X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=8539bff033401c4c406958c283de9c0e894b3600;hb=eb3e924768678719afc1bfaffb69354c407daa5b;hp=d2e5da8b03344cfbb234edf509553cb8f239d698;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git
diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index d2e5da8b03..8539bff033 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -1,10 +1,10 @@
array() // Title
);
+ // Only activated themes for the user
+ $add = " WHERE `theme_active`='Y'";
+
+ // Is there admin?
+ if (isAdmin()) {
+ // Then display all themes
+ $add = '';
+ } // END - if
+
+ // Select all themes we want
+ $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)) {
- // Load it's theme.php file
- $INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
- if (isIncludeReadable($INC)) {
+ while ($row = sqlFetchArray($result)) {
+ // Construct relative include file name
+ $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'];
+ loadInclude($inc);
+ array_push($themesArray['theme_unix'], $row['theme_path']);
+ array_push($themesArray['theme_name'], $row['theme_name']);
} // END - if
} // END - while
- // Sort whole array by title
- array_pk_sort($themesArray, array("theme_name"));
+ // Free the 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
@@ -84,63 +107,66 @@ function generateThemeSelectionBox ($mod, $act, $wht, $result) {
'selection' => $OUT
);
+ // Load template
+ $out = loadTemplate('theme_select_form', TRUE, $content);
+
// Return generated selection
- return LOAD_TEMPLATE("theme_select_form", true, $content);
+ return $out;
}
// 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 "!.!";
+ return '!.!';
} // END - if
- // Default version "number"
- $cver = "?.?";
+ // Default version 'number'
+ $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
- incrementConfigEntry('cache_hits');
- } elseif (GET_EXT_VERSION('cache') != '0.1.8') {
+ 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 (getThemeId($name) > 0);
+ return (((isExtensionActive('theme')) || (getModule() == 'admin')) && (isValidId(getThemeId($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;
+ 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])) {
@@ -148,17 +174,17 @@ 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 (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
@@ -168,9 +194,9 @@ 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";
+ return 'default';
} // END - if
// Get the Uni* name
@@ -182,39 +208,100 @@ 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 (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;
}
-// Initialize variables
-$GLOBALS['curr_theme'] = getCurrentTheme();
+// 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("