From ce723d07d2ac4188c26262c564160ad46c05d9f0 Mon Sep 17 00:00:00 2001
From: lopar <lopar.4ever@gmail.com>
Date: Sun, 28 Jan 2018 20:29:41 +0200
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?=
 =?UTF-8?q?=20=D1=82=D0=B5=D1=81=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 381 ++++++++++++++++++++++++++++++++++++++++++--
 test.php            |  66 ++------
 2 files changed, 379 insertions(+), 68 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39c6df7..0fcb425 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="099ac1fa-d110-4265-9475-c5ca8779a3f9" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/battles-game.iml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/composerJson.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="" />
+    <list default="true" id="099ac1fa-d110-4265-9475-c5ca8779a3f9" name="Default" comment="Правки в тестах">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.php" afterPath="$PROJECT_DIR$/test.php" />
     </list>
+    <ignored path=".idea/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -15,14 +13,138 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_TABLE_DETAILS" value="true" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <expand />
+    <select />
+  </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="test.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="593">
+              <caret line="73" column="59" lean-forward="false" selection-start-line="73" selection-start-column="59" selection-end-line="73" selection-end-column="59" />
+              <folding>
+                <marker date="1517164167710" expanded="true" signature="800:822" ph="SELECT * FRO... lichka" />
+                <marker date="1517164167710" expanded="true" signature="1215:1238" ph="SELECT * FRO... paldelo" />
+                <marker date="1517164167710" expanded="true" signature="2720:2757" ph="SELECT * FRO... users" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="153">
+              <caret line="9" column="8" lean-forward="false" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
+              <folding>
+                <marker date="1517151067399" expanded="true" signature="1294:1345" ph="SELECT * FRO... aligns" />
+                <marker date="1517151067399" expanded="true" signature="1842:2077" ph="INSERT INTO `aligns`... " />
+                <marker date="1517151067399" expanded="true" signature="2284:2356" ph="SELECT `id`,... users" />
+                <marker date="1517151067399" expanded="true" signature="2954:3277" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="3880:3919" ph="SELECT * FRO... aligns" />
+                <marker date="1517151067399" expanded="true" signature="8182:8214" ph="SELECT * FRO... reg_klan" />
+                <marker date="1517151067399" expanded="true" signature="8877:9003" ph="INSERT INTO `clans`... " />
+                <marker date="1517151067399" expanded="true" signature="9894:9932" ph="DELETE FROM " />
+                <marker date="1517151067399" expanded="true" signature="9995:10039" ph="SELECT `id` clans" />
+                <marker date="1517151067399" expanded="true" signature="10122:10157" ph="SELECT FROM `users`... " />
+                <marker date="1517151067399" expanded="true" signature="10216:10293" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="10349:10362" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="10948:10986" ph="DELETE FROM " />
+                <marker date="1517151067399" expanded="true" signature="11143:11178" ph="SELECT FROM `users`... " />
+                <marker date="1517151067399" expanded="true" signature="11704:11769" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="12027:12051" ph="SELECT * FRO... reg_klan" />
+                <marker date="1517151067399" expanded="true" signature="12414:12451" ph="SELECT * FRO... users" />
+                <marker date="1517151067399" expanded="true" signature="12532:12570" ph="DELETE FROM " />
+                <marker date="1517151067399" expanded="true" signature="13168:13174" ph=" " />
+                <marker date="1517151067399" expanded="true" signature="13246:13252" ph=" " />
+                <marker date="1517151067399" expanded="true" signature="19907:21701" ph="insert into shop... " />
+                <marker date="1517151067399" expanded="true" signature="21835:23587" ph="insert into fshop... " />
+                <marker date="1517151067399" expanded="true" signature="23738:25533" ph="insert into ashop... " />
+                <marker date="1517151067399" expanded="true" signature="33102:33108" ph=" " />
+                <marker date="1517151067399" expanded="true" signature="36918:36982" ph="select `id` users" />
+                <marker date="1517151067399" expanded="true" signature="37002:37088" ph="update `user... " />
+                <marker date="1517151067399" expanded="true" signature="37314:37384" ph="SELECT `id`,... users" />
+                <marker date="1517151067399" expanded="true" signature="37474:37558" ph="SELECT `time... effects" />
+                <marker date="1517151067399" expanded="true" signature="37766:37782" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="37861:37874" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="38018:38089" ph="SELECT `ip`,... users" />
+                <marker date="1517151067399" expanded="true" signature="38123:38213" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="38835:38925" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="38972:39079" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="39620:39687" ph="SELECT owner... bank" />
+                <marker date="1517151067399" expanded="true" signature="39761:39848" ph="UPDATE `bank... " />
+                <marker date="1517151067399" expanded="true" signature="39874:40034" ph="INSERT INTO `dilerdelo`... " />
+                <marker date="1517151067399" expanded="true" signature="40058:40264" ph="INSERT INTO `delo`... " />
+                <marker date="1517151067399" expanded="true" signature="40306:40391" ph="UPDATE `user... " />
+                <marker date="1517151067399" expanded="true" signature="42510:42586" ph="SELECT login... users" />
+                <marker date="1517151067399" expanded="true" signature="42619:42680" ph="SELECT owner... bank" />
+                <marker date="1517151067399" expanded="true" signature="42924:42995" ph="SELECT owner... bank" />
+                <marker date="1517151067399" expanded="true" signature="43046:43114" ph="SELECT login... users" />
+                <marker date="1517151067399" expanded="true" signature="44350:45369" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="44354:44604" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="44368:44594" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="44386:44589" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="44608:45361" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="44612:44915" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="44630:44910" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45052:45351" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45070:45346" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45429:46445" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45433:45680" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45447:45670" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45465:45665" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45684:46437" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45688:45991" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="45706:45986" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="46128:46427" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="46146:46422" ph="..." />
+                <marker date="1517151067399" expanded="true" signature="46533:46619" ph="SELECT `logi... users" />
+                <marker date="1517151067399" expanded="true" signature="46868:46977" ph="SELECT * FRO... dilerdelo" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/test.php" />
+      </list>
+    </option>
+  </component>
   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsFlowSettings">
