| xqd
@@ -2,6 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<change beforePath="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" afterPath="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
| xqd
@@ -23,19 +24,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="function_core.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="124">
|
|
|
- <caret line="1429" column="9" lean-forward="false" selection-start-line="1429" selection-start-column="9" selection-end-line="1429" selection-end-column="9" />
|
|
|
- <folding>
|
|
|
- <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
|
|
|
- <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
|
|
|
- </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">
|
| xqd
@@ -58,11 +46,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
|
|
|
+ <file leaf-file-name="config_global.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-914">
|
|
|
- <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="202">
|
|
|
+ <caret line="88" column="35" lean-forward="true" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -88,11 +76,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="discuz_admincp.php" pinned="false" current-in-tab="true">
|
|
|
+ <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="460">
|
|
|
- <caret line="186" column="51" lean-forward="true" selection-start-line="186" selection-start-column="51" selection-end-line="186" selection-end-column="51" />
|
|
|
+ <state relative-caret-position="615">
|
|
|
+ <caret line="191" column="33" lean-forward="true" selection-start-line="191" selection-start-column="33" selection-end-line="191" selection-end-column="33" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -108,6 +96,18 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="admin.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/uc_server/model/admin.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" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1523670583090" expanded="true" signature="1218:1341" ph="SELECT a.*, ${UC_DBTABLEPRE}" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file leaf-file-name="client.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/uc_client/client.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
| xqd
@@ -179,12 +179,12 @@
|
|
|
<option value="$PROJECT_DIR$/source/function/function_forum.php" />
|
|
|
<option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
|
|
|
<option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
|
- <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
<option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
|
<option value="$PROJECT_DIR$/uc_client/client.php" />
|
|
|
<option value="$PROJECT_DIR$/source/function/function_member.php" />
|
|
|
<option value="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
|
|
|
+ <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -235,13 +235,13 @@
|
|
|
<path>
|
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ <item name="uc_server" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="zijia" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
- <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ <item name="uc_server" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
+ <item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
| xqd
@@ -292,18 +292,18 @@
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
|
- <workItem from="1525658293907" duration="7893000" />
|
|
|
+ <workItem from="1525658293907" duration="8300000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="33767000" />
|
|
|
+ <option name="totallyTimeSpent" value="34174000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
| xqd
@@ -335,13 +335,6 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="248">
|
|
|
- <caret line="8" column="13" lean-forward="false" selection-start-line="5" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="4371">
|
| xqd
@@ -760,14 +753,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-914">
|
|
|
- <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/uc_client/client.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="291">
|
| xqd
@@ -778,6 +763,14 @@
|
|
|
</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="615">
|
|
|
+ <caret line="191" column="33" lean-forward="true" selection-start-line="191" selection-start-column="33" selection-end-line="191" selection-end-column="33" />
|
|
|
+ <folding />
|
|
|
+ </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="-160">
|
| xqd
@@ -786,10 +779,20 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/uc_server/model/admin.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" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1523670583090" expanded="true" signature="1218:1341" ph="SELECT a.*, ${UC_DBTABLEPRE}" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="460">
|
|
|
- <caret line="186" column="51" lean-forward="true" selection-start-line="186" selection-start-column="51" selection-end-line="186" selection-end-column="51" />
|
|
|
+ <state relative-caret-position="202">
|
|
|
+ <caret line="88" column="35" lean-forward="true" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|