From 6204390af16bcf50f82da61a1aefc2ad0c0adf94 Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Mon, 01 May 2006 10:47:27 -0400 Subject: [PATCH] Applied patch for requesting receipts by Salvatore Ansani --- program/steps/settings/edit_identity.inc | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index e0f649c..07cd8fa 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -22,13 +22,12 @@ if (($_GET['_iid'] || $_POST['_iid']) && $_action=='edit-identity') { $id = $_POST['_iid'] ? $_POST['_iid'] : $_GET['_iid']; - $DB->query(sprintf("SELECT * FROM %s - WHERE identity_id=%d - AND user_id=%d - AND del!='1'", - get_table_name('identities'), - $id, - $_SESSION['user_id'])); + $DB->query("SELECT * FROM ".get_table_name('identities')." + WHERE identity_id=? + AND user_id=? + AND del<>1", + $id, + $_SESSION['user_id']); $IDENTITY_RECORD = $DB->fetch_assoc(); @@ -49,6 +48,11 @@ if (!$IDENTITY_RECORD && $GLOBALS['_action']!='add-identity') return rcube_label('notfound'); + // add some labels to client + rcube_add_label('noemailwarning'); + rcube_add_label('nonamewarning'); + + list($form_start, $form_end) = get_form_tags($attrib, 'save-identity', array('name' => '_iid', 'value' => $IDENTITY_RECORD['identity_id'])); unset($attrib['form']); @@ -59,7 +63,8 @@ 'organization' => array('type' => 'text'), 'reply-to' => array('type' => 'text', 'label' => 'replyto'), 'bcc' => array('type' => 'text'), - 'default' => array('type' => 'checkbox', 'label' => 'setdefault')); + 'signature' => array('type' => 'textarea'), + 'standard' => array('type' => 'checkbox', 'label' => 'setdefault')); // a specific part is requested -- Gitblit v1.9.1