test

.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <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" />
@@ -24,21 +23,11 @@
           </provider>
         </entry>
       </file>
-      <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="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="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="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" />
+            <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" />
               <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')}" />
@@ -50,8 +39,8 @@
       <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" />
+            <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>
           </provider>
@@ -60,8 +49,8 @@
       <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" />
+            <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="1523670581653" expanded="true" signature="20209:20299" ph="..." />
               </folding>
@@ -69,10 +58,20 @@
           </provider>
         </entry>
       </file>
+      <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="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>
+      </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="34999">
+            <state relative-caret-position="384">
               <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" />
@@ -85,8 +84,8 @@
       <file leaf-file-name="forum_post.js" pinned="false" current-in-tab="false">
         <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" />
+            <state relative-caret-position="294">
+              <caret line="548" column="22" lean-forward="true" selection-start-line="548" selection-start-column="22" selection-end-line="548" selection-end-column="22" />
               <folding>
                 <marker date="1525014248552" expanded="true" signature="21646:21673" ph="..." />
               </folding>
@@ -116,8 +115,9 @@
     <findStrings>
       <find>上传</find>
       <find>activityaid_url</find>
-      <find>checkgroupname</find>
       <find>activityattach_image</find>
+      <find>groupnamecheck</find>
+      <find>checkgroupname</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -182,7 +182,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="forum_ajax&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
+    <property name="SearchEverywhereHistoryKey" value="function/function_message&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/function/function_message.php&#10;forum_ajax&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -210,12 +210,12 @@
       <option name="presentableId" value="Default" />
       <updated>1525013349427</updated>
       <workItem from="1525013350506" duration="115000" />
-      <workItem from="1525013490770" duration="1815000" />
+      <workItem from="1525013490770" duration="2207000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1930000" />
+    <option name="totallyTimeSpent" value="2322000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -291,16 +291,6 @@
         </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>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="403">
@@ -309,36 +299,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
+    <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
       <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" />
+        <state relative-caret-position="294">
+          <caret line="548" column="22" lean-forward="true" selection-start-line="548" selection-start-column="22" selection-end-line="548" selection-end-column="22" />
           <folding>
-            <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
+            <marker date="1525014248552" expanded="true" signature="21646:21673" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
+    <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="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 relative-caret-position="384">
+          <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="1525014815851" expanded="true" signature="17971:17983" ph="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_message.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="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" />
+        <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_core.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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" />
           <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')}" />
@@ -346,21 +339,28 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/source/function/function_message.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.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" />
           <folding>
-            <element signature="e#2726#2747#0#HTML" expanded="true" />
-            <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
+            <marker date="1523670581653" expanded="true" signature="20209:20299" 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" />
+        <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>

forum.php

@@ -68,7 +68,7 @@ runhooks();
 
 $navtitle = str_replace('{bbname}', $_G['setting']['bbname'], $_G['setting']['seotitle']['forum']);
 $_G['setting']['threadhidethreshold'] = 1;
-print_r(libfile('function/message'));
+print_r(template('common/showmessage'));
 require DISCUZ_ROOT.'./source/module/forum/forum_'.$mod.'.php';
 
 ?>