tst

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -13,11 +14,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="388">
-              <caret line="149" column="55" lean-forward="false" selection-start-line="149" selection-start-column="55" selection-end-line="149" selection-end-column="55" />
+            <state relative-caret-position="357">
+              <caret line="148" column="35" lean-forward="false" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
               <folding />
             </state>
           </provider>
@@ -33,11 +34,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="59">
-              <caret line="182" column="12" lean-forward="true" selection-start-line="182" selection-start-column="12" selection-end-line="182" selection-end-column="12" />
+            <state relative-caret-position="307">
+              <caret line="189" column="5" lean-forward="true" selection-start-line="189" selection-start-column="5" selection-end-line="189" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -100,8 +101,8 @@
       <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="0">
-              <caret line="0" column="64" lean-forward="false" selection-start-line="0" selection-start-column="64" selection-end-line="0" selection-end-column="64" />
+            <state relative-caret-position="248">
+              <caret line="5" column="19" lean-forward="false" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
               <folding>
                 <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
               </folding>
@@ -119,26 +120,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="table_forum_forumfield.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forumfield.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="636">
-              <caret line="33" column="35" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="35" />
-              <folding>
-                <marker date="1525702232788" expanded="true" signature="573:606" ph="SELECT * FRO... " />
-                <marker date="1525702232788" expanded="true" signature="754:894" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525702232788" expanded="true" signature="971:985" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525702232788" expanded="true" signature="971:1011" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-                <marker date="1525702232788" expanded="true" signature="1142:1211" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-                <marker date="1525702232788" expanded="true" signature="1351:1414" ph="UPDATE %t SE... " />
-                <marker date="1525702232788" expanded="true" signature="1579:1643" ph="UPDATE %t SE... " />
-                <marker date="1525702232788" expanded="true" signature="1762:1906" ph="SELECT f.fid... " />
-                <marker date="1525702232788" expanded="true" signature="2391:2594" ph="SELECT ff.po... ${DB::table($this-&gt;_table)}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="discuz_database.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_database.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -206,7 +187,6 @@
         <option value="$PROJECT_DIR$/template/default/group/group_area.htm" />
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
-        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/admin.php" />
         <option value="$PROJECT_DIR$/uc_client/client.php" />
         <option value="$PROJECT_DIR$/source/function/function_member.php" />
@@ -227,6 +207,7 @@
         <option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
         <option value="$PROJECT_DIR$/source/class/table/table_forum_forum.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
+        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       </list>
     </option>
   </component>
@@ -341,12 +322,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="4996000" />
+      <workItem from="1525701498505" duration="5175000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="54384000" />
+    <option name="totallyTimeSpent" value="54563000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -696,32 +677,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forumfield.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="636">
-          <caret line="33" column="35" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="35" />
-          <folding>
-            <marker date="1525702232788" expanded="true" signature="573:606" ph="SELECT * FRO... " />
-            <marker date="1525702232788" expanded="true" signature="754:894" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525702232788" expanded="true" signature="971:985" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525702232788" expanded="true" signature="971:1011" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
-            <marker date="1525702232788" expanded="true" signature="1142:1211" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
-            <marker date="1525702232788" expanded="true" signature="1351:1414" ph="UPDATE %t SE... " />
-            <marker date="1525702232788" expanded="true" signature="1579:1643" ph="UPDATE %t SE... " />
-            <marker date="1525702232788" expanded="true" signature="1762:1906" ph="SELECT f.fid... " />
-            <marker date="1525702232788" expanded="true" signature="2391:2594" ph="SELECT ff.po... ${DB::table($this-&gt;_table)}" />
-          </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="248">
-          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="104">
@@ -751,16 +706,6 @@
         </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="0">
-          <caret line="0" column="64" lean-forward="false" selection-start-line="0" selection-start-column="64" selection-end-line="0" selection-end-column="64" />
-          <folding>
-            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="698">
@@ -813,18 +758,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.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="59">
-          <caret line="182" column="12" lean-forward="true" selection-start-line="182" selection-start-column="12" selection-end-line="182" selection-end-column="12" />
+        <state relative-caret-position="248">
+          <caret line="5" column="19" lean-forward="false" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
+          <folding>
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forumfield.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="636">
+          <caret line="33" column="35" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="35" />
+          <folding>
+            <marker date="1525702232788" expanded="true" signature="573:606" ph="SELECT * FRO... " />
+            <marker date="1525702232788" expanded="true" signature="754:894" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525702232788" expanded="true" signature="971:985" ph="SELECT * FRO... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525702232788" expanded="true" signature="971:1011" ph="SELECT fid, ${DB::table($this-&gt;_table)}" />
+            <marker date="1525702232788" expanded="true" signature="1142:1211" ph="SELECT COUNT... ${DB::table($this-&gt;_table)}" />
+            <marker date="1525702232788" expanded="true" signature="1351:1414" ph="UPDATE %t SE... " />
+            <marker date="1525702232788" expanded="true" signature="1579:1643" ph="UPDATE %t SE... " />
+            <marker date="1525702232788" expanded="true" signature="1762:1906" ph="SELECT f.fid... " />
+            <marker date="1525702232788" expanded="true" signature="2391:2594" ph="SELECT ff.po... ${DB::table($this-&gt;_table)}" />
+          </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="248">
+          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="149" column="55" lean-forward="false" selection-start-line="149" selection-start-column="55" selection-end-line="149" selection-end-column="55" />
+        <state relative-caret-position="357">
+          <caret line="148" column="35" lean-forward="false" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
+          <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="307">
+          <caret line="189" column="5" lean-forward="true" selection-start-line="189" selection-start-column="5" selection-end-line="189" selection-end-column="5" />
           <folding />
         </state>
       </provider>

source/module/forum/forum_group.php

@@ -189,7 +189,7 @@ if($action == 'index') {
 		}
 	}
 
-	write_groupviewed($_G['fid']);
+//	write_groupviewed($_G['fid']);
     $_G['setting']['navs']['3']['navname'] = '俱乐部';
 	include template('diy:group/group:'.$_G['fid']);
 

source/module/group/group_index.php

@@ -147,7 +147,6 @@ if(!$metadescription) {
 
 if(empty($curtype)) {
     if(!empty($_GET['province'])) {
-        print_r(template('diy:group/group:54'));exit();
         $_G['sg'] = [];
         $_G['sg']['group_list'] = C::t('forum_forum')->fetch_all_for_grouplist_by_province('北京市', 'displayorder', '*', 10);
         include template('diy:group/area');