|
@@ -2,6 +2,8 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<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$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
|
|
|
|
+ <change beforePath="$PROJECT_DIR$/config/config_ucenter.php" afterPath="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
<change beforePath="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" afterPath="$PROJECT_DIR$/source/class/discuz/discuz_admincp.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" />
|
|
@@ -38,8 +40,8 @@
|
|
<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="false">
|
|
<entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
<entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="291">
|
|
|
|
- <caret line="88" column="28" lean-forward="false" selection-start-line="88" selection-start-column="21" selection-end-line="88" selection-end-column="28" />
|
|
|
|
|
|
+ <state relative-caret-position="341">
|
|
|
|
+ <caret line="11" column="42" lean-forward="true" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -48,8 +50,8 @@
|
|
<file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
<entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="527">
|
|
|
|
- <caret line="17" column="46" lean-forward="false" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="46" />
|
|
|
|
|
|
+ <state relative-caret-position="341">
|
|
|
|
+ <caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -68,8 +70,44 @@
|
|
<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="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="589">
|
|
|
|
- <caret line="190" column="21" lean-forward="false" selection-start-line="190" selection-start-column="21" selection-end-line="190" selection-end-column="21" />
|
|
|
|
|
|
+ <state relative-caret-position="333">
|
|
|
|
+ <caret line="197" column="35" lean-forward="false" selection-start-line="197" selection-start-column="35" selection-end-line="197" selection-end-column="35" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </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="314">
|
|
|
|
+ <caret line="148" column="9" lean-forward="false" selection-start-line="148" selection-start-column="9" selection-end-line="148" 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="function_member.php" pinned="false" current-in-tab="false">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_member.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="-151">
|
|
|
|
+ <caret line="67" column="9" lean-forward="false" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -100,15 +138,15 @@
|
|
<find>bannernew_url</find>
|
|
<find>bannernew_url</find>
|
|
<find>创建我的俱乐部</find>
|
|
<find>创建我的俱乐部</find>
|
|
<find>checkgroupname</find>
|
|
<find>checkgroupname</find>
|
|
- <find>print_r</find>
|
|
|
|
<find>所属分类</find>
|
|
<find>所属分类</find>
|
|
<find>s_province</find>
|
|
<find>s_province</find>
|
|
<find>uc_login_check</find>
|
|
<find>uc_login_check</find>
|
|
<find>adminsessions</find>
|
|
<find>adminsessions</find>
|
|
- <find>checkip</find>
|
|
|
|
<find>mysql</find>
|
|
<find>mysql</find>
|
|
<find>upload_icon_banner</find>
|
|
<find>upload_icon_banner</find>
|
|
<find>cookie_status</find>
|
|
<find>cookie_status</find>
|
|
|
|
+ <find>checkip</find>
|
|
|
|
+ <find>print_r</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
</component>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
@@ -134,13 +172,13 @@
|
|
<option value="$PROJECT_DIR$/source/function/function_forum.php" />
|
|
<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$/data/template/3_diy_group_group.tpl.php" />
|
|
<option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
|
|
<option value="$PROJECT_DIR$/source/module/forum/forum_group.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$/uc_client/client.php" />
|
|
<option value="$PROJECT_DIR$/uc_client/client.php" />
|
|
<option value="$PROJECT_DIR$/source/function/function_member.php" />
|
|
<option value="$PROJECT_DIR$/source/function/function_member.php" />
|
|
- <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
|
<option value="$PROJECT_DIR$/config/config_global_default.php" />
|
|
<option value="$PROJECT_DIR$/config/config_global_default.php" />
|
|
<option value="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
|
|
<option value="$PROJECT_DIR$/source/class/discuz/discuz_admincp.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/config/config_global.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/config/config_ucenter.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -248,12 +286,12 @@
|
|
<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="11398000" />
|
|
|
|
|
|
+ <workItem from="1525658293907" duration="12287000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="37272000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="38161000" />
|
|
</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" />
|
|
@@ -661,30 +699,6 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_admincp.php">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <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>
|
|
|
|
- <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>
|
|
|
|
<entry file="file://$PROJECT_DIR$/uc_server/model/admin.php">
|
|
<entry file="file://$PROJECT_DIR$/uc_server/model/admin.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<state relative-caret-position="0">
|
|
@@ -695,60 +709,84 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global_default.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="291">
|
|
|
|
- <caret line="88" column="28" lean-forward="false" selection-start-line="88" selection-start-column="21" selection-end-line="88" selection-end-column="28" />
|
|
|
|
|
|
+ <state relative-caret-position="299">
|
|
|
|
+ <caret line="165" column="43" lean-forward="false" selection-start-line="165" selection-start-column="43" selection-end-line="165" selection-end-column="43" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/config/config_global_default.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/uc_client/client.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="299">
|
|
|
|
- <caret line="165" column="43" lean-forward="false" selection-start-line="165" selection-start-column="43" selection-end-line="165" selection-end-column="43" />
|
|
|
|
|
|
+ <state relative-caret-position="291">
|
|
|
|
+ <caret line="438" column="9" lean-forward="false" selection-start-line="438" selection-start-column="9" selection-end-line="438" selection-end-column="9" />
|
|
|
|
+ <folding>
|
|
|
|
+ <marker date="1525667604306" expanded="true" signature="20811:21455" ph="..." />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/admin.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="233">
|
|
|
|
+ <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>
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_member.php">
|
|
<entry file="file://$PROJECT_DIR$/source/function/function_member.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="-160">
|
|
|
|
|
|
+ <state relative-caret-position="-151">
|
|
<caret line="67" column="9" lean-forward="false" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
|
|
<caret line="67" column="9" lean-forward="false" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/uc_client/client.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="291">
|
|
|
|
- <caret line="438" column="9" lean-forward="false" selection-start-line="438" selection-start-column="9" selection-end-line="438" selection-end-column="9" />
|
|
|
|
|
|
+ <state relative-caret-position="314">
|
|
|
|
+ <caret line="148" column="9" lean-forward="false" selection-start-line="148" selection-start-column="9" selection-end-line="148" selection-end-column="9" />
|
|
<folding>
|
|
<folding>
|
|
- <marker date="1525667604306" expanded="true" signature="20811:21455" 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="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>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="527">
|
|
|
|
- <caret line="17" column="46" lean-forward="false" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="46" />
|
|
|
|
|
|
+ <state relative-caret-position="341">
|
|
|
|
+ <caret line="11" column="42" lean-forward="true" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/admin.php">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="233">
|
|
|
|
- <caret line="28" column="12" lean-forward="true" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
|
|
|
|
|
|
+ <state relative-caret-position="341">
|
|
|
|
+ <caret line="11" column="31" lean-forward="true" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<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="589">
|
|
|
|
- <caret line="190" column="21" lean-forward="false" selection-start-line="190" selection-start-column="21" selection-end-line="190" selection-end-column="21" />
|
|
|
|
|
|
+ <state relative-caret-position="333">
|
|
|
|
+ <caret line="197" column="35" lean-forward="false" selection-start-line="197" selection-start-column="35" selection-end-line="197" selection-end-column="35" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|