SilentLittleCat 7 vuotta sitten
vanhempi
commit
dd4b8c7a13
2 muutettua tiedostoa jossa 38 lisäystä ja 37 poistoa
  1. 34 33
      .idea/workspace.xml
  2. 4 4
      source/module/forum/forum_group.php

+ 34 - 33
.idea/workspace.xml

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="384">
-              <caret line="351" column="30" lean-forward="true" selection-start-line="351" selection-start-column="30" selection-end-line="351" selection-end-column="30" />
+            <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 />
             </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="-253">
-              <caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
+            <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" />
               <folding>
                 <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
                 <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -178,9 +178,9 @@
       <find>bannernew_image</find>
       <find>bannernew_upload</find>
       <find>bannernew_url</find>
-      <find>upload_icon_banner</find>
       <find>创建我的俱乐部</find>
       <find>checkgroupname</find>
+      <find>upload_icon_banner</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -206,6 +206,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/function/function_forum.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       </list>
     </option>
@@ -313,12 +314,12 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="9039000" />
+      <workItem from="1525612433789" duration="9330000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="24927000" />
+    <option name="totallyTimeSpent" value="25218000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -719,10 +720,32 @@
         </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">
+          <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>
+            <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="..." />
+          </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="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" />
+          <folding>
+            <marker date="1523670581653" expanded="true" signature="20209:20299" 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="-253">
-          <caret line="707" column="9" lean-forward="false" selection-start-line="707" selection-start-column="9" selection-end-line="707" selection-end-column="9" />
+        <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" />
           <folding>
             <marker date="1523670581543" expanded="true" signature="5803:5809" ph=" " />
             <marker date="1523670581543" expanded="true" signature="5809:5815" ph=" " />
@@ -769,32 +792,10 @@
         </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">
-          <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>
-            <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="..." />
-          </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="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" />
-          <folding>
-            <marker date="1523670581653" expanded="true" signature="20209:20299" 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="384">
-          <caret line="351" column="30" lean-forward="true" selection-start-line="351" selection-start-column="30" selection-end-line="351" selection-end-column="30" />
+        <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 />
         </state>
       </provider>

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

xqd xqd
@@ -347,10 +347,8 @@ if($action == 'index') {
 			$gviewperm = intval($_GET['gviewperm']);
 
 
-            $iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
-            $bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
-            print_r($iconnew);
-            exit();
+            $iconnew = upload_icon_banner($_FILES['iconnew'], 'icon');
+            $bannernew = upload_icon_banner($_FILES['bannernew'], 'banner');
             if($iconnew) {
                 $icon = $iconnew;
             } else {
@@ -467,6 +465,8 @@ 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) {