Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[mailer.git] / inc / modules / member / what-holiday.php

diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php
index 63a5ed54b22720520a0d29b06ce106adb06e0740..bfcffff743d30f0ef1765d3bee6c933e18b68651 100644 (file)
--- a/inc/modules/member/what-holiday.php
+++ b/inc/modules/member/what-holiday.php
@@ -154,7 +154,7 @@ LIMIT 1",
                createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
 
                // Display message
-               loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW'));
+               loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}');
        }
 } // END - if
 
@@ -168,58 +168,70 @@ FROM
 WHERE
        `userid`=%s
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
-       $content = merge_array($content, SQL_FETCHARRAY($result));
-       SQL_FREERESULT($result);
 
-       if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
-               // Load data
-               $result = SQL_QUERY_ESC("SELECT
+       // Do we have an entry?
+       if (SQL_NUMROWS($result) == 1) {
+               // Merge arrays
+               $content = merge_array($content, SQL_FETCHARRAY($result));
+
+               if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getConfig('holiday_lock')) < time())) {
+                       // Load data
+                       $result2 = SQL_QUERY_ESC("SELECT
        `holiday_start`, `holiday_end`
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
        `userid`=%s
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) == 1) {
-                       // Data was found
-                       $content = merge_array($content, SQL_FETCHARRAY($result));
-                       SQL_FREERESULT($result);
+                       if (SQL_NUMROWS($result2) == 1) {
+                               // Data was found so merge it
+                               $content = merge_array($content, SQL_FETCHARRAY($result2));
 
-                       // Prepare it for the template
-                       $content['start'] = generateDateTime($content['holiday_start'], 3);
-                       $content['end']   = generateDateTime($content['holiday_end']  , 3);
+                               // Prepare it for the template
+                               $content['start'] = generateDateTime($content['holiday_start'], 3);
+                               $content['end']   = generateDateTime($content['holiday_end']  , 3);
 
-                       // Deactivate it now
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
+                               // Deactivate it now
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
 SET
        `holiday_active`='N',
        `holiday_activated`=0
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getMemberId()), __FILE__, __LINE__);
+                                       array(getMemberId()), __FILE__, __LINE__);
 
-                       // Remove entry
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
+                               // Remove entry
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
        `userid`=%s
 LIMIT 1",
-                               array(getMemberId()), __FILE__, __LINE__);
-
-                       // Send email to admin
-                       sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
-
-                       // Display message to user
-                       loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_DEACTIVATED_NOW'));
-               } else {
-                       // Display message to user
-                       loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_CANNOT_DEACTIVATE'));
+                                       array(getMemberId()), __FILE__, __LINE__);
+
+                               // Send email to admin
+                               sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getMemberId());
+
+                               // Display message to user
+                               loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_DEACTIVATED_NOW--}');
+                       } else {
+                               // Display message to user
+                               loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_CANNOT_DEACTIVATE--}');
+                       }
+
+                       // Free result
+                       SQL_FREERESULT($result2);
+               } elseif ($content['holiday_active'] == 'Y') {
+                       // To fast!
+                       loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}');
                }
-       } elseif ($content['holiday_active'] == 'Y') {
-               // To fast!
-               loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+       } else {
+               // User not found
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('HOLIDAY_MEMBER_NOT_STOPPED_404', getMemberId()));
        }
+
+       // Free result
+       SQL_FREERESULT($result);
 } // END - if
 
 // If something is wrong or link in menu is just clicked display form
@@ -250,9 +262,8 @@ WHERE
        `userid`=%s
 LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
-                                       // Data was found
+                                       // Data was found so merge it
                                        $content = merge_array($content, SQL_FETCHARRAY($result));
-                                       SQL_FREERESULT($result);
 
                                        // Prepare it for the template
                                        $content['start'] = generateDateTime($content['holiday_start'] , 3);
@@ -276,6 +287,9 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
                                        redirectToUrl('modules.php?module=login&amp;what=holiday');
                                        return;
                                }
+
+                               // Free result
+                               SQL_FREERESULT($result);
                                break;
 
                        case 'N': // Display activation form
@@ -300,7 +314,7 @@ LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
                }
        } else {
                // To fast!
-               loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED'));
+               loadTemplate('admin_settings_saved', false, '{--HOLIDAY_MEMBER_LOCKED--}');
        }
 } // END - if