X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-themes.php;h=b05034d6c0a72f9085afd79155fdcdcea5aaa1cd;hb=0f0e365a0e710b750d74ef8587dde8b37881dbeb;hp=1c52abe930cdc2f4ac5c313e7148baaaca7baa35;hpb=98e388b809fe0f6d5dbe2a02273a11e6816fb333;p=mailer.git

diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php
index 1c52abe930..b05034d6c0 100644
--- a/inc/modules/member/what-themes.php
+++ b/inc/modules/member/what-themes.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 03/20/2005 *
- * ================                             Last change: 03/20/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 03/20/2005 *
+ * ===================                          Last change: 03/20/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-themes.php                                  *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,32 +39,33 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('theme')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('theme'));
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('theme')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
+	return;
+} // END - if
 
-if (REQUEST_ISSET_POST('member_theme')) {
+if (isPostRequestParameterSet('member_theme')) {
 	// Save theme to member's profile
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `curr_theme`='%s' WHERE `userid`=%s LIMIT 1",
-		array(REQUEST_POST('member_theme'), getUserId()), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `curr_theme`='%s' WHERE `userid`=%s LIMIT 1",
+		array(postRequestParameter('member_theme'), getMemberId()), __FILE__, __LINE__);
 
 	// Set new theme for guests
-	$newTheme = SQL_ESCAPE(REQUEST_POST('member_theme'));
+	$newTheme = SQL_ESCAPE(postRequestParameter('member_theme'));
 
 	// Change to new theme
-	setSession('mxchange_theme', $newTheme);
+	setTheme($newTheme);
 
 	// Theme saved!
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_THEME_SAVED'));
-}
+	loadTemplate('admin_settings_saved', false, getMessage('MEMBER_THEME_SAVED'));
+} // END - if
 
 // Initialize array
 $THEMES = array(
@@ -76,17 +78,20 @@ $THEMES = array(
 );
 
 // Read directory "themes"
-$handle = opendir(constant('PATH')."theme/") or app_die(__FILE__, __LINE__, "Cannot read themes dir!");
-while ($entry = readdir($handle)) {
-	// Construct absolute theme.php file name
-	$INC = sprintf("theme/%s/theme.php", $entry);
+$includes = getArrayFromDirectory('theme/', '', false, true, array('css', 'images'));
 
-	if ((!isDirectory($entry)) && (isIncludeReadable($INC)) && (isThemeActive($entry))) {
+// Walk through all entries and add it
+foreach ($includes as $inc) {
+	// Get directory from it
+	$dir = basename(dirname($inc));
+
+	// Is the theme active, then include it
+	if (isThemeActive($dir)) {
 		// Found a valid directory so let's load it's theme.php file
-		loadInclude($INC);
+		loadInclude($inc);
 
 		// Add found theme to array
-		$THEMES['theme_unix'][]   = $entry;
+		$THEMES['theme_unix'][]   = $dir;
 		$THEMES['theme_name'][]   = $GLOBALS['theme_data']['name'];
 		$THEMES['theme_author'][] = $GLOBALS['theme_data']['author'];
 		$THEMES['theme_email'][]  = $GLOBALS['theme_data']['email'];
@@ -98,31 +103,28 @@ while ($entry = readdir($handle)) {
 // Remove last theme data
 unset($GLOBALS['theme_data']);
 
-// Close directory
-closedir($handle);
-
 // Sort array by Uni* name
-array_pk_sort($THEMES, array("theme_name"));
+array_pk_sort($THEMES, array('theme_name'));
 
 // Generate output lines for the template
 $OUT = ''; $SW = 2;
 foreach ($THEMES['theme_unix'] as $key => $unix) {
 	$default = '';
-	if (getSession('mxchange_theme') == $unix) $default = ' selected="selected"';
+	if (getCurrentTheme() == $unix) $default = ' selected="selected"';
 
 	// Add row
 	$OUT .= "<tr>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\" height=\"30\">
+  <td class=\"switch_sw".$SW." bottom right\" align=\"center\" height=\"30\">
     <input type=\"radio\" name=\"member_theme\" class=\"member_normal\" value=\"".$unix."\"".$default." />
   </td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
+  <td class=\"switch_sw".$SW." bottom right\" align=\"center\">".$THEMES['theme_name'][$key]."</td>
+  <td class=\"switch_sw".$SW." bottom right\" align=\"center\">
     <a href=\"mailto:".$THEMES['theme_email'][$key]."?Subject=[Theme:] ".$THEMES['theme_name'][$key]." (".$unix.")'.'\">".$THEMES['theme_author'][$key]."</a>
   </td>
-  <td class=\"switch_sw".$SW." bottom2 right2\" align=\"center\">
-    <a href=\"".DEREFERER($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
+  <td class=\"switch_sw".$SW." bottom right\" align=\"center\">
+    <a href=\"".generateDerefererUrl($THEMES['theme_url'][$key])."\" target=\"_blank\">".$THEMES['theme_url'][$key]."</a>
   </td>
-  <td class=\"switch_sw".$SW." bottom2\" align=\"center\">v".$THEMES['theme_ver'][$key]."</td>
+  <td class=\"switch_sw".$SW." bottom\" align=\"center\">v".$THEMES['theme_ver'][$key]."</td>
 </tr>\n";
 	$SW = 3 - $SW;
 } // END - foreach
@@ -130,15 +132,14 @@ foreach ($THEMES['theme_unix'] as $key => $unix) {
 if (empty($OUT)) {
 	// No themes found???
 	$OUT = "<tr>
-  <td colspan=\"5\" class=\"bottom2\" height=\"80\">
-    ".LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))."
+  <td colspan=\"5\" class=\"bottom\" height=\"80\">
+    ".loadTemplate('admin_settings_saved', true, getMessage('MEMBER_NO_THEMES_FOUND'))."
   </td>
 </tr>\n";
 } // END - if
-define('__THEME_LIST', $OUT);
 
 // Load template
-LOAD_TEMPLATE("member_themes");
+loadTemplate('member_themes', false, $OUT);
 
-//
+// [EOF]
 ?>