Moved to other repositories

diff --git a/.gitattributes b/.gitattributes
index dbd1b0630c2abce3fc522fa686c13cf5380340b6..74fd4869f15ba1fa31793f527b86b5649d05a9a9 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,128 +1,6 @@
 * text=auto !eol
 /Doxyfile -text
 application/.htaccess -text
 * text=auto !eol
 /Doxyfile -text
 application/.htaccess -text

-application/admin/.htaccess -text
-application/admin/admin/.htaccess -text
-application/admin/class_ApplicationHelper.php -text
-application/admin/config.php -text
-application/admin/data.php -text
-application/admin/debug.php -text
-application/admin/exceptions.php -text
-application/admin/exceptions/.htaccess -text
-application/admin/init.php -text
-application/admin/interfaces/.htaccess -text
-application/admin/loader.php -text
-application/admin/main/.htaccess -text
-application/admin/main/actions/.htaccess -text
-application/admin/main/actions/web/.htaccess -text
-application/admin/main/actions/web/class_WebAdminLoginWelcomeAction.php -text
-application/admin/main/class_ -text
-application/admin/main/commands/.htaccess -text
-application/admin/main/commands/web/.htaccess -text
-application/admin/main/commands/web/class_WebAdminUserLoginCommand.php -text
-application/admin/main/login/.htaccess -text
-application/admin/main/login/class_AdminUserLogin.php -text
-application/admin/main/login/helper/.htaccess -text
-application/admin/main/login/helper/class_AdminLoginHelper.php -text
-application/admin/starter.php -text
-application/admin/templates/.htaccess -text
-application/admin/templates/de/.htaccess -text
-application/admin/templates/de/code/action_admin_login_logout.ctp -text
-application/admin/templates/de/code/action_admin_login_profile.ctp -text
-application/admin/templates/de/code/action_admin_login_status_problem.ctp -text
-application/admin/templates/de/code/action_admin_login_welcome.ctp -text
-application/admin/templates/de/code/action_admin_status_problem.ctp -text
-application/admin/templates/de/code/admin_main.ctp -text
-application/admin/templates/de/code/block_persona_data.ctp -text
-application/admin/templates/de/code/captch_graphic_code.ctp -text
-application/admin/templates/de/code/footer.ctp -text
-application/admin/templates/de/code/header.ctp -text
-application/admin/templates/de/code/home.ctp -text
-application/admin/templates/de/code/login_failed.ctp -text
-application/admin/templates/de/code/login_form.ctp -text
-application/admin/templates/de/code/login_main.ctp -text
-application/admin/templates/de/code/logout_done.ctp -text
-application/admin/templates/de/code/mail_debug.ctp -text
-application/admin/templates/de/code/register_form.ctp -text
-application/admin/templates/de/emails/.htaccess -text
-application/admin/templates/de/emails/text_resend_link.tpl -text
-application/admin/templates/de/html/.htaccess -text
-application/admin/templates/de/html/nav_advert.tpl -text
-application/admin/templates/de/html/selector_admin.tpl -text
-application/admin/templates/images/.htaccess -text
-application/admin/templates/images/_cache/.htaccess -text
-application/admin/templates/images/de/.htaccess -text
-application/admin/templates/images/de/image/.htaccess -text
-application/admin/templates/images/de/image/base_code.itp -text
-application/admin/templates/images/de/image/code_captcha.itp -text
-application/blog/.htaccess -text
-application/blog/admin/.htaccess -text
-application/blog/class_ApplicationHelper.php -text
-application/blog/config.php -text
-application/blog/data.php -text
-application/blog/debug.php -text
-application/blog/exceptions.php -text
-application/blog/exceptions/.htaccess -text
-application/blog/init.php -text
-application/blog/interfaces/.htaccess -text
-application/blog/loader.php -text
-application/blog/main/.htaccess -text
-application/blog/main/actions/.htaccess -text
-application/blog/main/actions/class_ -text
-application/blog/main/actions/class_BaseBlogAction.php -text
-application/blog/main/actions/web/.htaccess -text
-application/blog/main/actions/web/class_WebBlogLoginWelcomeAction.php -text
-application/blog/main/class_ -text
-application/blog/main/commands/.htaccess -text
-application/blog/main/commands/web/.htaccess -text
-application/blog/main/commands/web/class_WebBlogGuestLoginCommand.php -text
-application/blog/main/commands/web/class_WebBlogUserLoginCommand.php -text
-application/blog/main/commands/web/failed/.htaccess -text
-application/blog/main/commands/web/failed/class_WebBlogFailedCommand.php -text
-application/blog/main/controller/.htaccess -text
-application/blog/main/controller/web/.htaccess -text
-application/blog/main/controller/web/class_WebBlogFailedController.php -text
-application/blog/main/filter/.htaccess -text
-application/blog/main/filter/blog/.htaccess -text
-application/blog/main/filter/blog/class_BlogDataFetchFilter.php -text
-application/blog/main/filter/class_ -text
-application/blog/main/filter/class_BaseBlogFilter.php -text
-application/blog/main/login/.htaccess -text
-application/blog/main/login/class_BlogGuestLogin.php -text
-application/blog/main/login/class_BlogUserLogin.php -text
-application/blog/main/login/helper/.htaccess -text
-application/blog/main/login/helper/class_BlogLoginHelper.php -text
-application/blog/starter.php -text
-application/blog/templates/.htaccess -text
-application/blog/templates/de/.htaccess -text
-application/blog/templates/de/code/action_blog_login_logout.ctp -text
-application/blog/templates/de/code/action_blog_login_profile.ctp -text
-application/blog/templates/de/code/action_blog_login_status_problem.ctp -text
-application/blog/templates/de/code/action_blog_login_welcome.ctp -text
-application/blog/templates/de/code/block_persona_data.ctp -text
-application/blog/templates/de/code/blog_main.ctp -text
-application/blog/templates/de/code/captch_graphic_code.ctp -text
-application/blog/templates/de/code/confirm_link.ctp -text
-application/blog/templates/de/code/footer.ctp -text
-application/blog/templates/de/code/header.ctp -text
-application/blog/templates/de/code/home.ctp -text
-application/blog/templates/de/code/login_failed.ctp -text
-application/blog/templates/de/code/login_form.ctp -text
-application/blog/templates/de/code/login_main.ctp -text
-application/blog/templates/de/code/logout_done.ctp -text
-application/blog/templates/de/code/mail_debug.ctp -text
-application/blog/templates/de/code/register_form.ctp -text
-application/blog/templates/de/emails/.htaccess -text
-application/blog/templates/de/emails/text_resend_link.tpl -text
-application/blog/templates/de/html/.htaccess -text
-application/blog/templates/de/html/nav_advert.tpl -text
-application/blog/templates/de/html/selector_ship-simu.tpl -text
-application/blog/templates/images/.htaccess -text
-application/blog/templates/images/_cache/.htaccess -text
-application/blog/templates/images/de/.htaccess -text
-application/blog/templates/images/de/image/.htaccess -text
-application/blog/templates/images/de/image/base_code.itp -text
-application/blog/templates/images/de/image/code_captcha.itp -text

 application/selector/.htaccess -text
 application/selector/admin/.htaccess -text
 application/selector/class_ApplicationHelper.php -text
 application/selector/.htaccess -text
 application/selector/admin/.htaccess -text
 application/selector/class_ApplicationHelper.php -text


@@ -340,94 +218,6 @@ application/ship-simu/templates/images/de/.htaccess -text
 application/ship-simu/templates/images/de/image/.htaccess -text
 application/ship-simu/templates/images/de/image/base_code.itp -text
 application/ship-simu/templates/images/de/image/code_captcha.itp -text
 application/ship-simu/templates/images/de/image/.htaccess -text
 application/ship-simu/templates/images/de/image/base_code.itp -text
 application/ship-simu/templates/images/de/image/code_captcha.itp -text

-application/shoutbox/.htaccess -text
-application/shoutbox/admin/.htaccess -text
-application/shoutbox/class_ApplicationHelper.php -text
-application/shoutbox/config.php -text
-application/shoutbox/data.php -text
-application/shoutbox/debug.php -text
-application/shoutbox/exceptions.php -text
-application/shoutbox/exceptions/.htaccess -text
-application/shoutbox/init.php -text
-application/shoutbox/interfaces/.htaccess -text
-application/shoutbox/loader.php -text
-application/shoutbox/main/.htaccess -text
-application/shoutbox/main/class_ -text
-application/shoutbox/starter.php -text
-application/shoutbox/templates/.htaccess -text
-application/shoutbox/templates/de/.htaccess -text
-application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp -text
-application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp -text
-application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp -text
-application/shoutbox/templates/de/code/action_shoutbox_login_welcome.ctp -text
-application/shoutbox/templates/de/code/block_persona_data.ctp -text
-application/shoutbox/templates/de/code/captch_graphic_code.ctp -text
-application/shoutbox/templates/de/code/confirm_link.ctp -text
-application/shoutbox/templates/de/code/footer.ctp -text
-application/shoutbox/templates/de/code/header.ctp -text
-application/shoutbox/templates/de/code/home.ctp -text
-application/shoutbox/templates/de/code/login_failed.ctp -text
-application/shoutbox/templates/de/code/login_form.ctp -text
-application/shoutbox/templates/de/code/login_main.ctp -text
-application/shoutbox/templates/de/code/logout_done.ctp -text
-application/shoutbox/templates/de/code/mail_debug.ctp -text
-application/shoutbox/templates/de/code/register_form.ctp -text
-application/shoutbox/templates/de/code/shoutbox_main.ctp -text
-application/shoutbox/templates/de/emails/.htaccess -text
-application/shoutbox/templates/de/emails/text_resend_link.tpl -text
-application/shoutbox/templates/de/html/.htaccess -text
-application/shoutbox/templates/de/html/nav_advert.tpl -text
-application/shoutbox/templates/de/html/selector_ship-simu.tpl -text
-application/shoutbox/templates/images/.htaccess -text
-application/shoutbox/templates/images/_cache/.htaccess -text
-application/shoutbox/templates/images/de/.htaccess -text
-application/shoutbox/templates/images/de/image/.htaccess -text
-application/shoutbox/templates/images/de/image/base_code.itp -text
-application/shoutbox/templates/images/de/image/code_captcha.itp -text
-application/todo/.htaccess -text
-application/todo/admin/.htaccess -text
-application/todo/class_ApplicationHelper.php -text
-application/todo/config.php -text
-application/todo/data.php -text
-application/todo/debug.php -text
-application/todo/exceptions.php -text
-application/todo/exceptions/.htaccess -text
-application/todo/init.php -text
-application/todo/interfaces/.htaccess -text
-application/todo/loader.php -text
-application/todo/main/.htaccess -text
-application/todo/main/class_ -text
-application/todo/starter.php -text
-application/todo/templates/.htaccess -text
-application/todo/templates/de/.htaccess -text
-application/todo/templates/de/code/action_todo_login_logout.ctp -text
-application/todo/templates/de/code/action_todo_login_profile.ctp -text
-application/todo/templates/de/code/action_todo_login_status_problem.ctp -text
-application/todo/templates/de/code/action_todo_login_welcome.ctp -text
-application/todo/templates/de/code/block_persona_data.ctp -text
-application/todo/templates/de/code/captch_graphic_code.ctp -text
-application/todo/templates/de/code/confirm_link.ctp -text
-application/todo/templates/de/code/footer.ctp -text
-application/todo/templates/de/code/header.ctp -text
-application/todo/templates/de/code/home.ctp -text
-application/todo/templates/de/code/login_failed.ctp -text
-application/todo/templates/de/code/login_form.ctp -text
-application/todo/templates/de/code/login_main.ctp -text
-application/todo/templates/de/code/logout_done.ctp -text
-application/todo/templates/de/code/mail_debug.ctp -text
-application/todo/templates/de/code/register_form.ctp -text
-application/todo/templates/de/code/todo_main.ctp -text
-application/todo/templates/de/emails/.htaccess -text
-application/todo/templates/de/emails/text_resend_link.tpl -text
-application/todo/templates/de/html/.htaccess -text
-application/todo/templates/de/html/nav_advert.tpl -text
-application/todo/templates/de/html/selector_ship-simu.tpl -text
-application/todo/templates/images/.htaccess -text
-application/todo/templates/images/_cache/.htaccess -text
-application/todo/templates/images/de/.htaccess -text
-application/todo/templates/images/de/image/.htaccess -text
-application/todo/templates/images/de/image/base_code.itp -text
-application/todo/templates/images/de/image/code_captcha.itp -text

 /clear-cache.sh -text
 db/.htaccess -text
 db/company_user/.htaccess -text
 /clear-cache.sh -text
 db/.htaccess -text
 db/company_user/.htaccess -text

diff --git a/application/admin/.htaccess b/application/admin/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/admin/.htaccess b/application/admin/admin/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/admin/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/class_ApplicationHelper.php b/application/admin/class_ApplicationHelper.php
deleted file mode 100644 (file)
index c041e08..0000000
--- a/application/admin/class_ApplicationHelper.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * A class holding general data about the application and some methods for
- * the management including the entry point.
- *
- * E.g.:
- *
- * index.php?app=my_app
- *
- * You need to create a folder in the folder "application" named "my_app"
- * (without the quotes) and create a include file called
- * class_ApplicationHelper.php. You have to write the same class for your
- * application and implement the same interface called ManageableApplication
- * because this class include file will be searched for.
- *
- * It is good when you avoid more GET parameters to keep URLs short and sweet.
- * But sometimes you need some GET paramerers e.g. for your imprint or info page
- * or other linked pages which you have to create and state some informations.
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
-       /**
-        * The version number of this application
-        */
-       private $appVersion = "";
-
-       /**
-        * The human-readable name for this application
-        */
-       private $appName = "";
-
-       /**
-        * The short uni*-like name for this application
-        */
-       private $shortName = "";
-
-       /**
-        * The name of the master template
-        */
-       private $masterTemplate = "admin_main";
-
-       /**
-        * An instance of a controller
-        */
-       private $controllerInstance = null;
-
-       /**
-        * An instance of this class
-        */
-       private static $thisInstance = null;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Getter for an instance of this class
-        *
-        * @return      $thisInstance           An instance of this class
-        */
-       public final static function getInstance () {
-               // Is the instance there?
-               if (is_null(self::$thisInstance)) {
-                       self::$thisInstance = new ApplicationHelper();
-               }
-
-               // Return the instance
-               return self::$thisInstance;
-       }
-
-       /**
-        * Getter for the version number
-        *
-        * @return      $appVersion             The application's version number
-        */
-       public final function getAppVersion () {
-               return $this->appVersion;
-       }
-
-       /**
-        * Setter for the version number
-        *
-        * @param       $appVersion             The application's version number
-        * @return      void
-        */
-       public final function setAppVersion ($appVersion) {
-               // Cast and set it
-               $appVersion = (string) $appVersion;
-               $this->appVersion = $appVersion;
-       }
-
-       /**
-        * Getter for human-readable name
-        *
-        * @return      $appName        The application's human-readable name
-        */
-       public final function getAppName () {
-               return $this->appName;
-       }
-
-       /**
-        * Setter for human-readable name
-        *
-        * @param       $appName        The application's human-readable name
-        * @return      void
-        */
-       public final function setAppName ($appName) {
-               // Cast and set it
-               $appName = (string) $appName;
-               $this->appName = $appName;
-       }
-
-       /**
-        * Getter for short uni*-like name
-        *
-        * @return      $shortName      The application's short uni*-like name
-        */
-       public final function getAppShortName () {
-               return $this->shortName;
-       }
-
-       /**
-        * Setter for short uni*-like name
-        *
-        * @param       $shortName      The application's short uni*-like name
-        * @return      void
-        */
-       public final function setAppShortName ($shortName) {
-               // Cast and set it
-               $shortName = (string) $shortName;
-               $this->shortName = $shortName;
-       }
-
-       /**
-        * Getter for master template name
-        *
-        * @return      $masterTemplate         Name of the master template
-        */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
-       }
-
-       /**
-        * Launches the admin area
-        *
-        * @return      void
-        */
-       public final function entryPoint () {
-               // Create a new request object
-               $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
-
-               // Default response is HTTP (HTML page) and type is "Web"
-               $response = "http";
-               $responseType = "web";
-
-               // Do we have another response?
-               if ($requestInstance->isRequestElementSet('request')) {
-                       // Then use it
-                       $response = strtolower($requestInstance->getRequestElement('request'));
-                       $responseType = $response;
-               } // END - if
-
-               // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
-
-               // Remember both in this application
-               $this->setRequestInstance($requestInstance);
-               $this->setResponseInstance($responseInstance);
-
-               // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement('page');
-
-               // If it is null then get default command
-               if (is_null($commandName)) {
-                       $commandName = $responseInstance->getDefaultCommand();
-               } // END - if
-
-               // Get a resolver
-               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
-
-               // Get a controller instance as well
-               $this->controllerInstance = $resolverInstance->resolveController();
-
-               // Handle the request
-               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
-       }
-
-       /**
-        * Handle the indexed array of fatal messages and puts them out in an
-        * acceptable fasion
-        *
-        * @param       $messageList    An array of fatal messages
-        * @return      void
-        */
-       public function handleFatalMessages (array $messageList) {
-               // Walk through all messages
-               foreach ($messageList as $message) {
-                       print("MSG:".$message."<br />\n");
-               } // END - if
-       }
-
-       /**
-        * Assigns application-depending data
-        *
-        * @param       $templateInstance       An instance of a template engine
-        * @return      void
-        */
-       public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
-               // Assign charset
-               $templateInstance->assignConfigVariable('header_charset');
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/admin/config.php b/application/admin/config.php
deleted file mode 100644 (file)
index e4522fe..0000000
--- a/application/admin/config.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/**
- * Additional/overwritten configuration parts
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get a configuration instance for shorter lines
-$cfg = FrameworkConfiguration::getInstance();
-
-// CFG: HEADER-CHARSET
-$cfg->setConfigEntry('header_charset', "utf-8");
-
-// CFG: DEFAULT-WEB-COMMAND
-$cfg->setConfigEntry('default_web_command', "home");
-
-// CFG: DEFAULT-IMAGE-COMMAND
-$cfg->setConfigEntry('default_image_command', "build");
-
-// CFG: PAGE-WITH-NEWS
-$cfg->setConfigEntry('page_with_news', "home");
-
-// CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', "index.php?app={?app_short_name?}&amp;page=do_form");
-
-// CFG: FORM-METHOD
-$cfg->setConfigEntry('form_method', "post");
-
-// CFG: FORM-TARGET
-$cfg->setConfigEntry('form_target', "_self");
-
-// CFG: REGISTER-REQUIRES-EMAIL
-$cfg->setConfigEntry('register_requires_email', "Y");
-
-// CFG: REGISTER-INCLUDES-PROFILE
-$cfg->setConfigEntry('register_includes_profile', "Y");
-
-// CFG: REGISTER-PERSONAL-DATA
-$cfg->setConfigEntry('register_personal_data', "Y");
-
-// CFG: REGISTER-EMAIL-UNIQUE
-$cfg->setConfigEntry('register_email_unique', "Y");
-
-// CFG: CHAT-ENABLED-ICQ
-$cfg->setConfigEntry('chat_enabled_icq', "Y");
-
-// CFG: CHAT-ENABLED-JABBER
-$cfg->setConfigEntry('chat_enabled_jabber', "Y");
-
-// CFG: CHAT-ENABLED-YAHOO
-$cfg->setConfigEntry('chat_enabled_yahoo', "Y");
-
-// CFG: CHAT-ENABLED-AOL
-$cfg->setConfigEntry('chat_enabled_aol', "Y");
-
-// CFG: CHAT-ENABLED-MSN
-$cfg->setConfigEntry('chat_enabled_msn', "Y");
-
-// CFG: USER-REGISTRATION
-$cfg->setConfigEntry('user_registration_class', "AdminRegistration");
-
-// CFG: USER-LOGIN-CLASS
-$cfg->setConfigEntry('user_login_class', "AdminUserLogin");
-
-// CFG: GUEST-LOGIN-CLASS
-$cfg->setConfigEntry('guest_login_class', "AdminGuestLogin");
-
-// CFG: USER-STATUS-REGISTER
-$cfg->setConfigEntry('user_status_unconfirmed', "UNCONFIRMED");
-
-// CFG: USER-STATUS-GUEST
-$cfg->setConfigEntry('user_status_guest', "GUEST");
-
-// CFG: USER-STATUS-CONFIRMED
-$cfg->setConfigEntry('user_status_confirmed', "CONFIRMED");
-
-// CFG: LOGIN-HELPER-CLASS
-$cfg->setConfigEntry('login_helper_class', "AdminLoginHelper");
-
-// CFG: AUTH-METHOD-CLASS
-$cfg->setConfigEntry('auth_method_class', "CookieAuth");
-
-// CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', "index.php?app={?app_short_name?}&page=login_area");
-
-// CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', "index.php?app={?app_short_name?}&page=login_failed");
-
-// CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', "index.php?app={?app_short_name?}&page=logout_done");
-
-// CFG: LOGIN-USER-STATUS-URL
-$cfg->setConfigEntry('login_user_status_url', "index.php?app={?app_short_name?}&page=login_area&action=status_problem");
-
-// CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_problem");
-
-// CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_email_missing");
-
-// CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app={?app_short_name?}&page=status&status=confirm_code_invalid");
-
-// CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', "index.php?app={?app_short_name?}&page=status&status=user_not_found");
-
-// CFG: LOGIN-DEFAULT-ACTION
-$cfg->setConfigEntry('login_default_action', "welcome");
-
-// CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
-
-// CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");
-
-// CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");
-
-// CFG: USER-AUTH-FILTER
-$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");
-
-// CFG: USER-UPDATE-FILTER
-$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");
-
-// CFG: USER-STATUS-CONFIRMED-FILTER
-$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");
-
-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
-$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");
-
-// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-USER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CONFIRM-CODE-VALIDATOR-FILTER
-$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");
-
-// CFG: NEWS-HOME-LIMIT
-$cfg->setConfigEntry('news_home_limit', 10);
-
-// CFG: NEWS-LOGIN-AREA-LIMIT
-$cfg->setConfigEntry('news_login_area_limit', 15);
-
-// CFG: LOGIN-ENABLED
-$cfg->setConfigEntry('login_enabled', "Y");
-
-// CFG: CONFIRM-EMAIL-ENABLED
-$cfg->setConfigEntry('confirm_email_enabled', "Y");
-
-// CFG: LOGIN-DISABLED-REASON
-$cfg->setConfigEntry('login_disabled_reason', "Loginbereich befindet sich noch im Aufbau.");
-
-// CFG: LOGIN-TYPE
-$cfg->setConfigEntry('login_type', "username"); // username, email, both
-
-// CFG: EMAIL-CHANGE-ALLOWED
-$cfg->setConfigEntry('email_change_allowed', "N");
-
-// CFG: EMAIL-CHANGE-CONFIRMATION
-$cfg->setConfigEntry('email_change_confirmation', "Y");
-
-// CFG: GUEST-LOGIN-ALLOWED
-$cfg->setConfigEntry('guest_login_allowed', "N");
-
-// CFG: GUEST-LOGIN-USERNAME
-$cfg->setConfigEntry('guest_login_user', "guest");
-
-// CFG: GUEST-LOGIN-PASS
-$cfg->setConfigEntry('guest_login_passwd', "guest");
-
-// CFG: LOGIN-WELCOME-ACTION-CLASS
-$cfg->setConfigEntry('login_welcome_action_class', "AdminLoginAction");
-
-// CFG: LOGIN-LOGOUT-ACTION-CLASS
-$cfg->setConfigEntry('login_logout_action_class', "AdminLogoutAction");
-
-// CFG: LOGIN-PROFILE-ACTION-CLASS
-$cfg->setConfigEntry('login_profile_action_class', "AdminProfileAction");
-
-// CFG: ADMIN-REGISTER-CAPTCHA
-$cfg->setConfigEntry('admin_register_captcha', "GraphicalCodeCaptcha");
-
-// CFG: ADMIN-USER-LOGIN-CAPTCHA
-$cfg->setConfigEntry('admin_user_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: ADMIN-GUEST-LOGIN-CAPTCHA
-$cfg->setConfigEntry('admin_guest_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: CAPTCHA-STRING-LENGTH
-$cfg->setConfigEntry('captcha_string_length', 5);
-
-// CFG: CAPTCHA-SEARCH-CHARS
-$cfg->setConfigEntry('captcha_search_chars', "+/=");
-
-// CFG: RANDOM-STRING-LENGTH
-$cfg->setConfigEntry('random_string_length', 100);
-
-// CFG: ADMIN-REGISTER-CAPTCHA-SECURED
-$cfg->setConfigEntry('admin_register_captcha_secured', "Y");
-
-// CFG: ADMIN-USER-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('admin_user_login_captcha_secured', "Y");
-
-// CFG: ADMIN-GUEST-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('admin_guest_login_captcha_secured', "Y");
-
-// CFG: BLOCK-SHOWS-REGISTRATION
-$cfg->setConfigEntry('block_shows_registration', "Y");
-
-// CFG EMAIl-TPL-RESEND-LINK
-$cfg->setConfigEntry('email_tpl_resend_link', "text");
-
-// CFG: MAIL-TEMPLATE-ENGINE
-$cfg->setConfigEntry('mail_template_class', "MailTemplateEngine");
-
-// CFG: IMAGE-TEMPLATE-ENGINE
-$cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
-
-// CFG: ADMIN-EMAIL
-$cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
-
-// CFG: WEB-BLOCK-HELPER
-$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
-
-// CFG: WEB-FORM-HELPER
-$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
-
-// CFG: WEB-LINK-HELPER
-$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
-
-// [EOF]
-?>

diff --git a/application/admin/data.php b/application/admin/data.php
deleted file mode 100644 (file)
index c20f064..0000000
--- a/application/admin/data.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Application data
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Get an instance of the helper
-$app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), "getInstance"),
-       array()
-);
-
-// Set application name and version
-$app->setAppName("Administrationsbereich");
-$app->setAppVersion("0.0.0");
-$app->setAppShortName("admin");
-
-// [EOF]
-?>

diff --git a/application/admin/debug.php b/application/admin/debug.php
deleted file mode 100644 (file)
index f5da828..0000000
--- a/application/admin/debug.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Some debugging stuff for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Reederei-Objekt debuggen
-//define('DEBUG_COMPANY_OBJ', true);
-// Hafen-Objekt debuggen
-//define('DEBUG_HARBOR_OBJ', true);
-// Schiff-Objekt debuggen
-//define('DEBUG_SHIP_OBJ', true);
-// Auftrag-Objekt debuggen
-//define('DEBUG_CONTRACT_OBJ', true);
-// Haendler-Objekt debuggen
-//define('DEBUG_MERCHANT_OBJ', true);
-// Personal-Objekt debuggen
-//define('DEBUG_PERSONELL_OBJ', true);
-// Personal debuggen
-//define('DEBUG_PERSONELL', true);
-// Reederei debuggen
-//define('DEBUG_COMPANY', true);
-// Mitarbeiter debuggen
-//define('DEBUG_COMPANY_EMPLOYEE', true);
-// Hafen debuggen
-//define('DEBUG_HARBOR', true);
-// Werft debuggen
-//define('DEBUG_SHIPYARD', true);
-// Schiff debuggen
-//define('DEBUG_SHIP', true);
-// Schiffstruktur debuggen
-//define('DEBUG_STRUCTURE', true);
-// Kabinen debuggen
-//define('DEBUG_CABIN', true);
-// Decks debuggen
-//define('DEBUG_DECK', true);
-// Bauauftraege debuggen
-//define('DEBUG_CONTRACT', true);
-// Haendler debuggen
-//define('DEBUG_MERCHANT', true);
-
-// [EOF]
-?>

diff --git a/application/admin/exceptions.php b/application/admin/exceptions.php
deleted file mode 100644 (file)
index fd41c37..0000000
--- a/application/admin/exceptions.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * The exception handler for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Our own exception handler
-function __exceptionHandler (FrameworkException $e) {
-       // Call the app_die() method
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
-               ApplicationHelper::getInstance()->getAppName(),
-               ApplicationHelper::getInstance()->getAppShortName(),
-               $e->__toString(),
-               $e->getHexCode(),
-               $e->getMessage(),
-               $e->getPrintableBackTrace()
-       ),
-               $e->getHexCode(),
-               $e->getExtraData()
-       );
-} // END - function
-
-// Set the new handler
-set_exception_handler('__exceptionHandler');
-
-// Error handler
-function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
-       // Construct the message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>, Message: <span class=\"debug_message\">%s</span>",
-               basename($errfile),
-               $errline,
-               $errno,
-               $errstr
-       );
-
-       // Throw an exception here
-       throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-} // END - function
-
-// Set error handler
-set_error_handler('__errorHandler');
-
-// Assertion handler
-function __assertHandler ($file, $line, $code) {
-       // Empty code?
-       if ($code === "") $code = "<em>Unknown</em>";
-
-       // Create message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>",
-               basename($file),
-               $line,
-               $code
-       );
-
-       // Throw an exception here
-       throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
-} // END - function
-
-// Init assert handling
-assert_options(ASSERT_ACTIVE,     1);
-assert_options(ASSERT_WARNING,    0);
-assert_options(ASSERT_BAIL,       0);
-assert_options(ASSERT_QUIET_EVAL, 0);
-assert_options(ASSERT_CALLBACK,   '__assertHandler');
-
-// [EOF]
-?>

diff --git a/application/admin/exceptions/.htaccess b/application/admin/exceptions/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/exceptions/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/init.php b/application/admin/init.php
deleted file mode 100644 (file)
index 39c5bed..0000000
--- a/application/admin/init.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Application initializer
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Initialize output system
-require($cfg->readConfig('base_path') . 'inc/output.php');
-
-// Initialize file i/o system
-require($cfg->readConfig('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->readConfig('base_path') . 'inc/language.php');
-
-// This application needs a database connection then we have to simply include
-// the inc/database.php script
-require($cfg->readConfig('base_path') . 'inc/database.php');
-
-// [EOF]
-?>

diff --git a/application/admin/interfaces/.htaccess b/application/admin/interfaces/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/interfaces/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/loader.php b/application/admin/loader.php
deleted file mode 100644 (file)
index 12b388b..0000000
--- a/application/admin/loader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * A specialized class loader for this class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Load all classes for the application
-foreach ($lowerClasses as $className) {
-       // Load the application classes
-       ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/%s", $cfg->readConfig('application_path'), $cfg->readConfig('app_name'), $className));
-} // END - if
-
-// Clean up the global namespace
-unset($lowerClasses);
-unset($className);
-
-// [EOF]
-?>

diff --git a/application/admin/main/.htaccess b/application/admin/main/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/actions/.htaccess b/application/admin/main/actions/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/actions/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/actions/web/.htaccess b/application/admin/main/actions/web/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/actions/web/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/actions/web/class_WebAdminLoginWelcomeAction.php b/application/admin/main/actions/web/class_WebAdminLoginWelcomeAction.php
deleted file mode 100644 (file)
index 33cf08d..0000000
--- a/application/admin/main/actions/web/class_WebAdminLoginWelcomeAction.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * An action class for the admin "welcome" page
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebAdminLoginWelcomeAction extends BaseAction implements PerformableAction, Registerable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this action
-        *
-        * @return      $actionInstance         An instance of this action class
-        */
-       public final static function createWebAdminLoginWelcomeAction () {
-               // Get a new instance
-               $actionInstance = new WebAdminLoginWelcomeAction();
-
-               // Return the instance
-               return $actionInstance;
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        Maybe we need to do something later here
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               $this->partialStub("Unfinished part.");
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        0% done
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               $this->partialStub("Need to add filters which looks for applications with &quot;admin&quot; directory.");
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/admin/main/class_ b/application/admin/main/class_
deleted file mode 100644 (file)
index df22004..0000000
--- a/application/admin/main/class_
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * 
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class  extends BaseFrameworkSystem {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/admin/main/commands/.htaccess b/application/admin/main/commands/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/commands/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/commands/web/.htaccess b/application/admin/main/commands/web/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/commands/web/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php b/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
deleted file mode 100644 (file)
index 03fc485..0000000
--- a/application/admin/main/commands/web/class_WebAdminUserLoginCommand.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * A command for user login
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebAdminUserLoginCommand extends BaseCommand implements Commandable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Creates an instance of this command and sets the resolver instance
-        *
-        * @param       $resolverInstance       An instance of a command resolver
-        * @return      $commandInstance        The created command instance
-        */
-       public final static function createWebAdminUserLoginCommand (CommandResolver $resolverInstance) {
-               // Get a new instance
-               $commandInstance = new WebAdminUserLoginCommand();
-
-               // Set the resolver instance
-               $commandInstance->setResolverInstance($resolverInstance);
-
-               // Return the prepared instance
-               return $commandInstance;
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // First get a UserLogin instance
-               $loginInstance = ObjectFactory::createObjectByConfiguredName('user_login_class');
-
-               // First set request and response instance
-               $loginInstance->setRequestInstance($requestInstance);
-
-               // Encrypt the password
-               $loginInstance->encryptPassword('pass');
-
-               // Do the login here
-               $loginInstance->doLogin($requestInstance, $responseInstance);
-
-               // Was the login fine? Then redirect here
-               if ($loginInstance->ifLoginWasSuccessfull()) {
-                       // Try to redirect here
-                       try {
-                               // Redirect...
-                               $responseInstance->redirectToConfiguredUrl('app_login_url');
-
-                               // Exit here
-                               exit();
-                       } catch (FrameworkException $e) {
-                               // Something went wrong here!
-                               $responseInstance->addFatalMessage($e->getMessage());
-                       }
-               } else {
-                       // Attach error message to the response
-                       $responseInstance->addFatalMessage('failed_user_login');
-               }
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        Add more filters
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Which login type do we have?
-               switch ($this->getConfigInstance()->readConfig('login_type')) {
-                       case "username": // Login via username
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter', array($controllerInstance)));
-                               break;
-
-                       case "email": // Login via email
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter', array($controllerInstance)));
-                               break;
-
-                       default: // Wether username or email is set
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter', array($controllerInstance)));
-                               break;
-               }
-
-               // Password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter', array($controllerInstance)));
-
-               // Add filter for CAPTCHA
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter', array($controllerInstance)));
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/admin/main/login/.htaccess b/application/admin/main/login/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/login/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/login/class_AdminUserLogin.php b/application/admin/main/login/class_AdminUserLogin.php
deleted file mode 100644 (file)
index a4187a5..0000000
--- a/application/admin/main/login/class_AdminUserLogin.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * A special login class for administration area
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class AdminUserLogin extends BaseFrameworkSystem implements LoginableUser {
-       /**
-        * The hashed password
-        */
-       private $hashedPassword = "";
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Creates an instance of this login class
-        *
-        * @return      $loginInstance  An instance of this login class
-        */
-       public final static function createAdminUserLogin () {
-               // Get a new instance
-               $loginInstance = new AdminUserLogin();
-
-               // Return the instance
-               return $loginInstance;
-       }
-
-       /**
-        * Logins the user with the given request containing the credential. The
-        * result of the login can be thrown by exception or, if prefered stored
-        * in a boolean attribute which is then readable by a matching getter.
-        *
-        * @param       $requestInstance        An instance of a Requestable class
-        * @param       $responseInstance       An instance of a Responseable class
-        * @return      void
-        * @throws      UserPasswordMismatchException   If the supplied password did not
-        *                                                                              match with the stored password
-        * @todo        We need to add something here which will make more than one
-        * @todo        guest logins, users who are online but based on the same
-        * @todo        user account.
-        */
-       public function doLogin (Requestable $requestInstance, Responseable $responseInstance) {
-               // By default no method is selected
-               $method = null;
-               $data = "";
-
-               // Get a instance of the registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
-
-               // Is there an instance?
-               if (is_null($userInstance)) {
-                       // Get member class
-                       $userClass = $this->getConfigInstance()->readConfig('user_class');
-
-                       // Get a user instance
-                       $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
-
-                       // Remember this new instance in registry
-                       Registry::getRegistry()->addInstance($userInstance);
-               } // END - if
-
-               // Is the password correct?
-               if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
-                       // Mismatching password
-                       throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
-
-               // ToDo place
-
-               // Now do the real login. This can be cookie- or session-based login
-               // which depends on the admins setting then on the user's taste.
-               // 1) Get a login helper instance
-               $helperInstance = ObjectFactory::createObjectByConfiguredName('login_helper_class', array($requestInstance));
-
-               // 2) Execute the login. This will now login...
-               $helperInstance->executeLogin($responseInstance);
-       }
-
-       /**
-        * Determines wether the login was fine. This is done by checking if 'login' instance is in registry
-        *
-        * @return      $loginDone      Wether the login was fine or not
-        */
-       public function ifLoginWasSuccessfull () {
-               // Is the registry key there?
-               $loginDone = (Registry::getRegistry()->getInstance('login') instanceof Registerable);
-
-               // Return the result
-               return $loginDone;
-       }
-
-       /**
-        * Encrypt given request key or throw an exception if key was not found in
-        * request
-        *
-        * @param       $requestKey             Key in request class
-        * @return      void
-        */
-       public function encryptPassword ($requestKey) {
-               // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
-                       // So encrypt the password and store it for later usage in
-                       // the request:
-
-                       // Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
-
-                       // Get user instance
-                       $userInstance = Registry::getRegistry()->getInstance('user');
-
-                       // Get a crypto helper and hash the password
-                       $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());
-
-                       // Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
-               } // END - if
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/admin/main/login/helper/.htaccess b/application/admin/main/login/helper/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/main/login/helper/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/main/login/helper/class_AdminLoginHelper.php b/application/admin/main/login/helper/class_AdminLoginHelper.php
deleted file mode 100644 (file)
index eb67fa4..0000000
--- a/application/admin/main/login/helper/class_AdminLoginHelper.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * A helper for administration area login. This login helper first checks what
- * setting (cookie or session) the admin has choosen then overwrites it with the
- * setting from current user. The registry instance should hold an instance of
- * this user class at key 'user' else an exception will be thrown. After this
- * the setting from a login form will be taken as login method and be stored
- * in database for later usage.
- *
- * The user shall be able to choose "Default login method" or similar to use his
- * own login method.
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class AdminLoginHelper extends BaseLoginHelper implements HelpableLogin {
-       /**
-        * The login method we shall choose
-        */
-       private $authMethod = "";
-
-       // Exception constants
-       const EXCEPTION_INVALID_USER_INSTANCE = 0x190;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this class by given request instance
-        *
-        * @param       $requestInstance        An instance of a Requestable class
-        * @return      $helperInstance         An instance of this helper class
-        * @throws      UserInstanceMissingException    If the user instance in registry
-        *                                                                                      is missing or invalid
-        */
-       public final static function createAdminLoginHelper (Requestable $requestInstance) {
-               // Get a new instance first
-               $helperInstance = new AdminLoginHelper();
-
-               // Get a user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
-
-               // Is this instance valid?
-               if (!$userInstance instanceof ManageableAccount) {
-                       // Thrown an exception here
-                       throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE);
-               } // END - if
-
-               // Set default login method from config
-               $helperInstance->setDefaultAuthMethod();
-
-               // Set request instance
-               $helperInstance->setRequestInstance($requestInstance);
-
-               // Return the prepared instance
-               return $helperInstance;
-       }
-
-       /**
-        * Setter for default login method from config
-        *
-        * @return      void
-        */
-       protected function setDefaultAuthMethod () {
-               $this->authMethod = $this->getConfigInstance()->readConfig('auth_method_class');
-       }
-
-       /**
-        * Execute the login request by given response instance. This instance can
-        * be used for sending cookies or at least the session id out.
-        *
-        * @param       $responseInstance       An instance of a Responseable class
-        * @return      void
-        */
-       public function executeLogin (Responseable $responseInstance) {
-               // Get an instance from the login method
-               $loginInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance));
-
-               // Set user cookie
-               $loginInstance->setUserAuth($this->getRequestInstance()->getRequestElement('username'));
-
-               // Set password cookie
-               $loginInstance->setPasswordAuth($this->getRequestInstance()->getRequestElement('pass_hash'));
-
-               // Remember this login instance for later usage
-               Registry::getRegistry()->addInstance('login', $loginInstance);
-       }
-}
-
-//
-?>

