New extension added, more EL-rewrites, naming-convention applied:

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 9d97d505c302a67c1daaf87fe5d906d79f121f1f..a6f61c9a37c86015b5dbd4c8d1d098cb76fe45e8 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Create a selection box with installed and activated themes or all if admin
 function generateThemeSelectionBox () {
@@ -49,9 +49,9 @@ function generateThemeSelectionBox () {
        $mod = getModule();
 
        // Construction URL
-       $formAction = "{%url=modules.php?module=" . $mod;
-       if (!empty($what)) $formAction .= "&what=" . $what;
-       $formAction = '%}';
+       $formAction = '{%url=modules.php?module='. $mod;
+       if (!empty($what)) $formAction .= '&what=' . $what;
+       $formAction .= '%}';
 
        // Initialize array
        $themesArray = array(
@@ -72,7 +72,7 @@ FROM
        `{?_MYSQL_PREFIX?}_themes`
 ".$add."
 ORDER BY
-       `theme_name` ASC", __FILE__, __LINE__);
+       `theme_name` ASC", __FUNCTION__, __LINE__);
 
        // Load all themes
        while ($content = SQL_FETCHARRAY($result)) {
@@ -92,11 +92,12 @@ ORDER BY
        SQL_FREERESULT($result);
 
        // Construct selection form for the box template
+       // @TODO Can't this be rewritten to an API function?
        $OUT = '';
        foreach ($themesArray['theme_unix'] as $key => $theme) {
-               $OUT .= "  <option value=\"".$theme."\"";
+               $OUT .= '  <option value="' . $theme . '"';
                if ($theme == getCurrentTheme()) $OUT .= ' selected="selected"';
-               $OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
+               $OUT .= '>' . $themesArray['theme_name'][$key] . '</option>';
        } // END - foreach
 
        // Remember content
@@ -121,13 +122,13 @@ function getThemeVersion ($name) {
        $cver = '?.?';
 
        // Is the cache entry there?
-       if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
+       if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) {
                // Get the version from cache
-               $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
+               $cver = $GLOBALS['cache_array']['themes']['theme_version'][$name];
 
                // Count up
                incrementStatsEntry('cache_hits');
-       } elseif (getExtensionVersion('cache') != '0.1.8') {
+       } elseif (isExtensionInstalledAndNewer('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",
                        array($name), __FUNCTION__, __LINE__);
@@ -170,7 +171,7 @@ function isThemeActive ($name) {
 
                // Count up
                incrementStatsEntry('cache_hits');
-       } elseif (getExtensionVersion('cache') != '0.1.8') {
+       } elseif (isExtensionInstalledAndNewer('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",
                        array($name), __FUNCTION__, __LINE__);
@@ -204,7 +205,7 @@ function getCurrentThemeName () {
 
                // Count up
                incrementStatsEntry('cache_hits');
-       } elseif (getExtensionVersion('cache') != '0.1.8') {
+       } elseif (isExtensionInstalledAndNewer('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",
                        array($name), __FUNCTION__, __LINE__);
@@ -320,6 +321,9 @@ function FILTER_HANDLE_THEME_CHANGE () {
 
                // Add new theme
                addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
+
+               // Redirect to same URL
+               redirectToRequestUri();
        } // END - if
 }
 
@@ -328,7 +332,7 @@ function FILTER_SET_USERS_THEME () {
        // Is the user data valid?
        if (!isMember()) {
                // Do only run for logged in members
-               debug_report_bug('Please only run this filter for logged in users.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
        } // END - if
 
        // Change to new theme