Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions

reformatting config

Browse Source
This commit is contained in:
Mike Schwörer 2014-05-14 23:55:44 +02:00
parent 3bba1068fa
commit dec918c268
4 changed files with 267 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

261
.idea/workspace.xml generated
View File

@ -2,13 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment=""> <list default="true" id="802a3fea-d257-43f4-acd0-825667875110" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/frameworkRootSettings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
</list> </list>
<ignored path="www.mikescher.de.iws" /> <ignored path="www.mikescher.de.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -62,7 +62,17 @@
</favorites_list> </favorites_list>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf /> <leaf>
<file leaf-file-name="main.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="67" column="66" selection-start="1387" selection-end="1387" vertical-scroll-proportion="-0.16112085" vertical-offset="1231" max-vertical-offset="1802">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
<FindUsagesManager> <FindUsagesManager>
@ -76,7 +86,6 @@
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/www/index.php" /> <option value="$PROJECT_DIR$/www/index.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
<option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" /> <option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" />
<option value="$PROJECT_DIR$/www/protected/views/site/index.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
<option value="$PROJECT_DIR$/www/css/styles.css" /> <option value="$PROJECT_DIR$/www/css/styles.css" />
@ -84,6 +93,9 @@
<option value="$PROJECT_DIR$/www/protected/views/site/about.php" /> <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
<option value="$PROJECT_DIR$/www/protected/models/SendMailForm.php" /> <option value="$PROJECT_DIR$/www/protected/models/SendMailForm.php" />
<option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" /> <option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/dev.php" />
<option value="$PROJECT_DIR$/www/protected/config/env/prod.php" />
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
</list> </list>
</option> </option>
</component> </component>
@ -334,6 +346,32 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="www" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="protected" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="config" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="env" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="www.mikescher.de" /> <option name="myItemId" value="www.mikescher.de" />
@ -417,9 +455,9 @@
<method /> <method />
</configuration> </configuration>
<list size="4"> <list size="4">
<item index="0" class="java.lang.String" itemvalue="JavaScript Debug.index.php" /> <item index="0" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - Index" />
<item index="1" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - Index" /> <item index="1" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - About" />
<item index="2" class="java.lang.String" itemvalue="PHP HTTP Request.www.mikescher.de - About" /> <item index="2" class="java.lang.String" itemvalue="JavaScript Debug.index.php" />
<item index="3" class="java.lang.String" itemvalue="PHP Script.index.php" /> <item index="3" class="java.lang.String" itemvalue="PHP Script.index.php" />
</list> </list>
<recent_temporary> <recent_temporary>
@ -456,8 +494,8 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="55" y="-8" width="1873" height="1096" extended-state="6" /> <frame x="55" y="-8" width="1873" height="1096" extended-state="7" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="11" side_tool="false" content_ui="tabs" />
@ -465,20 +503,20 @@
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24958678" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Framework" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294766" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19614325" 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" weight="0.1983471" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39766702" sideWeight="0.4997245" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2214876" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39766702" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33793837" sideWeight="0.5002755" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33828208" sideWeight="0.4997245" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33793837" sideWeight="0.4997245" order="2" 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" weight="0.33" sideWeight="0.5" order="10" 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" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32943678" sideWeight="0.4997245" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="PHP-CGI Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.UiProperties"> <component name="Vcs.Log.UiProperties">
@ -503,13 +541,49 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php"> <entry file="file://$PROJECT_DIR$/framework/yiilite.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="17" column="49" selection-start="564" selection-end="564" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1734"> <state line="56" column="27" selection-start="2001" selection-end="2001" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="176987">
<folding>
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="SELECT MAX(`..." />
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="UPDATE sqlit..." />
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="SELECT DISTI..sqlite_master..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="23" selection-start="536" selection-end="536" vertical-scroll-proportion="0.0" vertical-offset="561" max-vertical-offset="680" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php">
<provider selected="true" editor-type-id="text-editor">
<state line="708" column="0" selection-start="24111" selection-end="24111" vertical-scroll-proportion="0.0" vertical-offset="12036" max-vertical-offset="16932">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="27" selection-start="140" selection-end="140" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1343" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="18" selection-start="120" selection-end="131" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1564" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="28" selection-start="74" selection-end="74" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="544" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="49" selection-start="564" selection-end="564" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1734" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/yiilite.php"> <entry file="file://$PROJECT_DIR$/framework/yiilite.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="56" column="27" selection-start="2001" selection-end="2001" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="176987"> <state line="56" column="27" selection-start="2001" selection-end="2001" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="176987">
@ -523,9 +597,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css"> <entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="33" column="23" selection-start="536" selection-end="536" vertical-scroll-proportion="0.0" vertical-offset="561" max-vertical-offset="680"> <state line="33" column="23" selection-start="536" selection-end="536" vertical-scroll-proportion="0.0" vertical-offset="139" max-vertical-offset="680" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php"> <entry file="file://$PROJECT_DIR$/framework/base/CApplication.php">
@ -537,80 +609,17 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="10" column="27" selection-start="140" selection-end="140" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1343"> <state line="10" column="27" selection-start="140" selection-end="140" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1343" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="10" column="18" selection-start="120" selection-end="131" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1564"> <state line="10" column="18" selection-start="120" selection-end="131" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1564" />
<folding>
<marker date="1400057846386" expanded="true" signature="-1:-1" placeholder="SELECT * FRO..programme..." />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="4" column="28" selection-start="74" selection-end="74" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="544"> <state line="4" column="28" selection-start="74" selection-end="74" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="544" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="49" selection-start="564" selection-end="564" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1734">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/yiilite.php">
<provider selected="true" editor-type-id="text-editor">
<state line="56" column="27" selection-start="2001" selection-end="2001" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="176987">
<folding>
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="SELECT MAX(`..." />
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="UPDATE sqlit..." />
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="SELECT DISTI..sqlite_master..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="23" selection-start="536" selection-end="536" vertical-scroll-proportion="0.0" vertical-offset="139" max-vertical-offset="680">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php">
<provider selected="true" editor-type-id="text-editor">
<state line="708" column="0" selection-start="24111" selection-end="24111" vertical-scroll-proportion="0.0" vertical-offset="12036" max-vertical-offset="16932">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="27" selection-start="140" selection-end="140" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1343">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="18" selection-start="120" selection-end="131" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1564">
<folding>
<marker date="1400057846386" expanded="true" signature="-1:-1" placeholder="SELECT * FRO..programme..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="4" column="28" selection-start="74" selection-end="74" vertical-scroll-proportion="0.0" vertical-offset="68" max-vertical-offset="544">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/demos/default/index.php"> <entry file="file://$PROJECT_DIR$/demos/default/index.php">
@ -620,9 +629,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="72" column="2" selection-start="1954" selection-end="1954" vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="1632"> <state line="72" column="2" selection-start="1954" selection-end="1954" vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="1632" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
@ -642,11 +649,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="45" column="27" selection-start="1002" selection-end="1002" vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="1513"> <state line="45" column="27" selection-start="1002" selection-end="1002" vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="1513" />
<folding>
<marker date="1400057846386" expanded="true" signature="-1:-1" placeholder="SELECT * FRO..programme..." />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/index.php"> <entry file="file://$PROJECT_DIR$/www/index.php">
@ -659,11 +662,6 @@
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="598" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="598" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="714" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/demos/blog/protected/views/site/login.php"> <entry file="file://$PROJECT_DIR$/demos/blog/protected/views/site/login.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="884" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="884" />
@ -709,11 +707,6 @@
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.9475728" vertical-offset="488" max-vertical-offset="2176" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.9475728" vertical-offset="488" max-vertical-offset="2176" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="58" column="34" selection-start="1342" selection-end="1342" vertical-scroll-proportion="-37.923077" vertical-offset="0" max-vertical-offset="1666" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/demos/default/index.php"> <entry file="file://$PROJECT_DIR$/demos/default/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="605" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="605" />
@ -746,9 +739,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/css/styles.css"> <entry file="file://$PROJECT_DIR$/www/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="33" column="23" selection-start="536" selection-end="536" vertical-scroll-proportion="1.0369686" vertical-offset="0" max-vertical-offset="680"> <state line="33" column="23" selection-start="536" selection-end="536" vertical-scroll-proportion="1.0369686" vertical-offset="0" max-vertical-offset="680" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/base/CApplication.php"> <entry file="file://$PROJECT_DIR$/framework/base/CApplication.php">
@ -760,25 +751,17 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/site/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="10" column="18" selection-start="120" selection-end="131" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1564"> <state line="10" column="18" selection-start="120" selection-end="131" vertical-scroll-proportion="0.0" vertical-offset="170" max-vertical-offset="1564" />
<folding>
<marker date="1400057846386" expanded="true" signature="-1:-1" placeholder="SELECT * FRO..programme..." />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php"> <entry file="file://$PROJECT_DIR$/framework/web/helpers/CHtml.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1987" column="27" selection-start="82594" selection-end="82594" vertical-scroll-proportion="-4.076923" vertical-offset="33554" max-vertical-offset="44438"> <state line="1987" column="27" selection-start="82594" selection-end="82594" vertical-scroll-proportion="-4.076923" vertical-offset="33554" max-vertical-offset="44438" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="56" column="102" selection-start="1846" selection-end="1879" vertical-scroll-proportion="-11.115385" vertical-offset="663" max-vertical-offset="1734"> <state line="56" column="102" selection-start="1846" selection-end="1879" vertical-scroll-proportion="-11.115385" vertical-offset="663" max-vertical-offset="1734" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
@ -790,19 +773,12 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbActiveForm.php"> <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbActiveForm.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="46" column="30" selection-start="1287" selection-end="1287" vertical-scroll-proportion="1.1201551" vertical-offset="102" max-vertical-offset="10948"> <state line="46" column="30" selection-start="1287" selection-end="1287" vertical-scroll-proportion="1.1201551" vertical-offset="102" max-vertical-offset="10948" />
<folding>
<element signature="n#error#0;n#TbActiveForm#0;n#!!top" expanded="false" />
<element signature="n#errorSummary#0;n#TbActiveForm#0;n#!!top" expanded="false" />
</folding>
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php"> <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="52" column="31" selection-start="1510" selection-end="1510" vertical-scroll-proportion="-13.307693" vertical-offset="538" max-vertical-offset="1530"> <state line="52" column="31" selection-start="1510" selection-end="1510" vertical-scroll-proportion="-13.307693" vertical-offset="538" max-vertical-offset="1530" />
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/standard_7.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/standard_7.php">
@ -814,14 +790,17 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php"> <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="41" column="43" selection-start="817" selection-end="817" vertical-scroll-proportion="0.56007755" vertical-offset="408" max-vertical-offset="1105"> <state line="41" column="43" selection-start="817" selection-end="817" vertical-scroll-proportion="0.56007755" vertical-offset="408" max-vertical-offset="1105" />
<folding /> </provider>
</state> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/SendMailForm.php">
<provider selected="true" editor-type-id="text-editor">
<state line="53" column="8" selection-start="1116" selection-end="1116" vertical-scroll-proportion="1.4612403" vertical-offset="147" max-vertical-offset="1088" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/framework/yiilite.php"> <entry file="file://$PROJECT_DIR$/framework/yiilite.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="3447" column="20" selection-start="102918" selection-end="102918" vertical-scroll-proportion="0.3499006" vertical-offset="58083" max-vertical-offset="176647"> <state line="111" column="27" selection-start="3353" selection-end="3353" vertical-scroll-proportion="1.1153846" vertical-offset="1576" max-vertical-offset="176647">
<folding> <folding>
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="SELECT MAX(`..." /> <marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="SELECT MAX(`..." />
<marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="UPDATE sqlit..." /> <marker date="1376266513000" expanded="true" signature="-1:-1" placeholder="UPDATE sqlit..." />
@ -830,9 +809,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/www/protected/models/SendMailForm.php"> <entry file="file://$PROJECT_DIR$/www/protected/config/env/prod.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="53" column="8" selection-start="1116" selection-end="1116" vertical-scroll-proportion="1.4612403" vertical-offset="147" max-vertical-offset="1088"> <state line="28" column="40" selection-start="600" selection-end="600" vertical-scroll-proportion="0.92248064" vertical-offset="0" max-vertical-offset="612">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/env/dev.php">
<provider selected="true" editor-type-id="text-editor">
<state line="33" column="8" selection-start="603" selection-end="603" vertical-scroll-proportion="1.0872093" vertical-offset="0" max-vertical-offset="850">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
<provider selected="true" editor-type-id="text-editor">
<state line="67" column="66" selection-start="1387" selection-end="1387" vertical-scroll-proportion="-0.16112085" vertical-offset="1231" max-vertical-offset="1802">
<folding /> <folding />
</state> </state>
</provider> </provider>

