X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=themes%2Frandom.php;h=af6793a2da3a50aea1d55b2ed2ecca3083950cae;hp=765da388e5246522cd9e1ec800b0180752f6923d;hb=e3e770bdae1706d364495ef5529435682916a736;hpb=0b97a708e71c931153cd1ceee1495c9f4e1e209b

diff --git a/themes/random.php b/themes/random.php
index 765da388..af6793a2 100755
--- a/themes/random.php
+++ b/themes/random.php
@@ -1,38 +1,48 @@
 <?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
+ * Date:    December 24, 2001
+ * Comment: Guess what this does!
  *
- * Copyright (c) 2000-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * $Id$
+ * @author Tyler Akins
+ * @copyright &copy; 2000-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage themes
  */
 
-sq_mt_randomize();
+/** Prevent direct script loading */
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
+    die();
+}
+
+/** load required functions */
+include_once(SM_PATH . 'functions/global.php');
 
-require_once(SM_PATH . 'functions/global.php');
-   
-global $theme, $random_theme_good_themes;
-   
-if (!session_is_registered('random_theme_good_theme')) {
+global $theme;
+
+if (!sqsession_is_registered('random_theme_good_theme')) {
     $good_themes = array();
     foreach ($theme as $data) {
         if (substr($data['PATH'], -18) != '/themes/random.php') {
             $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);