mailer project continued:

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index c114071e338b70312b23c466278f16550e91a16f..02b8ea4c1538e837de0f127f1b92166ec4cfa2b6 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -81,8 +81,8 @@ ORDER BY
                if (isIncludeReadable($inc)) {
                        // And save all data in array
                        loadInclude($inc);
-                       $themesArray['theme_unix'][] = $content['theme_path'];
-                       $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
+                       array_push($themesArray['theme_unix'], $content['theme_path']);
+                       array_push($themesArray['theme_name'], $GLOBALS['theme_data']['name']);
                } // END - if
        } // END - while
 
@@ -145,7 +145,7 @@ function getThemeVersion ($name) {
        return $cver;
 }
 
-// Checks wether a theme is found in db
+// Checks whether a theme is found in db
 function ifThemeExists ($name) {
        // Get theme and is it not nul?
        return ((isExtensionActive('theme')) && (getThemeId($name) > 0));
@@ -225,12 +225,14 @@ function getActualTheme () {
        $ret = 'default';
 
        // Load default theme if not empty from configuration
-       if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) $ret = getConfig('default_theme');
+       if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) {
+               $ret = getConfig('default_theme');
+       } // END - if
 
-       if (!isSessionVariableSet('mailer_theme')) {
+       if (!isMailerThemeSet()) {
                // Set default theme
-               setTheme($ret);
-       } elseif ((isSessionVariableSet('mailer_theme')) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+               setMailerTheme($ret);
+       } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
                //die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
                // Get theme from cookie
                $ret = getSession('mailer_theme');
@@ -247,31 +249,23 @@ function getActualTheme () {
                // Installation mode active
                if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
                        // Set cookie from URL data
-                       setTheme(getRequestElement('theme'));
+                       setMailerTheme(getRequestElement('theme'));
                } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
                        // Set cookie from posted data
-                       setTheme(postRequestElement('theme'));
+                       setMailerTheme(postRequestElement('theme'));
                }
 
                // Set return value
                $ret = getSession('mailer_theme');
        } else {
                // Invalid design, reset cookie
-               setTheme($ret);
+               setMailerTheme($ret);
        }
 
        // Return theme value
        return $ret;
 }
 
-/**
- * Setter for theme in session (This setter does return the success of
- * setSession() which is required e.g. for destroySponsorSession().
- */
-function setTheme ($newTheme) {
-       return setSession('mailer_theme', $newTheme);
-}
-
 // Get id from theme
 function getThemeId ($name) {
        // Default id