Changeset 34aec72 in github

Timestamp:

Sep 15, 2009 9:47:12 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

20e2515

Parents:

2b77e8d

Message:

• Support skins in 'archive' and 'markasjunk' plugins

Files:

• CHANGELOG (modified) (1 diff)
• plugins/archive/archive.js (modified) (1 diff)
• plugins/archive/archive.php (modified) (4 diffs)
• plugins/archive/skins/default/archive_act.png (moved) (moved from plugins/archive/archive_act.png)
• plugins/archive/skins/default/archive_pas.png (moved) (moved from plugins/archive/archive_pas.png)
• plugins/archive/skins/default/foldericon.png (moved) (moved from plugins/archive/foldericon.png)
• plugins/markasjunk/markasjunk.php (modified) (1 diff)
• plugins/markasjunk/skins/default/junk_act.png (moved) (moved from plugins/markasjunk/junk_act.png)
• plugins/markasjunk/skins/default/junk_pas.png (moved) (moved from plugins/markasjunk/junk_pas.png)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Support skins in 'archive' and 'markasjunk' plugins
 - Added 'html_editor' hook (#1486068)
 - Fix DB constraint violation when populating messages cache (#1486052)

plugins/archive/archive.js

@@ -30 +30 @@
     // set css style for archive folder
     var li;
-    if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
-      $(li).css('background-image', 'url(plugins/archive/foldericon.png)');
+    if (rcmail.env.archive_folder && rcmail.env.archive_folder_icon && (li = rcmail.get_folder_li(rcmail.env.archive_folder)))
+      $(li).css('background-image', 'url(' + rcmail.env.archive_folder_icon + ')');
   })
 }

plugins/archive/archive.php

@@ -18 +18 @@
     $this->register_action('plugin.archive', array($this, 'request_action'));
 
-    # There is no "Archived flags"
-    # $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
+    // There is no "Archived flags"
+    // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
     
     $rcmail = rcmail::get_instance();
-    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show') && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
+    if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
+      && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
+
+      $skin_path = 'skins/'.$rcmail->output->config['skin'];
+
       $this->include_script('archive.js');
       $this->add_texts('localization', true);
@@ -28 +32 @@
         array(
             'command' => 'plugin.archive',
-            'imagepas' => 'archive_pas.png',
-            'imageact' => 'archive_act.png',
+            'imagepas' => $skin_path.'/archive_pas.png',
+            'imageact' => $skin_path.'/archive_act.png',
             'title' => 'buttontitle',
             'domain' => $this->ID,
@@ -40 +44 @@
       // set env variable for client
       $rcmail->output->set_env('archive_folder', $archive_folder);
+      $rcmail->output->set_env('archive_folder_icon', $this->url($skin_path.'/foldericon.png'));
 
       // add archive folder to the list of default mailboxes
@@ -45 +50 @@
         $default_folders[] = $archive_folder;
         $rcmail->config->set('default_imap_folders', $default_folders);
-      }
-      
+      }  
     }
     else if ($rcmail->task == 'settings') {

plugins/markasjunk/markasjunk.php

@@ -21 +21 @@
     $rcmail = rcmail::get_instance();
     if ($rcmail->action == '' || $rcmail->action == 'show') {
+      $skin_path = 'skins/'.$rcmail->output->config['skin'];
       $this->include_script('markasjunk.js');
       $this->add_texts('localization', true);
-      $this->add_button(array('command' => 'plugin.markasjunk', 'imagepas' => 'junk_pas.png',
-        'imageact' => 'junk_act.png', 'title' => 'markasjunk.buttontitle'), 'toolbar');
+      $this->add_button(array('command' => 'plugin.markasjunk',
+        'imagepas' => $skin_path.'/junk_pas.png',
+        'imageact' => $skin_path.'/junk_act.png',
+        'title' => 'markasjunk.buttontitle'), 'toolbar');
     }
   }