SilentLittleCat 7 tahun lalu
induk
melakukan
729dc6c099
2 mengubah file dengan 36 tambahan dan 36 penghapusan
  1. 31 31
      .idea/workspace.xml
  2. 5 5
      source/module/forum/forum_group.php

+ 31 - 31
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -16,8 +16,8 @@
       <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="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" />
+            <state relative-caret-position="198">
+              <caret line="346" column="51" lean-forward="false" selection-start-line="346" selection-start-column="51" selection-end-line="346" selection-end-column="51" />
               <folding />
             </state>
           </provider>
@@ -39,8 +39,8 @@
       <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="403">
-              <caret line="735" column="1" lean-forward="false" selection-start-line="735" selection-start-column="1" selection-end-line="735" selection-end-column="1" />
+            <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" />
               <folding>
                 <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -80,7 +80,7 @@
       <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">
+            <state relative-caret-position="-160">
               <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>
@@ -157,7 +157,6 @@
       <find>推荐</find>
       <find>create</find>
       <find>$parentid</find>
-      <find>print_r</find>
       <find>sd wk_sq_sd padding15 backfff</find>
       <find>mn wk_f_mn padding15 backfff</find>
       <find>jquery</find>
@@ -180,6 +179,7 @@
       <find>bannernew_url</find>
       <find>创建我的俱乐部</find>
       <find>checkgroupname</find>
+      <find>print_r</find>
       <find>upload_icon_banner</find>
     </findStrings>
   </component>
@@ -314,12 +314,12 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="9330000" />
+      <workItem from="1525612433789" duration="9746000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25218000" />
+    <option name="totallyTimeSpent" value="25634000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -712,14 +712,6 @@
         </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$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="353">
@@ -742,10 +734,29 @@
         </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="-160">
+          <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="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="403">
-          <caret line="735" column="1" lean-forward="false" selection-start-line="735" selection-start-column="1" selection-end-line="735" selection-end-column="1" />
+        <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" />
           <folding>
             <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -781,21 +792,10 @@
         </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="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/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="198">
+          <caret line="346" column="51" lean-forward="false" selection-start-line="346" selection-start-column="51" selection-end-line="346" selection-end-column="51" />
           <folding />
         </state>
       </provider>

+ 5 - 5
source/module/forum/forum_group.php

xqd xqd
@@ -346,9 +346,11 @@ if($action == 'index') {
 			$jointype = intval($_GET['jointype']);
 			$gviewperm = intval($_GET['gviewperm']);
 
-
-            $iconnew = upload_icon_banner($_FILES['iconnew'], 'icon');
-            $bannernew = upload_icon_banner($_FILES['bannernew'], 'banner');
+			$sg_data['fid'] = $newfid;
+            $iconnew = upload_icon_banner($sg_data, $_FILES['iconnew'], 'icon');
+            $bannernew = upload_icon_banner($sg_data, $_FILES['bannernew'], 'banner');
+            print_r($iconnew);
+            exit();
             if($iconnew) {
                 $icon = $iconnew;
             } else {
@@ -465,8 +467,6 @@ if($action == 'index') {
 
 			$setarr = array();
 			$deletebanner = $_GET['deletebanner'];
-			print_r($_G['forum']);
-			exit();
 			$iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
 			$bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
 			if($iconnew) {