X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftheme_functions.php;h=d7a320da346b101b213b91bddb99d82169cf77b3;hp=4a56e674ef2c6f2ff1dfbd0a1f4a6fbb85c02032;hb=f3e4c2c048761589836fdbe6bd2e46599a1833a7;hpb=59bd8a9805c51c895a92cc12825f4cbdfd792597

diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php
index 4a56e674ef..d7a320da34 100644
--- a/inc/libs/theme_functions.php
+++ b/inc/libs/theme_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Themen-Manager                                   *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -37,46 +42,50 @@ if (!defined('__SECURITY')) {
 	require($INC);
 }
 
-function THEME_SELECTION_BOX($mod, $act, $wht, $result) {
+// Create a selection box with installed and activated themes
+function THEME_SELECTION_BOX ($mod, $act, $wht, $result) {
 	// Construction URL
-	$FORM = "{!URL!}/modules.php?module=".$mod;
-	if (!empty($act)) $FORM .= "&action=".$act;
-	if (!empty($wht))   $FORM .= "&what=".$wht;
-	define('__FORM_VALUE', $FORM);
+	$formAction = "{!URL!}/modules.php?module=".$mod;
+	if (!empty($act)) $formAction .= "&action=".$act;
+	if (!empty($wht)) $formAction .= "&what=".$wht;
 
 	// Initialize array
-	$THEMES = array(
+	$themesArray = array(
 		'theme_unix'   => array(), // Unix name from filesystem
 		'theme_name'   => array()  // Title
 	);
 
 	// Load all themes
-	while (list($theme) = SQL_FETCHROW($result)) {
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Load it's theme.php file
-		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($theme));
+		$INC = sprintf("theme/%s/theme.php", SQL_ESCAPE($content['theme_path']));
 		if (INCLUDE_READABLE($INC)) {
 			// And save all data in array
 			LOAD_INC($INC);
-			$THEMES['theme_unix'][] = $theme;
-			$THEMES['theme_name'][] = $THEME_NAME;
+			$themesArray['theme_unix'][] = $content['theme_path'];
+			$themesArray['theme_name'][] = $THEME_NAME;
 		} // END - if
 	} // END - while
 
 	// Sort whole array by title
-	array_pk_sort($THEMES, array("theme_name"));
+	array_pk_sort($themesArray, array("theme_name"));
 
 	// Construct selection form for the box template
 	$OUT = "";
-	foreach ($THEMES['theme_unix'] as $key => $theme) {
+	foreach ($themesArray['theme_unix'] as $key => $theme) {
 		$OUT .= "  <option value=\"".$theme."\"";
 		if ($theme == GET_CURR_THEME()) $OUT .= " selected=\"selected\"";
-		$OUT .= ">".$THEMES['theme_name'][$key]."</option>\n";
+		$OUT .= ">".$themesArray['theme_name'][$key]."</option>\n";
 	} // END - foreach
 
+	// Remember content
+	$content = array(
+		'form_action' => $formAction,
+		'selection'   => $OUT
+	);
+
 	// Return generated selection
-	define('__THEME_SELECTION_OPTIONS', $OUT);
-	$OUT = LOAD_TEMPLATE("theme_select_form", true);
-	return $OUT;
+	return LOAD_TEMPLATE("theme_select_form", true, $content);
 }
 
 // Get version from name
@@ -100,7 +109,7 @@ function THEME_GET_VERSION ($name) {
 	} elseif (GET_EXT_VERSION("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",
-			array($name), __FILE__, __LINE__);
+			array($name), __FUNCTION__, __LINE__);
 
 		// Entry found?
 		if (SQL_NUMROWS($result) == 1) {
@@ -143,7 +152,7 @@ function THEME_IS_ACTIVE ($name) {
 	} elseif (GET_EXT_VERSION("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",
-			array($name), __FILE__, __LINE__);
+			array($name), __FUNCTION__, __LINE__);
 
 		// Is the theme active and installed?
 		$active = (SQL_NUMROWS($result) == 1);
@@ -177,7 +186,7 @@ function GET_CURR_THEME_NAME () {
 	} elseif (GET_EXT_VERSION("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",
-			array($name), __FILE__, __LINE__);
+			array($name), __FUNCTION__, __LINE__);
 
 		// Load theme name
 		list($name) = SQL_FETCHROW($result);
@@ -191,18 +200,18 @@ function GET_CURR_THEME_NAME () {
 }
 
 // Initialize variables
-$currTheme = GET_CURR_THEME();
+$GLOBALS['curr_theme'] = GET_CURR_THEME();
 
 // Check if new theme is selcted
-if ((!empty($_POST['new_theme'])) && ($_POST['new_theme'] != $currTheme)) {
+if ((REQUEST_ISSET_POST(('new_theme'))) && (REQUEST_POST('new_theme') != $GLOBALS['curr_theme'])) {
 	// Set new theme for guests
-	$newTheme = $_POST['new_theme'];
+	$newTheme = REQUEST_POST('new_theme');
 
 	// Change to new theme
 	set_session('mxchange_theme', $newTheme);
 
 	// Remove current from array and set new
-	$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $currTheme);
+	$theme = sprintf("%stheme/%s/theme.php", constant('PATH'), $GLOBALS['curr_theme']);
 	unset($INC_POOL[array_search($theme, $INC_POOL)]);
 	$INC_POOL[] = sprintf("%stheme/%s/theme.php", constant('PATH'), $newTheme);
 } // END - if