More variables renamed to , install/admin_WriteData() is now generic (with open TODO)

[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 26a98a80dfbb07519a131b4cb4fff79154533a92..2e4bc33e4ad4ddc2c929d6f7bad9844fce012d1b 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Check for selected holidays
 $SUM = 0;
@@ -49,12 +49,12 @@ if ($SUM > 0)
 {
        // Delete multiple holiday requests (for list_holiday)
        $cnt = 0;
-       foreach ($_POST['sel'] as $id=>$sel)
+       foreach ($_POST['sel'] as $id => $sel)
        {
                // Get the userid
                $result = SQL_QUERY_ESC("SELECT userid, holiday_start, holiday_end
-FROM "._MYSQL_PREFIX."_user_holidays
-WHERE id=%d LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_holidays`
+WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // Load data and free memory
@@ -62,13 +62,13 @@ WHERE id=%d LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
                        SQL_FREERESULT($result);
 
                        // Update user's account
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET holiday_active='N', holiday_activated='0'
-WHERE userid=%d LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
+WHERE userid=%s LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
 
                        // Remove holiday
-                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays
-WHERE id=%d LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`
+WHERE id=%s LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Prepare loaded data for the
                        $content = array(
@@ -91,8 +91,8 @@ WHERE id=%d LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
        // Fetch data
        $result_load = SQL_QUERY_ESC("SELECT holiday_start AS start, holiday_end AS end
-FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_holidays`
+WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_load) == 1)
        {
                // Load data
@@ -103,8 +103,8 @@ WHERE userid=%d LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
                unset($content[1]);
 
                // Delete one holiday request (for task)
-               $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_holidays`
+WHERE userid=%s LIMIT 1", array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                // Send email to user
                $msg = LOAD_EMAIL_TEMPLATE("member_holiday_removed", $content, $_GET['u_id']);