A lot menu templates added, XMLs rewritten, TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 767442500b32b6541ffe9c5aceb1ee68ac2c24ab..8b128c6881cd0884326f4ee5cbdd2e10f95712fc 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -241,6 +241,32 @@ application/ship-simu/templates/de/code/login_form.ctp -text
 application/ship-simu/templates/de/code/login_main.ctp -text
 application/ship-simu/templates/de/code/logout_done.ctp -text
 application/ship-simu/templates/de/code/mail_debug.ctp -text
+application/ship-simu/templates/de/code/menu_entries_end.ctp -text
+application/ship-simu/templates/de/code/menu_entries_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_home_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_home_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_login_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_login_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_register_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_register_start.ctp -text
+application/ship-simu/templates/de/code/menu_entry_terms_end.ctp -text
+application/ship-simu/templates/de/code/menu_entry_terms_start.ctp -text
+application/ship-simu/templates/de/code/menu_footer_end.ctp -text
+application/ship-simu/templates/de/code/menu_footer_start.ctp -text
+application/ship-simu/templates/de/code/menu_global_end.ctp -text
+application/ship-simu/templates/de/code/menu_global_start.ctp -text
+application/ship-simu/templates/de/code/menu_header_end.ctp -text
+application/ship-simu/templates/de/code/menu_header_start.ctp -text
+application/ship-simu/templates/de/code/menu_text_end.ctp -text
+application/ship-simu/templates/de/code/menu_text_start.ctp -text
+application/ship-simu/templates/de/code/menu_title_home_end.ctp -text
+application/ship-simu/templates/de/code/menu_title_home_start.ctp -text
+application/ship-simu/templates/de/code/menu_title_law_end.ctp -text
+application/ship-simu/templates/de/code/menu_title_law_start.ctp -text
 application/ship-simu/templates/de/code/register_form.ctp -text
 application/ship-simu/templates/de/code/shipsimu_main.ctp -text
 application/ship-simu/templates/de/code/status.ctp -text

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 2832f83f011880fd95e8a8444b14f82aa15d3677..ca1f053523e52b9b6e912495e273f085ae9d8cff 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -204,7 +204,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
 
                        // Remember this template and the application for later usage
                        $this->loadedTemplates->append(array(
-                               'template_class'   => $templateInstance,
+                               'web_template_class'   => $templateInstance,
                                'app_instance' => $appInstance
                        ));
                }
