X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=themes%2Frandom.php;h=67acb41b0bac0ba215b2cf3a29a91b3771c005a9;hb=0853837b3efb9d8fca15cb9cb22b54a916adfc72;hp=38094b7b191887e3fd5896b72d3a08233acc7180;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git

diff --git a/themes/random.php b/themes/random.php
index 38094b7b..67acb41b 100755
--- a/themes/random.php
+++ b/themes/random.php
@@ -1,24 +1,26 @@
 <?php
 
 /**
- * random.php
- *    Name:    Random Theme Every Login
- *    Author:  Tyler Akins
- *    Date:    December 24, 2001
- *    Comment: Guess what this does!
+ * Name:    Random Theme Every Login
+ * @author  Tyler Akins
+ * Date:    December 24, 2001
+ * Comment: Guess what this does!
  *
- * Copyright (c) 2000-2003 The SquirrelMail Project Team
+ * Copyright (c) 2000-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * $Id$
+ * @package squirrelmail
+ * @subpackage themes
  */
 
+/** Initialize the random number generator */
 sq_mt_randomize();
 
 require_once(SM_PATH . 'functions/global.php');
-   
-global $theme, $random_theme_good_themes;
-   
+
+global $theme;
+
 if (!sqsession_is_registered('random_theme_good_theme')) {
     $good_themes = array();
     foreach ($theme as $data) {
@@ -26,13 +28,21 @@ if (!sqsession_is_registered('random_theme_good_theme')) {
             $good_themes[] = $data['PATH'];
         }
     }
-    if (count($good_themes) == 0)
-    $good_themes[] = '../themes/default.php';
+    if (count($good_themes) == 0) {
+        $good_themes[] = '../themes/default.php';
+    }
     $which = mt_rand(0, count($good_themes));
     $random_theme_good_theme = $good_themes[$which];
+    // remove current sm_path from theme name
+    $path=preg_quote(SM_PATH,'/');
+    $random_theme_good_theme=preg_replace("/^$path/",'',$random_theme_good_theme);
+    // store it in session
     sqsession_register($random_theme_good_theme, 'random_theme_good_theme');
+} else {
+    // get random theme stored in session
+    sqgetGlobalVar('random_theme_good_theme',$random_theme_good_theme);
 }
-   
-@include_once ($random_theme_good_theme);
 
-?>
+@include_once (SM_PATH . $random_theme_good_theme);
+
+?>
\ No newline at end of file