test

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,23 +14,89 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <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="-15570">
-              <caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
+            <state relative-caret-position="539">
+              <caret line="363" column="337" lean-forward="true" selection-start-line="363" selection-start-column="337" selection-end-line="363" selection-end-column="337" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
+      <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="314">
+              <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>
+                <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
+                <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
+              </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="305">
+              <caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
+              <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="314">
+              <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>
+      </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="694">
-              <caret line="1418" column="119" lean-forward="true" selection-start-line="1418" selection-start-column="119" selection-end-line="1418" selection-end-column="119" />
+            <state relative-caret-position="849">
+              <caret line="816" column="54" lean-forward="false" selection-start-line="816" selection-start-column="54" selection-end-line="816" selection-end-column="54" />
               <folding>
-                <marker date="1525621401131" expanded="true" signature="18830:18842" ph="..." />
+                <element signature="e#72494#72500#0#HTML" expanded="true" />
+                <element signature="e#73120#73126#0#HTML" expanded="true" />
+                <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
               </folding>
             </state>
           </provider>
@@ -38,13 +105,27 @@
       <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="279">
-              <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="10" selection-end-column="41" />
+            <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>
       </file>
+      <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="314">
+              <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>
+      </file>
       <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -59,7 +140,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>activityaid_url</find>
       <find>activityattach_image</find>
       <find>groupnamecheck</find>
       <find>checkgroupname</find>
@@ -88,6 +168,8 @@
       <find>上传LOGO</find>
       <find>bannernew_image</find>
       <find>bannernew_upload</find>
+      <find>bannernew_url</find>
+      <find>upload_icon_banner</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -100,7 +182,6 @@
         <option value="$PROJECT_DIR$/source/language/lang_message.php" />
         <option value="$PROJECT_DIR$/forum.php" />
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
-        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/static/js/common.js" />
         <option value="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
         <option value="$PROJECT_DIR$/data/cache/area-select/area.js" />
@@ -114,6 +195,7 @@
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       </list>
     </option>
   </component>
@@ -182,7 +264,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="group_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;foru&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;gr&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;area.js&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/cache/area-select/area.js&#10;header.htm&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/default/common/header.htm&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.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_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;group_&#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;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" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/function/function_forum.php&#10;group_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;foru&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;gr&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;area.js&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/cache/area-select/area.js&#10;header.htm&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/default/common/header.htm&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.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_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;group_&#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;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="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -220,18 +302,18 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="6645000" />
+      <workItem from="1525612433789" duration="8117000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="22533000" />
+    <option name="totallyTimeSpent" value="24005000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" 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="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" 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" />
@@ -326,7 +408,9 @@
         <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" />
           <folding>
-            <marker date="1525621401131" expanded="true" signature="18830:18842" ph="..." />
+            <element signature="e#72494#72500#0#HTML" expanded="true" />
+            <element signature="e#73120#73126#0#HTML" expanded="true" />
+            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
           </folding>
         </state>
       </provider>
@@ -394,7 +478,9 @@
         <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" />
           <folding>
-            <marker date="1525621401131" expanded="true" signature="18830:18842" ph="..." />
+            <element signature="e#72494#72500#0#HTML" expanded="true" />
+            <element signature="e#73120#73126#0#HTML" expanded="true" />
+            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
           </folding>
         </state>
       </provider>
@@ -404,7 +490,9 @@
         <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" />
           <folding>
-            <marker date="1525621401131" expanded="true" signature="18830:18842" ph="..." />
+            <element signature="e#72494#72500#0#HTML" expanded="true" />
+            <element signature="e#73120#73126#0#HTML" expanded="true" />
+            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
           </folding>
         </state>
       </provider>
@@ -495,18 +583,6 @@
         </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="853">
-          <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
-          <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$/data/template/3_3_common_header_no_nav.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="682">
@@ -534,7 +610,7 @@
         <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" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
