X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_edit.php;h=74f24c839024e7f870efc6bcda65947a66663092;hb=928e9aedd8248545a9fef27c75a5ba016ad1d61b;hp=96f936afc08a59af8262f55023ba900b289fc8f7;hpb=07ec113b187228ba74b4b08966602c4a2c161d2c;p=mailer.git

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index 96f936afc0..74f24c8390 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -14,12 +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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -43,28 +41,23 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if (!isExtensionActive('theme')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('theme'));
-	return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
 
 // Check for selected themes
 if (ifPostContainsSelections()) {
 	$OUT = '';
-	foreach (postRequestParameter('sel') as $id => $sel) {
+	foreach (postRequestElement('sel') as $id => $sel) {
 		$sql = '';
 		// Shall I de-/activate or delete themes?
-		if (isPostRequestParameterSet('status')) {
+		if (isPostRequestElementSet('status')) {
 			// Change status
-			if (postRequestParameter('active', $id) == 'Y') {
+			if (postRequestElement('active', $id) == 'Y') {
 				$sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='N' WHERE `id`=%s LIMIT 1";
 			} else {
 				$sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='Y' WHERE `id`=%s LIMIT 1";
 			}
 			$OUT = '{--ADMIN_THEMES_UPDATED--}';
-		} elseif (isFormSent('del')) {
+		} elseif (isFormSent('delete')) {
 			// Delete themes
 			$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`=%s LIMIT 1";
 			$OUT = '{--ADMIN_THEMES_DELETED--}';
@@ -82,12 +75,12 @@ if (ifPostContainsSelections()) {
 
 	// Output generated?
 	if (empty($OUT)) $OUT = '{--ADMIN_THEME_NO_OUTPUT--}';
-} elseif (isGetRequestParameterSet('default_theme')) {
+} elseif (isGetRequestElementSet('default_theme')) {
 	// Escape string from input
-	$postData['default_theme'] = getRequestParameter('default_theme');
+	$postData['default_theme'] = getRequestElement('default_theme');
 
 	// Set session
-	setTheme($postData['default_theme']);
+	setMailerTheme($postData['default_theme']);
 
 	// Set it in config and current theme as well
 	setConfigEntry('default_theme', $postData['default_theme']);
@@ -121,15 +114,20 @@ if (!SQL_HASZERONUMS($result)) {
 		// Load theme in test mode
 		loadInclude($inc);
 
+		// Copy data from theme to content
+		$content['theme_url'] = $GLOBALS['theme_data']['url'];
+
 		// Is the loaded theme name != current theme name?
 		$content['link'] = $content['theme_path'];
-		if ($content['theme_path'] != getCurrentTheme()) $content['link'] = '<a href="{%url=modules.php?module=admin&amp;what=theme_edit&amp;default_theme=' . $content['theme_path'] . '%}" title="{--ADMIN_SET_AS_NEW_THEME--}">' . $content['theme_path'] . '</a>';
+		if ($content['theme_path'] != getCurrentTheme()) {
+			$content['link'] = '<a href="{%url=modules.php?module=admin&amp;what=theme_edit&amp;default_theme=' . $content['theme_path'] . '%}" title="{--ADMIN_SET_AS_NEW_THEME--}">' . $content['theme_path'] . '</a>';
+		} // END - if
 
 		// Prepare data for the row template
 		$content['email'] = '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>';
 
 		// Load row template and switch color
-		$OUT .= loadTemplate('admin_edit_theme_row', true, $content);
+		$OUT .= loadTemplate('admin_edit_theme_row', TRUE, $content);
 	} // END - while
 
 	// Free memory
@@ -138,13 +136,13 @@ if (!SQL_HASZERONUMS($result)) {
 	// No themes found???
 	$OUT .= '<tr>
   <td colspan="7" class="bottom" height="60">
-    ' . loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}') . '
+    ' . displayMessage('{--ADMIN_NO_THEMES_FOUND--}', TRUE) . '
   </td>
 </tr>';
 }
 
 // Load template
-loadTemplate('admin_edit_theme', false, $OUT);
+loadTemplate('admin_edit_theme', FALSE, $OUT);
 
 // [EOF]
 ?>