SilentLittleCat %!s(int64=7) %!d(string=hai) anos
pai
achega
e1613ab499
Modificáronse 2 ficheiros con 26 adicións e 21 borrados
  1. 24 18
      .idea/workspace.xml
  2. 2 3
      source/class/discuz/discuz_admincp.php

+ 24 - 18
.idea/workspace.xml

xqd xqd xqd xqd
@@ -132,8 +132,18 @@
       <file leaf-file-name="discuz_admincp.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="646">
-              <caret line="128" column="23" lean-forward="false" selection-start-line="128" selection-start-column="23" selection-end-line="128" selection-end-column="23" />
+            <state relative-caret-position="398">
+              <caret line="176" column="27" lean-forward="false" selection-start-line="176" selection-start-column="27" selection-end-line="176" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="function_member.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/function/function_member.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="35">
+              <caret line="99" column="9" lean-forward="false" selection-start-line="99" selection-start-column="9" selection-end-line="99" selection-end-column="9" />
               <folding />
             </state>
           </provider>
@@ -309,12 +319,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="6306000" />
+      <workItem from="1525658293907" duration="6493000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32180000" />
+    <option name="totallyTimeSpent" value="32367000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -352,18 +362,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2635">
-          <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$/config/config_ucenter.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="248">
@@ -805,10 +803,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/function/function_member.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="35">
+          <caret line="99" column="9" lean-forward="false" selection-start-line="99" selection-start-column="9" selection-end-line="99" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="128" column="23" lean-forward="false" selection-start-line="128" selection-start-column="23" selection-end-line="128" selection-end-column="23" />
+        <state relative-caret-position="398">
+          <caret line="176" column="27" lean-forward="false" selection-start-line="176" selection-start-column="27" selection-end-line="176" selection-end-column="27" />
           <folding />
         </state>
       </provider>

+ 2 - 3
source/class/discuz/discuz_admincp.php

xqd xqd
@@ -125,8 +125,6 @@ class discuz_admincp
 
 				$this->check_admin_login();
 			} elseif($this->cpaccess == 0) {
-                print_r('ok');
-                exit();
 				$this->check_user_login();
 			}
 		}
@@ -175,7 +173,8 @@ class discuz_admincp
 
 			require_once libfile('function/member');
 			if(logincheck($_POST['admin_username'])) {
-				if((empty($_POST['admin_questionid']) || empty($_POST['admin_answer'])) && ($_G['config']['admincp']['forcesecques'] || $_G['group']['forcesecques'])) {
+				if((empty($_POST['admin_questionid']) || empty($_POST['admin_answer'])) && ($_G['config']['admincp']['forcesecques'] || $_G['group']['forcesecques'])) {print_r('ok');
+                    exit();
 					$this->do_user_login();
 				}
 				$result = userlogin($_POST['admin_username'], $_POST['admin_password'], $_POST['admin_questionid'], $_POST['admin_answer'], 'username', $this->core->var['clientip']);