Rewrites to fix cache class

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

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 0c36ae43b923b614be3e21e303ebcc654730685f..1cac6e877e81a1032208233916d35cfd88170e14 100644 (file)
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,8 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
+       die();
 }
 
 // Create a selection box with installed and activated themes or all if admin
@@ -65,20 +64,20 @@ function generateThemeSelectionBox () {
        $add = " WHERE `theme_active`='Y'";
 
        // Do we have admin?
-       if (IS_ADMIN()) $add = '';
+       if (isAdmin()) $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__);
+       $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)) {
                // Construct relative include file name
-               $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
+               $inc = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
 
                // Load it's theme.php file if found
-               if (isIncludeReadable($INC)) {
+               if (isIncludeReadable($inc)) {
                        // And save all data in array
-                       loadInclude($INC);
+                       loadInclude($inc);
                        $themesArray['theme_unix'][] = $content['theme_path'];
                        $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
                } // END - if
@@ -102,13 +101,13 @@ function generateThemeSelectionBox () {
        );
 
        // Return generated selection
-       return LOAD_TEMPLATE('theme_select_form', true, $content);
+       return loadTemplate('theme_select_form', true, $content);
 }
 
 // Get version from name
-function THEME_GET_VERSION ($name) {
+function getThemeVersion ($name) {
        // Is the extension 'theme' installed?
-       if (!EXT_IS_ACTIVE('theme')) {
+       if (!isExtensionActive('theme')) {
                // Then abort here
                return '!.!';
        } // END - if
@@ -122,10 +121,10 @@ function THEME_GET_VERSION ($name) {
                $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
 
                // Count up
-               incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
+               incrementStatsEntry('cache_hits');
+       } elseif (getExtensionVersion('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?
@@ -151,7 +150,7 @@ function ifThemeExists ($name) {
 // Checks if a theme is active
 function isThemeActive ($name) {
        // Is the extension 'theme' installed?
-       if (!EXT_IS_ACTIVE('theme')) {
+       if (!isExtensionActive('theme')) {
                // Then abort here
                return false;
        } // END - if
@@ -165,10 +164,10 @@ function isThemeActive ($name) {
                $active = ($GLOBALS['cache_array']['themes']['theme_active'][$name] == 'Y');
 
                // Count up
-               incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
+               incrementStatsEntry('cache_hits');
+       } elseif (getExtensionVersion('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?
@@ -185,7 +184,7 @@ function isThemeActive ($name) {
 // Gets current human-readable theme name
 function getCurrentThemeName () {
        // Is the extension 'theme' installed?
-       if (!EXT_IS_ACTIVE('theme')) {
+       if (!isExtensionActive('theme')) {
                // Then abort here
                return 'default';
        } // END - if
@@ -199,10 +198,10 @@ function getCurrentThemeName () {
                $name = $GLOBALS['cache_array']['themes']['theme_name'][$name];
 
                // Count up
-               incrementConfigEntry('cache_hits');
-       } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
+               incrementStatsEntry('cache_hits');
+       } elseif (getExtensionVersion('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
@@ -220,18 +219,18 @@ function getCurrentThemeName () {
 $GLOBALS['curr_theme'] = getCurrentTheme();
 
 // Check if new theme is selcted
-if ((REQUEST_ISSET_POST('new_theme')) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) {
+if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != $GLOBALS['curr_theme'])) {
        // Set new theme for guests
-       $newTheme = REQUEST_POST('new_theme');
+       $newTheme = postRequestElement('new_theme');
 
        // Change to new theme
-       setSession('mxchange_theme', $newTheme);
+       setTheme($newTheme);
 
        // Remove current from array
-       REMOVE_INC_FROM_POOL(sprintf("theme/%s/theme.php", $GLOBALS['curr_theme']));
+       removeIncludeFromPool('theme', sprintf("theme/%s/theme.php", $GLOBALS['curr_theme']));
 
        // Add new theme
-       ADD_INC_TO_POOL(sprintf("theme/%s/theme.php", $newTheme));
+       addIncludeToPool('theme', sprintf("theme/%s/theme.php", $newTheme));
 } // END - if
 
 // [EOF]