+    <service-enabled>true</service-enabled>
+    <exe-path />
+    <annotation-enable>false</annotation-enable>
+    <other-services-enabled>true</other-services-enabled>
+    <auto-save>true</auto-save>
+  </component>
   <component name="JsGulpfileManager">
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
@@ -50,6 +172,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -61,14 +184,17 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="C:/Program Files/Git/bin/git.exe" />
-    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/.gitignore" />
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.vagrant" />
+    <property name="node.js.path.for.package.stylelint" value="project" />
+    <property name="node.js.detected.package.stylelint" value="true" />
+    <property name="node.js.selected.package.stylelint" value="" />
+    <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -85,6 +211,13 @@
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
   </component>
+  <component name="SshConsoleOptionsProvider">
+    <option name="myEncoding" value="UTF-8" />
+    <option name="myConnectionType" value="NONE" />
+  </component>
+  <component name="SvnConfiguration" myUseAcceleration="nothing">
+    <configuration>C:\Users\lopiu\AppData\Roaming\Subversion</configuration>
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="099ac1fa-d110-4265-9475-c5ca8779a3f9" name="Default" comment="" />
@@ -93,20 +226,32 @@
       <option name="presentableId" value="Default" />
       <updated>1517154442513</updated>
       <workItem from="1517155484792" duration="3554000" />
-      <workItem from="1517161672963" duration="28000" />
+      <workItem from="1517161672963" duration="170000" />
+      <workItem from="1517161857804" duration="1618000" />
     </task>
