SilentLittleCat 7 years ago
parent
commit
18ce6cfb25
3 changed files with 32 additions and 13 deletions
  1. 31 12
      .idea/workspace.xml
  2. 0 1
      portal.php
  3. 1 0
      source/function/function_core.php

+ 31 - 12
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/portal.php" afterPath="$PROJECT_DIR$/portal.php" />
+      <change beforePath="$PROJECT_DIR$/source/function/function_core.php" afterPath="$PROJECT_DIR$/source/function/function_core.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,16 +14,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="portal.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="portal.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/portal.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="806">
-              <caret line="30" column="14" lean-forward="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+              <caret line="30" column="20" lean-forward="false" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="function_core.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="562">
+              <caret line="831" column="19" lean-forward="false" selection-start-line="831" selection-start-column="19" selection-end-line="831" selection-end-column="19" />
+              <folding>
+                <marker date="1524014269334" expanded="true" signature="58688:58748" ph="SELECT COUNT... ${DB::table($tablename)}" />
+                <marker date="1524014269334" expanded="true" signature="64467:64545" ph="SELECT table... ${DB::table('forum_attachment')}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="Git.Settings">
@@ -32,6 +46,7 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/portal.php" />
+        <option value="$PROJECT_DIR$/source/function/function_core.php" />
       </list>
     </option>
   </component>
@@ -138,12 +153,12 @@
       <workItem from="1523803974605" duration="1880000" />
       <workItem from="1523837427247" duration="3230000" />
       <workItem from="1523925697036" duration="97000" />
-      <workItem from="1524012151662" duration="1929000" />
+      <workItem from="1524012151662" duration="1980000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14443000" />
+    <option name="totallyTimeSpent" value="14494000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -356,13 +371,6 @@
         </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="-3787">
-          <caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/template/default/portal/portalcp_index.htm">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1596">
@@ -555,10 +563,21 @@
     <entry file="file://$PROJECT_DIR$/portal.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="806">
-          <caret line="30" column="14" lean-forward="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+          <caret line="30" column="20" lean-forward="false" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
           <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="562">
+          <caret line="831" column="19" lean-forward="false" selection-start-line="831" selection-start-column="19" selection-end-line="831" selection-end-column="19" />
+          <folding>
+            <marker date="1524014269334" expanded="true" signature="58688:58748" ph="SELECT COUNT... ${DB::table($tablename)}" />
+            <marker date="1524014269334" expanded="true" signature="64467:64545" ph="SELECT table... ${DB::table('forum_attachment')}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 0 - 1
portal.php

xqd
@@ -28,7 +28,6 @@ runhooks();
 
 $navtitle = str_replace('{bbname}', $_G['setting']['bbname'], $_G['setting']['seotitle']['portal']);
 $_G['disabledwidthauto'] = 1;
-print_r('ok');
 require_once libfile('portal/'.$_GET['mod'], 'module');
 
 ?>

+ 1 - 0
source/function/function_core.php

xqd
@@ -829,6 +829,7 @@ function libfile($libname, $folder = '') {
 	} else {
 		$path = "{$libpath}/{$libname}";
 	}
+	print_r($path);
 	return preg_match('/^[\w\d\/_]+$/i', $path) ? realpath(DISCUZ_ROOT.$path.'.php') : false;
 }