diff --git a/application/admin/starter.php b/application/admin/starter.php
deleted file mode 100644 (file)
index b128839..0000000
--- a/application/admin/starter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * The application launcher
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Is there an application helper instance? We need the method main() for
-// maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
-
-// Some sanity checks
-if ((empty($app)) || (is_null($app))) {
-       // Something went wrong!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
-       ));
-} elseif (!is_object($app)) {
-       // No object!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",
-               $application
-       ));
-} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig('entry_method'))) {
-       // Method not found!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('entry_method')
-       ));
-}
-
-// Call user function
-call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
-
-// [EOF]
-?>

diff --git a/application/admin/templates/.htaccess b/application/admin/templates/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/de/.htaccess b/application/admin/templates/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/de/code/action_admin_login_logout.ctp b/application/admin/templates/de/code/action_admin_login_logout.ctp
deleted file mode 100644 (file)
index be15749..0000000
--- a/application/admin/templates/de/code/action_admin_login_logout.ctp
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
-
-// Set link text
-$helper->addLinkWithTextById('logout_now_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Set link text
-$helper->addLinkWithTextById('return_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="logout_box">
-       <div id="logout_header">
-               Willst du dich wirklich aus dem <span class="app_name">{?app_full_name?}</span> ausloggen?
-       </div>
-
-       <div id="logout_links">
-               {?logout_now_link?} | {?return_login_link?}
-       </div>
-</div>

diff --git a/application/admin/templates/de/code/action_admin_login_profile.ctp b/application/admin/templates/de/code/action_admin_login_profile.ctp
deleted file mode 100644 (file)
index 8957cf9..0000000
--- a/application/admin/templates/de/code/action_admin_login_profile.ctp
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "admin_profile"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Password can only be changed when the old one is entered and new one twice!
-$helper->addFormGroup('pass', "Neues Passwort einrichten:");
-$helper->addFormSubGroup('pass', "Bitte gebe zum &Auml;ndern deines Passwortes zweimal das gew&uuml;nschte neue Passwort ein.");
-$helper->addFieldText('pass1', "Neues Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
-$helper->addInputPasswordField('pass2');
-
-// Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
-
-// Only for changing email address
-if ($helper->ifEmailChangeAllowed()) {
-       $helper->addFormGroup('email', "&Auml;nderung deiner Email-Addresse:");
-       $helper->addFormSubGroup('email', "Gebe nur deine Email-Adresse zweimal ein, wenn du diese &auml;ndern m&ouml;chtest!");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im <span class=\"app_name\">{?app_full_name?}</span> verwendet worden sein.");
-       } // END - Unique email addresses
-
-       if ($helper->ifEmailChangeRequireConfirmation()) {
-               $helper->addFormNote('confirm_link', "Es wird ein Best&auml;tigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann m&ouml;glichst schnell an.");
-       } // END - Change requires confirmation
-} // END - email change allowed
-
-$helper->addFormGroup('profile', "Hier kannst du deine Profildaten &auml;ndern.");
-
-// Persoenliche Daten mit in der Anmeldung abfragen?
-if ($helper->ifRegisterIncludesPersonaData()) {
-       $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-       $helper->addFieldText('surname', "Dein Vorname:");
-       $helper->addInputTextFieldWithDefault('surname');
-       $helper->addFieldText('family', "Dein Nachname:");
-       $helper->addInputTextFieldWithDefault('family');
-       $helper->addFieldText('street', "Strasse und Hausnummer:");
-       $helper->addInputTextFieldWithDefault('street');
-       $helper->addFieldText('city', "Wohnort:");
-       $helper->addInputTextFieldWithDefault('city');
-} // END - Persona data
-
-$helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-$helper->addFieldText('zip', "Postleitzahl:");
-$helper->addInputTextFieldWithDefault('zip');
-
-$helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-if ($helper->ifChatEnabled('icq')) {
-       $helper->addFieldText('icq', "ICQ-Nummer:");
-       $helper->addInputTextFieldWithDefault('icq');
-} // END - if
-
-if ($helper->ifChatEnabled('jabber')) {
-       $helper->addFieldText('jabber', "Jabber:");
-       $helper->addInputTextFieldWithDefault('jabber');
-} // END - if
-
-if ($helper->ifChatEnabled('yahoo')) {
-       $helper->addFieldText('yahoo', "Yahoo!:");
-       $helper->addInputTextFieldWithDefault('yahoo');
-} // END - if
-
-if ($helper->ifChatEnabled('aol')) {
-       $helper->addFieldText('aol', "AOL-Screenname:");
-       $helper->addInputTextFieldWithDefault('aol');
-} // END - if
-
-if ($helper->ifChatEnabled('msn')) {
-       $helper->addFieldText('msn', "MSN:");
-       $helper->addInputTextFieldWithDefault('msn');
-} // END - if
-
-if (!$helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-} // END - Extra note
-
-// Rules already accepted?
-if ($helper->ifRulesHaveChanged()) {
-       $helper->addFormGroup('rules', "Bitte lese dir die Administrationsregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Administrationsregeln&quot; an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Administrationsregeln:");
-       $helper->addInputCheckboxField('rules', false);
-} else {
-       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Administrationsregeln akzeptiert. Vielen Dank!");
-       $helper->addInputHiddenField('rules', "1");
-}
-
-// Ask again for current account password
-$helper->addFormGroup('pass_old', "Bitte gebe zur Best&auml;tigung der &Auml;nderungen dein derzeitiges Passwort ein.");
-$helper->addFieldText('pass_old', "Altes Passwort:");
-$helper->addInputPasswordField('pass_old');
-
-// Abschliessender Hinweis und Abschluss des Formulars
-$helper->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Accountdaten aktualisieren");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Deine Profildaten bearbeiten
-</div>
-
-<div id="profile_box">
-       {?admin_profile?}
-</div>

diff --git a/application/admin/templates/de/code/action_admin_login_status_problem.ctp b/application/admin/templates/de/code/action_admin_login_status_problem.ctp
deleted file mode 100644 (file)
index 4c57125..0000000
--- a/application/admin/templates/de/code/action_admin_login_status_problem.ctp
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = WebFormHelper::createWebFormHelper($this, "resend_link");
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Add submit button or notice
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Add submit button
-       $helper->addInputHiddenFieldWithDefault('email');
-       $helper->addInputSubmitButton("Best&auml;tigungslink erneut aussenden");
-} elseif ($helper->ifUserAccountLocked()) {
-       // Account is locked
-       $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre:
-               <span id=\"lock_reason\">".$helper->getValueField('lock_reason')."</span>
-               Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
-       );
-}
-
-// Flush content and automatically close the form
-$helper->flushContent();
-
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Build the form for confirmation
-       $helper = WebFormHelper::createWebFormHelper($this, "confirm_code");
-
-       // Add code box
-       $helper->addFormGroup('code', "Bitte gebe hier den Best&auml;tigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");
-       $helper->addFieldText('code', "Best&auml;tigungscode aus der Mail:");
-       $helper->addInputTextField('code');
-
-       // Add submit button
-       $helper->addFormGroup('buttons', "Bitte einmal abschicken und das Ergebnis abwarten!");
-       $helper->addInputResetButton("Nochmal eingeben");
-       $helper->addInputSubmitButton("Best&auml;tigungscode absenden");
-
-       // Flush content and automatically close the form
-       $helper->flushContent();
-} // END - if
-?>
-<div id="content_header">
-       Problem mit deinem Account gefunden:
-</div>
-
-<div id="status_box">
-       Du bist m&ouml;glicherweise f&uuml;r deine ausgew&auml;hlte Aktion nicht
-       berechtigt oder du hast noch deine Email-Adresse nicht best&auml;tigt. Du
-       kannst dir nun den Best&auml;tigungslink erneut aussenden lassen, oder den
-       Best&auml;tigungscode unten eingeben.
-
-       <div id="resend_link_box">
-               {?resend_link?}
-       </div>
-
-       <div id="confirm_code_box">
-               {?confirm_code?}
-       </div>
-</div>

diff --git a/application/admin/templates/de/code/action_admin_login_welcome.ctp b/application/admin/templates/de/code/action_admin_login_welcome.ctp
deleted file mode 100644 (file)
index c1e0574..0000000
--- a/application/admin/templates/de/code/action_admin_login_welcome.ctp
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="overview_frame">
-       {?admin_app_list?}
-</div>
-
-<div id="overview_frame">
-       {?admin_overview?}
-</div>
-
-<div id="updates_frame">
-       <div id="updates_header">
-               {?updates_header?}
-       </div>
-
-       <div id="updates_content">
-               {?updates_content?}
-       </div>
-</div>

diff --git a/application/admin/templates/de/code/action_admin_status_problem.ctp b/application/admin/templates/de/code/action_admin_status_problem.ctp
deleted file mode 100644 (file)
index f033c5a..0000000
--- a/application/admin/templates/de/code/action_admin_status_problem.ctp
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Add submit button or notice
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Add submit button
-       $helper->addInputHiddenFieldWithDefault('email');
-       $helper->addInputSubmitButton("Best&auml;tigungslink erneut aussenden");
-} elseif ($helper->ifUserAccountLocked()) {
-       // Account is locked
-       $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre:
-               <span id=\"lock_reason\">".$helper->getValueField('lock_reason')."</span>
-               Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
-       );
-}
-
-// Flush content and automatically close the form
-$helper->flushContent();
-
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Build the form for confirmation
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
-
-       // Add code box
-       $helper->addFormGroup('code', "Bitte gebe hier den Best&auml;tigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");
-       $helper->addFieldText('code', "Best&auml;tigungscode aus der Mail:");
-       $helper->addInputTextField('code');
-
-       // Add submit button
-       $helper->addFormGroup('buttons', "Bitte einmal abschicken und das Ergebnis abwarten!");
-       $helper->addInputResetButton("Nochmal eingeben");
-       $helper->addInputSubmitButton("Best&auml;tigungscode absenden");
-
-       // Flush content and automatically close the form
-       $helper->flushContent();
-} // END - if
-
-// [EOC]
-?>
-<div id="content_header">
-       Problem mit deinem Account gefunden:
-</div>
-
-<div id="status_box">
-       Du bist m&ouml;glicherweise f&uuml;r deine ausgew&auml;hlte Aktion nicht
-       berechtigt oder du hast noch deine Email-Adresse nicht best&auml;tigt. Du
-       kannst dir nun den Best&auml;tigungslink erneut aussenden lassen, oder den
-       Best&auml;tigungscode unten eingeben.
-
-       <div id="resend_link_box">
-               {?resend_link?}
-       </div>
-
-       <div id="confirm_code_box">
-               {?confirm_code?}
-       </div>
-</div>

diff --git a/application/admin/templates/de/code/admin_main.ctp b/application/admin/templates/de/code/admin_main.ctp
deleted file mode 100644 (file)
index 256f91e..0000000
--- a/application/admin/templates/de/code/admin_main.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-{?header?}
-
-<div id="main_header">
-       {?admin_header?}
-</div>
-
-<div id="navigation">
-       {?navigation?}
-</div>
-
-<div id="main_content">
-       {?content?}
-</div>
-
-<div id="main_footer">
-       {?admin_footer?}
-</div>
-
-{?footer?}

diff --git a/application/admin/templates/de/code/block_persona_data.ctp b/application/admin/templates/de/code/block_persona_data.ctp
deleted file mode 100644 (file)
index 36a620b..0000000
--- a/application/admin/templates/de/code/block_persona_data.ctp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Prefetch user instance
-$helperInstance->prefetchValueInstance('user');
-
-// Flush the content out
-$helperInstance->flushContent();
-
-// [EOC]
-?>
-<div class="user_name_div">
-       Nickname: <span class="user_name">{?block_username?}</span>
-</div>
-<div class="user_status_div">
-       Account-Status: <span class="user_status">{?block_user_status?}</span>
-</div>
-<div class="user_profile_div">
-       {?profile_link?}
-</div>
-<div class="user_registered_div">
-       Angemeldet seit: <span class="registered">{?block_registered?}</span>
-</div>

diff --git a/application/admin/templates/de/code/captch_graphic_code.ctp b/application/admin/templates/de/code/captch_graphic_code.ctp
deleted file mode 100644 (file)
index 101be7f..0000000
--- a/application/admin/templates/de/code/captch_graphic_code.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// Get a helper instance without a form tag
-$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
-
-// Add input field with text for CAPTCHA code
-$captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
-$captchaHelper->addInputTextField('c_code');
-
-// Add hidden field with validation hash
-$captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
-
-// Flush content
-$captchaHelper->flushContent();
-
-// [EOC]
-?>
-<div class="captcha_image">
-       <img src="$config[base_url]/index.php?app={?app_short_name?}&amp;page=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image" alt="CAPTCHA-Bild" title="CAPTCHA-Bild" class="captcha_img" />
-</div>
-<div class="captcha_code">
-       {?captcha_code?}
-</div>

diff --git a/application/admin/templates/de/code/footer.ctp b/application/admin/templates/de/code/footer.ctp
deleted file mode 100644 (file)
index aa82e68..0000000
--- a/application/admin/templates/de/code/footer.ctp
+++ /dev/null
@@ -1,4 +0,0 @@
-</div> <!-- masterbox //-->
-
-</body>
-</html>

diff --git a/application/admin/templates/de/code/header.ctp b/application/admin/templates/de/code/header.ctp
deleted file mode 100644 (file)
index 1c92a39..0000000
--- a/application/admin/templates/de/code/header.ctp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
-<head>
-       <title>
-               {?app_full_name?} - {?title?}
-       </title>
-
-       <meta name="author" content="$config[meta_author]" />
-       <meta name="publisher" content="$config[meta_publisher]" />
-       <meta name="keywords" content="$config[meta_keywords]" />
-       <meta name="robots" content="index,follow" />
-       <meta name="description" content="$config[meta_description]" />
-       <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-       <meta http-equiv="content-style-type" content="text/css" />
-       <meta http-equiv="content-script-type" content="text/javascript" />
-       <meta http-equiv="language" content="de" />
-</head>
-
-<body>
-<div id="masterbox">

diff --git a/application/admin/templates/de/code/home.ctp b/application/admin/templates/de/code/home.ctp
deleted file mode 100644 (file)
index 016d50d..0000000
--- a/application/admin/templates/de/code/home.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="content_header">
-       Willkommen zum <span class="app_name">{?app_full_name?}</span>!
-</div>

diff --git a/application/admin/templates/de/code/login_failed.ctp b/application/admin/templates/de/code/login_failed.ctp
deleted file mode 100644 (file)
index 7b2e082..0000000
--- a/application/admin/templates/de/code/login_failed.ctp
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('login_retry_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist nicht mehr im <span class="app_name">{?app_full_name?}</span> eingeloggt!
-</div>
-
-<div id="content_body">
-       Du bist nicht mehr im <span class="app_name">{?app_full_name?}</span> eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
-
-       <ol id="login_failed_list">
-               <li>Dein Browser nimmt keine Cookies an.</li>
-               <li>Du hast den Loginbereich aus deinen Bookmarks/Favoriten aufgerufen
-                       und die Cookies sind gel&ouml;scht.</li>
-               <li>Es besteht ein Problem mit dem Server, wof&uuml;r du meistens nichts
-                       kannst. Bitte kontaktiere den Support, falls dieses Problem
-                       weiterhin besteht.</li>
-       </ol>
-
-       Wenn du den Support kontaktierst, halte bitte s&auml;mtliche relevante
-       Informationen - <span class="important_note">nicht aber dein Passwort</span>
-       - bereit. Du kannst auch einen Screenshot dieser Seite anfertigen und dem
-       Support diesen senden!
-</div>
-
-<div id="content_footer">
-       <div id="login_retry">
-               {?login_retry_link?}
-       </div>
-
-       Vielen Dank f&uuml;r deine Mitarbeit! :-)
-</div>

diff --git a/application/admin/templates/de/code/login_form.ctp b/application/admin/templates/de/code/login_form.ctp
deleted file mode 100644 (file)
index 688dc12..0000000
--- a/application/admin/templates/de/code/login_form.ctp
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'admin_user_login'));
-
-// Formular deaktiviert?
-if ($helper->ifLoginIsEnabled()) {
-       // Formular ist aktiv
-       $helper->addFormGroup('login', "Gebe hier deine Logindaten ein:");
-
-       // Welches Loginverfahren wurde konfiguriert?
-       if ($helper->ifLoginWithUsername()) {
-               // Login mit Username
-               $helper->addFormSubGroup('username', "Bitte mit deinem Nickname einloggen.");
-               $helper->addFieldText('username', "Dein Nickname:");
-               $helper->addInputTextField('username');
-       } elseif ($helper->ifLoginWithEmail()) {
-               // Login mit Email
-               $helper->addFormSubGroup('email', "Bitte mit deiner Email-Adresse einloggen.");
-               $helper->addFieldText('email', "Deine Email-Addresse:");
-               $helper->addInputTextField('email');
-       } else {
-               // Login mit Email/Username
-               $helper->addFormSubGroup('user_email', "Bitte mit deinem Nickname oder Email-Adresse einloggen.");
-               $helper->addFieldText('user_email', "Dein Nickname/Email:");
-               $helper->addInputTextField('user_email');
-       }
-
-       $helper->addFormSubGroup('pass', "Gebe dein Passwort von der Anmeldung ein.");
-       $helper->addFieldText('pass', "Dein Passwort:");
-       $helper->addInputPasswordField('pass');
-
-       // CAPTCHA enabled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit buttons
-       $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
-       $helper->addInputResetButton("Formular leeren");
-       $helper->addInputSubmitButton("Zum <span class=\"app_name\">{?app_full_name?}</span> einloggen");
-} else {
-       // Formular deaktiviert
-       $helper->addFormNote('form_deactivated', "Einloggen in den <span class=\"app_name\">{?app_full_name?}</span> ist deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
-       $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
-}
-
-// Formular schliessen
-$helper->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&amp;page=register'));
-
-// Set link text
-$helper->addLinkWithTextById('register_login_form_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Einloggen zu <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="content_body">
-       <div id="login_box">
-               {?admin_user_login?}
-       </div>
-</div>
-
-<div id="content_footer">
-       Noch kein Loginaccount? {?register_login_form_link?}
-</div>

diff --git a/application/admin/templates/de/code/login_main.ctp b/application/admin/templates/de/code/login_main.ctp
deleted file mode 100644 (file)
index 6207fba..0000000
--- a/application/admin/templates/de/code/login_main.ctp
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-///////////////////////////////
-// Assign personal user data //
-///////////////////////////////
-
-// Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
-
-// Set the data source instance which must exist in registry
-$blockInstance->prefetchValueInstance('user');
-
-// Assign fields with template variables
-$blockInstance->assignField('username');
-$blockInstance->assignFieldWithFilter('user_status', "user_status_translator");
-
-// Shall we include registration date?
-if ($blockInstance->ifIncludeRegistrationStamp()) {
-       // Then assign it as well!
-       $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp');
-} // END - if
-
-// Flush the content out to a template variable
-$blockInstance->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Add action
-$helper->addActionLink('logout', "Ausloggen");
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Willkommen zum <span class=\"app_name\">{?app_full_name?}</span>!
-</div>
-
-<div id="content_body">
-       {?login_content?}
-</div>
-
-<div id="persona_data" title="Informationen zum Adminaccount">
-       <div id="persona_header">
-               Account-Infos:
-       </div>
-
-       <div id="persona_body">
-               {?persona_data?}
-       </div>
-
-       <div id="logout_link">
-               {?logout_action_link?}
-       </div>
-</div>

diff --git a/application/admin/templates/de/code/logout_done.ctp b/application/admin/templates/de/code/logout_done.ctp
deleted file mode 100644 (file)
index fa7e286..0000000
--- a/application/admin/templates/de/code/logout_done.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('relogin_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist jetzt aus dem <span class=\"app_name\">{?app_full_name?}</span> ausgeloggt!
-</div>
-
-<div id="content_body">
-       Du kannst dich nun {?relogin_link?} oder weiter auf unseren Seiten bleiben. ;-)
-</div>

diff --git a/application/admin/templates/de/code/mail_debug.ctp b/application/admin/templates/de/code/mail_debug.ctp
deleted file mode 100644 (file)
index e62dd07..0000000
--- a/application/admin/templates/de/code/mail_debug.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="debug_header">
-       Mail-Debug-Ausgabe:
-</div>
-
-<div class="mail_header">
-       <div class="mail_header_line">
-               <span class="mail_sender">Von:</span> <span class="mail_info">{?sender?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_recipient">An:</span> <span class="mail_info">{?recipient?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_subject">Betreff:</span> <span class="mail_info">{?subject?}</span>
-       </div>
-</div>
-
-<div class="mail_text_box">
-       <div class="mail_message">
-               Nachricht:
-       </div>
-
-       <div class="mail_content">
-               {?message?}
-       </div>
-</div>

diff --git a/application/admin/templates/de/code/register_form.ctp b/application/admin/templates/de/code/register_form.ctp
deleted file mode 100644 (file)
index 016e675..0000000
--- a/application/admin/templates/de/code/register_form.ctp
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'admin_register'));
-
-// Always ask at least for nickname and password
-$helper->addFormGroup('login', "Bitte gebe hier gew&uuml;nschten Nickname und dein Zugangspasswort ein.");
-$helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares gepr&uuml;ft. Sp&auml;ter bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
-$helper->addFieldText('username', "Nickname im <span class=\"app_name\">{?app_full_name?}</span>:");
-$helper->addInputTextField('username');
-$helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Sp&auml;ter bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortst&auml;rke anzeigt.");
-$helper->addFieldText('pass1', "Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Passwortwiederholung:");
-$helper->addInputPasswordField('pass2');
-
-if ($helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Best&auml;tigung) ein, damit wir dir deinen Freischaltlink zusenden k&ouml;nnen.");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im <span class=\"app_name\">{?app_full_name?}</span> verwendet worden sein.");
-       } // END - Unique email addresses
-
-} // END - email verification
-
-if ($helper->ifRegisterIncludesProfile()) {
-       $helper->addFormGroup('profile', "Hier kannst du zus&auml;tzlich deine Profildaten vorweg eingeben, du kannst sie aber auch nach dem Login vervollst&auml;ndigen!");
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
-               $helper->addFieldText('email1', "Email-Adresse:");
-               $helper->addInputTextField('email1');
-       } // END - No email verification
-
-       // Persoenliche Daten mit in der Anmeldung abfragen?
-       if ($helper->ifRegisterIncludesPersonaData()) {
-               $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-               $helper->addFieldText('surname', "Dein Vorname:");
-               $helper->addInputTextField('surname');
-               $helper->addFieldText('family', "Dein Nachname:");
-               $helper->addInputTextField('family');
-               $helper->addFieldText('street', "Strasse und Hausnummer:");
-               $helper->addInputTextField('street');
-               $helper->addFieldText('city', "Wohnort:");
-               $helper->addInputTextField('city');
-       } // END - Persona data
-
-       $helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-       $helper->addFieldText('zip', "Postleitzahl:");
-       $helper->addInputTextField('zip');
-
-       $helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-       if ($helper->ifChatEnabled('icq')) {
-               $helper->addFieldText('icq', "ICQ-Nummer:");
-               $helper->addInputTextField('icq');
-       } // END - if
-
-       if ($helper->ifChatEnabled('jabber')) {
-               $helper->addFieldText('jabber', "Jabber:");
-               $helper->addInputTextField('jabber');
-       } // END - if
-
-       if ($helper->ifChatEnabled('yahoo')) {
-               $helper->addFieldText('yahoo', "Yahoo!:");
-               $helper->addInputTextField('yahoo');
-       } // END - if
-
-       if ($helper->ifChatEnabled('aol')) {
-               $helper->addFieldText('aol', "AOL-Screenname:");
-               $helper->addInputTextField('aol');
-       } // END - if
-
-       if ($helper->ifChatEnabled('msn')) {
-               $helper->addFieldText('msn', "MSN:");
-               $helper->addInputTextField('msn');
-       } // END - if
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-       } // END - Extra note
-
-} // END - ask profile data
-
-// Posting-/Kommentarregeln abfragen
-$helper->addFormGroup('rules', "Bitte lese dir die Administrationsregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Administrationsregeln&quot; an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Administrationsregeln:");
-$helper->addInputCheckboxField('rules', false);
-
-// Add CAPTCHA?
-if ($helper->ifFormSecuredWithCaptcha()) {
-       $helper->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann.");
-       $helper->addCaptcha();
-} // END - if
-
-// Final note and submit buttons
-$helper->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;t hast, kannst du die Anmeldung abschliessen.");
-
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Anmeldung zum <span class=\"app_name\">{?app_full_name?}</span> abschliessen");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Anmeldung bei <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="register_box">
-       {?admin_register?}
-</div>

