SilentLittleCat 7 年之前
父節點
當前提交
8b75f15958
共有 2 個文件被更改,包括 76 次插入69 次删除
  1. 74 69
      .idea/workspace.xml
  2. 2 0
      source/module/forum/forum_group.php

+ 74 - 69
.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
     <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" />
       <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
     </list>
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,8 +17,8 @@
       <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
       <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="632">
-              <caret line="360" column="31" lean-forward="true" selection-start-line="360" selection-start-column="31" selection-end-line="360" selection-end-column="31" />
+            <state relative-caret-position="322">
+              <caret line="468" column="19" lean-forward="false" selection-start-line="468" selection-start-column="19" selection-end-line="468" selection-end-column="19" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
@@ -26,7 +27,7 @@
       <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
         <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="314">
+            <state relative-caret-position="124">
               <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
               <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
               <folding>
               <folding>
                 <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
                 <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
@@ -39,8 +40,8 @@
       <file leaf-file-name="function_forum.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="function_forum.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
         <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="88">
-              <caret line="709" column="55" lean-forward="false" selection-start-line="709" selection-start-column="52" selection-end-line="709" selection-end-column="55" />
+            <state relative-caret-position="243">
+              <caret line="712" column="67" lean-forward="true" selection-start-line="712" selection-start-column="31" selection-end-line="712" selection-end-column="67" />
               <folding>
               <folding>
                 <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -80,7 +81,7 @@
       <file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="discuz_upload.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
         <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-160">
+            <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" />
               <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 />
               <folding />
             </state>
             </state>
@@ -90,11 +91,9 @@
       <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
       <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">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="353">
+            <state relative-caret-position="25978">
               <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
               <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
               <folding>
               <folding>
-                <element signature="e#72585#72591#0#HTML" expanded="true" />
-                <element signature="e#73211#73217#0#HTML" expanded="true" />
                 <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
                 <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
               </folding>
               </folding>
             </state>
             </state>
@@ -104,8 +103,8 @@
       <file leaf-file-name="forum_ajax.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="forum_ajax.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+            <state relative-caret-position="4309">
+              <caret line="144" column="5" lean-forward="false" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
               <folding>
               <folding>
                 <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
                 <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
               </folding>
               </folding>
@@ -126,7 +125,7 @@
       <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
         <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="314">
+            <state relative-caret-position="2635">
               <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
               <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
               <folding>
               <folding>
                 <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
                 <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
@@ -314,12 +313,13 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="9845000" />
+      <workItem from="1525612433789" duration="9986000" />
+      <workItem from="1525658293907" duration="147000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25733000" />
+    <option name="totallyTimeSpent" value="26021000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -331,19 +331,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="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="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="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="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="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="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="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="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="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="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="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="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="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="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>
     </layout>
   </component>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
   <component name="TypeScriptGeneratedFilesManager">
@@ -357,11 +357,58 @@
     <watches-manager />
     <watches-manager />
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
+    <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="25978">
+          <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
+          <folding>
+            <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
+          </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="4309">
+          <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+          <folding>
+            <marker date="1523670581653" expanded="true" signature="20209:20299" 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="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/function/function_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2635">
+          <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
+          <folding>
+            <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
+            <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
+            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="2" selection-end-line="9" selection-end-column="30" />
+          <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_index.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="248">
         <state relative-caret-position="248">
           <caret line="8" column="13" lean-forward="false" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
           <caret line="8" column="13" lean-forward="false" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -397,7 +444,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="682">
         <state relative-caret-position="682">
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -405,13 +451,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="37510">
         <state relative-caret-position="37510">
           <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
           <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
-          <folding>
-            <marker date="1525272579161" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="36343:36349" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="36349:36355" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="41659:41665" ph="..." />
-          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -420,8 +459,6 @@
         <state relative-caret-position="43679">
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
           <folding>
-            <element signature="e#72585#72591#0#HTML" expanded="true" />
-            <element signature="e#73211#73217#0#HTML" expanded="true" />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
@@ -431,7 +468,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="248">
         <state relative-caret-position="248">
           <caret line="8" column="13" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
           <caret line="8" column="13" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -467,7 +503,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="682">
         <state relative-caret-position="682">
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -475,13 +510,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="37510">
         <state relative-caret-position="37510">
           <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
           <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
-          <folding>
-            <marker date="1525272579161" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="36343:36349" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="36349:36355" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="41659:41665" ph="..." />
-          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -490,8 +518,6 @@
         <state relative-caret-position="43679">
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
           <folding>
-            <element signature="e#72585#72591#0#HTML" expanded="true" />
-            <element signature="e#73211#73217#0#HTML" expanded="true" />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
@@ -502,8 +528,6 @@
         <state relative-caret-position="23901">
         <state relative-caret-position="23901">
           <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
           <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>
           <folding>