@@ -270,7 +270,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
                        } elseif (count($curr) != 2) {
                                // Not expected count of entries
                                throw new InvalidArrayCountException(array($this, "curr", count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
-                       } elseif (!isset($curr['template_class']) || (!isset($curr['app_instance']))) {
+                       } elseif (!isset($curr['web_template_class']) || (!isset($curr['app_instance']))) {
                                // Expected entries missing
                                throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
                        }

diff --git a/application/ship-simu/templates/de/code/menu_entries_end.ctp b/application/ship-simu/templates/de/code/menu_entries_end.ctp
new file mode 100644 (file)
index 0000000..fadc5c8
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entries_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below all menu entries //-->

diff --git a/application/ship-simu/templates/de/code/menu_entries_start.ctp b/application/ship-simu/templates/de/code/menu_entries_start.ctp
new file mode 100644 (file)
index 0000000..df73178
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entries_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above all entries of the menu //-->
+<div id="menu_entries">

diff --git a/application/ship-simu/templates/de/code/menu_entry_home_end.ctp b/application/ship-simu/templates/de/code/menu_entry_home_end.ctp
new file mode 100644 (file)
index 0000000..ae249a9
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_home_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the entry 'home' //-->

diff --git a/application/ship-simu/templates/de/code/menu_entry_home_start.ctp b/application/ship-simu/templates/de/code/menu_entry_home_start.ctp
new file mode 100644 (file)
index 0000000..248e571
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_home_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the entry 'home' //-->
+<div id="menu_entry_home">

diff --git a/application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp b/application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp
new file mode 100644 (file)
index 0000000..e96aec5
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_imprint_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the entry 'imprint' //-->

diff --git a/application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp b/application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp
new file mode 100644 (file)
index 0000000..81a9bf5
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_imprint_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the entry 'imprint' //-->
+<div id="menu_entry_imprint">

diff --git a/application/ship-simu/templates/de/code/menu_entry_login_end.ctp b/application/ship-simu/templates/de/code/menu_entry_login_end.ctp
new file mode 100644 (file)
index 0000000..84d30c5
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_login_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the entry 'login' //-->

diff --git a/application/ship-simu/templates/de/code/menu_entry_login_start.ctp b/application/ship-simu/templates/de/code/menu_entry_login_start.ctp
new file mode 100644 (file)
index 0000000..5f6368b
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_login_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the entry 'login' //-->
+<div id="menu_entry_login">

diff --git a/application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp b/application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp
new file mode 100644 (file)
index 0000000..cc297ad
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_pillory_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the entry 'pillory' //-->

diff --git a/application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp b/application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp
new file mode 100644 (file)
index 0000000..0c4c688
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_pillory_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the entry 'pillory' //-->
+<div id="menu_entry_pillory">

diff --git a/application/ship-simu/templates/de/code/menu_entry_register_end.ctp b/application/ship-simu/templates/de/code/menu_entry_register_end.ctp
new file mode 100644 (file)
index 0000000..90a8e66
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_register_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the entry 'register' //-->

diff --git a/application/ship-simu/templates/de/code/menu_entry_register_start.ctp b/application/ship-simu/templates/de/code/menu_entry_register_start.ctp
new file mode 100644 (file)
index 0000000..36e2569
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_register_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the entry 'register' //-->
+<div id="menu_entry_register">

diff --git a/application/ship-simu/templates/de/code/menu_entry_terms_end.ctp b/application/ship-simu/templates/de/code/menu_entry_terms_end.ctp
new file mode 100644 (file)
index 0000000..a940440
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_terms_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the entry 'terms' //-->

diff --git a/application/ship-simu/templates/de/code/menu_entry_terms_start.ctp b/application/ship-simu/templates/de/code/menu_entry_terms_start.ctp
new file mode 100644 (file)
index 0000000..d250b45
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_entry_terms_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the entry 'terms' //-->
+<div id="menu_entry_terms">

diff --git a/application/ship-simu/templates/de/code/menu_footer_end.ctp b/application/ship-simu/templates/de/code/menu_footer_end.ctp
new file mode 100644 (file)
index 0000000..5b0db02
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_footer_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the menu footer //-->

diff --git a/application/ship-simu/templates/de/code/menu_footer_start.ctp b/application/ship-simu/templates/de/code/menu_footer_start.ctp
new file mode 100644 (file)
index 0000000..b3aa8ba
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_footer_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the footer the menu //-->
+<div id="menu_footer">

diff --git a/application/ship-simu/templates/de/code/menu_global_end.ctp b/application/ship-simu/templates/de/code/menu_global_end.ctp
new file mode 100644 (file)
index 0000000..9de5599
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_global_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the whole menu //-->

diff --git a/application/ship-simu/templates/de/code/menu_global_start.ctp b/application/ship-simu/templates/de/code/menu_global_start.ctp
new file mode 100644 (file)
index 0000000..d72c0a5
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_global_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the whole menu //-->
+<div id="menu">

diff --git a/application/ship-simu/templates/de/code/menu_header_end.ctp b/application/ship-simu/templates/de/code/menu_header_end.ctp
new file mode 100644 (file)
index 0000000..f0fde0c
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_header_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the menu header //-->

diff --git a/application/ship-simu/templates/de/code/menu_header_start.ctp b/application/ship-simu/templates/de/code/menu_header_start.ctp
new file mode 100644 (file)
index 0000000..a7d6c92
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_header_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the header the menu //-->
+<div id="menu_header">

diff --git a/application/ship-simu/templates/de/code/menu_text_end.ctp b/application/ship-simu/templates/de/code/menu_text_end.ctp
new file mode 100644 (file)
index 0000000..deb8565
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_text_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the menu text //-->

diff --git a/application/ship-simu/templates/de/code/menu_text_start.ctp b/application/ship-simu/templates/de/code/menu_text_start.ctp
new file mode 100644 (file)
index 0000000..489e9b9
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_text_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the text the menu //-->
+<div id="menu_text">

diff --git a/application/ship-simu/templates/de/code/menu_title_home_end.ctp b/application/ship-simu/templates/de/code/menu_title_home_end.ctp
new file mode 100644 (file)
index 0000000..b0d3494
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_title_home_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the title for menu 'home' //-->

diff --git a/application/ship-simu/templates/de/code/menu_title_home_start.ctp b/application/ship-simu/templates/de/code/menu_title_home_start.ctp
new file mode 100644 (file)
index 0000000..36683a2
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_title_home_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the title for menu 'home' //-->
+<div id="menu_title_home">

diff --git a/application/ship-simu/templates/de/code/menu_title_law_end.ctp b/application/ship-simu/templates/de/code/menu_title_law_end.ctp
new file mode 100644 (file)
index 0000000..98736c8
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_title_law_end.ctp
@@ -0,0 +1,2 @@
+</div>
+<!-- Code that should be displayed below the title for menu 'law' //-->

diff --git a/application/ship-simu/templates/de/code/menu_title_law_start.ctp b/application/ship-simu/templates/de/code/menu_title_law_start.ctp
new file mode 100644 (file)
index 0000000..bd10562
--- /dev/null
+++ b/application/ship-simu/templates/de/code/menu_title_law_start.ctp
@@ -0,0 +1,2 @@
+<!-- Code that should be displayed above the title for menu 'law' //-->
+<div id="menu_title_law">

diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml
index bb3c6bcd83788d5c036172450e2e39daea046928..8760e6364586050c304874423db7271245a1b181 100644 (file)
--- a/application/ship-simu/templates/de/menu/base_menu.xml
+++ b/application/ship-simu/templates/de/menu/base_menu.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <menu>
        <header>
-               <title class="{!menu_title_class">
+               <title class="{!menu_title_class?}">
                        {?menu_title?}
                </title>
        </header>
-       <entries>
-               <entry id="{?entry_id?}">
-                       <anchor id="{?anchor_id?}" link="{?anchor_link?}" title="{?anchor_title?}" target="{?anchor_target?}" rel="{?anchor_rel?}">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=]]>
-                       </anchor>
-               </entry>
-               <advert id="{?advert_id?}">
-                       <![CDATA[{?advert_code?}]]>
-               </advert>
-       </entries>
+       <entries-content>
+               {?menu_entries?}
+       </entries-content>
        <footer id="{!footer_id?}">
                <text class="{?footer_design_class?}">
