A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index 2e4bc33e4ad4ddc2c929d6f7bad9844fce012d1b..1cc10d10942ace1f9504933bc44068316f7575cd 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -42,14 +42,14 @@ ADD_DESCR("admin", __FILE__);
 
 // Check for selected holidays
 $SUM = 0;
-if (isset($_POST['sel'])) $SUM = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST('sel')) $SUM = SELECTION_COUNT(REQUEST_POST('sel'));
 
 // Shall I delete selected holidays???
 if ($SUM > 0)
 {
        // Delete multiple holiday requests (for list_holiday)
        $cnt = 0;
-       foreach ($_POST['sel'] as $id => $sel)
+       foreach (REQUEST_POST('sel') as $id => $sel)
        {
                // Get the userid
                $result = SQL_QUERY_ESC("SELECT userid, holiday_start, holiday_end
@@ -78,40 +78,33 @@ WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Send email to user
                        $msg = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, $uid);
-                       SEND_EMAIL($uid, HOLIDAY_ADMIN_REMOVED_SUBJ, $msg);
+                       SEND_EMAIL($uid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $msg);
                        $cnt++;
                }
        }
-       LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_ADMIN_MULTI_DEL_1.$cnt.HOLIDAY_ADMIN_MULTI_DEL_2);
-}
- elseif (!empty($_GET['u_id']))
-{
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('HOLIDAY_ADMIN_MULTI_DEL'), $cnt));
+} elseif (REQUEST_ISSET_GET(('uid'))) {
        // Set default message
-       $MSG = HOLIDAY_ADMIN_SINGLE_404;
+       $MSG = getMessage('HOLIDAY_ADMIN_SINGLE_404');
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT holiday_start AS start, holiday_end AS end
 FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_load) == 1)
-       {
+WHERE userid=%s LIMIT 1", array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+       if (SQL_NUMROWS($result_load) == 1) {
                // Load data
                $content = SQL_FETCHARRAY($result_load);
 
-               // Free some memory
-               unset($content[0]);
-               unset($content[1]);
-
                // Delete one holiday request (for task)
                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`
-WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 
                // Send email to user
-               $msg = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, $_GET['u_id']);
-               SEND_EMAIL($_GET['u_id'], HOLIDAY_ADMIN_REMOVED_SUBJ, $msg);
+               $msg = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, REQUEST_GET('uid'));
+               SEND_EMAIL(REQUEST_GET('uid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $msg);
 
                // Set message
-               $MSG = HOLIDAY_ADMIN_SINGLE_DELETED;
+               $MSG = getMessage('HOLIDAY_ADMIN_SINGLE_DELETED');
        }
 
        // Free memory
@@ -119,11 +112,10 @@ WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
        // Output message
        LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
-}
- else
-{
+} else {
        // Please call me over other scripts... ;)
-       LOAD_TEMPLATE("admin_settings_saved", false, HOLIDAY_NO_DIRECT_CALL);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('HOLIDAY_NO_DIRECT_CALL'));
 }
+
 //
 ?>