projects
/
mailer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...
[mailer.git]
/
inc
/
libs
/
theme_functions.php
diff --git
a/inc/libs/theme_functions.php
b/inc/libs/theme_functions.php
index 976d45acc50f6eb6367212a7231f1f40dfd39550..8245ee807cbfed3de354ff2c111c961b2b3ba795 100644
(file)
--- a/
inc/libs/theme_functions.php
+++ b/
inc/libs/theme_functions.php
@@
-16,8
+16,8
@@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 201
1
by Mailer Developer Team *
- * For more information visit: http://
www.mxchange.org
*
+ * Copyright (c) 2009 - 201
2
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 *
* *
* 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 *
@@
-60,12
+60,12
@@
function generateThemeSelectionBox () {
// Only activated themes for the user
$add = " WHERE `theme_active`='Y'";
// Only activated themes for the user
$add = " WHERE `theme_active`='Y'";
- //
Do we hav
e admin?
+ //
Is ther
e admin?
if (isAdmin()) $add = '';
// Select all themes we want
$result = SQL_QUERY('SELECT
if (isAdmin()) $add = '';
// Select all themes we want
$result = SQL_QUERY('SELECT
- `theme_path`,
`theme_name`
+ `theme_path`,`theme_name`
FROM
`{?_MYSQL_PREFIX?}_themes`
' . $add . '
FROM
`{?_MYSQL_PREFIX?}_themes`
' . $add . '
@@
-81,8
+81,8
@@
ORDER BY
if (isIncludeReadable($inc)) {
// And save all data in array
loadInclude($inc);
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'], $content['theme_path'])
;
+
array_push($themesArray['theme_name'], $GLOBALS['theme_data']['name'])
;
} // END - if
} // END - while
} // END - if
} // END - while
@@
-145,7
+145,7
@@
function getThemeVersion ($name) {
return $cver;
}
return $cver;
}
-// Checks wether a theme is found in db
+// Checks w
h
ether a theme is found in db
function ifThemeExists ($name) {
// Get theme and is it not nul?
return ((isExtensionActive('theme')) && (getThemeId($name) > 0));
function ifThemeExists ($name) {
// Get theme and is it not nul?
return ((isExtensionActive('theme')) && (getThemeId($name) > 0));
@@
-225,12
+225,14
@@
function getActualTheme () {
$ret = 'default';
// Load default theme if not empty from configuration
$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 (!is
SessionVariableSet('mailer_theme'
)) {
+ if (!is
MailerThemeSet(
)) {
// Set default theme
// Set default theme
- setTheme($ret);
- } elseif ((is
SessionVariableSet('mailer_theme'
)) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
+ set
Mailer
Theme($ret);
+ } elseif ((is
MailerThemeSet(
)) && (isExtensionInstalledAndNewer('sql_patches', '0.1.4'))) {
//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
// Get theme from cookie
$ret = getSession('mailer_theme');
//die("<pre>".print_r($GLOBALS['cache_array']['themes'], true)."</pre>");
// Get theme from cookie
$ret = getSession('mailer_theme');
@@
-240,38
+242,30
@@
function getActualTheme () {
// Fix it to default
$ret = 'default';
} // END - if
// Fix it to default
$ret = 'default';
} // END - if
- } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequest
ParameterSet('theme')) || (isPostRequestParameter
Set('theme')))) {
+ } elseif ((!isInstalled()) && ((isInstalling()) || (isHtmlOutputMode())) && ((isGetRequest
ElementSet('theme')) || (isPostRequestElement
Set('theme')))) {
// Prepare filename for checking
// Prepare filename for checking
- $themeFile = sprintf("theme/%s/theme.php", getRequest
Parameter
('theme'));
+ $themeFile = sprintf("theme/%s/theme.php", getRequest
Element
('theme'));
// Installation mode active
// Installation mode active
- if ((isGetRequest
Parameter
Set('theme')) && (isIncludeReadable($theme))) {
+ if ((isGetRequest
Element
Set('theme')) && (isIncludeReadable($theme))) {
// Set cookie from URL data
// Set cookie from URL data
- set
Theme(getRequestParameter
('theme'));
- } elseif (isIncludeReadable(sprintf("theme/%s/theme.php",
secureString(postRequestParameter('theme')
)))) {
+ set
MailerTheme(getRequestElement
('theme'));
+ } elseif (isIncludeReadable(sprintf("theme/%s/theme.php",
postRequestElement('theme'
)))) {
// Set cookie from posted data
// Set cookie from posted data
- set
Theme(secureString(postRequestParameter('theme')
));
+ set
MailerTheme(postRequestElement('theme'
));
}
// Set return value
$ret = getSession('mailer_theme');
} else {
// Invalid design, reset cookie
}
// Set return value
$ret = getSession('mailer_theme');
} else {
// Invalid design, reset cookie
- setTheme($ret);
+ set
Mailer
Theme($ret);
}
// Return theme value
return $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
// Get id from theme
function getThemeId ($name) {
// Default id