X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=74894b99564c3dabaf3dcb7dfa47b0220f913540;hb=ab5ff5126ef56b08f5130a9e110b53c00d0a2761;hp=a044e8a06c2aeb84b049a401378a4715a3cd5e4f;hpb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;p=mailer.git
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index a044e8a06c..74894b9956 100644
--- 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 - 2012 by Mailer Developer Team *
+ * 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 *
@@ -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(
@@ -61,10 +60,13 @@ function generateThemeSelectionBox () {
$add = " WHERE `theme_active`='Y'";
// Is there admin?
- if (isAdmin()) $add = '';
+ if (isAdmin()) {
+ // Then display all themes
+ $add = '';
+ } // END - if
// Select all themes we want
- $result = SQL_QUERY('SELECT
+ $result = sqlQuery('SELECT
`theme_path`,
`theme_name`
FROM
@@ -74,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);
- array_push($themesArray['theme_unix'], $content['theme_path']);
- array_push($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?
@@ -105,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
@@ -129,17 +131,17 @@ 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
@@ -149,7 +151,7 @@ function getThemeVersion ($name) {
// 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
@@ -157,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])) {
@@ -172,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
@@ -206,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
@@ -234,7 +236,7 @@ function getActualTheme () {
// Set default theme
setMailerTheme($ret);
} elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
- //die("".print_r($GLOBALS['cache_array']['themes'], true)."
");
+ //die("".print_r($GLOBALS['cache_array']['themes'], TRUE)."
");
// Get theme from cookie
$ret = getSession('mailer_theme');
@@ -245,13 +247,13 @@ function getActualTheme () {
} // END - if
} elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequestElementSet('theme')) || (isPostRequestElementSet('theme')))) {
// Prepare filename for checking
- $themeFile = sprintf("theme/%s/theme.php", getRequestElement('theme'));
+ $themeFile = sprintf('theme/%s/theme.php', getRequestElement('theme'));
// Installation mode active
- if ((isGetRequestElementSet('theme')) && (isIncludeReadable($theme))) {
+ if ((isGetRequestElementSet('theme')) && (isThemeReadable(getRequestElement('theme')))) {
// Set cookie from URL data
setMailerTheme(getRequestElement('theme'));
- } elseif (isIncludeReadable(sprintf("theme/%s/theme.php", postRequestElement('theme')))) {
+ } elseif ((isPostRequestElementSet('theme')) && (isThemeReadable(postRequestElement('theme')))) {
// Set cookie from posted data
setMailerTheme(postRequestElement('theme'));
}
@@ -281,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