X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_edit.php;h=ac36496e27cea6f51404bdda6bdfc966e1703386;hp=cc0f464db5607be39bd5d367f967cc8428c1dbbe;hb=2379934be6a196a54f4155bb8e24c49b20736969;hpb=30ae22f62ae87c53a56baf0d134569ba91011111

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index cc0f464db5..ac36496e27 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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,9 +75,9 @@ 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']);
@@ -106,7 +99,7 @@ $result = SQL_QUERY("SELECT
 	`id`,
 	`theme_path`,
 	`theme_active`,
-	`theme_ver`,
+	`theme_ver` AS `theme_version`,
 	`theme_name`
 FROM
 	`{?_MYSQL_PREFIX?}_themes`
@@ -121,23 +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?
-		$LINK = $content['theme_path'];
-		if ($content['theme_path'] != getCurrentTheme()) $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>';
+		$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>';
+		} // END - if
 
 		// Prepare data for the row template
-		$content = array(
-			'id'            => $content['id'],
-			'link'          => $LINK,
-			'theme_name'    => $content['theme_name'],
-			'theme_active'  => $content['theme_active'],
-			'email'         => '<a href="mailto:' . $GLOBALS['theme_data']['email'] . '?Subject=[Theme:] ' . $GLOBALS['theme_data']['name'] . ' (' . $content['theme_path'] . ')\>' . $GLOBALS['theme_data']['author'] . '</a>',
-			'url'           => $GLOBALS['theme_data']['url'],
-			'theme_version' => $content['theme_version'],
-		);
+		$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_theme_edit_row', true, $content);
+		$OUT .= loadTemplate('admin_edit_theme_row', true, $content);
 	} // END - while
 
 	// Free memory
@@ -146,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_theme_edit', false, $OUT);
+loadTemplate('admin_edit_theme', false, $OUT);
 
 // [EOF]
 ?>