X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_mods.php;h=aad70b3f7489f8660b5df4cc05e05bb590013041;hb=cf3765c38cf0a76f396aca291f71858936e92956;hp=3c98f73df6103d1a5f8daae3eb4fbccd31a105a0;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 3c98f73df6..aad70b3f74 100644
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -45,11 +45,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestParameterSet('edit')) {
+if (isFormSent('edit')) {
 	// Check if at least one module is selected
 	if (countPostSelection() > 0) {
 		// Output header
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 
 		// Edit selected modules
 		foreach (postRequestParameter('sel') as $id => $sel) {
@@ -66,7 +66,6 @@ if (isPostRequestParameterSet('edit')) {
 
 			// Prepare array for the template
 			$content = array(
-				'sw'     => $SW,
 				'mod'    => $data['module'],
 				'id'     => $id,
 				'title'  => $data['title'],
@@ -84,13 +83,13 @@ if (isPostRequestParameterSet('edit')) {
 		loadTemplate('admin_mods_edit', false, $OUT);
 	} else {
 		// Nothing selected
-		loadTemplate('admin_settings_saved', false, getMessage('MODS_NOTHING_SELECTED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_NOTHING_SELECTED--}');
 
 		// Remove maybe confusing data
 		unsetPostRequestParameter('edit');
 		unsetPostRequestParameter('change');
 	}
-} elseif (isPostRequestParameterSet('change')) {
+} elseif (isFormSent('change')) {
 	// Init SQLs
 	initSqls();
 
@@ -115,54 +114,41 @@ if (isPostRequestParameterSet('edit')) {
 	runFilterChain('run_sqls');
 
 	// Remove cache file if version matches
-	if (getExtensionVersion('cache') >= '0.1.2') {
+	if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
 		if ($GLOBALS['cache_instance']->loadCacheFile('modules')) $GLOBALS['cache_instance']->removeCacheFile();
 	} // END - if
 
 	// Entries updated
-	loadTemplate('admin_settings_saved', false, getMessage('MODS_CHANGED'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_MODS_CHANGED--}');
 }
 
-if (countPostSelection() == '0') {
+if (countPostSelection() == 0) {
 	// Load module data (We do not need to check if there's at least one...)
-	$result = SQL_QUERY('SELECT id, module, locked, hidden, admin_only, title, mem_only
-FROM `{?_MYSQL_PREFIX?}_mod_reg`
-ORDER BY module', __FILE__, __LINE__);
-	$OUT = ''; $SW = 2;
+	$result = SQL_QUERY('SELECT
+	`id`, `module`, `locked`, `hidden`, `admin_only`, `title`, `mem_only`
+FROM
+	`{?_MYSQL_PREFIX?}_mod_reg`
+ORDER BY
+	`module` ASC', __FILE__, __LINE__);
+
+	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Reset title to --- if it is NULL
-		if (empty($content['title'])) $content['title'] = '---';
 		if (($content['module'] == 'index') || ($content['module'] == 'login')) {
 			// Add link to detail statistics
-			$content['module'] = "<strong><a href=\"{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=" . $content['module'] . "%}\">" . $content['module'] . "</a></strong>";
+			$content['module'] = '<strong><a href="{%url=modules.php?module=admin&amp;what=stats_mods&amp;mod=' . $content['module'] . '%}">' . $content['module'] . '</a></strong>';
 		} // END - if
 
-		// Prepare array for the template
-		// @TODO Rewritings: mod->module in template
-		$content = array(
-			'sw'     => $SW,
-			'id'     => $content['id'],
-			'mod'    => $content['module'],
-			'title'  => $content['title'],
-			'locked' => translateYesNo($content['locked']),
-			'hidden' => translateYesNo($content['hidden']),
-			'admin'  => translateYesNo($content['admin_only']),
-			'mem'    => translateYesNo($content['mem_only']),
-		);
-
 		// Load row template
 		$OUT .= loadTemplate('admin_list_mods_row', true, $content);
-
-		// Switch colors
-		$SW = 3 - $SW;
-	}
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Load main template
 	loadTemplate('admin_list_mods', false, $OUT);
-}
+} // END - if
 
 // [EOF]
 ?>