test

.idea/workspace.xml

@@ -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$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,127 +13,46 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="false">
-        <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>
-      </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="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="false">
-        <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>
-      </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="-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>
-      </file>
-      <file leaf-file-name="forum_ajax.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
+      <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="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="-174">
+              <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
               <folding>
-                <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
+                <element signature="e#2726#2747#0#HTML" expanded="true" />
+                <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="forum.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/forum.php">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="663">
-              <caret line="70" column="0" lean-forward="true" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
+            <state relative-caret-position="5406">
+              <caret line="453" column="32" lean-forward="false" selection-start-line="453" selection-start-column="17" selection-end-line="453" selection-end-column="32" />
               <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="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>
-      </file>
-      <file leaf-file-name="forum_post.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
+      <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/config_global.php">
           <provider selected="true" editor-type-id="text-editor">
-            <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>
+            <state relative-caret-position="0">
+              <caret line="0" column="5" lean-forward="true" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/static/js/common.js">
+      <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="true">
+        <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="-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" />
+            <state relative-caret-position="260">
+              <caret line="93" column="26" lean-forward="true" selection-start-line="93" selection-start-column="26" selection-end-line="93" selection-end-column="26" />
               <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="..." />
+                <element signature="e#1656#1677#0#HTML" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -143,11 +62,15 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>上传</find>
       <find>activityaid_url</find>
       <find>activityattach_image</find>
       <find>groupnamecheck</find>
       <find>checkgroupname</find>
+      <find>create</find>
+      <find>$jointype</find>
+      <find>推荐</find>
+      <find>上传</find>
+      <find>group_recommend</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -156,13 +79,13 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <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$/source/language/lang_message.php" />
         <option value="$PROJECT_DIR$/forum.php" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
       </list>
     </option>
   </component>
@@ -203,6 +126,11 @@
               <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="config" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -224,7 +152,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="3_3_common_showmessage&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php&#10;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" />
+    <property name="SearchEverywhereHistoryKey" value="group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;forum_gro&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_3_common_showmessage&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php&#10;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" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -252,12 +180,12 @@
       <option name="presentableId" value="Default" />
       <updated>1525013349427</updated>
       <workItem from="1525013350506" duration="115000" />
-      <workItem from="1525013490770" duration="2595000" />
+      <workItem from="1525013490770" duration="3762000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2710000" />
+    <option name="totallyTimeSpent" value="3877000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -333,35 +261,6 @@
         </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">
-          <caret line="362" column="51" lean-forward="false" selection-start-line="362" selection-start-column="51" selection-end-line="362" selection-end-column="51" />
-          <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="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>
-        </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="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$/data/template/3_3_common_showmessage.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1410">
@@ -370,14 +269,6 @@
         </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$/source/language/lang_message.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="558">
@@ -443,5 +334,52 @@
         </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="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>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="5" lean-forward="true" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" />
+          <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="-174">
+          <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
+          <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/module/forum/forum_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5406">
+          <caret line="453" column="32" lean-forward="false" selection-start-line="453" selection-start-column="17" selection-end-line="453" selection-end-column="32" />
+          <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="260">
+          <caret line="93" column="26" lean-forward="true" selection-start-line="93" selection-start-column="26" selection-end-line="93" selection-end-column="26" />
+          <folding>
+            <element signature="e#1656#1677#0#HTML" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

data/template/3_diy_group_index.tpl.php

@@ -88,7 +88,9 @@
             <?php if(is_array(dunserialize($_G['setting']['group_recommend']))) { ?>
                 <?php foreach(dunserialize($_G['setting']['group_recommend']) as $val) { ?>
                     <div>
-                        <img src="<?php echo $val['icon'];?>" width="48" height="48">
+                        <a href="forum.php?mod=group&fid=<?php echo $val['fid'];?>">
+                            <img src="<?php echo $val['icon'];?>" width="48" height="48">
+                        </a>
                     </div>
                 <?php } ?>
             <?php } ?>