1
0
Fork 0

Continued to switch the old configuration handling to the new one.

Dieser Commit ist enthalten in:
DSB 2012-08-04 17:09:48 +00:00
Ursprung 025b5c339d
Commit ae87af916f
54 geänderte Dateien mit 501 neuen und 269 gelöschten Zeilen

Datei anzeigen

@ -36,7 +36,7 @@ class Application_Form_Config_Email extends Zend_Form_SubForm
*/
public function init()
{
$this->_config = Msd_Configuration::getInstance();
$this->_config = Msd_Registry::getConfig();
$this->_lang = Msd_Language::getInstance();
$this->setDisableLoadDefaultDecorators(true);
$this->setDecorators(array('SubForm'));
@ -58,7 +58,7 @@ class Application_Form_Config_Email extends Zend_Form_SubForm
// add Recipients CC
$ccElements = $this->_setRecipientCc(
$this->_config->get('config.email.RecipientCc'),
$this->_config->getParam('email.RecipientCc'),
$activateValidator
);

Datei anzeigen

@ -29,7 +29,7 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
*/
public function init()
{
$config = Msd_Configuration::getInstance();
$config = Msd_Registry::getConfig();
$this->_lang = Msd_Language::getInstance();
$this->setDisableLoadDefaultDecorators(true);
$this->setDecorators(array('SubForm'));
@ -40,7 +40,7 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
$this->setDisplayGroupDecorators(array('DisplayGroup'));
$this->_addButtonFtpAdd();
$ftpConfig = $config->get('config.ftp');
$ftpConfig = $config->getParam('ftp');
$ftpKeys = array_keys($ftpConfig);
$nrOfFtpProfiles = count($ftpKeys, 1);
foreach ($ftpKeys as $ftpConnectionId) {