diff --git a/application/admin/templates/de/emails/.htaccess b/application/admin/templates/de/emails/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/de/emails/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/de/emails/text_resend_link.tpl b/application/admin/templates/de/emails/text_resend_link.tpl
deleted file mode 100644 (file)
index e764146..0000000
--- a/application/admin/templates/de/emails/text_resend_link.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<text-mail>
-       <mail-data>
-               <sender-address value="$config[admin_email]" />
-               <subject-line value="Anforderung deines Best&auml;tigungslinks" />
-               <recipient-address value="{?email?}" />
-               <message>
-               <![CDATA[Hallo {?username?}!
-
-Du (oder ein anderer) hattest soeben deinen Best&auml;tigungslink erneut angefordert. Solltest du dies nicht gewesen sein, bitten wir dich den Vorfall zu entschuldigen.
-
-Hier ist nun dein Best&auml;tigungslink. Der alte aus der Anmeldemail ist somit nicht mehr g&uuml;ltig!
-
-$config[base_url]/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?}
-
-Solltest du die URL nicht anklicken k&ouml;nnen, versuche diese in die Adresszeile deines Browsers zu kopieren.
-
-Alternativ kannst du im Loginbereich unter Best&auml;tigungscode den folgenden Code reinkopieren oder eingeben:
-
-{?confirm_hash?}
-
-Solltest du Fragen dazu oder Probleme mit der Best&auml;tigung haben, so melde dich bitte beim Support-Team.
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Dein {?app_short_name?}-Team
-
-{?mail_footer?}]]>
-               </message>
-       </mail-data>
-</text-mail>

diff --git a/application/admin/templates/de/html/.htaccess b/application/admin/templates/de/html/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/de/html/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/de/html/nav_advert.tpl b/application/admin/templates/de/html/nav_advert.tpl
deleted file mode 100644 (file)
index 22da43b..0000000
--- a/application/admin/templates/de/html/nav_advert.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- Put your ads code here which shall be shown below the navigation //-->

diff --git a/application/admin/templates/de/html/selector_admin.tpl b/application/admin/templates/de/html/selector_admin.tpl
deleted file mode 100644 (file)
index 36f9cd1..0000000
--- a/application/admin/templates/de/html/selector_admin.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="selector_content">
-       <strong>TODO:</strong> Diese Anwendung sollte eigentlich nicht ausw&auml;hlbar sein.
-</div>

diff --git a/application/admin/templates/images/.htaccess b/application/admin/templates/images/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/images/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/images/_cache/.htaccess b/application/admin/templates/images/_cache/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/images/_cache/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/images/de/.htaccess b/application/admin/templates/images/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/images/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/images/de/image/.htaccess b/application/admin/templates/images/de/image/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/admin/templates/images/de/image/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/admin/templates/images/de/image/base_code.itp b/application/admin/templates/images/de/image/base_code.itp
deleted file mode 100644 (file)
index 6501b56..0000000
--- a/application/admin/templates/images/de/image/base_code.itp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<image>
-       <type value="{?image_type?}" />
-       <base>
-               <name value="{?image_name?}" />
-       </base>
-       <resolution>
-               <width value="{?image_width?}" />
-               <height value="{?image_height?}" />
-       </resolution>
-       <background-color>
-               <red value="{?image_bg_red?}" />
-               <green value="{?image_bg_green?}" />
-               <blue value="{?image_bg_blue?}" />
-       </background-color>
-       <foreground-color>
-               <red value="{?image_fg_red?}" />
-               <green value="{?image_fg_green?}" />
-               <blue value="{?image_fg_blue?}" />
-       </foreground-color>
-       <image-string value="groupable">
-               <string-name value="{?image_string_name?}" />
-               <x value="{?image_x?}" />
-               <y value="{?image_y?}" />
-               <font-size value="{?image_size?}" />
-               <text value="{?image_string?}" />
-       </image-string>
-</image>

diff --git a/application/admin/templates/images/de/image/code_captcha.itp b/application/admin/templates/images/de/image/code_captcha.itp
deleted file mode 100644 (file)
index 2e28522..0000000
--- a/application/admin/templates/images/de/image/code_captcha.itp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// Needed in every image template to initialy set the image type
-$helper = ImageHelper::createImageHelper($this, "png");
-$helper->setImageName("code_captcha");
-$helper->setBaseImage("base_code");
-
-// Set image dimensions
-$helper->setWidth(100);
-$helper->setHeight(50);
-
-// Get random number
-$rand = $helper->getRngInstance()->randomNumber(0, 6);
-
-// Background and foreground color
-switch ($rand) {
-       case 1:
-               // First varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x90  , 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xff  , 'rand');
-               break;
-
-       case 2:
-               // Second varriant
-               $helper->setBackgroundColorRedGreenBlue(0x90  , 'rand', 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-
-       case 3:
-               // Third varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xff  );
-               break;
-
-       case 4:
-               // Forth varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 0x90  , 'rand');
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xa0  );
-               break;
-
-       case 5:
-               // Fith varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xe0  , 'rand');
-               break;
-
-       default:
-               // Last varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 'rand', 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-}
-
-// Random X/Y factors...
-$xRand = $helper->getRngInstance()->randomNumber(0, 45);
-$yRand = $helper->getRngInstance()->randomNumber(0, 25);
-
-// Add code
-$helper->addTextLine("code");
-$helper->setCoord((5 + $xRand), (5 + $yRand));
-$helper->setFontSize('rand');
-$helper->setImageString("{?decrypted_code?}");
-
-// Only for debug!
-/*
-$helper->addTextLine("debug");
-$helper->setCoord(90, 35);
-$helper->setFontSize(3);
-$helper->setImageString($rand);
-*/
-
-// Flush content to the template engine
-$helper->flushContent();
-
-// Comment this out if image is done
-//$this->debugInstance();
-
-// [EOF]
-?>

diff --git a/application/blog/.htaccess b/application/blog/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/admin/.htaccess b/application/blog/admin/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/admin/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/class_ApplicationHelper.php b/application/blog/class_ApplicationHelper.php
deleted file mode 100644 (file)
index b14778f..0000000
--- a/application/blog/class_ApplicationHelper.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * A class holding general data about the application and some methods for
- * the management including the entry point.
- *
- * E.g.:
- *
- * index.php?app=my_app
- *
- * You need to create a folder in the folder "application" named "my_app"
- * (without the quotes) and create a include file called
- * class_ApplicationHelper.php. You have to write the same class for your
- * application and implement the same interface called ManageableApplication
- * because this class include file will be searched for.
- *
- * It is good when you avoid more GET parameters to keep URLs short and sweet.
- * But sometimes you need some GET paramerers e.g. for your imprint or info page
- * or other linked pages which you have to create and state some informations.
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
-       /**
-        * The version number of this application
-        */
-       private $appVersion = "";
-
-       /**
-        * The human-readable name for this application
-        */
-       private $appName = "";
-
-       /**
-        * The short uni*-like name for this application
-        */
-       private $shortName = "";
-
-       /**
-        * The name of the master template
-        */
-       private $masterTemplate = "blog_main";
-
-       /**
-        * An instance of a controller
-        */
-       private $controllerInstance = null;
-
-       /**
-        * An instance of this class
-        */
-       private static $thisInstance = null;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Getter for an instance of this class
-        *
-        * @return      $thisInstance           An instance of this class
-        */
-       public final static function getInstance () {
-               // Is the instance there?
-               if (is_null(self::$thisInstance)) {
-                       self::$thisInstance = new ApplicationHelper();
-               }
-
-               // Return the instance
-               return self::$thisInstance;
-       }
-
-       /**
-        * Getter for the version number
-        *
-        * @return      $appVersion             The application's version number
-        */
-       public final function getAppVersion () {
-               return $this->appVersion;
-       }
-
-       /**
-        * Setter for the version number
-        *
-        * @param       $appVersion             The application's version number
-        * @return      void
-        */
-       public final function setAppVersion ($appVersion) {
-               // Cast and set it
-               $appVersion = (string) $appVersion;
-               $this->appVersion = $appVersion;
-       }
-
-       /**
-        * Getter for human-readable name
-        *
-        * @return      $appName        The application's human-readable name
-        */
-       public final function getAppName () {
-               return $this->appName;
-       }
-
-       /**
-        * Setter for human-readable name
-        *
-        * @param       $appName        The application's human-readable name
-        * @return      void
-        */
-       public final function setAppName ($appName) {
-               // Cast and set it
-               $appName = (string) $appName;
-               $this->appName = $appName;
-       }
-
-       /**
-        * Getter for short uni*-like name
-        *
-        * @return      $shortName      The application's short uni*-like name
-        */
-       public final function getAppShortName () {
-               return $this->shortName;
-       }
-
-       /**
-        * Setter for short uni*-like name
-        *
-        * @param       $shortName      The application's short uni*-like name
-        * @return      void
-        */
-       public final function setAppShortName ($shortName) {
-               // Cast and set it
-               $shortName = (string) $shortName;
-               $this->shortName = $shortName;
-       }
-
-       /**
-        * Getter for master template name
-        *
-        * @return      $masterTemplate         Name of the master template
-        */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
-       }
-
-       /**
-        * Launches the blog software
-        *
-        * @return      void
-        */
-       public final function entryPoint () {
-               // Create a new request object
-               $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
-
-               // Default response is HTTP (HTML page) and type is "Web"
-               $response = "http";
-               $responseType = "web";
-
-               // Do we have another response?
-               if ($requestInstance->isRequestElementSet('request')) {
-                       // Then use it
-                       $response = strtolower($requestInstance->getRequestElement('request'));
-                       $responseType = $response;
-               } // END - if
-
-               // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
-
-               // Remember both in this application
-               $this->setRequestInstance($requestInstance);
-               $this->setResponseInstance($responseInstance);
-
-               // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement('page');
-
-               // If it is null then get default command
-               if (is_null($commandName)) {
-                       $commandName = $responseInstance->getDefaultCommand();
-               } // END - if
-
-               // Get a resolver
-               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
-
-               // Get a controller instance as well
-               $this->controllerInstance = $resolverInstance->resolveController();
-
-               // Handle the request
-               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
-       }
-
-       /**
-        * Handle the indexed array of fatal messages and puts them out in an
-        * acceptable fasion
-        *
-        * @param       $messageList    An array of fatal messages
-        * @return      void
-        */
-       public function handleFatalMessages (array $messageList) {
-               // Walk through all messages
-               foreach ($messageList as $message) {
-                       print("MSG:".$message."<br />\n");
-               } // END - if
-       }
-
-       /**
-        * Assigns application-depending data
-        *
-        * @param       $templateInstance       An instance of a template engine
-        * @return      void
-        */
-       public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
-               // Assign charset
-               $templateInstance->assignConfigVariable('header_charset');
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/config.php b/application/blog/config.php
deleted file mode 100644 (file)
index 5117cb9..0000000
--- a/application/blog/config.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * Additional/overwritten configuration parts
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get a configuration instance for shorter lines
-$cfg = FrameworkConfiguration::getInstance();
-
-// CFG: HEADER-CHARSET
-$cfg->setConfigEntry('header_charset', "utf-8");
-
-// CFG: DEFAULT-WEB-COMMAND
-$cfg->setConfigEntry('default_web_command', "home");
-
-// CFG: DEFAULT-IMAGE-COMMAND
-$cfg->setConfigEntry('default_image_command', "build");
-
-// CFG: PAGE-WITH-NEWS
-$cfg->setConfigEntry('page_with_news', "home");
-
-// CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', "index.php?app={?app_short_name?}&amp;page=do_form");
-
-// CFG: FORM-METHOD
-$cfg->setConfigEntry('form_method', "post");
-
-// CFG: FORM-TARGET
-$cfg->setConfigEntry('form_target', "_self");
-
-// CFG: REGISTER-REQUIRES-EMAIL
-$cfg->setConfigEntry('register_requires_email', "Y");
-
-// CFG: REGISTER-INCLUDES-PROFILE
-$cfg->setConfigEntry('register_includes_profile', "Y");
-
-// CFG: REGISTER-PERSONAL-DATA
-$cfg->setConfigEntry('register_personal_data', "Y");
-
-// CFG: REGISTER-EMAIL-UNIQUE
-$cfg->setConfigEntry('register_email_unique', "Y");
-
-// CFG: CHAT-ENABLED-ICQ
-$cfg->setConfigEntry('chat_enabled_icq', "Y");
-
-// CFG: CHAT-ENABLED-JABBER
-$cfg->setConfigEntry('chat_enabled_jabber', "Y");
-
-// CFG: CHAT-ENABLED-YAHOO
-$cfg->setConfigEntry('chat_enabled_yahoo', "Y");
-
-// CFG: CHAT-ENABLED-AOL
-$cfg->setConfigEntry('chat_enabled_aol', "Y");
-
-// CFG: CHAT-ENABLED-MSN
-$cfg->setConfigEntry('chat_enabled_msn', "Y");
-
-// CFG: USER-REGISTRATION
-$cfg->setConfigEntry('user_registration_class', "BlogRegistration");
-
-// CFG: USER-LOGIN-CLASS
-$cfg->setConfigEntry('user_login_class', "BlogUserLogin");
-
-// CFG: GUEST-LOGIN-CLASS
-$cfg->setConfigEntry('guest_login_class', "BlogGuestLogin");
-
-// CFG: USER-STATUS-REGISTER
-$cfg->setConfigEntry('user_status_unconfirmed', "UNCONFIRMED");
-
-// CFG: USER-STATUS-GUEST
-$cfg->setConfigEntry('user_status_guest', "GUEST");
-
-// CFG: USER-STATUS-CONFIRMED
-$cfg->setConfigEntry('user_status_confirmed', "CONFIRMED");
-
-// CFG: LOGIN-HELPER-CLASS
-$cfg->setConfigEntry('login_helper_class', "BlogLoginHelper");
-
-// CFG: AUTH-METHOD-CLASS
-$cfg->setConfigEntry('auth_method_class', "CookieAuth");
-
-// CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', "index.php?app={?app_short_name?}&page=login_area");
-
-// CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', "index.php?app={?app_short_name?}&page=login_failed");
-
-// CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', "index.php?app={?app_short_name?}&page=logout_done");
-
-// CFG: LOGIN-USER-STATUS-URL
-$cfg->setConfigEntry('login_user_status_url', "index.php?app={?app_short_name?}&page=login_area&action=status_problem");
-
-// CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_problem");
-
-// CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_email_missing");
-
-// CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app={?app_short_name?}&page=status&status=confirm_code_invalid");
-
-// CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', "index.php?app={?app_short_name?}&page=status&status=user_not_found");
-
-// CFG: LOGIN-BLOG-FAILED-USER-URL
-$cfg->setConfigEntry('login_blog_failed_user_url', "index.php?app={?app_short_name?}&page=blog_failed&failed=user");
-
-// CFG: LOGIN-DEFAULT-ACTION
-$cfg->setConfigEntry('login_default_action', "welcome");
-
-// CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
-
-// CFG: NEWS-READER-LOGIN-AREA-CLASS
-$cfg->setConfigEntry('news_reader_login_area_class', "DefaultNewsReader");
-
-// CFG: NEWS-READER-BLOG-FAILED-CLASS
-$cfg->setConfigEntry('news_reader_blog_failed_class', "DefaultNewsReader");
-
-// CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");
-
-// CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");
-
-// CFG: USER-AUTH-FILTER
-$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");
-
-// CFG: USER-UPDATE-FILTER
-$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");
-
-// CFG: BLOG-DATA-FILTER
-$cfg->setConfigEntry('blog_data_filter', "BlogDataFetchFilter");
-
-// CFG: USER-STATUS-CONFIRMED-FILTER
-$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");
-
-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
-$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");
-
-// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-USER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CONFIRM-CODE-VALIDATOR-FILTER
-$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");
-
-// CFG: NEWS-HOME-LIMIT
-$cfg->setConfigEntry('news_home_limit', 10);
-
-// CFG: NEWS-LOGIN-AREA-LIMIT
-$cfg->setConfigEntry('news_login_area_limit', 15);
-
-// CFG: NEWS-BLOG-FAILED-LIMIT
-$cfg->setConfigEntry('news_blog_failed_limit', 15);
-
-// CFG: LOGIN-ENABLED
-$cfg->setConfigEntry('login_enabled', "Y");
-
-// CFG: CONFIRM-EMAIL-ENABLED
-$cfg->setConfigEntry('confirm_email_enabled', "Y");
-
-// CFG: LOGIN-DISABLED-REASON
-$cfg->setConfigEntry('login_disabled_reason', "Loginbereich befindet sich noch im Aufbau.");
-
-// CFG: LOGIN-TYPE
-$cfg->setConfigEntry('login_type', "username"); // username, email, both
-
-// CFG: EMAIL-CHANGE-ALLOWED
-$cfg->setConfigEntry('email_change_allowed', "Y");
-
-// CFG: EMAIL-CHANGE-CONFIRMATION
-$cfg->setConfigEntry('email_change_confirmation', "Y");
-
-// CFG: GUEST-LOGIN-ALLOWED
-$cfg->setConfigEntry('guest_login_allowed', "Y");
-
-// CFG: GUEST-LOGIN-USERNAME
-$cfg->setConfigEntry('guest_login_user', "guest");
-
-// CFG: GUEST-LOGIN-PASS
-$cfg->setConfigEntry('guest_login_passwd', "guest");
-
-// CFG: LOGIN-WELCOME-ACTION-CLASS
-$cfg->setConfigEntry('login_welcome_action_class', "BlogLoginAction");
-
-// CFG: LOGIN-LOGOUT-ACTION-CLASS
-$cfg->setConfigEntry('login_logout_action_class', "BlogLogoutAction");
-
-// CFG: LOGIN-PROFILE-ACTION-CLASS
-$cfg->setConfigEntry('login_profile_action_class', "BlogProfileAction");
-
-// CFG: BLOG-REGISTER-CAPTCHA
-$cfg->setConfigEntry('blog_register_captcha', "GraphicalCodeCaptcha");
-
-// CFG: BLOG-USER-LOGIN-CAPTCHA
-$cfg->setConfigEntry('blog_user_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: BLOG-GUEST-LOGIN-CAPTCHA
-$cfg->setConfigEntry('blog_guest_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: CAPTCHA-STRING-LENGTH
-$cfg->setConfigEntry('captcha_string_length', 5);
-
-// CFG: CAPTCHA-SEARCH-CHARS
-$cfg->setConfigEntry('captcha_search_chars', "+/=");
-
-// CFG: RANDOM-STRING-LENGTH
-$cfg->setConfigEntry('random_string_length', 100);
-
-// CFG: BLOG-REGISTER-CAPTCHA-SECURED
-$cfg->setConfigEntry('blog_register_captcha_secured', "Y");
-
-// CFG: BLOG-USER-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('blog_user_login_captcha_secured', "Y");
-
-// CFG: BLOG-GUEST-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('blog_guest_login_captcha_secured', "Y");
-
-// CFG: BLOCK-SHOWS-REGISTRATION
-$cfg->setConfigEntry('block_shows_registration', "Y");
-
-// CFG: COMPANY-CLASS
-$cfg->setConfigEntry('company_class', "ShippingCompany");
-
-// CFG: COMPANY-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('company_db_wrapper_class', "CompanyDatabaseWrapper");
-
-// CFG EMAIl-TPL-RESEND-LINK
-$cfg->setConfigEntry('email_tpl_resend_link', "text");
-
-// CFG: MAIL-TEMPLATE-ENGINE
-$cfg->setConfigEntry('mail_template_class', "MailTemplateEngine");
-
-// CFG: IMAGE-TEMPLATE-ENGINE
-$cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
-
-// CFG: ADMIN-EMAIL
-$cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
-
-// CFG: WEB-BLOCK-HELPER
-$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
-
-// CFG: WEB-FORM-HELPER
-$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
-
-// CFG: WEB-LINK-HELPER
-$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
-
-// [EOF]
-?>

diff --git a/application/blog/data.php b/application/blog/data.php
deleted file mode 100644 (file)
index e89cd58..0000000
--- a/application/blog/data.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Application data
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Get an instance of the helper
-$app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), "getInstance"),
-       array()
-);
-
-// Set application name and version
-$app->setAppName("Nameless Blogging Software");
-$app->setAppVersion("0.0.0");
-$app->setAppShortName("blog");
-
-// [EOF]
-?>

diff --git a/application/blog/debug.php b/application/blog/debug.php
deleted file mode 100644 (file)
index f5da828..0000000
--- a/application/blog/debug.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Some debugging stuff for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Reederei-Objekt debuggen
-//define('DEBUG_COMPANY_OBJ', true);
-// Hafen-Objekt debuggen
-//define('DEBUG_HARBOR_OBJ', true);
-// Schiff-Objekt debuggen
-//define('DEBUG_SHIP_OBJ', true);
-// Auftrag-Objekt debuggen
-//define('DEBUG_CONTRACT_OBJ', true);
-// Haendler-Objekt debuggen
-//define('DEBUG_MERCHANT_OBJ', true);
-// Personal-Objekt debuggen
-//define('DEBUG_PERSONELL_OBJ', true);
-// Personal debuggen
-//define('DEBUG_PERSONELL', true);
-// Reederei debuggen
-//define('DEBUG_COMPANY', true);
-// Mitarbeiter debuggen
-//define('DEBUG_COMPANY_EMPLOYEE', true);
-// Hafen debuggen
-//define('DEBUG_HARBOR', true);
-// Werft debuggen
-//define('DEBUG_SHIPYARD', true);
-// Schiff debuggen
-//define('DEBUG_SHIP', true);
-// Schiffstruktur debuggen
-//define('DEBUG_STRUCTURE', true);
-// Kabinen debuggen
-//define('DEBUG_CABIN', true);
-// Decks debuggen
-//define('DEBUG_DECK', true);
-// Bauauftraege debuggen
-//define('DEBUG_CONTRACT', true);
-// Haendler debuggen
-//define('DEBUG_MERCHANT', true);
-
-// [EOF]
-?>

diff --git a/application/blog/exceptions.php b/application/blog/exceptions.php
deleted file mode 100644 (file)
index fd41c37..0000000
--- a/application/blog/exceptions.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * The exception handler for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Our own exception handler
-function __exceptionHandler (FrameworkException $e) {
-       // Call the app_die() method
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
-               ApplicationHelper::getInstance()->getAppName(),
-               ApplicationHelper::getInstance()->getAppShortName(),
-               $e->__toString(),
-               $e->getHexCode(),
-               $e->getMessage(),
-               $e->getPrintableBackTrace()
-       ),
-               $e->getHexCode(),
-               $e->getExtraData()
-       );
-} // END - function
-
-// Set the new handler
-set_exception_handler('__exceptionHandler');
-
-// Error handler
-function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
-       // Construct the message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>, Message: <span class=\"debug_message\">%s</span>",
-               basename($errfile),
-               $errline,
-               $errno,
-               $errstr
-       );
-
-       // Throw an exception here
-       throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-} // END - function
-
-// Set error handler
-set_error_handler('__errorHandler');
-
-// Assertion handler
-function __assertHandler ($file, $line, $code) {
-       // Empty code?
-       if ($code === "") $code = "<em>Unknown</em>";
-
-       // Create message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>",
-               basename($file),
-               $line,
-               $code
-       );
-
-       // Throw an exception here
-       throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
-} // END - function
-
-// Init assert handling
-assert_options(ASSERT_ACTIVE,     1);
-assert_options(ASSERT_WARNING,    0);
-assert_options(ASSERT_BAIL,       0);
-assert_options(ASSERT_QUIET_EVAL, 0);
-assert_options(ASSERT_CALLBACK,   '__assertHandler');
-
-// [EOF]
-?>

