summaryrefslogtreecommitdiff
path: root/manager
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-08-09 22:26:17 +0200
committerBenny Baumann <BenBE@geshi.org>2015-08-09 22:26:17 +0200
commit8a5059809e66396eb97dbe1588cd28b8d38eb8a2 (patch)
treebd8d52e8cdcf5e3a59f64a4dafd9ce392284636f /manager
parent2cbb6d9c9cea8624d474807857ba2f8c81352c15 (diff)
parent09e2615ec5281b6543f9b70035df6ac4d8b596ae (diff)
downloadcacert-mgr-8a5059809e66396eb97dbe1588cd28b8d38eb8a2.tar.gz
cacert-mgr-8a5059809e66396eb97dbe1588cd28b8d38eb8a2.tar.xz
cacert-mgr-8a5059809e66396eb97dbe1588cd28b8d38eb8a2.zip
Merge branch 'bug-1396'
Diffstat (limited to 'manager')
-rw-r--r--manager/.project58
-rw-r--r--manager/application/Bootstrap.php308
-rw-r--r--manager/application/configs/application.ini.ca-mgr1114
-rw-r--r--manager/application/configs/application.ini.mawatest112
-rw-r--r--manager/application/controllers/ErrorController.php69
-rw-r--r--manager/application/controllers/IndexController.php8
-rw-r--r--manager/application/controllers/LoginController.php568
-rw-r--r--manager/application/controllers/LogoutController.php54
-rw-r--r--manager/application/controllers/MailController.php154
-rw-r--r--manager/application/controllers/ManageAccountController.php148
-rw-r--r--manager/application/layouts/scripts/layout.phtml62
-rw-r--r--manager/application/models/User.php16
-rw-r--r--manager/application/views/helpers/LeftNav.php192
-rw-r--r--manager/application/views/helpers/TopNav.php198
-rw-r--r--manager/application/views/helpers/UserInfo.php190
-rw-r--r--manager/application/views/scripts/index/index.phtml14
-rw-r--r--manager/application/views/scripts/login/index.phtml32
-rw-r--r--manager/application/views/scripts/mail/delete.phtml24
-rw-r--r--manager/application/views/scripts/mail/full.phtml74
-rw-r--r--manager/application/views/scripts/mail/index.phtml74
-rw-r--r--manager/application/views/scripts/mail/read.phtml20
-rw-r--r--manager/application/views/scripts/manage-account/assurance.phtml16
-rw-r--r--manager/application/views/scripts/manage-account/batch-assurance-form.phtml22
-rw-r--r--manager/application/views/scripts/manage-account/batch-assurance.phtml32
-rw-r--r--manager/library/CAcert/User/Emails.php120
-rw-r--r--manager/library/actions/ActionIndex.php106
-rw-r--r--manager/library/actions/ActionLogin.php106
-rw-r--r--manager/library/actions/ActionMail.php106
-rw-r--r--manager/library/actions/FWAction.php14
-rw-r--r--manager/library/config/Config.php207
-rw-r--r--manager/library/config/Config_Db.php678
-rw-r--r--manager/library/config/Config_Writer_Db.php434
-rw-r--r--manager/library/date/HumanReadableTime.php280
-rw-r--r--manager/library/date/exception.HumanReadableTimeException.php73
-rw-r--r--manager/library/date/testHumanReadableTime.php31
-rw-r--r--manager/library/exception/exception.Base.php195
-rw-r--r--manager/library/global/defines.php56
-rw-r--r--manager/library/i18n/I18n.php190
-rw-r--r--manager/library/imap/exception.IMAPException.php68
-rw-r--r--manager/library/imap/imapConnection.php862
-rw-r--r--manager/library/l10n/L10n.php94
-rw-r--r--manager/library/log/Log.php210
-rw-r--r--manager/library/plugins/plugin.buildmenu.php146
-rw-r--r--manager/library/plugins/plugin.charsetheader.php24
-rw-r--r--manager/library/plugins/plugin.forceauth.php58
-rw-r--r--manager/library/plugins/plugin.loginlogout.php62
-rw-r--r--manager/locale/en_US/locale.php4
-rw-r--r--manager/public/css/form_dl.css20
-rw-r--r--manager/public/css/form_dl_wide.css22
-rw-r--r--manager/public/css/global.css244
-rw-r--r--manager/public/css/login.css20
-rw-r--r--manager/public/css/mail.css98
-rw-r--r--manager/public/index.php102
-rw-r--r--manager/public/js/center.js20
-rw-r--r--manager/public/js/mail_redirect.js14
-rw-r--r--manager/public/js/positionUserInfo.js34
56 files changed, 3626 insertions, 3631 deletions
diff --git a/manager/.project b/manager/.project
index 5f27609..e218398 100644
--- a/manager/.project
+++ b/manager/.project
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ca-mgr (mawaunix)</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.dltk.core.scriptbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.zend.php.framework.ZendFrameworkNature</nature>
- <nature>org.eclipse.php.core.PHPNature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ca-mgr (mawaunix)</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.dltk.core.scriptbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.zend.php.framework.ZendFrameworkNature</nature>
+ <nature>org.eclipse.php.core.PHPNature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
diff --git a/manager/application/Bootstrap.php b/manager/application/Bootstrap.php
index c559b59..e1e3991 100644
--- a/manager/application/Bootstrap.php
+++ b/manager/application/Bootstrap.php
@@ -1,154 +1,154 @@
-<?php
-require_once('plugins/plugin.charsetheader.php');
-require_once('plugins/plugin.forceauth.php');
-require_once('plugins/plugin.loginlogout.php');
-require_once('plugins/plugin.buildmenu.php');
-require_once('config/Config.php');
-require_once('log/Log.php');
-require_once('l10n/L10n.php');
-require_once('i18n/I18n.php');
-
-class Bootstrap extends Zend_Application_Bootstrap_Bootstrap {
- protected function _initAutoload() {
- $autoloader = new Zend_Application_Module_Autoloader(array(
- 'namespace' => 'Default_',
- 'basePath' => dirname(__FILE__)
- ));
- return $autoloader;
- }
-
- protected function _initPlugins() {
- $this->bootstrap('session');
-
- $fc = Zend_Controller_Front::getInstance();
-
- $charset_header = new CharsetHeader();
- $fc->registerPlugin($charset_header);
-
- $force_auth = new ForceAuth();
- $fc->registerPlugin($force_auth);
-
- $buildmenu = new BuildMenu();
- $fc->registerPlugin($buildmenu);
-
- $loginlogout = new LoginLogout();
- $fc->registerPlugin($loginlogout);
- }
-
- protected function _initDoctype() {
- $this->bootstrap('view');
- $this->bootstrap('log');
- $this->bootstrap('I18n');
- $this->bootstrap('session');
-
- $view = $this->getResource('view');
- Zend_Registry::set('view', $view);
- $view->doctype('XHTML1_STRICT');
- $view->addHelperPath(APPLICATION_PATH . '/views/helpers/');
- $view->headTitle = I18n::_('CAcert Test Manager');
- }
-
- /**
- * @todo expireSessionCookie()
- * @todo rememberMe(xx)
- * @todo forgetMe()
- * @see Zend_Registry::get('session');
- * @return Zend_Session_Namespace
- */
- protected function _initSession() {
- $options = $this->getOption('ca_mgr');
-
- $db = Zend_Db::factory($options['db']['session']['pdo'], $options['db']['session']);
-
- /**
- * automatically clean up expired session entries from session cache
- * use the modified and lifetime stamps to calculate expire time
- */
- if ($options['db']['session']['autocleanup'] == '1') {
- $stmt = $db->query('delete from front_session where (modified + lifetime * 2) < unix_timestamp()');
- # $stmt->execute();
- }
-
- //you can either set the Zend_Db_Table default adapter
- //or you can pass the db connection straight to the save handler $config
- // @see lifetimeColumn / lifetime / overrideLifetime, lifetime defaults to php.ini: session.gc_maxlifetime
- Zend_Db_Table_Abstract::setDefaultAdapter($db);
- $config = array(
- 'name' => 'front_session',
- 'primary' => 'id',
- 'modifiedColumn' => 'modified',
- 'dataColumn' => 'data',
- 'lifetimeColumn' => 'lifetime'
- );
-
- //create your Zend_Session_SaveHandler_DbTable and
- //set the save handler for Zend_Session
- Zend_Session::setSaveHandler(new Zend_Session_SaveHandler_DbTable($config));
-
- // Zend_Session::rememberMe(7200);
-
- //start your session!
- Zend_Session::start();
-
- $session = new Zend_Session_Namespace();
- if (!isset($session->started))
- $session->started = time();
- if (!isset($session->authdata))
- $session->authdata = array('authed' => false);
-
- Zend_Registry::set('session', $session);
- return $session;
- }
-
- /**
- * get the basic system config from database, store the config object in the bootstrap registry
- * @see Zend_Registry::get('config');
- * @return Config
- */
- protected function _initConfig() {
- $options = $this->getOption('ca_mgr');
- $db = Zend_Db::factory($options['db']['config']['pdo'], $options['db']['config']);
- $config = Config::getInstance(SYSTEM_CONFIG, $db);
-
- Zend_Registry::set('config', $config);
- Zend_Registry::set('config_dbc', $db);
-
- return $config;
- }
-
- /**
- * make singleton system logger
- * @see Zend_Registry::get('log');
- * @return Log
- */
- public function _initLog() {
- $this->bootstrap('Config');
-
- $op = $this->getOption('log');
- $log = Log::getInstance(SYSTEM_LOG, $op['application']);
-
- Zend_Registry::set('log', $log);
- return $log;
- }
-
- /**
- * make singleton I18n (internationalization) object (translation)
- */
- public function _initI18n() {
- $this->bootstrap('Config');
- // need existing L10n object for initialization
- $this->bootstrap('L10n');
-
- $I18n = I18n::getInstance(L10n::getInstance()->getLanguage());
- }
-
- /**
- * make singleton L10n (localization) object (set locale, convert date and
- * number formats)
- */
- public function _initL10n() {
- $this->bootstrap('Config');
-
- $L10n = L10n::getInstance();
- }
-}
+<?php
+require_once('plugins/plugin.charsetheader.php');
+require_once('plugins/plugin.forceauth.php');
+require_once('plugins/plugin.loginlogout.php');
+require_once('plugins/plugin.buildmenu.php');
+require_once('config/Config.php');
+require_once('log/Log.php');
+require_once('l10n/L10n.php');
+require_once('i18n/I18n.php');
+
+class Bootstrap extends Zend_Application_Bootstrap_Bootstrap {
+ protected function _initAutoload() {
+ $autoloader = new Zend_Application_Module_Autoloader(array(
+ 'namespace' => 'Default_',
+ 'basePath' => dirname(__FILE__)
+ ));
+ return $autoloader;
+ }
+
+ protected function _initPlugins() {
+ $this->bootstrap('session');
+
+ $fc = Zend_Controller_Front::getInstance();
+
+ $charset_header = new CharsetHeader();
+ $fc->registerPlugin($charset_header);
+
+ $force_auth = new ForceAuth();
+ $fc->registerPlugin($force_auth);
+
+ $buildmenu = new BuildMenu();
+ $fc->registerPlugin($buildmenu);
+
+ $loginlogout = new LoginLogout();
+ $fc->registerPlugin($loginlogout);
+ }
+
+ protected function _initDoctype() {
+ $this->bootstrap('view');
+ $this->bootstrap('log');
+ $this->bootstrap('I18n');
+ $this->bootstrap('session');
+
+ $view = $this->getResource('view');
+ Zend_Registry::set('view', $view);
+ $view->doctype('XHTML1_STRICT');
+ $view->addHelperPath(APPLICATION_PATH . '/views/helpers/');
+ $view->headTitle = I18n::_('CAcert Test Manager');
+ }
+
+ /**
+ * @todo expireSessionCookie()
+ * @todo rememberMe(xx)
+ * @todo forgetMe()
+ * @see Zend_Registry::get('session');
+ * @return Zend_Session_Namespace
+ */
+ protected function _initSession() {
+ $options = $this->getOption('ca_mgr');
+
+ $db = Zend_Db::factory($options['db']['session']['pdo'], $options['db']['session']);
+
+ /**
+ * automatically clean up expired session entries from session cache
+ * use the modified and lifetime stamps to calculate expire time
+ */
+ if ($options['db']['session']['autocleanup'] == '1') {
+ $stmt = $db->query('delete from front_session where (modified + lifetime * 2) < unix_timestamp()');
+ # $stmt->execute();
+ }
+
+ //you can either set the Zend_Db_Table default adapter
+ //or you can pass the db connection straight to the save handler $config
+ // @see lifetimeColumn / lifetime / overrideLifetime, lifetime defaults to php.ini: session.gc_maxlifetime
+ Zend_Db_Table_Abstract::setDefaultAdapter($db);
+ $config = array(
+ 'name' => 'front_session',
+ 'primary' => 'id',
+ 'modifiedColumn' => 'modified',
+ 'dataColumn' => 'data',
+ 'lifetimeColumn' => 'lifetime'
+ );
+
+ //create your Zend_Session_SaveHandler_DbTable and
+ //set the save handler for Zend_Session
+ Zend_Session::setSaveHandler(new Zend_Session_SaveHandler_DbTable($config));
+
+ // Zend_Session::rememberMe(7200);
+
+ //start your session!
+ Zend_Session::start();
+
+ $session = new Zend_Session_Namespace();
+ if (!isset($session->started))
+ $session->started = time();
+ if (!isset($session->authdata))
+ $session->authdata = array('authed' => false);
+
+ Zend_Registry::set('session', $session);
+ return $session;
+ }
+
+ /**
+ * get the basic system config from database, store the config object in the bootstrap registry
+ * @see Zend_Registry::get('config');
+ * @return Config
+ */
+ protected function _initConfig() {
+ $options = $this->getOption('ca_mgr');
+ $db = Zend_Db::factory($options['db']['config']['pdo'], $options['db']['config']);
+ $config = Config::getInstance(SYSTEM_CONFIG, $db);
+
+ Zend_Registry::set('config', $config);
+ Zend_Registry::set('config_dbc', $db);
+
+ return $config;
+ }
+
+ /**
+ * make singleton system logger
+ * @see Zend_Registry::get('log');
+ * @return Log
+ */
+ public function _initLog() {
+ $this->bootstrap('Config');
+
+ $op = $this->getOption('log');
+ $log = Log::getInstance(SYSTEM_LOG, $op['application']);
+
+ Zend_Registry::set('log', $log);
+ return $log;
+ }
+
+ /**
+ * make singleton I18n (internationalization) object (translation)
+ */
+ public function _initI18n() {
+ $this->bootstrap('Config');
+ // need existing L10n object for initialization
+ $this->bootstrap('L10n');
+
+ $I18n = I18n::getInstance(L10n::getInstance()->getLanguage());
+ }
+
+ /**
+ * make singleton L10n (localization) object (set locale, convert date and
+ * number formats)
+ */
+ public function _initL10n() {
+ $this->bootstrap('Config');
+
+ $L10n = L10n::getInstance();
+ }
+}
diff --git a/manager/application/configs/application.ini.ca-mgr1 b/manager/application/configs/application.ini.ca-mgr1
index 4db026b..8b22a64 100644
--- a/manager/application/configs/application.ini.ca-mgr1
+++ b/manager/application/configs/application.ini.ca-mgr1
@@ -1,57 +1,57 @@
-[production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-includePaths.library = LIBRARY_PATH
-bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
-bootstrap.class = "Bootstrap"
-resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
-resources.frontController.noViewRenderer = 0
-resources.frontController.noErrorHandler = 0
-resources.frontController.useDefaultControllerAlways = 0
-resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts"
-resources.view[] =
-autoloadernamespaces.0 = "CAcert_"
-
-; Database settings for Session DB
-ca_mgr.db.session.pdo = "Pdo_Mysql"
-ca_mgr.db.session.autocleanup = 1
-ca_mgr.db.session.host = "localhost"
-ca_mgr.db.session.username = "ca_mgr"
-ca_mgr.db.session.password = "jsdfhsd47534hsdf7"
-ca_mgr.db.session.dbname = "ca_mgr"
-
-; Database settings for Auth DB (CACert User Table)
-ca_mgr.db.auth.pdo = "Pdo_Mysql"
-ca_mgr.db.auth.host = "cacert1.it-sls.de"
-ca_mgr.db.auth.username = "ca_mgr"
-ca_mgr.db.auth.password = "6348Jhfge(3457H5Kse"
-ca_mgr.db.auth.dbname = "cacert"
-ca_mgr.db.auth.tablename = "users"
-
-; Database settings for Auth DB (Manager User Table)
-ca_mgr.db.auth2.pdo = "Pdo_Mysql"
-ca_mgr.db.auth2.host = "localhost"
-ca_mgr.db.auth2.username = "ca_mgr"
-ca_mgr.db.auth2.password = "jsdfhsd47534hsdf7"
-ca_mgr.db.auth2.dbname = "ca_mgr"
-ca_mgr.db.auth2.tablename = "system_user"
-
-; Database settings for Config DB (access to system_config and dnssecme data tables)
-ca_mgr.db.config.pdo = "Pdo_Mysql"
-ca_mgr.db.config.host = "localhost"
-ca_mgr.db.config.username = "ca_mgr"
-ca_mgr.db.config.password = "jsdfhsd47534hsdf7"
-ca_mgr.db.config.dbname = "ca_mgr"
-
-; Application name for logger
-log.application = "web"
-
-[staging : production]
-
-[testing : production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-
-[development : production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
+[production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+includePaths.library = LIBRARY_PATH
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.noViewRenderer = 0
+resources.frontController.noErrorHandler = 0
+resources.frontController.useDefaultControllerAlways = 0
+resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts"
+resources.view[] =
+autoloadernamespaces.0 = "CAcert_"
+
+; Database settings for Session DB
+ca_mgr.db.session.pdo = "Pdo_Mysql"
+ca_mgr.db.session.autocleanup = 1
+ca_mgr.db.session.host = "localhost"
+ca_mgr.db.session.username = "ca_mgr"
+ca_mgr.db.session.password = "jsdfhsd47534hsdf7"
+ca_mgr.db.session.dbname = "ca_mgr"
+
+; Database settings for Auth DB (CACert User Table)
+ca_mgr.db.auth.pdo = "Pdo_Mysql"
+ca_mgr.db.auth.host = "cacert1.it-sls.de"
+ca_mgr.db.auth.username = "ca_mgr"
+ca_mgr.db.auth.password = "6348Jhfge(3457H5Kse"
+ca_mgr.db.auth.dbname = "cacert"
+ca_mgr.db.auth.tablename = "users"
+
+; Database settings for Auth DB (Manager User Table)
+ca_mgr.db.auth2.pdo = "Pdo_Mysql"
+ca_mgr.db.auth2.host = "localhost"
+ca_mgr.db.auth2.username = "ca_mgr"
+ca_mgr.db.auth2.password = "jsdfhsd47534hsdf7"
+ca_mgr.db.auth2.dbname = "ca_mgr"
+ca_mgr.db.auth2.tablename = "system_user"
+
+; Database settings for Config DB (access to system_config and dnssecme data tables)
+ca_mgr.db.config.pdo = "Pdo_Mysql"
+ca_mgr.db.config.host = "localhost"
+ca_mgr.db.config.username = "ca_mgr"
+ca_mgr.db.config.password = "jsdfhsd47534hsdf7"
+ca_mgr.db.config.dbname = "ca_mgr"
+
+; Application name for logger
+log.application = "web"
+
+[staging : production]
+
+[testing : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
diff --git a/manager/application/configs/application.ini.mawatest b/manager/application/configs/application.ini.mawatest
index 61f7d98..a2ebdb1 100644
--- a/manager/application/configs/application.ini.mawatest
+++ b/manager/application/configs/application.ini.mawatest
@@ -1,57 +1,57 @@
-[production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-includePaths.library = LIBRARY_PATH
-bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
-bootstrap.class = "Bootstrap"
-resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
-resources.frontController.noViewRenderer = 0
-resources.frontController.noErrorHandler = 0
-resources.frontController.useDefaultControllerAlways = 0
-resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts"
-resources.view[] =
-autoloadernamespaces.0 = "CAcert_"
-
-; Database settings for Session DB
-ca_mgr.db.session.pdo = "Pdo_Mysql"
-ca_mgr.db.session.autocleanup = 1
-ca_mgr.db.session.host = "localhost"
-ca_mgr.db.session.username = "front_session"
-ca_mgr.db.session.password = "laskdsfzrwethv45"
-ca_mgr.db.session.dbname = "ca_mgr"
-
-; Database settings for Auth DB (CACert User Table)
-ca_mgr.db.auth.pdo = "Pdo_Mysql"
-ca_mgr.db.auth.host = "localhost"
-ca_mgr.db.auth.username = "ca_mgr"
-ca_mgr.db.auth.password = "jsdfhsd47534hsdf7"
-ca_mgr.db.auth.dbname = "cacert"
-ca_mgr.db.auth.tablename = "users"
-
-; Database settings for Auth DB (Manager User Table)
-ca_mgr.db.auth2.pdo = "Pdo_Mysql"
-ca_mgr.db.auth2.host = "localhost"
-ca_mgr.db.auth2.username = "ca_mgr"
-ca_mgr.db.auth2.password = "jsdfhsd47534hsdf7"
-ca_mgr.db.auth2.dbname = "ca_mgr"
-ca_mgr.db.auth2.tablename = "system_user"
-
-; Database settings for Config DB (access to system_config and dnssecme data tables)
-ca_mgr.db.config.pdo = "Pdo_Mysql"
-ca_mgr.db.config.host = "localhost"
-ca_mgr.db.config.username = "ca_mgr"
-ca_mgr.db.config.password = "jsdfhsd47534hsdf7"
-ca_mgr.db.config.dbname = "ca_mgr"
-
-; Application name for logger
-log.application = "web"
-
-[staging : production]
-
-[testing : production]
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-
-[development : production]
-phpSettings.display_startup_errors = 1
+[production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+includePaths.library = LIBRARY_PATH
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.noViewRenderer = 0
+resources.frontController.noErrorHandler = 0
+resources.frontController.useDefaultControllerAlways = 0
+resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts"
+resources.view[] =
+autoloadernamespaces.0 = "CAcert_"
+
+; Database settings for Session DB
+ca_mgr.db.session.pdo = "Pdo_Mysql"
+ca_mgr.db.session.autocleanup = 1
+ca_mgr.db.session.host = "localhost"
+ca_mgr.db.session.username = "front_session"
+ca_mgr.db.session.password = "laskdsfzrwethv45"
+ca_mgr.db.session.dbname = "ca_mgr"
+
+; Database settings for Auth DB (CACert User Table)
+ca_mgr.db.auth.pdo = "Pdo_Mysql"
+ca_mgr.db.auth.host = "localhost"
+ca_mgr.db.auth.username = "ca_mgr"
+ca_mgr.db.auth.password = "jsdfhsd47534hsdf7"
+ca_mgr.db.auth.dbname = "cacert"
+ca_mgr.db.auth.tablename = "users"
+
+; Database settings for Auth DB (Manager User Table)
+ca_mgr.db.auth2.pdo = "Pdo_Mysql"
+ca_mgr.db.auth2.host = "localhost"
+ca_mgr.db.auth2.username = "ca_mgr"
+ca_mgr.db.auth2.password = "jsdfhsd47534hsdf7"
+ca_mgr.db.auth2.dbname = "ca_mgr"
+ca_mgr.db.auth2.tablename = "system_user"
+
+; Database settings for Config DB (access to system_config and dnssecme data tables)
+ca_mgr.db.config.pdo = "Pdo_Mysql"
+ca_mgr.db.config.host = "localhost"
+ca_mgr.db.config.username = "ca_mgr"
+ca_mgr.db.config.password = "jsdfhsd47534hsdf7"
+ca_mgr.db.config.dbname = "ca_mgr"
+
+; Application name for logger
+log.application = "web"
+
+[staging : production]
+
+[testing : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
phpSettings.display_errors = 1 \ No newline at end of file
diff --git a/manager/application/controllers/ErrorController.php b/manager/application/controllers/ErrorController.php
index 806565d..d69e3a3 100644
--- a/manager/application/controllers/ErrorController.php
+++ b/manager/application/controllers/ErrorController.php
@@ -1,35 +1,34 @@
-<?php
-
-class ErrorController extends Zend_Controller_Action
-{
-
- public function errorAction()
- {
- $errors = $this->_getParam('error_handler');
-
- switch ($errors->type) {
- case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
- case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
-
- // 404 error -- controller or action not found
- $this->getResponse()->setHttpResponseCode(404);
- $this->view->message = 'Page not found';
- break;
- default:
- // application error
- $this->getResponse()->setHttpResponseCode(500);
- $this->view->message = 'Application error';
- break;
- }
-
- $this->view->exception = $errors->exception;
- $this->view->request = $errors->request;
-
- Log::Log()->emerg($errors->exception);
- }
-
- public function permissiondeniedAction() {
-
- }
-}
-
+<?php
+
+class ErrorController extends Zend_Controller_Action
+{
+
+ public function errorAction()
+ {
+ $errors = $this->_getParam('error_handler');
+
+ switch ($errors->type) {
+ case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER:
+ case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION:
+
+ // 404 error -- controller or action not found
+ $this->getResponse()->setHttpResponseCode(404);
+ $this->view->message = 'Page not found';
+ break;
+ default:
+ // application error
+ $this->getResponse()->setHttpResponseCode(500);
+ $this->view->message = 'Application error';
+ break;
+ }
+
+ $this->view->exception = $errors->exception;
+ $this->view->request = $errors->request;
+
+ Log::Log()->emerg($errors->exception);
+ }
+
+ public function permissiondeniedAction() {
+
+ }
+}
diff --git a/manager/application/controllers/IndexController.php b/manager/application/controllers/IndexController.php
index 8b185e2..7bfe07e 100644
--- a/manager/application/controllers/IndexController.php
+++ b/manager/application/controllers/IndexController.php
@@ -10,10 +10,10 @@ class IndexController extends Zend_Controller_Action
public function init()
{
/* Initialize action controller here */
- /**
- * get bootstrap, get resource from bootstrap
- * resources are created when an bootstrap _init method returns an object
- $bootstrap = $this->getInvokeArg('bootstrap');
+ /**
+ * get bootstrap, get resource from bootstrap
+ * resources are created when an bootstrap _init method returns an object
+ $bootstrap = $this->getInvokeArg('bootstrap');
$view = $bootstrap->getResource('view');
*/
}
diff --git a/manager/application/controllers/LoginController.php b/manager/application/controllers/LoginController.php
index 784c4b8..e2f39e8 100644
--- a/manager/application/controllers/LoginController.php
+++ b/manager/application/controllers/LoginController.php
@@ -1,284 +1,284 @@
-<?php
-/**
- * @author markus
- * $Id: LoginController.php 75 2010-02-25 14:40:10Z markus $
- */
-
-require_once('helpers/GetEnv.php');
-require_once('config/Config.php');
-
-class LoginController extends Zend_Controller_Action
-{
-
- public function init() {
- /* Initialize action controller here */
- $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
-
- $db = Zend_Db::factory($config->ca_mgr->db->auth->pdo, $config->ca_mgr->db->auth);
- Zend_Registry::set('auth_dbc', $db);
- $db2 = Zend_Db::factory($config->ca_mgr->db->auth2->pdo, $config->ca_mgr->db->auth2);
- Zend_Registry::set('auth2_dbc', $db2);
- }
-
- public function indexAction() {
- $this->view->form = $this->getForm();
- $this->render('index');
- }
-
- public function loginAction() {
- $form = $this->getForm();
- if ($form->isValid($_POST)) {
- $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
-
- $db = Zend_Registry::get('auth_dbc');
- $db2 = Zend_Registry::get('auth2_dbc');
-
- $auth = new Zend_Auth_Adapter_DbTable($db);
-
- $auth->setTableName($config->ca_mgr->db->auth->tablename)
- ->setIdentityColumn('email')
- ->setCredentialColumn('password');
-
- Log::Log()->info(__METHOD__ . ' authenticate ' . $this->getRequest()->getParam('login_name') . ' ' . sha1(utf8_decode($this->getRequest()->getParam('login_password'))));
-
- $auth->setIdentity( $this->getRequest()->getParam('login_name'))
- ->setCredential( sha1(utf8_decode($this->getRequest()->getParam('login_password'))))
- ->setCredentialTreatment('?');
-
- $result = $auth->authenticate();
-
- $code = $result->getCode();
- switch ($code) {
- case Zend_Auth_Result::FAILURE:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE) to log in ' . $this->getRequest()->getParam('login_name'));
- throw new Exception(__METHOD__ . ': unknown error');
- case Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND) to log in ' . $this->getRequest()->getParam('login_name'));
- throw new Exception(__METHOD__ . ': ID unknown');
- case Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS) to log in ' . $this->getRequest()->getParam('login_name'));
- throw new Exception(__METHOD__ . ': ID not unique');
- case Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID) to log in ' . $this->getRequest()->getParam('login_name'));
- throw new Exception(__METHOD__ . ': ID unknown'); // to prevent brute force password attachs
- case Zend_Auth_Result::FAILURE_UNCATEGORIZED:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_UNCATEGORIZED) to log in ' . $this->getRequest()->getParam('login_name'));
- throw new Exception(__METHOD__ . ': unknown error');
- }
-
- $this->getAuthDetailsIntoSession($auth, false);
-
- Log::Log()->info(__METHOD__ . ' user logged in ' . $this->view->session->authdata['authed_username'] .
- ' (' . $this->getRequest()->getParam('login_name') . ')');
-
- #$this->_forward('index', 'index'); // only "soft" forward, we need to change the url in browser
- $this->_redirect($this->view->url(array('controller' => 'index', 'action' => 'index'), 'default', true));
-
- /*
- $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
- $viewRenderer->setRender('loginresult');
- $this->view->request = $this->getRequest();
- */
- }
- else {
- $this->view->form = $form;
- return $this->render('index');
- }
- }
-
- public function crtAction() {
- $ssl_client_s_dn = GetEnv::getEnvVar('SSL_CLIENT_S_DN');
- $ssl_client_i_dn = GetEnv::getEnvVar('SSL_CLIENT_I_DN');
-
- $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
-
- $db = Zend_Registry::get('auth_dbc');
- $db2 = Zend_Registry::get('auth2_dbc');
-
- $auth = new Zend_Auth_Adapter_DbTable($db2);
-
- $auth->setTableName($config->ca_mgr->db->auth2->tablename)
- ->setIdentityColumn('user_client_crt_s_dn_i_dn')
- ->setCredentialColumn('user_client_crt_s_dn_i_dn');
-
- $auth->setIdentity( $ssl_client_s_dn . '//' . $ssl_client_i_dn)
- ->setCredential($ssl_client_s_dn . '//' . $ssl_client_i_dn)
- ->setCredentialTreatment('?');
-
- $result = $auth->authenticate();
-
- $code = $result->getCode();
- switch ($code) {
- case Zend_Auth_Result::FAILURE:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
- throw new Exception(__METHOD__ . ': unknown error');
- case Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
- throw new Exception(__METHOD__ . ': ID unknown');
- case Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
- throw new Exception(__METHOD__ . ': ID not unique');
- case Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
- throw new Exception(__METHOD__ . ': ID unknown'); // to prevent brute force password attachs
- case Zend_Auth_Result::FAILURE_UNCATEGORIZED:
- Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_UNCATEGORIZED) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
- throw new Exception(__METHOD__ . ': unknown error');
- }
-
- $this->getAuthDetailsIntoSession($auth, true);
-
- /*
- $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
- $viewRenderer->setRender('loginresult');
- */
-
- Log::Log()->info(__METHOD__ . ' user logged in ' . $this->view->session->authdata['authed_username'] .
- ' (' . $ssl_client_s_dn . '//' . $ssl_client_i_dn . ')');
-
- #$this->_forward('index', 'index'); // only "soft" forward, we need to change the url in browser
- $this->_redirect($this->view->url(array('controller' => 'index', 'action' => 'index'), 'default', true));
- }
-
- /**
- * get user data from Zend_Auth result and store data in session
- * @param Zend_Auth_Result $auth
- */
- protected function getAuthDetailsIntoSession($auth, $crt) {
- $session = Zend_Registry::get('session');
-
- $db = Zend_Registry::get('auth_dbc');
- $db2 = Zend_Registry::get('auth2_dbc');
-
- /**
- * non existent in our case, look up a 2nd table (ca_mgr.system_user by login name (email)) and
- * get id from there, defaulting to User (1) when no db entry exists
- */
- $auth_res = $auth->getResultRowObject();
-
- if (!isset($auth_res->system_role_id) || $auth_res->system_role_id == 0) {
- $res = $db2->query('select * from system_user where login=?', array($auth_res->email));
- if ($res->rowCount() > 0) {
- $res_ar = $res->fetch();
- $system_roles_id = $res_ar['system_role_id'];
- }
- else {
- // no extra user info in manager database, assume standard user
- $system_roles_id = 1;
- }
- }
- else
- $system_roles_id = $auth_res->system_role_id;
-
- $session->authdata['authed'] = true;
- $session->authdata['authed_id'] = $auth_res->id;
- if (!isset($auth_res->fname) || !isset($auth_res->lname)) {
- $res = $db->query('select * from users where email=?', array($auth_res->login));
- $res_ar = $res->fetch();
- $session->authdata['authed_username'] = 'crt' . $res_ar['login'];
- $session->authdata['authed_fname'] = $res_ar['fname'];
- $session->authdata['authed_lname'] = $res_ar['lname'];
- }
- else {
- $session->authdata['authed_username'] = $auth_res->email;
- $session->authdata['authed_fname'] = $auth_res->fname;
- $session->authdata['authed_lname'] = $auth_res->lname;
- }
- $session->authdata['authed_by_crt'] = $crt;
- $session->authdata['authed_by_cli'] = true;
-
- $res = $db2->query('select * from system_role where id=?', array($system_roles_id));
- $res_ar = $res->fetch();
- $session->authdata['authed_role'] = $res_ar['role'];
-
- $acl = $this->makeAcl($db2);
-
- $session->authdata['authed_permissions'] = $acl;
-
- /* test cases
- Log::Log()->debug(($acl->isAllowed('User', 'Administration', 'view') == true)?'true':'false');
- Log::Log()->debug(($acl->isAllowed('User', 'Administration', 'edit') == true)?'true':'false');
- Log::Log()->debug(($acl->isAllowed('User', 'Account', 'view') == true)?'true':'false');
- Log::Log()->debug(($acl->isAllowed('User', 'Account', 'edit') == true)?'true':'false');
- Log::Log()->debug(($acl->isAllowed('Admin', 'Administration', 'view') == true)?'true':'false');
- Log::Log()->debug(($acl->isAllowed('Admin', 'Account', 'view') == true)?'true':'false');
- */
-
- $this->view->session = $session;
- }
-
- /**
- * build login form and return to requesting method
- * @return Zend_Form
- */
- protected function getForm() {
- $form = new Zend_Form();
- $form->setAction('/login/login')
- ->setMethod('post');
- #$form->setAttrib('id', 'loginform');
- $username = new Zend_Form_Element_Text('login_name');
- $username->setRequired(true)
- ->setLabel(I18n::_('User Name'))
- ->addFilter(new Zend_Filter_StringTrim())
- ->addFilter(new Zend_Filter_StripTags());
- $password = new Zend_Form_Element_Password('login_password');
- $password->setRequired(true)
- ->setLabel(I18n::_('Password'))
- ->addFilter(new Zend_Filter_StringTrim());
- $submit = new Zend_Form_Element_Submit('submit');
- $submit->setLabel(I18n::_('Login'));
- $form->addElement($username)
- ->addElement($password)
- ->addElement($submit);
-
- return $form;
- }
-
- /**
- * get roles and resources from db, build Zend_Acl structure and add permissions
- * @param Zend_Db $db
- */
- protected function makeAcl($db) {
- $acl = new Zend_Acl();
-
- $res = $db->fetchAll('select * from system_role');
- foreach ($res as $obj) {
- if ($obj['inherit_role'] != '') {
- if ($acl->hasRole($obj['inherit_role'])) {
- $acl->addRole(new Zend_Acl_Role($obj['role']), $obj['inherit_role']);
- }
- else {
- /**
- * @todo very simply system to order roles, add role before inherited role
- */
- $res[] = $obj;
- continue;
- }
- }
- else {
- $acl->addRole(new Zend_Acl_Role($obj['role']));
- }
- }
-
- $res = $db->fetchAll('select * from system_resource');
- foreach ($res as $obj) {
- $acl->addResource(new Zend_Acl_Resource($obj['resource']));
- }
-
- $res = $db->fetchAll('select r.role as role, rs.resource as resource, permission, privilege '.
- 'from system_role as r join system_role_has_system_resource as m on ' .
- '(r.id = m.system_role_id) join system_resource as rs on (m.system_resource_id = rs.id)');
-
- foreach ($res as $obj) {
- $privilege = explode(',', $obj['privilege']);
- if ($obj['permission'] == 'allow') {
- $acl->allow($obj['role'], $obj['resource'], $privilege);
- }
- else {
- $acl->deny($obj['role'], $obj['resource'], $privilege);
- }
- }
-
- return $acl;
- }
-}
+<?php
+/**
+ * @author markus
+ * $Id: LoginController.php 75 2010-02-25 14:40:10Z markus $
+ */
+
+require_once('helpers/GetEnv.php');
+require_once('config/Config.php');
+
+class LoginController extends Zend_Controller_Action
+{
+
+ public function init() {
+ /* Initialize action controller here */
+ $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
+
+ $db = Zend_Db::factory($config->ca_mgr->db->auth->pdo, $config->ca_mgr->db->auth);
+ Zend_Registry::set('auth_dbc', $db);
+ $db2 = Zend_Db::factory($config->ca_mgr->db->auth2->pdo, $config->ca_mgr->db->auth2);
+ Zend_Registry::set('auth2_dbc', $db2);
+ }
+
+ public function indexAction() {
+ $this->view->form = $this->getForm();
+ $this->render('index');
+ }
+
+ public function loginAction() {
+ $form = $this->getForm();
+ if ($form->isValid($_POST)) {
+ $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
+
+ $db = Zend_Registry::get('auth_dbc');
+ $db2 = Zend_Registry::get('auth2_dbc');
+
+ $auth = new Zend_Auth_Adapter_DbTable($db);
+
+ $auth->setTableName($config->ca_mgr->db->auth->tablename)
+ ->setIdentityColumn('email')
+ ->setCredentialColumn('password');
+
+ Log::Log()->info(__METHOD__ . ' authenticate ' . $this->getRequest()->getParam('login_name') . ' ' . sha1(utf8_decode($this->getRequest()->getParam('login_password'))));
+
+ $auth->setIdentity( $this->getRequest()->getParam('login_name'))
+ ->setCredential( sha1(utf8_decode($this->getRequest()->getParam('login_password'))))
+ ->setCredentialTreatment('?');
+
+ $result = $auth->authenticate();
+
+ $code = $result->getCode();
+ switch ($code) {
+ case Zend_Auth_Result::FAILURE:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE) to log in ' . $this->getRequest()->getParam('login_name'));
+ throw new Exception(__METHOD__ . ': unknown error');
+ case Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND) to log in ' . $this->getRequest()->getParam('login_name'));
+ throw new Exception(__METHOD__ . ': ID unknown');
+ case Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS) to log in ' . $this->getRequest()->getParam('login_name'));
+ throw new Exception(__METHOD__ . ': ID not unique');
+ case Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID) to log in ' . $this->getRequest()->getParam('login_name'));
+ throw new Exception(__METHOD__ . ': ID unknown'); // to prevent brute force password attachs
+ case Zend_Auth_Result::FAILURE_UNCATEGORIZED:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_UNCATEGORIZED) to log in ' . $this->getRequest()->getParam('login_name'));
+ throw new Exception(__METHOD__ . ': unknown error');
+ }
+
+ $this->getAuthDetailsIntoSession($auth, false);
+
+ Log::Log()->info(__METHOD__ . ' user logged in ' . $this->view->session->authdata['authed_username'] .
+ ' (' . $this->getRequest()->getParam('login_name') . ')');
+
+ #$this->_forward('index', 'index'); // only "soft" forward, we need to change the url in browser
+ $this->_redirect($this->view->url(array('controller' => 'index', 'action' => 'index'), 'default', true));
+
+ /*
+ $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+ $viewRenderer->setRender('loginresult');
+ $this->view->request = $this->getRequest();
+ */
+ }
+ else {
+ $this->view->form = $form;
+ return $this->render('index');
+ }
+ }
+
+ public function crtAction() {
+ $ssl_client_s_dn = GetEnv::getEnvVar('SSL_CLIENT_S_DN');
+ $ssl_client_i_dn = GetEnv::getEnvVar('SSL_CLIENT_I_DN');
+
+ $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
+
+ $db = Zend_Registry::get('auth_dbc');
+ $db2 = Zend_Registry::get('auth2_dbc');
+
+ $auth = new Zend_Auth_Adapter_DbTable($db2);
+
+ $auth->setTableName($config->ca_mgr->db->auth2->tablename)
+ ->setIdentityColumn('user_client_crt_s_dn_i_dn')
+ ->setCredentialColumn('user_client_crt_s_dn_i_dn');
+
+ $auth->setIdentity( $ssl_client_s_dn . '//' . $ssl_client_i_dn)
+ ->setCredential($ssl_client_s_dn . '//' . $ssl_client_i_dn)
+ ->setCredentialTreatment('?');
+
+ $result = $auth->authenticate();
+
+ $code = $result->getCode();
+ switch ($code) {
+ case Zend_Auth_Result::FAILURE:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
+ throw new Exception(__METHOD__ . ': unknown error');
+ case Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
+ throw new Exception(__METHOD__ . ': ID unknown');
+ case Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_IDENTITY_AMBIGUOUS) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
+ throw new Exception(__METHOD__ . ': ID not unique');
+ case Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
+ throw new Exception(__METHOD__ . ': ID unknown'); // to prevent brute force password attachs
+ case Zend_Auth_Result::FAILURE_UNCATEGORIZED:
+ Log::Log()->info(__METHOD__ . ' user failed (Zend_Auth_Result::FAILURE_UNCATEGORIZED) to log in ' . $ssl_client_s_dn . '//' . $ssl_client_i_dn);
+ throw new Exception(__METHOD__ . ': unknown error');
+ }
+
+ $this->getAuthDetailsIntoSession($auth, true);
+
+ /*
+ $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer');
+ $viewRenderer->setRender('loginresult');
+ */
+
+ Log::Log()->info(__METHOD__ . ' user logged in ' . $this->view->session->authdata['authed_username'] .
+ ' (' . $ssl_client_s_dn . '//' . $ssl_client_i_dn . ')');
+
+ #$this->_forward('index', 'index'); // only "soft" forward, we need to change the url in browser
+ $this->_redirect($this->view->url(array('controller' => 'index', 'action' => 'index'), 'default', true));
+ }
+
+ /**
+ * get user data from Zend_Auth result and store data in session
+ * @param Zend_Auth_Result $auth
+ */
+ protected function getAuthDetailsIntoSession($auth, $crt) {
+ $session = Zend_Registry::get('session');
+
+ $db = Zend_Registry::get('auth_dbc');
+ $db2 = Zend_Registry::get('auth2_dbc');
+
+ /**
+ * non existent in our case, look up a 2nd table (ca_mgr.system_user by login name (email)) and
+ * get id from there, defaulting to User (1) when no db entry exists
+ */
+ $auth_res = $auth->getResultRowObject();
+
+ if (!isset($auth_res->system_role_id) || $auth_res->system_role_id == 0) {
+ $res = $db2->query('select * from system_user where login=?', array($auth_res->email));
+ if ($res->rowCount() > 0) {
+ $res_ar = $res->fetch();
+ $system_roles_id = $res_ar['system_role_id'];
+ }
+ else {
+ // no extra user info in manager database, assume standard user
+ $system_roles_id = 1;
+ }
+ }
+ else
+ $system_roles_id = $auth_res->system_role_id;
+
+ $session->authdata['authed'] = true;
+ $session->authdata['authed_id'] = $auth_res->id;
+ if (!isset($auth_res->fname) || !isset($auth_res->lname)) {
+ $res = $db->query('select * from users where email=?', array($auth_res->login));
+ $res_ar = $res->fetch();
+ $session->authdata['authed_username'] = 'crt' . $res_ar['login'];
+ $session->authdata['authed_fname'] = $res_ar['fname'];
+ $session->authdata['authed_lname'] = $res_ar['lname'];
+ }
+ else {
+ $session->authdata['authed_username'] = $auth_res->email;
+ $session->authdata['authed_fname'] = $auth_res->fname;
+ $session->authdata['authed_lname'] = $auth_res->lname;
+ }
+ $session->authdata['authed_by_crt'] = $crt;
+ $session->authdata['authed_by_cli'] = true;
+
+ $res = $db2->query('select * from system_role where id=?', array($system_roles_id));
+ $res_ar = $res->fetch();
+ $session->authdata['authed_role'] = $res_ar['role'];
+
+ $acl = $this->makeAcl($db2);
+
+ $session->authdata['authed_permissions'] = $acl;
+
+ /* test cases
+ Log::Log()->debug(($acl->isAllowed('User', 'Administration', 'view') == true)?'true':'false');
+ Log::Log()->debug(($acl->isAllowed('User', 'Administration', 'edit') == true)?'true':'false');
+ Log::Log()->debug(($acl->isAllowed('User', 'Account', 'view') == true)?'true':'false');
+ Log::Log()->debug(($acl->isAllowed('User', 'Account', 'edit') == true)?'true':'false');
+ Log::Log()->debug(($acl->isAllowed('Admin', 'Administration', 'view') == true)?'true':'false');
+ Log::Log()->debug(($acl->isAllowed('Admin', 'Account', 'view') == true)?'true':'false');
+ */
+
+ $this->view->session = $session;
+ }
+
+ /**
+ * build login form and return to requesting method
+ * @return Zend_Form
+ */
+ protected function getForm() {
+ $form = new Zend_Form();
+ $form->setAction('/login/login')
+ ->setMethod('post');
+ #$form->setAttrib('id', 'loginform');
+ $username = new Zend_Form_Element_Text('login_name');
+ $username->setRequired(true)
+ ->setLabel(I18n::_('User Name'))
+ ->addFilter(new Zend_Filter_StringTrim())
+ ->addFilter(new Zend_Filter_StripTags());
+ $password = new Zend_Form_Element_Password('login_password');
+ $password->setRequired(true)
+ ->setLabel(I18n::_('Password'))
+ ->addFilter(new Zend_Filter_StringTrim());
+ $submit = new Zend_Form_Element_Submit('submit');
+ $submit->setLabel(I18n::_('Login'));
+ $form->addElement($username)
+ ->addElement($password)
+ ->addElement($submit);
+
+ return $form;
+ }
+
+ /**
+ * get roles and resources from db, build Zend_Acl structure and add permissions
+ * @param Zend_Db $db
+ */
+ protected function makeAcl($db) {
+ $acl = new Zend_Acl();
+
+ $res = $db->fetchAll('select * from system_role');
+ foreach ($res as $obj) {
+ if ($obj['inherit_role'] != '') {
+ if ($acl->hasRole($obj['inherit_role'])) {
+ $acl->addRole(new Zend_Acl_Role($obj['role']), $obj['inherit_role']);
+ }
+ else {
+ /**
+ * @todo very simply system to order roles, add role before inherited role
+ */
+ $res[] = $obj;
+ continue;
+ }
+ }
+ else {
+ $acl->addRole(new Zend_Acl_Role($obj['role']));
+ }
+ }
+
+ $res = $db->fetchAll('select * from system_resource');
+ foreach ($res as $obj) {
+ $acl->addResource(new Zend_Acl_Resource($obj['resource']));
+ }
+
+ $res = $db->fetchAll('select r.role as role, rs.resource as resource, permission, privilege '.
+ 'from system_role as r join system_role_has_system_resource as m on ' .
+ '(r.id = m.system_role_id) join system_resource as rs on (m.system_resource_id = rs.id)');
+
+ foreach ($res as $obj) {
+ $privilege = explode(',', $obj['privilege']);
+ if ($obj['permission'] == 'allow') {
+ $acl->allow($obj['role'], $obj['resource'], $privilege);
+ }
+ else {
+ $acl->deny($obj['role'], $obj['resource'], $privilege);
+ }
+ }
+
+ return $acl;
+ }
+}
diff --git a/manager/application/controllers/LogoutController.php b/manager/application/controllers/LogoutController.php
index 83859d4..960ebed 100644
--- a/manager/application/controllers/LogoutController.php
+++ b/manager/application/controllers/LogoutController.php
@@ -1,27 +1,27 @@
-<?php
-/**
- * @author markus
- * $Id: LogoutController.php 12 2009-11-24 13:35:16Z markus $
- */
-
-require_once('helpers/GetEnv.php');
-require_once('config/Config.php');
-
-class LogoutController extends Zend_Controller_Action
-{
-
- public function init() {
- /* Initialize action controller here */
- }
-
- public function indexAction() {
- $session = Zend_Registry::get('session');
-
- Log::Log()->info(__METHOD__ . ' user logged out ' . $this->view->session->authdata['authed_username']);
-
- unset($session->authdata);
- $session->authdata['authed'] = false;
-
- Zend_Session::destroy();
- }
-}
+<?php
+/**
+ * @author markus
+ * $Id: LogoutController.php 12 2009-11-24 13:35:16Z markus $
+ */
+
+require_once('helpers/GetEnv.php');
+require_once('config/Config.php');
+
+class LogoutController extends Zend_Controller_Action
+{
+
+ public function init() {
+ /* Initialize action controller here */
+ }
+
+ public function indexAction() {
+ $session = Zend_Registry::get('session');
+
+ Log::Log()->info(__METHOD__ . ' user logged out ' . $this->view->session->authdata['authed_username']);
+
+ unset($session->authdata);
+ $session->authdata['authed'] = false;
+
+ Zend_Session::destroy();
+ }
+}
diff --git a/manager/application/controllers/MailController.php b/manager/application/controllers/MailController.php
index b48faad..af2fe27 100644
--- a/manager/application/controllers/MailController.php
+++ b/manager/application/controllers/MailController.php
@@ -8,60 +8,60 @@ require_once(LIBRARY_PATH . '/imap/imapConnection.php');
class MailController extends Zend_Controller_Action
{
- /**
- * list of email addresses associated with that account
- * @var array
- */
- private $addresses = array();
+ /**
+ * list of email addresses associated with that account
+ * @var array
+ */
+ private $addresses = array();
public function init()
{
/* Initialize action controller here */
- $session = Zend_Registry::get('session');
- $auth = $session->authdata['authed_permissions'];
-
- $action = $this->getRequest()->getActionName();
-
- $this->view->leftNav('<a href="' .
- $this->view->url(array('controller' => 'mail', 'action' => 'index'), 'default', true) .
- '"' . (($action == 'index')?' class="active"':'') . '>' . I18n::_('View own Mails') . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, 1);
- if ($session->authdata['authed_role'] == 'Admin') {
- $this->view->leftNav('<a href="' .
- $this->view->url(array('controller' => 'mail', 'action' => 'full'), 'default', true) .
- '"' . (($action == 'full')?' class="active"':'') . '>' . I18n::_('View all Mails') . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, 2);
- }
+ $session = Zend_Registry::get('session');
+ $auth = $session->authdata['authed_permissions'];
+
+ $action = $this->getRequest()->getActionName();
+
+ $this->view->leftNav('<a href="' .
+ $this->view->url(array('controller' => 'mail', 'action' => 'index'), 'default', true) .
+ '"' . (($action == 'index')?' class="active"':'') . '>' . I18n::_('View own Mails') . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, 1);
+ if ($session->authdata['authed_role'] == 'Admin') {
+ $this->view->leftNav('<a href="' .
+ $this->view->url(array('controller' => 'mail', 'action' => 'full'), 'default', true) .
+ '"' . (($action == 'full')?' class="active"':'') . '>' . I18n::_('View all Mails') . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, 2);
+ }
- $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
- $db = Zend_Db::factory($config->ca_mgr->db->auth->pdo, $config->ca_mgr->db->auth);
- $emails = new CAcert_User_Emails($db);
+ $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
+ $db = Zend_Db::factory($config->ca_mgr->db->auth->pdo, $config->ca_mgr->db->auth);
+ $emails = new CAcert_User_Emails($db);
- $this->addresses = $emails->getEmailAddressesByLogin($session->authdata['authed_username']);
+ $this->addresses = $emails->getEmailAddressesByLogin($session->authdata['authed_username']);
}
public function indexAction()
{
- $config = Zend_Registry::get('config');
- $session = Zend_Registry::get('session');
+ $config = Zend_Registry::get('config');
+ $session = Zend_Registry::get('session');
- $imap_config = $config->imap;
+ $imap_config = $config->imap;
$imap = imapConnection::getInstance('cacert', $imap_config);
- $imap->imapSwitchMbox('INBOX');
+ $imap->imapSwitchMbox('INBOX');
$ck = $imap->imapCheck();
$headers = array();
for ($i=0; $i < $ck->Nmsgs; $i++) {
- $header = $imap->imapHeader($i+1);
+ $header = $imap->imapHeader($i+1);
- // skip all emails that do not belong to the user
- if (!in_array($header->toaddress, $this->addresses))
- continue;
+ // skip all emails that do not belong to the user
+ if (!in_array($header->toaddress, $this->addresses))
+ continue;
- $header->uid = $imap->imapUID($i+1);
- $header->detailslink = $this->view->url(array('controller' => 'mail', 'action' => 'read', 'uid' => $header->uid), 'default', true);
- $header->deletelink = $this->view->url(array('controller' => 'mail', 'action' => 'delete', 'uid' => $header->uid), 'default', true);
- $headers[] = $header;
+ $header->uid = $imap->imapUID($i+1);
+ $header->detailslink = $this->view->url(array('controller' => 'mail', 'action' => 'read', 'uid' => $header->uid), 'default', true);
+ $header->deletelink = $this->view->url(array('controller' => 'mail', 'action' => 'delete', 'uid' => $header->uid), 'default', true);
+ $headers[] = $header;
}
$this->view->headers = $headers;
@@ -69,21 +69,21 @@ class MailController extends Zend_Controller_Action
public function fullAction()
{
- $config = Zend_Registry::get('config');
+ $config = Zend_Registry::get('config');
- $imap_config = $config->imap;
+ $imap_config = $config->imap;
$imap = imapConnection::getInstance('cacert', $imap_config);
- $imap->imapSwitchMbox('INBOX');
+ $imap->imapSwitchMbox('INBOX');
$ck = $imap->imapCheck();
$headers = array();
for ($i=0; $i < $ck->Nmsgs; $i++) {
- $header = $imap->imapHeader($i+1);
- $header->uid = $imap->imapUID($i+1);
- $header->detailslink = $this->view->url(array('controller' => 'mail', 'action' => 'read', 'uid' => $header->uid), 'default', true);
- $header->deletelink = $this->view->url(array('controller' => 'mail', 'action' => 'delete', 'uid' => $header->uid), 'default', true);
- $headers[] = $header;
+ $header = $imap->imapHeader($i+1);
+ $header->uid = $imap->imapUID($i+1);
+ $header->detailslink = $this->view->url(array('controller' => 'mail', 'action' => 'read', 'uid' => $header->uid), 'default', true);
+ $header->deletelink = $this->view->url(array('controller' => 'mail', 'action' => 'delete', 'uid' => $header->uid), 'default', true);
+ $headers[] = $header;
}
$this->view->headers = $headers;
@@ -91,50 +91,50 @@ class MailController extends Zend_Controller_Action
public function readAction()
{
- $config = Zend_Registry::get('config');
- $imap_config = $config->imap;
+ $config = Zend_Registry::get('config');
+ $imap_config = $config->imap;
$imap = imapConnection::getInstance('cacert', $imap_config);
- $imap->imapSwitchMbox('INBOX');
+ $imap->imapSwitchMbox('INBOX');
- $uid = $this->getRequest()->getParam('uid');
+ $uid = $this->getRequest()->getParam('uid');
- $body = $imap->imapBodyByUID($uid);
+ $body = $imap->imapBodyByUID($uid);
- $this->view->mail_body = $body;
+ $this->view->mail_body = $body;
}
/**
* delete message with unique id
*/
- public function deleteAction()
+ public function deleteAction()
{
- $config = Zend_Registry::get('config');
- $uid = $this->getRequest()->getParam('uid', -1);
- $this->view->returnto = $_SERVER['HTTP_REFERER'];
-
- if ($uid == -1) {
- $this->view->message = I18n::_('You did not select an email for deletion');
- }
- elseif ($this->view->returnto == '') {
- $this->view->message = I18n::_('Please use the delete icons in the mail inventory to delete mails');
- }
- else {
- $imap_config = $config->imap;
- $imap = imapConnection::getInstance('cacert', $imap_config);
- $imap->imapSwitchMbox('INBOX');
-
- $header = $imap->imapFetchOverview($uid);
-
- $session = Zend_Registry::get('session');
-
- if ($session->authdata['authed_role'] != 'Admin' && !in_array($header->to, $this->addresses)) {
- $this->view->message = I18n::_('This message does not belong to you');
- }
- else {
- $imap->imapDelete($uid);
- $imap->imapExpunge();
- $this->view->message = I18n::_('Message deleted');
- }
- }
+ $config = Zend_Registry::get('config');
+ $uid = $this->getRequest()->getParam('uid', -1);
+ $this->view->returnto = $_SERVER['HTTP_REFERER'];
+
+ if ($uid == -1) {
+ $this->view->message = I18n::_('You did not select an email for deletion');
+ }
+ elseif ($this->view->returnto == '') {
+ $this->view->message = I18n::_('Please use the delete icons in the mail inventory to delete mails');
+ }
+ else {
+ $imap_config = $config->imap;
+ $imap = imapConnection::getInstance('cacert', $imap_config);
+ $imap->imapSwitchMbox('INBOX');
+
+ $header = $imap->imapFetchOverview($uid);
+
+ $session = Zend_Registry::get('session');
+
+ if ($session->authdata['authed_role'] != 'Admin' && !in_array($header->to, $this->addresses)) {
+ $this->view->message = I18n::_('This message does not belong to you');
+ }
+ else {
+ $imap->imapDelete($uid);
+ $imap->imapExpunge();
+ $this->view->message = I18n::_('Message deleted');
+ }
+ }
}
}
diff --git a/manager/application/controllers/ManageAccountController.php b/manager/application/controllers/ManageAccountController.php
index 1bf9700..e2e4a5a 100644
--- a/manager/application/controllers/ManageAccountController.php
+++ b/manager/application/controllers/ManageAccountController.php
@@ -8,12 +8,12 @@ class ManageAccountController extends Zend_Controller_Action
const MAX_POINTS_PER_ASSURANCE = 35;
const MAX_POINTS_TOTAL = 150;
const ADMIN_INCREASE_FRAGMENT_SIZE = 2;
-
+
// Value used in the database to identify a admin increase
const ADMIN_INCREASE_METHOD = 'Administrative Increase';
-
+
protected $db;
-
+
public function init()
{
$config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini',
@@ -21,7 +21,7 @@ class ManageAccountController extends Zend_Controller_Action
$this->db = Zend_Db::factory($config->ca_mgr->db->auth->pdo,
$config->ca_mgr->db->auth);
-
+
// Build the left navigation
$actions = array();
$actions['assurance'] = I18n::_('Automated Assurance');
@@ -35,16 +35,16 @@ class ManageAccountController extends Zend_Controller_Action
$link = '<a href="'.$this->view->url($url, 'default', true).'">'.
$label . '</a>';
$this->view->leftNav($link);
- }
-
+ }
+
}
-
+
public function indexAction()
{
// Just render the view
return;
}
-
+
public function assuranceAction()
{
// Validate form
@@ -53,13 +53,13 @@ class ManageAccountController extends Zend_Controller_Action
$this->view->assurance_form = $form;
return $this->render('assuranceform');
}
-
+
// Form is valid -> get values for processing
$values = $form->getValues();
-
+
// Get the current user
$user = Default_Model_User::findCurrentUser();
-
+
$this->view->assurancesDone = array();
$quantity = $values['quantity'];
do {
@@ -71,56 +71,56 @@ class ManageAccountController extends Zend_Controller_Action
$points = $quantity;
$quantity = 0;
}
-
+
// Get the assurer for this assurance
$issued = $user->findNewAssurer()
->assure($user, $points, $values['location'], $values['date']);
-
+
$this->view->assurancesDone[] = $issued;
} while ($quantity > 0);
-
+
return;
}
-
+
public function batchAssuranceAction() {
- // Validate form
+ // Validate form
$form = $this->getBatchAssuranceForm();
if (!$this->getRequest()->isPost() || !$form->isValid($_POST)) {
$this->view->batch_assurance_form = $form;
return $this->render('batch-assurance-form');
}
-
+
// Form is valid -> get values for processing
$values = $form->getValues();
-
+
$user = Default_Model_User::findCurrentUser();
-
+
$location = $values['location'];
$date = $values['date'];
-
+
$this->view->assurances = array();
-
+
for ($i = 0; $i < intval($values['quantity']); $i++) {
$assuree = $user->findNewAssuree();
-
+
if ($values['percentage'] === 'percentage') {
$points = ($user->maxpoints() * intval($values['points'])) /100;
}elseif ($values['percentage'] === 'absolute') {
$points = intval($values['points']);
}
-
+
$user->assure($assuree, $points, $location, $date);
-
+
$this->view->assurances[] = array(
'assuree'=>$assuree->getPrimEmail(),
'points'=>$points,
'location'=>$location,
'date'=>$date);
}
-
+
return;
}
-
+
public function adminIncreaseAction()
{
// Validate form
@@ -129,16 +129,16 @@ class ManageAccountController extends Zend_Controller_Action
$this->view->admin_increase_form = $form;
return $this->render('admin-increase-form');
}
-
+
// Form is valid -> get values for processing
$values = $form->getValues();
-
+
// Get current user
$user = Default_Model_User::findCurrentUser();
-
+
$this->view->adminIncreasesDone = array();
$points = $values['points'];
-
+
// Only assign points within the limit if unlimited flag is not set
if ($values['unlimited'] != '1') {
if ($user->getPoints() >= self::MAX_POINTS_TOTAL) {
@@ -148,14 +148,14 @@ class ManageAccountController extends Zend_Controller_Action
$points = self::MAX_POINTS_TOTAL - $user->getPoints();
}
}
-
+
$user->adminIncrease($points, $values['location'], $values['date']);
$this->view->adminIncreasesDone[] = $points;
-
+
return;
}
-
-
+
+
public function assurerChallengeAction()
{
// Validate form
@@ -164,27 +164,27 @@ class ManageAccountController extends Zend_Controller_Action
$this->view->assurer_challenge_form = $form;
return $this->render('assurer-challenge-form');
}
-
+
// Form is valid -> get values for processing
$values = $form->getValues();
-
+
// Get user data
$user = Default_Model_User::findCurrentUser();
-
+
$user->assignChallenge(1, $values['variant']);
}
-
+
public function flagsAction()
{
$user = Default_Model_User::findCurrentUser();
-
+
// Validate form
$form = $this->getFlagsForm($user);
$this->view->flags_form = $form;
if (!$this->getRequest()->isPost() || !$form->isValid($_POST)) {
return;
}
-
+
$flags = $user->getFlags();
foreach ($flags as $flag => $value) {
$element = $form->getElement($flag);
@@ -192,48 +192,48 @@ class ManageAccountController extends Zend_Controller_Action
$flags[$flag] = $element->isChecked();
}
}
-
+
$user->setFlags($flags);
return;
}
-
+
protected function getAssuranceForm()
{
$form = new Zend_Form();
$form->setAction('/manage-account/assurance')->setMethod('post');
-
+
$quantity = new Zend_Form_Element_Text('quantity');
$quantity->setRequired(true)
->setLabel(I18n::_('Number of Points'))
->addFilter(new Zend_Filter_Int())
->addValidator(new Zend_Validate_Between(0, 100));
$form->addElement($quantity);
-
+
$location = new Zend_Form_Element_Text('location');
$location->setRequired(true)
->setLabel(I18n::_('Location'))
->setValue(I18n::_('CAcert Test Manager'))
->addValidator(new Zend_Validate_StringLength(1,255));
$form->addElement($location);
-
+
$date = new Zend_Form_Element_Text('date');
$date->setRequired(true)
->setLabel(I18n::_('Date of Assurance'))
->setValue(date('Y-m-d H:i:s'))
->addValidator(new Zend_Validate_StringLength(1,255));
$form->addElement($date);
-
+
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(I18n::_('Assure Me'));
$form->addElement($submit);
-
+
return $form;
}
-
+
protected function getBatchAssuranceForm() {
- $form = new Zend_Form();
+ $form = new Zend_Form();
$form->setAction('/manage-account/batch-assurance')->setMethod('post');
-
+
$quantity = new Zend_Form_Element_Text('quantity');
$quantity->setRequired(true)
->setLabel(I18n::_('Number of Assurances'))
@@ -241,17 +241,17 @@ class ManageAccountController extends Zend_Controller_Action
->addFilter(new Zend_Filter_Int())
->addValidator(new Zend_Validate_Between(0, 100));
$form->addElement($quantity);
-
+
$percentage = new Zend_Form_Element_Select('percentage');
$percentage->setRequired(true)
->setLabel(I18n::_('Are the points specified absolute?'))
->setValue('percentage')
->setMultiOptions(array(
- 'percentage' => I18n::_('Percentage'),
+ 'percentage' => I18n::_('Percentage'),
'absolute' => I18n::_('Absolute'),
));
$form->addElement($percentage);
-
+
$points = new Zend_Form_Element_Text('points');
$points->setRequired(true)
->setLabel(I18n::_('Points per Assurance'))
@@ -259,73 +259,73 @@ class ManageAccountController extends Zend_Controller_Action
->addFilter(new Zend_Filter_Int())
->addValidator(new Zend_Validate_Between(0, 100));
$form->addElement($points);
-
+
$location = new Zend_Form_Element_Text('location');
$location->setRequired(true)
->setLabel(I18n::_('Location'))
->setValue(I18n::_('CAcert Test Manager Batch Assurance'))
->addValidator(new Zend_Validate_StringLength(1,255));
$form->addElement($location);
-
+
$date = new Zend_Form_Element_Text('date');
$date->setRequired(true)
->setLabel(I18n::_('Date of Assurance'))
->setValue(date('Y-m-d H:i:s'))
->addValidator(new Zend_Validate_StringLength(1,255));
$form->addElement($date);
-
+
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(I18n::_('Make Batch Assurance'));
$form->addElement($submit);
-
+
return $form;
}
-
+
protected function getAdminIncreaseForm()
{
$form = new Zend_Form();
$form->setAction('/manage-account/admin-increase')->setMethod('post');
-
+
$points = new Zend_Form_Element_Text('points');
$points->setRequired(true)
->setLabel(I18n::_('Number of Points'))
->addFilter(new Zend_Filter_Int())
->addValidator(new Zend_Validate_GreaterThan(0));
$form->addElement($points);
-
+
$unlimited = new Zend_Form_Element_Checkbox('unlimited');
$unlimited->setLabel(I18n::_('Assign Points even if the Limit of 150 '.
'is exceeded'))
->setChecked(false);
$form->addElement($unlimited);
-
+
$location = new Zend_Form_Element_Text('location');
$location->setRequired(true)
->setLabel(I18n::_('Location'))
->setValue(I18n::_('CAcert Test Manager'))
->addValidator(new Zend_Validate_StringLength(1,255));
$form->addElement($location);
-
+
$date = new Zend_Form_Element_Text('date');
$date->setRequired(true)
->setLabel(I18n::_('Date of Increase'))
->setValue(date('Y-m-d H:i:s'))
->addValidator(new Zend_Validate_StringLength(1,255));
$form->addElement($date);
-
+
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(I18n::_('Give Me Points'));
$form->addElement($submit);
-
+
return $form;
}
-
+
protected function getAssurerChallengeForm()
{
$form = new Zend_Form();
$form->setAction('/manage-account/assurer-challenge')
->setMethod('post');
-
+
$variant = new Zend_Form_Element_Select('variant');
$variant->setLabel(I18n::_('Variant'));
$options =
@@ -333,22 +333,22 @@ class ManageAccountController extends Zend_Controller_Action
$variant->setMultiOptions($options)
->setRequired(true);
$form->addElement($variant);
-
+
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(I18n::_('Challenge Me'));
$form->addElement($submit);
-
+
return $form;
}
-
+
protected function getFlagsForm(Default_Model_User $user)
{
$form = new Zend_Form();
$form->setAction('/manage-account/flags')
->setMethod('post');
-
+
$flags = $user->getFlags();
-
+
// Add a checkbox for each flag
$labels = array();
$labels['admin'] = I18n::_('Support Engineer');
@@ -360,18 +360,18 @@ class ManageAccountController extends Zend_Controller_Action
$labels['tverify'] = I18n::_('TVerify');
$labels['locked'] = I18n::_('Lock Account');
$labels['assurer_blocked'] = I18n::_('Block Assurer');
-
+
foreach ($labels as $flag => $label) {
$checkbox = new Zend_Form_Element_Checkbox($flag);
$checkbox->setLabel($label)
->setChecked($flags[$flag]);
$form->addElement($checkbox);
}
-
+
$submit = new Zend_Form_Element_Submit('submit');
$submit->setLabel(I18n::_('Save Flags'));
$form->addElement($submit);
-
+
return $form;
}
}
diff --git a/manager/application/layouts/scripts/layout.phtml b/manager/application/layouts/scripts/layout.phtml
index 44f59cf..817815a 100644
--- a/manager/application/layouts/scripts/layout.phtml
+++ b/manager/application/layouts/scripts/layout.phtml
@@ -1,32 +1,32 @@
-<?php
-// application/layouts/scripts/layout.phtml
-
-print $this->doctype(); ?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><?php print $this->headTitle; ?></title>
- <?php print $this->headLink()->prependStylesheet('/css/global.css'); ?>
- <?php print $this->headScript()->appendFile('/js/positionUserInfo.js'); // ->appendFile('/js/center.js'); ?>
-</head>
-<body>
- <div id="center">
- <div id="header">
- <div id="header-logo">
- <img src="/img/cacert4.png" border="0" alt="CACert Logo" width="100px" height="30px">
- </div>
- <div id="header-navigation">
- <?php print $this->topNav(); ?>
- </div>
- </div>
-
- <div id="left-navigation">
- <?php print $this->leftNav(); ?>
- </div>
- <div id="content">
- <?php print $this->layout()->content; ?>
- </div>
- </div>
- <? print $this->userInfo(); ?>
-</body>
+<?php
+// application/layouts/scripts/layout.phtml
+
+print $this->doctype(); ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title><?php print $this->headTitle; ?></title>
+ <?php print $this->headLink()->prependStylesheet('/css/global.css'); ?>
+ <?php print $this->headScript()->appendFile('/js/positionUserInfo.js'); // ->appendFile('/js/center.js'); ?>
+</head>
+<body>
+ <div id="center">
+ <div id="header">
+ <div id="header-logo">
+ <img src="/img/cacert4.png" border="0" alt="CACert Logo" width="100px" height="30px">
+ </div>
+ <div id="header-navigation">
+ <?php print $this->topNav(); ?>
+ </div>
+ </div>
+
+ <div id="left-navigation">
+ <?php print $this->leftNav(); ?>
+ </div>
+ <div id="content">
+ <?php print $this->layout()->content; ?>
+ </div>
+ </div>
+ <? print $this->userInfo(); ?>
+</body>
</html> \ No newline at end of file
diff --git a/manager/application/models/User.php b/manager/application/models/User.php
index 7bbe090..d03ce75 100644
--- a/manager/application/models/User.php
+++ b/manager/application/models/User.php
@@ -133,7 +133,7 @@ class Default_Model_User {
* Get points of the user
*
* @return int
- * The amount of points the user has
+ * The amount of points the user has
*/
public function getPoints()
{
@@ -238,8 +238,8 @@ class Default_Model_User {
* @throws Exception
*
* @return int
- * The amount of points that have been issued (might be less than
- * $points)
+ * The amount of points that have been issued (might be less than
+ * $points)
*/
public function assure(Default_Model_User $assuree, $points, $location, $date) {
// Sanitize inputs
@@ -373,7 +373,7 @@ class Default_Model_User {
* Get the challenge types that are available in the database
*
* @param $db Zend_Db_Adapter_Abstract
- * The database connection to use
+ * The database connection to use
*
* @return array(int => string)
*/
@@ -388,7 +388,7 @@ class Default_Model_User {
* database
*
* @param $db Zend_Db_Adapter_Abstract
- * The database connection to use
+ * The database connection to use
* @param $type int
* The type of challenge you want to get the variants of
*
@@ -406,10 +406,10 @@ class Default_Model_User {
* Assign the challenge to the user
*
* @param $type int
- * The type of the challenge, has to be one of the keys returned by
+ * The type of the challenge, has to be one of the keys returned by
* getAvailableChallengeTypes()
* @param $variant int
- * The variant of the challenge, has to be one of the keys returned by
+ * The variant of the challenge, has to be one of the keys returned by
* getAvailableChallengeVariants()
* @param $date Zend_Date
* The date the challenge was passed, defaults to current time
@@ -467,7 +467,7 @@ class Default_Model_User {
* getFlags() first
*
* @param $flags array (string => boolean)
- * Currently unknown flags are silently ignored
+ * Currently unknown flags are silently ignored
*/
public function setFlags(array $flags) {
$newflags = array();
diff --git a/manager/application/views/helpers/LeftNav.php b/manager/application/views/helpers/LeftNav.php
index 01d31e5..9d8c2e2 100644
--- a/manager/application/views/helpers/LeftNav.php
+++ b/manager/application/views/helpers/LeftNav.php
@@ -1,96 +1,96 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_View
- * @subpackage Helper
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @version $Id: LeftNav.php 8 2009-11-24 10:32:47Z markus $
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Helper for building an applications top navigation bar
- *
- * @uses Zend_View_Helper_Placeholder_Container_Standalone
- * @package Zend_View
- * @subpackage Helper
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Zend_View_Helper_LeftNav extends Zend_View_Helper_Placeholder_Container_Standalone
-{
- /**
- * Registry key for placeholder
- * @var string
- */
- protected $_regKey = 'Zend_View_Helper_LeftNav';
-
- protected $items = array();
-
- /**
- * Retrieve placeholder for navigation element and optionally set state
- *
- * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
- *
- * @param string $link
- * @param string $setType
- * @param string $setPos
- * @return Zend_View_Helper_LeftNav
- */
- public function leftNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
- {
- $link = (string) $link;
- if ($link !== '') {
- if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
- if ($setPos != 0)
- $this->items[$setPos] = $link;
- else
- $this->items[] = $link;
- } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
- $this->items = array_merge(array($link), $this->items);
- } else {
- $this->items[] = $link;
- }
- }
-
- return $this;
- }
-
- /**
- * Turn helper into string
- *
- * @param string|null $indent
- * @param string|null $locale
- * @return string
- */
- public function toString($indent = null, $locale = null)
- {
- $output = '';
- $indent = (null !== $indent)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
-
- $output .= $indent . "<ul>\n";
- foreach ($this->items as $item) {
- $output .= $indent . "<li>" . $item . "</li>\n";
- }
- $output .= $indent . "</ul>\n";
-
- return $output;
- }
-}
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_View
+ * @subpackage Helper
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version $Id: LeftNav.php 8 2009-11-24 10:32:47Z markus $
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for building an applications top navigation bar
+ *
+ * @uses Zend_View_Helper_Placeholder_Container_Standalone
+ * @package Zend_View
+ * @subpackage Helper
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_View_Helper_LeftNav extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+ /**
+ * Registry key for placeholder
+ * @var string
+ */
+ protected $_regKey = 'Zend_View_Helper_LeftNav';
+
+ protected $items = array();
+
+ /**
+ * Retrieve placeholder for navigation element and optionally set state
+ *
+ * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
+ *
+ * @param string $link
+ * @param string $setType
+ * @param string $setPos
+ * @return Zend_View_Helper_LeftNav
+ */
+ public function leftNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
+ {
+ $link = (string) $link;
+ if ($link !== '') {
+ if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
+ if ($setPos != 0)
+ $this->items[$setPos] = $link;
+ else
+ $this->items[] = $link;
+ } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
+ $this->items = array_merge(array($link), $this->items);
+ } else {
+ $this->items[] = $link;
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Turn helper into string
+ *
+ * @param string|null $indent
+ * @param string|null $locale
+ * @return string
+ */
+ public function toString($indent = null, $locale = null)
+ {
+ $output = '';
+ $indent = (null !== $indent)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
+
+ $output .= $indent . "<ul>\n";
+ foreach ($this->items as $item) {
+ $output .= $indent . "<li>" . $item . "</li>\n";
+ }
+ $output .= $indent . "</ul>\n";
+
+ return $output;
+ }
+}
diff --git a/manager/application/views/helpers/TopNav.php b/manager/application/views/helpers/TopNav.php
index 151b03f..2cc2151 100644
--- a/manager/application/views/helpers/TopNav.php
+++ b/manager/application/views/helpers/TopNav.php
@@ -1,99 +1,99 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_View
- * @subpackage Helper
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @version $Id: TopNav.php 20 2009-12-01 14:26:22Z markus $
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Helper for building an applications top navigation bar
- *
- * @uses Zend_View_Helper_Placeholder_Container_Standalone
- * @package Zend_View
- * @subpackage Helper
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Standalone
-{
- /**
- * Registry key for placeholder
- * @var string
- */
- protected $_regKey = 'Zend_View_Helper_TopNav';
-
- protected $items = array();
-
- /**
- * Retrieve placeholder for navigation element and optionally set state
- *
- * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
- *
- * @param string $link
- * @param string $setType
- * @param string $setPos
- * @return Zend_View_Helper_TopNav
- */
- public function topNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
- {
- $link = (string) $link;
- if ($link !== '') {
- if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
- if ($setPos != 0)
- $this->items[$setPos] = $link;
- else
- $this->items[] = $link;
- } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
- $this->items = array_merge(array($link), $this->items);
- } else {
- $this->items[] = $link;
- }
- }
-
- return $this;
- }
-
- /**
- * Turn helper into string
- *
- * @param string|null $indent
- * @param string|null $locale
- * @return string
- */
- public function toString($indent = null, $locale = null)
- {
- $output = '';
- $indent = (null !== $indent)
- ? $this->getWhitespace($indent)
- : $this->getIndent();
-
- ksort($this->items);
-
- $output .= $indent . "<ul>\n";
-
- foreach ($this->items as $item) {
- $output .= $indent . "<li>" . $item . "</li>\n";
- }
- $output .= $indent . "</ul>\n";
-
- return $output;
- }
-}
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_View
+ * @subpackage Helper
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version $Id: TopNav.php 20 2009-12-01 14:26:22Z markus $
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for building an applications top navigation bar
+ *
+ * @uses Zend_View_Helper_Placeholder_Container_Standalone
+ * @package Zend_View
+ * @subpackage Helper
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_View_Helper_TopNav extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+ /**
+ * Registry key for placeholder
+ * @var string
+ */
+ protected $_regKey = 'Zend_View_Helper_TopNav';
+
+ protected $items = array();
+
+ /**
+ * Retrieve placeholder for navigation element and optionally set state
+ *
+ * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
+ *
+ * @param string $link
+ * @param string $setType
+ * @param string $setPos
+ * @return Zend_View_Helper_TopNav
+ */
+ public function topNav($link = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
+ {
+ $link = (string) $link;
+ if ($link !== '') {
+ if ($setType == Zend_View_Helper_Placeholder_Container_Abstract::SET) {
+ if ($setPos != 0)
+ $this->items[$setPos] = $link;
+ else
+ $this->items[] = $link;
+ } elseif ($setType == Zend_View_Helper_Placeholder_Container_Abstract::PREPEND) {
+ $this->items = array_merge(array($link), $this->items);
+ } else {
+ $this->items[] = $link;
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * Turn helper into string
+ *
+ * @param string|null $indent
+ * @param string|null $locale
+ * @return string
+ */
+ public function toString($indent = null, $locale = null)
+ {
+ $output = '';
+ $indent = (null !== $indent)
+ ? $this->getWhitespace($indent)
+ : $this->getIndent();
+
+ ksort($this->items);
+
+ $output .= $indent . "<ul>\n";
+
+ foreach ($this->items as $item) {
+ $output .= $indent . "<li>" . $item . "</li>\n";
+ }
+ $output .= $indent . "</ul>\n";
+
+ return $output;
+ }
+}
diff --git a/manager/application/views/helpers/UserInfo.php b/manager/application/views/helpers/UserInfo.php
index 5ec31ed..bf98f1b 100644
--- a/manager/application/views/helpers/UserInfo.php
+++ b/manager/application/views/helpers/UserInfo.php
@@ -1,95 +1,95 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_View
- * @subpackage Helper
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @version $Id: UserInfo.php 33 2009-12-10 15:08:38Z markus $
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-/** Zend_View_Helper_Placeholder_Container_Standalone */
-require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
-
-/**
- * Helper for displaying an user info div somewhere
- *
- * @uses Zend_View_Helper_Placeholder_Container_Standalone
- * @package Zend_View
- * @subpackage Helper
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_Standalone
-{
- /**
- * Registry key for placeholder
- * @var string
- */
- protected $_regKey = 'Zend_View_Helper_UserInfo';
-
- private $items = array();
-
- /**
- * Retrieve placeholder for navigation element and optionally set state
- *
- * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
- *
- * @param array $data
- * @return Zend_View_Helper_UserData
- */
- public function UserInfo($ar = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
- {
- if ($ar !== null && is_array($ar)) {
- $this->items = $ar;
- }
- return $this;
- }
-
- /**
- * Turn helper into string
- *
- * @param string|null $indent
- * @param string|null $locale
- * @return string
- */
- public function toString($indent = null, $locale = null)
- {
- $session = Zend_Registry::get('session');
- $this->items = $session->authdata;
-
- $output = '';
-
- if ($session->authdata['authed'] !== true)
- return $output;
-
-# $indent = (null !== $indent)
-# ? $this->getWhitespace($indent)
-# : $this->getIndent();
- $indent = '';
-
- $output .= $indent . "<div id=\"userinfo\">\n";
- $output .= $indent . "\tUser: " . $this->items['authed_username'] . "<br>\n";
- $output .= $indent . "\tName: " . $this->items['authed_fname'] . ' ' . $this->items['authed_lname'] . "<br>\n";
- $output .= $indent . "\tRole: " . $this->items['authed_role'] . "<br>\n";
- if ($this->items['authed_by_crt'] === true)
- $output .= $indent . "\tLoginmethod: CRT<br>\n";
- else
- $output .= $indent . "\tLoginmethod: PASSWD<br>\n";
- $output .= $indent . "</div>\n";
-
- return $output;
- }
-}
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_View
+ * @subpackage Helper
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version $Id: UserInfo.php 33 2009-12-10 15:08:38Z markus $
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/** Zend_View_Helper_Placeholder_Container_Standalone */
+require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
+
+/**
+ * Helper for displaying an user info div somewhere
+ *
+ * @uses Zend_View_Helper_Placeholder_Container_Standalone
+ * @package Zend_View
+ * @subpackage Helper
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_Standalone
+{
+ /**
+ * Registry key for placeholder
+ * @var string
+ */
+ protected $_regKey = 'Zend_View_Helper_UserInfo';
+
+ private $items = array();
+
+ /**
+ * Retrieve placeholder for navigation element and optionally set state
+ *
+ * Single Link elements to be made with $this->url(array('controller'=>'<controller>'), 'default', true);
+ *
+ * @param array $data
+ * @return Zend_View_Helper_UserData
+ */
+ public function UserInfo($ar = null, $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $setPos = 0)
+ {
+ if ($ar !== null && is_array($ar)) {
+ $this->items = $ar;
+ }
+ return $this;
+ }
+
+ /**
+ * Turn helper into string
+ *
+ * @param string|null $indent
+ * @param string|null $locale
+ * @return string
+ */
+ public function toString($indent = null, $locale = null)
+ {
+ $session = Zend_Registry::get('session');
+ $this->items = $session->authdata;
+
+ $output = '';
+
+ if ($session->authdata['authed'] !== true)
+ return $output;
+
+# $indent = (null !== $indent)
+# ? $this->getWhitespace($indent)
+# : $this->getIndent();
+ $indent = '';
+
+ $output .= $indent . "<div id=\"userinfo\">\n";
+ $output .= $indent . "\tUser: " . $this->items['authed_username'] . "<br>\n";
+ $output .= $indent . "\tName: " . $this->items['authed_fname'] . ' ' . $this->items['authed_lname'] . "<br>\n";
+ $output .= $indent . "\tRole: " . $this->items['authed_role'] . "<br>\n";
+ if ($this->items['authed_by_crt'] === true)
+ $output .= $indent . "\tLoginmethod: CRT<br>\n";
+ else
+ $output .= $indent . "\tLoginmethod: PASSWD<br>\n";
+ $output .= $indent . "</div>\n";
+
+ return $output;
+ }
+}
diff --git a/manager/application/views/scripts/index/index.phtml b/manager/application/views/scripts/index/index.phtml
index 58c9dc9..480afca 100644
--- a/manager/application/views/scripts/index/index.phtml
+++ b/manager/application/views/scripts/index/index.phtml
@@ -1,7 +1,7 @@
-<?php
-/**
- * @author markus
- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
- */
-?>
-<H1><?php print I18n::_('Dashboard'); ?></H1>
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+?>
+<H1><?php print I18n::_('Dashboard'); ?></H1>
diff --git a/manager/application/views/scripts/login/index.phtml b/manager/application/views/scripts/login/index.phtml
index 57f49ea..a7bceaa 100644
--- a/manager/application/views/scripts/login/index.phtml
+++ b/manager/application/views/scripts/login/index.phtml
@@ -1,16 +1,16 @@
-<?php
-/**
- * @author markus
- * $Id: index.phtml 36 2009-12-15 15:49:57Z markus $
- */
-
-// $this->headScript()->appendFile('js/1st.js');
-// $this->headScript()->appendFile('js/2nd.js');
-$this->headLink()->appendStylesheet('/css/login.css');
-
-$this->headLink()->appendStylesheet('/css/form_dl.css');
-?>
-
-<H1><?php print I18n::_('Please log in'); ?></H1>
-<?php print $this->form;?>
-<a href='/login/crt'><?php print I18n::_('Client Cert Login'); ?></a> \ No newline at end of file
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 36 2009-12-15 15:49:57Z markus $
+ */
+
+// $this->headScript()->appendFile('js/1st.js');
+// $this->headScript()->appendFile('js/2nd.js');
+$this->headLink()->appendStylesheet('/css/login.css');
+
+$this->headLink()->appendStylesheet('/css/form_dl.css');
+?>
+
+<H1><?php print I18n::_('Please log in'); ?></H1>
+<?php print $this->form;?>
+<a href='/login/crt'><?php print I18n::_('Client Cert Login'); ?></a>
diff --git a/manager/application/views/scripts/mail/delete.phtml b/manager/application/views/scripts/mail/delete.phtml
index d01cec8..9d2e46c 100644
--- a/manager/application/views/scripts/mail/delete.phtml
+++ b/manager/application/views/scripts/mail/delete.phtml
@@ -1,12 +1,12 @@
-<?php
-/**
- * @author markus
- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
- */
-$this->headLink()->appendStylesheet('/css/mail.css');
-$this->headScript()->appendFile('/js/mail_redirect.js');
-?>
-<H1><?php print I18n::_('Delete Mail'); ?></H1>
-<?php
-print $this->message;
-print '<input type="hidden" id="returnto" value="' . $this->returnto . '">';
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+$this->headScript()->appendFile('/js/mail_redirect.js');
+?>
+<H1><?php print I18n::_('Delete Mail'); ?></H1>
+<?php
+print $this->message;
+print '<input type="hidden" id="returnto" value="' . $this->returnto . '">';
diff --git a/manager/application/views/scripts/mail/full.phtml b/manager/application/views/scripts/mail/full.phtml
index ba1986b..1bfed87 100644
--- a/manager/application/views/scripts/mail/full.phtml
+++ b/manager/application/views/scripts/mail/full.phtml
@@ -1,37 +1,37 @@
-<?php
-/**
- * @author markus
- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
- */
-$this->headLink()->appendStylesheet('/css/mail.css');
-?>
-<H1><?php print I18n::_('View all Mail'); ?></H1>
-<?php
-if (count($this->headers) == 0) {
- print I18n::_('You currently have no mail.');
-}
-else {
-?>
-<table>
- <tr>
- <th class="col1"><?php print I18n::_('From');?></th>
- <th class="col2"><?php print I18n::_('To');?></th>
- <th class="col3"><?php print I18n::_('Subject');?></th>
- <th class="col4"><?php print I18n::_('Date');?></th>
- <th class="col5"><?php print I18n::_('Size');?></th>
- <th class="col6"><?php print I18n::_('Del');?></th>
- </tr>
-<?php
- foreach ($this->headers as $header) {
- print " <tr>\n";
- print " <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
- print " <td>" . $header->toaddress . "</td>";
- print " <td>" . $header->subject . "</td>";
- print " <td>" . $header->date . "</td>";
- print " <td>" . $header->Size . "</td>";
- print " <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
- print " </tr>\n";
- }
-}
-?>
-</table>
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+?>
+<H1><?php print I18n::_('View all Mail'); ?></H1>
+<?php
+if (count($this->headers) == 0) {
+ print I18n::_('You currently have no mail.');
+}
+else {
+?>
+<table>
+ <tr>
+ <th class="col1"><?php print I18n::_('From');?></th>
+ <th class="col2"><?php print I18n::_('To');?></th>
+ <th class="col3"><?php print I18n::_('Subject');?></th>
+ <th class="col4"><?php print I18n::_('Date');?></th>
+ <th class="col5"><?php print I18n::_('Size');?></th>
+ <th class="col6"><?php print I18n::_('Del');?></th>
+ </tr>
+<?php
+ foreach ($this->headers as $header) {
+ print " <tr>\n";
+ print " <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
+ print " <td>" . $header->toaddress . "</td>";
+ print " <td>" . $header->subject . "</td>";
+ print " <td>" . $header->date . "</td>";
+ print " <td>" . $header->Size . "</td>";
+ print " <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
+ print " </tr>\n";
+ }
+}
+?>
+</table>
diff --git a/manager/application/views/scripts/mail/index.phtml b/manager/application/views/scripts/mail/index.phtml
index 85288e4..427d0e9 100644
--- a/manager/application/views/scripts/mail/index.phtml
+++ b/manager/application/views/scripts/mail/index.phtml
@@ -1,37 +1,37 @@
-<?php
-/**
- * @author markus
- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
- */
-$this->headLink()->appendStylesheet('/css/mail.css');
-?>
-<H1><?php print I18n::_('View own Mail'); ?></H1>
-<?php
-if (count($this->headers) == 0) {
- print I18n::_('You currently have no mail.');
-}
-else {
-?>
-<table>
- <tr>
- <th class="col1"><?php print I18n::_('From');?></th>
- <th class="col2"><?php print I18n::_('To');?></th>
- <th class="col3"><?php print I18n::_('Subject');?></th>
- <th class="col4"><?php print I18n::_('Date');?></th>
- <th class="col5"><?php print I18n::_('Size');?></th>
- <th class="col6"><?php print I18n::_('Del');?></th>
- </tr>
-<?php
- foreach ($this->headers as $header) {
- print " <tr>\n";
- print " <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
- print " <td>" . $header->toaddress . "</td>";
- print " <td>" . $header->subject . "</td>";
- print " <td>" . $header->date . "</td>";
- print " <td>" . $header->Size . "</td>";
- print " <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
- print " </tr>\n";
- }
-}
-?>
-</table>
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+?>
+<H1><?php print I18n::_('View own Mail'); ?></H1>
+<?php
+if (count($this->headers) == 0) {
+ print I18n::_('You currently have no mail.');
+}
+else {
+?>
+<table>
+ <tr>
+ <th class="col1"><?php print I18n::_('From');?></th>
+ <th class="col2"><?php print I18n::_('To');?></th>
+ <th class="col3"><?php print I18n::_('Subject');?></th>
+ <th class="col4"><?php print I18n::_('Date');?></th>
+ <th class="col5"><?php print I18n::_('Size');?></th>
+ <th class="col6"><?php print I18n::_('Del');?></th>
+ </tr>
+<?php
+ foreach ($this->headers as $header) {
+ print " <tr>\n";
+ print " <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
+ print " <td>" . $header->toaddress . "</td>";
+ print " <td>" . $header->subject . "</td>";
+ print " <td>" . $header->date . "</td>";
+ print " <td>" . $header->Size . "</td>";
+ print " <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
+ print " </tr>\n";
+ }
+}
+?>
+</table>
diff --git a/manager/application/views/scripts/mail/read.phtml b/manager/application/views/scripts/mail/read.phtml
index 21ac131..24b6838 100644
--- a/manager/application/views/scripts/mail/read.phtml
+++ b/manager/application/views/scripts/mail/read.phtml
@@ -1,10 +1,10 @@
-<?php
-/**
- * @author markus
- * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
- */
-$this->headLink()->appendStylesheet('/css/mail.css');
-?>
-<H1><?php print I18n::_('Read Mail'); ?></H1>
-<?php
-print nl2br(htmlspecialchars(quoted_printable_decode($this->mail_body), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
+<?php
+/**
+ * @author markus
+ * $Id: index.phtml 25 2009-12-02 15:43:21Z markus $
+ */
+$this->headLink()->appendStylesheet('/css/mail.css');
+?>
+<H1><?php print I18n::_('Read Mail'); ?></H1>
+<?php
+print nl2br(htmlspecialchars(quoted_printable_decode($this->mail_body), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
diff --git a/manager/application/views/scripts/manage-account/assurance.phtml b/manager/application/views/scripts/manage-account/assurance.phtml
index db45e0a..79e1b19 100644
--- a/manager/application/views/scripts/manage-account/assurance.phtml
+++ b/manager/application/views/scripts/manage-account/assurance.phtml
@@ -9,12 +9,12 @@
<p><?php print I18n::_('The following assurances were added to your account:')?></p>
<table>
- <thead>
- <tr><th>#</th><th><?php print I18n::_('Number of points')?></th></tr>
- </thead>
- <tbody>
- <?php foreach ($this->assurancesDone as $i => $points) {
- printf('<tr><td> %1$d </td><td> %2$d </td></tr>', $i, $points);
- }?>
- </tbody>
+ <thead>
+ <tr><th>#</th><th><?php print I18n::_('Number of points')?></th></tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->assurancesDone as $i => $points) {
+ printf('<tr><td> %1$d </td><td> %2$d </td></tr>', $i, $points);
+ }?>
+ </tbody>
</table>
diff --git a/manager/application/views/scripts/manage-account/batch-assurance-form.phtml b/manager/application/views/scripts/manage-account/batch-assurance-form.phtml
index 3a68691..0fc829f 100644
--- a/manager/application/views/scripts/manage-account/batch-assurance-form.phtml
+++ b/manager/application/views/scripts/manage-account/batch-assurance-form.phtml
@@ -7,22 +7,22 @@
<h1><?php print I18n::_('Do Multiple Assurances at Once') ?></h1>
<p><?php print I18n::_('Assure multiple dummy accounts in one step. '.
- 'The assurances look just like normal assurances and can be used to gain '.
+ 'The assurances look just like normal assurances and can be used to gain '.
'experience points without suffering from RSI (also known as mouse arm).')
?></p>
<p><?php print I18n::_('The amount of points given per Assurance can be '.
- 'specified in two ways:') ?></p>
+ 'specified in two ways:') ?></p>
<dl>
- <dt><?php print I18n::_('Percentage') ?></dt>
- <dd><?php print I18n::_('n percent of the maximal possible points are '.
- 'given per Assurance. If it\'s not an integer it is rounded down to '.
- 'the next integer') ?></dd>
- <dt><?php print I18n::_('Absolute') ?></dt>
- <dd><?php print I18n::_('Exactly n points are given. If n exceeds the '.
- 'current maximum of points that may be given, it is set to the '.
- 'maximum until due to the gained experience points more points may be '.
- 'given') ?></dd>
+ <dt><?php print I18n::_('Percentage') ?></dt>
+ <dd><?php print I18n::_('n percent of the maximal possible points are '.
+ 'given per Assurance. If it\'s not an integer it is rounded down to '.
+ 'the next integer') ?></dd>
+ <dt><?php print I18n::_('Absolute') ?></dt>
+ <dd><?php print I18n::_('Exactly n points are given. If n exceeds the '.
+ 'current maximum of points that may be given, it is set to the '.
+ 'maximum until due to the gained experience points more points may be '.
+ 'given') ?></dd>
</dl>
<?php print $this->batch_assurance_form ?>
diff --git a/manager/application/views/scripts/manage-account/batch-assurance.phtml b/manager/application/views/scripts/manage-account/batch-assurance.phtml
index b13d226..32af13e 100644
--- a/manager/application/views/scripts/manage-account/batch-assurance.phtml
+++ b/manager/application/views/scripts/manage-account/batch-assurance.phtml
@@ -9,20 +9,20 @@
<p><?php print I18n::_('The following assurances were executed:')?></p>
<table>
- <thead>
- <tr>
- <th>#</th>
- <th><?php print I18n::_('Assuree')?></th>
- <th><?php print I18n::_('Number of points')?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->assurances as $i => $assurance) {?>
- <tr>
- <td><?php print $i ?></td>
- <td><?php print $assurance['assuree'] ?></td>
- <td><?php print $assurance['points'] ?></td>
- </tr>
- <?php }?>
- </tbody>
+ <thead>
+ <tr>
+ <th>#</th>
+ <th><?php print I18n::_('Assuree')?></th>
+ <th><?php print I18n::_('Number of points')?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->assurances as $i => $assurance) {?>
+ <tr>
+ <td><?php print $i ?></td>
+ <td><?php print $assurance['assuree'] ?></td>
+ <td><?php print $assurance['points'] ?></td>
+ </tr>
+ <?php }?>
+ </tbody>
</table> \ No newline at end of file
diff --git a/manager/library/CAcert/User/Emails.php b/manager/library/CAcert/User/Emails.php
index 3988c2a..a341cc3 100644
--- a/manager/library/CAcert/User/Emails.php
+++ b/manager/library/CAcert/User/Emails.php
@@ -1,60 +1,60 @@
-<?php
-
-class CAcert_User_Emails {
- private $db = null;
-
- public function __construct($db) {
- $this->db = $db;
- }
-
- /**
- * get list of email addresses by login, needed to be able to filter emails
- * @param string $addr
- * @return array
- */
- public function getEmailAddressesByLogin($addr) {
- $db = $this->db;
-
- /**
- * find out user id by email address
- */
- $sql = 'select users.id from users where email=?';
-
- $id = $db->fetchOne($sql, array($addr));
-
- /**
- * get secondary email addresses
- */
- $sql = 'select email.email from email where memid=?';
-
- $res = $db->query($sql, array($id));
-
- $emails = array();
-
- $num = $res->rowCount();
- for ($i = 0; $i < $num; $i++) {
- $row = $res->fetch(PDO::FETCH_ASSOC);
- $emails[] = $row['email'];
- }
-
- /**
- * get additional addresses by domains
- */
- $sql = 'select domains.domain from domains where memid=?';
-
- $res = $db->query($sql, array($id));
- $num = $res->rowCount();
- $variants = array('root','hostmaster','postmaster','admin','webmaster');
- for ($i = 0; $i < $num; $i++) {
- $row = $res->fetch(PDO::FETCH_ASSOC);
-
- foreach ($variants as $variant) {
- $emails[] = $variant . '@' . $row['domain'];
- }
- }
-
- // Log::Log()->debug(__METHOD__ . ' addresses ' . implode(',', $emails));
-
- return $emails;
- }
-}
+<?php
+
+class CAcert_User_Emails {
+ private $db = null;
+
+ public function __construct($db) {
+ $this->db = $db;
+ }
+
+ /**
+ * get list of email addresses by login, needed to be able to filter emails
+ * @param string $addr
+ * @return array
+ */
+ public function getEmailAddressesByLogin($addr) {
+ $db = $this->db;
+
+ /**
+ * find out user id by email address
+ */
+ $sql = 'select users.id from users where email=?';
+
+ $id = $db->fetchOne($sql, array($addr));
+
+ /**
+ * get secondary email addresses
+ */
+ $sql = 'select email.email from email where memid=?';
+
+ $res = $db->query($sql, array($id));
+
+ $emails = array();
+
+ $num = $res->rowCount();
+ for ($i = 0; $i < $num; $i++) {
+ $row = $res->fetch(PDO::FETCH_ASSOC);
+ $emails[] = $row['email'];
+ }
+
+ /**
+ * get additional addresses by domains
+ */
+ $sql = 'select domains.domain from domains where memid=?';
+
+ $res = $db->query($sql, array($id));
+ $num = $res->rowCount();
+ $variants = array('root','hostmaster','postmaster','admin','webmaster');
+ for ($i = 0; $i < $num; $i++) {
+ $row = $res->fetch(PDO::FETCH_ASSOC);
+
+ foreach ($variants as $variant) {
+ $emails[] = $variant . '@' . $row['domain'];
+ }
+ }
+
+ // Log::Log()->debug(__METHOD__ . ' addresses ' . implode(',', $emails));
+
+ return $emails;
+ }
+}
diff --git a/manager/library/actions/ActionIndex.php b/manager/library/actions/ActionIndex.php
index 2771bad..5657870 100644
--- a/manager/library/actions/ActionIndex.php
+++ b/manager/library/actions/ActionIndex.php
@@ -1,53 +1,53 @@
-<?php
-
-require_once (FWACTIONS_PATH . '/FWAction.php');
-
-class Index extends FWAction {
- /**
- * get a list of required permissions that are needed to access this action
- * @return array
- */
- public static function getRequiredPermissions() {
- return array();
- }
-
- /**
- * get a role that is required for accessing that action
- * @return string
- */
- public static function getRequiredRole() {
- return 'User';
- }
-
- /**
- * sort order for top navigation
- * @return integer
- */
- public static function getTopNavPrio() {
- return 1;
- }
-
- /**
- * controller to invoke
- * @return string
- */
- public static function getController() {
- return 'index';
- }
-
- /**
- * action to invoke
- * @return string
- */
- public static function getAction() {
- return 'index';
- }
-
- /**
- * get text for menu, caller is responsible for translating
- * @return string
- */
- public static function getMenuText() {
- return 'Dashboard';
- }
-}
+<?php
+
+require_once (FWACTIONS_PATH . '/FWAction.php');
+
+class Index extends FWAction {
+ /**
+ * get a list of required permissions that are needed to access this action
+ * @return array
+ */
+ public static function getRequiredPermissions() {
+ return array();
+ }
+
+ /**
+ * get a role that is required for accessing that action
+ * @return string
+ */
+ public static function getRequiredRole() {
+ return 'User';
+ }
+
+ /**
+ * sort order for top navigation
+ * @return integer
+ */
+ public static function getTopNavPrio() {
+ return 1;
+ }
+
+ /**
+ * controller to invoke
+ * @return string
+ */
+ public static function getController() {
+ return 'index';
+ }
+
+ /**
+ * action to invoke
+ * @return string
+ */
+ public static function getAction() {
+ return 'index';
+ }
+
+ /**
+ * get text for menu, caller is responsible for translating
+ * @return string
+ */
+ public static function getMenuText() {
+ return 'Dashboard';
+ }
+}
diff --git a/manager/library/actions/ActionLogin.php b/manager/library/actions/ActionLogin.php
index 02bae86..509f83c 100644
--- a/manager/library/actions/ActionLogin.php
+++ b/manager/library/actions/ActionLogin.php
@@ -1,53 +1,53 @@
-<?php
-
-require_once (FWACTIONS_PATH . '/FWAction.php');
-
-class Login extends FWAction {
- /**
- * get a list of required permissions that are needed to access this action
- * @return array
- */
- public static function getRequiredPermissions() {
- return array();
- }
-
- /**
- * get a role that is required for accessing that action
- * @return string
- */
- public static function getRequiredRole() {
- return 'User';
- }
-
- /**
- * sort order for top navigation
- * @return integer
- */
- public static function getTopNavPrio() {
- return 1000;
- }
-
- /**
- * controller to invoke
- * @return string
- */
- public static function getController() {
- return 'login';
- }
-
- /**
- * action to invoke
- * @return string
- */
- public static function getAction() {
- return 'index';
- }
-
- /**
- * get text for menu, caller is responsible for translating
- * @return string
- */
- public static function getMenuText() {
- return 'Login';
- }
-}
+<?php
+
+require_once (FWACTIONS_PATH . '/FWAction.php');
+
+class Login extends FWAction {
+ /**
+ * get a list of required permissions that are needed to access this action
+ * @return array
+ */
+ public static function getRequiredPermissions() {
+ return array();
+ }
+
+ /**
+ * get a role that is required for accessing that action
+ * @return string
+ */
+ public static function getRequiredRole() {
+ return 'User';
+ }
+
+ /**
+ * sort order for top navigation
+ * @return integer
+ */
+ public static function getTopNavPrio() {
+ return 1000;
+ }
+
+ /**
+ * controller to invoke
+ * @return string
+ */
+ public static function getController() {
+ return 'login';
+ }
+
+ /**
+ * action to invoke
+ * @return string
+ */
+ public static function getAction() {
+ return 'index';
+ }
+
+ /**
+ * get text for menu, caller is responsible for translating
+ * @return string
+ */
+ public static function getMenuText() {
+ return 'Login';
+ }
+}
diff --git a/manager/library/actions/ActionMail.php b/manager/library/actions/ActionMail.php
index 4ed23de..65f55d6 100644
--- a/manager/library/actions/ActionMail.php
+++ b/manager/library/actions/ActionMail.php
@@ -1,53 +1,53 @@
-<?php
-
-require_once (FWACTIONS_PATH . '/FWAction.php');
-
-class Mail extends FWAction {
- /**
- * get a list of required permissions that are needed to access this action
- * @return array
- */
- public static function getRequiredPermissions() {
- return array();
- }
-
- /**
- * get a role that is required for accessing that action
- * @return string
- */
- public static function getRequiredRole() {
- return 'User';
- }
-
- /**
- * sort order for top navigation
- * @return integer
- */
- public static function getTopNavPrio() {
- return 100;
- }
-
- /**
- * controller to invoke
- * @return string
- */
- public static function getController() {
- return 'mail';
- }
-
- /**
- * action to invoke
- * @return string
- */
- public static function getAction() {
- return 'index';
- }
-
- /**
- * get text for menu, caller is responsible for translating
- * @return string
- */
- public static function getMenuText() {
- return 'Mail';
- }
-}
+<?php
+
+require_once (FWACTIONS_PATH . '/FWAction.php');
+
+class Mail extends FWAction {
+ /**
+ * get a list of required permissions that are needed to access this action
+ * @return array
+ */
+ public static function getRequiredPermissions() {
+ return array();
+ }
+
+ /**
+ * get a role that is required for accessing that action
+ * @return string
+ */
+ public static function getRequiredRole() {
+ return 'User';
+ }
+
+ /**
+ * sort order for top navigation
+ * @return integer
+ */
+ public static function getTopNavPrio() {
+ return 100;
+ }
+
+ /**
+ * controller to invoke
+ * @return string
+ */
+ public static function getController() {
+ return 'mail';
+ }
+
+ /**
+ * action to invoke
+ * @return string
+ */
+ public static function getAction() {
+ return 'index';
+ }
+
+ /**
+ * get text for menu, caller is responsible for translating
+ * @return string
+ */
+ public static function getMenuText() {
+ return 'Mail';
+ }
+}
diff --git a/manager/library/actions/FWAction.php b/manager/library/actions/FWAction.php
index 346e4fa..3bd2879 100644
--- a/manager/library/actions/FWAction.php
+++ b/manager/library/actions/FWAction.php
@@ -1,7 +1,7 @@
-<?php
-/**
- * @author markus
- */
-abstract class FWAction {
-
-}
+<?php
+/**
+ * @author markus
+ */
+abstract class FWAction {
+
+}
diff --git a/manager/library/config/Config.php b/manager/library/config/Config.php
index 26b21fa..2c315a6 100644
--- a/manager/library/config/Config.php
+++ b/manager/library/config/Config.php
@@ -1,104 +1,103 @@
-<?php
-
-require_once('config/Config_Db.php');
-
-class Config {
- /**
- * static pointer to instances
- * @var array(Config)
- */
- private static $instances = array();
-
- /**
- * can handle several instances, distinct by instance name string
- * @var string
- */
- private $instanceName = '';
-
- /**
- * config object
- * @var Config_Db
- */
- private $config = null;
-
- /**
- * make a new Config_Db
- *
- * by using the $where statement you can limit the data that is fetched from db, i.e. only get config for zone $id
- *
- * @param string $instanceName
- * @param Zend_Db_Adapter $db
- * @param string $where
- */
- protected function __construct($instanceName = null, $db = null, $where = null) {
- if ($instanceName === null)
- throw new Exception(__METHOD__ . ': expected an instance name, got none');
-
- $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
- $this->instanceName = $instanceName;
-
- if ($db === null)
- $db = Zend_Db::factory($config->dnssecme->db->config->pdo, $config->dnssecme->db->config);
-
- $this->config = new Config_Db($db, $instanceName, $where, true);
- }
-
- /**
- * get already existing instance, make new instance or throw an exception
- * @param string $instanceName
- * @param Zend_Db_Adapter $db
- * @param string $where
- */
- public static function getInstance($instanceName, $db = null, $where = null) {
- if ($instanceName === null)
- throw new Exception(__METHOD__ . ': expected an instance name, got none');
-
- // no caching if presumeably volatile data is requested
- if ($db !== null && $where !== null) {
- return new Config($instanceName, $db, $where);
- }
-
- if (!array_key_exists($instanceName, self::$instances)) {
- self::$instances[$instanceName] = new Config($instanceName, $db, $where);
- }
-
- return self::$instances[$instanceName];
- }
-
- /**
- * magic method that dispatches all unrecognized method calls to the config object
- *
- * @param string $param
- */
- public function __get($param) {
- return $this->config->$param;
- }
-
- /**
- * magic method that handles isset inquiries to attributes
- *
- * @param string $param
- */
- public function __isset($param) {
- return isset($this->config->$param);
- }
-
- /**
- * magic method that dispatches all unrecognized method calls to the config object
- *
- * @param string $param
- * @param string $value
- */
- public function __set($param, $value) {
- $this->config->$param = $value;
- }
-
- /**
- * get the config object
- * @return Zend_Config_*
- */
- public function getConfig() {
- return $this->config;
- }
-}
-?> \ No newline at end of file
+<?php
+
+require_once('config/Config_Db.php');
+
+class Config {
+ /**
+ * static pointer to instances
+ * @var array(Config)
+ */
+ private static $instances = array();
+
+ /**
+ * can handle several instances, distinct by instance name string
+ * @var string
+ */
+ private $instanceName = '';
+
+ /**
+ * config object
+ * @var Config_Db
+ */
+ private $config = null;
+
+ /**
+ * make a new Config_Db
+ *
+ * by using the $where statement you can limit the data that is fetched from db, i.e. only get config for zone $id
+ *
+ * @param string $instanceName
+ * @param Zend_Db_Adapter $db
+ * @param string $where
+ */
+ protected function __construct($instanceName = null, $db = null, $where = null) {
+ if ($instanceName === null)
+ throw new Exception(__METHOD__ . ': expected an instance name, got none');
+
+ $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/application.ini', APPLICATION_ENV);
+ $this->instanceName = $instanceName;
+
+ if ($db === null)
+ $db = Zend_Db::factory($config->dnssecme->db->config->pdo, $config->dnssecme->db->config);
+
+ $this->config = new Config_Db($db, $instanceName, $where, true);
+ }
+
+ /**
+ * get already existing instance, make new instance or throw an exception
+ * @param string $instanceName
+ * @param Zend_Db_Adapter $db
+ * @param string $where
+ */
+ public static function getInstance($instanceName, $db = null, $where = null) {
+ if ($instanceName === null)
+ throw new Exception(__METHOD__ . ': expected an instance name, got none');
+
+ // no caching if presumeably volatile data is requested
+ if ($db !== null && $where !== null) {
+ return new Config($instanceName, $db, $where);
+ }
+
+ if (!array_key_exists($instanceName, self::$instances)) {
+ self::$instances[$instanceName] = new Config($instanceName, $db, $where);
+ }
+
+ return self::$instances[$instanceName];
+ }
+
+ /**
+ * magic method that dispatches all unrecognized method calls to the config object
+ *
+ * @param string $param
+ */
+ public function __get($param) {
+ return $this->config->$param;
+ }
+
+ /**
+ * magic method that handles isset inquiries to attributes
+ *
+ * @param string $param
+ */
+ public function __isset($param) {
+ return isset($this->config->$param);
+ }
+
+ /**
+ * magic method that dispatches all unrecognized method calls to the config object
+ *
+ * @param string $param
+ * @param string $value
+ */
+ public function __set($param, $value) {
+ $this->config->$param = $value;
+ }
+
+ /**
+ * get the config object
+ * @return Zend_Config_*
+ */
+ public function getConfig() {
+ return $this->config;
+ }
+}
diff --git a/manager/library/config/Config_Db.php b/manager/library/config/Config_Db.php
index fa312df..6bf0e9c 100644
--- a/manager/library/config/Config_Db.php
+++ b/manager/library/config/Config_Db.php
@@ -1,339 +1,339 @@
-<?php
-/**
- * Add database driven configuration to the framework, source based on Zend_Config_Ini
- *
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Config_Db.php 27 2009-12-03 13:00:29Z markus $
- */
-
-
-/**
- * @see Zend_Config
- */
-require_once 'Zend/Config.php';
-
-
-/**
- * @category Zend
- * @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Config_Db extends Zend_Config
-{
- /**
- * String that separates nesting levels of configuration data identifiers
- *
- * @var string
- */
- protected $_nestSeparator = '.';
-
- /**
- * String that separates the parent section name
- *
- * @var string
- */
- protected $_sectionSeparator = ':';
-
- /**
- * Wether to skip extends or not
- *
- * @var boolean
- */
- protected $_skipExtends = false;
-
- /**
- * Loads the section $section from the config file $filename for
- * access facilitated by nested object properties.
- *
- * If the section name contains a ":" then the section name to the right
- * is loaded and included into the properties. Note that the keys in
- * this $section will override any keys of the same
- * name in the sections that have been included via ":".
- *
- * If the $section is null, then all sections in the ini file are loaded.
- *
- * If any key includes a ".", then this will act as a separator to
- * create a sub-property.
- *
- * example ini file:
- * [all]
- * db.connection = database
- * hostname = live
- *
- * [staging : all]
- * hostname = staging
- *
- * after calling $data = new Zend_Config_Ini($file, 'staging'); then
- * $data->hostname === "staging"
- * $data->db->connection === "database"
- *
- * The $options parameter may be provided as either a boolean or an array.
- * If provided as a boolean, this sets the $allowModifications option of
- * Zend_Config. If provided as an array, there are two configuration
- * directives that may be set. For example:
- *
- * $options = array(
- * 'allowModifications' => false,
- * 'nestSeparator' => '->'
- * );
- *
- * @param Zend_Db $dbc
- * @param string $db_table
- * @param string|null $section
- * @param boolean|array $options
- * @throws Zend_Config_Exception
- * @return void
- */
- public function __construct($dbc, $db_table, $section = null, $options = false)
- {
- if (empty($dbc)) {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception('Database connection is not set');
- }
-
- if (empty($db_table)) {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception('Database table is not set');
- }
-
- $allowModifications = false;
- if (is_bool($options)) {
- $allowModifications = $options;
- } elseif (is_array($options)) {
- if (isset($options['allowModifications'])) {
- $allowModifications = (bool) $options['allowModifications'];
- }
- if (isset($options['nestSeparator'])) {
- $this->_nestSeparator = (string) $options['nestSeparator'];
- }
- if (isset($options['skipExtends'])) {
- $this->_skipExtends = (bool) $options['skipExtends'];
- }
- }
-
- $iniArray = $this->_loadIniFile($dbc, $db_table, $section);
- $section = null;
-
- if (null === $section) {
- // Load entire file
- $dataArray = array();
- foreach ($iniArray as $sectionName => $sectionData) {
- if(!is_array($sectionData)) {
- $dataArray = array_merge_recursive($dataArray, $this->_processKey(array(), $sectionName, $sectionData));
- } else {
- $dataArray[$sectionName] = $this->_processSection($iniArray, $sectionName);
- }
- }
- parent::__construct($dataArray, $allowModifications);
- } else {
- // Load one or more sections
- if (!is_array($section)) {
- $section = array($section);
- }
- $dataArray = array();
- foreach ($section as $sectionName) {
- if (!isset($iniArray[$sectionName])) {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception("Section '$sectionName' cannot be found");
- }
- $dataArray = array_merge($this->_processSection($iniArray, $sectionName), $dataArray);
-
- }
- parent::__construct($dataArray, $allowModifications);
- }
-
- $this->_loadedSection = $section;
- }
-
- /**
- * Load data from database and preprocess the section separator (':' in the
- * section name (that is used for section extension) so that the resultant
- * array has the correct section names and the extension information is
- * stored in a sub-key called ';extends'. We use ';extends' as this can
- * never be a valid key name in an INI file that has been loaded using
- * parse_ini_file().
- *
- * @param Zend_Db $dbc
- * @param string $db_table
- * @throws Zend_Config_Exception
- * @return array
- */
- protected function _loadIniFile($dbc, $db_table, $section = null)
- {
- set_error_handler(array($this, '_loadFileErrorHandler'));
- $loaded = $this->_parse_ini_db($dbc, $db_table, $section); // Warnings and errors are suppressed
- restore_error_handler();
- // Check if there was a error while loading file
- if ($this->_loadFileErrorStr !== null) {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception($this->_loadFileErrorStr);
- }
-
- $iniArray = array();
- foreach ($loaded as $key => $data)
- {
- $pieces = explode($this->_sectionSeparator, $key);
- $thisSection = trim($pieces[0]);
- switch (count($pieces)) {
- case 1:
- $iniArray[$thisSection] = $data;
- break;
-
- case 2:
- $extendedSection = trim($pieces[1]);
- $iniArray[$thisSection] = array_merge(array(';extends'=>$extendedSection), $data);
- break;
-
- default:
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception("Section '$thisSection' may not extend multiple sections");
- }
- }
-
- return $iniArray;
- }
-
- /**
- * read config from (current db in $dbc).$db_table
- *
- * @param Zend_Db $dbc
- * @param string $db_table
- * @param string $section
- * @return array
- */
- protected function _parse_ini_db($dbc, $db_table, $section) {
- $sql = 'select * from ' . $db_table;
- if ($section !== null) {
- $sql .= ' where ' . $section;
- }
-
- $db_config = $dbc->query($sql);
-
- $config = array();
-
- while (($row = $db_config->fetch()) !== false) {
- $key = explode('.', $row['config_key']);
- $depth = count($key);
- $ci = &$config;
- for ($cnt = 0; $cnt < $depth; $cnt++) {
- if ($cnt == ($depth - 1))
- $ci[$key[$cnt]] = $row['config_value'];
- elseif (!isset($ci[$key[$cnt]]))
- $ci[$key[$cnt]] = array();
- $ci = &$ci[$key[$cnt]];
- }
- }
- return $config;
- }
-
- /**
- * Process each element in the section and handle the ";extends" inheritance
- * key. Passes control to _processKey() to handle the nest separator
- * sub-property syntax that may be used within the key name.
- *
- * @param array $iniArray
- * @param string $section
- * @param array $config
- * @throws Zend_Config_Exception
- * @return array
- */
- protected function _processSection($iniArray, $section, $config = array())
- {
- $thisSection = $iniArray[$section];
-
- foreach ($thisSection as $key => $value) {
- if (strtolower($key) == ';extends') {
- if (isset($iniArray[$value])) {
- $this->_assertValidExtend($section, $value);
-
- if (!$this->_skipExtends) {
- $config = $this->_processSection($iniArray, $value, $config);
- }
- } else {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception("Parent section '$section' cannot be found");
- }
- } else {
- $config = $this->_processKey($config, $key, $value);
- }
- }
- return $config;
- }
-
- /**
- * Assign the key's value to the property list. Handles the
- * nest separator for sub-properties.
- *
- * @param array $config
- * @param string $key
- * @param string $value
- * @throws Zend_Config_Exception
- * @return array
- */
- protected function _processKey($config, $key, $value)
- {
- if (strpos($key, $this->_nestSeparator) !== false) {
- $pieces = explode($this->_nestSeparator, $key, 2);
- if (strlen($pieces[0]) && strlen($pieces[1])) {
- if (!isset($config[$pieces[0]])) {
- if ($pieces[0] === '0' && !empty($config)) {
- // convert the current values in $config into an array
- $config = array($pieces[0] => $config);
- } else {
- $config[$pieces[0]] = array();
- }
- } elseif (!is_array($config[$pieces[0]])) {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception("Cannot create sub-key for '{$pieces[0]}' as key already exists");
- }
- $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value);
- } else {
- /**
- * @see Zend_Config_Exception
- */
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception("Invalid key '$key'");
- }
- } else {
- $config[$key] = $value;
- }
- return $config;
- }
-}
+<?php
+/**
+ * Add database driven configuration to the framework, source based on Zend_Config_Ini
+ *
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_Config
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @version $Id: Config_Db.php 27 2009-12-03 13:00:29Z markus $
+ */
+
+
+/**
+ * @see Zend_Config
+ */
+require_once 'Zend/Config.php';
+
+
+/**
+ * @category Zend
+ * @package Zend_Config
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Config_Db extends Zend_Config
+{
+ /**
+ * String that separates nesting levels of configuration data identifiers
+ *
+ * @var string
+ */
+ protected $_nestSeparator = '.';
+
+ /**
+ * String that separates the parent section name
+ *
+ * @var string
+ */
+ protected $_sectionSeparator = ':';
+
+ /**
+ * Wether to skip extends or not
+ *
+ * @var boolean
+ */
+ protected $_skipExtends = false;
+
+ /**
+ * Loads the section $section from the config file $filename for
+ * access facilitated by nested object properties.
+ *
+ * If the section name contains a ":" then the section name to the right
+ * is loaded and included into the properties. Note that the keys in
+ * this $section will override any keys of the same
+ * name in the sections that have been included via ":".
+ *
+ * If the $section is null, then all sections in the ini file are loaded.
+ *
+ * If any key includes a ".", then this will act as a separator to
+ * create a sub-property.
+ *
+ * example ini file:
+ * [all]
+ * db.connection = database
+ * hostname = live
+ *
+ * [staging : all]
+ * hostname = staging
+ *
+ * after calling $data = new Zend_Config_Ini($file, 'staging'); then
+ * $data->hostname === "staging"
+ * $data->db->connection === "database"
+ *
+ * The $options parameter may be provided as either a boolean or an array.
+ * If provided as a boolean, this sets the $allowModifications option of
+ * Zend_Config. If provided as an array, there are two configuration
+ * directives that may be set. For example:
+ *
+ * $options = array(
+ * 'allowModifications' => false,
+ * 'nestSeparator' => '->'
+ * );
+ *
+ * @param Zend_Db $dbc
+ * @param string $db_table
+ * @param string|null $section
+ * @param boolean|array $options
+ * @throws Zend_Config_Exception
+ * @return void
+ */
+ public function __construct($dbc, $db_table, $section = null, $options = false)
+ {
+ if (empty($dbc)) {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception('Database connection is not set');
+ }
+
+ if (empty($db_table)) {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception('Database table is not set');
+ }
+
+ $allowModifications = false;
+ if (is_bool($options)) {
+ $allowModifications = $options;
+ } elseif (is_array($options)) {
+ if (isset($options['allowModifications'])) {
+ $allowModifications = (bool) $options['allowModifications'];
+ }
+ if (isset($options['nestSeparator'])) {
+ $this->_nestSeparator = (string) $options['nestSeparator'];
+ }
+ if (isset($options['skipExtends'])) {
+ $this->_skipExtends = (bool) $options['skipExtends'];
+ }
+ }
+
+ $iniArray = $this->_loadIniFile($dbc, $db_table, $section);
+ $section = null;
+
+ if (null === $section) {
+ // Load entire file
+ $dataArray = array();
+ foreach ($iniArray as $sectionName => $sectionData) {
+ if(!is_array($sectionData)) {
+ $dataArray = array_merge_recursive($dataArray, $this->_processKey(array(), $sectionName, $sectionData));
+ } else {
+ $dataArray[$sectionName] = $this->_processSection($iniArray, $sectionName);
+ }
+ }
+ parent::__construct($dataArray, $allowModifications);
+ } else {
+ // Load one or more sections
+ if (!is_array($section)) {
+ $section = array($section);
+ }
+ $dataArray = array();
+ foreach ($section as $sectionName) {
+ if (!isset($iniArray[$sectionName])) {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception("Section '$sectionName' cannot be found");
+ }
+ $dataArray = array_merge($this->_processSection($iniArray, $sectionName), $dataArray);
+
+ }
+ parent::__construct($dataArray, $allowModifications);
+ }
+
+ $this->_loadedSection = $section;
+ }
+
+ /**
+ * Load data from database and preprocess the section separator (':' in the
+ * section name (that is used for section extension) so that the resultant
+ * array has the correct section names and the extension information is
+ * stored in a sub-key called ';extends'. We use ';extends' as this can
+ * never be a valid key name in an INI file that has been loaded using
+ * parse_ini_file().
+ *
+ * @param Zend_Db $dbc
+ * @param string $db_table
+ * @throws Zend_Config_Exception
+ * @return array
+ */
+ protected function _loadIniFile($dbc, $db_table, $section = null)
+ {
+ set_error_handler(array($this, '_loadFileErrorHandler'));
+ $loaded = $this->_parse_ini_db($dbc, $db_table, $section); // Warnings and errors are suppressed
+ restore_error_handler();
+ // Check if there was a error while loading file
+ if ($this->_loadFileErrorStr !== null) {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception($this->_loadFileErrorStr);
+ }
+
+ $iniArray = array();
+ foreach ($loaded as $key => $data)
+ {
+ $pieces = explode($this->_sectionSeparator, $key);
+ $thisSection = trim($pieces[0]);
+ switch (count($pieces)) {
+ case 1:
+ $iniArray[$thisSection] = $data;
+ break;
+
+ case 2:
+ $extendedSection = trim($pieces[1]);
+ $iniArray[$thisSection] = array_merge(array(';extends'=>$extendedSection), $data);
+ break;
+
+ default:
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception("Section '$thisSection' may not extend multiple sections");
+ }
+ }
+
+ return $iniArray;
+ }
+
+ /**
+ * read config from (current db in $dbc).$db_table
+ *
+ * @param Zend_Db $dbc
+ * @param string $db_table
+ * @param string $section
+ * @return array
+ */
+ protected function _parse_ini_db($dbc, $db_table, $section) {
+ $sql = 'select * from ' . $db_table;
+ if ($section !== null) {
+ $sql .= ' where ' . $section;
+ }
+
+ $db_config = $dbc->query($sql);
+
+ $config = array();
+
+ while (($row = $db_config->fetch()) !== false) {
+ $key = explode('.', $row['config_key']);
+ $depth = count($key);
+ $ci = &$config;
+ for ($cnt = 0; $cnt < $depth; $cnt++) {
+ if ($cnt == ($depth - 1))
+ $ci[$key[$cnt]] = $row['config_value'];
+ elseif (!isset($ci[$key[$cnt]]))
+ $ci[$key[$cnt]] = array();
+ $ci = &$ci[$key[$cnt]];
+ }
+ }
+ return $config;
+ }
+
+ /**
+ * Process each element in the section and handle the ";extends" inheritance
+ * key. Passes control to _processKey() to handle the nest separator
+ * sub-property syntax that may be used within the key name.
+ *
+ * @param array $iniArray
+ * @param string $section
+ * @param array $config
+ * @throws Zend_Config_Exception
+ * @return array
+ */
+ protected function _processSection($iniArray, $section, $config = array())
+ {
+ $thisSection = $iniArray[$section];
+
+ foreach ($thisSection as $key => $value) {
+ if (strtolower($key) == ';extends') {
+ if (isset($iniArray[$value])) {
+ $this->_assertValidExtend($section, $value);
+
+ if (!$this->_skipExtends) {
+ $config = $this->_processSection($iniArray, $value, $config);
+ }
+ } else {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception("Parent section '$section' cannot be found");
+ }
+ } else {
+ $config = $this->_processKey($config, $key, $value);
+ }
+ }
+ return $config;
+ }
+
+ /**
+ * Assign the key's value to the property list. Handles the
+ * nest separator for sub-properties.
+ *
+ * @param array $config
+ * @param string $key
+ * @param string $value
+ * @throws Zend_Config_Exception
+ * @return array
+ */
+ protected function _processKey($config, $key, $value)
+ {
+ if (strpos($key, $this->_nestSeparator) !== false) {
+ $pieces = explode($this->_nestSeparator, $key, 2);
+ if (strlen($pieces[0]) && strlen($pieces[1])) {
+ if (!isset($config[$pieces[0]])) {
+ if ($pieces[0] === '0' && !empty($config)) {
+ // convert the current values in $config into an array
+ $config = array($pieces[0] => $config);
+ } else {
+ $config[$pieces[0]] = array();
+ }
+ } elseif (!is_array($config[$pieces[0]])) {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception("Cannot create sub-key for '{$pieces[0]}' as key already exists");
+ }
+ $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value);
+ } else {
+ /**
+ * @see Zend_Config_Exception
+ */
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception("Invalid key '$key'");
+ }
+ } else {
+ $config[$key] = $value;
+ }
+ return $config;
+ }
+}
diff --git a/manager/library/config/Config_Writer_Db.php b/manager/library/config/Config_Writer_Db.php
index 1614a41..126437f 100644
--- a/manager/library/config/Config_Writer_Db.php
+++ b/manager/library/config/Config_Writer_Db.php
@@ -1,217 +1,217 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Config_Writer_Db.php 43 2009-12-21 14:12:34Z markus $
- */
-
-/**
- * Usage:
- * require_once(LIBRARY_PATH . '/config/Config_Writer_Db.php');
- * $writer = new Config_Writer_Db();
- * $writer->setTableName('system_config');
- * $writer->write(Zend_Registry::get('config_dbc'), Zend_Registry::get('config'));
- *
- * $writer = new Config_Writer_Db();
- * $writer->setTableName('dnssec_org_param');
- * $writer->write(Zend_Registry::get('config_dbc'), dnssec_org_conf, 'dnssec_org_id="2"');
- */
-
-/**
- * @see Zend_Config_Writer
- */
-require_once 'Zend/Config/Writer.php';
-
-/**
- * @category Zend
- * @package Zend_Config
- * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-class Config_Writer_Db extends Zend_Config_Writer
-{
- /**
- * String that separates nesting levels of configuration data identifiers
- *
- * @var string
- */
- protected $_nestSeparator = '.';
-
- protected $_set = null;
-
- protected $_tableName = null;
-
- /**
- * Set the nest separator
- *
- * @param string $filename
- * @return Zend_Config_Writer_Ini
- */
- public function setNestSeparator($separator)
- {
- $this->_nestSeparator = $separator;
-
- return $this;
- }
-
- public function setTableName($name)
- {
- $this->_tableName = $name;
-
- return $this;
- }
-
- /**
- * Defined by Zend_Config_Writer
- *
- * use set to limit impact when a shared config file is used (i.e. config per item using foreign keys)
- *
- * @param string $filename
- * @param Config_Db $config
- * @param string $set
- * @return void
- */
- public function write($db = null, $config = null, $set = null) {
- $this->_set = $set;
-
- // this method is specialized for writing back Config objects (which hold config_db objects)
- if ($config !== null) {
- if ($config instanceof Config)
- $this->setConfig($config->getConfig());
- else {
- $this->setConfig($config);
- }
- }
-
- if ($this->_config === null) {
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception('No config was set');
- }
-
- if ($db === null) {
- require_once 'Zend/Config/Exception.php';
- throw new Zend_Config_Exception('No db was set');
- }
-
- $sql = array();
-
- $string = 'delete from ' . $this->_tableName;
- if ($this->_set !== null) {
- $string .= ' where ' . $this->_set;
- }
-
- $sql[] = $string;
-
- $iniString = '';
- $extends = $this->_config->getExtends();
- $sectionName = $this->_config->getSectionName();
-
- foreach ($this->_config as $key => $data) {
- $sql= array_merge($sql, $this->addEntry($sectionName, $key, $data));
- }
-
- try {
- $db->beginTransaction();
- foreach ($sql as $command) {
- #Log::Log()->debug($command);
- $db->query($command);
- }
- $db->commit();
- } catch (Exception $e) {
- $db->rollBack();
- Log::Log()->err($e);
- throw $e;
- }
- }
-
- /**
- * build key value pairs, key is created by recursively adding section names, delimited by "."
- * @param string $prefix
- * @param string $key
- * @param mixed $data
- */
- protected function addEntry($prefix, $key, $data) {
- $sql = array();
-
- if ($data instanceof Zend_Config) {
- if ($prefix != '')
- $prefix .= '.';
- $prefix .= $key;
- foreach ($data as $k => $v) {
- $sql = array_merge($sql, $this->addEntry($prefix, $k, $v));
- }
- }
- else {
- $string = 'insert into ' . $this->_tableName . ' set ';
- $pkey = $prefix;
- if ($pkey != '')
- $pkey .= '.';
- $pkey .= $key;
- $string .= 'config_key=' . $this->_prepareValue($pkey) . ', ';
- $string .= 'config_value=' . $this->_prepareValue($data);
- if ($this->_set !== null)
- $string .= ', ' . $this->_set;
-
- $sql[] = $string;
- }
-
- return $sql;
- }
-
- /**
- * Add a branch to an INI string recursively
- *
- * @param Zend_Config $config
- * @return void
- */
- protected function _addBranch(Zend_Config $config, $parents = array())
- {
- $iniString = '';
-
- foreach ($config as $key => $value) {
- $group = array_merge($parents, array($key));
-
- if ($value instanceof Zend_Config) {
- $iniString .= $this->_addBranch($value, $group);
- } else {
- $iniString .= implode($this->_nestSeparator, $group)
- . ' = '
- . $this->_prepareValue($value)
- . "\n";
- }
- }
-
- return $iniString;
- }
-
- /**
- * Prepare a value for INI
- *
- * @param mixed $value
- * @return string
- */
- protected function _prepareValue($value)
- {
- if (is_integer($value) || is_float($value)) {
- return $value;
- } elseif (is_bool($value)) {
- return ($value ? 'true' : 'false');
- } else {
- return '"' . addslashes($value) . '"';
- }
- }
-}
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category Zend
+ * @package Zend_Config
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @version $Id: Config_Writer_Db.php 43 2009-12-21 14:12:34Z markus $
+ */
+
+/**
+ * Usage:
+ * require_once(LIBRARY_PATH . '/config/Config_Writer_Db.php');
+ * $writer = new Config_Writer_Db();
+ * $writer->setTableName('system_config');
+ * $writer->write(Zend_Registry::get('config_dbc'), Zend_Registry::get('config'));
+ *
+ * $writer = new Config_Writer_Db();
+ * $writer->setTableName('dnssec_org_param');
+ * $writer->write(Zend_Registry::get('config_dbc'), dnssec_org_conf, 'dnssec_org_id="2"');
+ */
+
+/**
+ * @see Zend_Config_Writer
+ */
+require_once 'Zend/Config/Writer.php';
+
+/**
+ * @category Zend
+ * @package Zend_Config
+ * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+class Config_Writer_Db extends Zend_Config_Writer
+{
+ /**
+ * String that separates nesting levels of configuration data identifiers
+ *
+ * @var string
+ */
+ protected $_nestSeparator = '.';
+
+ protected $_set = null;
+
+ protected $_tableName = null;
+
+ /**
+ * Set the nest separator
+ *
+ * @param string $filename
+ * @return Zend_Config_Writer_Ini
+ */
+ public function setNestSeparator($separator)
+ {
+ $this->_nestSeparator = $separator;
+
+ return $this;
+ }
+
+ public function setTableName($name)
+ {
+ $this->_tableName = $name;
+
+ return $this;
+ }
+
+ /**
+ * Defined by Zend_Config_Writer
+ *
+ * use set to limit impact when a shared config file is used (i.e. config per item using foreign keys)
+ *
+ * @param string $filename
+ * @param Config_Db $config
+ * @param string $set
+ * @return void
+ */
+ public function write($db = null, $config = null, $set = null) {
+ $this->_set = $set;
+
+ // this method is specialized for writing back Config objects (which hold config_db objects)
+ if ($config !== null) {
+ if ($config instanceof Config)
+ $this->setConfig($config->getConfig());
+ else {
+ $this->setConfig($config);
+ }
+ }
+
+ if ($this->_config === null) {
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception('No config was set');
+ }
+
+ if ($db === null) {
+ require_once 'Zend/Config/Exception.php';
+ throw new Zend_Config_Exception('No db was set');
+ }
+
+ $sql = array();
+
+ $string = 'delete from ' . $this->_tableName;
+ if ($this->_set !== null) {
+ $string .= ' where ' . $this->_set;
+ }
+
+ $sql[] = $string;
+
+ $iniString = '';
+ $extends = $this->_config->getExtends();
+ $sectionName = $this->_config->getSectionName();
+
+ foreach ($this->_config as $key => $data) {
+ $sql= array_merge($sql, $this->addEntry($sectionName, $key, $data));
+ }
+
+ try {
+ $db->beginTransaction();
+ foreach ($sql as $command) {
+ #Log::Log()->debug($command);
+ $db->query($command);
+ }
+ $db->commit();
+ } catch (Exception $e) {
+ $db->rollBack();
+ Log::Log()->err($e);
+ throw $e;
+ }
+ }
+
+ /**
+ * build key value pairs, key is created by recursively adding section names, delimited by "."
+ * @param string $prefix
+ * @param string $key
+ * @param mixed $data
+ */
+ protected function addEntry($prefix, $key, $data) {
+ $sql = array();
+
+ if ($data instanceof Zend_Config) {
+ if ($prefix != '')
+ $prefix .= '.';
+ $prefix .= $key;
+ foreach ($data as $k => $v) {
+ $sql = array_merge($sql, $this->addEntry($prefix, $k, $v));
+ }
+ }
+ else {
+ $string = 'insert into ' . $this->_tableName . ' set ';
+ $pkey = $prefix;
+ if ($pkey != '')
+ $pkey .= '.';
+ $pkey .= $key;
+ $string .= 'config_key=' . $this->_prepareValue($pkey) . ', ';
+ $string .= 'config_value=' . $this->_prepareValue($data);
+ if ($this->_set !== null)
+ $string .= ', ' . $this->_set;
+
+ $sql[] = $string;
+ }
+
+ return $sql;
+ }
+
+ /**
+ * Add a branch to an INI string recursively
+ *
+ * @param Zend_Config $config
+ * @return void
+ */
+ protected function _addBranch(Zend_Config $config, $parents = array())
+ {
+ $iniString = '';
+
+ foreach ($config as $key => $value) {
+ $group = array_merge($parents, array($key));
+
+ if ($value instanceof Zend_Config) {
+ $iniString .= $this->_addBranch($value, $group);
+ } else {
+ $iniString .= implode($this->_nestSeparator, $group)
+ . ' = '
+ . $this->_prepareValue($value)
+ . "\n";
+ }
+ }
+
+ return $iniString;
+ }
+
+ /**
+ * Prepare a value for INI
+ *
+ * @param mixed $value
+ * @return string
+ */
+ protected function _prepareValue($value)
+ {
+ if (is_integer($value) || is_float($value)) {
+ return $value;
+ } elseif (is_bool($value)) {
+ return ($value ? 'true' : 'false');
+ } else {
+ return '"' . addslashes($value) . '"';
+ }
+ }
+}
diff --git a/manager/library/date/HumanReadableTime.php b/manager/library/date/HumanReadableTime.php
index ee75703..7c2a7c8 100644
--- a/manager/library/date/HumanReadableTime.php
+++ b/manager/library/date/HumanReadableTime.php
@@ -1,140 +1,140 @@
-<?php
-
-/**
- * class that provides methods to convert human readable time / interval length
- * expressions into other formats
- *
- * @author markus
- * $Id: HumanReadableTime.php 92 2010-03-10 11:43:15Z markus $
- */
-
-require_once(LIBRARY_PATH . '/date/exception.HumanReadableTimeException.php');
-
-class HumanReadableTime {
- /**
- * normalize an HRT string, convert from HRT to seconds and then convert back to
- * HRT
- * @param string $hrt
- * @param string $maxunit
- * @return string
- */
- public static function NormalizeHRT($hrt, $maxunit = 'w') {
- return self::Seconds2HR(self::HR2Seconds($hrt), $maxunit);
- }
-
- /**
- * convert string / interger which contains an interval length to
- * human readable format (1w2d7h)
- *
- * if $maxunit is set, it defines the biggest unit in output (i.e. $maxunit = 'h' will
- * allow only hms)
- *
- * @param string|integer $seconds
- * @param string $maxunit
- * @return string
- */
- public static function Seconds2HR($seconds, $maxunit = 'w') {
- $maxunit = trim(strtolower($maxunit));
- $allowed = array('w' => 0, 'd' => 0, 'h' => 0, 'm' => 0, 's' => 0);
- if (!in_array($maxunit, array_keys($allowed), true))
- throw new HumanReadableTimeException('illegal value for maxunit: "' . $maxunit . '"');
- foreach ($allowed as $key => $value) {
- if ($maxunit == $key)
- break;
- unset($allowed[$key]);
- }
-
- $seconds = intval($seconds);
- $hrt = '';
- foreach ($allowed as $key => $value) {
- switch ($key) {
- case 'w':
- $tmp = intval($seconds / (7*86400));
- if ($tmp > 0)
- $seconds %= (7*86400);
- $allowed[$key] += $tmp;
- break;
- case 'd':
- $tmp = intval($seconds / (86400));
- if ($tmp > 0)
- $seconds %= (86400);
- $allowed[$key] += $tmp;
- break;
- case 'h':
- $tmp = intval($seconds / (3600));
- if ($tmp > 0)
- $seconds %= (3600);
- $allowed[$key] += $tmp;
- break;
- case 'm':
- $tmp = intval($seconds / (60));
- if ($tmp > 0)
- $seconds %= (60);
- $allowed[$key] += $tmp;
- break;
- case 's':
- $allowed[$key] += $seconds;
- break;
- }
- }
-
- $hrt = '';
- foreach ($allowed as $key => $value) {
- if ($value > 0)
- $hrt .= sprintf('%d%s', $value, $key);
- }
- return $hrt;
- }
-
- /**
- * parse a string of 3h2m7s and return the number of seconds as integer
- * add "s" to the end of the number if $addsecond is set to true
- * @param string $hr
- * @param boolean $addsecond
- * @return integer|string
- */
- public static function HR2Seconds($hr, $addsecond = false) {
- $hr = trim($hr);
- if ($hr == '') {
- if ($addsecond === true)
- return '0s';
- else
- return 0;
- }
-
- $hr = strtolower($hr);
-
- $matches = array();
- if (preg_match_all('/([0-9]*)([wdhms])/', $hr, $matches, PREG_SET_ORDER) > 0) {
- $interval = 0;
- for ($i = 0; $i < count($matches); $i++) {
- switch ($matches[$i][2]) {
- case 'w':
- $interval += $matches[$i][1] * 7 * 86400;
- break;
- case 'd':
- $interval += $matches[$i][1] * 86400;
- break;
- case 'h':
- $interval += $matches[$i][1] * 3600;
- break;
- case 'm':
- $interval += $matches[$i][1] * 60;
- break;
- case 's':
- $interval += $matches[$i][1];
- break;
- }
- }
- if ($addsecond === true)
- return sprintf('%ds', $interval);
- else
- return $interval;
- }
-
- if ($addsecond === true)
- return '0s';
- else
- return 0;
- }
-}
+<?php
+
+/**
+ * class that provides methods to convert human readable time / interval length
+ * expressions into other formats
+ *
+ * @author markus
+ * $Id: HumanReadableTime.php 92 2010-03-10 11:43:15Z markus $
+ */
+
+require_once(LIBRARY_PATH . '/date/exception.HumanReadableTimeException.php');
+
+class HumanReadableTime {
+ /**
+ * normalize an HRT string, convert from HRT to seconds and then convert back to
+ * HRT
+ * @param string $hrt
+ * @param string $maxunit
+ * @return string
+ */
+ public static function NormalizeHRT($hrt, $maxunit = 'w') {
+ return self::Seconds2HR(self::HR2Seconds($hrt), $maxunit);
+ }
+
+ /**
+ * convert string / interger which contains an interval length to
+ * human readable format (1w2d7h)
+ *
+ * if $maxunit is set, it defines the biggest unit in output (i.e. $maxunit = 'h' will
+ * allow only hms)
+ *
+ * @param string|integer $seconds
+ * @param string $maxunit
+ * @return string
+ */
+ public static function Seconds2HR($seconds, $maxunit = 'w') {
+ $maxunit = trim(strtolower($maxunit));
+ $allowed = array('w' => 0, 'd' => 0, 'h' => 0, 'm' => 0, 's' => 0);
+ if (!in_array($maxunit, array_keys($allowed), true))
+ throw new HumanReadableTimeException('illegal value for maxunit: "' . $maxunit . '"');
+ foreach ($allowed as $key => $value) {
+ if ($maxunit == $key)
+ break;
+ unset($allowed[$key]);
+ }
+
+ $seconds = intval($seconds);
+ $hrt = '';
+ foreach ($allowed as $key => $value) {
+ switch ($key) {
+ case 'w':
+ $tmp = intval($seconds / (7*86400));
+ if ($tmp > 0)
+ $seconds %= (7*86400);
+ $allowed[$key] += $tmp;
+ break;
+ case 'd':
+ $tmp = intval($seconds / (86400));
+ if ($tmp > 0)
+ $seconds %= (86400);
+ $allowed[$key] += $tmp;
+ break;
+ case 'h':
+ $tmp = intval($seconds / (3600));
+ if ($tmp > 0)
+ $seconds %= (3600);
+ $allowed[$key] += $tmp;
+ break;
+ case 'm':
+ $tmp = intval($seconds / (60));
+ if ($tmp > 0)
+ $seconds %= (60);
+ $allowed[$key] += $tmp;
+ break;
+ case 's':
+ $allowed[$key] += $seconds;
+ break;
+ }
+ }
+
+ $hrt = '';
+ foreach ($allowed as $key => $value) {
+ if ($value > 0)
+ $hrt .= sprintf('%d%s', $value, $key);
+ }
+ return $hrt;
+ }
+
+ /**
+ * parse a string of 3h2m7s and return the number of seconds as integer
+ * add "s" to the end of the number if $addsecond is set to true
+ * @param string $hr
+ * @param boolean $addsecond
+ * @return integer|string
+ */
+ public static function HR2Seconds($hr, $addsecond = false) {
+ $hr = trim($hr);
+ if ($hr == '') {
+ if ($addsecond === true)
+ return '0s';
+ else
+ return 0;
+ }
+
+ $hr = strtolower($hr);
+
+ $matches = array();
+ if (preg_match_all('/([0-9]*)([wdhms])/', $hr, $matches, PREG_SET_ORDER) > 0) {
+ $interval = 0;
+ for ($i = 0; $i < count($matches); $i++) {
+ switch ($matches[$i][2]) {
+ case 'w':
+ $interval += $matches[$i][1] * 7 * 86400;
+ break;
+ case 'd':
+ $interval += $matches[$i][1] * 86400;
+ break;
+ case 'h':
+ $interval += $matches[$i][1] * 3600;
+ break;
+ case 'm':
+ $interval += $matches[$i][1] * 60;
+ break;
+ case 's':
+ $interval += $matches[$i][1];
+ break;
+ }
+ }
+ if ($addsecond === true)
+ return sprintf('%ds', $interval);
+ else
+ return $interval;
+ }
+
+ if ($addsecond === true)
+ return '0s';
+ else
+ return 0;
+ }
+}
diff --git a/manager/library/date/exception.HumanReadableTimeException.php b/manager/library/date/exception.HumanReadableTimeException.php
index 2698d58..c354c3d 100644
--- a/manager/library/date/exception.HumanReadableTimeException.php
+++ b/manager/library/date/exception.HumanReadableTimeException.php
@@ -1,37 +1,36 @@
-<?php
-/**
- * @package SLS
- * @subpackage CONFIG.EXCEPTION
- */
-
-/**
- * required files
- * @ignore
- */
-require_once(LIBRARY_PATH . '/exception/exception.Base.php');
-
-/**
- * Exceptions thrown in the DNSSEC library classes
- *
- * @package SLS
- * @subpackage CONFIG.EXCEPTION
- * @author Markus Warg <mw@it-sls.de>
- * @since 2009-02-25 13:05
- * @version $Id: exception.HumanReadableTimeException.php 91 2010-03-10 10:36:25Z markus $
- */
-class HumanReadableTimeException extends BaseException {
- /**
- * make new object
- *
- * @access public
- * @param string $message
- * @param int $code
- * @param string $extra
- */
- /*
- public function __construct($message,$code = 0,$extra = '') {
- parent::__construct($message,$code, $extra);
- }
- */
-}
-?> \ No newline at end of file
+<?php
+/**
+ * @package SLS
+ * @subpackage CONFIG.EXCEPTION
+ */
+
+/**
+ * required files
+ * @ignore
+ */
+require_once(LIBRARY_PATH . '/exception/exception.Base.php');
+
+/**
+ * Exceptions thrown in the DNSSEC library classes
+ *
+ * @package SLS
+ * @subpackage CONFIG.EXCEPTION
+ * @author Markus Warg <mw@it-sls.de>
+ * @since 2009-02-25 13:05
+ * @version $Id: exception.HumanReadableTimeException.php 91 2010-03-10 10:36:25Z markus $
+ */
+class HumanReadableTimeException extends BaseException {
+ /**
+ * make new object
+ *
+ * @access public
+ * @param string $message
+ * @param int $code
+ * @param string $extra
+ */
+ /*
+ public function __construct($message,$code = 0,$extra = '') {
+ parent::__construct($message,$code, $extra);
+ }
+ */
+}
diff --git a/manager/library/date/testHumanReadableTime.php b/manager/library/date/testHumanReadableTime.php
index 177d650..dfcd96c 100644
--- a/manager/library/date/testHumanReadableTime.php
+++ b/manager/library/date/testHumanReadableTime.php
@@ -1,16 +1,15 @@
-<?php
-defined('LIBARARY_PATH')
- || define('LIBRARY_PATH', realpath(dirname(__FILE__) . '/..'));
-
-require_once('HumanReadableTime.php');
-
-$hrf = HumanReadableTime::HR2Seconds($argv[1], true);
-print 'Seconds: ' . $hrf . "\n";
-
-print 'Default: ' . HumanReadableTime::Seconds2HR($hrf) . "\n";
-print 'Week: ' . HumanReadableTime::Seconds2HR($hrf, 'w') . "\n";
-print 'Day: ' . HumanReadableTime::Seconds2HR($hrf, 'd') . "\n";
-print 'Hour: ' . HumanReadableTime::Seconds2HR($hrf, 'h') . "\n";
-print 'Minute: ' . HumanReadableTime::Seconds2HR($hrf, 'm') . "\n";
-print 'Second: ' . HumanReadableTime::Seconds2HR($hrf, 's') . "\n";
-
+<?php
+defined('LIBARARY_PATH')
+ || define('LIBRARY_PATH', realpath(dirname(__FILE__) . '/..'));
+
+require_once('HumanReadableTime.php');
+
+$hrf = HumanReadableTime::HR2Seconds($argv[1], true);
+print 'Seconds: ' . $hrf . "\n";
+
+print 'Default: ' . HumanReadableTime::Seconds2HR($hrf) . "\n";
+print 'Week: ' . HumanReadableTime::Seconds2HR($hrf, 'w') . "\n";
+print 'Day: ' . HumanReadableTime::Seconds2HR($hrf, 'd') . "\n";
+print 'Hour: ' . HumanReadableTime::Seconds2HR($hrf, 'h') . "\n";
+print 'Minute: ' . HumanReadableTime::Seconds2HR($hrf, 'm') . "\n";
+print 'Second: ' . HumanReadableTime::Seconds2HR($hrf, 's') . "\n";
diff --git a/manager/library/exception/exception.Base.php b/manager/library/exception/exception.Base.php
index a91c086..7120c37 100644
--- a/manager/library/exception/exception.Base.php
+++ b/manager/library/exception/exception.Base.php
@@ -1,98 +1,97 @@
-<?php
-/**
- * @package SLS
- * @subpackage EXCEPTION
- */
-
-/**
- * extend PHPs standard exception by some details
- *
- * @package SLS
- * @subpackage EXCEPTION
- * @author Markus Warg <mw@it-sls.de>
- * @since 2009-02-23 16:10
- * @version $Id: exception.Base.php 90 2010-03-09 09:48:27Z markus $
- */
-class BaseException extends Exception {
- /**
- * additional data / string
- * @var string
- */
- protected $extra = '';
-
- /**
- * location of thrower
- * @var string
- */
- protected $exception_location = '';
-
- /**
- * make new object
- *
- * @access public
- * @param string $message
- * @param int $code
- */
- public function __construct($message, $code = 0, $extra = '') {
- $bt = debug_backtrace();
-
- $remove_exception = 0;
- while( $remove_exception < count($bt) && isset($bt[$remove_exception]['class']) && eregi('exception', $bt[$remove_exception]['class']) ) {
- $remove_exception++;
- }
-
- if ($remove_exception > 0)
- $remove_exception--;
-
- if ($remove_exception < count($bt)) {
- $this->exception_location = $bt[$remove_exception]['file'].':'.$bt[$remove_exception]['line'];
- }
-
- $this->extra = $extra;
-
- parent::__construct($message,$code);
- }
-
- /**
- * Make a string out of this exception
- *
- * @access public
- * @return string
- */
- public function __toString() {
- $out = __CLASS__ . '['.$this->code.']:';
-
- if ($this->exception_location != '')
- $out.= $this->exception_location;
- $out .= ':';
-
- $out .= " {$this->message}";
-
- if (isset($this->extra) && strlen($this->extra) > 0)
- $out .= " ({$this->extra})\n";
-
- return $out;
- }
-
- /**
- * get the extra info string
- *
- * @access public
- * @return string
- */
- public function getExtraInfo() {
- return $this->extra;
- }
-
- /**
- * get the exception location string
- *
- * @access public
- * @return string
- */
- public function getExceptionLocation() {
- return $this->exception_location;
- }
-
-}
-?> \ No newline at end of file
+<?php
+/**
+ * @package SLS
+ * @subpackage EXCEPTION
+ */
+
+/**
+ * extend PHPs standard exception by some details
+ *
+ * @package SLS
+ * @subpackage EXCEPTION
+ * @author Markus Warg <mw@it-sls.de>
+ * @since 2009-02-23 16:10
+ * @version $Id: exception.Base.php 90 2010-03-09 09:48:27Z markus $
+ */
+class BaseException extends Exception {
+ /**
+ * additional data / string
+ * @var string
+ */
+ protected $extra = '';
+
+ /**
+ * location of thrower
+ * @var string
+ */
+ protected $exception_location = '';
+
+ /**
+ * make new object
+ *
+ * @access public
+ * @param string $message
+ * @param int $code
+ */
+ public function __construct($message, $code = 0, $extra = '') {
+ $bt = debug_backtrace();
+
+ $remove_exception = 0;
+ while( $remove_exception < count($bt) && isset($bt[$remove_exception]['class']) && eregi('exception', $bt[$remove_exception]['class']) ) {
+ $remove_exception++;
+ }
+
+ if ($remove_exception > 0)
+ $remove_exception--;
+
+ if ($remove_exception < count($bt)) {
+ $this->exception_location = $bt[$remove_exception]['file'].':'.$bt[$remove_exception]['line'];
+ }
+
+ $this->extra = $extra;
+
+ parent::__construct($message,$code);
+ }
+
+ /**
+ * Make a string out of this exception
+ *
+ * @access public
+ * @return string
+ */
+ public function __toString() {
+ $out = __CLASS__ . '['.$this->code.']:';
+
+ if ($this->exception_location != '')
+ $out.= $this->exception_location;
+ $out .= ':';
+
+ $out .= " {$this->message}";
+
+ if (isset($this->extra) && strlen($this->extra) > 0)
+ $out .= " ({$this->extra})\n";
+
+ return $out;
+ }
+
+ /**
+ * get the extra info string
+ *
+ * @access public
+ * @return string
+ */
+ public function getExtraInfo() {
+ return $this->extra;
+ }
+
+ /**
+ * get the exception location string
+ *
+ * @access public
+ * @return string
+ */
+ public function getExceptionLocation() {
+ return $this->exception_location;
+ }
+
+}
diff --git a/manager/library/global/defines.php b/manager/library/global/defines.php
index 4e90ac5..30d6ebc 100644
--- a/manager/library/global/defines.php
+++ b/manager/library/global/defines.php
@@ -1,28 +1,28 @@
-<?php
-/**
- * @author markus
- * $Id: defines.php 95 2010-03-19 14:14:39Z markus $
- */
-
-// Define path to application directory
-defined('APPLICATION_PATH')
- || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application'));
-defined('LIBARARY_PATH')
- || define('LIBRARY_PATH', realpath(dirname(__FILE__) . '/..'));
-defined('FWACTIONS_PATH')
- || define('FWACTIONS_PATH', LIBRARY_PATH . '/actions');
-defined('LOCALE_PATH')
- || define('LOCALE_PATH', realpath(dirname(__FILE__) . '/../../locale'));
-
-// Define application environment
-defined('APPLICATION_ENV')
- || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
-
-define('SYSTEM_CONFIG', 'system_config');
-define('SYSTEM_LOG', 'log');
-
-// Ensure library/ is on include_path
-set_include_path(implode(PATH_SEPARATOR, array(
- LIBRARY_PATH,
- get_include_path(),
-)));
+<?php
+/**
+ * @author markus
+ * $Id: defines.php 95 2010-03-19 14:14:39Z markus $
+ */
+
+// Define path to application directory
+defined('APPLICATION_PATH')
+ || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../../application'));
+defined('LIBARARY_PATH')
+ || define('LIBRARY_PATH', realpath(dirname(__FILE__) . '/..'));
+defined('FWACTIONS_PATH')
+ || define('FWACTIONS_PATH', LIBRARY_PATH . '/actions');
+defined('LOCALE_PATH')
+ || define('LOCALE_PATH', realpath(dirname(__FILE__) . '/../../locale'));
+
+// Define application environment
+defined('APPLICATION_ENV')
+ || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'production'));
+
+define('SYSTEM_CONFIG', 'system_config');
+define('SYSTEM_LOG', 'log');
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, array(
+ LIBRARY_PATH,
+ get_include_path(),
+)));
diff --git a/manager/library/i18n/I18n.php b/manager/library/i18n/I18n.php
index ea103c7..64e8a93 100644
--- a/manager/library/i18n/I18n.php
+++ b/manager/library/i18n/I18n.php
@@ -1,95 +1,95 @@
-<?php
-/**
- * encapsulate Zend_Translate within an singleton class
- * @author markus
- * $Id: I18n.php 33 2009-12-10 15:08:38Z markus $
- */
-
-require_once('l10n/L10n.php');
-
-class I18n {
- /**
- * static pointer to instance
- * @var array(I18n)
- */
- private static $instance = null;
-
- /**
- * config object
- * @var Zend_Translate
- */
- private $translate = null;
-
- /**
- * make new translate
- */
- protected function __construct() {
- $options = array(
- 'log' => Log::Log(),
- 'logUntranslated' => false
- );
-
- $locale = L10n::getInstance();
- $supported = $locale->getBrowser();
- arsort($supported, SORT_NUMERIC);
-
- $file = '';
- foreach ($supported as $loc => $val) {
- if (file_exists(LOCALE_PATH . '/' . $loc . '/locale.php')) {
- $file = LOCALE_PATH . '/' . $loc . '/locale.php';
- $locale->setLocale($loc);
- break;
- }
- }
-
- if ($file == '' && file_exists(LOCALE_PATH . '/en_US/locale.php')) {
- $file = LOCALE_PATH . '/en_US/locale.php';
- $locale->setLocale('en_US');
- }
-
- if ($file != '') {
- $this->translate = new Zend_Translate(Zend_Translate::AN_ARRAY, $file, $locale->getLanguage(), $options);
- #Log::Log()->debug('locale ' . $locale->getLanguage() . '_' .$locale->getRegion() . ' loaded');
- }
- else
- throw new Exception(__METHOD__ . ': no translation files available');
- }
-
- /**
- * get already existing instance, make new instance or throw an exception
- * @return I18n
- */
- public static function getInstance() {
- if (self::$instance === null) {
- self::$instance = new I18n();
- }
-
- return self::$instance;
- }
-
- /**
- * return the Zend_Translate object
- * @return Zend_Translate
- */
- public static function getTranslate() {
- return self::getInstance()->translate;
- }
-
- /**
- * map _ to translate
- * @param unknown_type $text
- * @param unknown_type $locale
- */
- public function _($text, $locale = null) {
- return self::getInstance()->translate->_($text, $locale);
- }
-
- /**
- * magic __call dispatches all unknown methods to Zend_Translate
- * @param unknown_type $method
- * @param unknown_type $arguments
- */
- public function __call($method, $arguments) {
- return call_user_func_array(array($this->translate, $method), $arguments);
- }
-}
+<?php
+/**
+ * encapsulate Zend_Translate within an singleton class
+ * @author markus
+ * $Id: I18n.php 33 2009-12-10 15:08:38Z markus $
+ */
+
+require_once('l10n/L10n.php');
+
+class I18n {
+ /**
+ * static pointer to instance
+ * @var array(I18n)
+ */
+ private static $instance = null;
+
+ /**
+ * config object
+ * @var Zend_Translate
+ */
+ private $translate = null;
+
+ /**
+ * make new translate
+ */
+ protected function __construct() {
+ $options = array(
+ 'log' => Log::Log(),
+ 'logUntranslated' => false
+ );
+
+ $locale = L10n::getInstance();
+ $supported = $locale->getBrowser();
+ arsort($supported, SORT_NUMERIC);
+
+ $file = '';
+ foreach ($supported as $loc => $val) {
+ if (file_exists(LOCALE_PATH . '/' . $loc . '/locale.php')) {
+ $file = LOCALE_PATH . '/' . $loc . '/locale.php';
+ $locale->setLocale($loc);
+ break;
+ }
+ }
+
+ if ($file == '' && file_exists(LOCALE_PATH . '/en_US/locale.php')) {
+ $file = LOCALE_PATH . '/en_US/locale.php';
+ $locale->setLocale('en_US');
+ }
+
+ if ($file != '') {
+ $this->translate = new Zend_Translate(Zend_Translate::AN_ARRAY, $file, $locale->getLanguage(), $options);
+ #Log::Log()->debug('locale ' . $locale->getLanguage() . '_' .$locale->getRegion() . ' loaded');
+ }
+ else
+ throw new Exception(__METHOD__ . ': no translation files available');
+ }
+
+ /**
+ * get already existing instance, make new instance or throw an exception
+ * @return I18n
+ */
+ public static function getInstance() {
+ if (self::$instance === null) {
+ self::$instance = new I18n();
+ }
+
+ return self::$instance;
+ }
+
+ /**
+ * return the Zend_Translate object
+ * @return Zend_Translate
+ */
+ public static function getTranslate() {
+ return self::getInstance()->translate;
+ }
+
+ /**
+ * map _ to translate
+ * @param unknown_type $text
+ * @param unknown_type $locale
+ */
+ public function _($text, $locale = null) {
+ return self::getInstance()->translate->_($text, $locale);
+ }
+
+ /**
+ * magic __call dispatches all unknown methods to Zend_Translate
+ * @param unknown_type $method
+ * @param unknown_type $arguments
+ */
+ public function __call($method, $arguments) {
+ return call_user_func_array(array($this->translate, $method), $arguments);
+ }
+}
diff --git a/manager/library/imap/exception.IMAPException.php b/manager/library/imap/exception.IMAPException.php
index 4672f6a..7a3889a 100644
--- a/manager/library/imap/exception.IMAPException.php
+++ b/manager/library/imap/exception.IMAPException.php
@@ -1,34 +1,34 @@
-<?php
-/**
- * @author markus
- * $Id: $
- */
-
-/**
- * required files
- * @ignore
- */
-require_once(LIBRARY_PATH . '/exception/exception.Base.php');
-
-/**
- * Exceptions thrown in the IMAP classes
- *
- * @package SLS
- * @subpackage CONFIG.EXCEPTION
- * @author Markus Warg <mw@it-sls.de>
- */
-class IMAPException extends BaseException {
- /**
- * make new object
- *
- * @access public
- * @param string $message
- * @param int $code
- * @param string $extra
- */
- /*
- public function __construct($message,$code = 0,$extra = '') {
- parent::__construct($message,$code, $extra);
- }
- */
-}
+<?php
+/**
+ * @author markus
+ * $Id: $
+ */
+
+/**
+ * required files
+ * @ignore
+ */
+require_once(LIBRARY_PATH . '/exception/exception.Base.php');
+
+/**
+ * Exceptions thrown in the IMAP classes
+ *
+ * @package SLS
+ * @subpackage CONFIG.EXCEPTION
+ * @author Markus Warg <mw@it-sls.de>
+ */
+class IMAPException extends BaseException {
+ /**
+ * make new object
+ *
+ * @access public
+ * @param string $message
+ * @param int $code
+ * @param string $extra
+ */
+ /*
+ public function __construct($message,$code = 0,$extra = '') {
+ parent::__construct($message,$code, $extra);
+ }
+ */
+}
diff --git a/manager/library/imap/imapConnection.php b/manager/library/imap/imapConnection.php
index 1528a76..deed5d2 100644
--- a/manager/library/imap/imapConnection.php
+++ b/manager/library/imap/imapConnection.php
@@ -20,36 +20,36 @@ define('IMAP_RETRIES', 5);
*/
class imapConnection {
- /**
- * Array mit den bereits vorhandenen Instanzen
- * @var array
- */
- private static $instances = array();
-
- /**
- * Instanzname, die unterschiedlichen Entitäten werden über den Namen
- * auseinandergehalten.
- * @var string
- */
- private $instanceName = '';
-
- /**
- * Configsection
- * @var Config
- */
- private $config = null;
-
- /**
- * IMAP Resource
- * @var imap_stream
- */
- private $imap = null;
-
- /**
- * Servername, Port, Flags
- * @var string
- */
- private $server = '';
+ /**
+ * Array mit den bereits vorhandenen Instanzen
+ * @var array
+ */
+ private static $instances = array();
+
+ /**
+ * Instanzname, die unterschiedlichen Entitäten werden über den Namen
+ * auseinandergehalten.
+ * @var string
+ */
+ private $instanceName = '';
+
+ /**
+ * Configsection
+ * @var Config
+ */
+ private $config = null;
+
+ /**
+ * IMAP Resource
+ * @var imap_stream
+ */
+ private $imap = null;
+
+ /**
+ * Servername, Port, Flags
+ * @var string
+ */
+ private $server = '';
/**
* Name der zuletzt geöffneten Mailbox
@@ -57,222 +57,222 @@ class imapConnection {
*/
private $mbox = '';
- /**
- * wird auf true gesetzt, wenn imapPing die Connection neu aufbaut
- * @var boolean
- */
- private $reopenedConnection = false;
-
- /**
- * liefert eine Liste der verfügbaren Folder
- * @param string $pattern
- * @return array
- */
- public function imapList($pattern = '*') {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * wird auf true gesetzt, wenn imapPing die Connection neu aufbaut
+ * @var boolean
+ */
+ private $reopenedConnection = false;
+
+ /**
+ * liefert eine Liste der verfügbaren Folder
+ * @param string $pattern
+ * @return array
+ */
+ public function imapList($pattern = '*') {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_list($this->imap, $this->server, $pattern);
- }
+ return imap_list($this->imap, $this->server, $pattern);
+ }
- /**
- * Checkt die Anzahl Messages in einer Mailbox
- * return array
- */
- public function imapCheck() {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * Checkt die Anzahl Messages in einer Mailbox
+ * return array
+ */
+ public function imapCheck() {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_check($this->imap);
- }
+ return imap_check($this->imap);
+ }
- /**
- * per imap_reopen die aktuelle Connection auf eine andere mbox umstellen
- * @param string $mbox
- * @return boolean
- */
- public function imapSwitchMbox($mbox) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * per imap_reopen die aktuelle Connection auf eine andere mbox umstellen
+ * @param string $mbox
+ * @return boolean
+ */
+ public function imapSwitchMbox($mbox) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- if (imap_reopen($this->imap, $this->server.$mbox) === false) {
- throw new IMAPException(__METHOD__ . ' reopen failed');
- }
+ if (imap_reopen($this->imap, $this->server.$mbox) === false) {
+ throw new IMAPException(__METHOD__ . ' reopen failed');
+ }
$this->mbox = $mbox;
- return true;
- }
-
-
- /**
- * setzt ein Flag bei allen in $sequence aufgeführten Messages
- * @param string $sequence
- * @param string $flag
- * @param integer $options
- * @return boolean
- */
- public function imapSetflagFull($sequence, $flag, $options = 0) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return true;
+ }
+
+
+ /**
+ * setzt ein Flag bei allen in $sequence aufgeführten Messages
+ * @param string $sequence
+ * @param string $flag
+ * @param integer $options
+ * @return boolean
+ */
+ public function imapSetflagFull($sequence, $flag, $options = 0) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_setflag_full($this->imap, $sequence, $flag, $options);
- }
+ return imap_setflag_full($this->imap, $sequence, $flag, $options);
+ }
- /**
- * liefert die Mailheader
- * @return array
- */
- public function imapHeaders() {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * liefert die Mailheader
+ * @return array
+ */
+ public function imapHeaders() {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_headers($this->imap);
- }
-
- /**
- * liefert die Header zu genau einer Mail mit der gegebenen ID
- * @param integer $number
- * @return array
- */
- public function imapHeader($number) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_headers($this->imap);
+ }
+
+ /**
+ * liefert die Header zu genau einer Mail mit der gegebenen ID
+ * @param integer $number
+ * @return array
+ */
+ public function imapHeader($number) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_headerinfo($this->imap, $number);
- }
+ return imap_headerinfo($this->imap, $number);
+ }
- /**
- * liefert die Header zu genau einer Mail mit der gegebenen UID
- * @param integer $uid
- * @return array
- */
- public function imapFetchHeader($uid) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * liefert die Header zu genau einer Mail mit der gegebenen UID
+ * @param integer $uid
+ * @return array
+ */
+ public function imapFetchHeader($uid) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
- $ret = imap_fetchheader($this->imap, $uid, FT_UID);
+ $ret = imap_fetchheader($this->imap, $uid, FT_UID);
return $ret;
- }
+ }
- /**
- * liefert die Header zu genau einer Mail mit der gegebenen UID
- * @param integer $uid
- * @return array
- */
- public function imapFetchOverview($uid) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * liefert die Header zu genau einer Mail mit der gegebenen UID
+ * @param integer $uid
+ * @return array
+ */
+ public function imapFetchOverview($uid) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
- $ret = imap_fetch_overview($this->imap, $uid, FT_UID);
+ $ret = imap_fetch_overview($this->imap, $uid, FT_UID);
return $ret[0];
- }
-
- /**
- * liefert den Body zu genau einer Mail mit der gegebenen ID
- * @param integer $number
- * @return string
- */
- public function imapBody($number) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ }
+
+ /**
+ * liefert den Body zu genau einer Mail mit der gegebenen ID
+ * @param integer $number
+ * @return string
+ */
+ public function imapBody($number) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_body($this->imap, $number);
- }
-
- /**
- * liefert den Body zu genau einer Mail mit der gegebenen UID
- * @param integer $uid
- * @return string
- */
- public function imapBodyByUID($uid) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_body($this->imap, $number);
+ }
+
+ /**
+ * liefert den Body zu genau einer Mail mit der gegebenen UID
+ * @param integer $uid
+ * @return string
+ */
+ public function imapBodyByUID($uid) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_body($this->imap, $uid, FT_UID );
- }
-
- /**
- * markiert die Nachricht mit der unique ID zum löschen
- * @param integer $uid
- * return boolean
- */
- public function imapDelete($uid) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_body($this->imap, $uid, FT_UID );
+ }
+
+ /**
+ * markiert die Nachricht mit der unique ID zum löschen
+ * @param integer $uid
+ * return boolean
+ */
+ public function imapDelete($uid) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- $ret = imap_delete($this->imap, $uid, FT_UID);
+ $ret = imap_delete($this->imap, $uid, FT_UID);
- if ($ret !== true) {
- print "imap delete returned false for ".$uid."\n";
- }
+ if ($ret !== true) {
+ print "imap delete returned false for ".$uid."\n";
+ }
- return $ret;
- }
+ return $ret;
+ }
- /**
- * löscht alle zum löschen markierten Nachrichten
- * @return boolean
- */
- public function imapExpunge() {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * löscht alle zum löschen markierten Nachrichten
+ * @return boolean
+ */
+ public function imapExpunge() {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_expunge($this->imap);
- }
-
- /**
- * kopiert die Nachricht mit der gegebenen uid in die gegebene Mailbox *auf dem selben Server*
- * @param integer $uid
- * @param string $dest_mbox
- * @return boolean
- */
- public function imapMailCopy($uid, $dest_mbox) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_expunge($this->imap);
+ }
+
+ /**
+ * kopiert die Nachricht mit der gegebenen uid in die gegebene Mailbox *auf dem selben Server*
+ * @param integer $uid
+ * @param string $dest_mbox
+ * @return boolean
+ */
+ public function imapMailCopy($uid, $dest_mbox) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_mail_copy($this->imap, $uid, $dest_mbox, CP_UID);
- }
-
- /**
- * verschiebt die Nachricht mit der gegebenen uid in die gegebene Mailbox *auf dem selben Server*
- * @param integer $uid
- * @param string $dest_mbox
- * @return boolean
- */
- public function imapMailMove($uid, $dest_mbox) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_mail_copy($this->imap, $uid, $dest_mbox, CP_UID);
+ }
+
+ /**
+ * verschiebt die Nachricht mit der gegebenen uid in die gegebene Mailbox *auf dem selben Server*
+ * @param integer $uid
+ * @param string $dest_mbox
+ * @return boolean
+ */
+ public function imapMailMove($uid, $dest_mbox) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
/*
* dont't add the server part,
@@ -280,136 +280,136 @@ class imapConnection {
*
* $dest_mbox = $this->server.$dest_mbox;
*/
- return imap_mail_move( $this->imap, $uid, $dest_mbox, CP_UID);
- }
-
- /**
- * legt eine neue Mailbox *auf dem selben Server* an
- * @param string $mbox
- * @return boolean
- */
- public function imapCreateMailbox($mbox) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_mail_move( $this->imap, $uid, $dest_mbox, CP_UID);
+ }
+
+ /**
+ * legt eine neue Mailbox *auf dem selben Server* an
+ * @param string $mbox
+ * @return boolean
+ */
+ public function imapCreateMailbox($mbox) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_createmailbox($this->imap, $this->server.$mbox);
- }
-
- /**
- * fragt ab, ob eine mbox unterhalb von mbox_root existiert und liefert true zurück, falls ja
- * Funktion existiert nicht direkt als IMAP Kommando, aus einzelnen Kommando's zusammengebaut
- *
- * @param string $mbox_root
- * @param string $mbox
- * @return boolean
- */
- public function imapMailboxExists($mbox_root, $mbox) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ return imap_createmailbox($this->imap, $this->server.$mbox);
+ }
+
+ /**
+ * fragt ab, ob eine mbox unterhalb von mbox_root existiert und liefert true zurück, falls ja
+ * Funktion existiert nicht direkt als IMAP Kommando, aus einzelnen Kommando's zusammengebaut
+ *
+ * @param string $mbox_root
+ * @param string $mbox
+ * @return boolean
+ */
+ public function imapMailboxExists($mbox_root, $mbox) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- $folderlist = $this->imapList($mbox_root);
- $foundFolder = false;
- foreach ($folderlist as $folder) {
- if (strpos($folder, $mbox) !== false) {
- return true;
- }
- }
-
- return false;
- }
-
- const AR_YYYY = 'Y';
- const AR_YYYYMM = 'Ym';
- const AR_YYYYMMDD = 'Ymd';
-
- /**
- * erzeugt eine Archivmailbox zur Mailbox $mbox, dabei wird das Archiv unterhalb von $mbox
- * auf dem selben Server angelegt, der Name der Mailbox enthält je nach $mode noch einen Datumsstamp
- * Wenn der Input ($mbox) bereits mehrere Ebenen enthält (NOC3.domain.incoming z.B.), dann
- * wird automatisch nur der am weitesten rechts stehende Teil extrahiert und benutzt.
- * NOC3.domain.incoming => NOC3.domain.incoming.incoming-200705
- * @param string $mbox
- * @param string $mode
- * @param integer $timestamp
- * @param string $delimiter
- * @return string
- */
- public static function imapMakeArchiveName($mbox, $mode, $timestamp = null, $delimiter = '-') {
- if ($timestamp === null)
- $timestamp = time();
-
- $ar = explode('.', $mbox);
-
- $sub_mbox = $ar[count($ar) - 1];
-
- return $mbox.'.'.$sub_mbox.$delimiter.date($mode,$timestamp);
- }
-
- public static function imapMakePrefixedArchiveName($mbox, $mode, $prefix = '', $timestamp = null, $delimiter = '-') {
- if ($timestamp === null)
- $timestamp = time();
-
- $ar = explode('.', $mbox);
-
- $sub_mbox = $ar[count($ar) - 1];
-
- return $mbox.'.'.$prefix.$delimiter.$sub_mbox.$delimiter.date($mode,$timestamp);
- }
-
- /**
- * liefert die unique ID der Nachricht mit der laufenden msg_number
- * @param integer $msg_number
- * @return integer
- */
- public function imapUID($msg_number) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ $folderlist = $this->imapList($mbox_root);
+ $foundFolder = false;
+ foreach ($folderlist as $folder) {
+ if (strpos($folder, $mbox) !== false) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ const AR_YYYY = 'Y';
+ const AR_YYYYMM = 'Ym';
+ const AR_YYYYMMDD = 'Ymd';
+
+ /**
+ * erzeugt eine Archivmailbox zur Mailbox $mbox, dabei wird das Archiv unterhalb von $mbox
+ * auf dem selben Server angelegt, der Name der Mailbox enthält je nach $mode noch einen Datumsstamp
+ * Wenn der Input ($mbox) bereits mehrere Ebenen enthält (NOC3.domain.incoming z.B.), dann
+ * wird automatisch nur der am weitesten rechts stehende Teil extrahiert und benutzt.
+ * NOC3.domain.incoming => NOC3.domain.incoming.incoming-200705
+ * @param string $mbox
+ * @param string $mode
+ * @param integer $timestamp
+ * @param string $delimiter
+ * @return string
+ */
+ public static function imapMakeArchiveName($mbox, $mode, $timestamp = null, $delimiter = '-') {
+ if ($timestamp === null)
+ $timestamp = time();
+
+ $ar = explode('.', $mbox);
+
+ $sub_mbox = $ar[count($ar) - 1];
+
+ return $mbox.'.'.$sub_mbox.$delimiter.date($mode,$timestamp);
+ }
+
+ public static function imapMakePrefixedArchiveName($mbox, $mode, $prefix = '', $timestamp = null, $delimiter = '-') {
+ if ($timestamp === null)
+ $timestamp = time();
+
+ $ar = explode('.', $mbox);
+
+ $sub_mbox = $ar[count($ar) - 1];
+
+ return $mbox.'.'.$prefix.$delimiter.$sub_mbox.$delimiter.date($mode,$timestamp);
+ }
+
+ /**
+ * liefert die unique ID der Nachricht mit der laufenden msg_number
+ * @param integer $msg_number
+ * @return integer
+ */
+ public function imapUID($msg_number) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_uid($this->imap, $msg_number);
- }
+ return imap_uid($this->imap, $msg_number);
+ }
- /**
- * liefert die laufende msg_number der Nachricht, die die unique ID uid hat
- * @param integer $uid
- * @return integer
- */
- public function imapMsgNo($uid) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ /**
+ * liefert die laufende msg_number der Nachricht, die die unique ID uid hat
+ * @param integer $uid
+ * @return integer
+ */
+ public function imapMsgNo($uid) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
$this->imapPing(true);
- return imap_msgno($this->imap, $uid);
- }
+ return imap_msgno($this->imap, $uid);
+ }
- /**
- * prüft, ob die Connection noch aktiv ist, Exception falls keine Connection definiert ist,
+ /**
+ * prüft, ob die Connection noch aktiv ist, Exception falls keine Connection definiert ist,
* oder die Connection geschlossen wurde
* wenn reconnect = true, dann wird bei einer geschlossenen Connection die Connection neu aufgebaut
* @param boolean $reconnect
- * @return boolean
- */
- public function imapPing($reconnect = false) {
- if ($this->imap === null) {
- throw new IMAPException(__METHOD__ . ' not connected');
- }
+ * @return boolean
+ */
+ public function imapPing($reconnect = false) {
+ if ($this->imap === null) {
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
- $ret = imap_ping($this->imap);
+ $ret = imap_ping($this->imap);
if ($ret === false) {
if ($reconnect === true) {
- $this->imap = $this->imapOpen($this->server.$this->mbox,
- $this->config->username,
- $this->config->password,
- OP_HALFOPEN);
+ $this->imap = $this->imapOpen($this->server.$this->mbox,
+ $this->config->username,
+ $this->config->password,
+ OP_HALFOPEN);
$ret = imap_ping($this->imap);
@@ -424,138 +424,138 @@ class imapConnection {
}
}
- return true;
- }
+ return true;
+ }
- public function __destruct() {
- if ($this->imap !== null) {
- imap_close($this->imap);
- $this->imap = null;
- }
- }
+ public function __destruct() {
+ if ($this->imap !== null) {
+ imap_close($this->imap);
+ $this->imap = null;
+ }
+ }
- /**
- * true, wenn imapPing die Connection neu aufgemacht hat
- * Variable wird auf false gesetzt wenn $flush true ist
- * @param boolean $flush
- * @return boolean
- */
- public function connectionReopened($flush = true) {
- $ret = $this->reopenedConnection;
- if ($flush === true) {
- $this->reopenedConnection = false;
- }
- return $ret;
- }
+ /**
+ * true, wenn imapPing die Connection neu aufgemacht hat
+ * Variable wird auf false gesetzt wenn $flush true ist
+ * @param boolean $flush
+ * @return boolean
+ */
+ public function connectionReopened($flush = true) {
+ $ret = $this->reopenedConnection;
+ if ($flush === true) {
+ $this->reopenedConnection = false;
+ }
+ return $ret;
+ }
- /**
- * interne IMAP Open Methode
- *
- * @param string $servername
+ /**
+ * interne IMAP Open Methode
+ *
+ * @param string $servername
* @param string $username
* @param string password
* @param integer $flags
- * @return resource
- */
+ * @return resource
+ */
protected function imapOpen($server, $username, $password, $flags) {
- return imap_open($server, $username, $password, $flags);
+ return imap_open($server, $username, $password, $flags);
}
- /**
- * privater Konstruktor, wird exklusiv von getInstance aufgerufen
- *
- * @param $instanceName
- * @param $config
- */
- protected function __construct($instanceName, $config) {
- $this->instanceName = $instanceName;
- $this->config = $config;
-
- if (!isset($this->config->mailhost)) {
- throw new IMAPException(__METHOD__ . ' config attribute missing: "mailhost"');
- }
- if (!isset($this->config->username)) {
- throw new IMAPException(__METHOD__ . ' config attribute missing: "username"');
- }
- if (!isset($this->config->password)) {
- throw new IMAPException(__METHOD__ . ' config attribute missing: "password"');
- }
- if (!isset($this->config->port)) {
- throw new IMAPException(__METHOD__ . ' config attribute missing: "port"');
- }
-
- $this->server = '{'.$this->config->mailhost.':'.$this->config->port.'/imap';
- if( isset($this->config->use_tls) &&
- $this->config->use_tls != 0 ) {
- $this->server .= '/tls';
- }
- $this->server .= '/novalidate-cert}';
-
- $mbox = '';
+ /**
+ * privater Konstruktor, wird exklusiv von getInstance aufgerufen
+ *
+ * @param $instanceName
+ * @param $config
+ */
+ protected function __construct($instanceName, $config) {
+ $this->instanceName = $instanceName;
+ $this->config = $config;
+
+ if (!isset($this->config->mailhost)) {
+ throw new IMAPException(__METHOD__ . ' config attribute missing: "mailhost"');
+ }
+ if (!isset($this->config->username)) {
+ throw new IMAPException(__METHOD__ . ' config attribute missing: "username"');
+ }
+ if (!isset($this->config->password)) {
+ throw new IMAPException(__METHOD__ . ' config attribute missing: "password"');
+ }
+ if (!isset($this->config->port)) {
+ throw new IMAPException(__METHOD__ . ' config attribute missing: "port"');
+ }
+
+ $this->server = '{'.$this->config->mailhost.':'.$this->config->port.'/imap';
+ if( isset($this->config->use_tls) &&
+ $this->config->use_tls != 0 ) {
+ $this->server .= '/tls';
+ }
+ $this->server .= '/novalidate-cert}';
+
+ $mbox = '';
$this->mbox = $mbox;
- $this->imap = null;
-
- $this->imap = $this->imapOpen($this->server.$mbox,
- $this->config->username,
- $this->config->password,
- OP_HALFOPEN);
-
- if ($this->imap === false) {
- $this->imap = null;
- throw new IMAPException(__METHOD__ . ' not connected');
- }
-
- $this->reopenedConnection = false;
- }
-
-
- /**
- * sucht nach einer bereits vorhandenen Instanz, wird keine gefunden,
- * dann wird eine neue Instanz angelegt.
- * Man kann die Config-Variable weglassen, wenn man sicher ist, dass
- * bereits eine Instanz mit dem gewünschten instanceName existiert,
- * existiert aber keiner, dann liefert getInstance eine Exception.
- *
- * @param $instance
- * @param $config
- * @return imapConnection
- */
- public static function getInstance($instanceName,$config = null) {
- if (!self::$instances)
- self::$instances = array();
-
- foreach (self::$instances as $instance) {
- if ($instance->getInstanceName() == $instanceName)
- return $instance;
- }
-
- /*
- if (!$config instanceof Config) {
- throw new IMAPException(__METHOD__ . ' no config');
- }
- */
-
- $object = new imapConnection($instanceName, $config);
-
- self::$instances[] = $object;
-
- return $object;
- }
-
-
- /**
- * Liefert den Namen der aktuellen Instanz
- * @return string
- */
- public function getInstanceName() {
- return $this->instanceName;
- }
+ $this->imap = null;
+
+ $this->imap = $this->imapOpen($this->server.$mbox,
+ $this->config->username,
+ $this->config->password,
+ OP_HALFOPEN);
+
+ if ($this->imap === false) {
+ $this->imap = null;
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
+
+ $this->reopenedConnection = false;
+ }
+
+
+ /**
+ * sucht nach einer bereits vorhandenen Instanz, wird keine gefunden,
+ * dann wird eine neue Instanz angelegt.
+ * Man kann die Config-Variable weglassen, wenn man sicher ist, dass
+ * bereits eine Instanz mit dem gewünschten instanceName existiert,
+ * existiert aber keiner, dann liefert getInstance eine Exception.
+ *
+ * @param $instance
+ * @param $config
+ * @return imapConnection
+ */
+ public static function getInstance($instanceName,$config = null) {
+ if (!self::$instances)
+ self::$instances = array();
+
+ foreach (self::$instances as $instance) {
+ if ($instance->getInstanceName() == $instanceName)
+ return $instance;
+ }
+
+ /*
+ if (!$config instanceof Config) {
+ throw new IMAPException(__METHOD__ . ' no config');
+ }
+ */
+
+ $object = new imapConnection($instanceName, $config);
+
+ self::$instances[] = $object;
+
+ return $object;
+ }
+
+
+ /**
+ * Liefert den Namen der aktuellen Instanz
+ * @return string
+ */
+ public function getInstanceName() {
+ return $this->instanceName;
+ }
}
diff --git a/manager/library/l10n/L10n.php b/manager/library/l10n/L10n.php
index 80fb091..6bcea2f 100644
--- a/manager/library/l10n/L10n.php
+++ b/manager/library/l10n/L10n.php
@@ -1,47 +1,47 @@
-<?php
-/**
- * encapsulate Zend_Locale within an singleton class
- * @author markus
- * $Id: L10n.php 13 2009-11-24 14:52:56Z markus $
- */
-class L10n {
- /**
- * static pointer to instance
- * @var L10n
- */
- private static $instance = null;
-
- /**
- * config object
- * @var Zend_Locale
- */
- private $locale = null;
-
- /**
- * make new translate
- */
- protected function __construct() {
- $this->locale = new Zend_Locale();
- }
-
- /**
- * get already existing instance, make new instance or throw an exception
- * @return L10n
- */
- public static function getInstance() {
- if (self::$instance === null) {
- self::$instance = new L10n();
- }
-
- return self::$instance;
- }
-
- /**
- * magic __call dispatches all unknown methods to Zend_Locale
- * @param unknown_type $method
- * @param unknown_type $arguments
- */
- public function __call($method, $arguments) {
- return call_user_func_array(array($this->locale, $method), $arguments);
- }
-}
+<?php
+/**
+ * encapsulate Zend_Locale within an singleton class
+ * @author markus
+ * $Id: L10n.php 13 2009-11-24 14:52:56Z markus $
+ */
+class L10n {
+ /**
+ * static pointer to instance
+ * @var L10n
+ */
+ private static $instance = null;
+
+ /**
+ * config object
+ * @var Zend_Locale
+ */
+ private $locale = null;
+
+ /**
+ * make new translate
+ */
+ protected function __construct() {
+ $this->locale = new Zend_Locale();
+ }
+
+ /**
+ * get already existing instance, make new instance or throw an exception
+ * @return L10n
+ */
+ public static function getInstance() {
+ if (self::$instance === null) {
+ self::$instance = new L10n();
+ }
+
+ return self::$instance;
+ }
+
+ /**
+ * magic __call dispatches all unknown methods to Zend_Locale
+ * @param unknown_type $method
+ * @param unknown_type $arguments
+ */
+ public function __call($method, $arguments) {
+ return call_user_func_array(array($this->locale, $method), $arguments);
+ }
+}
diff --git a/manager/library/log/Log.php b/manager/library/log/Log.php
index 8ad27b9..ce5a1e2 100644
--- a/manager/library/log/Log.php
+++ b/manager/library/log/Log.php
@@ -1,105 +1,105 @@
-<?php
-/**
- * encapsulate Zend_Log with one or several log writers within an singleton class
- * @author markus
- * $Id: Log.php 77 2010-02-26 11:58:34Z markus $
- */
-class Log {
- /**
- * static pointer to instances
- * @var array(Config)
- */
- private static $instances = array();
-
- /**
- * can handle several instances, distinct by instance name string
- * @var string
- */
- private $instanceName = '';
-
- /**
- * config object
- * @var Zend_Log
- */
- private $log = null;
-
- /**
- * make new logger, configuration is taken from system_config, section $instanceName
- * @param string $instanceName
- * @param string $application
- */
- protected function __construct($instanceName, $application = null) {
- if ($instanceName === null)
- throw new Exception(__METHOD__ . ': expected an instance name, got none');
-
- $config = Config::getInstance(SYSTEM_CONFIG);
- $log_config = $config->$instanceName;
-
- $this->log = new Zend_Log();
- if (isset($log_config->file) && intval($log_config->file->enabled) !== 0) {
- $file_logger = new Zend_Log_Writer_Stream($log_config->file->name);
-
- /**
- *
- $format = Zend_Log_Formatter_Simple::DEFAULT_FORMAT;
- $formatter = new Zend_Log_Formatter_Simple($format);
- $file_logger->setFormatter($formatter);
- */
- if (isset($application) && $application != '')
- $this->log->setEventItem('application', $application);
- $formatter = new Zend_Log_Formatter_Simple('%syslog_time% %application%[%pid%]: %priorityName%: %message%' . PHP_EOL);
- $file_logger->setFormatter($formatter);
- $this->log->addWriter($file_logger);
- }
- if (isset($log_config->syslog) && intval($log_config->syslog->enabled) !== 0) {
- $param = array('facility' => $log_config->syslog->facility);
- if (isset($application) && $application != '')
- $param['application'] = $application;
-
- $sys_logger = new Zend_Log_Writer_Syslog($param);
- $formatter = new Zend_Log_Formatter_Simple('%priorityName%: %message%' . PHP_EOL);
- $sys_logger->setFormatter($formatter);
- $this->log->addWriter($sys_logger);
- }
-
- $filter = new Zend_Log_Filter_Priority(intval($log_config->priority));
- $this->log->addFilter($filter);
- }
-
- /**
- * get already existing instance, make new instance or throw an exception
- * @param string $instanceName
- * @param string $application
- */
- public static function getInstance($instanceName = null, $application = null) {
- if ($instanceName === null) {
- if (count(self::$instances) == 0)
- throw new Exception(__METHOD__ . ': expected an instance name, got none');
- return self::$instances[0];
- }
-
- if (!array_key_exists($instanceName, self::$instances)) {
- self::$instances[$instanceName] = new Log($instanceName, $application);
- }
-
- return self::$instances[$instanceName];
- }
-
- /**
- * return SYSTEM_LOG for convenience
- * @return Zend_Log
- */
- public static function Log() {
- return self::$instances[SYSTEM_LOG]->getLog();
- }
-
- /**
- * get the Zend_Log object
- * @return Zend_Log
- */
- public function getLog() {
- $this->log->setEventItem('pid', posix_getpid());
- $this->log->setEventItem('syslog_time', date('Y-m-d H:i:s'));
- return $this->log;
- }
-}
+<?php
+/**
+ * encapsulate Zend_Log with one or several log writers within an singleton class
+ * @author markus
+ * $Id: Log.php 77 2010-02-26 11:58:34Z markus $
+ */
+class Log {
+ /**
+ * static pointer to instances
+ * @var array(Config)
+ */
+ private static $instances = array();
+
+ /**
+ * can handle several instances, distinct by instance name string
+ * @var string
+ */
+ private $instanceName = '';
+
+ /**
+ * config object
+ * @var Zend_Log
+ */
+ private $log = null;
+
+ /**
+ * make new logger, configuration is taken from system_config, section $instanceName
+ * @param string $instanceName
+ * @param string $application
+ */
+ protected function __construct($instanceName, $application = null) {
+ if ($instanceName === null)
+ throw new Exception(__METHOD__ . ': expected an instance name, got none');
+
+ $config = Config::getInstance(SYSTEM_CONFIG);
+ $log_config = $config->$instanceName;
+
+ $this->log = new Zend_Log();
+ if (isset($log_config->file) && intval($log_config->file->enabled) !== 0) {
+ $file_logger = new Zend_Log_Writer_Stream($log_config->file->name);
+
+ /**
+ *
+ $format = Zend_Log_Formatter_Simple::DEFAULT_FORMAT;
+ $formatter = new Zend_Log_Formatter_Simple($format);
+ $file_logger->setFormatter($formatter);
+ */
+ if (isset($application) && $application != '')
+ $this->log->setEventItem('application', $application);
+ $formatter = new Zend_Log_Formatter_Simple('%syslog_time% %application%[%pid%]: %priorityName%: %message%' . PHP_EOL);
+ $file_logger->setFormatter($formatter);
+ $this->log->addWriter($file_logger);
+ }
+ if (isset($log_config->syslog) && intval($log_config->syslog->enabled) !== 0) {
+ $param = array('facility' => $log_config->syslog->facility);
+ if (isset($application) && $application != '')
+ $param['application'] = $application;
+
+ $sys_logger = new Zend_Log_Writer_Syslog($param);
+ $formatter = new Zend_Log_Formatter_Simple('%priorityName%: %message%' . PHP_EOL);
+ $sys_logger->setFormatter($formatter);
+ $this->log->addWriter($sys_logger);
+ }
+
+ $filter = new Zend_Log_Filter_Priority(intval($log_config->priority));
+ $this->log->addFilter($filter);
+ }
+
+ /**
+ * get already existing instance, make new instance or throw an exception
+ * @param string $instanceName
+ * @param string $application
+ */
+ public static function getInstance($instanceName = null, $application = null) {
+ if ($instanceName === null) {
+ if (count(self::$instances) == 0)
+ throw new Exception(__METHOD__ . ': expected an instance name, got none');
+ return self::$instances[0];
+ }
+
+ if (!array_key_exists($instanceName, self::$instances)) {
+ self::$instances[$instanceName] = new Log($instanceName, $application);
+ }
+
+ return self::$instances[$instanceName];
+ }
+
+ /**
+ * return SYSTEM_LOG for convenience
+ * @return Zend_Log
+ */
+ public static function Log() {
+ return self::$instances[SYSTEM_LOG]->getLog();
+ }
+
+ /**
+ * get the Zend_Log object
+ * @return Zend_Log
+ */
+ public function getLog() {
+ $this->log->setEventItem('pid', posix_getpid());
+ $this->log->setEventItem('syslog_time', date('Y-m-d H:i:s'));
+ return $this->log;
+ }
+}
diff --git a/manager/library/plugins/plugin.buildmenu.php b/manager/library/plugins/plugin.buildmenu.php
index d98b14e..58eb090 100644
--- a/manager/library/plugins/plugin.buildmenu.php
+++ b/manager/library/plugins/plugin.buildmenu.php
@@ -1,74 +1,74 @@
-<?php
-
-/**
- * this plugin tries to add modules to the top navigation depending on the user
- * which is logged in and the required permissions needed (provided by the action modules)
- *
- * @author markus
- * $Id: plugin.buildmenu.php 95 2010-03-19 14:14:39Z markus $
- */
-class BuildMenu extends Zend_Controller_Plugin_Abstract {
- public function preDispatch(Zend_Controller_Request_Abstract $request) {
- $session = Zend_Registry::get('session');
- if (!isset($session->authdata) || !isset($session->authdata['authed']) || $session->authdata['authed'] === false)
- return;
-
- $cur_ctrl = $request->getControllerName();
- $cur_action = $request->getActionName();
-
- $view = Zend_Registry::get('view');
-
- if (is_dir(FWACTIONS_PATH)) {
- $dir = opendir(FWACTIONS_PATH);
-
- while (($file = readdir($dir)) !== false) {
- if ($file == '.' || $file == '..')
- continue;
- if (preg_match('/^Action([a-zA-Z0-9_]*)\.php/', $file, $match)) {
- $path = FWACTIONS_PATH . '/' . $file;
- require_once($path);
-
- $r = new ReflectionClass($match[1]);
-
- if ($r->isSubclassOf('FWAction')) {
- /**
- * match Actions permission with the permissions of the currently logged in user,
- * add to menu if user has access to that action
- */
-
- $required = $r->getMethod('getRequiredPermissions')->invoke(null);
- $menuprio = $r->getMethod('getTopNavPrio')->invoke(null);
- $ctrl = $r->getMethod('getController')->invoke(null);
- $action = $r->getMethod('getAction')->invoke(null);
- $text = $r->getMethod('getMenutext')->invoke(null);
- $role = $session->authdata['authed_role'];
-
- if ($cur_ctrl == $ctrl) # && $cur_action == $action)
- $aclass = ' class="active"';
- else
- $aclass = '';
-
- $acl = $session->authdata['authed_permissions'];
- if (is_array($required) && count($required) == 0) {
- $view->topNav('<a href="' .
- $view->url(array('controller' => $ctrl, 'action' => $action), 'default', true) .
- '"' . $aclass . '>' . I18n::_($text) . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
- }
- else {
- foreach ($required as $rperm) {
- if ($acl->has($rperm) && $acl->isAllowed($role, $rperm, 'view')) {
- $view->topNav('<a href="' .
- $view->url(array('controller' => $ctrl, 'action' => $action), 'default', true) .
- '"' . $aclass . '>' . I18n::_($text) . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
- break; // exit on first match
- }
- }
- }
- }
- }
- }
-
- closedir($dir);
- }
- }
+<?php
+
+/**
+ * this plugin tries to add modules to the top navigation depending on the user
+ * which is logged in and the required permissions needed (provided by the action modules)
+ *
+ * @author markus
+ * $Id: plugin.buildmenu.php 95 2010-03-19 14:14:39Z markus $
+ */
+class BuildMenu extends Zend_Controller_Plugin_Abstract {
+ public function preDispatch(Zend_Controller_Request_Abstract $request) {
+ $session = Zend_Registry::get('session');
+ if (!isset($session->authdata) || !isset($session->authdata['authed']) || $session->authdata['authed'] === false)
+ return;
+
+ $cur_ctrl = $request->getControllerName();
+ $cur_action = $request->getActionName();
+
+ $view = Zend_Registry::get('view');
+
+ if (is_dir(FWACTIONS_PATH)) {
+ $dir = opendir(FWACTIONS_PATH);
+
+ while (($file = readdir($dir)) !== false) {
+ if ($file == '.' || $file == '..')
+ continue;
+ if (preg_match('/^Action([a-zA-Z0-9_]*)\.php/', $file, $match)) {
+ $path = FWACTIONS_PATH . '/' . $file;
+ require_once($path);
+
+ $r = new ReflectionClass($match[1]);
+
+ if ($r->isSubclassOf('FWAction')) {
+ /**
+ * match Actions permission with the permissions of the currently logged in user,
+ * add to menu if user has access to that action
+ */
+
+ $required = $r->getMethod('getRequiredPermissions')->invoke(null);
+ $menuprio = $r->getMethod('getTopNavPrio')->invoke(null);
+ $ctrl = $r->getMethod('getController')->invoke(null);
+ $action = $r->getMethod('getAction')->invoke(null);
+ $text = $r->getMethod('getMenutext')->invoke(null);
+ $role = $session->authdata['authed_role'];
+
+ if ($cur_ctrl == $ctrl) # && $cur_action == $action)
+ $aclass = ' class="active"';
+ else
+ $aclass = '';
+
+ $acl = $session->authdata['authed_permissions'];
+ if (is_array($required) && count($required) == 0) {
+ $view->topNav('<a href="' .
+ $view->url(array('controller' => $ctrl, 'action' => $action), 'default', true) .
+ '"' . $aclass . '>' . I18n::_($text) . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
+ }
+ else {
+ foreach ($required as $rperm) {
+ if ($acl->has($rperm) && $acl->isAllowed($role, $rperm, 'view')) {
+ $view->topNav('<a href="' .
+ $view->url(array('controller' => $ctrl, 'action' => $action), 'default', true) .
+ '"' . $aclass . '>' . I18n::_($text) . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
+ break; // exit on first match
+ }
+ }
+ }
+ }
+ }
+ }
+
+ closedir($dir);
+ }
+ }
} \ No newline at end of file
diff --git a/manager/library/plugins/plugin.charsetheader.php b/manager/library/plugins/plugin.charsetheader.php
index 57e4f50..cb3044b 100644
--- a/manager/library/plugins/plugin.charsetheader.php
+++ b/manager/library/plugins/plugin.charsetheader.php
@@ -1,13 +1,13 @@
-<?php
-/**
- * @author markus
- * $Id: plugin.charsetheader.php 13 2009-11-24 14:52:56Z markus $
- */
-class CharsetHeader extends Zend_Controller_Plugin_Abstract {
- public function preDispatch(Zend_Controller_Request_Abstract $request) {
- $response = $this->getResponse();
- if ($response->canSendHeaders() === true) {
- $response->setHeader('Content-Type', 'text/html; charset=utf-8');
- }
- }
+<?php
+/**
+ * @author markus
+ * $Id: plugin.charsetheader.php 13 2009-11-24 14:52:56Z markus $
+ */
+class CharsetHeader extends Zend_Controller_Plugin_Abstract {
+ public function preDispatch(Zend_Controller_Request_Abstract $request) {
+ $response = $this->getResponse();
+ if ($response->canSendHeaders() === true) {
+ $response->setHeader('Content-Type', 'text/html; charset=utf-8');
+ }
+ }
} \ No newline at end of file
diff --git a/manager/library/plugins/plugin.forceauth.php b/manager/library/plugins/plugin.forceauth.php
index 4fa9068..e971056 100644
--- a/manager/library/plugins/plugin.forceauth.php
+++ b/manager/library/plugins/plugin.forceauth.php
@@ -1,29 +1,29 @@
-<?php
-/**
- * @author markus
- * $Id: plugin.forceauth.php 40 2009-12-21 09:40:43Z markus $
- */
-class ForceAuth extends Zend_Controller_Plugin_Abstract {
- public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request) {
- $session = Zend_Registry::get('session');
-
- if (in_array($request->getControllerName(), array('login', 'error', 'js', 'img', 'css')))
- return;
-
- if (!isset($session->authdata) || !isset($session->authdata['authed']) || $session->authdata['authed'] === false) {
- $fc = Zend_Controller_Front::getInstance();
-
- $response = $fc->getResponse();
- $response->canSendHeaders(true);
-
- $response->setHeader('Location', 'login', true);
- $response->setHeader('Status', '301', true);
- Log::Log()->debug('redirected to login');
-
- $request->setModuleName('default')
- ->setControllerName('login')
- ->setActionName('index')
- ->setDispatched(false);
- }
- }
-}
+<?php
+/**
+ * @author markus
+ * $Id: plugin.forceauth.php 40 2009-12-21 09:40:43Z markus $
+ */
+class ForceAuth extends Zend_Controller_Plugin_Abstract {
+ public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request) {
+ $session = Zend_Registry::get('session');
+
+ if (in_array($request->getControllerName(), array('login', 'error', 'js', 'img', 'css')))
+ return;
+
+ if (!isset($session->authdata) || !isset($session->authdata['authed']) || $session->authdata['authed'] === false) {
+ $fc = Zend_Controller_Front::getInstance();
+
+ $response = $fc->getResponse();
+ $response->canSendHeaders(true);
+
+ $response->setHeader('Location', 'login', true);
+ $response->setHeader('Status', '301', true);
+ Log::Log()->debug('redirected to login');
+
+ $request->setModuleName('default')
+ ->setControllerName('login')
+ ->setActionName('index')
+ ->setDispatched(false);
+ }
+ }
+}
diff --git a/manager/library/plugins/plugin.loginlogout.php b/manager/library/plugins/plugin.loginlogout.php
index 8bd13db..1077ef2 100644
--- a/manager/library/plugins/plugin.loginlogout.php
+++ b/manager/library/plugins/plugin.loginlogout.php
@@ -1,31 +1,31 @@
-<?php
-
-/**
- * this plugin just monitors the authdata section in the current session and adds an login / logout link to the
- * top navigation bar depending on the value that was found
- * @author markus
- * $Id: plugin.loginlogout.php 95 2010-03-19 14:14:39Z markus $
- */
-class LoginLogout extends Zend_Controller_Plugin_Abstract {
- public function postDispatch(Zend_Controller_Request_Abstract $request) {
- $session = Zend_Registry::get('session');
- if (!isset($session->authdata) || !isset($session->authdata['authed']) || $session->authdata['authed'] === false) {
- $controller = 'login';
- $text = 'Login';
- }
- else {
- $controller = 'logout';
- $text = 'Logout';
- }
- $cur_ctrl = $request->getControllerName();
- if ($cur_ctrl == 'login')
- $aclass=' class="active"';
- else
- $aclass='';
-
- $view = Zend_Registry::get('view');
- $view->topNav('<a href="' .
- $view->url(array('controller' => $controller), 'default', true) .
- '"' . $aclass . '>' . I18n::_($text) . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, 1000);
- }
-}
+<?php
+
+/**
+ * this plugin just monitors the authdata section in the current session and adds an login / logout link to the
+ * top navigation bar depending on the value that was found
+ * @author markus
+ * $Id: plugin.loginlogout.php 95 2010-03-19 14:14:39Z markus $
+ */
+class LoginLogout extends Zend_Controller_Plugin_Abstract {
+ public function postDispatch(Zend_Controller_Request_Abstract $request) {
+ $session = Zend_Registry::get('session');
+ if (!isset($session->authdata) || !isset($session->authdata['authed']) || $session->authdata['authed'] === false) {
+ $controller = 'login';
+ $text = 'Login';
+ }
+ else {
+ $controller = 'logout';
+ $text = 'Logout';
+ }
+ $cur_ctrl = $request->getControllerName();
+ if ($cur_ctrl == 'login')
+ $aclass=' class="active"';
+ else
+ $aclass='';
+
+ $view = Zend_Registry::get('view');
+ $view->topNav('<a href="' .
+ $view->url(array('controller' => $controller), 'default', true) .
+ '"' . $aclass . '>' . I18n::_($text) . '</a>', Zend_View_Helper_Placeholder_Container_Abstract::SET, 1000);
+ }
+}
diff --git a/manager/locale/en_US/locale.php b/manager/locale/en_US/locale.php
index 68e6ef9..d266508 100644
--- a/manager/locale/en_US/locale.php
+++ b/manager/locale/en_US/locale.php
@@ -1,2 +1,2 @@
-<?php
-return array(); \ No newline at end of file
+<?php
+return array();
diff --git a/manager/public/css/form_dl.css b/manager/public/css/form_dl.css
index c3dc8c0..f677c34 100644
--- a/manager/public/css/form_dl.css
+++ b/manager/public/css/form_dl.css
@@ -1,23 +1,23 @@
@CHARSET "UTF-8";
#content dl.zend_form label.required {
- color: #000000;
- font-weight: bold;
+ color: #000000;
+ font-weight: bold;
}
#content dl.zend_form {
- display: block;
+ display: block;
}
#content dl.zend_form dt {
- display: block;
- float: left;
- width: 125px;
- margin: 10px;
+ display: block;
+ float: left;
+ width: 125px;
+ margin: 10px;
}
#content dl.zend_form dd {
- display: block;
- clear: right;
- padding: 10px;
+ display: block;
+ clear: right;
+ padding: 10px;
}
diff --git a/manager/public/css/form_dl_wide.css b/manager/public/css/form_dl_wide.css
index 6f8ed41..181c6ca 100644
--- a/manager/public/css/form_dl_wide.css
+++ b/manager/public/css/form_dl_wide.css
@@ -1,24 +1,24 @@
@CHARSET "UTF-8";
#content dl.zend_form label.required {
- color: #000000;
- font-weight: bold;
+ color: #000000;
+ font-weight: bold;
}
#content dl.zend_form {
- display: block;
- font-size: 0.8em;
+ display: block;
+ font-size: 0.8em;
}
#content dl.zend_form dt {
- display: block;
- float: left;
- width: 350px;
- margin: 10px;
+ display: block;
+ float: left;
+ width: 350px;
+ margin: 10px;
}
#content dl.zend_form dd {
- display: block;
- clear: right;
- padding: 10px;
+ display: block;
+ clear: right;
+ padding: 10px;
}
diff --git a/manager/public/css/global.css b/manager/public/css/global.css
index b289414..d67ce22 100644
--- a/manager/public/css/global.css
+++ b/manager/public/css/global.css
@@ -1,123 +1,123 @@
-@CHARSET "UTF-8";
-
-html {
- font-family: sans-serif;
- background-color: #cccccc;
- color: #333333;
- overflow: scroll;
-}
-
-#center {
- position: absolute;
- width: 1000px;
- left: 50%;
- margin-left: -500px;
-}
-
-#header {
- background-color: #F5F7F7;
- width: 99%;
- height: 30px;
- top: 0px;
- left: 0px;
- position: absolute;
- padding: 3px;
- margin: 3px;
-}
-
-#header-logo {
- float: left;
- color: #FFFFFF;
-}
-
-#header-navigation {
- float: right;
-}
-
-#header-navigation ul {
- list-style-type: none;
- padding: 0px;
- margin: 0px;
- font-size: 1.2em;
-}
-
-#header-navigation ul li {
- padding-left: 5px;
- margin-left: 5px;
- display: inline;
-}
-
-#header-navigation ul li a {
- text-decoration: none;
- color: #000000;
-}
-
-#header-navigation ul li a:hover {
- color: #777777;
-}
-
-#header-navigation ul li a.active {
- color: #505090;
-}
-
-#left-navigation {
- background-color: #F5F7F7;
- width: 180px;
- height: 600px;
- left: 0px;
- top: 36px;
- position: absolute;
- padding: 3px;
- margin: 3px;
-}
-
-#left-navigation ul {
- list-style-type: none;
- padding: 0px;
- margin: 0px;
- font-size: 1.2em;
-}
-
-#left-navigation ul li {
- padding-left: 5px;
- margin-left: 5px;
- display: block;
-}
-
-#left-navigation ul li a {
- text-decoration: none;
- color: #000000;
-}
-
-#left-navigation ul li a:hover {
- color: #777777;
-}
-
-#left-navigation ul li a.active {
- color: #770000;
-}
-
-#content {
- left: 186px;
- top: 36px;
- width: 800px;
- position: absolute;
- padding: 5px;
- margin: 3px;
- background-color: #FFFFFF;
-}
-
-#userinfo {
- right: 5px;
- bottom: 5px;
- position: absolute;
- padding: 3px;
- margin: 3px;
- background-color: #DDDDAA;
- font-size: 0.8em;
-}
-
-#content .error {
- color: #F80808;
- font-weight: bold;
+@CHARSET "UTF-8";
+
+html {
+ font-family: sans-serif;
+ background-color: #cccccc;
+ color: #333333;
+ overflow: scroll;
+}
+
+#center {
+ position: absolute;
+ width: 1000px;
+ left: 50%;
+ margin-left: -500px;
+}
+
+#header {
+ background-color: #F5F7F7;
+ width: 99%;
+ height: 30px;
+ top: 0px;
+ left: 0px;
+ position: absolute;
+ padding: 3px;
+ margin: 3px;
+}
+
+#header-logo {
+ float: left;
+ color: #FFFFFF;
+}
+
+#header-navigation {
+ float: right;
+}
+
+#header-navigation ul {
+ list-style-type: none;
+ padding: 0px;
+ margin: 0px;
+ font-size: 1.2em;
+}
+
+#header-navigation ul li {
+ padding-left: 5px;
+ margin-left: 5px;
+ display: inline;
+}
+
+#header-navigation ul li a {
+ text-decoration: none;
+ color: #000000;
+}
+
+#header-navigation ul li a:hover {
+ color: #777777;
+}
+
+#header-navigation ul li a.active {
+ color: #505090;
+}
+
+#left-navigation {
+ background-color: #F5F7F7;
+ width: 180px;
+ height: 600px;
+ left: 0px;
+ top: 36px;
+ position: absolute;
+ padding: 3px;
+ margin: 3px;
+}
+
+#left-navigation ul {
+ list-style-type: none;
+ padding: 0px;
+ margin: 0px;
+ font-size: 1.2em;
+}
+
+#left-navigation ul li {
+ padding-left: 5px;
+ margin-left: 5px;
+ display: block;
+}
+
+#left-navigation ul li a {
+ text-decoration: none;
+ color: #000000;
+}
+
+#left-navigation ul li a:hover {
+ color: #777777;
+}
+
+#left-navigation ul li a.active {
+ color: #770000;
+}
+
+#content {
+ left: 186px;
+ top: 36px;
+ width: 800px;
+ position: absolute;
+ padding: 5px;
+ margin: 3px;
+ background-color: #FFFFFF;
+}
+
+#userinfo {
+ right: 5px;
+ bottom: 5px;
+ position: absolute;
+ padding: 3px;
+ margin: 3px;
+ background-color: #DDDDAA;
+ font-size: 0.8em;
+}
+
+#content .error {
+ color: #F80808;
+ font-weight: bold;
} \ No newline at end of file
diff --git a/manager/public/css/login.css b/manager/public/css/login.css
index c68a4aa..7fcc8aa 100644
--- a/manager/public/css/login.css
+++ b/manager/public/css/login.css
@@ -1,11 +1,11 @@
-@CHARSET "UTF-8";
-
-#content a {
- text-decoration: none;
- color: #000000;
- font-size: 1.2em;
-}
-
-#content a:hover {
- color: #777777;
+@CHARSET "UTF-8";
+
+#content a {
+ text-decoration: none;
+ color: #000000;
+ font-size: 1.2em;
+}
+
+#content a:hover {
+ color: #777777;
} \ No newline at end of file
diff --git a/manager/public/css/mail.css b/manager/public/css/mail.css
index 4ce23f5..4fbcde3 100644
--- a/manager/public/css/mail.css
+++ b/manager/public/css/mail.css
@@ -1,49 +1,49 @@
-@CHARSET "UTF-8";
-
-#content table {
- border: 1px solid black;
- border-collapse: collapse;
-}
-
-#content th {
- border: 1px solid black;
- padding: 3px;
-}
-
-#content td {
- border: 1px solid black;
- padding: 3px;
-}
-
-#content .col1 {
- width: 170px;
-}
-#content .col2 {
- width: 170px;
-}
-#content .col3 {
- width: 165px;
-}
-#content .col4 {
- width: 170px;
-}
-#content .col5 {
- width: 50px;
-}
-#content .col6 {
- width: 30px;
-}
-
-#content a {
- text-decoration: none;
- color: #000000;
-}
-
-#content a:hover {
- color: #777777;
-}
-
-#content a.delete {
- background-color: #ffffff;
- color: white;
-}
+@CHARSET "UTF-8";
+
+#content table {
+ border: 1px solid black;
+ border-collapse: collapse;
+}
+
+#content th {
+ border: 1px solid black;
+ padding: 3px;
+}
+
+#content td {
+ border: 1px solid black;
+ padding: 3px;
+}
+
+#content .col1 {
+ width: 170px;
+}
+#content .col2 {
+ width: 170px;
+}
+#content .col3 {
+ width: 165px;
+}
+#content .col4 {
+ width: 170px;
+}
+#content .col5 {
+ width: 50px;
+}
+#content .col6 {
+ width: 30px;
+}
+
+#content a {
+ text-decoration: none;
+ color: #000000;
+}
+
+#content a:hover {
+ color: #777777;
+}
+
+#content a.delete {
+ background-color: #ffffff;
+ color: white;
+}
diff --git a/manager/public/index.php b/manager/public/index.php
index 229290b..f214332 100644
--- a/manager/public/index.php
+++ b/manager/public/index.php
@@ -1,51 +1,51 @@
-<?php
-/*
- * @done Zend_Locale (http://framework.zend.com/manual/en/zend.locale.functions.html)
- * @done Zend_Translate (Buch 381ff, 383) http://framework.zend.com/manual/en/zend.translate.using.html
- * @done Session Tabelle aufräumen (auto expire eingebaut, Housekeeper fehlt aber)
- * @todo Zend_Auth (LoginController - Reaktion auf falsche Eingaben fehlt noch)
- * @todo Zend_Filter_Input - Zeichensätze aus Userinput filtern
- * @todo Zend_Measure, Zend_Currency
- * @todo Zend_Date
- * @todo Daemon / CLI Zend_Console_Getopt (Buch 203ff)
- * @todo Zend_Mail (Buch 279ff)
- * @todo Zend_Form(!), Zend_Validate, Zend_Filter
- * @todo Zend_Log - Formatierung der Texte
- * @todo Funktionsmodule - jedes Modul prüft die Rechte anhand der Session und Zend_Acl und fügt ggf. einen Link ins Menü ein (TOP / LEFT)
- * @todo addMessages mit übersetzten Strings (LoginController -> getForm, ...)
- * @todo favicon
- * @todo sinnvolle Defaults, wenn system_config leer ist (globale Config BIND)
- * @todo sinnvolle Defaults, wenn system_config leer ist (Organisationsconfig BIND)
- * @todo Links zum Löschen für Zonen / Organisationen, Rechtechecks in ActionController (foreign key constraints beachten!)
- * @todo ConfigBIND left Menu geht nicht aus, wenn man die selektierte Org deaktiviert (init vor Action)
- * @todo Textausgabe, wenn Attribute aus Defaults initialisiert und NICHT aus der DB geladen wurden
- */
-
-require_once('../library/global/defines.php');
-
-try {
- /** Zend Autoloader */
- require_once 'Zend/Loader/Autoloader.php';
- Zend_Loader_Autoloader::getInstance();
-
- // Create application, bootstrap, and run
- $application = new Zend_Application(
- APPLICATION_ENV,
- APPLICATION_PATH . '/configs/application.ini'
- );
-
- /** override settings from application.ini, if necessary
- $fc = Zend_Controller_Front::getInstance();
- $fc->setControllerDirectory(realpath(APPLICATION_PATH . '/controllers'));
- $fc->setParam('noViewRenderer', false);
- $fc->throwExceptions(true);
- $fc->setParam('noErrorHandler', false);
- */
-
- $application->bootstrap()
- ->run();
-} catch (Exception $e) {
- print "Exception: " . $e->getMessage() . "\n";
- print $e->getTraceAsString() . "\n";
- Log::Log()->emerg($e);
-}
+<?php
+/*
+ * @done Zend_Locale (http://framework.zend.com/manual/en/zend.locale.functions.html)
+ * @done Zend_Translate (Buch 381ff, 383) http://framework.zend.com/manual/en/zend.translate.using.html
+ * @done Session Tabelle aufräumen (auto expire eingebaut, Housekeeper fehlt aber)
+ * @todo Zend_Auth (LoginController - Reaktion auf falsche Eingaben fehlt noch)
+ * @todo Zend_Filter_Input - Zeichensätze aus Userinput filtern
+ * @todo Zend_Measure, Zend_Currency
+ * @todo Zend_Date
+ * @todo Daemon / CLI Zend_Console_Getopt (Buch 203ff)
+ * @todo Zend_Mail (Buch 279ff)
+ * @todo Zend_Form(!), Zend_Validate, Zend_Filter
+ * @todo Zend_Log - Formatierung der Texte
+ * @todo Funktionsmodule - jedes Modul prüft die Rechte anhand der Session und Zend_Acl und fügt ggf. einen Link ins Menü ein (TOP / LEFT)
+ * @todo addMessages mit übersetzten Strings (LoginController -> getForm, ...)
+ * @todo favicon
+ * @todo sinnvolle Defaults, wenn system_config leer ist (globale Config BIND)
+ * @todo sinnvolle Defaults, wenn system_config leer ist (Organisationsconfig BIND)
+ * @todo Links zum Löschen für Zonen / Organisationen, Rechtechecks in ActionController (foreign key constraints beachten!)
+ * @todo ConfigBIND left Menu geht nicht aus, wenn man die selektierte Org deaktiviert (init vor Action)
+ * @todo Textausgabe, wenn Attribute aus Defaults initialisiert und NICHT aus der DB geladen wurden
+ */
+
+require_once('../library/global/defines.php');
+
+try {
+ /** Zend Autoloader */
+ require_once 'Zend/Loader/Autoloader.php';
+ Zend_Loader_Autoloader::getInstance();
+
+ // Create application, bootstrap, and run
+ $application = new Zend_Application(
+ APPLICATION_ENV,
+ APPLICATION_PATH . '/configs/application.ini'
+ );
+
+ /** override settings from application.ini, if necessary
+ $fc = Zend_Controller_Front::getInstance();
+ $fc->setControllerDirectory(realpath(APPLICATION_PATH . '/controllers'));
+ $fc->setParam('noViewRenderer', false);
+ $fc->throwExceptions(true);
+ $fc->setParam('noErrorHandler', false);
+ */
+
+ $application->bootstrap()
+ ->run();
+} catch (Exception $e) {
+ print "Exception: " . $e->getMessage() . "\n";
+ print $e->getTraceAsString() . "\n";
+ Log::Log()->emerg($e);
+}
diff --git a/manager/public/js/center.js b/manager/public/js/center.js
index 267550c..9313315 100644
--- a/manager/public/js/center.js
+++ b/manager/public/js/center.js
@@ -1,10 +1,10 @@
-function setCSS() {
- var x = window.innerWidth;
-
- x = x - 18; // maybe scroll bar
- document.getElementById('center').style.width = x + "px";
- document.getElementById('center').style.marginLeft = "-" + x/2 + "px";
-}
-
-window.onload = setCSS;
-window.onresize = setCSS;
+function setCSS() {
+ var x = window.innerWidth;
+
+ x = x - 18; // maybe scroll bar
+ document.getElementById('center').style.width = x + "px";
+ document.getElementById('center').style.marginLeft = "-" + x/2 + "px";
+}
+
+window.onload = setCSS;
+window.onresize = setCSS;
diff --git a/manager/public/js/mail_redirect.js b/manager/public/js/mail_redirect.js
index a60e58f..3486f21 100644
--- a/manager/public/js/mail_redirect.js
+++ b/manager/public/js/mail_redirect.js
@@ -1,8 +1,8 @@
-var delay = 2000;
-setTimeout('redirect()', delay);
-
-function redirect() {
- var returnto = document.getElementById('returnto');
-
- window.location = returnto.value;
+var delay = 2000;
+setTimeout('redirect()', delay);
+
+function redirect() {
+ var returnto = document.getElementById('returnto');
+
+ window.location = returnto.value;
} \ No newline at end of file
diff --git a/manager/public/js/positionUserInfo.js b/manager/public/js/positionUserInfo.js
index 0de1db4..f6344eb 100644
--- a/manager/public/js/positionUserInfo.js
+++ b/manager/public/js/positionUserInfo.js
@@ -1,17 +1,17 @@
-function setUserInfoPos() {
- var x = window.innerWidth;
- var ui;
-
- x = x - 18; // maybe scroll bar
-
- ui = document.getElementById('userinfo');
- if (ui != null) {
- ui.style.right = "3px";
-// document.getElementById('userinfo').style.bottom = "3px";
- ui.style.bottom = 3 - window.pageYOffset + "px";
- }
-}
-
-window.onload = setUserInfoPos;
-window.onresize = setUserInfoPos;
-window.onscroll = setUserInfoPos;
+function setUserInfoPos() {
+ var x = window.innerWidth;
+ var ui;
+
+ x = x - 18; // maybe scroll bar
+
+ ui = document.getElementById('userinfo');
+ if (ui != null) {
+ ui.style.right = "3px";
+// document.getElementById('userinfo').style.bottom = "3px";
+ ui.style.bottom = 3 - window.pageYOffset + "px";
+ }
+}
+
+window.onload = setUserInfoPos;
+window.onresize = setUserInfoPos;
+window.onscroll = setUserInfoPos;