'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

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

diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php
index b471e2c425f91c102b69b1b5365514ac28c83314..46acae9c4ecc6fe9072605a09780f7c64b7c97a0 100644 (file)
--- a/inc/modules/member/action-themes.php
+++ b/inc/modules/member/action-themes.php
@@ -38,12 +38,12 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $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__, generateExtensionInactiveNotInstalledMessage('theme'));
        return;
 }
 
@@ -56,13 +56,13 @@ $num_themes = SQL_NUMROWS($result_themes);
 if ($num_themes > 1) {
        // If more than 1 is installed output selection box
        $act = ''; $wht = '';
-       if (!empty($GLOBALS['action'])) $act = SQL_ESCAPE($GLOBALS['action']);
-       if (!empty($GLOBALS['what']))   $wht = SQL_ESCAPE($GLOBALS['what']);
-       $OUT = THEME_SELECTION_BOX("login", $act, $wht, $result_themes);
+       if (isActionSet()) $act = getAction();
+       if (isWhatSet())   $wht = getWhat();
+       $OUT = generateThemeSelectionBox('login', $act, $wht, $result_themes);
 } elseif (($num_themes == 1) || ((!IS_ADMIN()) && ($num_themes == 0))) {
        // If there's only one just print it's name
-       define('__THEME_NAME', GET_CURR_THEME_NAME());
-       $OUT = LOAD_TEMPLATE("theme_one", true);
+       define('__THEME_NAME', getCurrentThemeName());
+       $OUT = LOAD_TEMPLATE('theme_one', true);
 } elseif (IS_ADMIN()) {
        // If there is no theme installed and there's an admin notify him!
        $OUT = LOAD_TEMPLATE('admin_settings_saved', true, "<div class=\"admin_note\">{--ADMIN_NO_THEME_INSTALLED_WARNING--}</div>");
@@ -72,7 +72,7 @@ if ($num_themes > 1) {
 SQL_FREERESULT($result_themes);
 
 // Load final box template
-LOAD_TEMPLATE("theme_select_box", false, $OUT);
+LOAD_TEMPLATE('theme_select_box', false, $OUT);
 
 //
 ?>