SilentLittleCat 7 éve
szülő
commit
16e1e44663
3 módosított fájl, 115 hozzáadás és 42 törlés
  1. 104 30
      .idea/workspace.xml
  2. 1 1
      admin.php
  3. 10 11
      source/admincp/admincp_login.php

+ 104 - 30
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/admin.php" afterPath="$PROJECT_DIR$/admin.php" />
+      <change beforePath="$PROJECT_DIR$/source/admincp/admincp_login.php" afterPath="$PROJECT_DIR$/source/admincp/admincp_login.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,18 +14,68 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="admin.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="admin.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/admin.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="403">
-              <caret line="53" column="19" lean-forward="false" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
+            <state relative-caret-position="310">
+              <caret line="50" column="27" lean-forward="false" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" />
               <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">
+            <state relative-caret-position="305">
+              <caret line="292" column="13" lean-forward="false" selection-start-line="292" selection-start-column="13" selection-end-line="292" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="admincp_main.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/admincp/admincp_main.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-5568">
+              <caret line="77" column="171" lean-forward="false" selection-start-line="77" selection-start-column="166" selection-end-line="77" selection-end-column="171" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="admincp_login.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/source/admincp/admincp_login.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="465">
+              <caret line="86" column="0" lean-forward="false" selection-start-line="86" selection-start-column="2" selection-end-line="91" selection-end-column="9" />
+              <folding>
+                <marker date="1524728542216" expanded="true" signature="1348:1580" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="1355:1573" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="1644:1737" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="1682:1728" ph="{...}" />
+                <marker date="1524728542216" expanded="true" signature="1761:1872" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="1766:1872" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="2028:2322" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="2033:2313" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="2068:2307" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="2096:2298" ph="..." />
+                <marker date="1524728542216" expanded="false" signature="2200:2206" ph="©" />
+                <marker date="1524728542216" expanded="true" signature="3136:4372" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="3572:4081" ph="..." />
+                <marker date="1524728542216" expanded="true" signature="3637:4074" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>login</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -36,6 +86,7 @@
         <option value="$PROJECT_DIR$/portal.php" />
         <option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
         <option value="$PROJECT_DIR$/admin.php" />
+        <option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
       </list>
     </option>
   </component>
@@ -82,6 +133,12 @@
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="admincp" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -140,12 +197,12 @@
       <workItem from="1523925697036" duration="97000" />
       <workItem from="1524012151662" duration="5085000" />
       <workItem from="1524101424073" duration="15000" />
-      <workItem from="1524727323225" duration="289000" />
+      <workItem from="1524727323225" duration="1211000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17903000" />
+    <option name="totallyTimeSpent" value="18825000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -183,20 +240,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/archiver/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/source/plugin/baidusubmit/function/function_baidu.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="11" column="60" lean-forward="true" selection-start-line="11" selection-start-column="60" selection-end-line="11" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/connect.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-356">
@@ -508,14 +551,6 @@
         </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="314">
-          <caret line="274" column="13" lean-forward="false" selection-start-line="274" selection-start-column="13" selection-end-line="274" 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="128">
@@ -529,11 +564,50 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/admin.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="53" column="19" lean-forward="false" selection-start-line="53" selection-start-column="19" selection-end-line="53" selection-end-column="19" />
+        <state relative-caret-position="310">
+          <caret line="50" column="27" lean-forward="false" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" />
+          <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="305">
+          <caret line="292" column="13" lean-forward="false" selection-start-line="292" selection-start-column="13" selection-end-line="292" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/admincp/admincp_main.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5568">
+          <caret line="77" column="171" lean-forward="false" selection-start-line="77" selection-start-column="166" selection-end-line="77" selection-end-column="171" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/source/admincp/admincp_login.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="86" column="0" lean-forward="false" selection-start-line="86" selection-start-column="2" selection-end-line="91" selection-end-column="9" />
+          <folding>
+            <marker date="1524728542216" expanded="true" signature="1348:1580" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="1355:1573" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="1644:1737" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="1682:1728" ph="{...}" />
+            <marker date="1524728542216" expanded="true" signature="1761:1872" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="1766:1872" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="2028:2322" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="2033:2313" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="2068:2307" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="2096:2298" ph="..." />
+            <marker date="1524728542216" expanded="false" signature="2200:2206" ph="©" />
+            <marker date="1524728542216" expanded="true" signature="3136:4372" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="3572:4081" ph="..." />
+            <marker date="1524728542216" expanded="true" signature="3637:4074" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 1
admin.php

xqd
@@ -51,7 +51,7 @@ if(empty($action) || $frames != null) {
 	$admincp->show_admincp_main();
 } elseif($action == 'logout') {
 	$admincp->do_admin_logout();
-	print_r('here');
+
 	dheader("Location: ./index.php");
 } elseif(in_array($action, $admincp_actions_normal) || ($admincp->isfounder && in_array($action, $admincp_actions_founder))) {
 	if($admincp->allow($action, $operation, $do) || $action == 'index') {

+ 10 - 11
source/admincp/admincp_login.php

xqd xqd xqd
@@ -52,7 +52,6 @@ function html_login_header($form = true) {
 <meta http-equiv="Content-Type" content="text/html;charset=$charset" />
 <title>$title</title>
 <link rel="stylesheet" href="static/image/admincp/admincp.css?{$_G[style][verhash]}" type="text/css" media="all" />
-<meta content="Comsenz Inc." name="Copyright" />
 </head>
 <body>
 EOT;
@@ -66,10 +65,10 @@ EOT;
 </script>
 <table class="logintb">
 <tr>
-	<td class="login">
-		<h1>Discuz! Administrator's Control Panel</h1>
-		<p>$tips</p>
-	</td>
+//	<td class="login">
+//		<h1>Discuz! Administrator's Control Panel</h1>
+//		<p>$tips</p>
+//	</td>
 
 	<td>
 EOT;
@@ -85,12 +84,12 @@ function html_login_footer($halt = true) {
 </table>
 <table class="logintb">
 <tr>
-	<td colspan="2" class="footer">
-		<div class="copyright">
-			<p>Powered by <a href="http://www.discuz.net/" target="_blank">Discuz!</a> $version </p>
-			<p>&copy; 2001-2017, <a href="http://www.comsenz.com/" target="_blank">Comsenz</a> Inc.</p>
-		</div>
-	</td>
+//	<td colspan="2" class="footer">
+//		<div class="copyright">
+//			<p>Powered by <a href="http://www.discuz.net/" target="_blank">Discuz!</a> $version </p>
+//			<p>&copy; 2001-2017, <a href="http://www.comsenz.com/" target="_blank">Comsenz</a> Inc.</p>
+//		</div>
+//	</td>
 </tr>
 </table>
 </body>