-                       {?footer_text?}
+                       {?menu_footer?}
                </text>
        </footer>
 </menu>

diff --git a/application/ship-simu/templates/de/menu/generic_menu_entries.xml b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
index 79e5b66c9f93185fba67d5c86ec2892644acd10a..beb9c4865a7ca69e3a0ddcca5c9ad685d12e6f7f 100644 (file)
--- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml
+++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
@@ -1,25 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<entries extends="base_menu">
-       <entry id="home">
-               <anchor id="menu_home" link="Home" title="Home">
-                       <![CDATA[index.php?app={?app_short_name?}]]>
-               </anchor>
-       </entry>
-       <entry id="login">
-               <anchor id="menu_login" link="Einloggen" title="Zum Spiel {?app_name?} einloggen">
-                       <![CDATA[index.php?app={?app_short_name?}&amp;page=login]]>
-               </anchor>
-       </entry>
-       <entry id="register">
-               <anchor id="menu_register" link="Home" title="Zur Anmeldeseite">
-                       <![CDATA[index.php?app={?app_short_name?}&amp;page=register]]>
-               </anchor>
-       </entry>
-       <!--
-       <entry id="">
-               <anchor id="menu_" link="" title="" target="" rel="">
-                       <![CDATA[index.php?app={?app_short_name?}&amp;page=]]>
-               </anchor>
-       </entry>
-       //-->
-</entries>
+<!--@TODO Later versions: <menu extends="base_menu">//-->
+<menu>
+       <header>
+               <title id="home" class="menu_title_home">
+                       <![CDATA[Home:]]>
+               </title>
+       </header>
+       <entries>
+               <entry id="home">
+                       <anchor id="menu_home" link="Home" title="Home">
+                               <![CDATA[index.php?app={?app_short_name?}]]>
+                       </anchor>
+               </entry>
+               <entry id="login">
+                       <anchor id="menu_login" link="Einloggen" title="Zum Spiel {?app_name?} einloggen">
+                               <![CDATA[index.php?app={?app_short_name?}&amp;page=login]]>
+                       </anchor>
+               </entry>
+               <entry id="register">
+                       <anchor id="menu_register" link="Home" title="Zur Anmeldeseite">
+                               <![CDATA[index.php?app={?app_short_name?}&amp;page=register]]>
+                       </anchor>
+               </entry>
+       </entries>
+       <header>
+               <title id="law" class="menu_title_law">
+                       <![CDATA[Rechtliches:]]>
+               </title>
+       </header>
+       <entries>
+               <entry id="imprint">
+                       <anchor id="menu_imprint" link="Impressum" title="Impressum">
+                               <![CDATA[index.php?app={?app_short_name?}&amp;page=imprint]]>
+                       </anchor>
+               </entry>
+               <entry id="terms">
+                       <anchor id="menu_terms" link="ANBs" title="Allgemeine Nutzungsbedingungen">
+                               <![CDATA[index.php?app={?app_short_name?}&amp;page=terms]]>
+                       </anchor>
+               </entry>
+               <entry id="pillory">
+                       <anchor id="menu_pillory" link="Pranger" title="Zum Pranger">
+                               <![CDATA[index.php?app={?app_short_name?}&amp;page=pillory]]>
+                       </anchor>
+               </entry>
+               <!--
+               <entry id="">
+                       <anchor id="menu_" link="" title="" target="" rel="">
+                               <![CDATA[index.php?app={?app_short_name?}&amp;page=]]>
+                       </anchor>
+               </entry>
+               //-->
+       </entries>
+       <footer id="generic_menu_footer">
+               <text class="menu_footer">
+                       <![CDATA[Leer]]>
+               </text>
+       </footer>
+</menu>

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 8778146d3e8673b01d1be56b33fe5f15cfe74175..4875c9c8b10e0f568963b23b2b80470e0a75135e 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -36,9 +36,9 @@
 ./application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php:85:       * @todo        Add functionality here
 ./application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php:90:      * @todo        Add some more pre/post filters to the controller
 ./application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php:97:     * @todo        Add more filters
