added phpdoc blocks to netstyle theme.

fixed random theme. theme was stored with sm_path in session. breaks theme in plugins.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8358 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/themes/netstyle_theme.php b/themes/netstyle_theme.php
index 5c0dc4ce35ac5f1cc95575c6fd06aca87892ae7a..2aeaf404a97c47e20bfa51260629b3c0c07262ac 100644 (file)
--- a/themes/netstyle_theme.php
+++ b/themes/netstyle_theme.php
@@ -1,29 +1,33 @@
 <?php
-   /** Author:       Gabriele Maidecchi
-       Date:         October 6, 2004
-       Theme Name:   'Net-Style theme'
-       URL:          http://www.net-style.it
+/**
+ * Author:       Gabriele Maidecchi
+ * Date:         October 6, 2004
+ * Theme Name:   'Net-Style theme'
+ * URL:          http://www.net-style.it
+ *
+ * Copyright (c) 2000-2004 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage themes
+ */
 
-       Copyright (c) 2000-2004 The SquirrelMail Project Team
-       Licensed under the GNU GPL. For full terms see the file COPYING.
-
-    **/
-
-    global $color;
-    $color[0]   = '#f09000'; // (dark orange)    TitleBar
-    $color[1]   = '#800000'; // (red)
-    $color[2]   = '#CC0000'; // (light red)      Warning/Error Messages
-    $color[3]   = '#ffcc66'; // (light orange)   Left Bar Background
-    $color[4]   = '#FFFFFF'; // (white)          Normal Background
-    $color[5]   = '#ffbb55'; // (light orange)   Table Headers
-    $color[6]   = '#000000'; // (black)          Text on left bar
-    $color[7]   = '#770000'; // (dark red)       Links
-    $color[8]   = '#000000'; // (black)          Normal text
-    $color[9]   = '#ffbb55'; // (light orange)   Darker version of #0
-    $color[10]  = '#F06000'; // (darkest orange) Darker version of #9
-    $color[11]  = '#770000'; // (dark red)       Special Folders color
-    $color[12]  = '#FFFFCC'; // (lightest yellow)  Alternate color for message list
-    $color[13]  = '#0000F0'; // (blue)           Color for quoted text -- > 1 quote
-    $color[14]  = '#00C060'; // (green)          Color for quoted text -- >> 2 or more
-    $color[15]  = '#002266'; // (dark blue)      Unselectable folders
+global $color;
+$color[0]   = '#f09000'; // (dark orange)    TitleBar
+$color[1]   = '#800000'; // (red)
+$color[2]   = '#CC0000'; // (light red)      Warning/Error Messages
+$color[3]   = '#ffcc66'; // (light orange)   Left Bar Background
+$color[4]   = '#FFFFFF'; // (white)          Normal Background
+$color[5]   = '#ffbb55'; // (light orange)   Table Headers
+$color[6]   = '#000000'; // (black)          Text on left bar
+$color[7]   = '#770000'; // (dark red)       Links
+$color[8]   = '#000000'; // (black)          Normal text
+$color[9]   = '#ffbb55'; // (light orange)   Darker version of #0
+$color[10]  = '#F06000'; // (darkest orange) Darker version of #9
+$color[11]  = '#770000'; // (dark red)       Special Folders color
+$color[12]  = '#FFFFCC'; // (lightest yellow)  Alternate color for message list
+$color[13]  = '#0000F0'; // (blue)           Color for quoted text -- > 1 quote
+$color[14]  = '#00C060'; // (green)          Color for quoted text -- >> 2 or more
+$color[15]  = '#002266'; // (dark blue)      Unselectable folders
 ?>
\ No newline at end of file

diff --git a/themes/random.php b/themes/random.php
index bdce7c0cca1d072593285b570be67dbfe49e28a4..8858c7908cf268bc0ebed0057309aeab7533db83 100755 (executable)
--- a/themes/random.php
+++ b/themes/random.php
@@ -33,12 +33,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