--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
- <file url="file://$PROJECT_DIR$/classes/bfw/mvc/view/error/index.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/classes/bfw/mvc/view/footer.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/classes/bfw/mvc/view/header.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/classes/bfw/mvc/view/home/index.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/classes/bfw/mvc/view/layout.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/config/config.php" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/css/main.css" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/classes/bfw/mvc/view/error/index.tpl" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/classes/bfw/mvc/view/footer.tpl" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/classes/bfw/mvc/view/header.tpl" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/classes/bfw/mvc/view/home/index.tpl" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/classes/bfw/mvc/view/layout.tpl" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/config/config.php" charset="UTF-8" />
+ <file url="file://C:/var/www/vhosts/BFW_APP/css/main.css" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/TicketSystem.iml" filepath="$PROJECT_DIR$/.idea/TicketSystem.iml" />
+ <module fileurl="file://$PROJECT_DIR$/../BFW_APP/.idea/TicketSystem.iml" filepath="$PROJECT_DIR$/../BFW_APP/.idea/TicketSystem.iml" />
</modules>
</component>
</project>
\ No newline at end of file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="7bee8c38-4d16-466d-b05e-cfdeec8ff6af" name="Default" comment="Kleinere Korrekturen vorm Schlafengehen ">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/Dispatcher.php" afterPath="$PROJECT_DIR$/classes/bfw/Dispatcher.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/core/Controller.php" afterPath="$PROJECT_DIR$/classes/bfw/core/Controller.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/core/View.php" afterPath="$PROJECT_DIR$/classes/bfw/core/View.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/Model.php" afterPath="$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/Model.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/mvc/model/dokumentation/Model.php" afterPath="$PROJECT_DIR$/classes/bfw/mvc/model/dokumentation/Model.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/mvc/model/error/Model.php" afterPath="$PROJECT_DIR$/classes/bfw/mvc/model/error/Model.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/mvc/model/home/Model.php" afterPath="$PROJECT_DIR$/classes/bfw/mvc/model/home/Model.php" />
+ <list default="true" id="7bee8c38-4d16-466d-b05e-cfdeec8ff6af" name="Default" comment="Weitere Korrekturen nach dem Aufwachen ">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/.idea/encodings.xml" afterPath="$PROJECT_DIR$/../BFW_APP/.idea/encodings.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/.idea/modules.xml" afterPath="$PROJECT_DIR$/../BFW_APP/.idea/modules.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/.idea/workspace.xml" afterPath="$PROJECT_DIR$/../BFW_APP/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/classes/bfw/Dispatcher.php" afterPath="$PROJECT_DIR$/../BFW_APP/classes/bfw/Dispatcher.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/classes/bfw/core/Controller.php" afterPath="$PROJECT_DIR$/../BFW_APP/classes/bfw/core/Controller.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/BenutzerverwaltungController.php" afterPath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/BenutzerverwaltungController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/DokumentationController.php" afterPath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/DokumentationController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/ErrorController.php" afterPath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/ErrorController.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/HomeController.php" afterPath="$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/HomeController.php" />
</list>
<list id="8732f4c9-96b1-49c6-9723-a582f5bcb680" name="New changelist" comment="New changelist" />
<ignored path="TicketSystem.iws" />
@@ -39,98 +39,7 @@
<favorites_list name="TicketSystem" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="Model.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/Model.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-27.461538">
- <caret line="45" column="18" selection-start-line="45" selection-start-column="18" selection-end-line="45" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Controller.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Controller.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="27.384615">
- <caret line="40" column="44" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ErrorController.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/ErrorController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.9615384">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Dispatcher.php" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/classes/bfw/Dispatcher.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.2347526">
- <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Entity.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Entity.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-11.769231">
- <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Request.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/Request.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="128.73077">
- <caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Response.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/Response.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.9230769">
- <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="View.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/View.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-14.461538">
- <caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Model.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/dokumentation/Model.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.26923">
- <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="Git.Settings">
<option name="PREVIOUS_COMMIT_AUTHORS">
@@ -144,11 +53,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/BenutzerverwaltungsController.php" />
- <option value="$PROJECT_DIR$/.htaccess" />
- <option value="$PROJECT_DIR$/templates/tickets/index.tpl" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/HistoryController.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TTicket.php" />
<option value="$PROJECT_DIR$/classes/bfw/mvc/controller/TicketsController.php" />
<option value="$PROJECT_DIR$/templates/home/index.tpl" />
<option value="$PROJECT_DIR$/templates/footer.tpl" />
@@ -176,10 +80,6 @@
<option value="$PROJECT_DIR$/classes/bfw/entities/TUser.php" />
<option value="$PROJECT_DIR$/classes/bfw/Request.php" />
<option value="$PROJECT_DIR$/classes/bfw/Response.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/BenutzerverwaltungController.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/DokumentationController.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/ErrorController.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/HomeController.php" />
<option value="$PROJECT_DIR$/classes/bfw/core/Entity.php" />
<option value="$PROJECT_DIR$/classes/bfw/core/Model.php" />
<option value="$PROJECT_DIR$/logs/tickets.log" />
@@ -188,12 +88,21 @@
<option value="$PROJECT_DIR$/config/log4php.xml" />
<option value="$PROJECT_DIR$/.hgignore" />
<option value="$PROJECT_DIR$/classes/bfw/database/Database.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/Model.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/core/View.php" />
+ <option value="$PROJECT_DIR$/logs/bfw.log" />
<option value="$PROJECT_DIR$/classes/bfw/mvc/model/dokumentation/Model.php" />
<option value="$PROJECT_DIR$/classes/bfw/mvc/model/error/Model.php" />
<option value="$PROJECT_DIR$/classes/bfw/mvc/model/home/Model.php" />
- <option value="$PROJECT_DIR$/classes/bfw/core/View.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/Model.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/DataModel.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/dokumentation/DataModel.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/error/DataModel.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/home/DataModel.php" />
<option value="$PROJECT_DIR$/classes/bfw/core/Controller.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/BenutzerverwaltungController.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/DokumentationController.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/ErrorController.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/HomeController.php" />
<option value="$PROJECT_DIR$/classes/bfw/Dispatcher.php" />
</list>
</option>
@@ -206,7 +115,7 @@
<component name="PhpDebugGeneral" hide_empty_superglobals="false" />
<component name="PhpServers">
<servers>
- <server host="ticket" id="deecc2df-00c6-496c-a329-f753c4476f9e" name="Ticket-System-App" port="8080" />
+ <server host="bfwapp" id="deecc2df-00c6-496c-a329-f753c4476f9e" name="BFW" port="8080" />
</servers>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP 5.4" />
@@ -344,6 +253,16 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="TicketSystem" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="BFW_APP" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
<pane id="Scratches" />
@@ -423,7 +342,7 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="recentsLimit" value="5" />
- <property name="settings.editor.selected.configurable" value="editor.preferences.folding" />
+ <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="291" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
@@ -458,11 +377,11 @@
<recent name="C:\var\www\vhosts\TicketSystem\classes\bfw\mvc\view" />
</key>
</component>
- <component name="RunManager" selected="PHP Web Application.Ticket">
+ <component name="RunManager" selected="PHP Web Application.BFW">
<configuration default="false" name="index.php" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/TicketSystem/index.php">
<method />
</configuration>
- <configuration default="false" name="index.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/index.php">
+ <configuration default="false" name="index.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/../BFW_APP/index.php">
<method />
</configuration>
<configuration default="true" type="AppEnginePhpConfigurationType" factoryName="App Engine for PHP">
@@ -506,18 +425,18 @@
<envs />
<method />
</configuration>
- <configuration default="false" name="Ticket" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Ticket-System-App">
+ <configuration default="false" name="BFW" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="BFW">
<method />
</configuration>
- <configuration default="false" name="TicketSystem" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
- <TestRunner directory="$PROJECT_DIR$" />
+ <configuration default="false" name="BFWUnit" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+ <TestRunner directory="$PROJECT_DIR$/../BFW_APP" />
<method />
</configuration>
<list size="4">
- <item index="0" class="java.lang.String" itemvalue="PHP Web Application.Ticket" />
- <item index="1" class="java.lang.String" itemvalue="PHPUnit.TicketSystem" />
- <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="0" class="java.lang.String" itemvalue="JavaScript Debug.index.php" />
+ <item index="1" class="java.lang.String" itemvalue="PHP Script.index.php" />
+ <item index="2" class="java.lang.String" itemvalue="PHP Web Application.BFW" />
+ <item index="3" class="java.lang.String" itemvalue="PHPUnit.BFWUnit" />
</list>
<recent_temporary>
<list size="2">
@@ -538,24 +457,6 @@
<option name="number" value="Default" />
<updated>1446106927314</updated>
</task>
- <task id="LOCAL-00012" summary="Usability-Konzepte (Content: Fehlermeldungen)">
- <created>1446739263191</created>
- <option name="number" value="00012" />
- <option name="project" value="LOCAL" />
- <updated>1446739263191</updated>
- </task>
- <task id="LOCAL-00013" summary="Suche bezieht sich auf /templates/ ">
- <created>1446739420219</created>
- <option name="number" value="00013" />
- <option name="project" value="LOCAL" />
- <updated>1446739420219</updated>
- </task>
- <task id="LOCAL-00014" summary="ticket.php: Textkürzungen ">
- <created>1446743143014</created>
- <option name="number" value="00014" />
- <option name="project" value="LOCAL" />
- <updated>1446743143014</updated>
- </task>
<task id="LOCAL-00015" summary="Neue Testdaten für CSV Import ">
<created>1446743163200</created>
<option name="number" value="00015" />
@@ -832,7 +733,25 @@
<option name="project" value="LOCAL" />
<updated>1447383939777</updated>
</task>
- <option name="localTasksCounter" value="61" />
+ <task id="LOCAL-00061" summary="Weitere Korrekturen nach dem Aufwachen ">
+ <created>1447422791255</created>
+ <option name="number" value="00061" />
+ <option name="project" value="LOCAL" />
+ <updated>1447422791257</updated>
+ </task>
+ <task id="LOCAL-00062" summary="Weitere Korrekturen nach dem Aufwachen ">
+ <created>1447422791989</created>
+ <option name="number" value="00062" />
+ <option name="project" value="LOCAL" />
+ <updated>1447422791989</updated>
+ </task>
+ <task id="LOCAL-00063" summary="DataModel extends Model ohne Namenskonflikte beim initialen Erzeugen ">
+ <created>1447423649008</created>
+ <option name="number" value="00063" />
+ <option name="project" value="LOCAL" />
+ <updated>1447423649008</updated>
+ </task>
+ <option name="localTasksCounter" value="64" />
<servers />
</component>
<component name="TodoView">
@@ -850,8 +769,10 @@
<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.20469083" sideWeight="0.4883721" 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.32972974" 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.32932165" sideWeight="0.5" order="7" 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.3347779" sideWeight="0.45469084" order="12" 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.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3347779" sideWeight="0.5453092" 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.23293608" sideWeight="0.5" order="9" 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.32972974" 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" />
@@ -859,14 +780,12 @@
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19584885" sideWeight="0.5116279" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39328277" sideWeight="0.4978678" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" 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.32932165" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" 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="8" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39869988" sideWeight="0.58861095" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3347779" sideWeight="0.5453092" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
@@ -909,8 +828,6 @@
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_CODE_CLEANUP_BEFORE_PROJECT_COMMIT" value="true" />
- <MESSAGE value="Umstellung auf MVC Struktur Model, View und Controller rudimentär lauffähig " />
- <MESSAGE value="Umstellung auf MVC Struktur Model, View und Controller Struktur verbessert " />
<MESSAGE value="Abschließende Korrekturen fürs MVC und Fehlerbehandlung " />
<MESSAGE value="Annehmen / Laden Nachrichten für Supporter " />
<MESSAGE value="Smarty Templates in Ordnerstruktur verschoben" />
@@ -934,7 +851,9 @@
<MESSAGE value="Umstellung der Testdaten auf testbox.de" />
<MESSAGE value="Überarbeitete MVC-Struktur, die ich jetzt auch nachvollziehen kann. " />
<MESSAGE value="Kleinere Korrekturen vorm Schlafengehen " />
- <option name="LAST_COMMIT_MESSAGE" value="Kleinere Korrekturen vorm Schlafengehen " />
+ <MESSAGE value="Weitere Korrekturen nach dem Aufwachen " />
+ <MESSAGE value="DataModel extends Model ohne Namenskonflikte beim initialen Erzeugen " />
+ <option name="LAST_COMMIT_MESSAGE" value="DataModel extends Model ohne Namenskonflikte beim initialen Erzeugen " />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
@@ -958,21 +877,14 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/library/log4php/configurators/LoggerConfiguratorDefault.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-2.5264976">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/library/log4php/configurators/LoggerConfigurationAdapterXML.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/log4php/configurators/LoggerConfigurationAdapterXML.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/library/log4php/configurators/LoggerConfigurationAdapterPHP.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/log4php/configurators/LoggerConfigurationAdapterPHP.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -986,84 +898,84 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/library/log4php/LoggerAppender.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/log4php/LoggerAppender.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.4615383">
<caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/library/smarty/libs/Smarty.class.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/smarty/libs/Smarty.class.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.1923075">
<caret line="1602" column="0" selection-start-line="1602" selection-start-column="0" selection-end-line="1602" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/library/smarty/libs/sysplugins/smarty_internal_template.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/smarty/libs/sysplugins/smarty_internal_template.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.0">
<caret line="891" column="0" selection-start-line="891" selection-start-column="0" selection-end-line="891" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/js/main.js">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="6" column="3" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/resetpasswort.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/benutzerverwaltung/resetpasswort.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/footer.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/footer.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.5384617">
<caret line="10" column="65" selection-start-line="10" selection-start-column="65" selection-end-line="10" selection-end-column="65" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/meinprofil.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/benutzerverwaltung/meinprofil.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.3076923">
<caret line="2" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/dokumentation/index.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/dokumentation/index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/home/index.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/home/index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.65384614">
<caret line="1" column="5" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/registrieren.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/benutzerverwaltung/registrieren.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.8846154">
<caret line="9" column="83" selection-start-line="9" selection-start-column="83" selection-end-line="9" selection-end-column="83" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/abmelden.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/benutzerverwaltung/abmelden.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/index.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/benutzerverwaltung/index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0">
<caret line="0" column="36" selection-start-line="0" selection-start-column="36" selection-end-line="0" selection-end-column="36" />
@@ -1077,179 +989,84 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.423077">
<caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/header.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/header.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3912543">
<caret line="20" column="12" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/css/main.css">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/css/main.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.5">
<caret line="109" column="1" selection-start-line="109" selection-start-column="1" selection-end-line="109" selection-end-column="1" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/data/import/test_users.csv">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/data/import/test_users.csv">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.22793296">
<caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/library/smarty/libs/sysplugins/smartyexception.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/smarty/libs/sysplugins/smartyexception.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.36956522">
<caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/entities/TView.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-6.423077">
- <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.hgignore">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/.hgignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.16129032">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/config/log4php.xml">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/config/log4php.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.13572854">
<caret line="4" column="34" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/entities/TGroup.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.1559633">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/BenutzerverwaltungController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-52.307693">
- <caret line="80" column="39" selection-start-line="80" selection-start-column="39" selection-end-line="80" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/HomeController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.28593272">
- <caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/DokumentationController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.1559633">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/index.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/index.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-6.5384617">
<caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/database/Database.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="230.1923">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/database/DBInterface.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.9230769">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/entities/TUser.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.85">
- <caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/config/config.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/config/config.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0625">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/.htaccess">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/.htaccess">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/sql/init.sql">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/sql/init.sql">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.88616073">
<caret line="397" column="0" selection-start-line="397" selection-start-column="0" selection-end-line="397" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/logs/bfw.log">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/home/Model.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.923077">
- <caret line="35" column="15" selection-start-line="35" selection-start-column="15" selection-end-line="35" selection-end-column="15" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/error/Model.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.26923">
- <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/dokumentation/Model.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.26923">
- <caret line="34" column="22" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/benutzerverwaltung/Model.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-27.461538">
- <caret line="45" column="18" selection-start-line="45" selection-start-column="18" selection-end-line="45" selection-end-column="18" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Entity.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/core/Entity.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.769231">
<caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
@@ -1257,15 +1074,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/Request.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="128.73077">
- <caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/layout.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/layout.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3912543">
<caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
@@ -1273,7 +1082,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/error/index.tpl">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/view/error/index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1281,23 +1090,69 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/View.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/core/View.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.461538">
<caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
+ <folding>
+ <marker date="1447422640970" expanded="true" signature="106:166" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/core/Model.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.31300345">
+ <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/Request.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="128.73077">
+ <caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Controller.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/Response.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="27.384615">
- <caret line="40" column="44" selection-start-line="40" selection-start-column="44" selection-end-line="40" selection-end-column="44" />
+ <state vertical-scroll-proportion="-3.9230769">
+ <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/logs/bfw.log">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/ErrorController.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/model/dokumentation/DataModel.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-3.9230769">
+ <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+ <folding>
+ <marker date="1447423584208" expanded="true" signature="125:214" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/library/log4php/Logger.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding>
+ <element signature="e#6#832#0#PHP" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/database/DBInterface.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.9615384">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
@@ -1305,26 +1160,130 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Model.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/database/Database.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="218.3077">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding>
+ <element signature="e#7#83#0#PHP" expanded="true" />
+ <marker date="1447383929457" expanded="true" signature="1602:1637" placeholder="DELETE FROM ..." />
+ <marker date="1447383929457" expanded="true" signature="1672:1708" placeholder="DELETE FROM ..." />
+ <marker date="1447383929457" expanded="true" signature="1744:1783" placeholder="ALTER TABLE `t_user`..." />
+ <marker date="1447383929457" expanded="true" signature="1818:1858" placeholder="ALTER TABLE `t_group`..." />
+ <marker date="1447383929457" expanded="true" signature="2447:2480" placeholder="SELECT %s FR..." />
+ <marker date="1447383929457" expanded="true" signature="3266:3361" placeholder="SELECT * FRO..%s..." />
+ <marker date="1447383929457" expanded="true" signature="4437:4476" placeholder="INSERT INTO ..." />
+ <marker date="1447383929457" expanded="true" signature="4843:4954" placeholder="SELECT * FRO..%s..." />
+ <marker date="1447383929457" expanded="true" signature="5461:5572" placeholder="SELECT * FRO..%s..." />
+ <marker date="1447383929457" expanded="true" signature="6136:6250" placeholder="SELECT * FRO..%s..." />
+ <marker date="1447383929457" expanded="true" signature="6791:6905" placeholder="SELECT * FRO..%s..." />
+ <marker date="1447383929457" expanded="true" signature="8149:8206" placeholder="INSERT INTO `%s`..." />
+ <marker date="1447383929457" expanded="true" signature="8817:8875" placeholder="UPDATE `%s` ..." />
+ <marker date="1447383929457" expanded="true" signature="9192:9236" placeholder="DELETE FROM ..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/core/Controller.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.31300345">
- <caret line="19" column="60" selection-start-line="19" selection-start-column="60" selection-end-line="19" selection-end-column="60" />
+ <state vertical-scroll-proportion="-32.115383">
+ <caret line="131" column="32" selection-start-line="131" selection-start-column="32" selection-end-line="131" selection-end-column="32" />
+ <folding>
+ <marker date="1447423879986" expanded="true" signature="106:152" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/DokumentationController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-10.461538">
+ <caret line="19" column="47" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/HomeController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-11.769231">
+ <caret line="21" column="7" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/ErrorController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-9.153846">
+ <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/Response.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/model/error/DataModel.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-5.8846154">
+ <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+ <folding>
+ <marker date="1447423587842" expanded="true" signature="117:206" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/model/home/DataModel.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.9230769">
- <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+ <state vertical-scroll-proportion="-5.8846154">
+ <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+ <folding>
+ <marker date="1447423574648" expanded="true" signature="116:205" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/Dispatcher.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-19.692308">
+ <caret line="65" column="52" selection-start-line="65" selection-start-column="52" selection-end-line="65" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/Dispatcher.php">
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/entities/TGroup.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-1.9615384">
+ <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/entities/TUser.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-1.0769231">
+ <caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/entities/TView.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.2347526">
- <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+ <state vertical-scroll-proportion="-2.0384614">
+ <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/model/benutzerverwaltung/DataModel.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.17606445">
+ <caret line="12" column="23" selection-start-line="12" selection-start-column="23" selection-end-line="12" selection-end-column="23" />
+ <folding>
+ <marker date="1447423579776" expanded="true" signature="130:219" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../BFW_APP/classes/bfw/mvc/controller/BenutzerverwaltungController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.15650173">
+ <caret line="19" column="47" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
<folding />
</state>
</provider>
@@ -1332,7 +1291,7 @@
</component>
<component name="hg4idea.settings">
<option name="CHECK_INCOMING_OUTGOING" value="true" />
- <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" />
+ <option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$/../BFW_APP" />
</component>
<component name="masterDetails">
<states>
--- a/classes/bfw/Dispatcher.php
+++ b/classes/bfw/Dispatcher.php
@@ -8,7 +8,6 @@
namespace bfw;
use bfw\core\Controller;
-use bfw\core\Model;
use bfw\core\View;
use ReflectionClass;
use ReflectionException;
@@ -63,7 +62,7 @@
$action = 'index';
}
} catch (ReflectionException $re) {
- $controller = new mvc\controller\ErrorController(new Model());
+ $controller = new mvc\controller\ErrorController();
$controllerName = 'error';
$action = 'index';
--- a/classes/bfw/core/Controller.php
+++ b/classes/bfw/core/Controller.php
@@ -119,7 +119,13 @@
*/
abstract public function index();
- protected function getModelName() {
+ public function getDataModelInstance() {
+ $modelName = $this->getModelName();
+
+ return new $modelName();
+ }
+
+ private function getModelName() {
$modelName = str_replace('controller', 'model', get_class($this));
$modelName = strtolower($modelName);
--- a/classes/bfw/mvc/controller/BenutzerverwaltungController.php
+++ b/classes/bfw/mvc/controller/BenutzerverwaltungController.php
@@ -17,10 +17,7 @@
*
*/
public function __construct() {
-
- $modelName = $this->getModelName();
-
- $model = new $modelName();
+ $model = $this->getDataModelInstance();
parent::__construct($model);
}
--- a/classes/bfw/mvc/controller/DokumentationController.php
+++ b/classes/bfw/mvc/controller/DokumentationController.php
@@ -17,9 +17,7 @@
class DokumentationController extends Controller {
public function __construct() {
- $modelName = $this->getModelName();
- $model = new $modelName();
-
+ $model = $this->getDataModelInstance();
parent::__construct($model);
}
--- a/classes/bfw/mvc/controller/ErrorController.php
+++ b/classes/bfw/mvc/controller/ErrorController.php
@@ -15,7 +15,8 @@
*/
class ErrorController extends Controller {
- public function __construct($model) {
+ public function __construct() {
+ $model = $this->getDataModelInstance();
parent::__construct($model);
}
--- a/classes/bfw/mvc/controller/HomeController.php
+++ b/classes/bfw/mvc/controller/HomeController.php
@@ -15,9 +15,7 @@
*
*/
public function __construct() {
- $modelName = $this->getModelName();
- $model = new $modelName();
-
+ $model = $this->getDataModelInstance();
parent::__construct($model);
}