Changeset 01accaf in github

Timestamp:

Oct 28, 2009 6:53:40 PM (4 years ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

531e886

Parents:

2b96b67e

Message:

Add fallback to default skin if the selected one is not available in plugin directory

Files:

• plugins/archive/archive.php (modified) (1 diff)
• plugins/markasjunk/markasjunk.php (modified) (1 diff)
• program/include/rcube_plugin.php (modified) (1 diff)

plugins/archive/archive.php

@@ -25 +25 @@
       && ($archive_folder = $rcmail->config->get('archive_mbox'))) {
 
-      $skin_path = 'skins/'.$rcmail->output->config['skin'];
-
+      $skin_path = $this->local_skin_path();
+      
       $this->include_script('archive.js');
       $this->add_texts('localization', true);

plugins/markasjunk/markasjunk.php

@@ -20 +20 @@
     $rcmail = rcmail::get_instance();
     if ($rcmail->action == '' || $rcmail->action == 'show') {
-      $skin_path = 'skins/'.$rcmail->output->config['skin'];
+      $skin_path = $this->local_skin_path();;
       $this->include_script('markasjunk.js');
       $this->add_texts('localization', true);

program/include/rcube_plugin.php

@@ -232 +232 @@
       return $fn;
   }
+  
+  /**
+   * Provide path to the currently selected skin folder within the plugin directory
+   * with a fallback to the default skin folder.
+   *
+   * @return string Skin path relative to plugins directory
+   */
+  protected function local_skin_path()
+  {
+      $skin_path = 'skins/'.$this->api->output->config['skin'];
+      if (!is_dir(realpath(slashify($this->home) . $skin_path)))
+        $skin_path = 'skins/default';
+    return $skin_path;
+  }
 
   /**