|
@@ -3,6 +3,7 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
<list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
|
|
<change beforePath="$PROJECT_DIR$/admin.php" afterPath="$PROJECT_DIR$/admin.php" />
|
|
<change beforePath="$PROJECT_DIR$/admin.php" afterPath="$PROJECT_DIR$/admin.php" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" afterPath="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -119,47 +120,21 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <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">
|
|
<entry file="file://$PROJECT_DIR$/admin.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="512">
|
|
|
|
- <caret line="29" column="7" lean-forward="false" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
|
|
|
|
|
|
+ <state relative-caret-position="481">
|
|
|
|
+ <caret line="28" column="12" lean-forward="true" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="function_admincp.php" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_admincp.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="-802">
|
|
|
|
- <caret line="296" column="9" lean-forward="false" selection-start-line="296" selection-start-column="9" selection-end-line="296" selection-end-column="9" />
|
|
|
|
- <folding>
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="6988:6996" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="8815:8821" ph=" " />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="11408:12516" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="11415:11651" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="11658:12516" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="11690:11920" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="12155:12417" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="12270:12408" ph="{...}" />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="14179:14196" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="16823:16874" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="17180:17193" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="31467:31491" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="31796:31808" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="31860:31873" ph="..." />
|
|
|
|
- <marker date="1523670581543" expanded="true" signature="35123:35133" ph="..." />
|
|
|
|
- </folding>
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- <file leaf-file-name="discuz_admincp.php" pinned="false" current-in-tab="false">
|
|
|
|
|
|
+ <file leaf-file-name="discuz_admincp.php" pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
|
|
<entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="305">
|
|
|
|
- <caret line="278" column="13" lean-forward="false" selection-start-line="278" selection-start-column="13" selection-end-line="278" selection-end-column="13" />
|
|
|
|
|
|
+ <state relative-caret-position="584">
|
|
|
|
+ <caret line="55" column="15" lean-forward="false" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -197,8 +172,8 @@
|
|
<find>checkgroupname</find>
|
|
<find>checkgroupname</find>
|
|
<find>print_r</find>
|
|
<find>print_r</find>
|
|
<find>所属分类</find>
|
|
<find>所属分类</find>
|
|
- <find>upload_icon_banner</find>
|
|
|
|
<find>s_province</find>
|
|
<find>s_province</find>
|
|
|
|
+ <find>upload_icon_banner</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -227,6 +202,7 @@
|
|
<option value="$PROJECT_DIR$/config/config_global.php" />
|
|
<option value="$PROJECT_DIR$/config/config_global.php" />
|
|
<option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
<option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
<option value="$PROJECT_DIR$/admin.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -334,18 +310,18 @@
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
<workItem from="1525275777043" duration="4000" />
|
|
<workItem from="1525275777043" duration="4000" />
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
- <workItem from="1525658293907" duration="5885000" />
|
|
|
|
|
|
+ <workItem from="1525658293907" duration="6002000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="31759000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="31876000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
|
<editor active="true" />
|
|
<editor active="true" />
|
|
<layout>
|
|
<layout>
|
|
- <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="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="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="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="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" />
|
|
<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" />
|
|
@@ -798,18 +774,10 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</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="278" column="13" lean-forward="false" selection-start-line="278" selection-start-column="13" selection-end-line="278" selection-end-column="13" />
|
|
|
|
- <folding />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_admincp.php">
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_admincp.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="-802">
|
|
|
|
- <caret line="296" column="9" lean-forward="false" selection-start-line="296" selection-start-column="9" selection-end-line="296" selection-end-column="9" />
|
|
|
|
|
|
+ <state relative-caret-position="376">
|
|
|
|
+ <caret line="329" column="9" lean-forward="true" selection-start-line="329" selection-start-column="9" selection-end-line="329" selection-end-column="9" />
|
|
<folding>
|
|
<folding>
|
|
<marker date="1523670581543" expanded="true" signature="6988:6996" ph="..." />
|
|
<marker date="1523670581543" expanded="true" signature="6988:6996" ph="..." />
|
|
<marker date="1523670581543" expanded="true" signature="8815:8821" ph=" " />
|
|
<marker date="1523670581543" expanded="true" signature="8815:8821" ph=" " />
|
|
@@ -832,8 +800,16 @@
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/admin.php">
|
|
<entry file="file://$PROJECT_DIR$/admin.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="512">
|
|
|
|
- <caret line="29" column="7" lean-forward="false" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
|
|
|
|
|
|
+ <state relative-caret-position="481">
|
|
|
|
+ <caret line="28" column="12" lean-forward="true" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
|
|
|
|
+ <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="584">
|
|
|
|
+ <caret line="55" column="15" lean-forward="false" selection-start-line="55" selection-start-column="15" selection-end-line="55" selection-end-column="15" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|