| xqd
@@ -2,7 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/forum.php" afterPath="$PROJECT_DIR$/forum.php" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/source/language/lang_message.php" afterPath="$PROJECT_DIR$/source/language/lang_message.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -23,25 +23,55 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
+ <file leaf-file-name="function_message.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_message.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="527">
|
|
|
+ <caret line="141" column="25" lean-forward="true" selection-start-line="141" selection-start-column="25" selection-end-line="141" selection-end-column="25" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="lang_message.php" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/language/lang_message.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="367">
|
|
|
- <caret line="1426" column="19" lean-forward="false" selection-start-line="1426" selection-start-column="19" selection-end-line="1426" selection-end-column="19" />
|
|
|
+ <state relative-caret-position="558">
|
|
|
+ <caret line="40" column="36" lean-forward="true" selection-start-line="40" selection-start-column="36" selection-end-line="40" selection-end-column="36" />
|
|
|
<folding>
|
|
|
- <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
- <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="46795:46801" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="46997:47003" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47003:47009" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47009:47015" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47406:47412" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47412:47418" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47418:47424" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47685:47691" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47691:47697" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47697:47703" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47908:47914" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47914:47920" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47920:47926" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48139:48145" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48145:48151" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48151:48157" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48506:48512" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48512:48518" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48518:48524" ph=" " />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="function_message.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_message.php">
|
|
|
+ <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="496">
|
|
|
- <caret line="47" column="46" lean-forward="false" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="46" />
|
|
|
- <folding />
|
|
|
+ <state relative-caret-position="-244">
|
|
|
+ <caret line="425" column="9" lean-forward="false" selection-start-line="425" selection-start-column="9" selection-end-line="425" selection-end-column="9" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
+ <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
| xqd
@@ -58,7 +88,7 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="forum.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="forum.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="663">
|
| xqd
@@ -132,6 +162,7 @@
|
|
|
<option value="$PROJECT_DIR$/static/js/forum_post.js" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
<option value="$PROJECT_DIR$/forum.php" />
|
|
|
+ <option value="$PROJECT_DIR$/source/language/lang_message.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -172,6 +203,17 @@
|
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
+ <path>
|
|
|
+ <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ <item name="language" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
| xqd
@@ -182,7 +224,7 @@
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
- <property name="SearchEverywhereHistoryKey" value="function/function_message	FILE	file://D:/wamp64/www/Project/zijia/source/function/function_message.php forum_ajax	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php 3_diy_group_group	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php forum_grou	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php 3_diy_group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php group_index	FILE	file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
|
|
|
+ <property name="SearchEverywhereHistoryKey" value="3_3_common_showmessage	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php function/function_message	FILE	file://D:/wamp64/www/Project/zijia/source/function/function_message.php forum_ajax	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php 3_diy_group_group	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php forum_grou	FILE	file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php 3_diy_group_index	FILE	file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php group_index	FILE	file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
|
<option name="ruleStates">
|
| xqd
@@ -210,12 +252,12 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1525013349427</updated>
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
- <workItem from="1525013490770" duration="2207000" />
|
|
|
+ <workItem from="1525013490770" duration="2565000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="2322000" />
|
|
|
+ <option name="totallyTimeSpent" value="2680000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -320,50 +362,86 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_3_common_showmessage.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="155">
|
|
|
- <caret line="59" column="46" lean-forward="false" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="-1410">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="367">
|
|
|
- <caret line="1426" column="19" lean-forward="false" selection-start-line="1426" selection-start-column="19" selection-end-line="1426" selection-end-column="19" />
|
|
|
+ <state relative-caret-position="384">
|
|
|
+ <caret line="143" column="14" lean-forward="true" selection-start-line="143" selection-start-column="14" selection-end-line="143" selection-end-column="14" />
|
|
|
<folding>
|
|
|
- <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
- <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
+ <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_message.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="496">
|
|
|
- <caret line="47" column="46" lean-forward="false" selection-start-line="47" selection-start-column="16" selection-end-line="47" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="663">
|
|
|
+ <caret line="70" column="38" lean-forward="false" selection-start-line="70" selection-start-column="38" selection-end-line="70" selection-end-column="38" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="384">
|
|
|
- <caret line="143" column="14" lean-forward="true" selection-start-line="143" selection-start-column="14" selection-end-line="143" selection-end-column="14" />
|
|
|
+ <state relative-caret-position="-244">
|
|
|
+ <caret line="425" column="9" lean-forward="false" selection-start-line="425" selection-start-column="9" selection-end-line="425" selection-end-column="9" />
|
|
|
<folding>
|
|
|
- <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
|
|
|
+ <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
+ <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="663">
|
|
|
- <caret line="70" column="38" lean-forward="false" selection-start-line="70" selection-start-column="38" selection-end-line="70" selection-end-column="38" />
|
|
|
+ <state relative-caret-position="155">
|
|
|
+ <caret line="59" column="46" lean-forward="false" selection-start-line="59" selection-start-column="46" selection-end-line="59" selection-end-column="46" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_message.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="527">
|
|
|
+ <caret line="141" column="25" lean-forward="true" selection-start-line="141" selection-start-column="25" selection-end-line="141" selection-end-column="25" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/language/lang_message.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="558">
|
|
|
+ <caret line="40" column="36" lean-forward="true" selection-start-line="40" selection-start-column="36" selection-end-line="40" selection-end-column="36" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525016068862" expanded="true" signature="46795:46801" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="46997:47003" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47003:47009" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47009:47015" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47406:47412" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47412:47418" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47418:47424" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47685:47691" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47691:47697" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47697:47703" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47908:47914" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47914:47920" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="47920:47926" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48139:48145" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48145:48151" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48151:48157" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48506:48512" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48512:48518" ph=" " />
|
|
|
+ <marker date="1525016068862" expanded="true" signature="48518:48524" ph=" " />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|