projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5252 from JKingsnorth/CRM-10551
[civicrm-core.git]
/
CRM
/
Admin
/
Form
/
MailSettings.php
diff --git
a/CRM/Admin/Form/MailSettings.php
b/CRM/Admin/Form/MailSettings.php
index cc6a0360560fd53306e148cf8c36de0cc72f1420..21f6a7ec1a227d4242b7514c94a47aa92ee4b057 100644
(file)
--- a/
CRM/Admin/Form/MailSettings.php
+++ b/
CRM/Admin/Form/MailSettings.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.6 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-23,12
+23,12
@@
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
| GNU Affero General Public License or the licensing of CiviCRM, |
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
-*/
+
*/
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
4
+ * @copyright CiviCRM LLC (c) 2004-201
5
* $Id$
*
*/
* $Id$
*
*/
@@
-40,7
+40,7
@@
class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
/**
class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
/**
- * Build the form object
+ * Build the form object
.
*
* @return void
*/
*
* @return void
*/
@@
-84,14
+84,15
@@
class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
$this->add('checkbox', 'is_ssl', ts('Use SSL?'));
$this->add('checkbox', 'is_ssl', ts('Use SSL?'));
- $usedfor = array(1 => ts('Bounce Processing'),
+ $usedfor = array(
+ 1 => ts('Bounce Processing'),
0 => ts('Email-to-Activity Processing'),
);
$this->add('select', 'is_default', ts('Used For?'), $usedfor);
}
/**
0 => ts('Email-to-Activity Processing'),
);
$this->add('select', 'is_default', ts('Used For?'), $usedfor);
}
/**
- * Add local and global form rules
+ * Add local and global form rules
.
*
*
* @return void
*
*
* @return void
@@
-101,12
+102,13
@@
class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
}
/**
}
/**
- * Global validation rules for the form
+ * Global validation rules for the form
.
*
*
- * @param array $fields posted values of the form
+ * @param array $fields
+ * Posted values of the form.
*
*
- * @return array
list of errors to be posted back to the form
- *
@static
+ * @return array
+ *
list of errors to be posted back to the form
*/
public static function formRule($fields) {
$errors = array();
*/
public static function formRule($fields) {
$errors = array();
@@
-119,7
+121,7
@@
class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
}
/**
}
/**
- * Process the form submission
+ * Process the form submission
.
*
*
* @return void
*
*
* @return void
@@
-153,7
+155,9
@@
class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
$params = array();
foreach ($fields as $f) {
if (in_array($f, array(
$params = array();
foreach ($fields as $f) {
if (in_array($f, array(
- 'is_default', 'is_ssl'))) {
+ 'is_default',
+ 'is_ssl',
+ ))) {
$params[$f] = CRM_Utils_Array::value($f, $formValues, FALSE);
}
else {
$params[$f] = CRM_Utils_Array::value($f, $formValues, FALSE);
}
else {