Changeset 4649 in subversion

Timestamp:

Apr 12, 2011 2:05:36 PM (2 years ago)

Author:

thomasb

Message:

Keep all submitted data if contact form validation fails (#1487865)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/addressbook/edit.inc (modified) (2 diffs)
• program/steps/addressbook/save.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Keep all submitted data if contact form validation fails (#1487865)
+- Handle uncode strings in rcube_addressbook::normalize_string() (#1487866)
 - Fix bug where template name without plugin prefix was used in render_page hook
 - Fix handling of debug_level=4 in ajax requests (#1487831)

trunk/roundcubemail/program/steps/addressbook/edit.inc

@@ -32 +32 @@
 
 
+function rcmail_get_edit_record()
+{
+    global $RCMAIL, $CONTACTS;
+
+     // check if we have a valid result
+     if ($GLOBALS['EDIT_RECORD']) {
+         $record = $GLOBALS['EDIT_RECORD'];
+     }
+     else if ($RCMAIL->action != 'add'
+         && !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
+     ) {
+         $RCMAIL->output->show_message('contactnotfound');
+         return false;
+     }
+     
+     return $record;
+}
+
 function rcmail_contact_edithead($attrib)
 {
-   global $RCMAIL, $CONTACTS;
-
     // check if we have a valid result
-    if ($RCMAIL->action != 'add'
-        && !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
-    ) {
-        $RCMAIL->output->show_message('contactnotfound');
-        return false;
-    }
-    
+    $record = rcmail_get_edit_record();
     $i_size = !empty($attrib['size']) ? $attrib['size'] : 20;
 
@@ -75 +85 @@
 function rcmail_contact_editform($attrib)
 {
-   global $RCMAIL, $CONTACTS, $CONTACT_COLTYPES;
-
-    // check if we have a valid result
-    if ($RCMAIL->action != 'add'
-        && !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
-    ) {
-        $RCMAIL->output->show_message('contactnotfound');
-        return false;
-    }
+    global $RCMAIL, $CONTACT_COLTYPES;
+
+    $record = rcmail_get_edit_record();
 
     // add some labels to client

trunk/roundcubemail/program/steps/addressbook/save.inc

@@ -140 +140 @@
     $err = (array)$CONTACTS->get_error() + array('message' => 'formincomplete', 'type' => 'warning');
     $OUTPUT->show_message($err['message'], $err['type']);
+    $GLOBALS['EDIT_RECORD'] = $a_record;  // store submitted data to be used in edit form
     rcmail_overwrite_action($return_action);
     return;