diff --git a/application/blog/exceptions/.htaccess b/application/blog/exceptions/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/exceptions/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/init.php b/application/blog/init.php
deleted file mode 100644 (file)
index 39c5bed..0000000
--- a/application/blog/init.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Application initializer
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Initialize output system
-require($cfg->readConfig('base_path') . 'inc/output.php');
-
-// Initialize file i/o system
-require($cfg->readConfig('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->readConfig('base_path') . 'inc/language.php');
-
-// This application needs a database connection then we have to simply include
-// the inc/database.php script
-require($cfg->readConfig('base_path') . 'inc/database.php');
-
-// [EOF]
-?>

diff --git a/application/blog/interfaces/.htaccess b/application/blog/interfaces/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/interfaces/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/loader.php b/application/blog/loader.php
deleted file mode 100644 (file)
index 12b388b..0000000
--- a/application/blog/loader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * A specialized class loader for this class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Load all classes for the application
-foreach ($lowerClasses as $className) {
-       // Load the application classes
-       ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/%s", $cfg->readConfig('application_path'), $cfg->readConfig('app_name'), $className));
-} // END - if
-
-// Clean up the global namespace
-unset($lowerClasses);
-unset($className);
-
-// [EOF]
-?>

diff --git a/application/blog/main/.htaccess b/application/blog/main/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/actions/.htaccess b/application/blog/main/actions/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/actions/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/actions/class_ b/application/blog/main/actions/class_
deleted file mode 100644 (file)
index 726285a..0000000
--- a/application/blog/main/actions/class_
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * 
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class ???Action extends BaseBlogAction implements Commandable, Registerable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this action
-        *
-        * @param       $resolverInstance       An instance of an action resolver
-        * @return      $actionInstance         An instance of this action class
-        */
-       public final static function create???Action (ActionResolver $resolverInstance) {
-               // Get a new instance
-               $actionInstance = new ???Action();
-
-               // Return the instance
-               return $actionInstance;
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        0% done
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Call parent execute method
-               parent::execute($requestInstance, $responseInstance);
-
-               // Add your code here
-               $this->partialStub("You have to implement me.");
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        Add some filters here
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Call parent addExtraFilters method
-               parent::addExtraFilters($controllerInstance, $requestInstance);
-
-               // Unfinished method
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/actions/class_BaseBlogAction.php b/application/blog/main/actions/class_BaseBlogAction.php
deleted file mode 100644 (file)
index d0c85bf..0000000
--- a/application/blog/main/actions/class_BaseBlogAction.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * A general action class for blog
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class BaseBlogAction extends BaseAction {
-       /**
-        * Protected constructor
-        *
-        * @param       $className      Name of the class
-        * @return      void
-        */
-       protected function __construct ($className) {
-               // Call parent constructor
-               parent::__construct($className);
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        0% done
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Add code here executed with every action
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        Add some filters here
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Fetch some blog data
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('blog_data_filter', array($controllerInstance)));
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/actions/web/.htaccess b/application/blog/main/actions/web/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/actions/web/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/actions/web/class_WebBlogLoginWelcomeAction.php b/application/blog/main/actions/web/class_WebBlogLoginWelcomeAction.php
deleted file mode 100644 (file)
index cf73954..0000000
--- a/application/blog/main/actions/web/class_WebBlogLoginWelcomeAction.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * An action for the welcome page
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebBlogLoginWelcomeAction extends BaseBlogAction implements Commandable, Registerable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this action
-        *
-        * @param       $resolverInstance       An instance of an action resolver
-        * @return      $actionInstance         An instance of this action class
-        */
-       public final static function createWebBlogLoginWelcomeAction (ActionResolver $resolverInstance) {
-               // Get a new instance
-               $actionInstance = new WebBlogLoginWelcomeAction();
-
-               // Set the resolver instance
-               $actionInstance->setResolverInstance($resolverInstance);
-
-               // Return the instance
-               return $actionInstance;
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        0% done
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Call parent execute method
-               parent::execute($requestInstance, $responseInstance);
-
-               // Execute some code here
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        Add some filters here
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Call parent addExtraFilters method
-               parent::addExtraFilters($controllerInstance, $requestInstance);
-
-               // Unfinished method
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/class_ b/application/blog/main/class_
deleted file mode 100644 (file)
index df22004..0000000
--- a/application/blog/main/class_
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * 
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class  extends BaseFrameworkSystem {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/commands/.htaccess b/application/blog/main/commands/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/commands/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/commands/web/.htaccess b/application/blog/main/commands/web/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/commands/web/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/commands/web/class_WebBlogGuestLoginCommand.php b/application/blog/main/commands/web/class_WebBlogGuestLoginCommand.php
deleted file mode 100644 (file)
index ef0807f..0000000
--- a/application/blog/main/commands/web/class_WebBlogGuestLoginCommand.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * A command for guest logins
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebBlogGuestLoginCommand extends BaseCommand implements Commandable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Creates an instance of this command and sets the resolver instance
-        *
-        * @param       $resolverInstance       An instance of a command resolver
-        * @return      $commandInstance        The created command instance
-        */
-       public final static function createWebBlogGuestLoginCommand (CommandResolver $resolverInstance) {
-               // Get a new instance
-               $commandInstance = new WebBlogGuestLoginCommand();
-
-               // Set the resolver instance
-               $commandInstance->setResolverInstance($resolverInstance);
-
-               // Return the prepared instance
-               return $commandInstance;
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // First get a GuestLogin instance
-               $loginInstance = ObjectFactory::createObjectByConfiguredName('guest_login_class');
-
-               // First set request and response instance
-               $loginInstance->setRequestInstance($requestInstance);
-
-               // Encrypt the password
-               $loginInstance->encryptPassword('passwd');
-
-               // Do the login here
-               $loginInstance->doLogin($requestInstance, $responseInstance);
-
-               // Was the login fine? Then redirect here
-               if ($loginInstance->ifLoginWasSuccessfull()) {
-                       // Try to redirect here
-                       try {
-                               // Redirect...
-                               $responseInstance->redirectToConfiguredUrl('app_login_url');
-
-                               // Exit here
-                               exit();
-                       } catch (FrameworkException $e) {
-                               // Something went wrong here!
-                               $responseInstance->addFatalMessage($e->getMessage());
-                       }
-               } else {
-                       // Attach error message to the response
-                       $responseInstance->addFatalMessage('failed_user_login');
-               }
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        Add more filters
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Add username verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_guest_verifier_filter', array($controllerInstance)));
-
-               // Add password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('passwd_guest_verifier_filter', array($controllerInstance)));
-
-               // Add CAPTCHA verifier code
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_guest_verifier_filter', array($controllerInstance)));
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/commands/web/class_WebBlogUserLoginCommand.php b/application/blog/main/commands/web/class_WebBlogUserLoginCommand.php
deleted file mode 100644 (file)
index ad56dd9..0000000
--- a/application/blog/main/commands/web/class_WebBlogUserLoginCommand.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * A command for user login
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebBlogUserLoginCommand extends BaseCommand implements Commandable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Creates an instance of this command and sets the resolver instance
-        *
-        * @param       $resolverInstance       An instance of a command resolver
-        * @return      $commandInstance        The created command instance
-        */
-       public final static function createWebBlogUserLoginCommand (CommandResolver $resolverInstance) {
-               // Get a new instance
-               $commandInstance = new WebBlogUserLoginCommand();
-
-               // Set the resolver instance
-               $commandInstance->setResolverInstance($resolverInstance);
-
-               // Return the prepared instance
-               return $commandInstance;
-       }
-
-       /**
-        * Executes the command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // First get a UserLogin instance
-               $loginInstance = ObjectFactory::createObjectByConfiguredName('user_login_class');
-
-               // First set request and response instance
-               $loginInstance->setRequestInstance($requestInstance);
-
-               // Encrypt the password
-               $loginInstance->encryptPassword('pass');
-
-               // Do the login here
-               $loginInstance->doLogin($requestInstance, $responseInstance);
-
-               // Was the login fine? Then redirect here
-               if ($loginInstance->ifLoginWasSuccessfull()) {
-                       // Try to redirect here
-                       try {
-                               // Redirect...
-                               $responseInstance->redirectToConfiguredUrl('app_login_url');
-
-                               // Exit here
-                               exit();
-                       } catch (FrameworkException $e) {
-                               // Something went wrong here!
-                               $responseInstance->addFatalMessage($e->getMessage());
-                       }
-               } else {
-                       // Attach error message to the response
-                       $responseInstance->addFatalMessage('failed_user_login');
-               }
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        * @todo        Add more filters
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Which login type do we have?
-               switch ($this->getConfigInstance()->readConfig('login_type')) {
-                       case "username": // Login via username
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_verifier_filter', array($controllerInstance)));
-                               break;
-
-                       case "email": // Login via email
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_verifier_filter', array($controllerInstance)));
-                               break;
-
-                       default: // Wether username or email is set
-                               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_email_verifier_filter', array($controllerInstance)));
-                               break;
-               }
-
-               // Password verifier filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_filter', array($controllerInstance)));
-
-               // Add filter for CAPTCHA
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('captcha_user_verifier_filter', array($controllerInstance)));
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/commands/web/failed/.htaccess b/application/blog/main/commands/web/failed/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/commands/web/failed/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/commands/web/failed/class_WebBlogFailedCommand.php b/application/blog/main/commands/web/failed/class_WebBlogFailedCommand.php
deleted file mode 100644 (file)
index 87cfaa8..0000000
--- a/application/blog/main/commands/web/failed/class_WebBlogFailedCommand.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * A command for failed blog "requests"
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebBlogFailedCommand extends BaseCommand implements Commandable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this class
-        *
-        * @param       $resolverInstance       An instance of a command resolver class
-        * @return      $commandInstance        An instance a prepared command class
-        */
-       public final static function createWebBlogFailedCommand (CommandResolver $resolverInstance) {
-               // Get new instance
-               $commandInstance = new WebBlogFailedCommand();
-
-               // Set the application instance
-               $commandInstance->setResolverInstance($resolverInstance);
-
-               // Return the prepared instance
-               return $commandInstance;
-       }
-
-       /**
-        * Executes the given command with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        0% done
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               $this->partialStub("Unfinished method.");
-       }
-
-       /**
-        * Adds extra filters to the given controller instance
-        *
-        * @param       $controllerInstance             A controller instance
-        * @param       $requestInstance                An instance of a class with an Requestable interface
-        * @return      void
-        */
-       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Empty for now
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/controller/.htaccess b/application/blog/main/controller/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/controller/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/controller/web/.htaccess b/application/blog/main/controller/web/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/controller/web/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/controller/web/class_WebBlogFailedController.php b/application/blog/main/controller/web/class_WebBlogFailedController.php
deleted file mode 100644 (file)
index bbd33be..0000000
--- a/application/blog/main/controller/web/class_WebBlogFailedController.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * Controller for failed blog data "requests"
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class WebBlogFailedController extends BaseController implements Controller {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this class
-        *
-        * @param       $resolverInstance               An instance of a command resolver class
-        * @return      $controllerInstance             A prepared instance of this class
-        * @todo        Add some filters to this controller
-        */
-       public final static function createWebBlogFailedController (CommandResolver $resolverInstance) {
-               // Create the instance
-               $controllerInstance = new WebBlogFailedController();
-
-               // Set the command resolver
-               $controllerInstance->setResolverInstance($resolverInstance);
-
-               // User auth filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_filter', array($controllerInstance)));
-
-               // User update filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_update_filter', array($controllerInstance)));
-
-               // News fetcher filter
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_download_filter', array($controllerInstance)));
-
-               // News proccess/display-preparation
-               $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('news_process_filter', array($controllerInstance)));
-
-               // Return the prepared instance
-               return $controllerInstance;
-       }
-
-       /**
-        * Handles the given request and response
-        *
-        * @param       $requestInstance        An instance of a request class
-        * @param       $responseInstance       An instance of a response class
-        * @return      void
-        */
-       public function handleRequest (Requestable $requestInstance, Responseable $responseInstance) {
-               // Get the command instance from the resolver by sending a request instance to the resolver
-               $commandInstance = $this->getResolverInstance()->resolveCommandByRequest($requestInstance);
-
-               // Add more filters by the command
-               $commandInstance->addExtraFilters($this, $requestInstance);
-
-               // Try to run the pre filters, if auth exceptions come through redirect here
-               try {
-                       // Run the pre filters
-                       $this->executePreFilters($requestInstance, $responseInstance);
-               } catch (UserAuthorizationException $e) {
-                       // Redirect to main page
-                       $responseInstance->redirectToConfiguredUrl('login_failed_url');
-
-                       // Exit here
-                       exit();
-               }
-
-               // This request was valid! :-D
-               $requestInstance->requestIsValid();
-
-               // Execute the command
-               $commandInstance->execute($requestInstance, $responseInstance);
-
-               // Run the pre filters
-               $this->executePostFilters($requestInstance, $responseInstance);
-
-               // Flush the response out
-               $responseInstance->flushBuffer();
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/filter/.htaccess b/application/blog/main/filter/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/filter/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/filter/blog/.htaccess b/application/blog/main/filter/blog/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/filter/blog/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/filter/blog/class_BlogDataFetchFilter.php b/application/blog/main/filter/blog/class_BlogDataFetchFilter.php
deleted file mode 100644 (file)
index e3cba61..0000000
--- a/application/blog/main/filter/blog/class_BlogDataFetchFilter.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * A filter for fetching blog data related to the current user
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class BlogDataFetchFilter extends BaseBlogFilter implements Filterable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this filter class
-        *
-        * @param       $controllerInstance             An instance of a Controller class
-        * @return      $filterInstance                 An instance of this filter class
-        */
-       public final static function createBlogDataFetchFilter (Controller $controllerInstance) {
-               // Get a new instance
-               $filterInstance = new BlogDataFetchFilter();
-
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
-               // Return the instance
-               return $filterInstance;
-       }
-
-       /**
-        * Executes the filter with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        Add code being executed in this filter
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Execute the parent execute method
-               parent::execute($requestInstance, $responseInstance);
-
-               // Get a user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
-
-               // Is the user instance valid?
-               if (!$userInstance instanceof ManageableMember) {
-                       // Request is invalid
-                       $requestInstance->requestIsValid(false);
-
-                       // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('login_blog_failed_user_url');
-
-                       // Stop processing here
-                       exit();
-               } // END - if
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/filter/class_ b/application/blog/main/filter/class_
deleted file mode 100644 (file)
index 3cf4789..0000000
--- a/application/blog/main/filter/class_
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * A filter for money refill page
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class ???Filter extends BaseBlogFilter implements Filterable {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this filter class
-        *
-        * @param       $controllerInstance             An instance of a Controller class
-        * @return      $filterInstance                 An instance of this filter class
-        */
-       public final static function create???Filter (Controller $controllerInstance) {
-               // Get a new instance
-               $filterInstance = new ???Filter();
-
-               // Set the controller
-               $filterInstance->setControllerInstance($controllerInstance);
-
-               // Return the instance
-               return $filterInstance;
-       }
-
-       /**
-        * Executes the filter with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        Add code being executed in this filter
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Execute the parent execute method
-               parent::execute($requestInstance, $responseInstance);
-
-               $this->partialStub("Add code here for your specific filter.");
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/filter/class_BaseBlogFilter.php b/application/blog/main/filter/class_BaseBlogFilter.php
deleted file mode 100644 (file)
index e1b430a..0000000
--- a/application/blog/main/filter/class_BaseBlogFilter.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * A general filter class for Ship-Simu
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class BaseBlogFilter extends BaseFilter {
-       /**
-        * Protected constructor
-        *
-        * @param       $className      Name of the filter class
-        * @return      void
-        */
-       protected function __construct ($className) {
-               // Call parent constructor
-               parent::__construct($className);
-       }
-
-       /**
-        * Executes the filter with given request and response objects
-        *
-        * @param       $requestInstance        An instance of a class with an Requestable interface
-        * @param       $responseInstance       An instance of a class with an Responseable interface
-        * @return      void
-        * @todo        0%
-        */
-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
-               // Add something to do on every filter
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/login/.htaccess b/application/blog/main/login/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/login/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/login/class_BlogGuestLogin.php b/application/blog/main/login/class_BlogGuestLogin.php
deleted file mode 100644 (file)
index ea6e784..0000000
--- a/application/blog/main/login/class_BlogGuestLogin.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
- * A special guest login class for the blog
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class BlogGuestLogin extends BaseFrameworkSystem implements LoginableUser {
-       /**
-        * The hashed password
-        */
-       private $hashedPassword = "";
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Creates an instance of this login class
-        *
-        * @return      $loginInstance  An instance of this login class
-        */
-       public final static function createBlogGuestLogin () {
-               // Get a new instance
-               $loginInstance = new BlogGuestLogin();
-
-               // Return the instance
-               return $loginInstance;
-       }
-
-       /**
-        * Logins the user with the given request containing the credential. The
-        * result of the login can be thrown by exception or, if prefered stored
-        * in a boolean attribute which is then readable by a matching getter.
-        *
-        * @param       $requestInstance        An instance of a Requestable class
-        * @param       $responseInstance       An instance of a Responseable class
-        * @return      void
-        * @throws      UserAuthMethodException If wether username nor email login
-        *                                                                              was detected
-        * @throws      MissingMethodException          If a method was not found in the
-        *                                                                              User class
-        * @throws      UserPasswordMismatchException   If the supplied password did not
-        *                                                                              match with the stored password
-        */
-       public function doLogin (Requestable $requestInstance, Responseable $responseInstance) {
-               // By default no method is selected
-               $method = null;
-               $data = "";
-
-               // Detect login method (username or email) and try to get a userinstance
-               if (!is_null($requestInstance->getRequestElement('user'))) {
-                       // Username found!
-                       $method = 'createGuestByUsername';
-                       $data = $requestInstance->getRequestElement('user');
-               } // END - if
-
-               // Is a method detected?
-               if (is_null($method)) {
-                       // Then abort here
-                       throw new UserAuthMethodException($this, self::EXCEPTION_MISSING_METHOD);
-               } elseif (!method_exists($this->getConfigInstance()->readConfig('guest_class'), $method)) {
-                       // The method is invalid!
-                       throw new MissingMethodException(array($this, $method), self::EXCEPTION_MISSING_METHOD);
-               }
-
-               // Get a instance of the registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
-
-               // Is there an instance?
-               if (is_null($userInstance)) {
-                       // Get a user instance
-                       $userInstance = call_user_func_array(array($this->getConfigInstance()->readConfig('guest_class'), $method), array($data));
-
-                       // Remember this new instance in registry
-                       Registry::getRegistry()->addInstance($userInstance);
-               } // END - if
-
-               // Is the password correct?
-               if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
-                       // Mismatching password
-                       throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
-
-               // Now do the real login. This can be cookie- or session-based login
-               // which depends on the admins setting then on the user's taste.
-               // 1) Get a login helper instance
-               $helperInstance = ObjectFactory::createObjectByConfiguredName('login_helper_class', array($requestInstance));
-
-               // 2) Execute the login. This will now login...
-               $helperInstance->executeLogin($responseInstance);
-       }
-
-       /**
-        * Determines wether the login was fine. This is done by checking if 'login' instance is in registry
-        *
-        * @return      $loginDone      Wether the login was fine or not
-        */
-       public function ifLoginWasSuccessfull () {
-               // Is the registry key there?
-               $loginDone = (Registry::getRegistry()->getInstance('login') instanceof Registerable);
-
-               // Return the result
-               return $loginDone;
-       }
-
-       /**
-        * Encrypt given request key or throw an exception if key was not found in
-        * request
-        *
-        * @param       $requestKey             Key in request class
-        * @return      void
-        */
-       public function encryptPassword ($requestKey) {
-               // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
-                       // So encrypt the password and store it for later usage in
-                       // the request:
-
-                       // Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
-
-                       // Get user instance
-                       $userInstance = Registry::getRegistry()->getInstance('user');
-
-                       // Get a crypto helper and hash the password
-                       $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());
-
-                       // Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
-               } // END - if
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/login/class_BlogUserLogin.php b/application/blog/main/login/class_BlogUserLogin.php
deleted file mode 100644 (file)
index 1c28494..0000000
--- a/application/blog/main/login/class_BlogUserLogin.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * A special login class for the blog
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class BlogUserLogin extends BaseFrameworkSystem implements LoginableUser {
-       /**
-        * The hashed password
-        */
-       private $hashedPassword = "";
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-
-       /**
-        * Creates an instance of this login class
-        *
-        * @return      $loginInstance  An instance of this login class
-        */
-       public final static function createBlogUserLogin () {
-               // Get a new instance
-               $loginInstance = new BlogUserLogin();
-
-               // Return the instance
-               return $loginInstance;
-       }
-
-       /**
-        * Logins the user with the given request containing the credential. The
-        * result of the login can be thrown by exception or, if prefered stored
-        * in a boolean attribute which is then readable by a matching getter.
-        *
-        * @param       $requestInstance        An instance of a Requestable class
-        * @param       $responseInstance       An instance of a Responseable class
-        * @return      void
-        * @throws      UserPasswordMismatchException   If the supplied password did not
-        *                                                                              match with the stored password
-        * @todo        We need to add something here which will make more than one
-        * @todo        guest logins, users who are online but based on the same
-        * @todo        user account.
-        */
-       public function doLogin (Requestable $requestInstance, Responseable $responseInstance) {
-               // By default no method is selected
-               $method = null;
-               $data = "";
-
-               // Get a instance of the registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
-
-               // Is there an instance?
-               if (is_null($userInstance)) {
-                       // Get member class
-                       $userClass = $this->getConfigInstance()->readConfig('user_class');
-
-                       // Get a user instance
-                       $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
-
-                       // Remember this new instance in registry
-                       Registry::getRegistry()->addInstance($userInstance);
-               } // END - if
-
-               // Is the password correct?
-               if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {
-                       // Mismatching password
-                       throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH);
-               } // END - if
-
-               // ToDo place
-
-               // Now do the real login. This can be cookie- or session-based login
-               // which depends on the admins setting then on the user's taste.
-               // 1) Get a login helper instance
-               $helperInstance = ObjectFactory::createObjectByConfiguredName('login_helper_class', array($requestInstance));
-
-               // 2) Execute the login. This will now login...
-               $helperInstance->executeLogin($responseInstance);
-       }
-
-       /**
-        * Determines wether the login was fine. This is done by checking if 'login' instance is in registry
-        *
-        * @return      $loginDone      Wether the login was fine or not
-        */
-       public function ifLoginWasSuccessfull () {
-               // Is the registry key there?
-               $loginDone = (Registry::getRegistry()->getInstance('login') instanceof Registerable);
-
-               // Return the result
-               return $loginDone;
-       }
-
-       /**
-        * Encrypt given request key or throw an exception if key was not found in
-        * request
-        *
-        * @param       $requestKey             Key in request class
-        * @return      void
-        */
-       public function encryptPassword ($requestKey) {
-               // Check if password is found in request
-               if ($this->getRequestInstance()->isRequestElementSet($requestKey)) {
-                       // So encrypt the password and store it for later usage in
-                       // the request:
-
-                       // Get the plain password
-                       $plainPassword = $this->getRequestInstance()->getRequestElement($requestKey);
-
-                       // Get user instance
-                       $userInstance = Registry::getRegistry()->getInstance('user');
-
-                       // Get a crypto helper and hash the password
-                       $this->hashedPassword = ObjectFactory::createObjectByConfiguredName('crypto_class')->hashString($plainPassword, $userInstance->getPasswordHash());
-
-                       // Store the hash back in request
-                       $this->getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword);
-               } // END - if
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/blog/main/login/helper/.htaccess b/application/blog/main/login/helper/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/main/login/helper/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/main/login/helper/class_BlogLoginHelper.php b/application/blog/main/login/helper/class_BlogLoginHelper.php
deleted file mode 100644 (file)
index 8cb22bf..0000000
--- a/application/blog/main/login/helper/class_BlogLoginHelper.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * A helper for Blog to login. This login helper first checks what setting
- * (cookie or session) the admin has choosen then overwrites it with the setting
- * from current user. The registry instance should hold an instance of this user
- * class at key 'user' else an exception will be thrown. After this the setting
- * from a login form will be taken as login method and be stored in database
- * for later usage.
- *
- * The user shall be able to choose "Default login method" or similar to use his
- * own login method.
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class BlogLoginHelper extends BaseLoginHelper implements HelpableLogin {
-       /**
-        * The login method we shall choose
-        */
-       private $authMethod = "";
-
-       // Exception constants
-       const EXCEPTION_INVALID_USER_INSTANCE = 0x190;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Creates an instance of this class by given request instance
-        *
-        * @param       $requestInstance        An instance of a Requestable class
-        * @return      $helperInstance         An instance of this helper class
-        * @throws      UserInstanceMissingException    If the user instance in registry
-        *                                                                                      is missing or invalid
-        */
-       public final static function createBlogLoginHelper (Requestable $requestInstance) {
-               // Get a new instance first
-               $helperInstance = new BlogLoginHelper();
-
-               // Get a user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
-
-               // Is this instance valid?
-               if (!$userInstance instanceof ManageableAccount) {
-                       // Thrown an exception here
-                       throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE);
-               } // END - if
-
-               // Set default login method from config
-               $helperInstance->setDefaultAuthMethod();
-
-               // Set request instance
-               $helperInstance->setRequestInstance($requestInstance);
-
-               // Return the prepared instance
-               return $helperInstance;
-       }
-
-       /**
-        * Setter for default login method from config
-        *
-        * @return      void
-        */
-       protected function setDefaultAuthMethod () {
-               $this->authMethod = $this->getConfigInstance()->readConfig('auth_method_class');
-       }
-
-       /**
-        * Execute the login request by given response instance. This instance can
-        * be used for sending cookies or at least the session id out.
-        *
-        * @param       $responseInstance       An instance of a Responseable class
-        * @return      void
-        */
-       public function executeLogin (Responseable $responseInstance) {
-               // Get an instance from the login method
-               $loginInstance = ObjectFactory::createObjectByName($this->authMethod, array($responseInstance));
-
-               // Set user cookie
-               $loginInstance->setUserAuth($this->getRequestInstance()->getRequestElement('username'));
-
-               // Set password cookie
-               $loginInstance->setPasswordAuth($this->getRequestInstance()->getRequestElement('pass_hash'));
-
-               // Remember this login instance for later usage
-               Registry::getRegistry()->addInstance('login', $loginInstance);
-       }
-}
-
-//
-?>

diff --git a/application/blog/starter.php b/application/blog/starter.php
deleted file mode 100644 (file)
index b128839..0000000
--- a/application/blog/starter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * The application launcher
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Is there an application helper instance? We need the method main() for
-// maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
-
-// Some sanity checks
-if ((empty($app)) || (is_null($app))) {
-       // Something went wrong!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
-       ));
-} elseif (!is_object($app)) {
-       // No object!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",
-               $application
-       ));
-} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig('entry_method'))) {
-       // Method not found!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('entry_method')
-       ));
-}
-
-// Call user function
-call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
-
-// [EOF]
-?>

diff --git a/application/blog/templates/.htaccess b/application/blog/templates/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/de/.htaccess b/application/blog/templates/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/de/code/action_blog_login_logout.ctp b/application/blog/templates/de/code/action_blog_login_logout.ctp
deleted file mode 100644 (file)
index e1ef3db..0000000
--- a/application/blog/templates/de/code/action_blog_login_logout.ctp
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
-
-// Set link text
-$helper->addLinkWithTextById('logout_now_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Set link text
-$helper->addLinkWithTextById('return_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="logout_box">
-       <div id="logout_header">
-               Willst du dich wirklich aus dem Blog ausloggen?
-       </div>
-
-       <div id="logout_links">
-               {?logout_now_link?} | {?return_login_link?}
-       </div>
-</div>

diff --git a/application/blog/templates/de/code/action_blog_login_profile.ctp b/application/blog/templates/de/code/action_blog_login_profile.ctp
deleted file mode 100644 (file)
index 7a44b9a..0000000
--- a/application/blog/templates/de/code/action_blog_login_profile.ctp
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "blog_profile"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Password can only be changed when the old one is entered and new one twice!
-$helper->addFormGroup('pass', "Neues Passwort einrichten:");
-$helper->addFormSubGroup('pass', "Bitte gebe zum &Auml;ndern deines Passwortes zweimal das gew&uuml;nschte neue Passwort ein.");
-$helper->addFieldText('pass1', "Neues Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
-$helper->addInputPasswordField('pass2');
-
-// Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
-
-// Only for changing email address
-if ($helper->ifEmailChangeAllowed()) {
-       $helper->addFormGroup('email', "&Auml;nderung deiner Email-Addresse:");
-       $helper->addFormSubGroup('email', "Gebe nur deine Email-Adresse zweimal ein, wenn du diese &auml;ndern m&ouml;chtest!");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Blog verwendet worden sein.");
-       } // END - Unique email addresses
-
-       if ($helper->ifEmailChangeRequireConfirmation()) {
-               $helper->addFormNote('confirm_link', "Es wird ein Best&auml;tigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann m&ouml;glichst schnell an.");
-       } // END - Change requires confirmation
-} // END - email change allowed
-
-$helper->addFormGroup('profile', "Hier kannst du deine Profildaten &auml;ndern.");
-
-// Persoenliche Daten mit in der Anmeldung abfragen?
-if ($helper->ifRegisterIncludesPersonaData()) {
-       $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-       $helper->addFieldText('surname', "Dein Vorname:");
-       $helper->addInputTextFieldWithDefault('surname');
-       $helper->addFieldText('family', "Dein Nachname:");
-       $helper->addInputTextFieldWithDefault('family');
-       $helper->addFieldText('street', "Strasse und Hausnummer:");
-       $helper->addInputTextFieldWithDefault('street');
-       $helper->addFieldText('city', "Wohnort:");
-       $helper->addInputTextFieldWithDefault('city');
-} // END - Persona data
-
-$helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-$helper->addFieldText('zip', "Postleitzahl:");
-$helper->addInputTextFieldWithDefault('zip');
-
-$helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-if ($helper->ifChatEnabled('icq')) {
-       $helper->addFieldText('icq', "ICQ-Nummer:");
-       $helper->addInputTextFieldWithDefault('icq');
-} // END - if
-
-if ($helper->ifChatEnabled('jabber')) {
-       $helper->addFieldText('jabber', "Jabber:");
-       $helper->addInputTextFieldWithDefault('jabber');
-} // END - if
-
-if ($helper->ifChatEnabled('yahoo')) {
-       $helper->addFieldText('yahoo', "Yahoo!:");
-       $helper->addInputTextFieldWithDefault('yahoo');
-} // END - if
-
-if ($helper->ifChatEnabled('aol')) {
-       $helper->addFieldText('aol', "AOL-Screenname:");
-       $helper->addInputTextFieldWithDefault('aol');
-} // END - if
-
-if ($helper->ifChatEnabled('msn')) {
-       $helper->addFieldText('msn', "MSN:");
-       $helper->addInputTextFieldWithDefault('msn');
-} // END - if
-
-if (!$helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-} // END - Extra note
-
-// Rules already accepted?
-if ($helper->ifRulesHaveChanged()) {
-       $helper->addFormGroup('rules', "Bitte lese dir die Blogeregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Blogregeln&quot; an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
-       $helper->addInputCheckboxField('rules', false);
-} else {
-       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Blogregeln akzeptiert. Vielen Dank!");
-       $helper->addInputHiddenField('rules', "1");
-}
-
-// Ask again for current account password
-$helper->addFormGroup('pass_old', "Bitte gebe zur Best&auml;tigung der &Auml;nderungen dein derzeitiges Passwort ein.");
-$helper->addFieldText('pass_old', "Altes Passwort:");
-$helper->addInputPasswordField('pass_old');
-
-// Abschliessender Hinweis und Abschluss des Formulars
-$helper->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Accountdaten aktualisieren");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Deine Profildaten bearbeiten
-</div>
-
-<div id="profile_box">
-       {?blog_profile?}
-</div>

diff --git a/application/blog/templates/de/code/action_blog_login_status_problem.ctp b/application/blog/templates/de/code/action_blog_login_status_problem.ctp
deleted file mode 100644 (file)
index e71f3e8..0000000
--- a/application/blog/templates/de/code/action_blog_login_status_problem.ctp
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Add submit button or notice
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Add submit button
-       $helper->addInputHiddenFieldWithDefault('email');
-       $helper->addInputSubmitButton("Best&auml;tigungslink erneut aussenden");
-} elseif ($helper->ifUserAccountLocked()) {
-       // Account is locked
-       $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre:
-               <span id=\"lock_reason\">".$helper->getValueField('lock_reason')."</span>
-               Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
-       );
-} elseif ($helper->ifUserAccountGuest()) {
-       // Account is guest account
-       $helper->addFormNote('status_guest', "G&auml;steaccounts sind in der Funktionalit&auml;t
-               leicht eingeschr&auml;nkt. Bitte melde dich an, damit du ein
-               vollwertiges Account bekommst."
-       );
-}
-
-// Flush content and automatically close the form
-$helper->flushContent();
-
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Build the form for confirmation
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
-
-       // Add code box
-       $helper->addFormGroup('code', "Bitte gebe hier den Best&auml;tigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");
-       $helper->addFieldText('code', "Best&auml;tigungscode aus der Mail:");
-       $helper->addInputTextField('code');
-
-       // Add submit button
-       $helper->addFormGroup('buttons', "Bitte einmal abschicken und das Ergebnis abwarten!");
-       $helper->addInputResetButton("Nochmal eingeben");
-       $helper->addInputSubmitButton("Best&auml;tigungscode absenden");
-
-       // Flush content and automatically close the form
-       $helper->flushContent();
-} // END - if
-
-// [EOC]
-?>
-<div id="content_header">
-       Problem mit deinem Account gefunden:
-</div>
-
-<div id="status_box">
-       Du bist m&ouml;glicherweise f&uuml;r deine ausgew&auml;hlte Aktion nicht
-       berechtigt oder du hast noch deine Email-Adresse nicht best&auml;tigt. Du
-       kannst dir nun den Best&auml;tigungslink erneut aussenden lassen, oder den
-       Best&auml;tigungscode unten eingeben.
-
-       <div id="resend_link_box">
-               {?resend_link?}
-       </div>
-
-       <div id="confirm_code_box">
-               {?confirm_code?}
-       </div>
-</div>

diff --git a/application/blog/templates/de/code/action_blog_login_welcome.ctp b/application/blog/templates/de/code/action_blog_login_welcome.ctp
deleted file mode 100644 (file)
index f307fa8..0000000
--- a/application/blog/templates/de/code/action_blog_login_welcome.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="news_frame">
-       {?blog_login_news?}
-</div>

diff --git a/application/blog/templates/de/code/block_persona_data.ctp b/application/blog/templates/de/code/block_persona_data.ctp
deleted file mode 100644 (file)
index 36a620b..0000000
--- a/application/blog/templates/de/code/block_persona_data.ctp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Prefetch user instance
-$helperInstance->prefetchValueInstance('user');
-
-// Flush the content out
-$helperInstance->flushContent();
-
-// [EOC]
-?>
-<div class="user_name_div">
-       Nickname: <span class="user_name">{?block_username?}</span>
-</div>
-<div class="user_status_div">
-       Account-Status: <span class="user_status">{?block_user_status?}</span>
-</div>
-<div class="user_profile_div">
-       {?profile_link?}
-</div>
-<div class="user_registered_div">
-       Angemeldet seit: <span class="registered">{?block_registered?}</span>
-</div>

diff --git a/application/blog/templates/de/code/blog_main.ctp b/application/blog/templates/de/code/blog_main.ctp
deleted file mode 100644 (file)
index 1f66539..0000000
--- a/application/blog/templates/de/code/blog_main.ctp
+++ /dev/null
@@ -1,23 +0,0 @@
-{?header?}
-
-<div id="main_header">
-       {?blog_header?}
-</div>
-
-<div id="navigation">
-       {?navigation?}
-</div>
-
-<div id="advert">
-       {?nav_advert?}
-</div>
-
-<div id="main_content">
-       {?content?}
-</div>
-
-<div id="main_footer">
-       {?blog_footer?}
-</div>
-
-{?footer?}

diff --git a/application/blog/templates/de/code/captch_graphic_code.ctp b/application/blog/templates/de/code/captch_graphic_code.ctp
deleted file mode 100644 (file)
index 101be7f..0000000
--- a/application/blog/templates/de/code/captch_graphic_code.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// Get a helper instance without a form tag
-$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
-
-// Add input field with text for CAPTCHA code
-$captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
-$captchaHelper->addInputTextField('c_code');
-
-// Add hidden field with validation hash
-$captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
-
-// Flush content
-$captchaHelper->flushContent();
-
-// [EOC]
-?>
-<div class="captcha_image">
-       <img src="$config[base_url]/index.php?app={?app_short_name?}&amp;page=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image" alt="CAPTCHA-Bild" title="CAPTCHA-Bild" class="captcha_img" />
-</div>
-<div class="captcha_code">
-       {?captcha_code?}
-</div>

