Complete rewrite of and , wrapper functions added, see bug #101

[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 3c833ba359b211c6f983110acee66edb9f0eee0a..6cfeda596acb3120c31e96e6557502caaf9b92d6 100644 (file)
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -39,33 +39,33 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']) || (!IS_ADMIN()))
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['del']))
+if (REQUEST_ISSET_POST(('del')))
 {
        // Delete entries from tables
-       $SEL = SELECTION_COUNT($_POST['sel']);
+       $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
        if ($SEL > 0)
        {
                // Delete entries...
-               foreach ($_POST['sel'] as $id=>$sel)
+               foreach (REQUEST_POST('sel') as $id => $sel)
                {
-                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_transfers_in WHERE trans_id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
-                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_transfers_out WHERE trans_id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_transfers_in` WHERE trans_id=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_transfers_out` WHERE trans_id=%s LIMIT 1",
+                               array(bigintval($id)), __FILE__, __LINE__);
                }
        }
 }
 
 // We only need outgoing transfers
-$result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM "._MYSQL_PREFIX."_user_transfers_out ORDER BY trans_id", __FILE__, __LINE__);
-$total = "0";
+$result = SQL_QUERY("SELECT userid, to_uid, trans_id, points, reason, time_trans FROM `{!_MYSQL_PREFIX!}_user_transfers_out` ORDER BY trans_id", __FILE__, __LINE__);
+$total = 0;
 if (SQL_NUMROWS($result) > 0)
 {
        // Output rows
        $OUT = ""; $SW = 2;
-       while(list($uid1, $uid2, $idx, $points, $reason, $stamp) = SQL_FETCHROW($result))
+       while (list($uid1, $uid2, $idx, $points, $reason, $stamp) = SQL_FETCHROW($result))
        {
                // Prepare data for the row template
                $content = array(
@@ -91,11 +91,11 @@ if (SQL_NUMROWS($result) > 0)
  else
 {
        // Nothing for in and out
-       $OUT = "<TR>
-  <TD colspan=\"6\" align=\"center\" class=\"bottom2\" height=\"70\">
+       $OUT = "<tr>
+  <td colspan=\"6\" align=\"center\" class=\"bottom2\" height=\"70\">
     ".LOAD_TEMPLATE("admin_settings_saved", true, TRANSFER_NO_INOUT_TRANSFERS)."
-  </TD>
-</TR>";
+  </td>
+</tr>";
 }
 
 // ... and add them to a constant for the template
@@ -108,7 +108,7 @@ define('__TRANSFER_TOTAL_VALUE', $total);
 define('__TRANSFER_TITLE', TRANSFER_LIST_ALL);
 
 // Show delete button here
-define('__TRANSFER_DELETE', "<INPUT type=\"reset\" class=\"admin_reset\" value=\"".UNDO_SELECTIONS."\">&nbsp;*&nbsp;<INPUT type=\"submit\" name=\"del\" class=\"admin_delete\" value=\"".TRANSFER_DELETE."\">");
+define('__TRANSFER_DELETE', "<input type=\"reset\" class=\"admin_reset\" value=\"".UNDO_SELECTIONS."\" />&nbsp;*&nbsp;<input type=\"submit\" name=\"del\" class=\"admin_delete\" value=\"".TRANSFER_DELETE."\" />");
 
 // Load final template
 LOAD_TEMPLATE("admin_list_transfer");