From 1079ab2b4b8ee62cb5e434b5ee3d04bd7369f954 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 25 Apr 2012 17:06:59 +0000 Subject: [PATCH] Added missing directories/config entries --- .gitattributes | 3 +++ application/selector/config.php | 15 +++++++++++++++ application/selector/data.php | 4 ++-- application/selector/exceptions/.htaccess | 1 + application/selector/init.php | 4 ++++ application/selector/interfaces/.htaccess | 1 + application/selector/loader.php | 11 ++++++++--- application/selector/main/.htaccess | 1 + application/selector/starter.php | 2 +- 9 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 application/selector/exceptions/.htaccess create mode 100644 application/selector/interfaces/.htaccess create mode 100644 application/selector/main/.htaccess diff --git a/.gitattributes b/.gitattributes index 30982b5..6c20fc3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,8 +8,11 @@ application/selector/config.php -text svneol=unset#text/plain application/selector/data.php -text svneol=unset#text/plain application/selector/debug.php -text svneol=unset#text/plain application/selector/exceptions.php -text svneol=unset#text/plain +application/selector/exceptions/.htaccess -text application/selector/init.php -text svneol=unset#text/plain +application/selector/interfaces/.htaccess -text application/selector/loader.php -text svneol=unset#text/plain +application/selector/main/.htaccess -text application/selector/starter.php -text svneol=unset#text/plain application/selector/templates/.htaccess -text application/selector/templates/de/.htaccess -text diff --git a/application/selector/config.php b/application/selector/config.php index bade6cb..f51f5ae 100644 --- a/application/selector/config.php +++ b/application/selector/config.php @@ -43,5 +43,20 @@ $cfg->setConfigEntry('form_method', 'post'); // CFG: FORM-TARGET $cfg->setConfigEntry('form_target', '_self'); +// CFG: WEB-CMD-HOME-RESOLVER-CLASS +$cfg->setConfigEntry('web_cmd_home_resolver_class', 'WebCommandResolver'); + +// CFG: NEWS-DOWNLOAD-FILTER +$cfg->setConfigEntry('news_download_filter', 'NewsDownloadFilter'); + +// CFG: NEWS-PROCESS-FILTER +$cfg->setConfigEntry('news_process_filter', 'NewsProcessFilter'); + +// CFG: NEWS-READER-HOME-CLASS +$cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader'); + +// CFG: NEWS-HOME-LIMIT +$cfg->setConfigEntry('news_home_limit', 10); + // [EOF] ?> diff --git a/application/selector/data.php b/application/selector/data.php index 3711c98..928acca 100644 --- a/application/selector/data.php +++ b/application/selector/data.php @@ -35,8 +35,8 @@ $app = call_user_func_array( ); // Set application name and version -$app->setAppName("Applikationsauswähler"); -$app->setAppVersion("0.1a"); +$app->setAppName('Applikationsauswähler'); +$app->setAppVersion('0.1a'); $app->setAppShortName($cfg->getConfigEntry('selector_name')); // [EOF] diff --git a/application/selector/exceptions/.htaccess b/application/selector/exceptions/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/selector/exceptions/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/selector/init.php b/application/selector/init.php index a77ca0d..0185a20 100644 --- a/application/selector/init.php +++ b/application/selector/init.php @@ -31,5 +31,9 @@ $cfg = FrameworkConfiguration::getSelfInstance(); // Initialize output system require($cfg->getConfigEntry('base_path') . 'inc/output.php'); +// This application needs a database connection then we have to simply include +// the inc/database.php script +require($cfg->getConfigEntry('base_path') . 'inc/database.php'); + // [EOF] ?> diff --git a/application/selector/interfaces/.htaccess b/application/selector/interfaces/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/selector/interfaces/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/selector/loader.php b/application/selector/loader.php index abe4534..c0786aa 100644 --- a/application/selector/loader.php +++ b/application/selector/loader.php @@ -1,6 +1,7 @@ * @version 0.0.0 * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team @@ -24,11 +25,15 @@ // Get config instance $cfg = FrameworkConfiguration::getSelfInstance(); -// Load all classes -ClassLoader::getSelfInstance()->scanClassPath(sprintf("%s/%s/", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'))); +// Load all classes for the application +foreach ($lowerClasses as $className) { + // Load the application classes + ClassLoader::getSelfInstance()->scanClassPath(sprintf("%s/%s/%s", $cfg->getConfigEntry('application_path'), $cfg->getConfigEntry('app_name'), $className)); +} // END - if // Clean up the global namespace unset($lowerClasses); +unset($className); // [EOF] ?> diff --git a/application/selector/main/.htaccess b/application/selector/main/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/selector/main/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/selector/starter.php b/application/selector/starter.php index 48141e8..4c59f6d 100644 --- a/application/selector/starter.php +++ b/application/selector/starter.php @@ -46,7 +46,7 @@ if ((empty($app)) || (is_null($app))) { )); } -// Call the entry point method +// Call user function call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array()); // [EOF] -- 2.30.2