diff --git a/application/blog/templates/de/code/confirm_link.ctp b/application/blog/templates/de/code/confirm_link.ctp
deleted file mode 100644 (file)
index 4cfaf38..0000000
--- a/application/blog/templates/de/code/confirm_link.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('direct_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Best&auml;tigung Deiner Email-Adresse:
-</div>
-
-<div id="content_body">
-       Hallo <span class="data_username">{?username?}</span>! Du hast heute deine
-       Email-Addresse best&auml;tigt, wodurch alle Blogfunktionen entsperrt
-       worden sind. Viel Spass beim Bloggen!
-</div>
-
-<div id="content_footer">
-       {?direct_login_link?}
-</div>

diff --git a/application/blog/templates/de/code/footer.ctp b/application/blog/templates/de/code/footer.ctp
deleted file mode 100644 (file)
index aa82e68..0000000
--- a/application/blog/templates/de/code/footer.ctp
+++ /dev/null
@@ -1,4 +0,0 @@
-</div> <!-- masterbox //-->
-
-</body>
-</html>

diff --git a/application/blog/templates/de/code/header.ctp b/application/blog/templates/de/code/header.ctp
deleted file mode 100644 (file)
index 1c92a39..0000000
--- a/application/blog/templates/de/code/header.ctp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
-<head>
-       <title>
-               {?app_full_name?} - {?title?}
-       </title>
-
-       <meta name="author" content="$config[meta_author]" />
-       <meta name="publisher" content="$config[meta_publisher]" />
-       <meta name="keywords" content="$config[meta_keywords]" />
-       <meta name="robots" content="index,follow" />
-       <meta name="description" content="$config[meta_description]" />
-       <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-       <meta http-equiv="content-style-type" content="text/css" />
-       <meta http-equiv="content-script-type" content="text/javascript" />
-       <meta http-equiv="language" content="de" />
-</head>
-
-<body>
-<div id="masterbox">

diff --git a/application/blog/templates/de/code/home.ctp b/application/blog/templates/de/code/home.ctp
deleted file mode 100644 (file)
index 67db51c..0000000
--- a/application/blog/templates/de/code/home.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="content_header">
-       Willkommen zur namenlosen Blogging-Software!
-</div>

diff --git a/application/blog/templates/de/code/login_failed.ctp b/application/blog/templates/de/code/login_failed.ctp
deleted file mode 100644 (file)
index 57508d1..0000000
--- a/application/blog/templates/de/code/login_failed.ctp
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('login_retry_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist nicht mehr im Blog eingeloggt!
-</div>
-
-<div id="content_body">
-       Du bist nicht mehr im <span class="app_name">{?app_full_name?}</span> Blog eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
-
-       <ol id="login_failed_list">
-               <li>Dein Browser nimmt keine Cookies an.</li>
-               <li>Du hast den Loginbereich aus deinen Bookmarks/Favoriten aufgerufen
-                       und die Cookies sind gel&ouml;scht.</li>
-               <li>Es besteht ein Problem mit dem Server, wof&uuml;r du meistens nichts
-                       kannst. Bitte kontaktiere den Support, falls dieses Problem
-                       weiterhin besteht.</li>
-       </ol>
-
-       Wenn du den Support kontaktierst, halte bitte s&auml;mtliche relevante
-       Informationen - <span class="important_note">nicht aber dein Passwort</span>
-       - bereit. Du kannst auch einen Screenshot dieser Seite anfertigen und dem
-       Support diesen senden!
-</div>
-
-<div id="content_footer">
-       <div id="login_retry">
-               {?login_retry_link?}
-       </div>
-
-       Vielen Dank f&uuml;r deine Mitarbeit! :-)
-</div>

diff --git a/application/blog/templates/de/code/login_form.ctp b/application/blog/templates/de/code/login_form.ctp
deleted file mode 100644 (file)
index 44492ac..0000000
--- a/application/blog/templates/de/code/login_form.ctp
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'blog_user_login'));
-
-// Formular deaktiviert?
-if ($helper->ifLoginIsEnabled()) {
-       // Formular ist aktiv
-       $helper->addFormGroup('login', "Gebe hier deine Logindaten ein:");
-
-       // Welches Loginverfahren wurde konfiguriert?
-       if ($helper->ifLoginWithUsername()) {
-               // Login mit Username
-               $helper->addFormSubGroup('username', "Bitte mit deinem Nickname einloggen.");
-               $helper->addFieldText('username', "Dein Nickname:");
-               $helper->addInputTextField('username');
-       } elseif ($helper->ifLoginWithEmail()) {
-               // Login mit Email
-               $helper->addFormSubGroup('email', "Bitte mit deiner Email-Adresse einloggen.");
-               $helper->addFieldText('email', "Deine Email-Addresse:");
-               $helper->addInputTextField('email');
-       } else {
-               // Login mit Email/Username
-               $helper->addFormSubGroup('user_email', "Bitte mit deinem Nickname oder Email-Adresse einloggen.");
-               $helper->addFieldText('user_email', "Dein Nickname/Email:");
-               $helper->addInputTextField('user_email');
-       }
-
-       $helper->addFormSubGroup('pass', "Gebe dein Passwort von der Anmeldung ein.");
-       $helper->addFieldText('pass', "Dein Passwort:");
-       $helper->addInputPasswordField('pass');
-
-       // CAPTCHA enabled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit buttons
-       $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
-       $helper->addInputResetButton("Formular leeren");
-       $helper->addInputSubmitButton("Zum Blog einloggen");
-} else {
-       // Formular deaktiviert
-       $helper->addFormNote('form_deactivated', "Einloggen in diesen Blog ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
-       $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
-}
-
-// Formular schliessen
-$helper->flushContent();
-
-// Ist Gastlogin erlaubt?
-if ($helper->ifGuestLoginAllowed()) {
-       // Neue Helper-Instanz holen
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'blog_guest_login'));
-       $helper->addInputHiddenConfiguredField('user', 'guest_login');
-       $helper->addInputHiddenConfiguredField('passwd', 'guest_login');
-
-       // CAPTCHA enbaled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_guest', "Unser Gast-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit button
-       $helper->addFormGroup('buttons_guest', "Gastlogins sind in der Funkionsweise eingeschr&auml;nkt. Mehr dazu unter &quot;Gastlogin&quot;.");
-       $helper->addInputSubmitButton("Als Gast einloggen");
-       $helper->flushContent();
-}
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&amp;page=register'));
-
-// Set link text
-$helper->addLinkWithTextById('register_login_form_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Einloggen zu <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="content_body">
-       <div id="login_box">
-               {?blog_user_login?}
-       </div>
-
-       <div id="guest_login">
-               {?blog_guest_login?}
-       </div>
-</div>
-
-<div id="content_footer">
-       Noch kein Loginaccount? {?register_login_form_link?}
-</div>

diff --git a/application/blog/templates/de/code/login_main.ctp b/application/blog/templates/de/code/login_main.ctp
deleted file mode 100644 (file)
index 03736cd..0000000
--- a/application/blog/templates/de/code/login_main.ctp
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-///////////////////////////////
-// Assign personal user data //
-///////////////////////////////
-
-// Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
-
-// Set the data source instance which must exist in registry
-$blockInstance->prefetchValueInstance('user');
-
-// Assign fields with template variables
-$blockInstance->assignField('username');
-$blockInstance->assignFieldWithFilter('user_status', "user_status_translator");
-
-// Shall we include registration date?
-if ($blockInstance->ifIncludeRegistrationStamp()) {
-       // Then assign it as well!
-       $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp');
-} // END - if
-
-// Flush the content out to a template variable
-$blockInstance->flushContent();
-
-// Get a new instance for blog data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'blog_data'));
-
-// Set the data source instance which must exist in registry
-$blockInstance->prefetchValueInstance('blog');
-
-// Flush the content out to a template variable
-$blockInstance->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Add action
-$helper->addActionLink('logout', "Ausloggen");
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Willkommen im Loginbereich  von <span class=\"app_name\">{?app_full_name?}</span>!
-</div>
-
-<div id="content_body">
-       {?login_content?}
-</div>
-
-<div id="persona_data" title="Informationen zu Deinem Loginaccount">
-       <div id="persona_header">
-               Account-Infos:
-       </div>
-
-       <div id="persona_body">
-               {?persona_data?}
-       </div>
-
-       <div id="persona_body">
-               {?blog_data?}
-       </div>
-
-       <div id="logout_link">
-               {?logout_action_link?}
-       </div>
-</div>

diff --git a/application/blog/templates/de/code/logout_done.ctp b/application/blog/templates/de/code/logout_done.ctp
deleted file mode 100644 (file)
index a84cc92..0000000
--- a/application/blog/templates/de/code/logout_done.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('relogin_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist jetzt aus dem Blog ausgeloggt!
-</div>
-
-<div id="content_body">
-       Du kannst dich nun {?relogin_link?} oder weiter auf unseren Seiten bleiben. ;-)
-</div>

diff --git a/application/blog/templates/de/code/mail_debug.ctp b/application/blog/templates/de/code/mail_debug.ctp
deleted file mode 100644 (file)
index e62dd07..0000000
--- a/application/blog/templates/de/code/mail_debug.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="debug_header">
-       Mail-Debug-Ausgabe:
-</div>
-
-<div class="mail_header">
-       <div class="mail_header_line">
-               <span class="mail_sender">Von:</span> <span class="mail_info">{?sender?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_recipient">An:</span> <span class="mail_info">{?recipient?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_subject">Betreff:</span> <span class="mail_info">{?subject?}</span>
-       </div>
-</div>
-
-<div class="mail_text_box">
-       <div class="mail_message">
-               Nachricht:
-       </div>
-
-       <div class="mail_content">
-               {?message?}
-       </div>
-</div>

diff --git a/application/blog/templates/de/code/register_form.ctp b/application/blog/templates/de/code/register_form.ctp
deleted file mode 100644 (file)
index e7fefc4..0000000
--- a/application/blog/templates/de/code/register_form.ctp
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'blog_register'));
-
-// Always ask at least for nickname and password
-$helper->addFormGroup('login', "Bitte gebe hier gew&uuml;nschten Nickname und dein Zugangspasswort ein.");
-$helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares gepr&uuml;ft. Sp&auml;ter bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
-$helper->addFieldText('username', "Nickname im Blog:");
-$helper->addInputTextField('username');
-$helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Sp&auml;ter bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortst&auml;rke anzeigt.");
-$helper->addFieldText('pass1', "Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Passwortwiederholung:");
-$helper->addInputPasswordField('pass2');
-
-if ($helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Best&auml;tigung) ein, damit wir dir deinen Freischaltlink zusenden k&ouml;nnen.");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im Blog verwendet worden sein.");
-       } // END - Unique email addresses
-
-} // END - email verification
-
-if ($helper->ifRegisterIncludesProfile()) {
-       $helper->addFormGroup('profile', "Hier kannst du zus&auml;tzlich deine Profildaten vorweg eingeben, du kannst sie aber auch nach dem Login vervollst&auml;ndigen!");
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
-               $helper->addFieldText('email1', "Email-Adresse:");
-               $helper->addInputTextField('email1');
-       } // END - No email verification
-
-       // Persoenliche Daten mit in der Anmeldung abfragen?
-       if ($helper->ifRegisterIncludesPersonaData()) {
-               $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-               $helper->addFieldText('surname', "Dein Vorname:");
-               $helper->addInputTextField('surname');
-               $helper->addFieldText('family', "Dein Nachname:");
-               $helper->addInputTextField('family');
-               $helper->addFieldText('street', "Strasse und Hausnummer:");
-               $helper->addInputTextField('street');
-               $helper->addFieldText('city', "Wohnort:");
-               $helper->addInputTextField('city');
-       } // END - Persona data
-
-       $helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-       $helper->addFieldText('zip', "Postleitzahl:");
-       $helper->addInputTextField('zip');
-
-       $helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-       if ($helper->ifChatEnabled('icq')) {
-               $helper->addFieldText('icq', "ICQ-Nummer:");
-               $helper->addInputTextField('icq');
-       } // END - if
-
-       if ($helper->ifChatEnabled('jabber')) {
-               $helper->addFieldText('jabber', "Jabber:");
-               $helper->addInputTextField('jabber');
-       } // END - if
-
-       if ($helper->ifChatEnabled('yahoo')) {
-               $helper->addFieldText('yahoo', "Yahoo!:");
-               $helper->addInputTextField('yahoo');
-       } // END - if
-
-       if ($helper->ifChatEnabled('aol')) {
-               $helper->addFieldText('aol', "AOL-Screenname:");
-               $helper->addInputTextField('aol');
-       } // END - if
-
-       if ($helper->ifChatEnabled('msn')) {
-               $helper->addFieldText('msn', "MSN:");
-               $helper->addInputTextField('msn');
-       } // END - if
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-       } // END - Extra note
-} // END - ask profile data
-
-// Posting-/Kommentarregeln abfragen
-$helper->addFormGroup('rules', "Bitte lese dir die Blogregeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Blogregeln&quot; an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Blogregeln:");
-$helper->addInputCheckboxField('rules', false);
-
-// Add CAPTCHA?
-if ($helper->ifFormSecuredWithCaptcha()) {
-       $helper->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann.");
-       $helper->addCaptcha();
-} // END - if
-
-// Final note and submit buttons
-$helper->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;t hast, kannst du die Anmeldung abschliessen.");
-
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Anmeldung zum Blog abschliessen");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Anmeldung bei <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="register_box">
-       {?blog_register?}
-</div>

diff --git a/application/blog/templates/de/emails/.htaccess b/application/blog/templates/de/emails/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/de/emails/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/de/emails/text_resend_link.tpl b/application/blog/templates/de/emails/text_resend_link.tpl
deleted file mode 100644 (file)
index e764146..0000000
--- a/application/blog/templates/de/emails/text_resend_link.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<text-mail>
-       <mail-data>
-               <sender-address value="$config[admin_email]" />
-               <subject-line value="Anforderung deines Best&auml;tigungslinks" />
-               <recipient-address value="{?email?}" />
-               <message>
-               <![CDATA[Hallo {?username?}!
-
-Du (oder ein anderer) hattest soeben deinen Best&auml;tigungslink erneut angefordert. Solltest du dies nicht gewesen sein, bitten wir dich den Vorfall zu entschuldigen.
-
-Hier ist nun dein Best&auml;tigungslink. Der alte aus der Anmeldemail ist somit nicht mehr g&uuml;ltig!
-
-$config[base_url]/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?}
-
-Solltest du die URL nicht anklicken k&ouml;nnen, versuche diese in die Adresszeile deines Browsers zu kopieren.
-
-Alternativ kannst du im Loginbereich unter Best&auml;tigungscode den folgenden Code reinkopieren oder eingeben:
-
-{?confirm_hash?}
-
-Solltest du Fragen dazu oder Probleme mit der Best&auml;tigung haben, so melde dich bitte beim Support-Team.
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Dein {?app_short_name?}-Team
-
-{?mail_footer?}]]>
-               </message>
-       </mail-data>
-</text-mail>

diff --git a/application/blog/templates/de/html/.htaccess b/application/blog/templates/de/html/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/de/html/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/de/html/nav_advert.tpl b/application/blog/templates/de/html/nav_advert.tpl
deleted file mode 100644 (file)
index 22da43b..0000000
--- a/application/blog/templates/de/html/nav_advert.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- Put your ads code here which shall be shown below the navigation //-->

diff --git a/application/blog/templates/de/html/selector_ship-simu.tpl b/application/blog/templates/de/html/selector_ship-simu.tpl
deleted file mode 100644 (file)
index b96640e..0000000
--- a/application/blog/templates/de/html/selector_ship-simu.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="selector_content">
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Gr&uuml;nden Sie eine virtuelle Reederei an den bedeutestens
-               Welth&auml;fen! Oder treten Sie einer Reederei als Angestellter bei und
-               arbeiten Sie sich bis in die Chef-Etagge hoch!
-       </div>
-
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Oder fangen Sie als Matrose auf einem Passagierschiff (virtuell) an zu
-               arbeiten und werden Sie nach wenigen Kreuzfahrten bald Kapit&auml;n!
-       </div>
-
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Oder buchen Sie eine virtuelle Kreuzfahrt durch die bekannten Meeren in
-               {!POINTS!} in einer Luxus-Suite!
-       </div>
-</div>

diff --git a/application/blog/templates/images/.htaccess b/application/blog/templates/images/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/images/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/images/_cache/.htaccess b/application/blog/templates/images/_cache/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/images/_cache/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/images/de/.htaccess b/application/blog/templates/images/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/images/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/images/de/image/.htaccess b/application/blog/templates/images/de/image/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/blog/templates/images/de/image/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/blog/templates/images/de/image/base_code.itp b/application/blog/templates/images/de/image/base_code.itp
deleted file mode 100644 (file)
index 6501b56..0000000
--- a/application/blog/templates/images/de/image/base_code.itp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<image>
-       <type value="{?image_type?}" />
-       <base>
-               <name value="{?image_name?}" />
-       </base>
-       <resolution>
-               <width value="{?image_width?}" />
-               <height value="{?image_height?}" />
-       </resolution>
-       <background-color>
-               <red value="{?image_bg_red?}" />
-               <green value="{?image_bg_green?}" />
-               <blue value="{?image_bg_blue?}" />
-       </background-color>
-       <foreground-color>
-               <red value="{?image_fg_red?}" />
-               <green value="{?image_fg_green?}" />
-               <blue value="{?image_fg_blue?}" />
-       </foreground-color>
-       <image-string value="groupable">
-               <string-name value="{?image_string_name?}" />
-               <x value="{?image_x?}" />
-               <y value="{?image_y?}" />
-               <font-size value="{?image_size?}" />
-               <text value="{?image_string?}" />
-       </image-string>
-</image>

diff --git a/application/blog/templates/images/de/image/code_captcha.itp b/application/blog/templates/images/de/image/code_captcha.itp
deleted file mode 100644 (file)
index 2e28522..0000000
--- a/application/blog/templates/images/de/image/code_captcha.itp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// Needed in every image template to initialy set the image type
-$helper = ImageHelper::createImageHelper($this, "png");
-$helper->setImageName("code_captcha");
-$helper->setBaseImage("base_code");
-
-// Set image dimensions
-$helper->setWidth(100);
-$helper->setHeight(50);
-
-// Get random number
-$rand = $helper->getRngInstance()->randomNumber(0, 6);
-
-// Background and foreground color
-switch ($rand) {
-       case 1:
-               // First varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x90  , 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xff  , 'rand');
-               break;
-
-       case 2:
-               // Second varriant
-               $helper->setBackgroundColorRedGreenBlue(0x90  , 'rand', 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-
-       case 3:
-               // Third varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xff  );
-               break;
-
-       case 4:
-               // Forth varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 0x90  , 'rand');
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xa0  );
-               break;
-
-       case 5:
-               // Fith varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xe0  , 'rand');
-               break;
-
-       default:
-               // Last varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 'rand', 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-}
-
-// Random X/Y factors...
-$xRand = $helper->getRngInstance()->randomNumber(0, 45);
-$yRand = $helper->getRngInstance()->randomNumber(0, 25);
-
-// Add code
-$helper->addTextLine("code");
-$helper->setCoord((5 + $xRand), (5 + $yRand));
-$helper->setFontSize('rand');
-$helper->setImageString("{?decrypted_code?}");
-
-// Only for debug!
-/*
-$helper->addTextLine("debug");
-$helper->setCoord(90, 35);
-$helper->setFontSize(3);
-$helper->setImageString($rand);
-*/
-
-// Flush content to the template engine
-$helper->flushContent();
-
-// Comment this out if image is done
-//$this->debugInstance();
-
-// [EOF]
-?>

diff --git a/application/shoutbox/.htaccess b/application/shoutbox/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/admin/.htaccess b/application/shoutbox/admin/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/admin/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/class_ApplicationHelper.php b/application/shoutbox/class_ApplicationHelper.php
deleted file mode 100644 (file)
index 4adc321..0000000
--- a/application/shoutbox/class_ApplicationHelper.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * A class holding general data about the application and some methods for
- * the management including the entry point.
- *
- * E.g.:
- *
- * index.php?app=my_app
- *
- * You need to create a folder in the folder "application" named "my_app"
- * (without the quotes) and create a include file called
- * class_ApplicationHelper.php. You have to write the same class for your
- * application and implement the same interface called ManageableApplication
- * because this class include file will be searched for.
- *
- * It is good when you avoid more GET parameters to keep URLs short and sweet.
- * But sometimes you need some GET paramerers e.g. for your imprint or info page
- * or other linked pages which you have to create and state some informations.
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
-       /**
-        * The version number of this application
-        */
-       private $appVersion = "";
-
-       /**
-        * The human-readable name for this application
-        */
-       private $appName = "";
-
-       /**
-        * The short uni*-like name for this application
-        */
-       private $shortName = "";
-
-       /**
-        * The name of the master template
-        */
-       private $masterTemplate = "shoutbox_main";
-
-       /**
-        * An instance of a controller
-        */
-       private $controllerInstance = null;
-
-       /**
-        * An instance of this class
-        */
-       private static $thisInstance = null;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Getter for an instance of this class
-        *
-        * @return      $thisInstance           An instance of this class
-        */
-       public final static function getInstance () {
-               // Is the instance there?
-               if (is_null(self::$thisInstance)) {
-                       self::$thisInstance = new ApplicationHelper();
-               }
-
-               // Return the instance
-               return self::$thisInstance;
-       }
-
-       /**
-        * Getter for the version number
-        *
-        * @return      $appVersion             The application's version number
-        */
-       public final function getAppVersion () {
-               return $this->appVersion;
-       }
-
-       /**
-        * Setter for the version number
-        *
-        * @param       $appVersion             The application's version number
-        * @return      void
-        */
-       public final function setAppVersion ($appVersion) {
-               // Cast and set it
-               $appVersion = (string) $appVersion;
-               $this->appVersion = $appVersion;
-       }
-
-       /**
-        * Getter for human-readable name
-        *
-        * @return      $appName        The application's human-readable name
-        */
-       public final function getAppName () {
-               return $this->appName;
-       }
-
-       /**
-        * Setter for human-readable name
-        *
-        * @param       $appName        The application's human-readable name
-        * @return      void
-        */
-       public final function setAppName ($appName) {
-               // Cast and set it
-               $appName = (string) $appName;
-               $this->appName = $appName;
-       }
-
-       /**
-        * Getter for short uni*-like name
-        *
-        * @return      $shortName      The application's short uni*-like name
-        */
-       public final function getAppShortName () {
-               return $this->shortName;
-       }
-
-       /**
-        * Setter for short uni*-like name
-        *
-        * @param       $shortName      The application's short uni*-like name
-        * @return      void
-        */
-       public final function setAppShortName ($shortName) {
-               // Cast and set it
-               $shortName = (string) $shortName;
-               $this->shortName = $shortName;
-       }
-
-       /**
-        * Getter for master template name
-        *
-        * @return      $masterTemplate         Name of the master template
-        */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
-       }
-
-       /**
-        * Launches the shoutbox software
-        *
-        * @return      void
-        */
-       public final function entryPoint () {
-               // Create a new request object
-               $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
-
-               // Default response is HTTP (HTML page) and type is "Web"
-               $response = "http";
-               $responseType = "web";
-
-               // Do we have another response?
-               if ($requestInstance->isRequestElementSet('request')) {
-                       // Then use it
-                       $response = strtolower($requestInstance->getRequestElement('request'));
-                       $responseType = $response;
-               } // END - if
-
-               // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
-
-               // Remember both in this application
-               $this->setRequestInstance($requestInstance);
-               $this->setResponseInstance($responseInstance);
-
-               // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement('page');
-
-               // If it is null then get default command
-               if (is_null($commandName)) {
-                       $commandName = $responseInstance->getDefaultCommand();
-               } // END - if
-
-               // Get a resolver
-               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
-
-               // Get a controller instance as well
-               $this->controllerInstance = $resolverInstance->resolveController();
-
-               // Handle the request
-               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
-       }
-
-       /**
-        * Handle the indexed array of fatal messages and puts them out in an
-        * acceptable fasion
-        *
-        * @param       $messageList    An array of fatal messages
-        * @return      void
-        */
-       public function handleFatalMessages (array $messageList) {
-               // Walk through all messages
-               foreach ($messageList as $message) {
-                       print("MSG:".$message."<br />\n");
-               } // END - if
-       }
-
-       /**
-        * Assigns application-depending data
-        *
-        * @param       $templateInstance       An instance of a template engine
-        * @return      void
-        */
-       public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
-               // Assign charset
-               $templateInstance->assignConfigVariable('header_charset');
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/shoutbox/config.php b/application/shoutbox/config.php
deleted file mode 100644 (file)
index 466c9e6..0000000
--- a/application/shoutbox/config.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Additional/overwritten configuration parts
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get a configuration instance for shorter lines
-$cfg = FrameworkConfiguration::getInstance();
-
-// CFG: HEADER-CHARSET
-$cfg->setConfigEntry('header_charset', "utf-8");
-
-// CFG: DEFAULT-WEB-COMMAND
-$cfg->setConfigEntry('default_web_command', "home");
-
-// CFG: DEFAULT-IMAGE-COMMAND
-$cfg->setConfigEntry('default_image_command', "build");
-
-// CFG: PAGE-WITH-NEWS
-$cfg->setConfigEntry('page_with_news', "home");
-
-// CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', "index.php?app={?app_short_name?}&amp;page=do_form");
-
-// CFG: FORM-METHOD
-$cfg->setConfigEntry('form_method', "post");
-
-// CFG: FORM-TARGET
-$cfg->setConfigEntry('form_target', "_self");
-
-// CFG: REGISTER-REQUIRES-EMAIL
-$cfg->setConfigEntry('register_requires_email', "Y");
-
-// CFG: REGISTER-INCLUDES-PROFILE
-$cfg->setConfigEntry('register_includes_profile', "Y");
-
-// CFG: REGISTER-PERSONAL-DATA
-$cfg->setConfigEntry('register_personal_data', "Y");
-
-// CFG: REGISTER-EMAIL-UNIQUE
-$cfg->setConfigEntry('register_email_unique', "Y");
-
-// CFG: CHAT-ENABLED-ICQ
-$cfg->setConfigEntry('chat_enabled_icq', "Y");
-
-// CFG: CHAT-ENABLED-JABBER
-$cfg->setConfigEntry('chat_enabled_jabber', "Y");
-
-// CFG: CHAT-ENABLED-YAHOO
-$cfg->setConfigEntry('chat_enabled_yahoo', "Y");
-
-// CFG: CHAT-ENABLED-AOL
-$cfg->setConfigEntry('chat_enabled_aol', "Y");
-
-// CFG: CHAT-ENABLED-MSN
-$cfg->setConfigEntry('chat_enabled_msn', "Y");
-
-// CFG: USER-REGISTRATION
-$cfg->setConfigEntry('user_registration_class', "ShoutBoxRegistration");
-
-// CFG: USER-LOGIN-CLASS
-$cfg->setConfigEntry('user_login_class', "ShoutBoxUserLogin");
-
-// CFG: GUEST-LOGIN-CLASS
-$cfg->setConfigEntry('guest_login_class', "ShoutBoxGuestLogin");
-
-// CFG: USER-STATUS-REGISTER
-$cfg->setConfigEntry('user_status_unconfirmed', "UNCONFIRMED");
-
-// CFG: USER-STATUS-GUEST
-$cfg->setConfigEntry('user_status_guest', "GUEST");
-
-// CFG: USER-STATUS-CONFIRMED
-$cfg->setConfigEntry('user_status_confirmed', "CONFIRMED");
-
-// CFG: LOGIN-HELPER-CLASS
-$cfg->setConfigEntry('login_helper_class', "ShoutBoxLoginHelper");
-
-// CFG: AUTH-METHOD-CLASS
-$cfg->setConfigEntry('auth_method_class', "CookieAuth");
-
-// CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', "index.php?app={?app_short_name?}&page=login_area");
-
-// CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', "index.php?app={?app_short_name?}&page=login_failed");
-
-// CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', "index.php?app={?app_short_name?}&page=logout_done");
-
-// CFG: LOGIN-USER-STATUS-URL
-$cfg->setConfigEntry('login_user_status_url', "index.php?app={?app_short_name?}&page=login_area&action=status_problem");
-
-// CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_problem");
-
-// CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_email_missing");
-
-// CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app={?app_short_name?}&page=status&status=confirm_code_invalid");
-
-// CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', "index.php?app={?app_short_name?}&page=status&status=user_not_found");
-
-// CFG: LOGIN-DEFAULT-ACTION
-$cfg->setConfigEntry('login_default_action', "welcome");
-
-// CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
-
-// CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");
-
-// CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");
-
-// CFG: USER-AUTH-FILTER
-$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");
-
-// CFG: USER-UPDATE-FILTER
-$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");
-
-// CFG: USER-STATUS-CONFIRMED-FILTER
-$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");
-
-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
-$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");
-
-// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-USER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CONFIRM-CODE-VALIDATOR-FILTER
-$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");
-
-// CFG: NEWS-HOME-LIMIT
-$cfg->setConfigEntry('news_home_limit', 10);
-
-// CFG: NEWS-LOGIN-AREA-LIMIT
-$cfg->setConfigEntry('news_login_area_limit', 15);
-
-// CFG: LOGIN-ENABLED
-$cfg->setConfigEntry('login_enabled', "Y");
-
-// CFG: CONFIRM-EMAIL-ENABLED
-$cfg->setConfigEntry('confirm_email_enabled', "Y");
-
-// CFG: LOGIN-DISABLED-REASON
-$cfg->setConfigEntry('login_disabled_reason', "Loginbereich befindet sich noch im Aufbau.");
-
-// CFG: LOGIN-TYPE
-$cfg->setConfigEntry('login_type', "username"); // username, email, both
-
-// CFG: EMAIL-CHANGE-ALLOWED
-$cfg->setConfigEntry('email_change_allowed', "Y");
-
-// CFG: EMAIL-CHANGE-CONFIRMATION
-$cfg->setConfigEntry('email_change_confirmation', "Y");
-
-// CFG: GUEST-LOGIN-ALLOWED
-$cfg->setConfigEntry('guest_login_allowed', "Y");
-
-// CFG: GUEST-LOGIN-USERNAME
-$cfg->setConfigEntry('guest_login_user', "guest");
-
-// CFG: GUEST-LOGIN-PASS
-$cfg->setConfigEntry('guest_login_passwd', "guest");
-
-// CFG: LOGIN-WELCOME-ACTION-CLASS
-$cfg->setConfigEntry('login_welcome_action_class', "ShoutBoxLoginAction");
-
-// CFG: LOGIN-LOGOUT-ACTION-CLASS
-$cfg->setConfigEntry('login_logout_action_class', "ShoutBoxLogoutAction");
-
-// CFG: LOGIN-PROFILE-ACTION-CLASS
-$cfg->setConfigEntry('login_profile_action_class', "ShoutBoxProfileAction");
-
-// CFG: SHOUTBOX-REGISTER-CAPTCHA
-$cfg->setConfigEntry('shoutbox_register_captcha', "GraphicalCodeCaptcha");
-
-// CFG: SHOUTBOX-USER-LOGIN-CAPTCHA
-$cfg->setConfigEntry('shoutbox_user_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: SHOUTBOX-GUEST-LOGIN-CAPTCHA
-$cfg->setConfigEntry('shoutbox_guest_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: CAPTCHA-STRING-LENGTH
-$cfg->setConfigEntry('captcha_string_length', 5);
-
-// CFG: CAPTCHA-SEARCH-CHARS
-$cfg->setConfigEntry('captcha_search_chars', "+/=");
-
-// CFG: RANDOM-STRING-LENGTH
-$cfg->setConfigEntry('random_string_length', 100);
-
-// CFG: SHOUTBOX-REGISTER-CAPTCHA-SECURED
-$cfg->setConfigEntry('shoutbox_register_captcha_secured', "Y");
-
-// CFG: SHOUTBOX-USER-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('shoutbox_user_login_captcha_secured', "Y");
-
-// CFG: SHOUTBOX-GUEST-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('shoutbox_guest_login_captcha_secured', "Y");
-
-// CFG: BLOCK-SHOWS-REGISTRATION
-$cfg->setConfigEntry('block_shows_registration', "Y");
-
-// CFG: COMPANY-CLASS
-$cfg->setConfigEntry('company_class', "ShippingCompany");
-
-// CFG: COMPANY-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('company_db_wrapper_class', "CompanyDatabaseWrapper");
-
-// CFG EMAIl-TPL-RESEND-LINK
-$cfg->setConfigEntry('email_tpl_resend_link', "text");
-
-// CFG: MAIL-TEMPLATE-ENGINE
-$cfg->setConfigEntry('mail_template_class', "MailTemplateEngine");
-
-// CFG: IMAGE-TEMPLATE-ENGINE
-$cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
-
-// CFG: ADMIN-EMAIL
-$cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
-
-// CFG: WEB-BLOCK-HELPER
-$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
-
-// CFG: WEB-FORM-HELPER
-$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
-
-// CFG: WEB-LINK-HELPER
-$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
-
-// [EOF]
-?>

diff --git a/application/shoutbox/data.php b/application/shoutbox/data.php
deleted file mode 100644 (file)
index d97c702..0000000
--- a/application/shoutbox/data.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Application data
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Get an instance of the helper
-$app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), "getInstance"),
-       array()
-);
-
-// Set application name and version
-$app->setAppName("Nameless Blogging Software");
-$app->setAppVersion("0.0.0");
-$app->setAppShortName("shoutbox");
-
-// [EOF]
-?>