+            <element signature="n#!!doc" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -563,17 +639,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3415">
-          <caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
-          <folding>
-            <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
-            <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_application.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
@@ -614,39 +679,111 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="10" selection-end-column="41" />
+        <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$/config/config_ucenter.php">
+    <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="0" lean-forward="false" selection-start-line="8" selection-start-column="2" selection-end-line="9" selection-end-column="30" />
+          <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/forum/forum_group.php">
+    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-15570">
-          <caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
-          <folding />
+        <state relative-caret-position="314">
+          <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$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="694">
-          <caret line="1418" column="119" lean-forward="true" selection-start-line="1418" selection-start-column="119" selection-end-line="1418" selection-end-column="119" />
+        <state relative-caret-position="849">
+          <caret line="816" column="54" lean-forward="false" selection-start-line="816" selection-start-column="54" selection-end-line="816" selection-end-column="54" />
+          <folding>
+            <element signature="e#72494#72500#0#HTML" expanded="true" />
+            <element signature="e#73120#73126#0#HTML" expanded="true" />
+            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
+          </folding>
+        </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="314">
+          <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$/source/function/function_core.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="314">
+          <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>
-            <marker date="1525621401131" expanded="true" signature="18830:18842" ph="..." />
+            <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
+            <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
           </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="305">
+          <caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
+          <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="539">
+          <caret line="363" column="337" lean-forward="true" selection-start-line="363" selection-start-column="337" selection-end-line="363" selection-end-column="337" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

data/template/3_diy_group_group.tpl.php

@@ -797,17 +797,24 @@ EOF;
                             <tr>
                                 <th><?php echo $_G['setting']['navs']['3']['navname'];?>顶部图片</th>
                                 <td>
-                                    <input type="text" name="bannernew" id="bannernew_url" class="px" />
-                                    <button type="button" class="pn" onclick="uploadWindow(function (aid, url){bannernew_upload(aid, url)})"><span>上传</span></button>
-                                    <div id="bannernew_image"></div>
+                                    <input type="file" name="bannernew" id="bannernew" class="pf" size="25" />
+                                    <p class="d">
+                                        <?php if($_G['setting']['group_imgsizelimit']) { ?>
+                                            文件小于 <?php echo $_G['setting']['group_imgsizelimit'];?> KB &nbsp;
+                                        <?php } ?>
+                                        建议使用尺寸为 730×150 的图片以取得最佳效果
+                                    </p>
                                 </td>
                             </tr>
                             <tr>
                                 <th><?php echo $_G['setting']['navs']['3']['navname'];?>图标</th>
                                 <td>
-                                    <input type="text" name="logo" id="activityaid_url" class="px" />
-                                    <button type="button" class="pn" onclick="uploadWindow(function (aid, url){activityaid_upload(aid, url)})"><span>上传</span></button>
-                                    <div id="activityattach_image"></div>
+                                    <input type="file" id="iconnew" class="pf vm" size="25" name="iconnew" />
+                                    <p class="d">
+                                        自动缩略成 48 X 48 像素大小的图片 &nbsp;
+                                        <?php if($_G['setting']['group_imgsizelimit']) { ?>
+                                            文件小于 <?php echo $_G['setting']['group_imgsizelimit'];?> KB
+                                        <?php } ?></p>
                                 </td>
                             </tr>
                             <tr>

source/module/forum/forum_group.php

@@ -345,7 +345,23 @@ if($action == 'index') {
 		if($newfid) {
 			$jointype = intval($_GET['jointype']);
 			$gviewperm = intval($_GET['gviewperm']);
-			$fieldarray = array('fid' => $newfid, 'description' => $descriptionnew, 'jointype' => $jointype, 'gviewperm' => $gviewperm, 'dateline' => TIMESTAMP, 'founderuid' => $_G['uid'], 'foundername' => $_G['username'], 'membernum' => 1, 'province' => $_GET['province'], 'city' => $_GET['city'], 'logo' => $_GET['logo']);
+
+            $iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
+            $bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
+
+            if($iconnew) {
+                $icon = $iconnew;
+            } else {
+                $icon = null;
+            }
+
+            if($bannernew) {
+                $banner = $bannernew;
+            } else {
+                $banner = null;
+            }
+
+			$fieldarray = array('fid' => $newfid, 'description' => $descriptionnew, 'jointype' => $jointype, 'gviewperm' => $gviewperm, 'dateline' => TIMESTAMP, 'founderuid' => $_G['uid'], 'foundername' => $_G['username'], 'membernum' => 1, 'province' => $_GET['province'], 'city' => $_GET['city'], 'icon' => $icon, 'banner' => $banner);
 			C::t('forum_forumfield')->insert($fieldarray);
 			C::t('forum_forumfield')->update_groupnum($fup, 1);
 			C::t('forum_groupuser')->insert($newfid, $_G['uid'], $_G['username'], 1, TIMESTAMP);