'), '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 . "\n";
- $output .= $indent . "\tUser: " . $this->items['authed_username'] . "
\n";
-
- return $output;
- }
-}
+url(array('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 . "\n";
+ $output .= $indent . "\tUser: " . $this->items['authed_username'] . "
\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 @@
-
-
-
- #
-
- assurancesDone as $i => $points) {
- printf(' %1$d %2$d
+
+ #
+
+ assurancesDone as $i => $points) {
+ printf(' %1$d %2$d
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 @@
+ 'specified in two ways:') ?>
-
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 @@
-
-
- #
-
-
-
- assurances as $i => $assurance) {?>
-
-
-
-
+
+
+ #
+
+
+
+ assurances as $i => $assurance) {?>
+
+
+
+
\ 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 @@
-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;
- }
-}
+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 @@
-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
+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 @@
-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;
- }
-}
+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 @@
-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) . '"';
- }
- }
-}
+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 @@
- 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;
- }
-}
+ 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 @@
-
- * @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
+
+ * @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 @@
-
- * @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
+
+ * @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 @@
- 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);
- }
-}
+ 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 @@
-
- */
-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);
- }
- */
-}
+
+ */
+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();
+ /**
+ * 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 = '';
+ /**
+ * Instanzname, die unterschiedlichen Entitäten werden über den Namen
+ * auseinandergehalten.
+ * @var string
+ */
+ private $instanceName = '';
- /**
- * Configsection
- * @var Config
- */
- private $config = null;
+ /**
+ * Configsection
+ * @var Config
+ */
+ private $config = null;
- /**
- * IMAP Resource
- * @var imap_stream
- */
- private $imap = null;
+ /**
+ * IMAP Resource
+ * @var imap_stream
+ */
+ private $imap = null;
- /**
- * Servername, Port, Flags
- * @var string
- */
- private $server = '';
+ /**
+ * 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;
+ /**
+ * 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');
- }
+ /**
+ * 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;
- }
+ 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');
- }
+ /**
+ * 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);
- }
+ 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');
- }
+ /**
+ * 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);
- }
+ 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');
- }
+ /**
+ * 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 );
- }
+ 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');
- }
+ /**
+ * 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);
- }
+ 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');
- }
+ /**
+ * 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);
- }
+ 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');
- }
+ /**
+ * 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);
- }
+ 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');
- }
+ /**
+ * 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);
- }
+ 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');
- }
+ /**
+ * 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;
- }
- }
+ $folderlist = $this->imapList($mbox_root);
+ $foundFolder = false;
+ foreach ($folderlist as $folder) {
+ if (strpos($folder, $mbox) !== false) {
+ return true;
+ }
+ }
- return false;
- }
+ return false;
+ }
- const AR_YYYY = 'Y';
- const AR_YYYYMM = 'Ym';
- const AR_YYYYMMDD = 'Ymd';
+ 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();
+ /**
+ * 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);
+ $ar = explode('.', $mbox);
- $sub_mbox = $ar[count($ar) - 1];
+ $sub_mbox = $ar[count($ar) - 1];
- return $mbox.'.'.$sub_mbox.$delimiter.date($mode,$timestamp);
- }
+ return $mbox.'.'.$sub_mbox.$delimiter.date($mode,$timestamp);
+ }
- public static function imapMakePrefixedArchiveName($mbox, $mode, $prefix = '', $timestamp = null, $delimiter = '-') {
- if ($timestamp === null)
- $timestamp = time();
+ public static function imapMakePrefixedArchiveName($mbox, $mode, $prefix = '', $timestamp = null, $delimiter = '-') {
+ if ($timestamp === null)
+ $timestamp = time();
- $ar = explode('.', $mbox);
+ $ar = explode('.', $mbox);
- $sub_mbox = $ar[count($ar) - 1];
+ $sub_mbox = $ar[count($ar) - 1];
- return $mbox.'.'.$prefix.$delimiter.$sub_mbox.$delimiter.date($mode,$timestamp);
- }
+ 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');
- }
+ /**
+ * 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;
- }
-
-
- 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;
- }
-
-
- /**
- * interne IMAP Open Methode
- *
- * @param string $servername
- * @param string $username
- * @param string password
- * @param integer $flags
- * @return resource
- */
- protected function imapOpen($server, $username, $password, $flags) {
- return imap_open($server, $username, $password, $flags);
+ return true;
}
- /**
- * privater Konstruktor, wird exklusiv von getInstance aufgerufen
- *
- * @param $instanceName
- * @param $config
- */
- protected function __construct($instanceName, $config) {
- $this->instanceName = $instanceName;
- $this->config = $config;
+ public function __destruct() {
+ if ($this->imap !== null) {
+ imap_close($this->imap);
+ $this->imap = null;
+ }
+ }
- 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}';
+ /**
+ * 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;
+ }
- $mbox = '';
+
+ /**
+ * interne IMAP Open Methode
+ *
+ * @param string $servername
+ * @param string $username
+ * @param string password
+ * @param integer $flags
+ * @return resource
+ */
+ protected function imapOpen($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 = '';
$this->mbox = $mbox;
- $this->imap = null;
+ $this->imap = null;
- $this->imap = $this->imapOpen($this->server.$mbox,
- $this->config->username,
- $this->config->password,
- OP_HALFOPEN);
+ $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');
- }
+ if ($this->imap === false) {
+ $this->imap = null;
+ throw new IMAPException(__METHOD__ . ' not connected');
+ }
- $this->reopenedConnection = false;
- }
+ $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();
+ /**
+ * 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;
- }
+ foreach (self::$instances as $instance) {
+ if ($instance->getInstanceName() == $instanceName)
+ return $instance;
+ }
- /*
- if (!$config instanceof Config) {
- throw new IMAPException(__METHOD__ . ' no config');
- }
- */
+ /*
+ if (!$config instanceof Config) {
+ throw new IMAPException(__METHOD__ . ' no config');
+ }
+ */
- $object = new imapConnection($instanceName, $config);
+ $object = new imapConnection($instanceName, $config);
- self::$instances[] = $object;
+ self::$instances[] = $object;
- return $object;
- }
+ return $object;
+ }
- /**
- * Liefert den Namen der aktuellen Instanz
- * @return string
- */
- public function getInstanceName() {
- return $this->instanceName;
- }
+ /**
+ * 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 @@
-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);
- }
-}
+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 @@
-$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;
- }
-}
+$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 @@
-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('' . I18n::_($text) . ' ', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
- }
- else {
- foreach ($required as $rperm) {
- if ($acl->has($rperm) && $acl->isAllowed($role, $rperm, 'view')) {
- $view->topNav('' . I18n::_($text) . ' ', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
- break; // exit on first match
- }
- }
- }
- }
- }
- }
-
- closedir($dir);
- }
- }
+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('' . I18n::_($text) . ' ', Zend_View_Helper_Placeholder_Container_Abstract::SET, $menuprio);
+ }
+ else {
+ foreach ($required as $rperm) {
+ if ($acl->has($rperm) && $acl->isAllowed($role, $rperm, 'view')) {
+ $view->topNav('' . I18n::_($text) . ' ', 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 @@
-getResponse();
- if ($response->canSendHeaders() === true) {
- $response->setHeader('Content-Type', 'text/html; charset=utf-8');
- }
- }
+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 @@
-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);
- }
- }
-}
+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 @@
-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('' . I18n::_($text) . ' ', Zend_View_Helper_Placeholder_Container_Abstract::SET, 1000);
- }
-}
+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('' . I18n::_($text) . ' ', 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 @@
- 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);
-}
+ 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;
- ![](\"/img/delete_icon.jpg\"){kind=icon}