diff --git a/application/shoutbox/debug.php b/application/shoutbox/debug.php
deleted file mode 100644 (file)
index f5da828..0000000
--- a/application/shoutbox/debug.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Some debugging stuff for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Reederei-Objekt debuggen
-//define('DEBUG_COMPANY_OBJ', true);
-// Hafen-Objekt debuggen
-//define('DEBUG_HARBOR_OBJ', true);
-// Schiff-Objekt debuggen
-//define('DEBUG_SHIP_OBJ', true);
-// Auftrag-Objekt debuggen
-//define('DEBUG_CONTRACT_OBJ', true);
-// Haendler-Objekt debuggen
-//define('DEBUG_MERCHANT_OBJ', true);
-// Personal-Objekt debuggen
-//define('DEBUG_PERSONELL_OBJ', true);
-// Personal debuggen
-//define('DEBUG_PERSONELL', true);
-// Reederei debuggen
-//define('DEBUG_COMPANY', true);
-// Mitarbeiter debuggen
-//define('DEBUG_COMPANY_EMPLOYEE', true);
-// Hafen debuggen
-//define('DEBUG_HARBOR', true);
-// Werft debuggen
-//define('DEBUG_SHIPYARD', true);
-// Schiff debuggen
-//define('DEBUG_SHIP', true);
-// Schiffstruktur debuggen
-//define('DEBUG_STRUCTURE', true);
-// Kabinen debuggen
-//define('DEBUG_CABIN', true);
-// Decks debuggen
-//define('DEBUG_DECK', true);
-// Bauauftraege debuggen
-//define('DEBUG_CONTRACT', true);
-// Haendler debuggen
-//define('DEBUG_MERCHANT', true);
-
-// [EOF]
-?>

diff --git a/application/shoutbox/exceptions.php b/application/shoutbox/exceptions.php
deleted file mode 100644 (file)
index fd41c37..0000000
--- a/application/shoutbox/exceptions.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * The exception handler for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Our own exception handler
-function __exceptionHandler (FrameworkException $e) {
-       // Call the app_die() method
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
-               ApplicationHelper::getInstance()->getAppName(),
-               ApplicationHelper::getInstance()->getAppShortName(),
-               $e->__toString(),
-               $e->getHexCode(),
-               $e->getMessage(),
-               $e->getPrintableBackTrace()
-       ),
-               $e->getHexCode(),
-               $e->getExtraData()
-       );
-} // END - function
-
-// Set the new handler
-set_exception_handler('__exceptionHandler');
-
-// Error handler
-function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
-       // Construct the message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>, Message: <span class=\"debug_message\">%s</span>",
-               basename($errfile),
-               $errline,
-               $errno,
-               $errstr
-       );
-
-       // Throw an exception here
-       throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-} // END - function
-
-// Set error handler
-set_error_handler('__errorHandler');
-
-// Assertion handler
-function __assertHandler ($file, $line, $code) {
-       // Empty code?
-       if ($code === "") $code = "<em>Unknown</em>";
-
-       // Create message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>",
-               basename($file),
-               $line,
-               $code
-       );
-
-       // Throw an exception here
-       throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
-} // END - function
-
-// Init assert handling
-assert_options(ASSERT_ACTIVE,     1);
-assert_options(ASSERT_WARNING,    0);
-assert_options(ASSERT_BAIL,       0);
-assert_options(ASSERT_QUIET_EVAL, 0);
-assert_options(ASSERT_CALLBACK,   '__assertHandler');
-
-// [EOF]
-?>

diff --git a/application/shoutbox/exceptions/.htaccess b/application/shoutbox/exceptions/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/exceptions/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/init.php b/application/shoutbox/init.php
deleted file mode 100644 (file)
index 39c5bed..0000000
--- a/application/shoutbox/init.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Application initializer
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Initialize output system
-require($cfg->readConfig('base_path') . 'inc/output.php');
-
-// Initialize file i/o system
-require($cfg->readConfig('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->readConfig('base_path') . 'inc/language.php');
-
-// This application needs a database connection then we have to simply include
-// the inc/database.php script
-require($cfg->readConfig('base_path') . 'inc/database.php');
-
-// [EOF]
-?>

diff --git a/application/shoutbox/interfaces/.htaccess b/application/shoutbox/interfaces/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/interfaces/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/loader.php b/application/shoutbox/loader.php
deleted file mode 100644 (file)
index 12b388b..0000000
--- a/application/shoutbox/loader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * A specialized class loader for this class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Load all classes for the application
-foreach ($lowerClasses as $className) {
-       // Load the application classes
-       ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/%s", $cfg->readConfig('application_path'), $cfg->readConfig('app_name'), $className));
-} // END - if
-
-// Clean up the global namespace
-unset($lowerClasses);
-unset($className);
-
-// [EOF]
-?>

diff --git a/application/shoutbox/main/.htaccess b/application/shoutbox/main/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/main/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/main/class_ b/application/shoutbox/main/class_
deleted file mode 100644 (file)
index df22004..0000000
--- a/application/shoutbox/main/class_
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * 
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class  extends BaseFrameworkSystem {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/shoutbox/starter.php b/application/shoutbox/starter.php
deleted file mode 100644 (file)
index b128839..0000000
--- a/application/shoutbox/starter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * The application launcher
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Is there an application helper instance? We need the method main() for
-// maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
-
-// Some sanity checks
-if ((empty($app)) || (is_null($app))) {
-       // Something went wrong!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
-       ));
-} elseif (!is_object($app)) {
-       // No object!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",
-               $application
-       ));
-} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig('entry_method'))) {
-       // Method not found!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('entry_method')
-       ));
-}
-
-// Call user function
-call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
-
-// [EOF]
-?>

diff --git a/application/shoutbox/templates/.htaccess b/application/shoutbox/templates/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/de/.htaccess b/application/shoutbox/templates/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp
deleted file mode 100644 (file)
index 6dd49a9..0000000
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_logout.ctp
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
-
-// Set link text
-$helper->addLinkWithTextById('logout_now_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Set link text
-$helper->addLinkWithTextById('return_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="logout_box">
-       <div id="logout_header">
-               Willst du dich wirklich aus der Shoutbox ausloggen?
-       </div>
-
-       <div id="logout_links">
-               {?logout_now_link?} | {?return_login_link?}
-       </div>
-</div>

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp
deleted file mode 100644 (file)
index dd27e8a..0000000
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_profile.ctp
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "shoutbox_profile"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Password can only be changed when the old one is entered and new one twice!
-$helper->addFormGroup('pass', "Neues Passwort einrichten:");
-$helper->addFormSubGroup('pass', "Bitte gebe zum &Auml;ndern deines Passwortes zweimal das gew&uuml;nschte neue Passwort ein.");
-$helper->addFieldText('pass1', "Neues Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
-$helper->addInputPasswordField('pass2');
-
-// Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
-
-// Only for changing email address
-if ($helper->ifEmailChangeAllowed()) {
-       $helper->addFormGroup('email', "&Auml;nderung deiner Email-Addresse:");
-       $helper->addFormSubGroup('email', "Gebe nur deine Email-Adresse zweimal ein, wenn du diese &auml;ndern m&ouml;chtest!");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal in der Shoutbox verwendet worden sein.");
-       } // END - Unique email addresses
-
-       if ($helper->ifEmailChangeRequireConfirmation()) {
-               $helper->addFormNote('confirm_link', "Es wird ein Best&auml;tigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann m&ouml;glichst schnell an.");
-       } // END - Change requires confirmation
-} // END - email change allowed
-
-$helper->addFormGroup('profile', "Hier kannst du deine Profildaten &auml;ndern.");
-
-// Persoenliche Daten mit in der Anmeldung abfragen?
-if ($helper->ifRegisterIncludesPersonaData()) {
-       $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-       $helper->addFieldText('surname', "Dein Vorname:");
-       $helper->addInputTextFieldWithDefault('surname');
-       $helper->addFieldText('family', "Dein Nachname:");
-       $helper->addInputTextFieldWithDefault('family');
-       $helper->addFieldText('street', "Strasse und Hausnummer:");
-       $helper->addInputTextFieldWithDefault('street');
-       $helper->addFieldText('city', "Wohnort:");
-       $helper->addInputTextFieldWithDefault('city');
-} // END - Persona data
-
-$helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-$helper->addFieldText('zip', "Postleitzahl:");
-$helper->addInputTextFieldWithDefault('zip');
-
-$helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-if ($helper->ifChatEnabled('icq')) {
-       $helper->addFieldText('icq', "ICQ-Nummer:");
-       $helper->addInputTextFieldWithDefault('icq');
-} // END - if
-
-if ($helper->ifChatEnabled('jabber')) {
-       $helper->addFieldText('jabber', "Jabber:");
-       $helper->addInputTextFieldWithDefault('jabber');
-} // END - if
-
-if ($helper->ifChatEnabled('yahoo')) {
-       $helper->addFieldText('yahoo', "Yahoo!:");
-       $helper->addInputTextFieldWithDefault('yahoo');
-} // END - if
-
-if ($helper->ifChatEnabled('aol')) {
-       $helper->addFieldText('aol', "AOL-Screenname:");
-       $helper->addInputTextFieldWithDefault('aol');
-} // END - if
-
-if ($helper->ifChatEnabled('msn')) {
-       $helper->addFieldText('msn', "MSN:");
-       $helper->addInputTextFieldWithDefault('msn');
-} // END - if
-
-if (!$helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-} // END - Extra note
-
-// Rules already accepted?
-if ($helper->ifRulesHaveChanged()) {
-       $helper->addFormGroup('rules', "Bitte lese dir die Shoutbox-Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Shoutbox-Regeln&quot; an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln:");
-       $helper->addInputCheckboxField('rules', false);
-} else {
-       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Shoutbox-Regeln akzeptiert. Vielen Dank!");
-       $helper->addInputHiddenField('rules', "1");
-}
-
-// Ask again for current account password
-$helper->addFormGroup('pass_old', "Bitte gebe zur Best&auml;tigung der &Auml;nderungen dein derzeitiges Passwort ein.");
-$helper->addFieldText('pass_old', "Altes Passwort:");
-$helper->addInputPasswordField('pass_old');
-
-// Abschliessender Hinweis und Abschluss des Formulars
-$helper->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Accountdaten aktualisieren");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Deine Profildaten bearbeiten
-</div>
-
-<div id="profile_box">
-       {?shoutbox_profile?}
-</div>

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp
deleted file mode 100644 (file)
index e71f3e8..0000000
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_status_problem.ctp
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Add submit button or notice
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Add submit button
-       $helper->addInputHiddenFieldWithDefault('email');
-       $helper->addInputSubmitButton("Best&auml;tigungslink erneut aussenden");
-} elseif ($helper->ifUserAccountLocked()) {
-       // Account is locked
-       $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre:
-               <span id=\"lock_reason\">".$helper->getValueField('lock_reason')."</span>
-               Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
-       );
-} elseif ($helper->ifUserAccountGuest()) {
-       // Account is guest account
-       $helper->addFormNote('status_guest', "G&auml;steaccounts sind in der Funktionalit&auml;t
-               leicht eingeschr&auml;nkt. Bitte melde dich an, damit du ein
-               vollwertiges Account bekommst."
-       );
-}
-
-// Flush content and automatically close the form
-$helper->flushContent();
-
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Build the form for confirmation
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
-
-       // Add code box
-       $helper->addFormGroup('code', "Bitte gebe hier den Best&auml;tigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");
-       $helper->addFieldText('code', "Best&auml;tigungscode aus der Mail:");
-       $helper->addInputTextField('code');
-
-       // Add submit button
-       $helper->addFormGroup('buttons', "Bitte einmal abschicken und das Ergebnis abwarten!");
-       $helper->addInputResetButton("Nochmal eingeben");
-       $helper->addInputSubmitButton("Best&auml;tigungscode absenden");
-
-       // Flush content and automatically close the form
-       $helper->flushContent();
-} // END - if
-
-// [EOC]
-?>
-<div id="content_header">
-       Problem mit deinem Account gefunden:
-</div>
-
-<div id="status_box">
-       Du bist m&ouml;glicherweise f&uuml;r deine ausgew&auml;hlte Aktion nicht
-       berechtigt oder du hast noch deine Email-Adresse nicht best&auml;tigt. Du
-       kannst dir nun den Best&auml;tigungslink erneut aussenden lassen, oder den
-       Best&auml;tigungscode unten eingeben.
-
-       <div id="resend_link_box">
-               {?resend_link?}
-       </div>
-
-       <div id="confirm_code_box">
-               {?confirm_code?}
-       </div>
-</div>

diff --git a/application/shoutbox/templates/de/code/action_shoutbox_login_welcome.ctp b/application/shoutbox/templates/de/code/action_shoutbox_login_welcome.ctp
deleted file mode 100644 (file)
index 902eba9..0000000
--- a/application/shoutbox/templates/de/code/action_shoutbox_login_welcome.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="news_frame">
-       {?shoutbox_login_news?}
-</div>

diff --git a/application/shoutbox/templates/de/code/block_persona_data.ctp b/application/shoutbox/templates/de/code/block_persona_data.ctp
deleted file mode 100644 (file)
index 36a620b..0000000
--- a/application/shoutbox/templates/de/code/block_persona_data.ctp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Prefetch user instance
-$helperInstance->prefetchValueInstance('user');
-
-// Flush the content out
-$helperInstance->flushContent();
-
-// [EOC]
-?>
-<div class="user_name_div">
-       Nickname: <span class="user_name">{?block_username?}</span>
-</div>
-<div class="user_status_div">
-       Account-Status: <span class="user_status">{?block_user_status?}</span>
-</div>
-<div class="user_profile_div">
-       {?profile_link?}
-</div>
-<div class="user_registered_div">
-       Angemeldet seit: <span class="registered">{?block_registered?}</span>
-</div>

diff --git a/application/shoutbox/templates/de/code/captch_graphic_code.ctp b/application/shoutbox/templates/de/code/captch_graphic_code.ctp
deleted file mode 100644 (file)
index 101be7f..0000000
--- a/application/shoutbox/templates/de/code/captch_graphic_code.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// Get a helper instance without a form tag
-$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
-
-// Add input field with text for CAPTCHA code
-$captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
-$captchaHelper->addInputTextField('c_code');
-
-// Add hidden field with validation hash
-$captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
-
-// Flush content
-$captchaHelper->flushContent();
-
-// [EOC]
-?>
-<div class="captcha_image">
-       <img src="$config[base_url]/index.php?app={?app_short_name?}&amp;page=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image" alt="CAPTCHA-Bild" title="CAPTCHA-Bild" class="captcha_img" />
-</div>
-<div class="captcha_code">
-       {?captcha_code?}
-</div>

diff --git a/application/shoutbox/templates/de/code/confirm_link.ctp b/application/shoutbox/templates/de/code/confirm_link.ctp
deleted file mode 100644 (file)
index 915db3d..0000000
--- a/application/shoutbox/templates/de/code/confirm_link.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('direct_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Best&auml;tigung Deiner Email-Adresse:
-</div>
-
-<div id="content_body">
-       Hallo <span class="data_username">{?username?}</span>! Du hast heute deine
-       Email-Addresse best&auml;tigt, wodurch alle Shoutbox-Funktionen entsperrt
-       worden sind. Viel Spass beim Chatten!
-</div>
-
-<div id="content_footer">
-       {?direct_login_link?}
-</div>

diff --git a/application/shoutbox/templates/de/code/footer.ctp b/application/shoutbox/templates/de/code/footer.ctp
deleted file mode 100644 (file)
index aa82e68..0000000
--- a/application/shoutbox/templates/de/code/footer.ctp
+++ /dev/null
@@ -1,4 +0,0 @@
-</div> <!-- masterbox //-->
-
-</body>
-</html>

diff --git a/application/shoutbox/templates/de/code/header.ctp b/application/shoutbox/templates/de/code/header.ctp
deleted file mode 100644 (file)
index 1c92a39..0000000
--- a/application/shoutbox/templates/de/code/header.ctp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
-<head>
-       <title>
-               {?app_full_name?} - {?title?}
-       </title>
-
-       <meta name="author" content="$config[meta_author]" />
-       <meta name="publisher" content="$config[meta_publisher]" />
-       <meta name="keywords" content="$config[meta_keywords]" />
-       <meta name="robots" content="index,follow" />
-       <meta name="description" content="$config[meta_description]" />
-       <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-       <meta http-equiv="content-style-type" content="text/css" />
-       <meta http-equiv="content-script-type" content="text/javascript" />
-       <meta http-equiv="language" content="de" />
-</head>
-
-<body>
-<div id="masterbox">

diff --git a/application/shoutbox/templates/de/code/home.ctp b/application/shoutbox/templates/de/code/home.ctp
deleted file mode 100644 (file)
index 51644c2..0000000
--- a/application/shoutbox/templates/de/code/home.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="content_header">
-       Willkommen zur namenlosen Shoutbox-Software!
-</div>

diff --git a/application/shoutbox/templates/de/code/login_failed.ctp b/application/shoutbox/templates/de/code/login_failed.ctp
deleted file mode 100644 (file)
index 73c6927..0000000
--- a/application/shoutbox/templates/de/code/login_failed.ctp
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('login_retry_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist nicht mehr in der Shoutbox eingeloggt!
-</div>
-
-<div id="content_body">
-       Du bist nicht mehr in der <span class="app_name">{?app_full_name?}</span> Shoutbox eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
-
-       <ol id="login_failed_list">
-               <li>Dein Browser nimmt keine Cookies an.</li>
-               <li>Du hast den Loginbereich aus deinen Bookmarks/Favoriten aufgerufen
-                       und die Cookies sind gel&ouml;scht.</li>
-               <li>Es besteht ein Problem mit dem Server, wof&uuml;r du meistens nichts
-                       kannst. Bitte kontaktiere den Support, falls dieses Problem
-                       weiterhin besteht.</li>
-       </ol>
-
-       Wenn du den Support kontaktierst, halte bitte s&auml;mtliche relevante
-       Informationen - <span class="important_note">nicht aber dein Passwort</span>
-       - bereit. Du kannst auch einen Screenshot dieser Seite anfertigen und dem
-       Support diesen senden!
-</div>
-
-<div id="content_footer">
-       <div id="login_retry">
-               {?login_retry_link?}
-       </div>
-
-       Vielen Dank f&uuml;r deine Mitarbeit! :-)
-</div>

diff --git a/application/shoutbox/templates/de/code/login_form.ctp b/application/shoutbox/templates/de/code/login_form.ctp
deleted file mode 100644 (file)
index f3dc1f1..0000000
--- a/application/shoutbox/templates/de/code/login_form.ctp
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shoutbox_user_login'));
-
-// Formular deaktiviert?
-if ($helper->ifLoginIsEnabled()) {
-       // Formular ist aktiv
-       $helper->addFormGroup('login', "Gebe hier deine Logindaten ein:");
-
-       // Welches Loginverfahren wurde konfiguriert?
-       if ($helper->ifLoginWithUsername()) {
-               // Login mit Username
-               $helper->addFormSubGroup('username', "Bitte mit deinem Nickname einloggen.");
-               $helper->addFieldText('username', "Dein Nickname:");
-               $helper->addInputTextField('username');
-       } elseif ($helper->ifLoginWithEmail()) {
-               // Login mit Email
-               $helper->addFormSubGroup('email', "Bitte mit deiner Email-Adresse einloggen.");
-               $helper->addFieldText('email', "Deine Email-Addresse:");
-               $helper->addInputTextField('email');
-       } else {
-               // Login mit Email/Username
-               $helper->addFormSubGroup('user_email', "Bitte mit deinem Nickname oder Email-Adresse einloggen.");
-               $helper->addFieldText('user_email', "Dein Nickname/Email:");
-               $helper->addInputTextField('user_email');
-       }
-
-       $helper->addFormSubGroup('pass', "Gebe dein Passwort von der Anmeldung ein.");
-       $helper->addFieldText('pass', "Dein Passwort:");
-       $helper->addInputPasswordField('pass');
-
-       // CAPTCHA enabled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit buttons
-       $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
-       $helper->addInputResetButton("Formular leeren");
-       $helper->addInputSubmitButton("Zur Shoutbox einloggen");
-} else {
-       // Formular deaktiviert
-       $helper->addFormNote('form_deactivated', "Einloggen in diese Shoutbox ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
-       $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
-}
-
-// Formular schliessen
-$helper->flushContent();
-
-// Ist Gastlogin erlaubt?
-if ($helper->ifGuestLoginAllowed()) {
-       // Neue Helper-Instanz holen
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shoutbox_guest_login'));
-       $helper->addInputHiddenConfiguredField('user', 'guest_login');
-       $helper->addInputHiddenConfiguredField('passwd', 'guest_login');
-
-       // CAPTCHA enbaled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_guest', "Unser Gast-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit button
-       $helper->addFormGroup('buttons_guest', "Gastlogins sind in der Funkionsweise eingeschr&auml;nkt. Mehr dazu unter &quot;Gastlogin&quot;.");
-       $helper->addInputSubmitButton("Als Gast einloggen");
-       $helper->flushContent();
-}
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&amp;page=register'));
-
-// Set link text
-$helper->addLinkWithTextById('register_login_form_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Einloggen zu <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="content_body">
-       <div id="login_box">
-               {?shoutbox_user_login?}
-       </div>
-
-       <div id="guest_login">
-               {?shoutbox_guest_login?}
-       </div>
-</div>
-
-<div id="content_footer">
-       Noch kein Loginaccount? {?register_login_form_link?}
-</div>

diff --git a/application/shoutbox/templates/de/code/login_main.ctp b/application/shoutbox/templates/de/code/login_main.ctp
deleted file mode 100644 (file)
index abeacc7..0000000
--- a/application/shoutbox/templates/de/code/login_main.ctp
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-///////////////////////////////
-// Assign personal user data //
-///////////////////////////////
-
-// Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
-
-// Set the data source instance which must exist in registry
-$blockInstance->prefetchValueInstance('user');
-
-// Assign fields with template variables
-$blockInstance->assignField('username');
-$blockInstance->assignFieldWithFilter('user_status', "user_status_translator");
-
-// Shall we include registration date?
-if ($blockInstance->ifIncludeRegistrationStamp()) {
-       // Then assign it as well!
-       $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp');
-} // END - if
-
-// Flush the content out to a template variable
-$blockInstance->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Add action
-$helper->addActionLink('logout', "Ausloggen");
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Willkommen im Loginbereich  von <span class=\"app_name\">{?app_full_name?}</span>!
-</div>
-
-<div id="content_body">
-       {?login_content?}
-</div>
-
-<div id="persona_data" title="Informationen zu Deinem Loginaccount">
-       <div id="persona_header">
-               Account-Infos:
-       </div>
-
-       <div id="persona_body">
-               {?persona_data?}
-       </div>
-
-       <div id="logout_link">
-               {?logout_action_link?}
-       </div>
-</div>

diff --git a/application/shoutbox/templates/de/code/logout_done.ctp b/application/shoutbox/templates/de/code/logout_done.ctp
deleted file mode 100644 (file)
index fbda00e..0000000
--- a/application/shoutbox/templates/de/code/logout_done.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('relogin_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist jetzt aus der Shoutbox ausgeloggt!
-</div>
-
-<div id="content_body">
-       Du kannst dich nun {?relogin_link?} oder weiter auf unseren Seiten bleiben. ;-)
-</div>

diff --git a/application/shoutbox/templates/de/code/mail_debug.ctp b/application/shoutbox/templates/de/code/mail_debug.ctp
deleted file mode 100644 (file)
index e62dd07..0000000
--- a/application/shoutbox/templates/de/code/mail_debug.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="debug_header">
-       Mail-Debug-Ausgabe:
-</div>
-
-<div class="mail_header">
-       <div class="mail_header_line">
-               <span class="mail_sender">Von:</span> <span class="mail_info">{?sender?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_recipient">An:</span> <span class="mail_info">{?recipient?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_subject">Betreff:</span> <span class="mail_info">{?subject?}</span>
-       </div>
-</div>
-
-<div class="mail_text_box">
-       <div class="mail_message">
-               Nachricht:
-       </div>
-
-       <div class="mail_content">
-               {?message?}
-       </div>
-</div>

diff --git a/application/shoutbox/templates/de/code/register_form.ctp b/application/shoutbox/templates/de/code/register_form.ctp
deleted file mode 100644 (file)
index 19b8c6a..0000000
--- a/application/shoutbox/templates/de/code/register_form.ctp
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'shoutbox_register'));
-
-// Always ask at least for nickname and password
-$helper->addFormGroup('login', "Bitte gebe hier gew&uuml;nschten Nickname und dein Zugangspasswort ein.");
-$helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares gepr&uuml;ft. Sp&auml;ter bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
-$helper->addFieldText('username', "Nickname in Shoutbox:");
-$helper->addInputTextField('username');
-$helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Sp&auml;ter bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortst&auml;rke anzeigt.");
-$helper->addFieldText('pass1', "Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Passwortwiederholung:");
-$helper->addInputPasswordField('pass2');
-
-if ($helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Best&auml;tigung) ein, damit wir dir deinen Freischaltlink zusenden k&ouml;nnen.");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal in der Shoutbox verwendet worden sein.");
-       } // END - Unique email addresses
-
-} // END - email verification
-
-if ($helper->ifRegisterIncludesProfile()) {
-       $helper->addFormGroup('profile', "Hier kannst du zus&auml;tzlich deine Profildaten vorweg eingeben, du kannst sie aber auch nach dem Login vervollst&auml;ndigen!");
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
-               $helper->addFieldText('email1', "Email-Adresse:");
-               $helper->addInputTextField('email1');
-       } // END - No email verification
-
-       // Persoenliche Daten mit in der Anmeldung abfragen?
-       if ($helper->ifRegisterIncludesPersonaData()) {
-               $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-               $helper->addFieldText('surname', "Dein Vorname:");
-               $helper->addInputTextField('surname');
-               $helper->addFieldText('family', "Dein Nachname:");
-               $helper->addInputTextField('family');
-               $helper->addFieldText('street', "Strasse und Hausnummer:");
-               $helper->addInputTextField('street');
-               $helper->addFieldText('city', "Wohnort:");
-               $helper->addInputTextField('city');
-       } // END - Persona data
-
-       $helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-       $helper->addFieldText('zip', "Postleitzahl:");
-       $helper->addInputTextField('zip');
-
-       $helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-       if ($helper->ifChatEnabled('icq')) {
-               $helper->addFieldText('icq', "ICQ-Nummer:");
-               $helper->addInputTextField('icq');
-       } // END - if
-
-       if ($helper->ifChatEnabled('jabber')) {
-               $helper->addFieldText('jabber', "Jabber:");
-               $helper->addInputTextField('jabber');
-       } // END - if
-
-       if ($helper->ifChatEnabled('yahoo')) {
-               $helper->addFieldText('yahoo', "Yahoo!:");
-               $helper->addInputTextField('yahoo');
-       } // END - if
-
-       if ($helper->ifChatEnabled('aol')) {
-               $helper->addFieldText('aol', "AOL-Screenname:");
-               $helper->addInputTextField('aol');
-       } // END - if
-
-       if ($helper->ifChatEnabled('msn')) {
-               $helper->addFieldText('msn', "MSN:");
-               $helper->addInputTextField('msn');
-       } // END - if
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-       } // END - Extra note
-
-} // END - ask profile data
-
-// Posting-/Kommentarregeln abfragen
-$helper->addFormGroup('rules', "Bitte lese dir die Shoutbox-Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Shoutbox-Regeln&quot; an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Shoutbox-Regeln:");
-$helper->addInputCheckboxField('rules', false);
-
-// Add CAPTCHA?
-if ($helper->ifFormSecuredWithCaptcha()) {
-       $helper->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann.");
-       $helper->addCaptcha();
-} // END - if
-
-// Final note and submit buttons
-$helper->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;t hast, kannst du die Anmeldung abschliessen.");
-
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Anmeldung zur Shoutbox abschliessen");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Anmeldung bei <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="register_box">
-       {?shoutbox_register?}
-</div>

diff --git a/application/shoutbox/templates/de/code/shoutbox_main.ctp b/application/shoutbox/templates/de/code/shoutbox_main.ctp
deleted file mode 100644 (file)
index 9425c47..0000000
--- a/application/shoutbox/templates/de/code/shoutbox_main.ctp
+++ /dev/null
@@ -1,23 +0,0 @@
-{?header?}
-
-<div id="main_header">
-       {?shoutbox_header?}
-</div>
-
-<div id="navigation">
-       {?navigation?}
-</div>
-
-<div id="advert">
-       {?nav_advert?}
-</div>
-
-<div id="main_content">
-       {?content?}
-</div>
-
-<div id="main_footer">
-       {?shoutbox_footer?}
-</div>
-
-{?footer?}

diff --git a/application/shoutbox/templates/de/emails/.htaccess b/application/shoutbox/templates/de/emails/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/de/emails/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/de/emails/text_resend_link.tpl b/application/shoutbox/templates/de/emails/text_resend_link.tpl
deleted file mode 100644 (file)
index e764146..0000000
--- a/application/shoutbox/templates/de/emails/text_resend_link.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<text-mail>
-       <mail-data>
-               <sender-address value="$config[admin_email]" />
-               <subject-line value="Anforderung deines Best&auml;tigungslinks" />
-               <recipient-address value="{?email?}" />
-               <message>
-               <![CDATA[Hallo {?username?}!
-
-Du (oder ein anderer) hattest soeben deinen Best&auml;tigungslink erneut angefordert. Solltest du dies nicht gewesen sein, bitten wir dich den Vorfall zu entschuldigen.
-
-Hier ist nun dein Best&auml;tigungslink. Der alte aus der Anmeldemail ist somit nicht mehr g&uuml;ltig!
-
-$config[base_url]/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?}
-
-Solltest du die URL nicht anklicken k&ouml;nnen, versuche diese in die Adresszeile deines Browsers zu kopieren.
-
-Alternativ kannst du im Loginbereich unter Best&auml;tigungscode den folgenden Code reinkopieren oder eingeben:
-
-{?confirm_hash?}
-
-Solltest du Fragen dazu oder Probleme mit der Best&auml;tigung haben, so melde dich bitte beim Support-Team.
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Dein {?app_short_name?}-Team
-
-{?mail_footer?}]]>
-               </message>
-       </mail-data>
-</text-mail>

diff --git a/application/shoutbox/templates/de/html/.htaccess b/application/shoutbox/templates/de/html/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/de/html/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/de/html/nav_advert.tpl b/application/shoutbox/templates/de/html/nav_advert.tpl
deleted file mode 100644 (file)
index 22da43b..0000000
--- a/application/shoutbox/templates/de/html/nav_advert.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- Put your ads code here which shall be shown below the navigation //-->

