Page MenuHomePhorge
Files F224459

No OneTemporary
Actions

View Options

diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index dbb3ece66..5cad6bec8 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -1,151 +1,142 @@
<?php
/*
+-----------------------------------------------------------------------+
| program/steps/settings/edit_identity.inc |
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
| Show edit form for a identity record or to add a new one |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
$Id$
*/
$OUTPUT->set_pagetitle(rcube_label('identities'));
if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') {
$IDENTITY_RECORD = $USER->get_identity(get_input_value('_iid', RCUBE_INPUT_GPC));
if (is_array($IDENTITY_RECORD))
$OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
}
else if (!$RCMAIL->config->get('multiple_identities', true)) {
$OUTPUT->show_message('opnotpermitted', 'error');
// go to identities page
rcmail_overwrite_action('identities');
return;
}
$OUTPUT->include_script('list.js');
function rcube_identity_form($attrib)
{
global $IDENTITY_RECORD, $RCMAIL, $OUTPUT;
$tinylang = substr($_SESSION['language'], 0, 2);
if (!file_exists('program/js/tiny_mce/langs/'.$tinylang.'.js'))
{
$tinylang = 'en';
}
$OUTPUT->include_script('tiny_mce/tiny_mce.js');
$OUTPUT->add_script("tinyMCE.init({ mode : 'textareas'," .
"editor_selector : 'mce_editor'," .
"apply_source_formatting : true," .
"language : '$tinylang'," .
"content_css : '\$__skin_path' + '/editor_content.css'," .
"theme : 'advanced'," .
"theme_advanced_toolbar_location : 'top'," .
"theme_advanced_toolbar_align : 'left'," .
- "theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr'," .
- "theme_advanced_buttons2 : 'link,unlink,code,forecolor,fontselect,fontsizeselect'," .
+ "theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor'," .
+ "theme_advanced_buttons2 : ',fontselect,fontsizeselect'," .
"theme_advanced_buttons3 : '',".
"gecko_spellcheck : true });");
if (!$IDENTITY_RECORD && $RCMAIL->action != 'add-identity')
return rcube_label('notfound');
// add some labels to client
$OUTPUT->add_label('noemailwarning', 'nonamewarning', 'converting');
+ $i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
+ $t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 6;
+ $t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;
list($form_start, $form_end) = get_form_tags($attrib, 'save-identity', array('name' => '_iid', 'value' => $IDENTITY_RECORD['identity_id']));
unset($attrib['form']);
// list of available cols
- $a_show_cols = array('name' => array('type' => 'text'),
- 'email' => array('type' => 'text'),
- 'organization' => array('type' => 'text'),
- 'reply-to' => array('type' => 'text', 'label' => 'reply-to'),
- 'bcc' => array('type' => 'text'),
- 'signature' => array('type' => 'textarea', 'size' => "40", 'rows' => "6"),
+ $a_show_cols = array('name' => array('type' => 'text', 'size' => $i_size),
+ 'email' => array('type' => 'text', 'size' => $i_size),
+ 'organization' => array('type' => 'text', 'size' => $i_size),
+ 'reply-to' => array('type' => 'text', 'label' => 'reply-to', 'size' => $i_size),
+ 'bcc' => array('type' => 'text', 'size' => $i_size),
+ 'signature' => array('type' => 'textarea', 'size' => $t_cols, 'rows' => $t_rows),
'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'rcmfd_signature\');'),
'standard' => array('type' => 'checkbox', 'label' => 'setdefault'));
// a specific part is requested
if ($attrib['part'])
{
$colprop = $a_show_cols[$attrib['part']];
if (is_array($colprop))
{
$out = $form_start;
- $out .= rcmail_get_edit_field($attrib['part'], $IDENTITY_RECORD[$attrib['part']], $attrib + array('size' => 30), $colprop['type']);
+ $out .= rcmail_get_edit_field($attrib['part'], $IDENTITY_RECORD[$attrib['part']], $attrib, $colprop['type']);
return $out;
}
else
return '';
}
// return the complete edit form as table
$out = "$form_start<table>\n\n";
foreach ($a_show_cols as $col => $colprop)
{
- $attrib['id'] = 'rcmfd_'.$col;
-
- if (strlen($colprop['onclick']))
- $attrib['onclick'] = $colprop['onclick'];
- else
- unset($attrib['onclick']);
+ $colprop['id'] = 'rcmfd_'.$col;
if ($col == 'signature')
{
- $attrib['size'] = $colprop['size'];
- $attrib['rows'] = $colprop['rows'];
- $attrib['spellcheck'] = true;
+ $colprop['spellcheck'] = true;
if ($IDENTITY_RECORD['html_signature'])
{
- $attrib['class'] = "mce_editor";
+ $colprop['class'] = 'mce_editor';
}
}
- else
- {
- $attrib['size'] = 40;
- unset($attrib['rows']);
- }
$label = strlen($colprop['label']) ? $colprop['label'] : $col;
- $value = rcmail_get_edit_field($col, $IDENTITY_RECORD[$col], $attrib, $colprop['type']);
+ $value = rcmail_get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
- $attrib['id'],
+ $colprop['id'],
Q(rcube_label($label)),
$value);
}
$out .= "\n</table>$form_end";
return $out;
}
$OUTPUT->add_handler('identityform', 'rcube_identity_form');
$OUTPUT->set_pagetitle(rcube_label(($RCMAIL->action=='add-identity' ? 'newidentity' : 'edititem')));
if ($RCMAIL->action=='add-identity' && $OUTPUT->template_exists('addidentity'))
$OUTPUT->send('addidentity');
$OUTPUT->send('editidentity');
?>
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 874465511..e89f0a60c 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -1,39 +1,39 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/settings.css" />
</head>
<body>
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
<roundcube:include file="/includes/settingstabs.html" />
<div id="identities-list">
<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
</div>
<p id="listbuttons">
<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
</p>
<div id="identity-details">
<div id="identity-title"><roundcube:object name="steptitle" /></div>
<div style="padding:15px;">
-<roundcube:object name="identityform" size="40" />
+<roundcube:object name="identityform" size="40" textareacols="60" textarearows="6" />
<p><br />
<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'&&config:multiple_identities:true" style="margin-right:0.5em" />
<roundcube:button command="save" type="input" class="button mainaction" label="save" />
</p>
</div>
</div>
<roundcube:include file="/includes/settingscripts.html" />
</body>
</html>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 10:23 AM (14 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
166644
Default Alt Text
(9 KB)

Event Timeline