Changeset 543 in subversion for trunk/roundcubemail/program/steps/settings/save_identity.inc

Timestamp:

Apr 28, 2007 2:07:12 PM (6 years ago)

Author:

thomasb

Message:

Merged branch devel-addressbook from r443 back to trunk

File:

• trunk/roundcubemail/program/steps/settings/save_identity.inc (modified) (5 diffs)

trunk/roundcubemail/program/steps/settings/save_identity.inc

@@ -28 +28 @@
 if (empty($_POST['_name']) || empty($_POST['_email']))
   {
-  show_message('formincomplete', 'warning');
+  $OUTPUT->show_message('formincomplete', 'warning');
   rcmail_overwrite_action('edit-identitiy');
   return;
@@ -73 +73 @@
   if ($updated)
     {
-    show_message('successfullysaved', 'confirmation');
+    $OUTPUT->show_message('successfullysaved', 'confirmation');
     
     if (!empty($_POST['_standard']))
@@ -87 +87 @@
     {
     // show error message
-    show_message('errorsaving', 'error');
+    $OUTPUT->show_message('errorsaving', 'error');
     rcmail_overwrite_action('edit-identitiy');
     return;
@@ -134 +134 @@
     {
     // show error message
-    show_message('errorsaving', 'error');
+    $OUTPUT->show_message('errorsaving', 'error');
     rcmail_overwrite_action('edit-identity');
     return;
@@ -153 +153 @@
 
 // go to next step
-rcmail_overwrite_action($_POST['_framed'] ? 'edit-identity' : 'identities');
+rcmail_overwrite_action($_framed ? 'edit-identity' : 'identities');
 
 ?>