Fixed some strict messages on configuration page
Dieser Commit ist enthalten in:
Ursprung
87f951530e
Commit
c4a04c1812
2 geänderte Dateien mit 84 neuen und 83 gelöschten Zeilen
|
@ -536,10 +536,11 @@ class Application_Form_Config_Email extends Zend_Form_SubForm
|
||||||
* Extracts an multi array from flat element names and values
|
* Extracts an multi array from flat element names and values
|
||||||
*
|
*
|
||||||
* @param array $data The values to extract index and values from
|
* @param array $data The values to extract index and values from
|
||||||
|
* @param bool $suppressArrayNotation
|
||||||
*
|
*
|
||||||
* @return array The converted array
|
* @return array The converted array
|
||||||
*/
|
*/
|
||||||
public function getValidValues($data)
|
public function getValidValues($data, $suppressArrayNotation = false)
|
||||||
{
|
{
|
||||||
$values = parent::getValidValues($data, true);
|
$values = parent::getValidValues($data, true);
|
||||||
$newArray = array();
|
$newArray = array();
|
||||||
|
@ -566,11 +567,11 @@ class Application_Form_Config_Email extends Zend_Form_SubForm
|
||||||
/**
|
/**
|
||||||
* Set default values
|
* Set default values
|
||||||
*
|
*
|
||||||
* @param $defaults
|
* @param array $defaults
|
||||||
*
|
*
|
||||||
* @return Zend_Form
|
* @return Zend_Form
|
||||||
*/
|
*/
|
||||||
public function setDefaults($defaults)
|
public function setDefaults(array $defaults)
|
||||||
{
|
{
|
||||||
if (isset($defaults['email']['RecipientCc'])) {
|
if (isset($defaults['email']['RecipientCc'])) {
|
||||||
$recipientCc = array();
|
$recipientCc = array();
|
||||||
|
|
|
@ -22,6 +22,7 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
|
||||||
* @var Msd_Language
|
* @var Msd_Language
|
||||||
*/
|
*/
|
||||||
protected $_lang;
|
protected $_lang;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Init form and add all elements
|
* Init form and add all elements
|
||||||
*
|
*
|
||||||
|
@ -243,6 +244,7 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add input "user"
|
* Add input "user"
|
||||||
*
|
*
|
||||||
|
@ -354,12 +356,12 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
|
||||||
* Get valid values
|
* Get valid values
|
||||||
*
|
*
|
||||||
* @param array $data
|
* @param array $data
|
||||||
|
* @param bool $suppressArrayNotation
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getValidValues($data)
|
public function getValidValues($data, $suppressArrayNotation = false)
|
||||||
{
|
{
|
||||||
//$values = parent::getValidValues($data, true);
|
|
||||||
$ftpData = array();
|
$ftpData = array();
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
if (substr($key, 0, 4) != 'ftp_') {
|
if (substr($key, 0, 4) != 'ftp_') {
|
||||||
|
@ -370,9 +372,7 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
|
||||||
$ftpData[$ftpId] = array();
|
$ftpData[$ftpId] = array();
|
||||||
}
|
}
|
||||||
$ftpData[$ftpId][$ftpKey] = $value;
|
$ftpData[$ftpId][$ftpKey] = $value;
|
||||||
//unset($values[$key]);
|
|
||||||
}
|
}
|
||||||
//var_dump($ftpData); die();
|
|
||||||
return $ftpData;
|
return $ftpData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -383,7 +383,7 @@ class Application_Form_Config_Ftp extends Zend_Form_SubForm
|
||||||
*
|
*
|
||||||
* @return Zend_Form
|
* @return Zend_Form
|
||||||
*/
|
*/
|
||||||
public function setDefaults($defaults)
|
public function setDefaults(array $defaults)
|
||||||
{
|
{
|
||||||
if (!empty($defaults['ftp'])) {
|
if (!empty($defaults['ftp'])) {
|
||||||
$ftp = array();
|
$ftp = array();
|
||||||
|
|
Laden …
In neuem Issue referenzieren