A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index f8fd66dbd5a1fc2a764fd40bc186fd5963f128fe..2321ea35ec97468d714becc8264a8b5a713d4430 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Themen-Manager                                   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,7 +38,7 @@
 
 // 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);
 }
 
@@ -58,7 +63,7 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
                        // And save all data in array
                        LOAD_INC($INC);
                        $themesArray['theme_unix'][] = $content['theme_path'];
-                       $themesArray['theme_name'][] = $THEME_NAME;
+                       $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
                } // END - if
        } // END - while
 
@@ -66,7 +71,7 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
        array_pk_sort($themesArray, array("theme_name"));
 
        // Construct selection form for the box template
-       $OUT = "";
+       $OUT = '';
        foreach ($themesArray['theme_unix'] as $key => $theme) {
                $OUT .= "  <option value=\"".$theme."\"";
                if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
@@ -85,8 +90,8 @@ function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
 
 // Get version from name
 function THEME_GET_VERSION ($name) {
-       // Is the extension "theme" installed?
-       if (!EXT_IS_ACTIVE("theme")) {
+       // Is the extension 'theme' installed?
+       if (!EXT_IS_ACTIVE('theme')) {
                // Then abort here
                return "!.!";
        } // END - if
@@ -101,7 +106,7 @@ function THEME_GET_VERSION ($name) {
 
                // Count up
                incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+       } 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",
                        array($name), __FUNCTION__, __LINE__);
@@ -128,8 +133,8 @@ function THEME_CHECK_EXIST ($name) {
 
 // Checks if a theme is active
 function THEME_IS_ACTIVE ($name) {
-       // Is the extension "theme" installed?
-       if (!EXT_IS_ACTIVE("theme")) {
+       // Is the extension 'theme' installed?
+       if (!EXT_IS_ACTIVE('theme')) {
                // Then abort here
                return false;
        } // END - if
@@ -140,11 +145,11 @@ function THEME_IS_ACTIVE ($name) {
        // Is the cache entry there?
        if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {
                // Get the version from cache
-               $active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == "Y");
+               $active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == 'Y');
 
                // Count up
                incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+       } 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",
                        array($name), __FUNCTION__, __LINE__);
@@ -162,8 +167,8 @@ function THEME_IS_ACTIVE ($name) {
 
 // Gets current human-readable theme name
 function GET_CURR_THEME_NAME () {
-       // Is the extension "theme" installed?
-       if (!EXT_IS_ACTIVE("theme")) {
+       // Is the extension 'theme' installed?
+       if (!EXT_IS_ACTIVE('theme')) {
                // Then abort here
                return "default";
        } // END - if
@@ -178,7 +183,7 @@ function GET_CURR_THEME_NAME () {
 
                // Count up
                incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION("cache") != "0.1.8") {
+       } 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",
                        array($name), __FUNCTION__, __LINE__);
@@ -207,8 +212,8 @@ if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBAL
 
        // Remove current from array and set new
        $theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);
-       unset($INC_POOL[array_search($theme, $INC_POOL)]);
-       $INC_POOL[] = sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme);
+       REMOVE_INC_FROM_POOL($theme);
+       ADD_INC_TO_POOL(sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme));
 } // END - if
 
 //