-            <element signature="e#72585#72591#0#HTML" expanded="true" />
-            <element signature="e#73211#73217#0#HTML" expanded="true" />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
@@ -520,7 +544,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2697">
         <state relative-caret-position="2697">
           <caret line="87" column="74" lean-forward="false" selection-start-line="87" selection-start-column="59" selection-end-line="87" selection-end-column="74" />
           <caret line="87" column="74" lean-forward="false" selection-start-line="87" selection-start-column="59" selection-end-line="87" selection-end-column="74" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -592,7 +615,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="682">
         <state relative-caret-position="682">
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -600,13 +622,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="853">
         <state relative-caret-position="853">
           <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
           <caret line="1215" column="137" lean-forward="false" selection-start-line="1215" selection-start-column="137" selection-end-line="1215" selection-end-column="137" />
-          <folding>
-            <marker date="1525272579161" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="36343:36349" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="36349:36355" ph=" " />
-            <marker date="1525272579161" expanded="true" signature="41659:41665" ph="..." />
-          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -614,9 +629,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="692">
         <state relative-caret-position="692">
           <caret line="38" column="212" lean-forward="false" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="212" />
           <caret line="38" column="212" lean-forward="false" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="212" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -624,7 +636,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
         <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" />
           <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>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -632,7 +643,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-4650">
         <state relative-caret-position="-4650">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="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>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -648,7 +658,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
         <state relative-caret-position="570">
           <caret line="496" column="38" lean-forward="true" selection-start-line="496" selection-start-column="38" selection-end-line="496" selection-end-column="38" />
           <caret line="496" column="38" lean-forward="true" selection-start-line="496" selection-start-column="38" selection-end-line="496" selection-end-column="38" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -672,7 +681,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
         <state relative-caret-position="357">
           <caret line="97" column="47" lean-forward="false" selection-start-line="97" selection-start-column="47" selection-end-line="97" selection-end-column="47" />
           <caret line="97" column="47" lean-forward="false" selection-start-line="97" selection-start-column="47" selection-end-line="97" selection-end-column="47" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -680,7 +688,6 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="122">
         <state relative-caret-position="122">
           <caret line="92" column="6" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="234" selection-end-column="49" />
           <caret line="92" column="6" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="234" selection-end-column="49" />
-          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -702,7 +709,7 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
     <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
+        <state relative-caret-position="2635">
           <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
           <caret line="90" column="9" lean-forward="false" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
           <folding>
           <folding>
             <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
             <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
@@ -714,11 +721,9 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
+        <state relative-caret-position="25978">
           <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
           <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
           <folding>
           <folding>
-            <element signature="e#72585#72591#0#HTML" expanded="true" />
-            <element signature="e#73211#73217#0#HTML" expanded="true" />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
             <marker date="1525623229992" expanded="true" signature="18891:18903" ph="..." />
           </folding>
           </folding>
         </state>
         </state>
@@ -726,8 +731,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_ajax.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+        <state relative-caret-position="4309">
+          <caret line="144" column="5" lean-forward="false" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
           <folding>
           <folding>
             <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
             <marker date="1523670581653" expanded="true" signature="20209:20299" ph="..." />
           </folding>
           </folding>
@@ -736,7 +741,7 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-160">
+        <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" />
           <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 />
           <folding />
         </state>
         </state>
@@ -744,7 +749,7 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
     <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
+        <state relative-caret-position="124">
           <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
           <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
           <folding>
           <folding>
             <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
             <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
@@ -755,8 +760,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
     <entry file="file://$PROJECT_DIR$/source/function/function_forum.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="709" column="55" lean-forward="false" selection-start-line="709" selection-start-column="52" selection-end-line="709" selection-end-column="55" />
+        <state relative-caret-position="243">
+          <caret line="712" column="67" lean-forward="true" selection-start-line="712" selection-start-column="31" selection-end-line="712" selection-end-column="67" />
           <folding>
           <folding>
             <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -794,8 +799,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="632">
-          <caret line="360" column="31" lean-forward="true" selection-start-line="360" selection-start-column="31" selection-end-line="360" selection-end-column="31" />
+        <state relative-caret-position="322">
+          <caret line="468" column="19" lean-forward="false" selection-start-line="468" selection-start-column="19" selection-end-line="468" selection-end-column="19" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>

+ 2 - 0
source/module/forum/forum_group.php

@@ -465,6 +465,8 @@ if($action == 'index') {
 
 
 			$setarr = array();
 			$setarr = array();
 			$deletebanner = $_GET['deletebanner'];
 			$deletebanner = $_GET['deletebanner'];
+			print_r($_G['forum']['status'], $_G['setting']['group_imgsizelimit']);
+			exit();
 			$iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
 			$iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
 			$bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
 			$bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
 			if($iconnew) {
 			if($iconnew) {