-./application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php:132:   * @todo        Maybe we need some filters here?
+./application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php:138:   * @todo        Maybe we need some filters here?
 ./application/ship-simu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php:59:    * @todo        0% done
-./application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php:132:  * @todo        Maybe we need some filters here?
+./application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php:138:  * @todo        Maybe we need some filters here?
 ./application/ship-simu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php:59:   * @todo        0% done
 ./application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php:59:  * @todo        0% done
 ./application/ship-simu/main/commands/web/government/class_WebShipsimuGovernmentStartupCommand.php:75:  * @todo        Maybe we need some filters here?
@@ -81,11 +81,11 @@
 ./inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php:10: * @todo               Rename this class to NoFoundEntryException
 ./inc/classes/exceptions/main/class_MissingMethodException.php:13: * @todo             Try to rewrite user/guest login classes and mark this exception as deprecated
 ./inc/classes/interfaces/class_FrameworkInterface.php:11: * @todo              Find a better name for this interface
-./inc/classes/main/class_BaseFrameworkSystem.php:1068:  * @todo        Write a logging mechanism for productive mode
-./inc/classes/main/class_BaseFrameworkSystem.php:1082:                 // @TODO Finish this part!
-./inc/classes/main/class_BaseFrameworkSystem.php:109:  // @todo Try to clean these constants up
-./inc/classes/main/class_BaseFrameworkSystem.php:190:   * @todo        This is old code. Do we still need this old lost code?
-./inc/classes/main/class_BaseFrameworkSystem.php:258:   * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
+./inc/classes/main/class_BaseFrameworkSystem.php:1078:  * @todo        Write a logging mechanism for productive mode
+./inc/classes/main/class_BaseFrameworkSystem.php:1092:                 // @TODO Finish this part!
+./inc/classes/main/class_BaseFrameworkSystem.php:119:  // @todo Try to clean these constants up
+./inc/classes/main/class_BaseFrameworkSystem.php:200:   * @todo        This is old code. Do we still need this old lost code?
+./inc/classes/main/class_BaseFrameworkSystem.php:268:   * @todo        SearchableResult and UpdateableResult shall have a super interface to use here
 ./inc/classes/main/commands/web/class_WebLoginAreaCommand.php:64:       * @todo        Add some stuff here: Some personal data, app/game related data
 ./inc/classes/main/commands/web/class_WebProblemCommand.php:58:         * @todo        0% done
 ./inc/classes/main/commands/web/class_WebStatusCommand.php:58:  * @todo        0% done
