Changeset 28c59fc in github

Timestamp:

Apr 16, 2008 1:10:27 PM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

09c1a37

Parents:

ccb412f

Message:

• fixed folders management after r1291

File:

• program/steps/settings/manage_folders.inc (modified) (8 diffs)

program/steps/settings/manage_folders.inc

@@ -23 +23 @@
 rcmail_imap_init(TRUE);
 
-$OUTPUT->include_script('list.js');
-
-
 // subscribe to one or more mailboxes
 if ($_action=='subscribe')
@@ -33 +30 @@
 
   if ($OUTPUT->ajax_call)
-    $OUTPUT->remote_response('// subscribed');
+    $OUTPUT->send('// subscribed');
   }
 
@@ -43 +40 @@
 
   if ($OUTPUT->ajax_call)
-    $OUTPUT->remote_response('// unsubscribed');
+    $OUTPUT->send('// unsubscribed');
   }
 
@@ -58 +55 @@
     $display_create = str_repeat('    ', substr_count($create, $delimiter)) . rcube_charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
     $OUTPUT->command('add_folder_row', $create, $display_create);
-    $OUTPUT->send();
     }
   else if (!$create && $OUTPUT->ajax_call)
     {
     $OUTPUT->show_message('errorsaving', 'error');
-    $OUTPUT->remote_response();
     }
   else if (!$create)
     $OUTPUT->show_message('errorsaving', 'error');
+
+  $OUTPUT->send();
   }
 
@@ -95 +92 @@
         }
     $OUTPUT->command('reset_folder_rename');
-    $OUTPUT->send();
     }
   else if (!$rename && $OUTPUT->ajax_call)
@@ -101 +97 @@
     $OUTPUT->command('reset_folder_rename');
     $OUTPUT->show_message('errorsaving', 'error');
-    $OUTPUT->send();
     }
   else if (!$rename)
     $OUTPUT->show_message('errorsaving', 'error');
+
+  $OUTPUT->send();
   }
 
@@ -129 +126 @@
       }
     $OUTPUT->show_message('folderdeleted', 'confirmation');
-    $OUTPUT->send();
     }
   else if ($OUTPUT->ajax_call)
     {
     $OUTPUT->show_message('errorsaving', 'error');
-    $OUTPUT->send();
-    }
+    }
+
+  $OUTPUT->send();
   }
 
@@ -308 +305 @@
   }
 
+$OUTPUT->include_script('list.js');
 
 // register UI objects