40
www/protected/config/env/dev.php vendored
View File

@ -1,37 +1,45 @@
<?php <?php
return array( return [
'components'=>array( 'components' =>
'db'=>array( [
'db' =>
[
'connectionString' => 'mysql:host=localhost;dbname=db451718', 'connectionString' => 'mysql:host=localhost;dbname=db451718',
'username' => 'root', 'username' => 'root',
'password' => '', 'password' => '',
'enableProfiling' => true, 'enableProfiling' => true,
'enableParamLogging' => true, 'enableParamLogging' => true,
'charset' => 'utf8', 'charset' => 'utf8',
), //'emulatePrepare'=>true, // needed by some MySQL installations
'schemaCachingDuration' => 3600, // Performance with AR's
],
'errorHandler'=>array( 'errorHandler' =>
[
'errorAction' => 'site/error', 'errorAction' => 'site/error',
), ],
), ],
'params' => array( 'params' =>
[
'yii.debug' => true, 'yii.debug' => true,
'yii.traceLevel' => 3, 'yii.traceLevel' => 3,
'yii.handleErrors' => true, 'yii.handleErrors' => true,
), ],
'modules'=>array( 'modules' =>
'gii'=>array( [
'gii' =>
[
'class' => 'system.gii.GiiModule', 'class' => 'system.gii.GiiModule',
'generatorPaths' => array('bootstrap.gii'), 'generatorPaths' => ['bootstrap.gii'],
'password' => 'giipw', 'password' => 'giipw',
'ipFilters'=>array('127.0.0.1','::1'), 'ipFilters' => ['127.0.0.1', '::1'],
), ],
), ],
); ];

