summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeremie kornobis <jkornobis@linagora.com>2012-11-26 14:12:48 +0100
committerjeremie kornobis <jkornobis@linagora.com>2012-11-26 14:17:20 +0100
commitf12585297974a994bd9b081cd1d70e8ab8d2365e (patch)
tree4978171bd5b071a1a74bc32a7f9ec8f356bc4409
parent7fac4dc87b2507227666db9b74d83090f38d62e7 (diff)
Add new identity level: one identity with edit only signature
-rw-r--r--config/main.inc.php.dist1
-rw-r--r--program/steps/settings/edit_identity.inc7
-rw-r--r--program/steps/settings/save_identity.inc2
3 files changed, 9 insertions, 1 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index dafee72f1..c8490a19d 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -357,6 +357,7 @@ $rcmail_config['send_format_flowed'] = true;
// 1 - many identities with possibility to edit all params but not email address
// 2 - one identity with possibility to edit all params
// 3 - one identity with possibility to edit all params but not email address
+// 4 - one identity with possibility to edit only signature
$rcmail_config['identities_level'] = 0;
// Mimetypes supported by the browser.
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index aa1aeea5d..7e7be1f83 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -97,6 +97,13 @@ function rcube_identity_form($attrib)
$form['addressing']['content']['email']['class'] = 'disabled';
}
+ if (IDENTITIES_LEVEL == 4) {
+ foreach($form['addressing']['content'] as $formfield => $value){
+ $form['addressing']['content'][$formfield]['disabled'] = true;
+ $form['addressing']['content'][$formfield]['class'] = 'disabled';
+ }
+ }
+
$IDENTITY_RECORD['email'] = rcube_idn_to_utf8($IDENTITY_RECORD['email']);
// Allow plugins to modify identity form content
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index 8515c44f1..7ca54a179 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -26,7 +26,7 @@ $a_boolean_cols = array('standard', 'html_signature');
$updated = $default_id = false;
// check input
-if (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3))
+if (IDENTITIES_LEVEL != 4 && (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3)))
{
$OUTPUT->show_message('formincomplete', 'warning');
rcmail_overwrite_action('edit-identity');