diff --git a/application/shoutbox/templates/de/html/selector_ship-simu.tpl b/application/shoutbox/templates/de/html/selector_ship-simu.tpl
deleted file mode 100644 (file)
index b96640e..0000000
--- a/application/shoutbox/templates/de/html/selector_ship-simu.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="selector_content">
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Gr&uuml;nden Sie eine virtuelle Reederei an den bedeutestens
-               Welth&auml;fen! Oder treten Sie einer Reederei als Angestellter bei und
-               arbeiten Sie sich bis in die Chef-Etagge hoch!
-       </div>
-
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Oder fangen Sie als Matrose auf einem Passagierschiff (virtuell) an zu
-               arbeiten und werden Sie nach wenigen Kreuzfahrten bald Kapit&auml;n!
-       </div>
-
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Oder buchen Sie eine virtuelle Kreuzfahrt durch die bekannten Meeren in
-               {!POINTS!} in einer Luxus-Suite!
-       </div>
-</div>

diff --git a/application/shoutbox/templates/images/.htaccess b/application/shoutbox/templates/images/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/images/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/images/_cache/.htaccess b/application/shoutbox/templates/images/_cache/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/images/_cache/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/images/de/.htaccess b/application/shoutbox/templates/images/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/images/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/images/de/image/.htaccess b/application/shoutbox/templates/images/de/image/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/shoutbox/templates/images/de/image/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/shoutbox/templates/images/de/image/base_code.itp b/application/shoutbox/templates/images/de/image/base_code.itp
deleted file mode 100644 (file)
index 6501b56..0000000
--- a/application/shoutbox/templates/images/de/image/base_code.itp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<image>
-       <type value="{?image_type?}" />
-       <base>
-               <name value="{?image_name?}" />
-       </base>
-       <resolution>
-               <width value="{?image_width?}" />
-               <height value="{?image_height?}" />
-       </resolution>
-       <background-color>
-               <red value="{?image_bg_red?}" />
-               <green value="{?image_bg_green?}" />
-               <blue value="{?image_bg_blue?}" />
-       </background-color>
-       <foreground-color>
-               <red value="{?image_fg_red?}" />
-               <green value="{?image_fg_green?}" />
-               <blue value="{?image_fg_blue?}" />
-       </foreground-color>
-       <image-string value="groupable">
-               <string-name value="{?image_string_name?}" />
-               <x value="{?image_x?}" />
-               <y value="{?image_y?}" />
-               <font-size value="{?image_size?}" />
-               <text value="{?image_string?}" />
-       </image-string>
-</image>

diff --git a/application/shoutbox/templates/images/de/image/code_captcha.itp b/application/shoutbox/templates/images/de/image/code_captcha.itp
deleted file mode 100644 (file)
index 2e28522..0000000
--- a/application/shoutbox/templates/images/de/image/code_captcha.itp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// Needed in every image template to initialy set the image type
-$helper = ImageHelper::createImageHelper($this, "png");
-$helper->setImageName("code_captcha");
-$helper->setBaseImage("base_code");
-
-// Set image dimensions
-$helper->setWidth(100);
-$helper->setHeight(50);
-
-// Get random number
-$rand = $helper->getRngInstance()->randomNumber(0, 6);
-
-// Background and foreground color
-switch ($rand) {
-       case 1:
-               // First varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x90  , 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xff  , 'rand');
-               break;
-
-       case 2:
-               // Second varriant
-               $helper->setBackgroundColorRedGreenBlue(0x90  , 'rand', 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-
-       case 3:
-               // Third varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xff  );
-               break;
-
-       case 4:
-               // Forth varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 0x90  , 'rand');
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xa0  );
-               break;
-
-       case 5:
-               // Fith varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xe0  , 'rand');
-               break;
-
-       default:
-               // Last varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 'rand', 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-}
-
-// Random X/Y factors...
-$xRand = $helper->getRngInstance()->randomNumber(0, 45);
-$yRand = $helper->getRngInstance()->randomNumber(0, 25);
-
-// Add code
-$helper->addTextLine("code");
-$helper->setCoord((5 + $xRand), (5 + $yRand));
-$helper->setFontSize('rand');
-$helper->setImageString("{?decrypted_code?}");
-
-// Only for debug!
-/*
-$helper->addTextLine("debug");
-$helper->setCoord(90, 35);
-$helper->setFontSize(3);
-$helper->setImageString($rand);
-*/
-
-// Flush content to the template engine
-$helper->flushContent();
-
-// Comment this out if image is done
-//$this->debugInstance();
-
-// [EOF]
-?>

diff --git a/application/todo/.htaccess b/application/todo/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/admin/.htaccess b/application/todo/admin/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/admin/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/class_ApplicationHelper.php b/application/todo/class_ApplicationHelper.php
deleted file mode 100644 (file)
index 4e3c957..0000000
--- a/application/todo/class_ApplicationHelper.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * A class holding general data about the application and some methods for
- * the management including the entry point.
- *
- * E.g.:
- *
- * index.php?app=my_app
- *
- * You need to create a folder in the folder "application" named "my_app"
- * (without the quotes) and create a include file called
- * class_ApplicationHelper.php. You have to write the same class for your
- * application and implement the same interface called ManageableApplication
- * because this class include file will be searched for.
- *
- * It is good when you avoid more GET parameters to keep URLs short and sweet.
- * But sometimes you need some GET paramerers e.g. for your imprint or info page
- * or other linked pages which you have to create and state some informations.
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
-       /**
-        * The version number of this application
-        */
-       private $appVersion = "";
-
-       /**
-        * The human-readable name for this application
-        */
-       private $appName = "";
-
-       /**
-        * The short uni*-like name for this application
-        */
-       private $shortName = "";
-
-       /**
-        * The name of the master template
-        */
-       private $masterTemplate = "todo_main";
-
-       /**
-        * An instance of a controller
-        */
-       private $controllerInstance = null;
-
-       /**
-        * An instance of this class
-        */
-       private static $thisInstance = null;
-
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-       }
-
-       /**
-        * Getter for an instance of this class
-        *
-        * @return      $thisInstance           An instance of this class
-        */
-       public final static function getInstance () {
-               // Is the instance there?
-               if (is_null(self::$thisInstance)) {
-                       self::$thisInstance = new ApplicationHelper();
-               }
-
-               // Return the instance
-               return self::$thisInstance;
-       }
-
-       /**
-        * Getter for the version number
-        *
-        * @return      $appVersion             The application's version number
-        */
-       public final function getAppVersion () {
-               return $this->appVersion;
-       }
-
-       /**
-        * Setter for the version number
-        *
-        * @param       $appVersion             The application's version number
-        * @return      void
-        */
-       public final function setAppVersion ($appVersion) {
-               // Cast and set it
-               $appVersion = (string) $appVersion;
-               $this->appVersion = $appVersion;
-       }
-
-       /**
-        * Getter for human-readable name
-        *
-        * @return      $appName        The application's human-readable name
-        */
-       public final function getAppName () {
-               return $this->appName;
-       }
-
-       /**
-        * Setter for human-readable name
-        *
-        * @param       $appName        The application's human-readable name
-        * @return      void
-        */
-       public final function setAppName ($appName) {
-               // Cast and set it
-               $appName = (string) $appName;
-               $this->appName = $appName;
-       }
-
-       /**
-        * Getter for short uni*-like name
-        *
-        * @return      $shortName      The application's short uni*-like name
-        */
-       public final function getAppShortName () {
-               return $this->shortName;
-       }
-
-       /**
-        * Setter for short uni*-like name
-        *
-        * @param       $shortName      The application's short uni*-like name
-        * @return      void
-        */
-       public final function setAppShortName ($shortName) {
-               // Cast and set it
-               $shortName = (string) $shortName;
-               $this->shortName = $shortName;
-       }
-
-       /**
-        * Getter for master template name
-        *
-        * @return      $masterTemplate         Name of the master template
-        */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
-       }
-
-       /**
-        * Launches the todo software
-        *
-        * @return      void
-        */
-       public final function entryPoint () {
-               // Create a new request object
-               $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
-
-               // Default response is HTTP (HTML page) and type is "Web"
-               $response = "http";
-               $responseType = "web";
-
-               // Do we have another response?
-               if ($requestInstance->isRequestElementSet('request')) {
-                       // Then use it
-                       $response = strtolower($requestInstance->getRequestElement('request'));
-                       $responseType = $response;
-               } // END - if
-
-               // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
-
-               // Remember both in this application
-               $this->setRequestInstance($requestInstance);
-               $this->setResponseInstance($responseInstance);
-
-               // Get the parameter from the request
-               $commandName = $requestInstance->getRequestElement('page');
-
-               // If it is null then get default command
-               if (is_null($commandName)) {
-                       $commandName = $responseInstance->getDefaultCommand();
-               } // END - if
-
-               // Get a resolver
-               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
-
-               // Get a controller instance as well
-               $this->controllerInstance = $resolverInstance->resolveController();
-
-               // Handle the request
-               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
-       }
-
-       /**
-        * Handle the indexed array of fatal messages and puts them out in an
-        * acceptable fasion
-        *
-        * @param       $messageList    An array of fatal messages
-        * @return      void
-        */
-       public function handleFatalMessages (array $messageList) {
-               // Walk through all messages
-               foreach ($messageList as $message) {
-                       print("MSG:".$message."<br />\n");
-               } // END - if
-       }
-
-       /**
-        * Assigns application-depending data
-        *
-        * @param       $templateInstance       An instance of a template engine
-        * @return      void
-        */
-       public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
-               // Assign charset
-               $templateInstance->assignConfigVariable('header_charset');
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/todo/config.php b/application/todo/config.php
deleted file mode 100644 (file)
index 8b664b0..0000000
--- a/application/todo/config.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Additional/overwritten configuration parts
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get a configuration instance for shorter lines
-$cfg = FrameworkConfiguration::getInstance();
-
-// CFG: HEADER-CHARSET
-$cfg->setConfigEntry('header_charset', "utf-8");
-
-// CFG: DEFAULT-WEB-COMMAND
-$cfg->setConfigEntry('default_web_command', "home");
-
-// CFG: DEFAULT-IMAGE-COMMAND
-$cfg->setConfigEntry('default_image_command', "build");
-
-// CFG: PAGE-WITH-NEWS
-$cfg->setConfigEntry('page_with_news', "home");
-
-// CFG: FORM-ACTION
-$cfg->setConfigEntry('form_action', "index.php?app={?app_short_name?}&amp;page=do_form");
-
-// CFG: FORM-METHOD
-$cfg->setConfigEntry('form_method', "post");
-
-// CFG: FORM-TARGET
-$cfg->setConfigEntry('form_target', "_self");
-
-// CFG: REGISTER-REQUIRES-EMAIL
-$cfg->setConfigEntry('register_requires_email', "Y");
-
-// CFG: REGISTER-INCLUDES-PROFILE
-$cfg->setConfigEntry('register_includes_profile', "Y");
-
-// CFG: REGISTER-PERSONAL-DATA
-$cfg->setConfigEntry('register_personal_data', "Y");
-
-// CFG: REGISTER-EMAIL-UNIQUE
-$cfg->setConfigEntry('register_email_unique', "Y");
-
-// CFG: CHAT-ENABLED-ICQ
-$cfg->setConfigEntry('chat_enabled_icq', "Y");
-
-// CFG: CHAT-ENABLED-JABBER
-$cfg->setConfigEntry('chat_enabled_jabber', "Y");
-
-// CFG: CHAT-ENABLED-YAHOO
-$cfg->setConfigEntry('chat_enabled_yahoo', "Y");
-
-// CFG: CHAT-ENABLED-AOL
-$cfg->setConfigEntry('chat_enabled_aol', "Y");
-
-// CFG: CHAT-ENABLED-MSN
-$cfg->setConfigEntry('chat_enabled_msn', "Y");
-
-// CFG: USER-REGISTRATION
-$cfg->setConfigEntry('user_registration_class', "ToDoRegistration");
-
-// CFG: USER-LOGIN-CLASS
-$cfg->setConfigEntry('user_login_class', "ToDoUserLogin");
-
-// CFG: GUEST-LOGIN-CLASS
-$cfg->setConfigEntry('guest_login_class', "ToDoGuestLogin");
-
-// CFG: USER-STATUS-REGISTER
-$cfg->setConfigEntry('user_status_unconfirmed', "UNCONFIRMED");
-
-// CFG: USER-STATUS-GUEST
-$cfg->setConfigEntry('user_status_guest', "GUEST");
-
-// CFG: USER-STATUS-CONFIRMED
-$cfg->setConfigEntry('user_status_confirmed', "CONFIRMED");
-
-// CFG: LOGIN-HELPER-CLASS
-$cfg->setConfigEntry('login_helper_class', "ToDoLoginHelper");
-
-// CFG: AUTH-METHOD-CLASS
-$cfg->setConfigEntry('auth_method_class', "CookieAuth");
-
-// CFG: APP-LOGIN-URL
-$cfg->setConfigEntry('app_login_url', "index.php?app={?app_short_name?}&page=login_area");
-
-// CFG: LOGIN-FAILED-URL
-$cfg->setConfigEntry('login_failed_url', "index.php?app={?app_short_name?}&page=login_failed");
-
-// CFG: LOGOUT-DONE-URL
-$cfg->setConfigEntry('logout_done_url', "index.php?app={?app_short_name?}&page=logout_done");
-
-// CFG: LOGIN-USER-STATUS-URL
-$cfg->setConfigEntry('login_user_status_url', "index.php?app={?app_short_name?}&page=login_area&action=status_problem");
-
-// CFG: USER-NOT-UNCONFIRMED-URL
-$cfg->setConfigEntry('user_not_unconfirmed_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_problem");
-
-// CFG: USER-UNCONFIRMED-EMAIL-MISSING-URL
-$cfg->setConfigEntry('user_unconfirmed_email_missing_url', "index.php?app={?app_short_name?}&page=status&status=unconfirmed_email_missing");
-
-// CFG: CONFIRM-CODE-INVALID-URL
-$cfg->setConfigEntry('confirm_code_invalid_url', "index.php?app={?app_short_name?}&page=status&status=confirm_code_invalid");
-
-// CFG: USER-NOT-FOUND-URL
-$cfg->setConfigEntry('user_not_found_url', "index.php?app={?app_short_name?}&page=status&status=user_not_found");
-
-// CFG: LOGIN-DEFAULT-ACTION
-$cfg->setConfigEntry('login_default_action', "welcome");
-
-// CFG: NEWS-READER-CLASS
-$cfg->setConfigEntry('news_reader_class', "DefaultNewsReader");
-
-// CFG: NEWS-DOWNLOAD-FILTER
-$cfg->setConfigEntry('news_download_filter', "NewsDownloadFilter");
-
-// CFG: NEWS-PROCESS-FILTER
-$cfg->setConfigEntry('news_process_filter', "NewsProcessFilter");
-
-// CFG: USER-AUTH-FILTER
-$cfg->setConfigEntry('user_auth_filter', "UserAuthFilter");
-
-// CFG: USER-UPDATE-FILTER
-$cfg->setConfigEntry('user_update_filter', "UserUpdateFilter");
-
-// CFG: USER-STATUS-CONFIRMED-FILTER
-$cfg->setConfigEntry('user_status_confirmed_filter', "UserStatusConfimedUpdateFilter");
-
-// CFG: CAPTCHA-ENCRYPT-VALIDATOR-FILTER
-$cfg->setConfigEntry('captcha_encrypt_validator_filter', "CaptchaEncryptFilter");
-
-// CFG: CAPTCHA-GUEST-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_guest_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-USER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_user_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CAPTCHA-REGISTER-VERIFIER-FILTER
-$cfg->setConfigEntry('captcha_register_verifier_filter', "GraphicalCodeCaptchaVerifierFilter");
-
-// CFG: CONFIRM-CODE-VALIDATOR-FILTER
-$cfg->setConfigEntry('confirm_code_verifier_filter', "ConfirmCodeVerifierFilter");
-
-// CFG: NEWS-HOME-LIMIT
-$cfg->setConfigEntry('news_home_limit', 10);
-
-// CFG: NEWS-LOGIN-AREA-LIMIT
-$cfg->setConfigEntry('news_login_area_limit', 15);
-
-// CFG: LOGIN-ENABLED
-$cfg->setConfigEntry('login_enabled', "Y");
-
-// CFG: CONFIRM-EMAIL-ENABLED
-$cfg->setConfigEntry('confirm_email_enabled', "Y");
-
-// CFG: LOGIN-DISABLED-REASON
-$cfg->setConfigEntry('login_disabled_reason', "Loginbereich befindet sich noch im Aufbau.");
-
-// CFG: LOGIN-TYPE
-$cfg->setConfigEntry('login_type', "username"); // username, email, both
-
-// CFG: EMAIL-CHANGE-ALLOWED
-$cfg->setConfigEntry('email_change_allowed', "Y");
-
-// CFG: EMAIL-CHANGE-CONFIRMATION
-$cfg->setConfigEntry('email_change_confirmation', "Y");
-
-// CFG: GUEST-LOGIN-ALLOWED
-$cfg->setConfigEntry('guest_login_allowed', "Y");
-
-// CFG: GUEST-LOGIN-USERNAME
-$cfg->setConfigEntry('guest_login_user', "guest");
-
-// CFG: GUEST-LOGIN-PASS
-$cfg->setConfigEntry('guest_login_passwd', "guest");
-
-// CFG: LOGIN-WELCOME-ACTION-CLASS
-$cfg->setConfigEntry('login_welcome_action_class', "ToDoLoginAction");
-
-// CFG: LOGIN-LOGOUT-ACTION-CLASS
-$cfg->setConfigEntry('login_logout_action_class', "ToDoLogoutAction");
-
-// CFG: LOGIN-PROFILE-ACTION-CLASS
-$cfg->setConfigEntry('login_profile_action_class', "ToDoProfileAction");
-
-// CFG: TODO-REGISTER-CAPTCHA
-$cfg->setConfigEntry('todo_register_captcha', "GraphicalCodeCaptcha");
-
-// CFG: TODO-USER-LOGIN-CAPTCHA
-$cfg->setConfigEntry('todo_user_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: TODO-GUEST-LOGIN-CAPTCHA
-$cfg->setConfigEntry('todo_guest_login_captcha', "GraphicalCodeCaptcha");
-
-// CFG: CAPTCHA-STRING-LENGTH
-$cfg->setConfigEntry('captcha_string_length', 5);
-
-// CFG: CAPTCHA-SEARCH-CHARS
-$cfg->setConfigEntry('captcha_search_chars', "+/=");
-
-// CFG: RANDOM-STRING-LENGTH
-$cfg->setConfigEntry('random_string_length', 100);
-
-// CFG: TODO-REGISTER-CAPTCHA-SECURED
-$cfg->setConfigEntry('todo_register_captcha_secured', "Y");
-
-// CFG: TODO-USER-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('todo_user_login_captcha_secured', "Y");
-
-// CFG: TODO-GUEST-LOGIN-CAPTCHA-SECURED
-$cfg->setConfigEntry('todo_guest_login_captcha_secured', "Y");
-
-// CFG: BLOCK-SHOWS-REGISTRATION
-$cfg->setConfigEntry('block_shows_registration', "Y");
-
-// CFG: COMPANY-CLASS
-$cfg->setConfigEntry('company_class', "ShippingCompany");
-
-// CFG: COMPANY-DB-WRAPPER-CLASS
-$cfg->setConfigEntry('company_db_wrapper_class', "CompanyDatabaseWrapper");
-
-// CFG EMAIl-TPL-RESEND-LINK
-$cfg->setConfigEntry('email_tpl_resend_link', "text");
-
-// CFG: MAIL-TEMPLATE-ENGINE
-$cfg->setConfigEntry('mail_template_class', "MailTemplateEngine");
-
-// CFG: IMAGE-TEMPLATE-ENGINE
-$cfg->setConfigEntry('image_template_class', "ImageTemplateEngine");
-
-// CFG: ADMIN-EMAIL
-$cfg->setConfigEntry('admin_email', "you@some-hoster.invalid");
-
-// CFG: WEB-BLOCK-HELPER
-$cfg->setConfigEntry('web_block_helper', "WebBlockHelper");
-
-// CFG: WEB-FORM-HELPER
-$cfg->setConfigEntry('web_form_helper', "WebFormHelper");
-
-// CFG: WEB-LINK-HELPER
-$cfg->setConfigEntry('web_link_helper', "WebLinkHelper");
-
-// [EOF]
-?>

diff --git a/application/todo/data.php b/application/todo/data.php
deleted file mode 100644 (file)
index df4b3bf..0000000
--- a/application/todo/data.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Application data
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Get an instance of the helper
-$app = call_user_func_array(
-       array($cfg->readConfig('app_helper_class'), "getInstance"),
-       array()
-);
-
-// Set application name and version
-$app->setAppName("OpenToDo");
-$app->setAppVersion("0.0.0");
-$app->setAppShortName("todo");
-
-// [EOF]
-?>

diff --git a/application/todo/debug.php b/application/todo/debug.php
deleted file mode 100644 (file)
index f5da828..0000000
--- a/application/todo/debug.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Some debugging stuff for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Reederei-Objekt debuggen
-//define('DEBUG_COMPANY_OBJ', true);
-// Hafen-Objekt debuggen
-//define('DEBUG_HARBOR_OBJ', true);
-// Schiff-Objekt debuggen
-//define('DEBUG_SHIP_OBJ', true);
-// Auftrag-Objekt debuggen
-//define('DEBUG_CONTRACT_OBJ', true);
-// Haendler-Objekt debuggen
-//define('DEBUG_MERCHANT_OBJ', true);
-// Personal-Objekt debuggen
-//define('DEBUG_PERSONELL_OBJ', true);
-// Personal debuggen
-//define('DEBUG_PERSONELL', true);
-// Reederei debuggen
-//define('DEBUG_COMPANY', true);
-// Mitarbeiter debuggen
-//define('DEBUG_COMPANY_EMPLOYEE', true);
-// Hafen debuggen
-//define('DEBUG_HARBOR', true);
-// Werft debuggen
-//define('DEBUG_SHIPYARD', true);
-// Schiff debuggen
-//define('DEBUG_SHIP', true);
-// Schiffstruktur debuggen
-//define('DEBUG_STRUCTURE', true);
-// Kabinen debuggen
-//define('DEBUG_CABIN', true);
-// Decks debuggen
-//define('DEBUG_DECK', true);
-// Bauauftraege debuggen
-//define('DEBUG_CONTRACT', true);
-// Haendler debuggen
-//define('DEBUG_MERCHANT', true);
-
-// [EOF]
-?>

diff --git a/application/todo/exceptions.php b/application/todo/exceptions.php
deleted file mode 100644 (file)
index fd41c37..0000000
--- a/application/todo/exceptions.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * The exception handler for this application
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Our own exception handler
-function __exceptionHandler (FrameworkException $e) {
-       // Call the app_die() method
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
-               ApplicationHelper::getInstance()->getAppName(),
-               ApplicationHelper::getInstance()->getAppShortName(),
-               $e->__toString(),
-               $e->getHexCode(),
-               $e->getMessage(),
-               $e->getPrintableBackTrace()
-       ),
-               $e->getHexCode(),
-               $e->getExtraData()
-       );
-} // END - function
-
-// Set the new handler
-set_exception_handler('__exceptionHandler');
-
-// Error handler
-function __errorHandler ($errno, $errstr, $errfile, $errline, array $errcontext) {
-       // Construct the message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>, Message: <span class=\"debug_message\">%s</span>",
-               basename($errfile),
-               $errline,
-               $errno,
-               $errstr
-       );
-
-       // Throw an exception here
-       throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR);
-} // END - function
-
-// Set error handler
-set_error_handler('__errorHandler');
-
-// Assertion handler
-function __assertHandler ($file, $line, $code) {
-       // Empty code?
-       if ($code === "") $code = "<em>Unknown</em>";
-
-       // Create message
-       $message = sprintf("File: <span class=\"debug_file\">%s</span>, Line: <span class=\"debug_line\">%s</span>, Code: <span class=\"debug_code\">%s</span>",
-               basename($file),
-               $line,
-               $code
-       );
-
-       // Throw an exception here
-       throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED);
-} // END - function
-
-// Init assert handling
-assert_options(ASSERT_ACTIVE,     1);
-assert_options(ASSERT_WARNING,    0);
-assert_options(ASSERT_BAIL,       0);
-assert_options(ASSERT_QUIET_EVAL, 0);
-assert_options(ASSERT_CALLBACK,   '__assertHandler');
-
-// [EOF]
-?>

diff --git a/application/todo/exceptions/.htaccess b/application/todo/exceptions/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/exceptions/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/init.php b/application/todo/init.php
deleted file mode 100644 (file)
index 39c5bed..0000000
--- a/application/todo/init.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Application initializer
- *
- * Please remember that this include file is being loaded *before* the class
- * loader is loading classes from "exceptions", "interfaces" and "main"!
- *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
- *
- * isset() is required to prevent a warning and is_object() is highly required
- * when the application itself is requested in URL (hint: index.php?app=your_app)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Initialize output system
-require($cfg->readConfig('base_path') . 'inc/output.php');
-
-// Initialize file i/o system
-require($cfg->readConfig('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->readConfig('base_path') . 'inc/language.php');
-
-// This application needs a database connection then we have to simply include
-// the inc/database.php script
-require($cfg->readConfig('base_path') . 'inc/database.php');
-
-// [EOF]
-?>

diff --git a/application/todo/interfaces/.htaccess b/application/todo/interfaces/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/interfaces/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/loader.php b/application/todo/loader.php
deleted file mode 100644 (file)
index 12b388b..0000000
--- a/application/todo/loader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * A specialized class loader for this class
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
-// Load all classes for the application
-foreach ($lowerClasses as $className) {
-       // Load the application classes
-       ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/%s", $cfg->readConfig('application_path'), $cfg->readConfig('app_name'), $className));
-} // END - if
-
-// Clean up the global namespace
-unset($lowerClasses);
-unset($className);
-
-// [EOF]
-?>

diff --git a/application/todo/main/.htaccess b/application/todo/main/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/main/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/main/class_ b/application/todo/main/class_
deleted file mode 100644 (file)
index df22004..0000000
--- a/application/todo/main/class_
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * 
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-class  extends BaseFrameworkSystem {
-       /**
-        * Protected constructor
-        *
-        * @return      void
-        */
-       protected function __construct () {
-               // Call parent constructor
-               parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
-       }
-}
-
-// [EOF]
-?>

diff --git a/application/todo/starter.php b/application/todo/starter.php
deleted file mode 100644 (file)
index b128839..0000000
--- a/application/todo/starter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * The application launcher
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Is there an application helper instance? We need the method main() for
-// maining the application
-$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
-
-// Some sanity checks
-if ((empty($app)) || (is_null($app))) {
-       // Something went wrong!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
-       ));
-} elseif (!is_object($app)) {
-       // No object!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",
-               $application
-       ));
-} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig('entry_method'))) {
-       // Method not found!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
-               $application,
-               FrameworkConfiguration::getInstance()->readConfig('entry_method')
-       ));
-}
-
-// Call user function
-call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
-
-// [EOF]
-?>

diff --git a/application/todo/templates/.htaccess b/application/todo/templates/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/de/.htaccess b/application/todo/templates/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/de/code/action_todo_login_logout.ctp b/application/todo/templates/de/code/action_todo_login_logout.ctp
deleted file mode 100644 (file)
index 7735472..0000000
--- a/application/todo/templates/de/code/action_todo_login_logout.ctp
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_now_link', 'index.php?app={?app_short_name?}&amp;page=logout'));
-
-// Set link text
-$helper->addLinkWithTextById('logout_now_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'return_login_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Set link text
-$helper->addLinkWithTextById('return_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="logout_box">
-       <div id="logout_header">
-               Willst du dich wirklich aus dem ToDo-Manager ausloggen?
-       </div>
-
-       <div id="logout_links">
-               {?logout_now_link?} | {?return_login_link?}
-       </div>
-</div>

diff --git a/application/todo/templates/de/code/action_todo_login_profile.ctp b/application/todo/templates/de/code/action_todo_login_profile.ctp
deleted file mode 100644 (file)
index 6853ae4..0000000
--- a/application/todo/templates/de/code/action_todo_login_profile.ctp
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "todo_profile"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Password can only be changed when the old one is entered and new one twice!
-$helper->addFormGroup('pass', "Neues Passwort einrichten:");
-$helper->addFormSubGroup('pass', "Bitte gebe zum &Auml;ndern deines Passwortes zweimal das gew&uuml;nschte neue Passwort ein.");
-$helper->addFieldText('pass1', "Neues Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Neues Passwort, Wiederholung:");
-$helper->addInputPasswordField('pass2');
-
-// Display current email
-$helper->addFormNote('current_email', "Derzeitige Email-Adresse: <span class=\"persona_data\">".$helper->getValueField('email')."</span>");
-
-// Only for changing email address
-if ($helper->ifEmailChangeAllowed()) {
-       $helper->addFormGroup('email', "&Auml;nderung deiner Email-Addresse:");
-       $helper->addFormSubGroup('email', "Gebe nur deine Email-Adresse zweimal ein, wenn du diese &auml;ndern m&ouml;chtest!");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im ToDo-Manager verwendet worden sein.");
-       } // END - Unique email addresses
-
-       if ($helper->ifEmailChangeRequireConfirmation()) {
-               $helper->addFormNote('confirm_link', "Es wird ein Best&auml;tigungslink an deine neue Email-Adresse gesendet. Bitte klicke diesen dann m&ouml;glichst schnell an.");
-       } // END - Change requires confirmation
-} // END - email change allowed
-
-$helper->addFormGroup('profile', "Hier kannst du deine Profildaten &auml;ndern.");
-
-// Persoenliche Daten mit in der Anmeldung abfragen?
-if ($helper->ifRegisterIncludesPersonaData()) {
-       $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-       $helper->addFieldText('surname', "Dein Vorname:");
-       $helper->addInputTextFieldWithDefault('surname');
-       $helper->addFieldText('family', "Dein Nachname:");
-       $helper->addInputTextFieldWithDefault('family');
-       $helper->addFieldText('street', "Strasse und Hausnummer:");
-       $helper->addInputTextFieldWithDefault('street');
-       $helper->addFieldText('city', "Wohnort:");
-       $helper->addInputTextFieldWithDefault('city');
-} // END - Persona data
-
-$helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-$helper->addFieldText('zip', "Postleitzahl:");
-$helper->addInputTextFieldWithDefault('zip');
-
-$helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-if ($helper->ifChatEnabled('icq')) {
-       $helper->addFieldText('icq', "ICQ-Nummer:");
-       $helper->addInputTextFieldWithDefault('icq');
-} // END - if
-
-if ($helper->ifChatEnabled('jabber')) {
-       $helper->addFieldText('jabber', "Jabber:");
-       $helper->addInputTextFieldWithDefault('jabber');
-} // END - if
-
-if ($helper->ifChatEnabled('yahoo')) {
-       $helper->addFieldText('yahoo', "Yahoo!:");
-       $helper->addInputTextFieldWithDefault('yahoo');
-} // END - if
-
-if ($helper->ifChatEnabled('aol')) {
-       $helper->addFieldText('aol', "AOL-Screenname:");
-       $helper->addInputTextFieldWithDefault('aol');
-} // END - if
-
-if ($helper->ifChatEnabled('msn')) {
-       $helper->addFieldText('msn', "MSN:");
-       $helper->addInputTextFieldWithDefault('msn');
-} // END - if
-
-if (!$helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-} // END - Extra note
-
-// Rules already accepted?
-if ($helper->ifRulesHaveChanged()) {
-       $helper->addFormGroup('rules', "Bitte lese dir die Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Regeln&quot; an.");
-       $helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Regeln:");
-       $helper->addInputCheckboxField('rules', false);
-} else {
-       $helper->addFormNote('rules_accepted', "Du hast die aktuellen Regeln akzeptiert. Vielen Dank!");
-       $helper->addInputHiddenField('rules', "1");
-}
-
-// Ask again for current account password
-$helper->addFormGroup('pass_old', "Bitte gebe zur Best&auml;tigung der &Auml;nderungen dein derzeitiges Passwort ein.");
-$helper->addFieldText('pass_old', "Altes Passwort:");
-$helper->addInputPasswordField('pass_old');
-
-// Abschliessender Hinweis und Abschluss des Formulars
-$helper->addFormGroup('buttons', "Sind alle Daten nun korrekt eingegeben? Dann sende sie mit einem Klick einfach ab!");
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Accountdaten aktualisieren");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Deine Profildaten bearbeiten
-</div>
-
-<div id="profile_box">
-       {?todo_profile?}
-</div>

diff --git a/application/todo/templates/de/code/action_todo_login_status_problem.ctp b/application/todo/templates/de/code/action_todo_login_status_problem.ctp
deleted file mode 100644 (file)
index e71f3e8..0000000
--- a/application/todo/templates/de/code/action_todo_login_status_problem.ctp
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "resend_link"));
-
-// Pre-fetch field data with a given registry key
-$helper->prefetchValueInstance('user');
-
-// Add submit button or notice
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Add submit button
-       $helper->addInputHiddenFieldWithDefault('email');
-       $helper->addInputSubmitButton("Best&auml;tigungslink erneut aussenden");
-} elseif ($helper->ifUserAccountLocked()) {
-       // Account is locked
-       $helper->addFormNote('status_locked', "Dein Account wurde gesperrt! Grund der Sperre:
-               <span id=\"lock_reason\">".$helper->getValueField('lock_reason')."</span>
-               Bitte melde dich beim Support, damit dieser dir weiterhelfen kann."
-       );
-} elseif ($helper->ifUserAccountGuest()) {
-       // Account is guest account
-       $helper->addFormNote('status_guest', "G&auml;steaccounts sind in der Funktionalit&auml;t
-               leicht eingeschr&auml;nkt. Bitte melde dich an, damit du ein
-               vollwertiges Account bekommst."
-       );
-}
-
-// Flush content and automatically close the form
-$helper->flushContent();
-
-if ($helper->ifUserAccountUnconfirmed()) {
-       // Build the form for confirmation
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, "confirm_code"));
-
-       // Add code box
-       $helper->addFormGroup('code', "Bitte gebe hier den Best&auml;tigungscode aus der Willkommensemail ein. Solltest du diese nicht erhalten haben, kannst du dir diesen jetzt zusenden lassen.");
-       $helper->addFieldText('code', "Best&auml;tigungscode aus der Mail:");
-       $helper->addInputTextField('code');
-
-       // Add submit button
-       $helper->addFormGroup('buttons', "Bitte einmal abschicken und das Ergebnis abwarten!");
-       $helper->addInputResetButton("Nochmal eingeben");
-       $helper->addInputSubmitButton("Best&auml;tigungscode absenden");
-
-       // Flush content and automatically close the form
-       $helper->flushContent();
-} // END - if
-
-// [EOC]
-?>
-<div id="content_header">
-       Problem mit deinem Account gefunden:
-</div>
-
-<div id="status_box">
-       Du bist m&ouml;glicherweise f&uuml;r deine ausgew&auml;hlte Aktion nicht
-       berechtigt oder du hast noch deine Email-Adresse nicht best&auml;tigt. Du
-       kannst dir nun den Best&auml;tigungslink erneut aussenden lassen, oder den
-       Best&auml;tigungscode unten eingeben.
-
-       <div id="resend_link_box">
-               {?resend_link?}
-       </div>
-
-       <div id="confirm_code_box">
-               {?confirm_code?}
-       </div>
-</div>

