X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-theme_edit.php;h=4b84e0498915c04e3649b3d0530fea7fc7086bbd;hb=d0dfa5c5907273f7afa601407ee3d86bd369b3cd;hp=a76d8e46e61ebad61742fe4a827ae04a532005b7;hpb=18e32f1a8971b18bace4f051094acf27800bd7d9;p=mailer.git

diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index a76d8e46e6..4b84e04989 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -51,29 +51,29 @@ if (!isExtensionActive('theme')) {
 } // END - if
 
 // Check for selected themes
-if (countPostSelection() > 0) {
+if (ifPostContainsSelections()) {
 	$OUT = '';
 	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`='".$id."' LIMIT 1";
+				$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`='".$id."' LIMIT 1";
+				$sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='Y' WHERE `id`=%s LIMIT 1";
 			}
-			$OUT = getMessage('ADMIN_THEMES_UPDATED');
+			$OUT = '{--ADMIN_THEMES_UPDATED--}';
 		} elseif (isFormSent('del')) {
 			// Delete themes
-			$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`='".$id."' LIMIT 1";
-			$OUT = getMessage('ADMIN_THEMES_DELETED');
+			$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`=%s LIMIT 1";
+			$OUT = '{--ADMIN_THEMES_DELETED--}';
 		}
 
 		// Run SQL command?
 		if (!empty($sql)) {
 			// Run it
-			$result = SQL_QUERY($sql, __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC($sql, array(bigintval($id)), __FILE__, __LINE__);
 
 			// Rebuild cache
 			rebuildCache('themes', 'them');
@@ -81,7 +81,7 @@ if (countPostSelection() > 0) {
 	} // END - foreach
 
 	// Output generated?
-	if (empty($OUT)) $OUT = getMessage('ADMIN_THEME_NO_OUTPUT');
+	if (empty($OUT)) $OUT = '{--ADMIN_THEME_NO_OUTPUT--}';
 } elseif (isGetRequestParameterSet('default_theme')) {
 	// Escape string from input
 	$postData['default_theme'] = getRequestParameter('default_theme');
@@ -106,16 +106,14 @@ $result = SQL_QUERY("SELECT
 	`id`,
 	`theme_path`,
 	`theme_active`,
-	`theme_ver`,
+	`theme_ver` AS `theme_version`,
 	`theme_name`
 FROM
 	`{?_MYSQL_PREFIX?}_themes`
 ORDER BY
 	`theme_path` ASC", __FILE__, __LINE__);
 
-if (SQL_NUMROWS($result) > 0) {
-	// Init color
-	$SW = 2;
+if (!SQL_HASZERONUMS($result)) {
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Construct IFN
 		$inc = sprintf("theme/%s/theme.php", $content['theme_path']);
@@ -129,32 +127,28 @@ if (SQL_NUMROWS($result) > 0) {
 
 		// Prepare data for the row template
 		$content = array(
-			'sw'        => $SW,
-			'id'        => $content['id'],
-			'active'    => $content['theme_active'],
-			'link'      => $LINK,
-			'name'      => $content['theme_name'],
-			'is_act'    => translateYesNo($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_link'  => generateDerefererUrl($GLOBALS['theme_data']['url']),
-			'url_title' => $GLOBALS['theme_data']['url'],
-			'ver'       => $content['theme_ver'],
+			'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'],
 		);
 
 		// Load row template and switch color
 		$OUT .= loadTemplate('admin_theme_edit_row', true, $content);
-		$SW = 3 - $SW;
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 } else {
 	// No themes found???
-	$OUT .= "<tr>
-  <td colspan=\"7\" class=\"bottom\" height=\"60\">
-    ".loadTemplate('admin_settings_saved', true, getMessage('ADMIN_NO_THEMES_FOUND'))."
+	$OUT .= '<tr>
+  <td colspan="7" class="bottom" height="60">
+    ' . loadTemplate('admin_settings_saved', true, '{--ADMIN_NO_THEMES_FOUND--}') . '
   </td>
-</tr>\n";
+</tr>';
 }
 
 // Load template