SilentLittleCat 7 년 전
부모
커밋
f8381685bd
2개의 변경된 파일49개의 추가작업 그리고 33개의 파일을 삭제
  1. 45 30
      .idea/workspace.xml
  2. 4 3
      source/module/forum/forum_group.php

+ 45 - 30
.idea/workspace.xml

xqd 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="477">
-              <caret line="348" column="12" lean-forward="false" selection-start-line="348" selection-start-column="12" selection-end-line="348" selection-end-column="12" />
+            <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" />
               <folding />
             </state>
           </provider>
@@ -90,8 +90,8 @@
       <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="-3553">
-              <caret line="698" column="94" lean-forward="true" selection-start-line="698" selection-start-column="94" selection-end-line="698" selection-end-column="94" />
+            <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" />
@@ -101,6 +101,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="forum_ajax.php" pinned="false" current-in-tab="false">
+        <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>
+      </file>
       <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">
@@ -140,7 +152,6 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>groupnamecheck</find>
-      <find>checkgroupname</find>
       <find>$jointype</find>
       <find>上传</find>
       <find>推荐</find>
@@ -167,8 +178,9 @@
       <find>bannernew_image</find>
       <find>bannernew_upload</find>
       <find>bannernew_url</find>
-      <find>创建我的俱乐部</find>
       <find>upload_icon_banner</find>
+      <find>创建我的俱乐部</find>
+      <find>checkgroupname</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -263,7 +275,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <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" />
+    <property name="SearchEverywhereHistoryKey" value="forum_aj&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.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">
@@ -301,12 +313,12 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="8718000" />
+      <workItem from="1525612433789" duration="9039000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="24606000" />
+    <option name="totallyTimeSpent" value="24927000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -547,13 +559,6 @@
         </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="384">
-          <caret line="143" column="14" lean-forward="true" selection-start-line="143" selection-start-column="14" selection-end-line="143" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -714,18 +719,6 @@
         </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="-3553">
-          <caret line="698" column="94" lean-forward="true" selection-start-line="698" selection-start-column="94" selection-end-line="698" selection-end-column="94" />
-          <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/function/function_forum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-253">
@@ -776,10 +769,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/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="477">
-          <caret line="348" column="12" lean-forward="false" selection-start-line="348" selection-start-column="12" selection-end-line="348" selection-end-column="12" />
+        <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" />
           <folding />
         </state>
       </provider>

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

xqd
@@ -345,11 +345,12 @@ if($action == 'index') {
 		if($newfid) {
 			$jointype = intval($_GET['jointype']);
 			$gviewperm = intval($_GET['gviewperm']);
-            print_r($_FILES['iconnew']);
-            
+
+
             $iconnew = upload_icon_banner($_G['forum'], $_FILES['iconnew'], 'icon');
             $bannernew = upload_icon_banner($_G['forum'], $_FILES['bannernew'], 'banner');
-
+            print_r($iconnew);
+            exit();
             if($iconnew) {
                 $icon = $iconnew;
             } else {