26
www/protected/config/env/prod.php vendored
View File

@ -1,25 +1,31 @@
<?php <?php
return array( return [
'components' => array( 'components' =>
'db' => array( [
'db' =>
[
'connectionString' => 'mysql:host=rdbms.strato.de;dbname=DB451718', 'connectionString' => 'mysql:host=rdbms.strato.de;dbname=DB451718',
'username' => 'U451718', 'username' => 'U451718',
'password' => 'Datenbank', 'password' => 'Datenbank',
'enableProfiling' => false, 'enableProfiling' => false,
'enableParamLogging' => false, 'enableParamLogging' => false,
'charset' => 'utf8', 'charset' => 'utf8',
), 'emulatePrepare' => true, // needed by some MySQL installations
'schemaCachingDuration' => 3600, // Performance with AR's
],
'errorHandler'=>array( 'errorHandler' =>
[
'errorAction' => 'site/error', 'errorAction' => 'site/error',
), ],
), ],
'params' => array( 'params' =>
[
'yii.debug' => false, 'yii.debug' => false,
'yii.traceLevel' => 3, 'yii.traceLevel' => 3,
'yii.handleErrors' => false, 'yii.handleErrors' => false,
) ],
); ];

80
www/protected/config/main.php
View File

@ -9,52 +9,63 @@
require_once('protected/lib/ArrayX.php'); require_once('protected/lib/ArrayX.php');
use Yiinitializr\Helpers\ArrayX; use Yiinitializr\Helpers\ArrayX;
return ArrayX::merge(array( return ArrayX::merge(
[
'basePath' => dirname(__FILE__) . DIRECTORY_SEPARATOR . '..', 'basePath' => dirname(__FILE__) . DIRECTORY_SEPARATOR . '..',
'name' => 'Mikescher.de', 'name' => 'Mikescher.de',
// preloading 'log' component // preloading 'log' component
'preload'=>array('log'), 'preload' =>
[
'log'
],
'aliases' => array( 'aliases' =>
[
'bootstrap' => realpath(__DIR__ . '/../extensions/bootstrap'), // change this if necessary 'bootstrap' => realpath(__DIR__ . '/../extensions/bootstrap'), // change this if necessary
), ],
// autoloading model and component classes // autoloading model and component classes
'import'=>array( 'import' =>
[
'application.models.*', 'application.models.*',
'application.components.*', 'application.components.*',
'bootstrap.components.*', 'bootstrap.components.*',
'bootstrap.behaviors.*', 'bootstrap.behaviors.*',
'bootstrap.helpers.*', 'bootstrap.helpers.*',
],
), 'modules' =>
[
'modules'=>array(
// //
), ],
// application components // application components
'components'=>array( 'components' =>
'bootstrap' => array( [
'bootstrap' =>
[
'class' => 'bootstrap.components.TbApi', 'class' => 'bootstrap.components.TbApi',
), ],
'user'=>array( 'user' =>
[
// enable cookie-based authentication // enable cookie-based authentication
'allowAutoLogin' => true, 'allowAutoLogin' => true,
), ],
// uncomment the following to enable URLs in path-format // uncomment the following to enable URLs in path-format
'urlManager'=>array( 'urlManager' =>
[
'urlFormat' => 'path', 'urlFormat' => 'path',
'caseSensitive' => false, 'caseSensitive' => false,
'showScriptName' => true, 'showScriptName' => true,
'rules'=>array( 'rules' =>
[
'' => 'site/index', '' => 'site/index',
'<action:(index|about)>' => 'site/<action>', '<action:\w+>' => 'site/<action>',
'gii' => 'gii', 'gii' => 'gii',
'gii/<controller:\w+>' => 'gii/<controller>', 'gii/<controller:\w+>' => 'gii/<controller>',
@ -62,32 +73,29 @@ return ArrayX::merge(array(
//'<controller:\w+>/<id:\d+>' => '<controller>/view', //'<controller:\w+>/<id:\d+>' => '<controller>/view',
//'<controller:\w+>/<action:\w+>/<id:\d+>' => '<controller>/<action>', //'<controller:\w+>/<action:\w+>/<id:\d+>' => '<controller>/<action>',
// '<controller:\w+>/<action:\w+>' => '<controller>/<action>', '<controller:\w+>/<action:\w+>' => '<controller>/<action>',
), ],
), ],
'log'=>array( 'log' =>
[
'class' => 'CLogRouter', 'class' => 'CLogRouter',
'routes'=>array( 'routes' =>
array( [
[
'class' => 'CFileLogRoute', 'class' => 'CFileLogRoute',
'levels' => 'error, warning', 'levels' => 'error, warning',
), ],
// uncomment the following to show log messages on web pages ],
/* ],
array( ],
'class'=>'CWebLogRoute',
),
*/
),
),
),
// application-level parameters that can be accessed // application-level parameters that can be accessed
// using Yii::app()->params['paramName'] // using Yii::app()->params['paramName']
'params'=>array( 'params' =>
[
// this is used in contact page // this is used in contact page
'adminEmail' => 'webmaster@example.com', 'adminEmail' => 'webmaster@example.com',
), ],
), require_once('env/' . YII_CUSTOM_ENV . '.php')); ], require_once('env/' . YII_CUSTOM_ENV . '.php'));