| xqd
@@ -3,6 +3,7 @@
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/forum.php" afterPath="$PROJECT_DIR$/forum.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -23,34 +24,59 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="forum.php" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="forum.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1379">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="636">
|
|
|
+ <caret line="70" column="37" lean-forward="false" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="37" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.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="403">
|
|
|
- <caret line="362" column="51" lean-forward="false" selection-start-line="362" selection-start-column="51" selection-end-line="362" selection-end-column="51" />
|
|
|
+ <state relative-caret-position="345">
|
|
|
+ <caret line="1425" column="44" lean-forward="false" selection-start-line="1425" selection-start-column="17" selection-end-line="1425" selection-end-column="44" />
|
|
|
+ <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>
|
|
|
+ </file>
|
|
|
+ <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="62">
|
|
|
+ <caret line="13" column="9" lean-forward="false" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="forum_ajax.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="291">
|
|
|
+ <caret line="143" column="14" lean-forward="false" selection-start-line="143" selection-start-column="14" selection-end-line="143" selection-end-column="14" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="663">
|
|
|
- <caret line="1383" column="45" lean-forward="false" selection-start-line="1383" selection-start-column="45" selection-end-line="1383" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="34999">
|
|
|
+ <caret line="803" column="128" lean-forward="false" selection-start-line="803" selection-start-column="114" selection-end-line="803" selection-end-column="128" />
|
|
|
<folding>
|
|
|
<element signature="e#2726#2747#0#HTML" expanded="true" />
|
|
|
- <marker date="1525014756643" expanded="true" signature="17971:17983" ph="..." />
|
|
|
+ <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -71,8 +97,8 @@
|
|
|
<file leaf-file-name="common.js" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2103">
|
|
|
- <caret line="514" column="5" lean-forward="true" selection-start-line="514" selection-start-column="5" selection-end-line="514" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="-67">
|
|
|
+ <caret line="413" column="9" lean-forward="false" selection-start-line="413" selection-start-column="9" selection-end-line="413" selection-end-column="9" />
|
|
|
<folding>
|
|
|
<marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
|
|
|
<marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
|
| xqd
@@ -90,6 +116,7 @@
|
|
|
<findStrings>
|
|
|
<find>上传</find>
|
|
|
<find>activityaid_url</find>
|
|
|
+ <find>checkgroupname</find>
|
|
|
<find>activityattach_image</find>
|
|
|
</findStrings>
|
|
|
</component>
|
| xqd
@@ -104,6 +131,7 @@
|
|
|
<option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
<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" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -154,7 +182,7 @@
|
|
|
<component name="PropertiesComponent">
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
- <property name="SearchEverywhereHistoryKey" value="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="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
@@ -182,12 +210,12 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1525013349427</updated>
|
|
|
<workItem from="1525013350506" duration="115000" />
|
|
|
- <workItem from="1525013490770" duration="1260000" />
|
|
|
+ <workItem from="1525013490770" duration="1815000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="1375000" />
|
|
|
+ <option name="totallyTimeSpent" value="1930000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -241,19 +269,35 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/misc.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="0">
|
|
|
+ <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$/forum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-1379">
|
|
|
- <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 relative-caret-position="-67">
|
|
|
+ <caret line="413" column="9" lean-forward="false" selection-start-line="413" selection-start-column="9" selection-end-line="413" selection-end-column="9" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
|
|
|
+ <marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
|
|
|
+ <marker date="1525011696005" expanded="true" signature="36341:36347" ph=" " />
|
|
|
+ <marker date="1525011696005" expanded="true" signature="36347:36353" ph=" " />
|
|
|
+ <marker date="1525011696005" expanded="true" signature="41657:41663" ph="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="438">
|
|
|
+ <caret line="552" column="12" lean-forward="false" selection-start-line="552" selection-start-column="12" selection-end-line="552" selection-end-column="12" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1525014248552" expanded="true" signature="21646:21673" ph="..." />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
| xqd
@@ -265,48 +309,61 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/misc.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="291">
|
|
|
+ <caret line="143" column="14" lean-forward="false" selection-start-line="143" selection-start-column="14" selection-end-line="143" selection-end-column="14" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <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="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$/static/js/forum_post.js">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_message.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="438">
|
|
|
- <caret line="552" column="12" lean-forward="false" selection-start-line="552" selection-start-column="12" selection-end-line="552" selection-end-column="12" />
|
|
|
- <folding>
|
|
|
- <marker date="1525014248552" expanded="true" signature="21646:21673" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="62">
|
|
|
+ <caret line="13" column="9" lean-forward="false" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/static/js/common.js">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2103">
|
|
|
- <caret line="514" column="5" lean-forward="true" selection-start-line="514" selection-start-column="5" selection-end-line="514" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="345">
|
|
|
+ <caret line="1425" column="44" lean-forward="false" selection-start-line="1425" selection-start-column="17" selection-end-line="1425" selection-end-column="44" />
|
|
|
<folding>
|
|
|
- <marker date="1525011696005" expanded="true" signature="32210:32216" ph=" " />
|
|
|
- <marker date="1525011696005" expanded="true" signature="32216:32222" ph=" " />
|
|
|
- <marker date="1525011696005" expanded="true" signature="36341:36347" ph=" " />
|
|
|
- <marker date="1525011696005" expanded="true" signature="36347:36353" ph=" " />
|
|
|
- <marker date="1525011696005" expanded="true" signature="41657:41663" 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$/data/template/3_diy_group_group.tpl.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="663">
|
|
|
- <caret line="1383" column="45" lean-forward="false" selection-start-line="1383" selection-start-column="45" selection-end-line="1383" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="34999">
|
|
|
+ <caret line="803" column="128" lean-forward="false" selection-start-line="803" selection-start-column="114" selection-end-line="803" selection-end-column="128" />
|
|
|
<folding>
|
|
|
<element signature="e#2726#2747#0#HTML" expanded="true" />
|
|
|
- <marker date="1525014756643" expanded="true" signature="17971:17983" ph="..." />
|
|
|
+ <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/forum.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="636">
|
|
|
+ <caret line="70" column="37" lean-forward="false" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="37" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|