A lot code rewritten:

[mailer.git] / inc / modules / admin / what-del_transfer.php

diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index d67a7bc278c01bb7b42749fcfa2de4ad4aa4d0b9..0681df69ac15efbda2f6902a9ba601f456d9ec56 100644 (file)
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,17 +45,17 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (isPostRequestElementSet('del')) {
+if (isFormSent('del')) {
        // Delete entries from tables
        if (countPostSelection() > 0) {
                // Init SQLs
                initSqls();
 
                // Delete entries...
-               foreach (postRequestElement('sel') as $id => $sel) {
-                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `trans_id`=%s LIMIT 1",
+               foreach (postRequestParameter('sel') as $id => $sel) {
+                       addSql(SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `trans_id`=%s LIMIT 1',
                                array(bigintval($id)), __FILE__, __LINE__, false));
-                       addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `trans_id`=%s LIMIT 1",
+                       addSql(SQL_QUERY_ESC('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `trans_id`=%s LIMIT 1',
                                array(bigintval($id)), __FILE__, __LINE__, false));
                } // END - foreach
 
@@ -64,39 +65,37 @@ if (isPostRequestElementSet('del')) {
 } // END - if
 
 // We only need outgoing transfers
-$result = SQL_QUERY("SELECT `userid`, `to_userid`, `trans_id`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` ORDER BY `trans_id` ASC", __FILE__, __LINE__);
+$result = SQL_QUERY('SELECT
+       `userid` AS `from_userid`, `to_userid`, `trans_id`, `points`, `reason`, `time_trans`
+FROM
+       `{?_MYSQL_PREFIX?}_user_transfers_out`
+ORDER BY
+       `trans_id` ASC', __FILE__, __LINE__);
+
 $total = '0';
 if (SQL_NUMROWS($result) > 0) {
        // Output rows
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the row template
-               $content = array(
-                       'sw'          => $SW,
-                       'trans_id'    => $content['trans_id'],
-                       'time_trans'  => generateDateTime($content['time_trans'], 3),
-                       'userid_from' => generateUserProfileLink($content['userid']),
-                       'userid_to'   => generateUserProfileLink($content['to_userid']),
-                       'reason'      => $content['reason'],
-                       'points'      => translateComma($content['points']),
-               );
+               $content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
                // Load row template
                $OUT .= loadTemplate('admin_del_transfer_row', true, $content);
 
                // Sum points and switch colors
-               $total += $content['points']; $SW = 3 - $SW;
+               $total += $content['points'];
        } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
 } else {
        // Nothing for in and out
-       $OUT = "<tr>
-  <td colspan=\"6\" align=\"center\" class=\"bottom\">
-    ".loadTemplate('admin_settings_saved', true, getMessage('TRANSFER_NO_INOUT_TRANSFERS'))."
+       $OUT = '<tr>
+  <td colspan="6" align="center" class="bottom">
+    ' . loadTemplate('admin_settings_saved', true, '{--TRANSFER_NO_INOUT_TRANSFERS--}') . '
   </td>
-</tr>";
+</tr>';
 }
 
 // ... and add them to a constant for the template
@@ -106,10 +105,11 @@ $content['rows'] = $OUT;
 $content['total'] = translateComma($total);
 
 // Set title
-$content['title'] = getMessage('TRANSFER_LIST_ALL');
+$content['title'] = '{--TRANSFER_LIST_ALL--}';
 
 // Show delete button here
-$content['delete'] = "<input type=\"reset\" class=\"admin_reset\" value=\"{--UNDO_SELECTIONS--}\" />&nbsp;*&nbsp;<input type=\"submit\" name=\"del\" class=\"admin_delete\" value=\"{--TRANSFER_DELETE--}\" />";
+$content['delete'] = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
+<input type="submit" name="del" class="admin_delete" value="{--TRANSFER_DELETE--}" />';
 
 // Load final template
 loadTemplate('admin_list_transfer', false, $content);