From 5bb45d38458106175065810aaf993fd15af1d8e4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 13 Sep 2010 01:55:58 +0000
Subject: [PATCH] Fixed several bugs (user list, shorted 'del' to 'delete')

---
 inc/libs/user_functions.php              | 2 +-
 inc/modules/admin/overview-inc.php       | 2 +-
 inc/modules/admin/what-del_transfer.php  | 2 +-
 inc/modules/admin/what-email_details.php | 2 +-
 inc/template-functions.php               | 6 ++++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 2a9dc34e84..38b1ae248e 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -123,7 +123,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 	} // END - foreach
 
 	// Add list and colspan
-	$content['list'] = substr($OUT, 0, -13);
+	$content['list'] = substr($OUT, 0, -1);
 	$content['colspan2'] = $colspan;
 
 	// Load template
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index e7449c79b2..31073f84bb 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -243,7 +243,7 @@ LIMIT 1",
 					// Add SQLs to a table
 					if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
 						// Add verbose SQL table
-						$taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%') . '<br />';
+						$taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
 					} // END - if
 				} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
 					// Run SQL commands in dry mode but only return the notes
diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index f37a735d7f..7869127894 100644
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -107,7 +107,7 @@ $content['title'] = '{--TRANSFER_LIST_ALL--}';
 
 // Show delete button here
 $content['delete'] = '<input type="reset" class="form_reset" value="{--UNDO_SELECTIONS--}" />
-<input type="submit" name="del" class="form_delete" value="{--TRANSFER_DELETE--}" />';
+<input type="submit" name="delete" class="form_delete" value="{--TRANSFER_DELETE--}" />';
 
 // Load final template
 loadTemplate('admin_list_transfer', false, $content);
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 3bc7046f6f..c1e5b5cf92 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -195,7 +195,7 @@ if (!SQL_HASZERONUMS($result_list)) {
 		// Only check if bonus extension is active
 		if (!SQL_HASZERONUMS($result_bonus)) outputHtml('<br /><br />');
 	} // END - if
-}
+} // END - if
 
 if ((isExtensionActive('bonus')) && (empty($WHO))) {
 	// Load bonus mails only when extension is active
diff --git a/inc/template-functions.php b/inc/template-functions.php
index 0765f2df4f..057ec6a052 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1043,6 +1043,9 @@ function generateMemberAdminActionLinks ($userid) {
 		if (($tar == 'lock_user') && ($status == 'LOCKED')) {
 			// Locked accounts shall be unlocked
 			$OUT .= 'UNLOCK_USER';
+		} elseif ($tar == 'del_user') {
+			// @TODO Deprecate this thing
+			$OUT .= 'DELETE_USER';
 		} else {
 			// All other status is fine
 			$OUT .= strtoupper($tar);
@@ -1051,6 +1054,9 @@ function generateMemberAdminActionLinks ($userid) {
 		if (($tar == 'lock_user') && ($status == 'LOCKED')) {
 			// Locked accounts shall be unlocked
 			$OUT .= 'UNLOCK_USER';
+		} elseif ($tar == 'del_user') {
+			// @TODO Deprecate this thing
+			$OUT .= 'DELETE_USER';
 		} else {
 			// All other status is fine
 			$OUT .= strtoupper($tar);
-- 
2.39.5