test

.idea/workspace.xml

@@ -3,7 +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" />
+      <change beforePath="$PROJECT_DIR$/source/module/portal/portal_index.php" afterPath="$PROJECT_DIR$/source/module/portal/portal_index.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +14,31 @@
   </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="837">
-              <caret line="31" column="51" lean-forward="false" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
+            <state relative-caret-position="605">
+              <caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="portal_index.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="760">
+              <caret line="30" column="38" lean-forward="false" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="helper_makehtml.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/class/helper/helper_makehtml.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="314">
+              <caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" />
               <folding />
             </state>
           </provider>
@@ -47,6 +67,7 @@
       <list>
         <option value="$PROJECT_DIR$/source/function/function_core.php" />
         <option value="$PROJECT_DIR$/portal.php" />
+        <option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
       </list>
     </option>
   </component>
@@ -97,18 +118,14 @@
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="plugin" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="module" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
             <path>
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
-              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="wfdsoft_jiaohu" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="source" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="module" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="portal" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
           </expand>
           <select />
@@ -153,12 +170,12 @@
       <workItem from="1523803974605" duration="1880000" />
       <workItem from="1523837427247" duration="3230000" />
       <workItem from="1523925697036" duration="97000" />
-      <workItem from="1524012151662" duration="2110000" />
+      <workItem from="1524012151662" duration="2225000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14624000" />
+    <option name="totallyTimeSpent" value="14739000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -195,13 +212,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/admin.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="18" column="46" lean-forward="true" selection-start-line="18" selection-start-column="46" selection-end-line="18" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/plugin/baidusubmit/table/table_baidusubmit_setting.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1333">
@@ -385,13 +395,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="961">
-          <caret line="31" column="18" lean-forward="true" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/template/default/portal/index.htm">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -573,8 +576,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/portal.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="837">
-          <caret line="31" column="51" lean-forward="false" selection-start-line="31" selection-start-column="51" selection-end-line="31" selection-end-column="51" />
+        <state relative-caret-position="605">
+          <caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/class/helper/helper_makehtml.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="314">
+          <caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/portal/portal_index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="760">
+          <caret line="30" column="38" lean-forward="false" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
           <folding />
         </state>
       </provider>

portal.php

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

source/module/portal/portal_index.php

@@ -28,6 +28,6 @@ if(!$metadescription) {
 if(isset($_G['makehtml'])){
 	helper_makehtml::portal_index();
 }
-
+print_r(template('diy:portal/index'));
 include_once template('diy:portal/index');
 ?>