+    <task id="LOCAL-00001" summary="Remove IDE files">
+      <created>1517161745193</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1517161745193</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3582000" />
+    <option name="totallyTimeSpent" value="5342000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" 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="true" show_stripe_button="true" weight="0.16190477" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969433" sideWeight="0.5" order="-1" 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.32969433" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969433" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969433" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" 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="1" side_tool="false" content_ui="tabs" />
@@ -132,12 +277,107 @@
     <ignored-roots>
       <path value="$PROJECT_DIR$" />
     </ignored-roots>
+    <MESSAGE value="Remove IDE files" />
+    <MESSAGE value="Правки в тестах" />
+    <option name="LAST_COMMIT_MESSAGE" value="Правки в тестах" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/test.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="425">
+          <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+          <folding>
+            <marker date="1517164167710" expanded="true" signature="800:822" ph="SELECT * FRO... lichka" />
+            <marker date="1517164167710" expanded="true" signature="1215:1238" ph="SELECT * FRO... paldelo" />
+            <marker date="1517164167710" expanded="true" signature="2720:2757" ph="SELECT * FRO... users" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config.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 />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/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="1517151067399" expanded="true" signature="1294:1345" ph="SELECT * FRO... aligns" />
+            <marker date="1517151067399" expanded="true" signature="1842:2077" ph="INSERT INTO `aligns`... " />
+            <marker date="1517151067399" expanded="true" signature="2284:2356" ph="SELECT `id`,... users" />
+            <marker date="1517151067399" expanded="true" signature="2954:3277" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="3880:3919" ph="SELECT * FRO... aligns" />
+            <marker date="1517151067399" expanded="true" signature="8182:8214" ph="SELECT * FRO... reg_klan" />
+            <marker date="1517151067399" expanded="true" signature="8877:9003" ph="INSERT INTO `clans`... " />
+            <marker date="1517151067399" expanded="true" signature="9894:9932" ph="DELETE FROM " />
+            <marker date="1517151067399" expanded="true" signature="9995:10039" ph="SELECT `id` clans" />
+            <marker date="1517151067399" expanded="true" signature="10122:10157" ph="SELECT FROM `users`... " />
+            <marker date="1517151067399" expanded="true" signature="10216:10293" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="10349:10362" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="10948:10986" ph="DELETE FROM " />
+            <marker date="1517151067399" expanded="true" signature="11143:11178" ph="SELECT FROM `users`... " />
+            <marker date="1517151067399" expanded="true" signature="11704:11769" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="12027:12051" ph="SELECT * FRO... reg_klan" />
+            <marker date="1517151067399" expanded="true" signature="12414:12451" ph="SELECT * FRO... users" />
+            <marker date="1517151067399" expanded="true" signature="12532:12570" ph="DELETE FROM " />
+            <marker date="1517151067399" expanded="true" signature="13168:13174" ph=" " />
+            <marker date="1517151067399" expanded="true" signature="13246:13252" ph=" " />
+            <marker date="1517151067399" expanded="true" signature="19907:21701" ph="insert into shop... " />
+            <marker date="1517151067399" expanded="true" signature="21835:23587" ph="insert into fshop... " />
+            <marker date="1517151067399" expanded="true" signature="23738:25533" ph="insert into ashop... " />
+            <marker date="1517151067399" expanded="true" signature="33102:33108" ph=" " />
+            <marker date="1517151067399" expanded="true" signature="36918:36982" ph="select `id` users" />
+            <marker date="1517151067399" expanded="true" signature="37002:37088" ph="update `user... " />
+            <marker date="1517151067399" expanded="true" signature="37314:37384" ph="SELECT `id`,... users" />
+            <marker date="1517151067399" expanded="true" signature="37474:37558" ph="SELECT `time... effects" />
+            <marker date="1517151067399" expanded="true" signature="37766:37782" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="37861:37874" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="38018:38089" ph="SELECT `ip`,... users" />
+            <marker date="1517151067399" expanded="true" signature="38123:38213" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="38835:38925" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="38972:39079" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="39620:39687" ph="SELECT owner... bank" />
+            <marker date="1517151067399" expanded="true" signature="39761:39848" ph="UPDATE `bank... " />
+            <marker date="1517151067399" expanded="true" signature="39874:40034" ph="INSERT INTO `dilerdelo`... " />
+            <marker date="1517151067399" expanded="true" signature="40058:40264" ph="INSERT INTO `delo`... " />
+            <marker date="1517151067399" expanded="true" signature="40306:40391" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="42510:42586" ph="SELECT login... users" />
+            <marker date="1517151067399" expanded="true" signature="42619:42680" ph="SELECT owner... bank" />
+            <marker date="1517151067399" expanded="true" signature="42924:42995" ph="SELECT owner... bank" />
+            <marker date="1517151067399" expanded="true" signature="43046:43114" ph="SELECT login... users" />
+            <marker date="1517151067399" expanded="true" signature="44350:45369" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44354:44604" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44368:44594" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44386:44589" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44608:45361" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44612:44915" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44630:44910" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45052:45351" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45070:45346" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45429:46445" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45433:45680" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45447:45670" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45465:45665" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45684:46437" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45688:45991" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45706:45986" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="46128:46427" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="46146:46422" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="46533:46619" ph="SELECT `logi... users" />
+            <marker date="1517151067399" expanded="true" signature="46868:46977" ph="SELECT * FRO... dilerdelo" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/11city.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -290,5 +530,120 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/admin.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="8" lean-forward="false" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
+          <folding>
+            <marker date="1517151067399" expanded="true" signature="1294:1345" ph="SELECT * FRO... aligns" />
+            <marker date="1517151067399" expanded="true" signature="1842:2077" ph="INSERT INTO `aligns`... " />
+            <marker date="1517151067399" expanded="true" signature="2284:2356" ph="SELECT `id`,... users" />
+            <marker date="1517151067399" expanded="true" signature="2954:3277" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="3880:3919" ph="SELECT * FRO... aligns" />
+            <marker date="1517151067399" expanded="true" signature="8182:8214" ph="SELECT * FRO... reg_klan" />
+            <marker date="1517151067399" expanded="true" signature="8877:9003" ph="INSERT INTO `clans`... " />
+            <marker date="1517151067399" expanded="true" signature="9894:9932" ph="DELETE FROM " />
+            <marker date="1517151067399" expanded="true" signature="9995:10039" ph="SELECT `id` clans" />
+            <marker date="1517151067399" expanded="true" signature="10122:10157" ph="SELECT FROM `users`... " />
+            <marker date="1517151067399" expanded="true" signature="10216:10293" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="10349:10362" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="10948:10986" ph="DELETE FROM " />
+            <marker date="1517151067399" expanded="true" signature="11143:11178" ph="SELECT FROM `users`... " />
+            <marker date="1517151067399" expanded="true" signature="11704:11769" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="12027:12051" ph="SELECT * FRO... reg_klan" />
+            <marker date="1517151067399" expanded="true" signature="12414:12451" ph="SELECT * FRO... users" />
+            <marker date="1517151067399" expanded="true" signature="12532:12570" ph="DELETE FROM " />
+            <marker date="1517151067399" expanded="true" signature="13168:13174" ph=" " />
+            <marker date="1517151067399" expanded="true" signature="13246:13252" ph=" " />
+            <marker date="1517151067399" expanded="true" signature="19907:21701" ph="insert into shop... " />
+            <marker date="1517151067399" expanded="true" signature="21835:23587" ph="insert into fshop... " />
+            <marker date="1517151067399" expanded="true" signature="23738:25533" ph="insert into ashop... " />
+            <marker date="1517151067399" expanded="true" signature="33102:33108" ph=" " />
+            <marker date="1517151067399" expanded="true" signature="36918:36982" ph="select `id` users" />
+            <marker date="1517151067399" expanded="true" signature="37002:37088" ph="update `user... " />
+            <marker date="1517151067399" expanded="true" signature="37314:37384" ph="SELECT `id`,... users" />
+            <marker date="1517151067399" expanded="true" signature="37474:37558" ph="SELECT `time... effects" />
+            <marker date="1517151067399" expanded="true" signature="37766:37782" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="37861:37874" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="38018:38089" ph="SELECT `ip`,... users" />
+            <marker date="1517151067399" expanded="true" signature="38123:38213" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="38835:38925" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="38972:39079" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="39620:39687" ph="SELECT owner... bank" />
+            <marker date="1517151067399" expanded="true" signature="39761:39848" ph="UPDATE `bank... " />
+            <marker date="1517151067399" expanded="true" signature="39874:40034" ph="INSERT INTO `dilerdelo`... " />
+            <marker date="1517151067399" expanded="true" signature="40058:40264" ph="INSERT INTO `delo`... " />
+            <marker date="1517151067399" expanded="true" signature="40306:40391" ph="UPDATE `user... " />
+            <marker date="1517151067399" expanded="true" signature="42510:42586" ph="SELECT login... users" />
+            <marker date="1517151067399" expanded="true" signature="42619:42680" ph="SELECT owner... bank" />
+            <marker date="1517151067399" expanded="true" signature="42924:42995" ph="SELECT owner... bank" />
+            <marker date="1517151067399" expanded="true" signature="43046:43114" ph="SELECT login... users" />
+            <marker date="1517151067399" expanded="true" signature="44350:45369" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44354:44604" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44368:44594" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44386:44589" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44608:45361" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44612:44915" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="44630:44910" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45052:45351" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45070:45346" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45429:46445" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45433:45680" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45447:45670" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45465:45665" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45684:46437" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45688:45991" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="45706:45986" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="46128:46427" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="46146:46422" ph="..." />
+            <marker date="1517151067399" expanded="true" signature="46533:46619" ph="SELECT `logi... users" />
+            <marker date="1517151067399" expanded="true" signature="46868:46977" ph="SELECT * FRO... dilerdelo" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="7" column="19" lean-forward="false" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://table:/6ec904cd/72912c8d-c0e2-4459-bcd8-30de417fde1c/combats_game.lichka">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://src:table:/6ec904cd/72912c8d-c0e2-4459-bcd8-30de417fde1c/combats_game.lichka">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/72912c8d-c0e2-4459-bcd8-30de417fde1c/console.sql">
+      <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 />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="593">
+          <caret line="73" column="59" lean-forward="false" selection-start-line="73" selection-start-column="59" selection-end-line="73" selection-end-column="59" />
+          <folding>
+            <marker date="1517164167710" expanded="true" signature="800:822" ph="SELECT * FRO... lichka" />
+            <marker date="1517164167710" expanded="true" signature="1215:1238" ph="SELECT * FRO... paldelo" />
+            <marker date="1517164167710" expanded="true" signature="2720:2757" ph="SELECT * FRO... users" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/test.php b/test.php
index 66b4be3..9e5dd72 100644
--- a/test.php
+++ b/test.php
@@ -10,18 +10,7 @@
 }
 ?>
 
