Fixes for broken installation routine

[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 830df271d38129acfd6562534f0149ac762d339f..fa3e614a33fc0383bdde5351f1bef10e7617489e 100644 (file)
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -41,9 +41,9 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'theme');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('theme'));
        return;
 }
 
@@ -53,13 +53,13 @@ ADD_DESCR('member', __FILE__);
 if (REQUEST_ISSET_POST(('member_theme'))) {
        // Save theme to member's profile
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET curr_theme='%s' WHERE userid=%s LIMIT 1",
-               array(REQUEST_POST('member_theme'), getUserId()), __FILE__, __LINE__);
+       array(REQUEST_POST('member_theme'), getUserId()), __FILE__, __LINE__);
 
        // Set new theme for guests
        $newTheme = SQL_ESCAPE(REQUEST_POST('member_theme'));
 
        // Change to new theme
-       set_session('mxchange_theme', $newTheme);
+       setSession('mxchange_theme', $newTheme);
 
        // Theme saved!
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_THEME_SAVED'));
@@ -81,9 +81,9 @@ while ($entry = readdir($handle)) {
        // Construct absolute theme.php file name
        $INC = sprintf("theme/%s/theme.php", $entry);
 
-       if (($entry != ".") && ($entry != "..") && (INCLUDE_READABLE($INC)) && (THEME_IS_ACTIVE($entry))) {
+       if ((!isDirectory($entry)) && (isIncludeReadable($INC)) && (isThemeActive($entry))) {
                // Found a valid directory so let's load it's theme.php file
-               LOAD_INC($INC);
+               loadInclude($INC);
 
                // Add found theme to array
                $THEMES['theme_unix'][]   = $entry;
@@ -105,7 +105,7 @@ array_pk_sort($THEMES, array("theme_name"));
 $OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
        $default = '';
-       if (get_session('mxchange_theme') == $unix) $default = " selected=\"selected\"";
+       if (getSession('mxchange_theme') == $unix) $default = ' selected="selected"';
 
        // Add row
        $OUT .= "<tr>
@@ -114,7 +114,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
   </td>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")"."\">".$THEMES['theme_author'][$key]."</a>
+    <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")'.'\">".$THEMES['theme_author'][$key]."</a>
   </td>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
     <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
@@ -125,7 +125,7 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 }
 
 if (empty($OUT)) {
-       // No themes found???
+       // No themes found???
        $OUT = "<tr>
   <td colspan=\"5\" class=\"bottom2\" height=\"80\">
     ".LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))."