From e728d099988738fa391e98d957680086c6c04b20 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 11 Apr 2015 16:48:09 +0200 Subject: [PATCH] Some renames + new controller added Signed-off-by: Roland Haeder --- application/city/config.php | 6 ++ .../city/main/actions/html/city/.htaccess | 1 + .../city/class_HtmlCityLoginCityMapAction.php | 79 +++++++++++++++++++ .../html/class_HtmlCityLoginWelcomeAction.php | 4 +- .../de/menu/login_area_menu_entries.xml | 4 +- core | 2 +- 6 files changed, 90 insertions(+), 6 deletions(-) create mode 100644 application/city/main/actions/html/city/.htaccess create mode 100644 application/city/main/actions/html/city/class_HtmlCityLoginCityMapAction.php diff --git a/application/city/config.php b/application/city/config.php index c0d7664..c9af86e 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -86,6 +86,9 @@ $cfg->setConfigEntry('news_reader_login_area_profile_class', 'DefaultNewsReader' // CFG: NEWS-READER-LOGIN-AREA-STATUS-PROBLEM-CLASS $cfg->setConfigEntry('news_reader_login_area_status_problem_class', 'DefaultNewsReader'); +// CFG: NEWS-READER-LOGIN-AREA-CITY-MAP-CLASS +$cfg->setConfigEntry('news_reader_login_area_city_map_class', 'DefaultNewsReader'); + // CFG: NEWS-HOME-LIMIT $cfg->setConfigEntry('news_home_limit', 10); @@ -444,6 +447,9 @@ $cfg->setConfigEntry('default_console_command', 'daemon'); // CFG: DEFAULT-CITY-CONSOLE-COMMAND $cfg->setConfigEntry('default_city_console_command', 'daemon'); +// CFG: DEFAULT-CITY-CONSOLE-CONTROLLER +$cfg->setConfigEntry('default_city_console_controller', 'daemon'); + // CFG: CITY-CONSOLE-CMD-DAEMON-RESOLVER-CLASS $cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'CityConsoleCommandResolver'); diff --git a/application/city/main/actions/html/city/.htaccess b/application/city/main/actions/html/city/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/city/main/actions/html/city/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/city/main/actions/html/city/class_HtmlCityLoginCityMapAction.php b/application/city/main/actions/html/city/class_HtmlCityLoginCityMapAction.php new file mode 100644 index 0000000..db5fe94 --- /dev/null +++ b/application/city/main/actions/html/city/class_HtmlCityLoginCityMapAction.php @@ -0,0 +1,79 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2015 City Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.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 . + */ +class HtmlCityLoginCityMapAction extends BaseCityAction 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 static final function createHtmlCityLoginCityMapAction (ActionResolver $resolverInstance) { + // Get a new instance + $actionInstance = new HtmlCityLoginCityMapAction(); + + // 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 Maybe add more here? + */ + public function execute (Requestable $requestInstance, Responseable $responseInstance) { + // Call parent execute method + parent::execute($requestInstance, $responseInstance); + } + + /** + * 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) { + // Unfinished method + } +} + +// [EOF] +?> diff --git a/application/city/main/actions/html/class_HtmlCityLoginWelcomeAction.php b/application/city/main/actions/html/class_HtmlCityLoginWelcomeAction.php index 6407d6b..27d576c 100644 --- a/application/city/main/actions/html/class_HtmlCityLoginWelcomeAction.php +++ b/application/city/main/actions/html/class_HtmlCityLoginWelcomeAction.php @@ -55,13 +55,11 @@ class HtmlCityLoginWelcomeAction extends BaseCityAction implements Commandable, * @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 + * @todo Maybe add more here? */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Call parent execute method parent::execute($requestInstance, $responseInstance); - - // Add your code here... } /** diff --git a/application/city/templates/de/menu/login_area_menu_entries.xml b/application/city/templates/de/menu/login_area_menu_entries.xml index efe4db3..adace6b 100644 --- a/application/city/templates/de/menu/login_area_menu_entries.xml +++ b/application/city/templates/de/menu/login_area_menu_entries.xml @@ -67,8 +67,8 @@ along with this program. If not, see - - + + diff --git a/core b/core index c00f206..57d9c52 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c00f2069057fcaa301bb045f5801e8bc0ff7c658 +Subproject commit 57d9c524afef252f209990a35283970907890c03 -- 2.39.5