@@ -111,13 +111,13 @@
 ./inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php:97:  * @todo        0% done
 ./inc/classes/main/filter/update/class_UserUpdateFilter.php:55:         * @todo        Add more user updates here
 ./inc/classes/main/filter/verifier/class_AccountPasswordVerifierFilter.php:57:  * @todo        Rewrite handling of different password fields
-./inc/classes/main/helper/class_BaseHelper.php:176:     * @todo        Rewrite this method using a helper class for filtering data
-./inc/classes/main/helper/class_BaseHelper.php:205:                    // @TODO Try to log it here
-./inc/classes/main/helper/web/class_BaseWebHelper.php:151:      * @todo        Implement check if rules have been changed
+./inc/classes/main/helper/class_BaseHelper.php:173:     * @todo        Rewrite this method using a helper class for filtering data
+./inc/classes/main/helper/class_BaseHelper.php:202:                    // @TODO Try to log it here
 ./inc/classes/main/helper/web/forms/class_WebFormHelper.php:102:        * @todo        Add some unique PIN here to bypass problems with some browser and/or extensions
 ./inc/classes/main/helper/web/forms/class_WebFormHelper.php:621:        * @todo        Add checking if sub option is already added
 ./inc/classes/main/helper/web/forms/class_WebFormHelper.php:649:        * @todo        Add checking if sub option is already added
 ./inc/classes/main/helper/web/forms/class_WebFormHelper.php:683:                       // @TODO We need to log this later
+./inc/classes/main/helper/web/forms/class_WebFormHelper.php:852:        * @todo        Implement check if rules have been changed
 ./inc/classes/main/helper/web/links/class_WebLinkHelper.php:184:        * @todo        Completely unimplemented
 ./inc/classes/main/images/class_BaseImage.php:156:      * @todo        Find something usefull for this method.
 ./inc/classes/main/images/class_BaseImage.php:166:      * @todo        Find something usefull for this method.
@@ -130,7 +130,9 @@
 ./inc/classes/main/images/class_BaseImage.php:255:      * @todo        Find something usefull for this method.
 ./inc/classes/main/io/class_FileIoStream.php:74:        * @todo        This method needs heavy rewrite
 ./inc/classes/main/mailer/debug/class_DebugMailer.php:124:      * @todo        0% done
