| xqd
@@ -2,8 +2,8 @@
|
|
|
<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" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/config/config_global_default.php" afterPath="$PROJECT_DIR$/config/config_global_default.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
| xqd
@@ -36,21 +36,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="area.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="739">
|
|
|
- <caret line="34" column="1" lean-forward="false" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="config_global.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="config_global.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -59,8 +49,8 @@
|
|
|
<file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="620">
|
|
|
- <caret line="20" column="21" lean-forward="true" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
| xqd
@@ -69,7 +59,7 @@
|
|
|
<file leaf-file-name="admin.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/admin.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="481">
|
|
|
+ <state relative-caret-position="-697">
|
|
|
<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>
|
| xqd
@@ -79,13 +69,23 @@
|
|
|
<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="615">
|
|
|
+ <state relative-caret-position="894">
|
|
|
<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>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="config_global_default.php" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global_default.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="361">
|
|
|
+ <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 />
|
|
|
+ </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">
|
| xqd
@@ -124,7 +124,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>create</find>
|
|
|
<find>$parentid</find>
|
|
|
<find>sd wk_sq_sd padding15 backfff</find>
|
|
|
<find>mn wk_f_mn padding15 backfff</find>
|
| xqd
@@ -154,6 +153,7 @@
|
|
|
<find>upload_icon_banner</find>
|
|
|
<find>uc_login_check</find>
|
|
|
<find>mysql</find>
|
|
|
+ <find>checkip</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
| xqd
@@ -185,6 +185,7 @@
|
|
|
<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" />
|
|
|
+ <option value="$PROJECT_DIR$/config/config_global_default.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
| xqd
@@ -292,12 +293,12 @@
|
|
|
<workItem from="1525227575525" duration="11054000" />
|
|
|
<workItem from="1525275777043" duration="4000" />
|
|
|
<workItem from="1525612433789" duration="9986000" />
|
|
|
- <workItem from="1525658293907" duration="8300000" />
|
|
|
+ <workItem from="1525658293907" duration="9080000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="34174000" />
|
|
|
+ <option name="totallyTimeSpent" value="34954000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
|
| xqd
@@ -335,14 +336,6 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="4371">
|
|
|
- <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="3596">
|
| xqd
@@ -737,62 +730,70 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/uc_client/client.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="620">
|
|
|
- <caret line="20" column="21" lean-forward="true" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
|
|
|
- <folding />
|
|
|
+ <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">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/function/function_member.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state relative-caret-position="-160">
|
|
|
+ <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 />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/uc_client/client.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/uc_server/model/admin.php">
|
|
|
<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="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="1525667604306" expanded="true" signature="20811:21455" ph="..." />
|
|
|
+ <marker date="1523670583090" expanded="true" signature="1218:1341" ph="SELECT a.*, ${UC_DBTABLEPRE}" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_ucenter.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" />
|
|
|
+ <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" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/source/function/function_member.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/admin.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-160">
|
|
|
- <caret line="67" column="9" lean-forward="false" selection-start-line="67" selection-start-column="9" selection-end-line="67" selection-end-column="9" />
|
|
|
+ <state relative-caret-position="-697">
|
|
|
+ <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$/uc_server/model/admin.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_admincp.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 relative-caret-position="894">
|
|
|
+ <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$/config/config_global.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <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" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/config/config_global_default.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="361">
|
|
|
+ <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 />
|
|
|
</state>
|
|
|
</provider>
|