Changeset 4856 in subversion

Timestamp:

Jun 15, 2011 9:21:49 AM (2 years ago)

Author:

alec

Message:

• Add possibility to return subscription status and css class name for folder row from "folder_save" hook
• Fix folder preview frame state after folder creation

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (4 diffs)
• steps/settings/func.inc (modified) (2 diffs)
• steps/settings/save_folder.inc (modified) (5 diffs)

trunk/roundcubemail/program/js/app.js

@@ -4462 +4462 @@
 
   // Add folder row to the table and initialize it
-  this.add_folder_row = function (name, display_name, protected, subscribed, skip_init)
+  this.add_folder_row = function (name, display_name, protected, subscribed, skip_init, class_name)
   {
     if (!this.gui_objects.subscriptionlist)
@@ -4479 +4479 @@
 
     // clone a table row if there are existing rows
-    row    = $(refrow).clone(true);
+    row = $(refrow).clone(true);
+
+    // set ID, reset css class
     row.attr('id', id);
+    row.attr('class', class_name);
 
     // set folder name
@@ -4538 +4541 @@
 
   // replace an existing table row with a new folder line (with subfolders)
-  this.replace_folder_row = function(oldfolder, newfolder, display_name, protected)
+  this.replace_folder_row = function(oldfolder, newfolder, display_name, protected, class_name)
   {
     if (!this.gui_objects.subscriptionlist)
@@ -4554 +4557 @@
     // replace an existing table row
     this._remove_folder_row(id);
-    row = $(this.add_folder_row(newfolder, display_name, protected, subscribed, true));
+    row = $(this.add_folder_row(newfolder, display_name, protected, subscribed, true, class_name));
 
     // detect tree depth change

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

@@ -820 +820 @@
     }
 
-    return $options;    
+    return $options;
 }
 
-// Updates (or creates) folder row in the subscriptions table
-function rcmail_update_folder_row($name, $oldname=null)
+/**
+ * Updates (or creates) folder row in the subscriptions table
+ *
+ * @param string $name      Folder name
+ * @param string $oldname   Old folder name (for update)
+ * @param bool   $subscribe Checks subscription checkbox
+ * @param string $class     CSS class name for folder row
+ */
+function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null)
 {
     global $IMAP, $CONFIG, $OUTPUT;
@@ -838 +845 @@
 
     if ($oldname === null)
-        $OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, true);
+        $OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, $subscribe,
+            false, $class_name);
     else
         $OUTPUT->command('replace_folder_row', rcube_charset_convert($oldname, 'UTF7-IMAP'),
-            $name_utf8, $display_name, $protected);
+            $name_utf8, $display_name, $protected, $class_name);
 }
 

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

@@ -72 +72 @@
     $folder['name']     = $name_imap;
     $folder['oldname']  = $old_imap;
+    $folder['class']    = '';
     $folder['settings'] = array(
         // List view mode: 0-list, 1-threads
@@ -83 +84 @@
 if (!$error && !strlen($old)) {
 
+    $folder['subscribe'] = true;
+
     $plugin = $RCMAIL->plugins->exec_hook('folder_create', array('record' => $folder));
 
@@ -88 +91 @@
 
     if (!$plugin['abort']) {
-        $created = $IMAP->create_mailbox($folder['name'], TRUE);
+        $created = $IMAP->create_mailbox($folder['name'], $folder['subscribe']);
     }
     else {
@@ -106 +109 @@
             $RCMAIL->user->save_prefs(array('message_threading' => $a_threaded));
         }
-  
-        rcmail_update_folder_row($folder['name']);
+
+        rcmail_update_folder_row($folder['name'], null, $folder['subscribe'], $folder['class']);
         $OUTPUT->show_message('foldercreated', 'confirmation');
+        // reset folder preview frame
+        $OUTPUT->command('subscription_select');
         $OUTPUT->send('iframe');
     }
@@ -164 +169 @@
         $OUTPUT->show_message('folderupdated', 'confirmation');
         if ($rename) {
-            rcmail_update_folder_row($folder['name'], $folder['oldname']);
+            rcmail_update_folder_row($folder['name'], $folder['oldname'], $folder['subscribe'], $folder['class']);
             $OUTPUT->send('iframe');
         }