X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-holiday.php;h=713119e5b66c8a0f718283ed586d64433e939093;hb=5fed4d6d18f6458182276599d6cab6c9134ef4aa;hp=b233e861a4523a6cb18a55599600a0d3b7cd907d;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index b233e861a4..713119e5b6 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -1,7 +1,7 @@ time()) || (($content['timestamp_ordered'] + getConfig('holiday_lock')) > time())) { + if ((($content['timestamp'] + getHolidayLock()) > time()) || (($content['timestamp_ordered'] + getHolidayLock()) > time())) { // Mail order is to close away! unsetPostRequestElement('ok'); unsetPostRequestElement('stop'); - if (($content['timestamp'] + getConfig('holiday_lock')) > time()) { + if (($content['timestamp'] + getHolidayLock()) > time()) { // Mail found in pool $stamp = $content['timestamp']; } else { @@ -99,7 +98,7 @@ if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) { } // Display message and exit here - loadTemplate('admin_settings_saved', false, sprintf(getMessage('HOLIDAY_MEMBER_ORDER'), generateDateTime($stamp, '1'))); + displayMessage('{%message,MEMBER_HOLIDAY_ORDER', generateDateTime($stamp, '1') . '%}'); return; } } // END - if @@ -115,23 +114,29 @@ if (isFormSent()) { // Test both values $TEST = $content['holiday_end'] - $START; - if (($TEST < 0) || ($TEST > (getConfig('ONE_DAY') * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) { + if (($TEST < 0) || ($TEST > (getOneDay() * getConfig('holiday_max'))) || ($START < time()) || ($content['holiday_end'] < time())) { // Time test failed unsetPostRequestElement('ok'); } else { // Everything went okay so let's store his request and send mails SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_holidays` (`userid`, `holiday_start`, `holiday_end`, `comments`) VALUES ('%s','%s','%s','%s')", - array(getUserId(), $START, $content['holiday_end'], postRequestElement('comments')), __FILE__, __LINE__); + array( + getMemberId(), + $START, + $content['holiday_end'], + postRequestElement('comments') + ), __FILE__, __LINE__); // Activate holiday system SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `holiday_active`='N', `holiday_activated`=UNIX_TIMESTAMP() + `holiday_active`='N', + `holiday_activated`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1", - array(getUserId()), __FILE__, __LINE__); + array(getMemberId()), __FILE__, __LINE__); // Prepare constants $content['start_day'] = bigintval(postRequestElement('start_day')); @@ -140,20 +145,20 @@ LIMIT 1", $content['end_day'] = bigintval(postRequestElement('end_day')); $content['end_month'] = $GLOBALS['month_descr'][postRequestElement('end_month')]; $content['end_year'] = bigintval(postRequestElement('end_year')); - $content['comments'] = secureString(postRequestElement('comments')); + $content['comments'] = postRequestElement('comments'); // Send mail to member - $message = loadEmailTemplate('member_holiday_request', $content, getUserId()); - sendEmail(getUserId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message); + $message = loadEmailTemplate('member_holiday_request', $content, getMemberId()); + sendEmail(getMemberId(), '{--MEMBER_HOLIDAY_SUBJECT--}', $message); // Send mail to all admins - sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getUserId()); + sendAdminNotification('{--ADMIN_HOLIDAY_SUBJECT--}', 'admin_holiday_request', $content, getMemberId()); - // Create task - createNewTask('{--HOLIDAY_ADMIN_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getUserId()); + // Create task (we ignore the task id here) + createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId()); // Display message - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_IS_ACTIVATED_NOW')); + displayMessage('{--MEMBER_HOLIDAY_IS_ACTIVATED_NOW--}'); } } // END - if @@ -161,105 +166,120 @@ LIMIT 1", if (isPostRequestElementSet('stop')) { // Okay, end the holiday here... $result = SQL_QUERY_ESC("SELECT - `holiday_active`, `holiday_activated` + `holiday_active`, + `holiday_activated` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s -LIMIT 1", array(getUserId()), __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 - `holiday_start`, `holiday_end` +LIMIT 1", array(getMemberId()), __FILE__, __LINE__); + + // Is there an entry? + if (SQL_NUMROWS($result) == 1) { + // Merge arrays + $content = merge_array($content, SQL_FETCHARRAY($result)); + + if (($content['holiday_active'] == 'Y') && (($content['holiday_activated'] + getHolidayLock()) < time())) { + // Load data + $result2 = SQL_QUERY_ESC("SELECT + `holiday_start`, + `holiday_end` FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s -LIMIT 1", array(getUserId()), __FILE__, __LINE__); - if (SQL_NUMROWS($result) == 1) { - // Data was found - $content = merge_array($content, SQL_FETCHARRAY($result)); - SQL_FREERESULT($result); - - // 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` +LIMIT 1", array(getMemberId()), __FILE__, __LINE__); + 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); + + // Deactivate it now + SQL_QUERY_ESC("UPDATE + `{?_MYSQL_PREFIX?}_user_data` SET `holiday_active`='N', `holiday_activated`=0 WHERE `userid`=%s LIMIT 1", - array(getUserId()), __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(getUserId()), __FILE__, __LINE__); - - // Send email to admin - sendAdminNotification(getMessage('HOLIDAY_ADMIN_DEAC_SUBJ'), 'admin_holiday_deactivated', $content, getUserId()); - - // 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('{--ADMIN_HOLIDAY_DEACTIVATED_SUBJECT--}', 'admin_holiday_deactivated', $content, getMemberId()); + + // Display message to user + displayMessage('{--MEMBER_HOLIDAY_DEACTIVATED_NOW--}'); + } else { + // Display message to user + displayMessage('{--MEMBER_HOLIDAY_CANNOT_DEACTIVATE--}'); + } + + // Free result + SQL_FREERESULT($result2); + } elseif ($content['holiday_active'] == 'Y') { + // To fast! + displayMessage('{--MEMBER_HOLIDAY_LOCKED--}'); } - } elseif ($content['holiday_active'] == 'Y') { - // To fast! - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED')); + } else { + // User not found + displayMessage('{--MEMBER_HOLIDAY_NOT_STOPPED_404--}'); } + + // Free result + SQL_FREERESULT($result); } // END - if // If something is wrong or link in menu is just clicked display form if ((!isFormSent()) && (!isPostRequestElementSet('stop'))) { // Check if user is in holiday... $result = SQL_QUERY_ESC("SELECT - `holiday_active`, `holiday_activated` + `holiday_active`, + `holiday_activated` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s -LIMIT 1", array(getUserId()), __FILE__, __LINE__); +LIMIT 1", array(getMemberId()), __FILE__, __LINE__); $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); // Check for lock - if (($content['holiday_activated'] + getConfig('holiday_lock')) < time()) { + if (($content['holiday_activated'] + getHolidayLock()) < time()) { // User can deactivate his holiday request - switch ($content['holiday_active']) - { + switch ($content['holiday_active']) { case 'Y': // Display deactivation form // Load starting and ending date $result = SQL_QUERY_ESC("SELECT - `holiday_start`, `holiday_end` + `holiday_start`, + `holiday_end` FROM `{?_MYSQL_PREFIX?}_user_holidays` WHERE `userid`=%s -LIMIT 1", array(getUserId()), __FILE__, __LINE__); +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'); - $content['end'] = generateDateTime($content['holiday_end'] , '3'); - $content['lock'] = generateDateTime($content['holiday_activated'], '1'); + $content['start'] = generateDateTime($content['holiday_start'] , 3); + $content['end'] = generateDateTime($content['holiday_end'] , 3); + $content['lock'] = generateDateTime($content['holiday_activated'], 1); // Load template - loadTemplate('member_holiday_deactivate', false, $content); + loadTemplate('member_holiday_deactivate', FALSE, $content); } else { // Free memory SQL_FREERESULT($result); @@ -271,35 +291,38 @@ SET `holiday_active`='N' WHERE `userid`=%s -LIMIT 1", array(getUserId()), __FILE__, __LINE__); +LIMIT 1", + array(getMemberId()), __FILE__, __LINE__); redirectToUrl('modules.php?module=login&what=holiday'); return; } + + // Free result + SQL_FREERESULT($result); break; case 'N': // Display activation form - // Starting day - $content['start_day'] = addSelectionBox('day' , date('d', (time() + getConfig('ONE_DAY'))), 'start'); - $content['start_month'] = addSelectionBox('month', date('m', (time() + getConfig('ONE_DAY'))), 'start'); - $content['start_year'] = addSelectionBox('year' , date('Y', (time() + getConfig('ONE_DAY'))), 'start'); + // Cache timestamps + $startingStamp = time() + getOneDay(); + $endingStamp = $startingStamp + (getOneDay() * getConfig('holiday_max')); - // Calcualte ending date - $D = date('d', time() + getConfig('ONE_DAY') + (getConfig('ONE_DAY') * getConfig('holiday_max'))); - $M = date('m', time() + getConfig('ONE_DAY') + (getConfig('ONE_DAY') * getConfig('holiday_max'))); - $Y = date('Y', time() + getConfig('ONE_DAY') + (getConfig('ONE_DAY') * getConfig('holiday_max'))); + // Starting day + $content['start_day'] = addSelectionBox('da', getDay($startingStamp) , 'start'); + $content['start_month'] = addSelectionBox('mo', getMonth($startingStamp), 'start'); + $content['start_year'] = addSelectionBox('ye', getYear($startingStamp) , 'start'); // Ending day - $content['end_day'] = addSelectionBox('day' , $D, 'end'); - $content['end_month'] = addSelectionBox('month', $M, 'end'); - $content['end_year'] = addSelectionBox('year' , $Y, 'end'); + $content['end_day'] = addSelectionBox('da', getDay($endingStamp) , 'end'); + $content['end_month'] = addSelectionBox('mo', getMonth($endingStamp), 'end'); + $content['end_year'] = addSelectionBox('ye', getYear($endingStamp) , 'end'); // Output form - loadTemplate('member_holiday_form'); + loadTemplate('member_holiday_form', FALSE, $content); break; - } + } // END - switch } else { // To fast! - loadTemplate('admin_settings_saved', false, getMessage('HOLIDAY_MEMBER_LOCKED')); + displayMessage('{--MEMBER_HOLIDAY_LOCKED--}'); } } // END - if