--- a/.hgignore
+++ b/.hgignore
@@ -5,7 +5,7 @@
\.conflict\~$
^data/templates_c$
-^logs/tickets.log$
+^logs/bfw.log$
syntax: glob
.hgignore
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,18 @@
<?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" />
+ <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" />
+ <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" />
+ </list>
<list id="8732f4c9-96b1-49c6-9723-a582f5bcb680" name="New changelist" comment="New changelist" />
<ignored path="TicketSystem.iws" />
<ignored path=".idea/workspace.xml" />
@@ -18,17 +29,82 @@
<option name="PATCH_PATH" value="" />
</component>
<component name="DatabaseView">
- <option name="FLATTEN" value="false" />
- <option name="GROUP_BY_TYPE" value="true" />
- <option name="SORT_CHILDREN" value="false" />
- <option name="SHOW_TABLE_CONSTRAINTS" value="true" />
+ <option name="GROUP_SCHEMA" value="true" />
+ <option name="GROUP_CONTENTS" value="false" />
+ <option name="SORT_POSITIONED" value="false" />
+ <option name="SHOW_TABLE_DETAILS" value="true" />
+ <option name="SHOW_EMPTY_GROUPS" value="false" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="TicketSystem" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+ <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">
+ <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>
+ </file>
+ <file leaf-file-name="TUser.php" pinned="false" current-in-tab="false">
+ <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>
+ </file>
+ <file leaf-file-name="TGroup.php" pinned="false" current-in-tab="false">
+ <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>
+ </file>
+ <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
+ <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>
+ </file>
+ </leaf>
</component>
<component name="Git.Settings">
<option name="PREVIOUS_COMMIT_AUTHORS">
@@ -42,57 +118,57 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/classes/mvc/model/TTicket.php" />
- <option value="$PROJECT_DIR$/templates/header.tpl" />
+ <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" />
+ <option value="$PROJECT_DIR$/js/main.js" />
<option value="$PROJECT_DIR$/templates/layout.tpl" />
- <option value="$PROJECT_DIR$/templates/home/home.tpl" />
- <option value="$PROJECT_DIR$/classes/mvc/model/TGroup.php" />
- <option value="$PROJECT_DIR$/templates/tickets/ticketanlegen.tpl" />
- <option value="$PROJECT_DIR$/templates/tickets/tickets.tpl" />
- <option value="$PROJECT_DIR$/templates/history/historie.tpl" />
- <option value="$PROJECT_DIR$/classes/mvc/view/View.php" />
- <option value="$PROJECT_DIR$/classes/Dispatcher.php" />
- <option value="$PROJECT_DIR$/classes/mvc/controller/BenutzerverwaltungsController.php" />
- <option value="$PROJECT_DIR$/classes/mvc/controller/Controller.php" />
- <option value="$PROJECT_DIR$/classes/mvc/controller/ErrorController.php" />
- <option value="$PROJECT_DIR$/classes/mvc/controller/HistoryController.php" />
- <option value="$PROJECT_DIR$/classes/mvc/model/Model.php" />
- <option value="$PROJECT_DIR$/classes/mvc/model/TAction.php" />
- <option value="$PROJECT_DIR$/classes/mvc/model/TText.php" />
- <option value="$PROJECT_DIR$/classes/mvc/model/TUser.php" />
- <option value="$PROJECT_DIR$/classes/mvc/model/TView.php" />
- <option value="$PROJECT_DIR$/classes/DBInterface.php" />
- <option value="$PROJECT_DIR$/classes/Request.php" />
- <option value="$PROJECT_DIR$/classes/mvc/controller/HomeController.php" />
- <option value="$PROJECT_DIR$/classes/mvc/controller/TicketsController.php" />
- <option value="$PROJECT_DIR$/library/bfw/Database.php" />
- <option value="$PROJECT_DIR$/library/bfw/DBInterface.php" />
- <option value="$PROJECT_DIR$/library/bfw/Dispatcher.php" />
- <option value="$PROJECT_DIR$/library/bfw/Request.php" />
- <option value="$PROJECT_DIR$/library/bfw/Response.php" />
+ <option value="$PROJECT_DIR$/templates/header.tpl" />
+ <option value="$PROJECT_DIR$/templates/benutzerverwaltung/index.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/Dokumentation.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/view/footer.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/index.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/view/dokumentation/index.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/view/home/index.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/registrieren.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TUser.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TGroup.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/entitities/TGroup.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/entities/Entity.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/mvc/common/Controller.php" />
+ <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" />
+ <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/model/TAction.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TGroup.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/THistory.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TStatus.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TText.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TUser.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TView.php" />
- <option value="$PROJECT_DIR$/index.php" />
- <option value="$PROJECT_DIR$/classes/bfw/Request.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/Model.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/HistoryController.php" />
- <option value="$PROJECT_DIR$/classes/bfw/Database.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/Controller.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/view/View.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/mvc/controller/TicketsController.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/BenutzerverwaltungsController.php" />
+ <option value="$PROJECT_DIR$/classes/bfw/entities/TView.php" />
<option value="$PROJECT_DIR$/config/config.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/model/TTicket.php" />
- <option value="$PROJECT_DIR$/classes/bfw/mvc/controller/HomeController.php" />
- <option value="$PROJECT_DIR$/logs/tickets.log" />
+ <option value="$PROJECT_DIR$/config/log4php.xml" />
<option value="$PROJECT_DIR$/.hgignore" />
+ <option value="$PROJECT_DIR$/classes/bfw/database/Database.php" />
</list>
</option>
</component>
@@ -110,9 +186,9 @@
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP 5.4" />
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
- <option name="y" value="1" />
+ <option name="y" value="-8" />
<option name="width" value="1936" />
- <option name="height" value="1055" />
+ <option name="height" value="1056" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@@ -244,7 +320,6 @@
</PATH>
</subPane>
</pane>
- <pane id="Scratches" />
<pane id="Scope">
<subPane subId="Project Files">
<PATH>
@@ -315,13 +390,14 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<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="project.propVCSSupport.Mappings" />
+ <property name="settings.editor.selected.configurable" value="editor.preferences.folding" />
<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" />
@@ -341,17 +417,19 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="full.screen.before.presentation.mode" value="false" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
+ <property name="php.override.implement.member.chooser.php.doc" value="NONE" />
</component>
<component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\var\www\vhosts\TicketSystem\data\import" />
- <recent name="C:\var\www\vhosts\TicketSystem\library\bfw\mvc\model" />
- <recent name="C:\var\www\vhosts\TicketSystem\library\bfw\mvc\controller" />
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\var\www\vhosts\TicketSystem\classes\bfw\mvc\model\home" />
<recent name="C:\var\www\vhosts\TicketSystem\library\bfw" />
- <recent name="C:\xampp\htdocs\TicketSystem\templates\tickets" />
</key>
- <key name="CopyFile.RECENT_KEYS">
- <recent name="C:\var\www\vhosts\TicketSystem\library\bfw" />
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="C:\var\www\vhosts\TicketSystem\classes\bfw" />
+ <recent name="C:\var\www\vhosts\TicketSystem\classes\bfw\mvc\common" />
+ <recent name="C:\var\www\vhosts\TicketSystem\classes\bfw\database\entitities" />
+ <recent name="C:\var\www\vhosts\TicketSystem\classes\bfw\database" />
+ <recent name="C:\var\www\vhosts\TicketSystem\classes\bfw\mvc\view" />
</key>
</component>
<component name="RunManager" selected="PHP Web Application.Ticket">
@@ -434,48 +512,6 @@
<option name="number" value="Default" />
<updated>1446106927314</updated>
</task>
- <task id="LOCAL-00004" summary="Entities korrigiert und erweitert ">
- <created>1446729323360</created>
- <option name="number" value="00004" />
- <option name="project" value="LOCAL" />
- <updated>1446729323360</updated>
- </task>
- <task id="LOCAL-00005" summary="Reset und Einspielen der Testdatensätze ">
- <created>1446729389868</created>
- <option name="number" value="00005" />
- <option name="project" value="LOCAL" />
- <updated>1446729389868</updated>
- </task>
- <task id="LOCAL-00006" summary="Korrekturen an den Content-Scripten ">
- <created>1446729418220</created>
- <option name="number" value="00006" />
- <option name="project" value="LOCAL" />
- <updated>1446729418220</updated>
- </task>
- <task id="LOCAL-00007" summary="Usability-Konzept (Entities) * Benutzer bekommen Feedback (Error, Success) ">
- <created>1446733417486</created>
- <option name="number" value="00007" />
- <option name="project" value="LOCAL" />
- <updated>1446733417486</updated>
- </task>
- <task id="LOCAL-00008" summary="Usability-Konzepte (Content) * (Benutzer bekommen Feedback)">
- <created>1446733466299</created>
- <option name="number" value="00008" />
- <option name="project" value="LOCAL" />
- <updated>1446733466299</updated>
- </task>
- <task id="LOCAL-00009" summary="Änderungen an TPersistence: => findMethoden fürs FW => unnötige Fetchmethoden entfernt => State ist wichtig und muss implementiert werden ">
- <created>1446738450939</created>
- <option name="number" value="00009" />
- <option name="project" value="LOCAL" />
- <updated>1446738450939</updated>
- </task>
- <task id="LOCAL-00010" summary="TTicket: Modifizierter State wird berücksichtigt ">
- <created>1446738581392</created>
- <option name="number" value="00010" />
- <option name="project" value="LOCAL" />
- <updated>1446738581392</updated>
- </task>
<task id="LOCAL-00011" summary="Entities mit Kommentaren ">
<created>1446739228859</created>
<option name="number" value="00011" />
@@ -728,7 +764,49 @@
<option name="project" value="LOCAL" />
<updated>1447335423584</updated>
</task>
- <option name="localTasksCounter" value="53" />
+ <task id="LOCAL-00053" summary="Aktualisierung des Frameworks * find, store und delete beziehen sich auf den aktuellen Datensatz * namespaces werden effizienter genutzt ">
+ <created>1447361958506</created>
+ <option name="number" value="00053" />
+ <option name="project" value="LOCAL" />
+ <updated>1447361958507</updated>
+ </task>
+ <task id="LOCAL-00054" summary="AutoLoader vereinfacht ">
+ <created>1447361991008</created>
+ <option name="number" value="00054" />
+ <option name="project" value="LOCAL" />
+ <updated>1447361991008</updated>
+ </task>
+ <task id="LOCAL-00055" summary="Testdaten aktualisiert ">
+ <created>1447362032441</created>
+ <option name="number" value="00055" />
+ <option name="project" value="LOCAL" />
+ <updated>1447362032441</updated>
+ </task>
+ <task id="LOCAL-00056" summary="Templates nutzen die neue MVC-Struktur ">
+ <created>1447362074993</created>
+ <option name="number" value="00056" />
+ <option name="project" value="LOCAL" />
+ <updated>1447362074993</updated>
+ </task>
+ <task id="LOCAL-00057" summary="htaccess: Umstellung auf 2 Parameter - /controller/action/ ">
+ <created>1447362108126</created>
+ <option name="number" value="00057" />
+ <option name="project" value="LOCAL" />
+ <updated>1447362108126</updated>
+ </task>
+ <task id="LOCAL-00058" summary="Umstellung der Testdaten auf testbox.de">
+ <created>1447362146110</created>
+ <option name="number" value="00058" />
+ <option name="project" value="LOCAL" />
+ <updated>1447362146110</updated>
+ </task>
+ <task id="LOCAL-00059" summary="Überarbeitete MVC-Struktur, die ich jetzt auch nachvollziehen kann. ">
+ <created>1447381441823</created>
+ <option name="number" value="00059" />
+ <option name="project" value="LOCAL" />
+ <updated>1447381441823</updated>
+ </task>
+ <option name="localTasksCounter" value="60" />
<servers />
</component>
<component name="TodoView">
@@ -741,51 +819,51 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="1" width="1936" height="1055" extended-state="0" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<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.19189766" sideWeight="0.4962162" 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.32946146" sideWeight="0.5" order="12" side_tool="true" 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="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="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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23318872" sideWeight="0.5" order="9" 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="Terminal" 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="11" 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.16044776" sideWeight="0.50378376" order="2" side_tool="true" 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="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.4" sideWeight="0.5" order="5" 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="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.33586133" sideWeight="0.5" 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" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3943662" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<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="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.32972974" sideWeight="0.5" order="7" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32946146" sideWeight="0.5" order="12" side_tool="true" 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="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.4" sideWeight="0.5" 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="false" show_stripe_button="true" weight="0.23593074" sideWeight="0.5" order="9" 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.3991323" 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="false" show_stripe_button="true" weight="0.23318872" 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="Terminal" 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="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.1913646" sideWeight="0.4962162" order="0" side_tool="false" content_ui="combo" />
+ <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="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="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.32792208" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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="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" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16044776" sideWeight="0.50378376" 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.3961039" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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="true" show_stripe_button="true" weight="0.39328277" sideWeight="0.4978678" order="3" side_tool="false" content_ui="tabs" />
</layout-to-restore>
</component>
<component name="UnknownFeatures">
@@ -803,14 +881,8 @@
<option name="myLimit" value="2678400000" />
</component>
<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="Ticket-Controller besitzt nun keine Seiteneffekte mehr. " />
- <MESSAGE value="Weitere Seiteneffekte korrigiert und behoben " />
- <MESSAGE value="Ticketsystem nach Änderungen repariert und begradigt " />
- <MESSAGE value="Ticketsystem V-0.9 " />
- <MESSAGE value="Ticketsystem V1.0 " />
- <MESSAGE value="Kleinere Korrekturen am Benutzer- und TicketController " />
- <MESSAGE value="MVC Struktur Beginn" />
<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 " />
@@ -829,147 +901,57 @@
<MESSAGE value="CSS und HTML Anpassungen w3c-validor und formulare " />
<MESSAGE value="Änderungen nach Ablehnung Namespace bfw " />
<MESSAGE value="Initialies Layout des BfWs" />
- <option name="LAST_COMMIT_MESSAGE" value="Initialies Layout des BfWs" />
+ <MESSAGE value="Aktualisierung des Frameworks * find, store und delete beziehen sich auf den aktuellen Datensatz * namespaces werden effizienter genutzt " />
+ <MESSAGE value="AutoLoader vereinfacht " />
+ <MESSAGE value="Testdaten aktualisiert " />
+ <MESSAGE value="Templates nutzen die neue MVC-Struktur " />
+ <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. " />
<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" />
+ <option name="CHANGE_BROWSER_SETTINGS">
+ <map>
+ <entry key="hg4idea">
+ <value>
+ <ChangeBrowserSettings>
+ <option name="DATE_BEFORE" />
+ <option name="DATE_AFTER" />
+ </ChangeBrowserSettings>
+ </value>
+ </entry>
+ </map>
+ </option>
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="94" />
+ <option name="time" value="102" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/library/smarty/libs/sysplugins/smarty_internal_template.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-15.153846">
- <caret line="920" column="0" selection-start-line="920" selection-start-column="0" selection-end-line="920" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/error/error.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.2692308">
- <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$/templates/footer.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-7.8461537">
- <caret line="12" column="6" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/js/main.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.07522124">
- <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$/templates/benutzerverwaltungs/resetpasswort.tpl">
+ <entry file="file://$PROJECT_DIR$/library/log4php/configurators/LoggerConfiguratorDefault.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$/templates/benutzerverwaltungs/anmelden.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
+ <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$/templates/benutzerverwaltungs/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$/templates/benutzerverwaltungs/registrieren.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="3" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/config/log4php.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.07825086">
- <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/templates/benutzerverwaltungs/meinprofil.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
- <caret line="0" column="40" selection-start-line="0" selection-start-column="40" selection-end-line="0" selection-end-column="40" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/benutzerverwaltungs/benutzerverwaltung.tpl">
+ <entry file="file://$PROJECT_DIR$/library/log4php/configurators/LoggerConfigurationAdapterXML.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
- <caret line="0" column="47" selection-start-line="0" selection-start-column="47" selection-end-line="0" selection-end-column="47" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/standard_2.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5330948">
- <caret line="323" column="9" selection-start-line="323" selection-start-column="9" selection-end-line="323" selection-end-column="9" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/home/home.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-9.807693">
- <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+ <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$/templates/header.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.5769231">
- <caret line="13" column="121" selection-start-line="13" selection-start-column="121" selection-end-line="13" selection-end-column="121" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/layout.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-13.076923">
- <caret line="20" column="40" selection-start-line="20" selection-start-column="40" selection-end-line="20" selection-end-column="40" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/tickets/ticketanlegen.tpl">
+ <entry file="file://$PROJECT_DIR$/library/log4php/configurators/LoggerConfigurationAdapterPHP.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-19.615385">
- <caret line="30" column="110" selection-start-line="30" selection-start-column="110" selection-end-line="30" selection-end-column="110" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/tickets/tickets.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.192308">
- <caret line="77" column="5" selection-start-line="77" selection-start-column="5" selection-end-line="77" selection-end-column="5" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/templates/history/historie.tpl">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.192308">
- <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+ <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>
@@ -978,133 +960,123 @@
<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$/css/main.css">
+ <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/PDO.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="1.6422182">
- <caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/library/log4php/Logger.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-258.92307">
- <caret line="461" column="27" selection-start-line="461" selection-start-column="27" selection-end-line="461" selection-end-column="27" />
+ <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>
<entry file="file://$PROJECT_DIR$/library/log4php/LoggerAppender.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="2.0679786">
+ <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>
+ <entry file="file://$PROJECT_DIR$/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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/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" />
+ <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.0">
+ <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>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/TStatus.php">
+ <entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.3076923">
- <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+ <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>
- <entry file="file://$PROJECT_DIR$/index.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/resetpasswort.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-4.576923">
- <caret line="7" column="14" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
- <folding>
- <element signature="e#7#34#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/TView.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.3076923">
- <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+ <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/model/TAction.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/error/index.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.3076923">
- <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+ <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/model/TGroup.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/layout.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
- <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
+ <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/model/THistory.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/footer.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
- <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
+ <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/model/TText.php">
+ <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="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+ <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/model/TUser.php">
+ <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.65384614">
- <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
- <folding>
- <marker date="1447331073637" expanded="true" signature="1963:2077" placeholder="SELECT * FRO..%s..." />
- <marker date="1447331073637" expanded="true" signature="2631:2907" placeholder="SELECT u.id,..t_user..." />
- <marker date="1447331073637" expanded="true" signature="3446:3574" placeholder="SELECT count..t_ticket..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/View.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="41.76923">
- <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
+ <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/model/Model.php">
+ <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.12164579">
- <caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
+ <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/controller/TicketsController.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/registrieren.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33273703">
- <caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
+ <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/DBInterface.php">
+ <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" />
@@ -1112,136 +1084,247 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/Dispatcher.php">
+ <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="50" column="66" selection-start-line="50" selection-start-column="66" selection-end-line="50" selection-end-column="66" />
+ <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" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/Response.php">
+ <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.33452594">
- <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
- <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.0">
- <caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
+ <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/controller/Controller.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/benutzerverwaltung/anmelden.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.34263566">
- <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+ <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/controller/ErrorController.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/view/header.tpl">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.052713178">
- <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
+ <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$/classes/bfw/mvc/controller/HistoryController.php">
+ <entry file="file://$PROJECT_DIR$/css/main.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.28992248">
- <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/config/config.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-21.576923">
- <caret line="35" column="16" selection-start-line="35" selection-start-column="16" selection-end-line="35" selection-end-column="16" />
+ <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" />
<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.0">
- <caret line="11" column="80" selection-start-line="11" selection-start-column="80" selection-end-line="11" selection-end-column="80" />
+ <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$/data/import/test_tickets.csv">
+ <entry file="file://$PROJECT_DIR$/library/smarty/libs/sysplugins/smartyexception.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 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$/classes/bfw/mvc/controller/BenutzerverwaltungsController.php">
+ <entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.026356589">
- <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/model/TTicket.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="100.96154">
- <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+ <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$/library/smarty/demo/templates/footer.tpl">
+ <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">
+ <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.026356589">
- <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
- <folding />
+ <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>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/classes/bfw/mvc/controller/HomeController.php">
+ <entry file="file://$PROJECT_DIR$/classes/bfw/core/Model.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-12.423077">
+ <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>
+ </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">
+ <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>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/classes/bfw/Dispatcher.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.2372093">
- <caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
+ <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$/classes/bfw/Database.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.026356589">
- <caret line="372" column="0" selection-start-line="372" selection-start-column="0" selection-end-line="372" selection-end-column="0" />
- <folding>
- <marker date="1447331919883" expanded="true" signature="3192:3287" placeholder="SELECT * FRO..${$table}..." />
- <marker date="1447331919883" expanded="true" signature="3967:4060" placeholder="SELECT * FRO..%s..." />
- <marker date="1447331919883" expanded="true" signature="4608:4708" placeholder="SELECT * FRO..%s..." />
- <marker date="1447331919883" expanded="true" signature="5331:5431" placeholder="SELECT * FRO..%s..." />
- <marker date="1447331919883" expanded="true" signature="5932:6034" placeholder="SELECT * FRO..%s..." />
- <marker date="1447331919883" expanded="true" signature="6678:6780" placeholder="SELECT * FRO..%s..." />
- <marker date="1447331919883" expanded="true" signature="7791:7848" placeholder="INSERT INTO `%s`..." />
- <marker date="1447331919883" expanded="true" signature="8643:8701" placeholder="UPDATE `%s` ..." />
- <marker date="1447331919883" expanded="true" signature="9179:9223" placeholder="DELETE FROM ..." />
- <marker date="1447331919883" expanded="true" signature="10274:10311" placeholder="DELETE FROM ..." />
- <marker date="1447331919883" expanded="true" signature="10355:10393" placeholder="DELETE FROM ..." />
- <marker date="1447331919883" expanded="true" signature="10437:10472" placeholder="DELETE FROM ..." />
- <marker date="1447331919883" expanded="true" signature="10517:10559" placeholder="ALTER TABLE `t_history`..." />
- <marker date="1447331919883" expanded="true" signature="10603:10644" placeholder="ALTER TABLE `t_ticket`..." />
- <marker date="1447331919883" expanded="true" signature="10688:10727" placeholder="ALTER TABLE `t_user`..." />
- <marker date="1447331919883" expanded="true" signature="12473:12512" placeholder="INSERT INTO ..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/logs/tickets.log">
+ <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" />
@@ -1251,14 +1334,78 @@
</entry>
<entry file="file://$PROJECT_DIR$/.hgignore">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.20029455">
- <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <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" />
+ <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" />
<option name="RECENT_HG_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="masterDetails">
--- a/classes/bfw/Dispatcher.php
+++ b/classes/bfw/Dispatcher.php
@@ -9,6 +9,7 @@
use bfw\core\Controller;
use bfw\core\View;
+use bfw\entities\TView;
use ReflectionClass;
use ReflectionException;
--- a/classes/bfw/core/Controller.php
+++ b/classes/bfw/core/Controller.php
@@ -15,7 +15,7 @@
*
*/
abstract class Controller {
- protected $logger = null;
+ protected $logger;
/**
* @var Model
*/
@@ -46,7 +46,7 @@
$this->model = $model;
$this->view = new View($this, $model);
- $this->logger = Logger::getLogger(__CLASS__);
+ $this->logger = Logger::getLogger(get_class($this));
}
/**
--- a/classes/bfw/core/Entity.php
+++ b/classes/bfw/core/Entity.php
@@ -20,7 +20,7 @@
* @method setId($param)
*/
class Entity {
- protected $logger = null;
+ protected $logger;
protected $table;
protected $db;
@@ -31,7 +31,7 @@
* @param $table
*/
public function __construct($table) {
- $this->logger = Logger::getLogger('__CLASS__');
+ $this->logger = Logger::getLogger(get_class($this));
$this->db = Database::getInstance();
@@ -105,7 +105,7 @@
* <b>Die Findall Methode erzeugt typsicher den Supertyp</b>
*
* @param bool|false $sys
- * @return Model[]
+ * @return Entity[]
*/
public function findAll($sys = false) {
$this->logger->info(sprintf('%s() ', __METHOD__));
@@ -135,7 +135,8 @@
*
* @param $field
* @param $value
- * @return Model
+ *
+ * @return Entity
*/
public function findByField($field, $value) {
$this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $field, $value));
@@ -156,7 +157,8 @@
* Erzeugt on the fly ein array mit dem Supertyp der Klasseninstanz
* @param $field
* @param $value
- * @return Model[]
+ *
+ * @return Entity[]
*/
public function findAllByField($field, $value) {
$this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $field, $value));
--- a/classes/bfw/core/Model.php
+++ b/classes/bfw/core/Model.php
@@ -14,9 +14,9 @@
*
*/
class Model {
- protected $logger = null;
+ protected $logger;
public function __construct() {
- $this->logger = Logger::getLogger(__CLASS__);
+ $this->logger = Logger::getLogger(get_class($this));
}
}
\ No newline at end of file
--- a/classes/bfw/database/Database.php
+++ b/classes/bfw/database/Database.php
@@ -12,16 +12,15 @@
use PDOException;
class Database implements DBInterface {
- private static $logger = null;
private static $handle = null;
-
+ private $logger;
/**
* @var PDO
*/
private $pdo;
private function __construct() {
- self::$logger = Logger::getLogger('__CLASS__');
+ $this->logger = Logger::getLogger(__CLASS__);
$dsn = 'mysql:host=localhost;dbname=ticketsystem';
$config = array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8");
@@ -59,12 +58,11 @@
*/
public function cleanup() {
try {
- $status = $this->pdo->exec("DELETE FROM `t_ticket` WHERE `id` > 1;");
- $status = $this->pdo->exec("DELETE FROM `t_history` WHERE `id` > 1;");
- $status = $this->pdo->exec("DELETE FROM `t_user` WHERE `id` > 2;");
- $status = $this->pdo->exec("ALTER TABLE `t_history` AUTO_INCREMENT = 1;");
- $status = $this->pdo->exec("ALTER TABLE `t_ticket` AUTO_INCREMENT = 1;");
- $status = $this->pdo->exec("ALTER TABLE `t_user` AUTO_INCREMENT = 2;");
+ $this->pdo->exec("DELETE FROM `t_user` WHERE `id` > 2;");
+ $this->pdo->exec("DELETE FROM `t_group` WHERE `id` > 5;");
+
+ $this->pdo->exec("ALTER TABLE `t_user` AUTO_INCREMENT = 2;");
+ $this->pdo->exec("ALTER TABLE `t_group` AUTO_INCREMENT = 5;");
} catch (PDOException $pdoe) {
return false;
}
@@ -98,7 +96,14 @@
fclose($handle);
}
+ /**
+ * @param $table
+ * @param $cond
+ * @return array|null
+ */
public function fetchAll($table, $cond) {
+ $this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $table, $cond));
+
return $this->fetch($table, $cond);
}
@@ -108,6 +113,8 @@
* @return array|null
*/
public function fetch($table, $cond) {
+ $this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $table, $cond));
+
$stmt = $this->pdo->prepare(sprintf('
SELECT
*
@@ -158,7 +165,14 @@
fclose($handle);
}
+ /**
+ * @param $table
+ * @param $id
+ * @return mixed|null
+ */
public function find($table, $id) {
+ $this->logger->info(sprintf('%s(%s, %d) ', __METHOD__, $table, $id));
+
$stmt = $this->pdo->prepare(
sprintf('
SELECT
@@ -180,7 +194,14 @@
return null;
}
+ /**
+ * @param $table
+ * @param $sys
+ * @return array|null
+ */
public function findAll($table, $sys) {
+ $this->logger->info(sprintf('%s(%s, %d) ', __METHOD__, $table, $sys));
+
$stmt = $this->pdo->prepare(
sprintf('
SELECT
@@ -202,7 +223,15 @@
return null;
}
+ /**
+ * @param $table
+ * @param $field
+ * @param $value
+ * @return mixed|null
+ */
public function findByField($table, $field, $value) {
+ $this->logger->info(sprintf('%s(%s, %s, %s) ', __METHOD__, $table, $field, $value));
+
$stmt = $this->pdo->prepare(
sprintf('
SELECT
@@ -223,7 +252,15 @@
return null;
}
+ /**
+ * @param $table
+ * @param $field
+ * @param $value
+ * @return array|null
+ */
function findAllByField($table, $field, $value) {
+ $this->logger->info(sprintf('%s(%s, %s, %s) ', __METHOD__, $table, $field, $value));
+
$stmt = $this->pdo->prepare(
sprintf('
SELECT
@@ -244,7 +281,13 @@
return null;
}
+ /**
+ * @param $sql
+ * @return array|null
+ */
public function query($sql) {
+ $this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $sql));
+
$stmt = $this->pdo->query($sql);
if ($stmt) {
@@ -254,6 +297,11 @@
return null;
}
+ /**
+ * @param $table
+ * @param $array
+ * @return int
+ */
public function persist($table, $array) {
$this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $table, print_r($array, true)));
@@ -283,6 +331,12 @@
return $this->pdo->exec($sql);
}
+ /**
+ * @param $table
+ * @param $id
+ * @param $array
+ * @return int
+ */
public function store($table, $id, $array) {
$this->logger->info(sprintf('%s(%s, %d, %s) ', __METHOD__, $table, $id, print_r($array, true)));
@@ -304,6 +358,11 @@
return $this->pdo->exec($sql);
}
+ /**
+ * @param $table
+ * @param $id
+ * @return int
+ */
public function delete($table, $id) {
$this->logger->info(sprintf('%s(%s, %s) ', __METHOD__, $table, $id));
--- a/classes/bfw/entities/TView.php
+++ b/classes/bfw/entities/TView.php
@@ -7,6 +7,8 @@
namespace bfw\entities;
+use bfw\core\Entity;
+
/**
* Class TView
*
--- a/config/config.php
+++ b/config/config.php
@@ -1,10 +1,10 @@
<?php
/**
- *
+ * Konfigurationsbereich des Bröker Frameworks
*/
-define('TICKET_PATH', dirname(dirname(__FILE__)));
+define('BFW_PATH', dirname(dirname(__FILE__)));
/**
* Standard-Autoloader für die Basis-Klassen des Projekts
@@ -14,7 +14,7 @@
*/
function bfw_autoLoader($class) {
$nsClass = str_replace('\\', '/', $class);
- $filename = sprintf('%s/classes/%s.php', TICKET_PATH, $nsClass);
+ $filename = sprintf('%s/classes/%s.php', BFW_PATH, $nsClass);
$classPath = sprintf('classes/%s.php', $nsClass);
if (file_exists($filename)) {
@@ -27,7 +27,7 @@
}
require_once 'library/log4php/Logger.php';
-Logger::configure(TICKET_PATH . '/config/log4php.xml');
+Logger::configure(BFW_PATH . '/config/log4php.xml');
spl_autoload_register('bfw_autoLoader');
--- a/config/log4php.xml
+++ b/config/log4php.xml
@@ -2,7 +2,7 @@
<configuration xmlns="http://logging.apache.org/log4php/">
<appender name="default" class="LoggerAppenderFile">
<layout class="LoggerLayoutSimple"/>
- <param name="file" value="/var/www/vhosts/TicketSystem/logs/tickets.log"/>
+ <param name="file" value="/var/www/vhosts/TicketSystem/logs/bfw.log"/>
<param name="append" value="true"/>
</appender>
<root>