-<?php
-// Подключаем библиотеку
-require_once('./Database/Mysql.php');
-require_once('./Database/Mysql/Exception.php');
-require_once('./Database/Mysql/Statement.php');
-
-// Подключение к СУБД, выбор кодировки и базы данных.
-$db = Database_Mysql::create('localhost', 'user42163_onli', '1W7y2E8u')
-           ->setCharset('utf8')
-           ->setDatabaseName('user42163_onli');
-
-?>
+<?php require_once('config.php'); ?>
 
 <!DOCTYPE html>
 <html>
@@ -33,20 +22,10 @@ $db = Database_Mysql::create('localhost', 'user42163_onli', '1W7y2E8u')
 
 <?php
 if (isset($_GET['dbshow'])) {
-  define("HOST","localhost");
-  define("USER","user42163_onli");
-  define("PASS","1W7y2E8u");
-  define("DB","user42163_onli");
 
-  $link = mysql_connect(HOST,USER,PASS) or die (mysql_error());  
-          mysql_select_db(DB, $link);
-          mysql_query ("SET NAMES utf8");
-  $sql = "SELECT * FROM `lichka`";
-  // Скармливаем наш запрос MySQL
-  $result = mysql_query($sql) or die(mysql_error() ."<br/>". $sql);
-  // Рисуем табличку
+  $sql = db::c()->query('SELECT * FROM `lichka`')->fetch_assoc();
   $table = "<table border=1 width=100% align=center>\n";
-  while ($row = mysql_fetch_assoc($result))
+  while ($sql)
   {
        $table .= "<tr>\n";
        $table .= "<th>Lichka\n";
@@ -58,18 +37,15 @@ if (isset($_GET['dbshow'])) {
   }
   $table .= "</table><p>\n";
 
-  $sql2 = "SELECT * FROM `paldelo`";
-  // Скармливаем наш запрос MySQL
-  $result2 = mysql_query($sql2) or die(mysql_error() ."<br/>". $sql2);
-  // Рисуем табличку
+  $sql2 = db::c()->query('SELECT * FROM `paldelo`')->fetch_assoc();
   $table2 = "<table border=1 width=100% align=center>\n";
-  while ($row2 = mysql_fetch_assoc($result2))
+  while ($sql2)
   {
        $table2 .= "<tr>\n";
        $table2 .= "<th>Paldelo\n";
-       $table2 .= "<td>".$row2['id']."</td>\n";
-       $table2 .= "<td>".$row2['author']."</td>\n";
-       $table2 .= "<td>".$row2['text']."</td>\n";
+       $table2 .= "<td>".$sql2['id']."</td>\n";
+       $table2 .= "<td>".$sql2['author']."</td>\n";
+       $table2 .= "<td>".$sql2['text']."</td>\n";
        
        $table2 .= "</tr>\n";
   }
@@ -80,9 +56,6 @@ if (isset($_GET['dbshow'])) {
 }
 
   if (isset($_GET['phpinfo'])) phpinfo();
-  #echo $asd.' - local test<br>';
-  #echo $GLOBALS['asd'].' - global massive $GLOBALS test<br>';
-  #echo $_GET['asd'].' - $_GET["asd"]';
 
   echo "Склонности: ";
   foreach (glob("i/align_*.{jpg,png,gif}", GLOB_BRACE) as $filename) echo "<img src={$filename} title={$filename}> ";
@@ -98,29 +71,12 @@ if (isset($_GET['dbshow'])) {
   foreach (glob("i/magic/*.{jpg,png,gif}", GLOB_BRACE) as $filename) echo "<img src={$filename} title={$filename}> ";
 
 // Получить все...
-$res = $db->query('SELECT * FROM `users` WHERE `id` = ?i','11263');
+$res = db::c()->query('SELECT * FROM `users` WHERE `id` = ?i',11263)->fetch_assoc();
 // Последовательно получать в виде ассоциативных массивов
-while ($data = $res->fetch_assoc()) print_r($data['id']);
+while ($res) print_r($res['id']);
 echo '<hr>';
-$data = $res->fetch_assoc();
-print_r($data['id']);
+print_r($res['id']);
 
- /*
-function FixTables() {
-  $tables = mysql_query('SHOW TABLES');
-  while ($table = mysql_fetch_array($tables)) {
-    mysql_query('ALTER TABLE `actions` DEFAULT  CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
-    mysql_query('ALTER TABLE `actions` CONVERT TO CHARACTER SET utf8;');
-  }
-  echo "<b> CONVERTED!!! </b>";
-}
-
-if (isset($_GET['dbfix'])) {
-  mysql_connect('localhost', 'user42163_onli', '1W7y2E8u');
-  mysql_select_db('user42163_onli');
-  FixTables();
-}
-*/
 ?>
 
 </body>