test

.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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,8 +17,59 @@
       <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="632">
-              <caret line="490" column="20" lean-forward="true" selection-start-line="490" selection-start-column="20" selection-end-line="490" selection-end-column="20" />
+            <state relative-caret-position="527">
+              <caret line="487" column="0" lean-forward="true" selection-start-line="487" selection-start-column="0" selection-end-line="487" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="function_forum.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="22103">
+              <caret line="718" column="18" lean-forward="false" selection-start-line="718" selection-start-column="18" selection-end-line="718" selection-end-column="18" />
+              <folding>
+                <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="5815:5821" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6033:6039" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6039:6045" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6045:6051" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6260:6266" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6266:6272" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6311:6317" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6317:6323" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6327:6333" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6333:6339" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6377:6383" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="6383:6389" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="10826:10832" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="10832:10838" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="10838:10844" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11046:11052" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11052:11058" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11058:11064" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11273:11279" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11279:11285" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11324:11330" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11330:11336" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11340:11346" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11346:11352" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11390:11396" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11396:11402" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="12371:12377" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="40714:40723" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="651">
+              <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
               <folding />
             </state>
           </provider>
@@ -26,10 +78,9 @@
       <file leaf-file-name="3_diy_group_group_sg.tpl.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="539">
+            <state relative-caret-position="30008">
               <caret line="966" column="74" lean-forward="false" selection-start-line="966" selection-start-column="68" selection-end-line="966" selection-end-column="74" />
               <folding>
-                <element signature="e#5295#5318#0#HTML" expanded="true" />
                 <marker date="1525795789239" expanded="true" signature="19545:19557" ph="..." />
                 <marker date="1525795789239" expanded="true" signature="99960:100058" ph="..." />
               </folding>
@@ -41,7 +92,7 @@
         <entry file="file://$PROJECT_DIR$/.gitignore">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="31">
-              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+              <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -89,8 +140,8 @@
       <find>管理</find>
       <find>俱乐部名称</find>
       <find>名称</find>
-      <find>加入方式</find>
       <find>upload_icon_banner</find>
+      <find>加入方式</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -245,12 +296,13 @@
       <workItem from="1525658293907" duration="23514000" />
       <workItem from="1525701498505" duration="7843000" />
       <workItem from="1525738524458" duration="1328000" />
-      <workItem from="1525788960861" duration="7556000" />
+      <workItem from="1525788960861" duration="7945000" />
+      <workItem from="1525826298814" duration="90000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="66115000" />
+    <option name="totallyTimeSpent" value="66594000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -262,19 +314,19 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32955715" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -558,58 +610,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-151">
-          <caret line="26" column="65" lean-forward="false" selection-start-line="26" selection-start-column="55" selection-end-line="26" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_portal_index.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="310">
           <caret line="10" column="22" lean-forward="true" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="735" column="1" lean-forward="false" selection-start-line="735" selection-start-column="1" selection-end-line="735" selection-end-column="1" />
-          <folding>
-            <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="5815:5821" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6033:6039" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6039:6045" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6045:6051" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6260:6266" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6266:6272" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6311:6317" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6317:6323" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6327:6333" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6333:6339" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6377:6383" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="6383:6389" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="10826:10832" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="10832:10838" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="10838:10844" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11046:11052" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11052:11058" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11058:11064" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11273:11279" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11279:11285" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11324:11330" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11330:11336" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11340:11346" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11346:11352" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11390:11396" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="11396:11402" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="12371:12377" ph=" " />
-            <marker date="1523670581543" expanded="true" signature="40714:40723" ph="..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -617,7 +621,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="248">
           <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -625,7 +628,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="605">
           <caret line="27" column="27" lean-forward="false" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -633,9 +635,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5445">
           <caret line="178" column="196" lean-forward="false" selection-start-line="178" selection-start-column="194" selection-end-line="178" selection-end-column="196" />
-          <folding>
-            <element signature="e#2048#2069#0#HTML" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -653,7 +652,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="264">
           <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -661,14 +659,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="538">
           <caret line="102" column="73" lean-forward="false" selection-start-line="102" selection-start-column="56" selection-end-line="102" selection-end-column="73" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="31">
-          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -681,22 +678,68 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="651">
+          <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="539">
+        <state relative-caret-position="30008">
           <caret line="966" column="74" lean-forward="false" selection-start-line="966" selection-start-column="68" selection-end-line="966" selection-end-column="74" />
           <folding>
-            <element signature="e#5295#5318#0#HTML" expanded="true" />
             <marker date="1525795789239" expanded="true" signature="19545:19557" ph="..." />
             <marker date="1525795789239" expanded="true" signature="99960:100058" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22103">
+          <caret line="718" column="18" lean-forward="false" selection-start-line="718" selection-start-column="18" selection-end-line="718" selection-end-column="18" />
+          <folding>
+            <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="5815:5821" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6033:6039" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6039:6045" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6045:6051" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6260:6266" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6266:6272" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6311:6317" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6317:6323" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6327:6333" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6333:6339" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6377:6383" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="6383:6389" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="10826:10832" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="10832:10838" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="10838:10844" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11046:11052" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11052:11058" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11058:11064" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11273:11279" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11279:11285" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11324:11330" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11330:11336" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11340:11346" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11346:11352" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11390:11396" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11396:11402" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="12371:12377" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="40714:40723" 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="632">
-          <caret line="490" column="20" lean-forward="true" selection-start-line="490" selection-start-column="20" selection-end-line="490" selection-end-column="20" />
+        <state relative-caret-position="527">
+          <caret line="487" column="0" lean-forward="true" selection-start-line="487" selection-start-column="0" selection-end-line="487" selection-end-column="0" />
           <folding />
         </state>
       </provider>

source/module/forum/forum_group.php

@@ -474,19 +474,19 @@ if($action == 'index') {
 			$iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
 			$bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
 
-			if($_FILES['nav_image_1']) {
+			if(!empty($_FILES['nav_image_1']['tmp_name'])) {
 			    $nav_image_1 = upload_icon_banner($_G['forum'], $_FILES['nav_image_1'], 'carousel_1');
             } else {
                 $nav_image_1 = $_GET['nav_image_1_old'];
             }
 
-            if($_FILES['nav_image_2']) {
+            if(!empty($_FILES['nav_image_2']['tmp_name'])) {
                 $nav_image_2 = upload_icon_banner($_G['forum'], $_FILES['nav_image_2'], 'carousel_2');
             } else {
                 $nav_image_2 = $_GET['nav_image_2_old'];
             }
 
-            if($_FILES['nav_image_3']) {
+            if(!empty($_FILES['nav_image_3']['tmp_name'])) {
                 $nav_image_3 = upload_icon_banner($_G['forum'], $_FILES['nav_image_3'], 'carousel_3');
             } else {
                 $nav_image_3 = $_GET['nav_image_3_old'];