X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=8539bff033401c4c406958c283de9c0e894b3600;hb=eb3e924768678719afc1bfaffb69354c407daa5b;hp=3b281e2cc2317323098b4f5b4fd0edcf8cf693c4;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 3b281e2cc2..8539bff033 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -4,7 +4,7 @@
* =================== Last change: 12/13/2004 *
* *
* -------------------------------------------------------------------- *
- * File : theme-manager.php *
+ * File : theme manager.php *
* -------------------------------------------------------------------- *
* Short description : Theme manager *
* -------------------------------------------------------------------- *
@@ -14,11 +14,10 @@
* $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 - 2009 by Roland Haeder *
- * 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 *
@@ -39,20 +38,17 @@
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
// Create a selection box with installed and activated themes or all if admin
function generateThemeSelectionBox () {
// Init variables and fill them if set
- $what = '';
+ $what = getWhat();
$mod = getModule();
- if (isWhatSet()) {
- $what = getWhat();
- } // END - if
// Construction URL
- $formAction = "{?URL?}/modules.php?module=" . $mod;
- if (!empty($what)) $formAction .= "&what=" . $what;
+ $formAction = 'modules.php?module='. $mod;
+ if (!empty($what)) $formAction .= '&what=' . $what;
// Initialize array
$themesArray = array(
@@ -63,35 +59,46 @@ 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` FROM `{?_MYSQL_PREFIX?}_themes`".$add." ORDER BY `theme_name` ASC", __FILE__, __LINE__);
+ $result = sqlQuery('SELECT
+ `theme_path`,
+ `theme_name`
+FROM
+ `{?_MYSQL_PREFIX?}_themes`
+' . $add . '
+ORDER BY
+ `theme_name` ASC', __FUNCTION__, __LINE__);
// Load all themes
- while ($content = SQL_FETCHARRAY($result)) {
+ while ($row = sqlFetchArray($result)) {
// Construct relative include file name
- $inc = sprintf("theme/%s/theme.php", secureString($content['theme_path']));
+ $inc = sprintf("theme/%s/theme.php", secureString($row['theme_path']));
// Load it's theme.php file if found
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'], $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?
$OUT = '';
foreach ($themesArray['theme_unix'] as $key => $theme) {
- $OUT .= " ';
} // END - foreach
// Remember content
@@ -100,8 +107,11 @@ function generateThemeSelectionBox () {
'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
@@ -116,35 +126,35 @@ function getThemeVersion ($name) {
$cver = '?.?';
// Is the cache entry there?
- if (isset($GLOBALS['cache_array']['themes']['theme_ver'][$name])) {
+ if (isset($GLOBALS['cache_array']['themes']['theme_version'][$name])) {
// Get the version from cache
- $cver = $GLOBALS['cache_array']['themes']['theme_ver'][$name];
+ $cver = $GLOBALS['cache_array']['themes']['theme_version'][$name];
// Count up
incrementStatsEntry('cache_hits');
- } elseif (getExtensionVersion('cache') != '0.1.8') {
+ } 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 (getThemeId($name) > 0);
+ return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (isValidId(getThemeId($name))));
}
// Checks if a theme is active
@@ -152,11 +162,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])) {
@@ -165,16 +175,16 @@ function isThemeActive ($name) {
// Count up
incrementStatsEntry('cache_hits');
- } elseif (getExtensionVersion('cache') != '0.1.8') {
+ } 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
@@ -199,37 +209,99 @@ function getCurrentThemeName () {
// Count up
incrementStatsEntry('cache_hits');
- } elseif (getExtensionVersion('cache') != '0.1.8') {
+ } 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
return $name;
}
-// @TODO Move this code block into a filter and register it with 'init'
-// Check if new theme is selcted
-if ((isPostRequestElementSet('new_theme')) && (postRequestElement('new_theme') != getCurrentTheme())) {
- // Set new theme for guests
- $newTheme = postRequestElement('new_theme');
+// Get current theme name
+function getActualTheme () {
+ // The default theme is 'default'... ;-)
+ $ret = 'default';
+
+ // Load default theme if not empty from configuration
+ if ((isConfigEntrySet('default_theme')) && (getConfig('default_theme') != '')) {
+ $ret = getConfig('default_theme');
+ } // END - if
+
+ if (!isMailerThemeSet()) {
+ // Set default theme
+ setMailerTheme($ret);
+ } elseif ((isMailerThemeSet()) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+ //die("