1 files changed, 15 insertions, 15 deletions

diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index edd4ba60d..974acb42a 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -23,14 +23,14 @@ define('IDENTITIES_LEVEL', intval($RCMAIL->config->get('identities_level', 0)));
 
 // edit-identity
 if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') {
-  $IDENTITY_RECORD = $RCMAIL->user->get_identity(get_input_value('_iid', RCUBE_INPUT_GPC));
+  $IDENTITY_RECORD = $RCMAIL->user->get_identity(rcube_utils::get_input_value('_iid', rcube_utils::INPUT_GPC));
 
   if (is_array($IDENTITY_RECORD))
     $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']);
   else {
     $OUTPUT->show_message('dberror', 'error');
     // go to identities page
-    rcmail_overwrite_action('identities');
+    $RCMAIL->overwrite_action('identities');
     return;
   }
 }
@@ -39,7 +39,7 @@ else {
   if (IDENTITIES_LEVEL > 1) {
     $OUTPUT->show_message('opnotpermitted', 'error');
     // go to identities page
-    rcmail_overwrite_action('identities');
+    $RCMAIL->overwrite_action('identities');
     return;
   }
   else if (IDENTITIES_LEVEL == 1) {
@@ -53,7 +53,7 @@ function rcube_identity_form($attrib)
   global $IDENTITY_RECORD, $RCMAIL, $OUTPUT;
 
   // Add HTML editor script(s)
-  rcube_html_editor('identity');
+  $RCMAIL->html_editor('identity');
 
   // add some labels to client
   $OUTPUT->add_label('noemailwarning', 'nonamewarning', 'converting', 'editorwarning');
@@ -65,21 +65,21 @@ function rcube_identity_form($attrib)
   // list of available cols
   $form = array(
     'addressing' => array(
-      'name'    => rcube_label('settings'),
+      'name'    => $RCMAIL->gettext('settings'),
       'content' => 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', 'size' => $i_size),
         'bcc'          => array('type' => 'text', 'size' => $i_size),
-        'standard'       => array('type' => 'checkbox', 'label' => rcube_label('setdefault')),
+        'standard'       => array('type' => 'checkbox', 'label' => $RCMAIL->gettext('setdefault')),
       )),
     'signature' => array(
-      'name' => rcube_label('signature'),
+      'name' => $RCMAIL->gettext('signature'),
       'content' => array(
         'signature'      => array('type' => 'textarea', 'size' => $t_cols, 'rows' => $t_rows,
             'spellcheck' => true),
-        'html_signature' => array('type' => 'checkbox', 'label' => rcube_label('htmlsignature'),
+        'html_signature' => array('type' => 'checkbox', 'label' => $RCMAIL->gettext('htmlsignature'),
             'onclick' => 'return rcmail_toggle_editor(this, \'rcmfd_signature\');'),
     ))
   );
@@ -90,7 +90,7 @@ function rcube_identity_form($attrib)
     $form['signature']['content']['signature']['is_escaped'] = true;
 
     // Correctly handle HTML entities in HTML editor (#1488483)
-    $IDENTITY_RECORD['signature'] = htmlspecialchars($IDENTITY_RECORD['signature'], ENT_NOQUOTES, RCMAIL_CHARSET);
+    $IDENTITY_RECORD['signature'] = htmlspecialchars($IDENTITY_RECORD['signature'], ENT_NOQUOTES, RCUBE_CHARSET);
   }
 
   // disable some field according to access level
@@ -106,7 +106,7 @@ function rcube_identity_form($attrib)
     }
   }
 
-  $IDENTITY_RECORD['email'] = rcube_idn_to_utf8($IDENTITY_RECORD['email']);
+  $IDENTITY_RECORD['email'] = rcube_utils::idn_to_utf8($IDENTITY_RECORD['email']);
 
   // Allow plugins to modify identity form content
   $plugin = $RCMAIL->plugins->exec_hook('identity_form', array(
@@ -137,12 +137,12 @@ function rcube_identity_form($attrib)
         $colprop['id'] = 'rcmfd_'.$col;
 
         $label = !empty($colprop['label']) ? $colprop['label'] :
-            rcube_label(str_replace('-', '', $col));
+            $RCMAIL->gettext(str_replace('-', '', $col));
 
         $value = !empty($colprop['value']) ? $colprop['value'] :
-            rcmail_get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);
+            rcube_output::get_edit_field($col, $IDENTITY_RECORD[$col], $colprop, $colprop['type']);
 
-        $table->add('title', html::label($colprop['id'], Q($label)));
+        $table->add('title', html::label($colprop['id'], rcube::Q($label)));
         $table->add(null, $value);
       }
       $content = $table->show($attrib);
@@ -151,7 +151,7 @@ function rcube_identity_form($attrib)
       $content = $fieldset['content'];
     }
 
-    $out .= html::tag('fieldset', null, html::tag('legend', null, Q($fieldset['name'])) . $content) ."\n";
+    $out .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($fieldset['name'])) . $content) ."\n";
   }
 
   $out .= $form_end;
@@ -164,7 +164,7 @@ $OUTPUT->add_handler('identityform', 'rcube_identity_form');
 $OUTPUT->set_env('identities_level', IDENTITIES_LEVEL);
 $OUTPUT->add_label('deleteidentityconfirm');
 
-$OUTPUT->set_pagetitle(rcube_label(($RCMAIL->action=='add-identity' ? 'newidentity' : 'edititem')));
+$OUTPUT->set_pagetitle($RCMAIL->gettext(($RCMAIL->action=='add-identity' ? 'newidentity' : 'edititem')));
 
 if ($RCMAIL->action=='add-identity' && $OUTPUT->template_exists('identityadd'))
   $OUTPUT->send('identityadd');