Fixed for loading themes, no longer needed parameters removed

[mailer.git] / inc / libs / theme_functions.php

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 3a7c791673e67d66ba9a50b5ff863991ad2c29f5..eb85579a286784abf03ecd8802fac91a85a2cb96 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -38,16 +38,22 @@
 
 // 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);
 }
 
-// Create a selection box with installed and activated themes
-function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
+// Create a selection box with installed and activated themes or all if admin
+function generateThemeSelectionBox () {
+       // Init variables and fill them if set
+       $what = '';
+       $mod = getModule();
+       if (isWhatSet()) {
+               $what = getWhat();
+       } // END - if
+
        // Construction URL
-       $formAction = "{!URL!}/modules.php?module=".$mod;
-       if (!empty($act)) $formAction .= "&action=".$act;
-       if (!empty($wht)) $formAction .= "&what=".$wht;
+       $formAction = "{!URL!}/modules.php?module=" . $mod;
+       if (!empty($what)) $formAction .= "&what=" . $what;
 
        // Initialize array
        $themesArray = array(
@@ -55,26 +61,37 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
                'theme_name'   => array()  // Title
        );
 
+       // Only activated themes for the user
+       $add = " WHERE `theme_active`='Y'";
+
+       // Do we have admin?
+       if (IS_ADMIN()) $add = '';
+
+       // Select all themes we want
+       $result = SQL_QUERY("SELECT `theme_path`, `theme_name` FROM `{!_MYSQL_PREFIX!}_themes`".$add." ORDER BY `theme_name` ASC", __FILE__, __LINE__);
+
        // Load all themes
        while ($content = SQL_FETCHARRAY($result)) {
-               // Load it's theme.php file
+               // Construct relative include file name
                $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
-               if (INCLUDE_READABLE($INC)) {
+
+               // Load it's theme.php file if found
+               if (isIncludeReadable($INC)) {
                        // And save all data in array
-                       LOAD_INC($INC);
+                       loadInclude($INC);
                        $themesArray['theme_unix'][] = $content['theme_path'];
                        $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
                } // END - if
        } // END - while
 
-       // Sort whole array by title
-       array_pk_sort($themesArray, array("theme_name"));
+       // Free the result
+       SQL_FREERESULT($result);
 
        // Construct selection form for the box template
        $OUT = '';
        foreach ($themesArray['theme_unix'] as $key => $theme) {
                $OUT .= "  <option value=\"".$theme."\"";
-               if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
+               if ($theme == getCurrentTheme()) $OUT .= ' selected="selected"';
                $OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
        } // END - foreach
 
@@ -85,7 +102,7 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
        );
 
        // Return generated selection
-       return LOAD_TEMPLATE("theme_select_form", true, $content);
+       return LOAD_TEMPLATE('theme_select_form', true, $content);
 }
 
 // Get version from name
@@ -93,11 +110,11 @@ function THEME_GET_VERSION ($name) {
        // Is the extension 'theme' installed?
        if (!EXT_IS_ACTIVE('theme')) {
                // Then abort here
-               return "!.!";
+               return '!.!';
        } // END - if
 
-       // Default version "number"
-       $cver = "?.?";
+       // Default version 'number'
+       $cver = '?.?';
 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
@@ -108,7 +125,7 @@ function THEME_GET_VERSION ($name) {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
                // Load version from database
-               $result = SQL_QUERY_ESC("SELECT theme_ver FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `theme_ver` FROM `{!_MYSQL_PREFIX!}_themes` WHERE `theme_path`='%s' LIMIT 1",
                        array($name), __FUNCTION__, __LINE__);
 
                // Entry found?
@@ -126,13 +143,13 @@ function THEME_GET_VERSION ($name) {
 }
 
 // Checks wether a theme is found in db
-function THEME_CHECK_EXIST ($name) {
+function ifThemeExists ($name) {
        // Get theme and is it not nul?
-       return (THEME_GET_ID($name) > 0);
+       return (getThemeId($name) > 0);
 }
 
 // Checks if a theme is active
-function THEME_IS_ACTIVE ($name) {
+function isThemeActive ($name) {
        // Is the extension 'theme' installed?
        if (!EXT_IS_ACTIVE('theme')) {
                // Then abort here
@@ -151,7 +168,7 @@ function THEME_IS_ACTIVE ($name) {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
                // Check if current theme is already imported or not
-               $result = SQL_QUERY_ESC("SELECT theme_active FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `theme_active` FROM `{!_MYSQL_PREFIX!}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1",
                        array($name), __FUNCTION__, __LINE__);
 
                // Is the theme active and installed?
@@ -166,15 +183,15 @@ function THEME_IS_ACTIVE ($name) {
 }
 
 // Gets current human-readable theme name
-function GET_CURR_THEME_NAME () {
+function getCurrentThemeName () {
        // Is the extension 'theme' installed?
        if (!EXT_IS_ACTIVE('theme')) {
                // Then abort here
-               return "default";
+               return 'default';
        } // END - if
 
        // Get the Uni* name
-       $name = GET_CURR_THEME();
+       $name = getCurrentTheme();
 
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['themes']['theme_name'][$name])) {
@@ -185,7 +202,7 @@ function GET_CURR_THEME_NAME () {
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
                // Check if current theme is already imported or not
-               $result = SQL_QUERY_ESC("SELECT theme_name FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_path='%s' AND theme_active='Y' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `theme_name` FROM `{!_MYSQL_PREFIX!}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1",
                        array($name), __FUNCTION__, __LINE__);
 
                // Load theme name
@@ -200,15 +217,15 @@ function GET_CURR_THEME_NAME () {
 }
 
 // Initialize variables
-$GLOBALS['curr_theme'] = GET_CURR_THEME();
+$GLOBALS['curr_theme'] = getCurrentTheme();
 
 // Check if new theme is selcted
-if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) {
+if ((REQUEST_ISSET_POST('new_theme')) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) {
        // Set new theme for guests
        $newTheme = REQUEST_POST('new_theme');
 
        // Change to new theme
-       set_session('mxchange_theme', $newTheme);
+       setSession('mxchange_theme', $newTheme);
 
        // Remove current from array and set new
        $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);
@@ -216,5 +233,5 @@ if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBAL
        ADD_INC_TO_POOL(sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme));
 } // END - if
 
-//
+// [EOF]
 ?>