Fixed several bugs (user list, shorted 'del' to 'delete')

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 2a9dc34e84e4a148edb21b41243489bee3d41ffa..38b1ae248e0a050f1d8549dbcf723959ff5df5da 100644 (file)
--- 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 e7449c79b22234f651ff7aedcf2780b363095761..31073f84bba7a3d708186fb0a54588d7136d8b83 100644 (file)
--- 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 f37a735d7f10053f26b30f837c3c1a6668b8d7f4..7869127894b61462c42cb04d5395b3c2c9b7615c 100644 (file)
--- 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 3bc7046f6f9e8be134964ff3e42b6a51107d5b24..c1e5b5cf922a6f034ae02d2e4856e18d22cd5a42 100644 (file)
--- 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 0765f2df4fdd93d0b885317b7ee585eeea86453d..057ec6a052a90b93d8e82ccef64f43ef2a66c851 100644 (file)
--- 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);