From 1854c4525bf1fce227a8cc0fa8aad06615df0eae Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 07 May 2008 05:38:44 -0400
Subject: [PATCH] More code cleanup + oop-ization
---
program/steps/settings/edit_identity.inc | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 1ea8947..18c5078 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -5,7 +5,7 @@
| program/steps/settings/edit_identity.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,24 +19,17 @@
*/
-if (($_GET['_iid'] || $_POST['_iid']) && $_action=='edit-identity')
+if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity')
{
- $DB->query("SELECT * FROM ".get_table_name('identities')."
- WHERE identity_id=?
- AND user_id=?
- AND del<>1",
- get_input_value('_iid', RCUBE_INPUT_GPC),
- $_SESSION['user_id']);
-
- $IDENTITY_RECORD = $DB->fetch_assoc();
+ $IDENTITY_RECORD = $USER->get_identity(get_input_value('_iid', RCUBE_INPUT_GPC));
if (is_array($IDENTITY_RECORD))
- $OUTPUT->add_script(sprintf("%s.set_env('iid', '%s');", $JS_OBJECT_NAME, $IDENTITY_RECORD['identity_id']));
-
- $PAGE_TITLE = rcube_label('edititem');
+ $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
+
+ $OUTPUT->set_pagetitle(rcube_label('edititem'));
}
else
- $PAGE_TITLE = rcube_label('newitem');
+ $OUTPUT->set_pagetitle(rcube_label('newitem'));
$OUTPUT->include_script('list.js');
@@ -44,14 +37,20 @@
function rcube_identity_form($attrib)
{
- global $IDENTITY_RECORD, $JS_OBJECT_NAME, $OUTPUT;
+ global $IDENTITY_RECORD, $RCMAIL, $OUTPUT;
- $OUTPUT->include_script('tiny_mce/tiny_mce_src.js');
- $OUTPUT->add_script("tinyMCE.init({ mode : 'specific_textareas'," .
+ $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'," .
- "popups_css : '\$__skin_path' + '/editor_popups.css'," .
- "editor_css : '\$__skin_path' + '/editor_ui.css'," .
"theme : 'advanced'," .
"theme_advanced_toolbar_location : 'top'," .
"theme_advanced_toolbar_align : 'left'," .
@@ -59,12 +58,11 @@
"theme_advanced_buttons2 : 'link,unlink,code,forecolor,fontselect,fontsizeselect'," .
"theme_advanced_buttons3 : '' });");
- if (!$IDENTITY_RECORD && $GLOBALS['_action']!='add-identity')
+ if (!$IDENTITY_RECORD && $RCMAIL->action != 'add-identity')
return rcube_label('notfound');
// add some labels to client
- rcube_add_label('noemailwarning');
- rcube_add_label('nonamewarning');
+ rcube_add_label('noemailwarning', 'nonamewarning');
list($form_start, $form_end) = get_form_tags($attrib, 'save-identity', array('name' => '_iid', 'value' => $IDENTITY_RECORD['identity_id']));
@@ -78,7 +76,7 @@
'reply-to' => array('type' => 'text', 'label' => 'replyto'),
'bcc' => array('type' => 'text'),
'signature' => array('type' => 'textarea', 'size' => "40", 'rows' => "6"),
- 'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'_signature\');'),
+ 'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'rcmfd_signature\');'),
'standard' => array('type' => 'checkbox', 'label' => 'setdefault'));
@@ -89,7 +87,7 @@
if (is_array($colprop))
{
$out = $form_start;
- $out .= rcmail_get_edit_field($attrib['part'], $IDENTITY_RECORD[$attrib['part']], $attrib, $colprop['type']);
+ $out .= rcmail_get_edit_field($attrib['part'], $IDENTITY_RECORD[$attrib['part']], $attrib + array('size' => 30), $colprop['type']);
return $out;
}
else
@@ -113,13 +111,15 @@
{
$attrib['size'] = $colprop['size'];
$attrib['rows'] = $colprop['rows'];
- $attrib['mce_editable'] = $IDENTITY_RECORD['html_signature'] ? "true" : "false";
+ if ($IDENTITY_RECORD['html_signature'])
+ {
+ $attrib['class'] = "mce_editor";
+ }
}
else
{
- unset($attrib['size']);
+ $attrib['size'] = 40;
unset($attrib['rows']);
- unset($attrib['mce_editable']);
}
$label = strlen($colprop['label']) ? $colprop['label'] : $col;
@@ -127,7 +127,7 @@
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
$attrib['id'],
- rep_specialchars_output(rcube_label($label)),
+ Q(rcube_label($label)),
$value);
}
@@ -136,10 +136,10 @@
return $out;
}
+$OUTPUT->add_handler('identityform', 'rcube_identity_form');
+if ($RCMAIL->action=='add-identity' && template_exists('addidentity'))
+ $OUTPUT->send('addidentity');
-if ($_action=='add-identity' && template_exists('addidentity'))
- parse_template('addidentity');
-
-parse_template('editidentity');
+$OUTPUT->send('editidentity');
?>
--
Gitblit v1.9.1