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

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index cc0f464db5..98ef708a84 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -56,7 +54,7 @@ if (ifPostContainsSelections()) {
 	foreach (postRequestParameter('sel') as $id => $sel) {
 		$sql = '';
 		// Shall I de-/activate or delete themes?
-		if (isPostRequestParameterSet(('status'))) {
+		if (isPostRequestParameterSet('status')) {
 			// Change status
 			if (postRequestParameter('active', $id) == 'Y') {
 				$sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='N' WHERE `id`=%s LIMIT 1";
@@ -64,7 +62,7 @@ if (ifPostContainsSelections()) {
 				$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--}';
@@ -106,7 +104,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 +119,18 @@ 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>';
 
 		// 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
@@ -152,7 +145,7 @@ if (!SQL_HASZERONUMS($result)) {
 }
 
 // Load template
-loadTemplate('admin_theme_edit', false, $OUT);
+loadTemplate('admin_edit_theme', false, $OUT);
 
 // [EOF]
 ?>