admin_new_ext.tpl now resists in right folder, some minor changes

[mailer.git] / inc / modules / member / what-themes.php

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 0e25541d34489d4bbc2ed20f58bfde34ea1140e5..849768d04dc9d3f00d5741e4dd0451a7a5472d55 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -37,7 +37,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
- elseif (!IS_LOGGED_IN())
+ elseif (!IS_MEMBER())
 {
        LOAD_URL("modules.php?module=index");
 }
@@ -48,15 +48,14 @@ ADD_DESCR("member", basename(__FILE__));
 if (!empty($_POST['member_theme']))
 {
        // Save theme to member's profile
-       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET curr_theme='%s' WHERE userid=%d LIMIT 1",
+       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET curr_theme='%s' WHERE userid=%s LIMIT 1",
          array($_POST['member_theme'], $GLOBALS['userid']), __FILE__, __LINE__);
 
        // Set new theme for guests
        $NewTheme = $_POST['member_theme'];
 
        // Change to new theme
-       set_session("mxchange_theme", $NewTheme, (time() + 60*60*24*365), COOKIE_PATH);
-       $_SESSION['mxchange_theme'] = $NewTheme;
+       set_session("mxchange_theme", $NewTheme);
 
        // Theme saved!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_THEME_SAVED);
@@ -74,17 +73,15 @@ $THEMES = array(
 
 // Read directory "themes"
 $handle = opendir(PATH."theme/") or mxchange_die("Cannot read themes dir!");
-while ($dir = readdir($handle))
-{
+while ($dir = readdir($handle)) {
        // Construct absolute theme.php file name
-       $theme = PATH."theme/".$dir."/"."theme.php";
+       $theme = sprintf("%stheme/%s/theme.php", PATH, $dir);
 
        // Test it...
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_themes WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
         array($dir), __FILE__, __LINE__);
 
-       if (($dir != ".") && ($dir != "..") && (file_exists($theme)) && (is_readable($theme)) && (SQL_NUMROWS($result) == 1))
-       {
+       if (($dir != ".") && ($dir != "..") && (FILE_READABLE($theme)) && (SQL_NUMROWS($result) == 1)) {
                // Free memory
                SQL_FREERESULT($result);
 
@@ -98,8 +95,10 @@ while ($dir = readdir($handle))
                $THEMES['theme_email'][]  = $THEME_EMAIL;
                $THEMES['theme_url'][]    = $THEME_URL;
                $THEMES['theme_ver'][]    = $THEME_VERSION;
-       }
-}
+       } // END - if
+} // END - while
+
+// Close directory
 closedir($handle);
 
 // Sort array by Uni* name
@@ -107,10 +106,10 @@ array_pk_sort($THEMES, array("theme_name"));
 
 // Generate output lines for the template
 $OUT = ""; $SW = 2;
-foreach ($THEMES['theme_unix'] as $key=>$unix)
+foreach ($THEMES['theme_unix'] as $key => $unix)
 {
        $default = "";
-       if ($_SESSION['mxchange_theme'] == $unix) $default = " checked selected";
+       if (get_session('mxchange_theme') == $unix) $default = " checked selected";
 
        // Add row
        $OUT .= "<TR>