X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=74894b99564c3dabaf3dcb7dfa47b0220f913540;hp=3fc35343e46d93a35058465cba7cad01b01b6abc;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hpb=0f3a135204757cc8750262871c8e62c42300acb4
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 3fc35343e4..74894b9956 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -47,9 +47,8 @@ function generateThemeSelectionBox () {
$mod = getModule();
// Construction URL
- $formAction = '{%url=modules.php?module='. $mod;
+ $formAction = 'modules.php?module='. $mod;
if (!empty($what)) $formAction .= '&what=' . $what;
- $formAction .= '%}';
// Initialize array
$themesArray = array(
@@ -60,12 +59,16 @@ function generateThemeSelectionBox () {
// Only activated themes for the user
$add = " WHERE `theme_active`='Y'";
- // Do we have admin?
- if (isAdmin()) $add = '';
+ // Is there admin?
+ if (isAdmin()) {
+ // Then display all themes
+ $add = '';
+ } // END - if
// Select all themes we want
- $result = SQL_QUERY('SELECT
- `theme_path`,`theme_name`
+ $result = sqlQuery('SELECT
+ `theme_path`,
+ `theme_name`
FROM
`{?_MYSQL_PREFIX?}_themes`
' . $add . '
@@ -73,21 +76,18 @@ ORDER BY
`theme_name` ASC', __FUNCTION__, __LINE__);
// Load all themes
- while ($content = SQL_FETCHARRAY($result)) {
- // Construct relative include file name
- $inc = sprintf("theme/%s/theme.php", secureString($content['theme_path']));
-
+ while ($row = sqlFetchArray($result)) {
// Load it's theme.php file if found
- if (isIncludeReadable($inc)) {
+ if (isThemeReadable($row['theme_path'])) {
// And save all data in array
- loadInclude($inc);
- $themesArray['theme_unix'][] = $content['theme_path'];
- $themesArray['theme_name'][] = $GLOBALS['theme_data']['name'];
+ loadInclude(sprintf('theme/%s/theme.php', secureString($row['theme_path'])));
+ array_push($themesArray['theme_unix'], $row['theme_path']);
+ array_push($themesArray['theme_name'], $row['theme_name']);
} // END - if
} // END - while
// Free the result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Construct selection form for the box template
// @TODO Can't this be rewritten to an API function?
@@ -104,8 +104,11 @@ ORDER BY
'selection' => $OUT
);
+ // Load template
+ $out = loadTemplate('theme_select_form', TRUE, $content);
+
// Return generated selection
- return loadTemplate('theme_select_form', true, $content);
+ return $out;
}
// Get version from name
@@ -128,27 +131,27 @@ function getThemeVersion ($name) {
incrementStatsEntry('cache_hits');
} 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",
+ $result = sqlQueryEscaped("SELECT `theme_ver` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
array($name), __FUNCTION__, __LINE__);
// Entry found?
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Fetch data
- list($cver) = SQL_FETCHROW($result);
+ list($cver) = sqlFetchRow($result);
} // END - if
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
}
// Return version
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));
+ return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (isValidId(getThemeId($name))));
}
// Checks if a theme is active
@@ -156,11 +159,11 @@ function isThemeActive ($name) {
// Is the extension 'theme' installed?
if (!isExtensionActive('theme')) {
// Then abort here
- return false;
+ return FALSE;
} // END - if
// Default is nothing active
- $active = false;
+ $active = FALSE;
// Is the cache entry there?
if (isset($GLOBALS['cache_array']['themes']['theme_active'][$name])) {
@@ -171,14 +174,14 @@ function isThemeActive ($name) {
incrementStatsEntry('cache_hits');
} 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",
+ $result = sqlQueryEscaped("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?
- $active = (SQL_NUMROWS($result) == 1);
+ $active = (sqlNumRows($result) == 1);
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
}
// Return result
@@ -205,14 +208,14 @@ function getCurrentThemeName () {
incrementStatsEntry('cache_hits');
} 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",
+ $result = sqlQueryEscaped("SELECT `theme_name` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' AND `theme_active`='Y' LIMIT 1",
array($name), __FUNCTION__, __LINE__);
// Load theme name
- list($name) = SQL_FETCHROW($result);
+ list($name) = sqlFetchRow($result);
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
}
// Return name
@@ -225,13 +228,15 @@ 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'))) {
- //die("".print_r($GLOBALS['cache_array']['themes'], true)."
");
+ setMailerTheme($ret);
+ } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+ //die("".print_r($GLOBALS['cache_array']['themes'], TRUE)."
");
// Get theme from cookie
$ret = getSession('mailer_theme');
@@ -240,38 +245,30 @@ function getActualTheme () {
// Fix it to default
$ret = 'default';
} // END - if
- } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestParameterSet('theme')) || (isPostRequestParameterSet('theme')))) {
+ } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
// Prepare filename for checking
- $themeFile = sprintf("theme/%s/theme.php", getRequestParameter('theme'));
+ $themeFile = sprintf('theme/%s/theme.php', getRequestElement('theme'));
// Installation mode active
- if ((isGetRequestParameterSet('theme')) && (isIncludeReadable($theme))) {
+ if ((isGetRequestElementSet('theme')) && (isThemeReadable(getRequestElement('theme')))) {
// Set cookie from URL data
- setTheme(getRequestParameter('theme'));
- } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestParameter('theme')))) {
+ setMailerTheme(getRequestElement('theme'));
+ } elseif ((isPostRequestElementSet('theme')) && (isThemeReadable(postRequestElement('theme')))) {
// Set cookie from posted data
- setTheme(postRequestParameter('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
@@ -286,17 +283,17 @@ function getThemeId ($name) {
incrementStatsEntry('cache_hits');
} elseif (isExtensionInstalledAndNewer('cache', '0.1.8')) {
// Check if current theme is already imported or not
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
+ $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_path`='%s' LIMIT 1",
array($name), __FUNCTION__, __LINE__);
// Entry found?
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Fetch data
- list($id) = SQL_FETCHROW($result);
+ list($id) = sqlFetchRow($result);
} // END - if
// Free result
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
}
// Return id