* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
}
// Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
if ((!isExtensionActive('holiday')) && (!isAdmin())) {
loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('holiday'));
LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
if ((SQL_NUMROWS($result1) == 1) || (SQL_NUMROWS($result2) == 1)) {
- // Mail order found!
+ // Mail order found
$content = merge_array($content, SQL_FETCHARRAY($result1));
$content = merge_array($content, SQL_FETCHARRAY($result2));
// 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
unsetPostRequestParameter('ok');
} else {
createNewTask('{--ADMIN_HOLIDAY_SUBJECT--}', $message, 'HOLIDAY_REQUEST', getMemberId());
// Display message
- loadTemplate('admin_settings_saved', false, '{--HOLIDAY_IS_ACTIVATED_NOW--}');
+ loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_IS_ACTIVATED_NOW--}');
}
} // END - if
// Check for lock
if (($content['holiday_activated'] + getConfig('holiday_lock')) < 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_active`='N'
WHERE
`userid`=%s
-LIMIT 1", array(getMemberId()), __FILE__, __LINE__);
+LIMIT 1",
+ array(getMemberId()), __FILE__, __LINE__);
redirectToUrl('modules.php?module=login&what=holiday');
return;
}
case 'N': // Display activation form
// Cache timestamps
- $startingStamp = time() + getConfig('ONE_DAY');
- $endingStamp = $startingStamp + (getConfig('ONE_DAY') * getConfig('holiday_max'));
+ $startingStamp = time() + getOneDay();
+ $endingStamp = $startingStamp + (getOneDay() * getConfig('holiday_max'));
// Starting day
$content['start_day'] = addSelectionBox('day' , getDay($startingStamp) , 'start');
// Output form
loadTemplate('member_holiday_form', false, $content);
break;
- }
+ } // END - switch
} else {
// To fast!
loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_LOCKED--}');