X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=8470a3a239eb2e7a8ad3fb77d7b07849db039426;hb=6c6f24bd5a3817573d1d49ed114700914ae8c920;hp=76b7859dbb16d00e39a994e3e95d368908d5b863;hpb=ca256746fe0757a23df4064824c8fe2087ad5634;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 76b7859dbb..8470a3a239 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -627,7 +627,8 @@ function createEpocheTimeFromSelections ($prefix, $postData) {
 	$M1   = getMonth();
 
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
-	if ((floor($TEST) == $TEST) && ($M1 == '02') && ($postData[$prefix . '_mo'] > '02'))  {
+	// 01     2     2         1    1           1    123     4                          43    3                                 32    233    4                          43    3                                 3210
+	if ((floor($TEST) == $TEST) && ($M1 == '02') && (((isset($postData[$prefix . '_mo'])) && ($postData[$prefix . '_mo'] > '02')) || ((isset($postData[$prefix . '_mn'])) && ($postData[$prefix . '_mn'] > '02')))) {
 		$SWITCH = getOneDay();
 	} // END - if
 
@@ -635,7 +636,11 @@ function createEpocheTimeFromSelections ($prefix, $postData) {
 	$ret += $postData[$prefix . '_ye'] * (31536000 + $SWITCH);
 
 	// Next months...
-	$ret += $postData[$prefix . '_mo'] * 2628000;
+	if (isset($postData[$prefix . '_mo'])) {
+		$ret += $postData[$prefix . '_mo'] * 2628000;
+	} elseif (isset($postData[$prefix . '_mn'])) {
+		$ret += $postData[$prefix . '_mn'] * 2628000;
+	}
 
 	// Next weeks
 	$ret += $postData[$prefix . '_we'] * 604800;
@@ -928,7 +933,7 @@ function encodeHashForCookie ($passHash) {
 
 			$mod = substr($mod, 0, 2);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'idx=' . $idx . ',part1=' . $part1 . '/part2=' . $part2 . '/mod=' . $mod . '(' . strlen($mod) . ')');
-			$mod = str_pad($mod, 2, '0', STR_PAD_LEFT);
+			$mod = padLeftZero($mod);
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mod(' . ($idx * 2) . ')=' . $mod . '*');
 			$start += 2;
 			$newHash .= $mod;
@@ -1449,17 +1454,17 @@ function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id,
 	$test = substr($id, -3);
 
 	// Improved way of checking! :-)
-	if (in_array($test, array('_ye', '_mo', '_we', '_da', '_ho', '_mi', '_se'))) {
+	if (in_array($test, array('_ye', '_mo', '_mn', '_we', '_da', '_ho', '_mi', '_se'))) {
 		// Found a multi-selection for timings?
 		$test = substr($id, 0, -3);
-		if ((isset($postData[$test . '_ye'])) && (isset($postData[$test . '_mo'])) && (isset($postData[$test . '_we'])) && (isset($postData[$test . '_da'])) && (isset($postData[$test . '_ho'])) && (isset($postData[$test . '_mi'])) && (isset($postData[$test . '_se'])) && ($test != $test2)) {
+		if ((isset($postData[$test . '_ye'])) && ((isset($postData[$test . '_mo'])) || (isset($postData[$test . '_mn']))) && (isset($postData[$test . '_we'])) && (isset($postData[$test . '_da'])) && (isset($postData[$test . '_ho'])) && (isset($postData[$test . '_mi'])) && (isset($postData[$test . '_se'])) && ($test != $test2)) {
 			// Generate timestamp
 			$postData[$test] = createEpocheTimeFromSelections($test, $postData);
 			array_push($content, sprintf("`%s`='%s'", $test, $postData[$test]));
 			$GLOBALS['skip_config'][$test] = TRUE;
 
 			// Remove data from array
-			foreach (array('ye', 'mo', 'we', 'da', 'ho', 'mi', 'se') as $rem) {
+			foreach (array('ye', 'mo', 'mn', 'we', 'da', 'ho', 'mi', 'se') as $rem) {
 				unset($postData[$test . '_' . $rem]);
 			} // END - foreach
 
@@ -1623,16 +1628,7 @@ function addNewBonusMail ($data, $mode = '', $output = TRUE) {
 	}
 }
 
-// Enables the reset mode and runs it
-function doReset () {
-	// Enable the reset mode
-	$GLOBALS['reset_enabled'] = TRUE;
-
-	// Run filters
-	runFilterChain('reset');
-}
-
-// Enables the reset mode (hourly, weekly and monthly) and runs it
+// Enables the hourly reset mode and runs it
 function doHourly () {
 	// Enable the hourly reset mode
 	$GLOBALS['hourly_enabled'] = TRUE;
@@ -1641,6 +1637,33 @@ function doHourly () {
 	runFilterChain('hourly');
 }
 
+// Enables the daily reset mode and runs it
+function doDaily () {
+	// Enable the reset mode
+	$GLOBALS['daily_enabled'] = TRUE;
+
+	// Run filters
+	runFilterChain('daily');
+}
+
+// Enables the weekly reset mode and runs it
+function doWeekly () {
+	// Enable the reset mode
+	$GLOBALS['weekly_enabled'] = TRUE;
+
+	// Run filters
+	runFilterChain('weekly');
+}
+
+// Enables the monthly reset mode and runs it
+function doMonthly () {
+	// Enable the reset mode
+	$GLOBALS['monthly_enabled'] = TRUE;
+
+	// Run filters
+	runFilterChain('monthly');
+}
+
 // Shuts down the mailer (e.g. closing database link, flushing output/filters, etc.)
 function doShutdown () {
 	// Call the filter chain 'shutdown'
@@ -2140,7 +2163,7 @@ function capitalizeUnderscoreString ($str) {
 }
 
 // Generate admin links for mail order
-// mailType can be: 'mid' or 'bid'
+// mailType can be: 'normal' or 'bonus'
 function generateAdminMailLinks ($mailType, $mailId) {
 	// Init variables
 	$OUT = '';
@@ -2152,11 +2175,11 @@ function generateAdminMailLinks ($mailType, $mailId) {
 
 	// Which mail do we have?
 	switch ($mailType) {
-		case 'bid': // Bonus mail
+		case 'bonus': // Bonus mail
 			$table = 'bonus';
 			break;
 
-		case 'mid': // Member mail
+		case 'normal': // Member mail
 			$table = 'pool';
 			break;
 
@@ -2722,9 +2745,18 @@ function translateTaskType ($taskType) {
 	return translateGeneric('ADMIN_TASK_TYPE', $taskType);
 }
 
-//-----------------------------------------------------------------------------
-// Automatically re-created functions, all taken from user comments on www.php.net
-//-----------------------------------------------------------------------------
+// "Translates" task status to a human-readable version
+function translateTaskStatus ($taskStatus) {
+	// Return it
+	return translateGeneric('ADMIN_TASK_STATUS', $taskStatus);
+}
+
+/*
+ *-----------------------------------------------------------------------------
+ * Automatically re-created functions, all taken from user comments on
+ * www.php.net
+ *-----------------------------------------------------------------------------
+ */
 if (!function_exists('html_entity_decode')) {
 	// Taken from documentation on www.php.net
 	function html_entity_decode ($string) {