X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=themes%2Frandom.php;h=60884fa9bb9b9ef980ce9682a06b01378f6d0677;hb=151562a780a0919b32e04d204ba7f33fb215bd84;hp=aee02320d201eec1277cc0b134c9a1f64e822736;hpb=c4309fbd89c120fad6921e58955fec5e0a592a0e;p=squirrelmail.git

diff --git a/themes/random.php b/themes/random.php
index aee02320..60884fa9 100755
--- a/themes/random.php
+++ b/themes/random.php
@@ -2,15 +2,14 @@
 
 /**
  * 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
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
- * @package squirrelmai
+ * @author Tyler Akins
+ * @copyright © 2000-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
  * @subpackage themes
  */
 
@@ -18,9 +17,9 @@
 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) {
@@ -33,9 +32,16 @@ if (!sqsession_is_registered('random_theme_good_theme')) {
     }
     $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