--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -8,12 +8,6 @@
<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://$PROJECT_DIR$/templates/benutzerverwaltung/abmelden.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/templates/benutzerverwaltung/anmelden.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/templates/benutzerverwaltung/index.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/templates/benutzerverwaltung/meinprofil.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/templates/benutzerverwaltung/registrieren.tpl" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/templates/tickets/index.tpl" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +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="Initialies Layout des BfWs">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.hgignore" afterPath="$PROJECT_DIR$/.hgignore" />
+ <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/Entity.php" afterPath="$PROJECT_DIR$/classes/bfw/core/Entity.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/core/Model.php" afterPath="$PROJECT_DIR$/classes/bfw/core/Model.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/database/Database.php" afterPath="$PROJECT_DIR$/classes/bfw/database/Database.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/classes/bfw/entities/TView.php" afterPath="$PROJECT_DIR$/classes/bfw/entities/TView.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/config.php" afterPath="$PROJECT_DIR$/config/config.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/log4php.xml" afterPath="$PROJECT_DIR$/config/log4php.xml" />
+ <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>
<list id="8732f4c9-96b1-49c6-9723-a582f5bcb680" name="New changelist" comment="New changelist" />
<ignored path="TicketSystem.iws" />
@@ -40,66 +39,93 @@
<favorites_list name="TicketSystem" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Database.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/database/Database.php">
+ <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="-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#7#83#0#PHP" expanded="true" />
- <marker date="1447383850145" expanded="true" signature="1603:1638" placeholder="DELETE FROM ..." />
- <marker date="1447383850145" expanded="true" signature="1673:1709" placeholder="DELETE FROM ..." />
- <marker date="1447383850145" expanded="true" signature="1745:1784" placeholder="ALTER TABLE `t_user`..." />
- <marker date="1447383850145" expanded="true" signature="1819:1859" placeholder="ALTER TABLE `t_group`..." />
- <marker date="1447383850145" expanded="true" signature="2448:2480" placeholder="SELECT %s FR..." />
- <marker date="1447383850145" expanded="true" signature="2448:2481" placeholder="SELECT %s FR..." />
- <marker date="1447383850145" expanded="true" signature="3267:3362" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="4438:4477" placeholder="INSERT INTO ..." />
- <marker date="1447383850145" expanded="true" signature="4844:4955" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="5462:5573" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="6137:6251" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="6792:6906" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="8150:8207" placeholder="INSERT INTO `%s`..." />
- <marker date="1447383850145" expanded="true" signature="8818:8876" placeholder="UPDATE `%s` ..." />
- <marker date="1447383850145" expanded="true" signature="9193:9237" placeholder="DELETE FROM ..." />
- </folding>
+ <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="TUser.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/entities/TUser.php">
+ <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="-3.9230769">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
+ <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="TGroup.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/classes/bfw/entities/TGroup.php">
+ <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="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
+ <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="HomeController.php" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/HomeController.php">
+ <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="0.4678899">
- <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
+ <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>
@@ -145,7 +171,6 @@
<option value="$PROJECT_DIR$/classes/bfw/mvc/common/Entity.php" />
<option value="$PROJECT_DIR$/classes/bfw/mvc/common/View.php" />
<option value="$PROJECT_DIR$/classes/bfw/mvc/common/Model.php" />
- <option value="$PROJECT_DIR$/classes/bfw/core/View.php" />
<option value="$PROJECT_DIR$/classes/bfw/database/DBInterface.php" />
<option value="$PROJECT_DIR$/classes/bfw/entities/TGroup.php" />
<option value="$PROJECT_DIR$/classes/bfw/entities/TUser.php" />
@@ -155,20 +180,21 @@
<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/mvc/model/benutzerverwaltung/Model.php" />
- <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/Entity.php" />
- <option value="$PROJECT_DIR$/classes/bfw/core/Controller.php" />
<option value="$PROJECT_DIR$/classes/bfw/core/Model.php" />
<option value="$PROJECT_DIR$/logs/tickets.log" />
- <option value="$PROJECT_DIR$/classes/bfw/Dispatcher.php" />
<option value="$PROJECT_DIR$/classes/bfw/entities/TView.php" />
<option value="$PROJECT_DIR$/config/config.php" />
<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/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/core/Controller.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/Dispatcher.php" />
</list>
</option>
</component>
@@ -320,6 +346,7 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scratches" />
<pane id="Scope">
<subPane subId="Project Files">
<PATH>
@@ -390,7 +417,6 @@
</PATH>
</subPane>
</pane>
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -512,12 +538,6 @@
<option name="number" value="Default" />
<updated>1446106927314</updated>
</task>
- <task id="LOCAL-00011" summary="Entities mit Kommentaren ">
- <created>1446739228859</created>
- <option name="number" value="00011" />
- <option name="project" value="LOCAL" />
- <updated>1446739228859</updated>
- </task>
<task id="LOCAL-00012" summary="Usability-Konzepte (Content: Fehlermeldungen)">
<created>1446739263191</created>
<option name="number" value="00012" />
@@ -806,7 +826,13 @@
<option name="project" value="LOCAL" />
<updated>1447381441823</updated>
</task>
- <option name="localTasksCounter" value="60" />
+ <task id="LOCAL-00060" summary="Kleinere Korrekturen vorm Schlafengehen ">
+ <created>1447383939777</created>
+ <option name="number" value="00060" />
+ <option name="project" value="LOCAL" />
+ <updated>1447383939777</updated>
+ </task>
+ <option name="localTasksCounter" value="61" />
<servers />
</component>
<component name="TodoView">
@@ -819,28 +845,28 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
<editor active="false" />
<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="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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23293608" sideWeight="0.5" order="9" side_tool="false" 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="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" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329718" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19616205" sideWeight="0.4883721" order="0" side_tool="false" content_ui="combo" />
- <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="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" />
<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>
@@ -883,7 +909,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 Löschen der alten Content Scripte " />
<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 " />
@@ -908,7 +933,8 @@
<MESSAGE value="htaccess: Umstellung auf 2 Parameter - /controller/action/ " />
<MESSAGE value="Umstellung der Testdaten auf testbox.de" />
<MESSAGE value="Überarbeitete MVC-Struktur, die ich jetzt auch nachvollziehen kann. " />
- <option name="LAST_COMMIT_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 " />
<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" />
@@ -936,7 +962,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -944,7 +969,6 @@
<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 />
</state>
</provider>
</entry>
@@ -952,15 +976,6 @@
<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 />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.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" />
- <folding />
</state>
</provider>
</entry>
@@ -968,7 +983,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-4.8461537">
<caret line="772" column="20" selection-start-line="772" selection-start-column="20" selection-end-line="772" selection-end-column="20" />
- <folding />
</state>
</provider>
</entry>
@@ -976,7 +990,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -984,7 +997,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -992,15 +1004,6 @@
<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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/sql/init.sql">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.84977907">
- <caret line="397" column="0" selection-start-line="397" selection-start-column="0" selection-end-line="397" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -1008,7 +1011,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -1016,6 +1018,257 @@
<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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/Reflection.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.3482143">
+ <caret line="1163" column="20" selection-start-line="1163" selection-start-column="20" selection-end-line="1163" selection-end-column="20" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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>
+ <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">
+ <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" />
<folding />
</state>
</provider>
@@ -1028,381 +1281,54 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/layout.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.68">
- <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/dokumentation/index.tpl">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/core/View.php">
<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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
+ <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>
- <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/Reflection.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.3482143">
- <caret line="1163" column="20" selection-start-line="1163" selection-start-column="20" selection-end-line="1163" selection-end-column="20" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/core/Controller.php">
<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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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 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>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </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="-3.9230769">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447381281961" expanded="true" signature="116:165" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/ErrorController.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" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </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="-3.9230769">
+ <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>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447381408652" expanded="true" signature="117:165" placeholder="..." />
- </folding>
- </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="0.79640716">
- <caret line="31" column="1" selection-start-line="31" selection-start-column="1" selection-end-line="31" selection-end-column="1" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </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="0.23752496">
- <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447381304747" expanded="true" signature="130:178" placeholder="..." />
- </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="-0.65384614">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447381408665" expanded="true" signature="125:173" placeholder="..." />
- </folding>
- </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="-48.384617">
- <caret line="80" column="39" selection-start-line="80" selection-start-column="39" selection-end-line="80" selection-end-column="39" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447381408670" expanded="true" signature="116:160" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Controller.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-14.038462">
- <caret line="48" column="60" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/classes/bfw/core/Model.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-12.423077">
+ <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>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447382863665" expanded="true" signature="105:119" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/View.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="55.26923">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/Request.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447381228766" expanded="true" signature="101:114" placeholder="..." />
- </folding>
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/classes/bfw/Response.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.30538923">
+ <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>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/classes/bfw/Dispatcher.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-6.423077">
- <caret line="66" column="68" selection-start-line="66" selection-start-column="68" selection-end-line="66" selection-end-column="68" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- <marker date="1447383030516" expanded="true" signature="101:215" placeholder="..." />
- </folding>
- </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" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/core/Entity.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="107.80769">
- <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </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="0.2035928">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/config/config.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.1017964">
- <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
- <folding />
- </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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.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 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>
- <entry file="file://$PROJECT_DIR$/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" />
- <folding />
- </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="-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#7#83#0#PHP" expanded="true" />
- <marker date="1447383850145" expanded="true" signature="1603:1638" placeholder="DELETE FROM ..." />
- <marker date="1447383850145" expanded="true" signature="1673:1709" placeholder="DELETE FROM ..." />
- <marker date="1447383850145" expanded="true" signature="1745:1784" placeholder="ALTER TABLE `t_user`..." />
- <marker date="1447383850145" expanded="true" signature="1819:1859" placeholder="ALTER TABLE `t_group`..." />
- <marker date="1447383850145" expanded="true" signature="2448:2480" placeholder="SELECT %s FR..." />
- <marker date="1447383850145" expanded="true" signature="2448:2481" placeholder="SELECT %s FR..." />
- <marker date="1447383850145" expanded="true" signature="3267:3362" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="4438:4477" placeholder="INSERT INTO ..." />
- <marker date="1447383850145" expanded="true" signature="4844:4955" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="5462:5573" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="6137:6251" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="6792:6906" placeholder="SELECT * FRO..%s..." />
- <marker date="1447383850145" expanded="true" signature="8150:8207" placeholder="INSERT INTO `%s`..." />
- <marker date="1447383850145" expanded="true" signature="8818:8876" placeholder="UPDATE `%s` ..." />
- <marker date="1447383850145" expanded="true" signature="9193:9237" placeholder="DELETE FROM ..." />
- </folding>
- </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="-3.9230769">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </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="-3.9230769">
- <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </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.4678899">
- <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
- <folding>
- <element signature="e#7#83#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
</component>
<component name="hg4idea.settings">
<option name="CHECK_INCOMING_OUTGOING" value="true" />
--- a/classes/bfw/Dispatcher.php
+++ b/classes/bfw/Dispatcher.php
@@ -8,8 +8,8 @@
namespace bfw;
use bfw\core\Controller;
+use bfw\core\Model;
use bfw\core\View;
-use bfw\entities\TView;
use ReflectionClass;
use ReflectionException;
@@ -62,8 +62,8 @@
if (!$reflection->hasMethod($action)) {
$action = 'index';
}
- } catch (ReflectionException $e) {
- $controller = new mvc\controller\ErrorController(new TView('NON_EXISTENT'));
+ } catch (ReflectionException $re) {
+ $controller = new mvc\controller\ErrorController(new Model());
$controllerName = 'error';
$action = 'index';
--- a/classes/bfw/core/Controller.php
+++ b/classes/bfw/core/Controller.php
@@ -37,9 +37,8 @@
* Controller constructor.
*
* @param Model $model
- * @param Request $request
*/
- public function __construct(Model $model = null) {
+ public function __construct(Model $model) {
$this->request = new Request();
$this->response = new Response();
@@ -57,20 +56,34 @@
return sprintf('bfw\mvc\controller\%sController', ucfirst($controller));
}
+ /**
+ * @return View
+ */
public function getView() {
return $this->view;
}
+ /**
+ * @param $view
+ * @return $this
+ */
public function setView($view) {
$this->view = $view;
return $this;
}
+ /**
+ * @return Response
+ */
public function getResponse() {
return $this->response;
}
+ /**
+ * @param $response
+ * @return $this
+ */
public function setResponse($response) {
$this->response = $response;
@@ -102,7 +115,7 @@
}
/**
- *
+ * @return mixed
*/
abstract public function index();
--- a/classes/bfw/core/View.php
+++ b/classes/bfw/core/View.php
@@ -13,7 +13,7 @@
require_once 'library/smarty/libs/Smarty.class.php';
-class View extends Smarty {
+class View {
/**
* Statische Referenz auf die reale Template Engine, hier Smarty
*
@@ -65,11 +65,19 @@
}
/**
- * weisst automatisch eine user-instanz zu: Seiten-Effekte beachten
+ * @param $template
+ * @return string
+ */
+ public function fetch($template) {
+ return self::$tpl->fetch($template);
+ }
+
+ /**
+ * <b>Anzeige der komplett gerenderten Seite mit dem Layout $layout</b>
*
- * TODO: Namensschema festlegen, damit dieser Effekt nicht auftritt
+ * @param string $layout
*/
- public function display() {
+ public function display($layout = 'layout.tpl') {
$user = new TUser();
$group = new TGroup();
@@ -90,13 +98,10 @@
$this->assign('request', $request);
try {
- self::$tpl->display('layout.tpl');
+ self::$tpl->display($layout);
} catch (SmartyException $se) {
$response->setStatusCode(404);
- $page = 'error/error';
- self::$tpl->assign('page', $page);
-
self::$tpl->display('layout.tpl');
}
@@ -111,4 +116,12 @@
self::$tpl->assign($key, $value);
}
+ /**
+ * @param string $key
+ * @return string
+ */
+ public function get($key) {
+ return self::$tpl->getTemplateVars($key);
+ }
+
}
--- a/classes/bfw/mvc/model/benutzerverwaltung/Model.php
+++ b/classes/bfw/mvc/model/benutzerverwaltung/Model.php
@@ -7,12 +7,20 @@
namespace bfw\mvc\model\benutzerverwaltung;
+use bfw\core\Entity;
use bfw\entities\TGroup;
use bfw\entities\TUser;
class Model extends \bfw\core\Model {
+ /**
+ * @var TUser
+ */
private $user;
+
+ /**
+ * @var TGroup
+ */
private $group;
public function __construct() {
@@ -20,18 +28,30 @@
$this->group = new TGroup();
}
+ /**
+ * @return TUser
+ */
public function getUser() {
return $this->user;
}
+ /**
+ * @return TGroup
+ */
public function getGroup() {
return $this->group;
}
+ /**
+ * @return Entity[]
+ */
public function getUsers() {
return $this->user->findAll();
}
+ /**
+ * @return Entity[]
+ */
public function getGroups() {
return $this->group->findAll();
}
--- a/classes/bfw/mvc/model/dokumentation/Model.php
+++ b/classes/bfw/mvc/model/dokumentation/Model.php
@@ -7,6 +7,7 @@
namespace bfw\mvc\model\dokumentation;
+use bfw\core\Entity;
use bfw\entities\TGroup;
use bfw\entities\TUser;
@@ -15,15 +16,24 @@
private $user;
private $group;
+ /**
+ * Model constructor.
+ */
public function __construct() {
$this->user = new TUser();
$this->group = new TGroup();
}
+ /**
+ * @return Entity[]
+ */
public function getUsers() {
return $this->user->findAll();
}
+ /**
+ * @return Entity[]
+ */
public function getGroups() {
return $this->group->findAll();
}
--- a/classes/bfw/mvc/model/error/Model.php
+++ b/classes/bfw/mvc/model/error/Model.php
@@ -7,6 +7,7 @@
namespace bfw\mvc\model\error;
+use bfw\core\Entity;
use bfw\entities\TGroup;
use bfw\entities\TUser;
@@ -15,15 +16,24 @@
private $user;
private $group;
+ /**
+ * Model constructor.
+ */
public function __construct() {
$this->user = new TUser();
$this->group = new TGroup();
}
+ /**
+ * @return Entity[]
+ */
public function getUsers() {
return $this->user->findAll();
}
+ /**
+ * @return Entity[]
+ */
public function getGroups() {
return $this->group->findAll();
}
--- a/classes/bfw/mvc/model/home/Model.php
+++ b/classes/bfw/mvc/model/home/Model.php
@@ -7,6 +7,7 @@
namespace bfw\mvc\model\home;
+use bfw\core\Entity;
use bfw\core\Model as MyModel;
use bfw\entities\TGroup;
use bfw\entities\TUser;
@@ -16,15 +17,24 @@
private $user;
private $group;
+ /**
+ * Model constructor.
+ */
public function __construct() {
$this->user = new TUser();
$this->group = new TGroup();
}
+ /**
+ * @return Entity[]
+ */
public function getUsers() {
return $this->user->findAll();
}
+ /**
+ * @return Entity[]
+ */
public function getGroups() {
return $this->group->findAll();
}