diff --git a/application/todo/templates/de/code/action_todo_login_welcome.ctp b/application/todo/templates/de/code/action_todo_login_welcome.ctp
deleted file mode 100644 (file)
index 538a8d1..0000000
--- a/application/todo/templates/de/code/action_todo_login_welcome.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="news_frame">
-       {?todo_login_news?}
-</div>

diff --git a/application/todo/templates/de/code/block_persona_data.ctp b/application/todo/templates/de/code/block_persona_data.ctp
deleted file mode 100644 (file)
index 36a620b..0000000
--- a/application/todo/templates/de/code/block_persona_data.ctp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// Get a helper instance for the profile link (and maybe later more!)
-$helperInstance = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'profile_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Prefetch user instance
-$helperInstance->prefetchValueInstance('user');
-
-// Flush the content out
-$helperInstance->flushContent();
-
-// [EOC]
-?>
-<div class="user_name_div">
-       Nickname: <span class="user_name">{?block_username?}</span>
-</div>
-<div class="user_status_div">
-       Account-Status: <span class="user_status">{?block_user_status?}</span>
-</div>
-<div class="user_profile_div">
-       {?profile_link?}
-</div>
-<div class="user_registered_div">
-       Angemeldet seit: <span class="registered">{?block_registered?}</span>
-</div>

diff --git a/application/todo/templates/de/code/captch_graphic_code.ctp b/application/todo/templates/de/code/captch_graphic_code.ctp
deleted file mode 100644 (file)
index 101be7f..0000000
--- a/application/todo/templates/de/code/captch_graphic_code.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-// Get a helper instance without a form tag
-$captchaHelper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'captcha_code', false, false));
-
-// Add input field with text for CAPTCHA code
-$captchaHelper->addFieldText('captcha_code', "Bitte wiederhole den Code:");
-$captchaHelper->addInputTextField('c_code');
-
-// Add hidden field with validation hash
-$captchaHelper->addInputHiddenField('hash', $this->readVariable('captcha_hash'));
-
-// Flush content
-$captchaHelper->flushContent();
-
-// [EOC]
-?>
-<div class="captcha_image">
-       <img src="$config[base_url]/index.php?app={?app_short_name?}&amp;page=code_captcha&amp;encrypt={?encrypted_code?}&amp;request=image" alt="CAPTCHA-Bild" title="CAPTCHA-Bild" class="captcha_img" />
-</div>
-<div class="captcha_code">
-       {?captcha_code?}
-</div>

diff --git a/application/todo/templates/de/code/confirm_link.ctp b/application/todo/templates/de/code/confirm_link.ctp
deleted file mode 100644 (file)
index 7ec3933..0000000
--- a/application/todo/templates/de/code/confirm_link.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'direct_login_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('direct_login_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Best&auml;tigung Deiner Email-Adresse:
-</div>
-
-<div id="content_body">
-       Hallo <span class="data_username">{?username?}</span>! Du hast heute deine
-       Email-Addresse best&auml;tigt, wodurch alle ToDo-Managerfunktionen entsperrt
-       worden sind.
-</div>
-
-<div id="content_footer">
-       {?direct_login_link?}
-</div>

diff --git a/application/todo/templates/de/code/footer.ctp b/application/todo/templates/de/code/footer.ctp
deleted file mode 100644 (file)
index aa82e68..0000000
--- a/application/todo/templates/de/code/footer.ctp
+++ /dev/null
@@ -1,4 +0,0 @@
-</div> <!-- masterbox //-->
-
-</body>
-</html>

diff --git a/application/todo/templates/de/code/header.ctp b/application/todo/templates/de/code/header.ctp
deleted file mode 100644 (file)
index 1c92a39..0000000
--- a/application/todo/templates/de/code/header.ctp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
-<head>
-       <title>
-               {?app_full_name?} - {?title?}
-       </title>
-
-       <meta name="author" content="$config[meta_author]" />
-       <meta name="publisher" content="$config[meta_publisher]" />
-       <meta name="keywords" content="$config[meta_keywords]" />
-       <meta name="robots" content="index,follow" />
-       <meta name="description" content="$config[meta_description]" />
-       <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-       <meta http-equiv="content-style-type" content="text/css" />
-       <meta http-equiv="content-script-type" content="text/javascript" />
-       <meta http-equiv="language" content="de" />
-</head>
-
-<body>
-<div id="masterbox">

diff --git a/application/todo/templates/de/code/home.ctp b/application/todo/templates/de/code/home.ctp
deleted file mode 100644 (file)
index eb72499..0000000
--- a/application/todo/templates/de/code/home.ctp
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="content_header">
-       Willkommen zu <span class="app_name">{?app_full_name?}</span> v<span class="admin_data">{?app_version?}</span>
-</div>

diff --git a/application/todo/templates/de/code/login_failed.ctp b/application/todo/templates/de/code/login_failed.ctp
deleted file mode 100644 (file)
index 74a7f7d..0000000
--- a/application/todo/templates/de/code/login_failed.ctp
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'login_retry_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('login_retry_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist nicht mehr im ToDo-Manager eingeloggt!
-</div>
-
-<div id="content_body">
-       Du bist nicht mehr im <span class="app_name">{?app_full_name?}</span> ToDo-Manager eingeloggt. Dies kann verschiedene Gr&uuml;nde haben:
-
-       <ol id="login_failed_list">
-               <li>Dein Browser nimmt keine Cookies an.</li>
-               <li>Du hast den Loginbereich aus deinen Bookmarks/Favoriten aufgerufen
-                       und die Cookies sind gel&ouml;scht.</li>
-               <li>Es besteht ein Problem mit dem Server, wof&uuml;r du meistens nichts
-                       kannst. Bitte kontaktiere den Support, falls dieses Problem
-                       weiterhin besteht.</li>
-       </ol>
-
-       Wenn du den Support kontaktierst, halte bitte s&auml;mtliche relevante
-       Informationen - <span class="important_note">nicht aber dein Passwort</span>
-       - bereit. Du kannst auch einen Screenshot dieser Seite anfertigen und dem
-       Support diesen senden!
-</div>
-
-<div id="content_footer">
-       <div id="login_retry">
-               {?login_retry_link?}
-       </div>
-
-       Vielen Dank f&uuml;r deine Mitarbeit! :-)
-</div>

diff --git a/application/todo/templates/de/code/login_form.ctp b/application/todo/templates/de/code/login_form.ctp
deleted file mode 100644 (file)
index f9ed480..0000000
--- a/application/todo/templates/de/code/login_form.ctp
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'todo_user_login'));
-
-// Formular deaktiviert?
-if ($helper->ifLoginIsEnabled()) {
-       // Formular ist aktiv
-       $helper->addFormGroup('login', "Gebe hier deine Logindaten ein:");
-
-       // Welches Loginverfahren wurde konfiguriert?
-       if ($helper->ifLoginWithUsername()) {
-               // Login mit Username
-               $helper->addFormSubGroup('username', "Bitte mit deinem Nickname einloggen.");
-               $helper->addFieldText('username', "Dein Nickname:");
-               $helper->addInputTextField('username');
-       } elseif ($helper->ifLoginWithEmail()) {
-               // Login mit Email
-               $helper->addFormSubGroup('email', "Bitte mit deiner Email-Adresse einloggen.");
-               $helper->addFieldText('email', "Deine Email-Addresse:");
-               $helper->addInputTextField('email');
-       } else {
-               // Login mit Email/Username
-               $helper->addFormSubGroup('user_email', "Bitte mit deinem Nickname oder Email-Adresse einloggen.");
-               $helper->addFieldText('user_email', "Dein Nickname/Email:");
-               $helper->addInputTextField('user_email');
-       }
-
-       $helper->addFormSubGroup('pass', "Gebe dein Passwort von der Anmeldung ein.");
-       $helper->addFieldText('pass', "Dein Passwort:");
-       $helper->addInputPasswordField('pass');
-
-       // CAPTCHA enabled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_user', "Das Benutzer-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit buttons
-       $helper->addFormGroup('buttons_user', "Alles richtig eingegeben?");
-       $helper->addInputResetButton("Formular leeren");
-       $helper->addInputSubmitButton("Zum ToDo-Manager einloggen");
-} else {
-       // Formular deaktiviert
-       $helper->addFormNote('form_deactivated', "Einloggen in diesen ToDo-Manager ist derzeit administrativ deaktiviert worden. Bitte komme sp&auml;ter noch mal wieder.");
-       $helper->addFormNote('admin_notice', "Nachricht vom Admin: <span id=\"disabled_reason\">".$this->getConfigInstance()->readConfig('login_disabled_reason')."</span>");
-}
-
-// Formular schliessen
-$helper->flushContent();
-
-// Ist Gastlogin erlaubt?
-if ($helper->ifGuestLoginAllowed()) {
-       // Neue Helper-Instanz holen
-       $helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'todo_guest_login'));
-       $helper->addInputHiddenConfiguredField('user', 'guest_login');
-       $helper->addInputHiddenConfiguredField('passwd', 'guest_login');
-
-       // CAPTCHA enbaled?
-       if ($helper->ifFormSecuredWithCaptcha()) {
-               $helper->addFormGroup('captcha_guest', "Unser Gast-Login ist durch ein CAPTCHA gesch&uuml;tzt. Bitte wiederhole den angezeigten Code, damit du dich einloggen kannst.");
-               $helper->addCaptcha();
-       } // END - if
-
-       // Submit button
-       $helper->addFormGroup('buttons_guest', "Gastlogins sind in der Funkionsweise eingeschr&auml;nkt. Mehr dazu unter &quot;Gastlogin&quot;.");
-       $helper->addInputSubmitButton("Als Gast einloggen");
-       $helper->flushContent();
-}
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'register_login_form_link', 'index.php?app={?app_short_name?}&amp;page=register'));
-
-// Set link text
-$helper->addLinkWithTextById('register_login_form_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Einloggen zu <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="content_body">
-       <div id="login_box">
-               {?todo_user_login?}
-       </div>
-
-       <div id="guest_login">
-               {?todo_guest_login?}
-       </div>
-</div>
-
-<div id="content_footer">
-       Noch kein Loginaccount? {?register_login_form_link?}
-</div>

diff --git a/application/todo/templates/de/code/login_main.ctp b/application/todo/templates/de/code/login_main.ctp
deleted file mode 100644 (file)
index abeacc7..0000000
--- a/application/todo/templates/de/code/login_main.ctp
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-///////////////////////////////
-// Assign personal user data //
-///////////////////////////////
-
-// Get a new instance for personal data
-$blockInstance = ObjectFactory::createObjectByConfiguredName('web_block_helper', array($this, 'persona_data'));
-
-// Set the data source instance which must exist in registry
-$blockInstance->prefetchValueInstance('user');
-
-// Assign fields with template variables
-$blockInstance->assignField('username');
-$blockInstance->assignFieldWithFilter('user_status', "user_status_translator");
-
-// Shall we include registration date?
-if ($blockInstance->ifIncludeRegistrationStamp()) {
-       // Then assign it as well!
-       $blockInstance->assignFieldWithFilter('registered', 'formatTimestamp');
-} // END - if
-
-// Flush the content out to a template variable
-$blockInstance->flushContent();
-
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'logout_action_link', 'index.php?app={?app_short_name?}&amp;page=login_area'));
-
-// Add action
-$helper->addActionLink('logout', "Ausloggen");
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Willkommen im Loginbereich  von <span class=\"app_name\">{?app_full_name?}</span>!
-</div>
-
-<div id="content_body">
-       {?login_content?}
-</div>
-
-<div id="persona_data" title="Informationen zu Deinem Loginaccount">
-       <div id="persona_header">
-               Account-Infos:
-       </div>
-
-       <div id="persona_body">
-               {?persona_data?}
-       </div>
-
-       <div id="logout_link">
-               {?logout_action_link?}
-       </div>
-</div>

diff --git a/application/todo/templates/de/code/logout_done.ctp b/application/todo/templates/de/code/logout_done.ctp
deleted file mode 100644 (file)
index db882f6..0000000
--- a/application/todo/templates/de/code/logout_done.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Get helper instance
-$helper = ObjectFactory::createObjectByConfiguredName('web_link_helper', array($this, 'relogin_link', 'index.php?app={?app_short_name?}&amp;page=login'));
-
-// Set link text
-$helper->addLinkWithTextById('relogin_link_text');
-
-// Flush the content
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Du bist jetzt aus dem ToDo-Manager ausgeloggt!
-</div>
-
-<div id="content_body">
-       Du kannst dich nun {?relogin_link?} oder weiter auf unseren Seiten bleiben. ;-)
-</div>

diff --git a/application/todo/templates/de/code/mail_debug.ctp b/application/todo/templates/de/code/mail_debug.ctp
deleted file mode 100644 (file)
index e62dd07..0000000
--- a/application/todo/templates/de/code/mail_debug.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="debug_header">
-       Mail-Debug-Ausgabe:
-</div>
-
-<div class="mail_header">
-       <div class="mail_header_line">
-               <span class="mail_sender">Von:</span> <span class="mail_info">{?sender?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_recipient">An:</span> <span class="mail_info">{?recipient?}</span>
-       </div>
-       <div class="mail_header_line">
-               <span class="mail_subject">Betreff:</span> <span class="mail_info">{?subject?}</span>
-       </div>
-</div>
-
-<div class="mail_text_box">
-       <div class="mail_message">
-               Nachricht:
-       </div>
-
-       <div class="mail_content">
-               {?message?}
-       </div>
-</div>

diff --git a/application/todo/templates/de/code/register_form.ctp b/application/todo/templates/de/code/register_form.ctp
deleted file mode 100644 (file)
index e51c857..0000000
--- a/application/todo/templates/de/code/register_form.ctp
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-// Get helper instance for web forms. This will add the opening form-tag to
-// the helper's render cache which is simply a small variable in the class
-// BaseHelper.
-$helper = ObjectFactory::createObjectByConfiguredName('web_form_helper', array($this, 'todo_register'));
-
-// Always ask at least for nickname and password
-$helper->addFormGroup('login', "Bitte gebe hier gew&uuml;nschten Nickname und dein Zugangspasswort ein.");
-$helper->addFormSubGroup('username', "Dein Nickname wird erst nach Absenden des Formulares gepr&uuml;ft. Sp&auml;ter bauen wir dann einen automatischen Test ein, der dir sofort zeigt, ob der Nickname bereits vergeben ist.");
-$helper->addFieldText('username', "Nickname im ToDo-Manager:");
-$helper->addInputTextField('username');
-$helper->addFormSubGroup('pass', "Dein Passwort sollte nicht zu leicht erratbar sein. Sp&auml;ter bauen wir hier noch einen automatischen Test ein, der dir sofort die Passwortst&auml;rke anzeigt.");
-$helper->addFieldText('pass1', "Passwort:");
-$helper->addInputPasswordField('pass1');
-$helper->addFieldText('pass2', "Passwortwiederholung:");
-$helper->addInputPasswordField('pass2');
-
-if ($helper->ifRegisterRequiresEmailVerification()) {
-       $helper->addFormGroup('email', "Bitte gebe deine Email zweimal (ein zweites Mal zur Best&auml;tigung) ein, damit wir dir deinen Freischaltlink zusenden k&ouml;nnen.");
-       $helper->addFieldText('email1', "Email-Adresse:");
-       $helper->addInputTextField('email1');
-       $helper->addFieldText('email2', "Wiederholung Email-Adresse:");
-       $helper->addInputTextField('email2');
-
-       if ($helper->ifEmailMustBeUnique()) {
-               $helper->addFormNote('email', "Die von dir eingegebene Email-Adresse darf nur einmal im ToDo-Manager verwendet worden sein.");
-       } // END - Unique email addresses
-
-} // END - email verification
-
-if ($helper->ifRegisterIncludesProfile()) {
-       $helper->addFormGroup('profile', "Hier kannst du zus&auml;tzlich deine Profildaten vorweg eingeben, du kannst sie aber auch nach dem Login vervollst&auml;ndigen!");
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormSubGroup('email', "Die Angabe deiner Email-Adresse ist nur dann n&ouml;tig, wenn du auch Email-Benachrichtigungen (<span id=\"add_note\">*1</span>) haben m&ouml;chtest.");
-               $helper->addFieldText('email1', "Email-Adresse:");
-               $helper->addInputTextField('email1');
-       } // END - No email verification
-
-       // Persoenliche Daten mit in der Anmeldung abfragen?
-       if ($helper->ifRegisterIncludesPersonaData()) {
-               $helper->addFormSubGroup('persona', "Wenn du magst, dann vervollst&auml;ndige deine komplette Adresse mit deinem Namen.");
-               $helper->addFieldText('surname', "Dein Vorname:");
-               $helper->addInputTextField('surname');
-               $helper->addFieldText('family', "Dein Nachname:");
-               $helper->addInputTextField('family');
-               $helper->addFieldText('street', "Strasse und Hausnummer:");
-               $helper->addInputTextField('street');
-               $helper->addFieldText('city', "Wohnort:");
-               $helper->addInputTextField('city');
-       } // END - Persona data
-
-       $helper->addFormSubGroup('zip', "Magst du uns auch deine Postleitzahl verraten?");
-       $helper->addFieldText('zip', "Postleitzahl:");
-       $helper->addInputTextField('zip');
-
-       $helper->addFormSubGroup('chat', "Gebe hier deine Nicknames bzw. Nummern an:");
-
-       if ($helper->ifChatEnabled('icq')) {
-               $helper->addFieldText('icq', "ICQ-Nummer:");
-               $helper->addInputTextField('icq');
-       } // END - if
-
-       if ($helper->ifChatEnabled('jabber')) {
-               $helper->addFieldText('jabber', "Jabber:");
-               $helper->addInputTextField('jabber');
-       } // END - if
-
-       if ($helper->ifChatEnabled('yahoo')) {
-               $helper->addFieldText('yahoo', "Yahoo!:");
-               $helper->addInputTextField('yahoo');
-       } // END - if
-
-       if ($helper->ifChatEnabled('aol')) {
-               $helper->addFieldText('aol', "AOL-Screenname:");
-               $helper->addInputTextField('aol');
-       } // END - if
-
-       if ($helper->ifChatEnabled('msn')) {
-               $helper->addFieldText('msn', "MSN:");
-               $helper->addInputTextField('msn');
-       } // END - if
-
-       if (!$helper->ifRegisterRequiresEmailVerification()) {
-               $helper->addFormExtraNote(1, "Die Benachrichtigungen per sind im Loginbereich verfeinerbar, welche du genau haben willst.");
-       } // END - Extra note
-
-} // END - ask profile data
-
-// Posting-/Kommentarregeln abfragen
-$helper->addFormGroup('rules', "Bitte lese dir die Regeln gut durch und kreuze dann &quot;Ja, ich akzeptiere die aktuellen Regeln&quot; an.");
-$helper->addFieldText('rules', "Ja, ich akzeptiere die aktuellen Regeln:");
-$helper->addInputCheckboxField('rules', false);
-
-// Add CAPTCHA?
-if ($helper->ifFormSecuredWithCaptcha()) {
-       $helper->addFormGroup('captcha', "Bitte wiederhole den angezeigten Code damit die Anmeldung abgeschlossen werden kann.");
-       $helper->addCaptcha();
-} // END - if
-
-// Final note and submit buttons
-$helper->addFormGroup('buttons', "Wenn du alle ben&ouml;tigten Felder korrekt ausgef&uuml;t hast, kannst du die Anmeldung abschliessen.");
-
-$helper->addInputResetButton("Alles nochmal eingeben");
-$helper->addInputSubmitButton("Anmeldung zum ToDo-Manager abschliessen");
-$helper->addFormNote('data_protection', "Deine Daten werden nach den g&uuml;ltigen Datenschutzgesetzten gespeichert und werden nicht an Dritte weitergegeben. Weiteres dazu siehe Link &quot;Datenschutz&quot;.");
-$helper->flushContent();
-
-// [EOC]
-?>
-<div id="content_header">
-       Anmeldung bei <span class="app_name">{?app_full_name?}</span>
-</div>
-
-<div id="register_box">
-       {?todo_register?}
-</div>

diff --git a/application/todo/templates/de/code/todo_main.ctp b/application/todo/templates/de/code/todo_main.ctp
deleted file mode 100644 (file)
index 70a0ed7..0000000
--- a/application/todo/templates/de/code/todo_main.ctp
+++ /dev/null
@@ -1,23 +0,0 @@
-{?header?}
-
-<div id="main_header">
-       {?todo_header?}
-</div>
-
-<div id="navigation">
-       {?navigation?}
-</div>
-
-<div id="advert">
-       {?nav_advert?}
-</div>
-
-<div id="main_content">
-       {?content?}
-</div>
-
-<div id="main_footer">
-       {?todo_footer?}
-</div>
-
-{?footer?}

diff --git a/application/todo/templates/de/emails/.htaccess b/application/todo/templates/de/emails/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/de/emails/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/de/emails/text_resend_link.tpl b/application/todo/templates/de/emails/text_resend_link.tpl
deleted file mode 100644 (file)
index e764146..0000000
--- a/application/todo/templates/de/emails/text_resend_link.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<text-mail>
-       <mail-data>
-               <sender-address value="$config[admin_email]" />
-               <subject-line value="Anforderung deines Best&auml;tigungslinks" />
-               <recipient-address value="{?email?}" />
-               <message>
-               <![CDATA[Hallo {?username?}!
-
-Du (oder ein anderer) hattest soeben deinen Best&auml;tigungslink erneut angefordert. Solltest du dies nicht gewesen sein, bitten wir dich den Vorfall zu entschuldigen.
-
-Hier ist nun dein Best&auml;tigungslink. Der alte aus der Anmeldemail ist somit nicht mehr g&uuml;ltig!
-
-$config[base_url]/index.php?app={?app_short_name?}&page=confirm&username={?username?}&confirm={?confirm_hash?}
-
-Solltest du die URL nicht anklicken k&ouml;nnen, versuche diese in die Adresszeile deines Browsers zu kopieren.
-
-Alternativ kannst du im Loginbereich unter Best&auml;tigungscode den folgenden Code reinkopieren oder eingeben:
-
-{?confirm_hash?}
-
-Solltest du Fragen dazu oder Probleme mit der Best&auml;tigung haben, so melde dich bitte beim Support-Team.
-
-Mit freundlichen Gr&uuml;&szlig;en,
-  Dein {?app_short_name?}-Team
-
-{?mail_footer?}]]>
-               </message>
-       </mail-data>
-</text-mail>

diff --git a/application/todo/templates/de/html/.htaccess b/application/todo/templates/de/html/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/de/html/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/de/html/nav_advert.tpl b/application/todo/templates/de/html/nav_advert.tpl
deleted file mode 100644 (file)
index 22da43b..0000000
--- a/application/todo/templates/de/html/nav_advert.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<!-- Put your ads code here which shall be shown below the navigation //-->

diff --git a/application/todo/templates/de/html/selector_ship-simu.tpl b/application/todo/templates/de/html/selector_ship-simu.tpl
deleted file mode 100644 (file)
index b96640e..0000000
--- a/application/todo/templates/de/html/selector_ship-simu.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="selector_content">
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Gr&uuml;nden Sie eine virtuelle Reederei an den bedeutestens
-               Welth&auml;fen! Oder treten Sie einer Reederei als Angestellter bei und
-               arbeiten Sie sich bis in die Chef-Etagge hoch!
-       </div>
-
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Oder fangen Sie als Matrose auf einem Passagierschiff (virtuell) an zu
-               arbeiten und werden Sie nach wenigen Kreuzfahrten bald Kapit&auml;n!
-       </div>
-
-       <div style="text-align: left; padding-top: 15px; padding-left: 10px; padding-right: 10px">
-               Oder buchen Sie eine virtuelle Kreuzfahrt durch die bekannten Meeren in
-               {!POINTS!} in einer Luxus-Suite!
-       </div>
-</div>

diff --git a/application/todo/templates/images/.htaccess b/application/todo/templates/images/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/images/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/images/_cache/.htaccess b/application/todo/templates/images/_cache/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/images/_cache/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/images/de/.htaccess b/application/todo/templates/images/de/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/images/de/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/images/de/image/.htaccess b/application/todo/templates/images/de/image/.htaccess
deleted file mode 100644 (file)
index 3a42882..0000000
--- a/application/todo/templates/images/de/image/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all

diff --git a/application/todo/templates/images/de/image/base_code.itp b/application/todo/templates/images/de/image/base_code.itp
deleted file mode 100644 (file)
index 6501b56..0000000
--- a/application/todo/templates/images/de/image/base_code.itp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<image>
-       <type value="{?image_type?}" />
-       <base>
-               <name value="{?image_name?}" />
-       </base>
-       <resolution>
-               <width value="{?image_width?}" />
-               <height value="{?image_height?}" />
-       </resolution>
-       <background-color>
-               <red value="{?image_bg_red?}" />
-               <green value="{?image_bg_green?}" />
-               <blue value="{?image_bg_blue?}" />
-       </background-color>
-       <foreground-color>
-               <red value="{?image_fg_red?}" />
-               <green value="{?image_fg_green?}" />
-               <blue value="{?image_fg_blue?}" />
-       </foreground-color>
-       <image-string value="groupable">
-               <string-name value="{?image_string_name?}" />
-               <x value="{?image_x?}" />
-               <y value="{?image_y?}" />
-               <font-size value="{?image_size?}" />
-               <text value="{?image_string?}" />
-       </image-string>
-</image>

diff --git a/application/todo/templates/images/de/image/code_captcha.itp b/application/todo/templates/images/de/image/code_captcha.itp
deleted file mode 100644 (file)
index 2e28522..0000000
--- a/application/todo/templates/images/de/image/code_captcha.itp
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-// Needed in every image template to initialy set the image type
-$helper = ImageHelper::createImageHelper($this, "png");
-$helper->setImageName("code_captcha");
-$helper->setBaseImage("base_code");
-
-// Set image dimensions
-$helper->setWidth(100);
-$helper->setHeight(50);
-
-// Get random number
-$rand = $helper->getRngInstance()->randomNumber(0, 6);
-
-// Background and foreground color
-switch ($rand) {
-       case 1:
-               // First varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x90  , 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xff  , 'rand');
-               break;
-
-       case 2:
-               // Second varriant
-               $helper->setBackgroundColorRedGreenBlue(0x90  , 'rand', 0x00  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-
-       case 3:
-               // Third varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xff  );
-               break;
-
-       case 4:
-               // Forth varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 0x90  , 'rand');
-               $helper->setForegroundColorRedGreenBlue(0x00  , 'rand', 0xa0  );
-               break;
-
-       case 5:
-               // Fith varriant
-               $helper->setBackgroundColorRedGreenBlue('rand', 0x00  , 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0x00  , 0xe0  , 'rand');
-               break;
-
-       default:
-               // Last varriant
-               $helper->setBackgroundColorRedGreenBlue(0x00  , 'rand', 0x90  );
-               $helper->setForegroundColorRedGreenBlue(0xff  , 0x00  , 'rand');
-               break;
-}
-
-// Random X/Y factors...
-$xRand = $helper->getRngInstance()->randomNumber(0, 45);
-$yRand = $helper->getRngInstance()->randomNumber(0, 25);
-
-// Add code
-$helper->addTextLine("code");
-$helper->setCoord((5 + $xRand), (5 + $yRand));
-$helper->setFontSize('rand');
-$helper->setImageString("{?decrypted_code?}");
-
-// Only for debug!
-/*
-$helper->addTextLine("debug");
-$helper->setCoord(90, 35);
-$helper->setFontSize(3);
-$helper->setImageString($rand);
-*/
-
-// Flush content to the template engine
-$helper->flushContent();
-
-// Comment this out if image is done
-//$this->debugInstance();
-
-// [EOF]
-?>