SilentLittleCat há 7 anos atrás
pai
commit
bd28f79037
2 ficheiros alterados com 58 adições e 26 exclusões
  1. 56 24
      .idea/workspace.xml
  2. 2 2
      admin.php

+ 56 - 24
.idea/workspace.xml

xqd xqd xqd xqd xqd
@@ -77,16 +77,6 @@
           </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="31">
-              <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">
@@ -132,13 +122,39 @@
       <file leaf-file-name="admin.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/admin.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="496">
-              <caret line="51" column="11" lean-forward="false" selection-start-line="51" selection-start-column="11" selection-end-line="51" selection-end-column="11" />
+            <state relative-caret-position="450">
+              <caret line="30" column="14" lean-forward="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="function_admincp.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/function/function_admincp.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-802">
+              <caret line="296" column="9" lean-forward="false" selection-start-line="296" selection-start-column="9" selection-end-line="296" selection-end-column="9" />
+              <folding>
+                <marker date="1523670581543" expanded="true" signature="6988:6996" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="8815:8821" ph=" " />
+                <marker date="1523670581543" expanded="true" signature="11408:12516" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="11415:11651" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="11658:12516" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="11690:11920" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="12155:12417" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="12270:12408" ph="{...}" />
+                <marker date="1523670581543" expanded="true" signature="14179:14196" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="16823:16874" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="17180:17193" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="31467:31491" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="31796:31808" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="31860:31873" ph="..." />
+                <marker date="1523670581543" expanded="true" signature="35123:35133" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="discuz_admincp.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -318,12 +334,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="5660000" />
+      <workItem from="1525658293907" duration="5801000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="31534000" />
+    <option name="totallyTimeSpent" value="31675000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -361,14 +377,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <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">
@@ -798,10 +806,34 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/function/function_admincp.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-802">
+          <caret line="296" column="9" lean-forward="false" selection-start-line="296" selection-start-column="9" selection-end-line="296" selection-end-column="9" />
+          <folding>
+            <marker date="1523670581543" expanded="true" signature="6988:6996" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="8815:8821" ph=" " />
+            <marker date="1523670581543" expanded="true" signature="11408:12516" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="11415:11651" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="11658:12516" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="11690:11920" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="12155:12417" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="12270:12408" ph="{...}" />
+            <marker date="1523670581543" expanded="true" signature="14179:14196" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="16823:16874" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="17180:17193" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="31467:31491" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="31796:31808" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="31860:31873" ph="..." />
+            <marker date="1523670581543" expanded="true" signature="35123:35133" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/admin.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="51" column="11" lean-forward="false" selection-start-line="51" selection-start-column="11" selection-end-line="51" selection-end-column="11" />
+        <state relative-caret-position="450">
+          <caret line="30" column="14" lean-forward="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
           <folding />
         </state>
       </provider>

+ 2 - 2
admin.php

xqd xqd
@@ -28,6 +28,7 @@ $admincp = new discuz_admincp();
 $admincp->core  = & $discuz;
 $admincp->init();
 
+print_r('ok');
 
 $admincp_actions_founder = array('templates', 'db', 'founder', 'postsplit', 'threadsplit', 'cloudaddons', 'upgrade', 'patch', 'optimizer');
 $admincp_actions_normal = array('index', 'setting', 'members', 'admingroup', 'usergroups', 'usertag',
@@ -48,8 +49,7 @@ $page = max(1, intval(getgpc('page')));
 $isfounder = $admincp->isfounder;
 
 if(empty($action) || $frames != null) {
-    print_r('pk');
-    exit();
+
 	$admincp->show_admincp_main();
 } elseif($action == 'logout') {
 	$admincp->do_admin_logout();