+./inc/classes/main/menu/class_BaseMenu.php:59:                 // @TODO Should we log it here? We should, because it will be silently ignored.
 ./inc/classes/main/output/class_ConsoleOutput.php:56:          // @TODO Need to rewrite this to $requestInstance->addHeader()
+./inc/classes/main/parser/xml/class_XmlParser.php:69:                  // @TODO We need to find a fallback solution here
 ./inc/classes/main/points/class_UserPoints.php:100:     * @todo        Finish loading part of points
 ./inc/classes/main/request/console/class_ConsoleRequest.php:115:               // @TODO There are no cookies on console
 ./inc/classes/main/request/console/class_ConsoleRequest.php:55:         * @todo        Needs to be implemented
@@ -138,25 +140,26 @@
 ./inc/classes/main/response/http/class_HttpResponse.php:78:     * @todo        Why are these parameters conflicting?
 ./inc/classes/main/response/http/class_HttpResponse.php:79:     * @todo        If the return statement is removed and setcookie() commented out,
 ./inc/classes/main/response/http/class_HttpResponse.php:80:     * @todo        this will send only one cookie out, the first one.
-./inc/classes/main/response/image/class_ImageResponse.php:93:   * @todo        Encryption of cookie data not yet supported.
-./inc/classes/main/response/image/class_ImageResponse.php:94:   * @todo        Why are these parameters conflicting?
-./inc/classes/main/response/image/class_ImageResponse.php:95:   * @todo        If the return statement is removed and setcookie() commented out,
-./inc/classes/main/response/image/class_ImageResponse.php:96:   * @todo        this will send only one cookie out, the first one.
+./inc/classes/main/response/image/class_ImageResponse.php:88:   * @todo        Encryption of cookie data not yet supported.
+./inc/classes/main/response/image/class_ImageResponse.php:89:   * @todo        Why are these parameters conflicting?
+./inc/classes/main/response/image/class_ImageResponse.php:90:   * @todo        If the return statement is removed and setcookie() commented out,
+./inc/classes/main/response/image/class_ImageResponse.php:91:   * @todo        this will send only one cookie out, the first one.
 ./inc/classes/main/result/class_DatabaseResult.php:226:         * @todo        0% done
 ./inc/classes/main/result/class_DatabaseResult.php:379:4        * @todo        Find a caching way without modifying the result array
 ./inc/classes/main/rng/class_RandomNumberGenerator.php:150:     * @todo        I had a better random number generator here but now it is somewhere lost :(
 ./inc/classes/main/rng/class_RandomNumberGenerator.php:83:      * @todo        Add site key for stronger salt!
-./inc/classes/main/template/class_BaseTemplateEngine.php:1303:                 // @TODO We need to find a fallback solution here
 ./inc/classes/main/template/class_BaseTemplateEngine.php:810:   * @todo        Unfinished work or don't die here.
 ./inc/classes/main/template/class_BaseTemplateEngine.php:827:                          // @TODO Non-string found so we need some deeper analysis...
 ./inc/classes/main/template/class_BaseTemplateEngine.php:904:                  // @TODO Old behaviour, will become obsolete!
 ./inc/classes/main/template/class_BaseTemplateEngine.php:907:                  // @TODO Yet another old way
-./inc/classes/main/template/class_BaseTemplateEngine.php:981:   * @todo        Make this code some nicer...
-./inc/classes/main/template/image/class_ImageTemplateEngine.php:229:    * @todo        Find something usefull with this!
-./inc/classes/main/template/image/class_ImageTemplateEngine.php:249:    * @todo        Add cache creation here
+./inc/classes/main/template/class_BaseTemplateEngine.php:983:   * @todo        Make this code some nicer...
+./inc/classes/main/template/image/class_ImageTemplateEngine.php:224:    * @todo        Find something usefull with this!
+./inc/classes/main/template/image/class_ImageTemplateEngine.php:244:    * @todo        Add cache creation here
 ./inc/classes/main/template/mail/class_MailTemplateEngine.php:234:      * @todo        Add cache creation here
 ./inc/classes/main/template/mail/class_MailTemplateEngine.php:244:      * @todo        Should we call back the mailer class here?
 ./inc/classes/main/template/mail/class_MailTemplateEngine.php:325:      * @todo        0% done
+./inc/classes/main/template/menu/class_MenuTemplateEngine.php:257:      * @todo        Find something useful with this!
+./inc/classes/main/template/menu/class_MenuTemplateEngine.php:302:      * @todo        Add cache creation here
 ./inc/classes/main/user/class_BaseUser.php:308:         * @todo        Try to make this method more generic so we can move it in BaseFrameworkSystem
 ./inc/classes/main/user/class_BaseUser.php:80:  * @todo        Find a way of casting here. "(int)" might destroy the user id > 32766
 ./inc/classes/main/user/member/class_Member.php:84:     * @todo        Add more ways over creating user classes
@@ -167,6 +170,7 @@
 ./inc/includes.php:36:// @TODO Find a nicer OOP-ed way for this
 ./inc/language.php:31:// @TODO Rewrite this
 ./inc/loader/class_ClassLoader.php:262:                        /* @todo: Do not die here. */
+./application/ship-simu/templates/de/menu/generic_menu_entries.xml:2:<!--@TODO Later versions: <menu extends="base_menu">//-->
 ### ### DEPRECATION FOLLOWS: ### ###
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:118:        * @deprecated
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:319:        * @deprecated
@@ -174,4 +178,5 @@
 ./inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php:10: * @deprecated
 ./inc/classes/exceptions/main/class_ClassNotFoundException.php:11: * @deprecated
 ./inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php:11: * @deprecated
-./inc/classes/main/template/class_BaseTemplateEngine.php:1131:  * @deprecated
+./inc/classes/main/template/class_BaseTemplateEngine.php:1133:  * @deprecated
+./inc/classes/main/template/class_BaseTemplateEngine.php:953:   * @deprecated

diff --git a/index.php b/index.php
index d534a4796c15b1caa2032c8049de745f0758ff6a..f2e1c4c49508273bec169275150700d1292e9d98 100644 (file)
--- a/index.php
+++ b/index.php
@@ -86,7 +86,7 @@ final class ApplicationEntryPoint {
                } // END - if
 
                // Get some instances
-               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('template_class');
+               $tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
                $languageInstance = LanguageSystem::getInstance();
 
                // Get response instance

diff --git a/todo-builder.sh b/todo-builder.sh
index c1941f584768143926c054eb79a8b43971f576b6..360b8888e2509f057431d6cc6dd4a8803a30140e 100755 (executable)
--- a/todo-builder.sh
+++ b/todo-builder.sh
@@ -3,6 +3,8 @@
 # This script helps building the file docs/TODOs.txt and should be executed by
 # developers with SVN write-access
 
+TYPES="php ctp xml"
+
 if ! test -e "index.php"; then
   echo "$0: Please execute this script from root directory."
   exit 1
@@ -11,8 +13,12 @@ fi
 echo "$0: Generating TODOs.txt..."
 echo "### WARNING: THIS FILE IS AUTO-GENERATED BY $0 ###" > docs/TODOs.txt
 echo "### DO NOT EDIT THIS FILE. ###" >> docs/TODOs.txt
-find -type f -name "*.php" -exec grep -Hin "@TODO" {} \; | sort >> docs/TODOs.txt
+for type in $TYPES; do
+       find -type f -name "*.$type" -exec grep -Hin "@TODO" {} \; | sort >> docs/TODOs.txt
+done
 echo "### ### DEPRECATION FOLLOWS: ### ###" >> docs/TODOs.txt
-find -type f -name "*.php" -exec grep -Hin "@DEPRECATED" {} \; | sort >> docs/TODOs.txt
+for type in $TYPES; do
+       find -type f -name "*.$type" -exec grep -Hin "@DEPRECATED" {} \; | sort >> docs/TODOs.txt
+done
 echo "$0: Done."
 exit 0