ADMIN_MEMBER_SELECTION_BOX() does now return a select-tag with the member list

[mailer.git] / inc / theme-manager.php

diff --git a/inc/theme-manager.php b/inc/theme-manager.php
index 3eeee63dde45d33663d1891998663790ce9ef93d..0ee37962e4c86e77643b4776632f04970bf243ed 100644 (file)
--- a/inc/theme-manager.php
+++ b/inc/theme-manager.php
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // Always make sure the session management is initialized first
 require_once(PATH."inc/session.php");
 
-//
+// Get current theme name
 function GET_CURR_THEME() {
        global $INC_POOL, $_CONFIG, $CSS;
 
@@ -69,10 +69,10 @@ function GET_CURR_THEME() {
                $theme = sprintf("%stheme/%s/theme.php", PATH, $_GET['theme']);
 
                // Installation mode active
-               if ((!empty($_GET['theme'])) && (file_exists($theme)) && (is_readable($theme))) {
+               if ((!empty($_GET['theme'])) && (FILE_READABLE($theme))) {
                        // Set cookie from URL data
                        set_session("mxchange_theme", $_GET['theme']);
-               } elseif (file_exists(PATH."theme/".$_POST['theme']."/theme.php")) {
+               } elseif (FILE_READABLE(PATH."theme/".$_POST['theme']."/theme.php")) {
                        // Set cookie from posted data
                        set_session("mxchange_theme", $_POST['theme']);
                }
@@ -88,16 +88,15 @@ function GET_CURR_THEME() {
        $theme = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($ret));
 
        // Try to load the requested include file
-       if ((@file_exists($theme)) && (is_readable($theme))) $INC_POOL[] = $theme;
+       if (FILE_READABLE($theme)) $INC_POOL[] = $theme;
 
        // Return theme value
        return $ret;
 }
 
-function THEME_SELECTION_BOX($mod, $act, $wht, $result)
-{
+function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
        // Construction URL
-       global $CurrTheme;
+       global $currTheme;
        $FORM = URL."/modules.php?module=".$mod;
        if (!empty($act)) $FORM .= "&action=".$act;
        if (!empty($wht))   $FORM .= "&what=".$wht;
@@ -110,30 +109,27 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result)
        );
 
        // Load all themes
-       while(list($theme) = SQL_FETCHROW($result))
-       {
+       while(list($theme) = SQL_FETCHROW($result)) {
                // Load it's theme.php file
-               $INC = PATH."theme/".$theme."/theme.php";
-               if (file_exists($INC))
-               {
+               $INC = sprintf("%stheme/%s/theme.php", PATH, SQL_ESCAPE($theme));
+               if (FILE_READABLE($INC)) {
                        // And save all data in array
-                       include($INC);
+                       require($INC);
                        $THEMES['theme_unix'][] = $theme;
                        $THEMES['theme_name'][] = $THEME_NAME;
-               }
-       }
+               } // END - if
+       } // END - while
 
        // Sort whole array by title
        array_pk_sort($THEMES, array("theme_name"));
 
        // Construct selection form for the box template
        $OUT = "";
-       foreach ($THEMES['theme_unix'] as $key=>$theme)
-       {
+       foreach ($THEMES['theme_unix'] as $key => $theme) {
                $OUT .= "  <OPTION value=\"".$theme."\"";
-               if ($theme == $CurrTheme) $OUT .= " selected=\"selected\"";
+               if ($theme == $currTheme) $OUT .= " selected=\"selected\"";
                $OUT .= ">".$THEMES['theme_name'][$key]."</OPTION>\n";
-       }
+       } // END - foreach
 
        // Return generated selection
        define('__THEME_SELECTION_OPTIONS', $OUT);
@@ -142,12 +138,11 @@ function THEME_SELECTION_BOX($mod, $act, $wht, $result)
 }
 
 // Initialize variables
-$CurrTheme = GET_CURR_THEME();
+$currTheme = GET_CURR_THEME();
 if (empty($_POST['new_theme'])) $_POST['new_theme'] = "";
 
 // Check if new theme is selcted
-if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $CurrTheme))
-{
+if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
        // Set new theme for guests
        $NewTheme = $_POST['new_theme'];
 
@@ -155,10 +150,10 @@ if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $CurrTheme))
        set_session("mxchange_theme", $NewTheme);
 
        // Remove current from array and set new
-       $theme = PATH."theme/".$CurrTheme."/theme.php";
+       $theme = sprintf("%stheme/%s/theme.php", PATH, $currTheme);
        unset($INC_POOL[array_search($theme, $INC_POOL)]);
-       $INC_POOL[] = PATH."theme/".$NewTheme."/theme.php";
-}
+       $INC_POOL[] = sprintf("%stheme/%s/theme.php", PATH, $NewTheme);
+} // END - if
 
 // Remove variable again
 unset($_POST['new_theme']);