X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=e55c5bbd3b1a44bd8b854ce07c97f3e69b828c7d;hp=d6bb58f5f338f1f5c1801f1ed01ebdfc63a25ba6;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index d6bb58f5f3..e55c5bbd3b 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -104,7 +104,7 @@ if (isGetRequestParameterSet('rallye')) {
 	runFilterChain('run_sqls');
 } elseif (isFormSent('remove')) {
 	// Delete rallyes
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Init SQLs
 		initSqls();
 
@@ -123,14 +123,14 @@ if (isGetRequestParameterSet('rallye')) {
 		runFilterChain('run_sqls');
 
 		// Output message
-		$message = getMessage('RALLYE_DELETED');
+		$message = '{--RALLYE_DELETED--}';
 	} else {
 		// No rallye selected to delete!
-		$message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
+		$message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
 	}
 } elseif (isFormSent('change')) {
 	// Change rallye
-	if (countSelection(postRequestParameter('title')) > 0) {
+	if (ifPostContainsSelections('title')) {
 		// Init SQLs
 		initSqls();
 
@@ -150,12 +150,12 @@ SET
 	`title`='%s',
 	`descr`='%s',
 	`template`='%s',
-	`start_time`='%s',
-	`end_time`='%s',
-	`min_users`='%s',
-	`min_prices`='%s'
+	`start_time`=%s,
+	`end_time`=%s,
+	`min_users`=%s,
+	`min_prices`=%s
 WHERE
-	`id`='%s'
+	`id`=%s
 LIMIT 1",
 			array(
 				$title,
@@ -173,15 +173,15 @@ LIMIT 1",
 		runFilterChain('run_sqls');
 
 		// Output message
-		$message = getMessage('RALLYE_CHANGED');
+		$message = '{--RALLYE_CHANGED--}';
 	}
 }
 
 if (isFormSent('edit')) {
 	// Check for selections
-	if (countPostSelection() > 0) {
+	if (ifPostContainsSelections()) {
 		// Make all selected and deactivated rallyes editable
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		foreach (postRequestParameter('sel') as $id => $selected) {
 			// Load rallye basic data
 			$result = SQL_QUERY_ESC("SELECT
@@ -199,45 +199,48 @@ LIMIT 1",
 			SQL_FREERESULT($result);
 
 			// Starting day
-			$content['s_sec']   = addSelectionBox('sec'  , date('s', $content['start_time']), 'start', $id);
-			$content['s_min']   = addSelectionBox('min'  , date('i', $content['start_time']), 'start', $id);
-			$content['s_hour']  = addSelectionBox('hour' , date('G', $content['start_time']), 'start', $id);
-			$content['s_day']   = addSelectionBox('day'  , date('d', $content['start_time']), 'start', $id);
-			$content['s_month'] = addSelectionBox('month', date('m', $content['start_time']), 'start', $id);
-			$content['s_year']  = addSelectionBox('year' , date('Y', $content['start_time']), 'start', $id);
+			$content['s_sec']   = addSelectionBox('sec'  , getSecond($content['start_time'])   , 'start', $id);
+			$content['s_min']   = addSelectionBox('min'  , getMinute($content['start_time'])   , 'start', $id);
+			$content['s_hour']  = addSelectionBox('hour' , getShortHour($content['start_time']), 'start', $id);
+			$content['s_day']   = addSelectionBox('day'  , getDay($content['start_time'])      , 'start', $id);
+			$content['s_month'] = addSelectionBox('month', getMonth($content['start_time'])    , 'start', $id);
+			$content['s_year']  = addSelectionBox('year' , getYear($content['start_time'])     , 'start', $id);
 
 			// Ending day
-			$content['e_sec']   = addSelectionBox('sec'  , date('s', $content['end_time'])  , 'end'  , $id);
-			$content['e_min']   = addSelectionBox('min'  , date('i', $content['end_time'])  , 'end'  , $id);
-			$content['e_hour']  = addSelectionBox('hour' , date('G', $content['end_time'])  , 'end'  , $id);
-			$content['e_day']   = addSelectionBox('day'  , date('d', $content['end_time'])  , 'end'  , $id);
-			$content['e_month'] = addSelectionBox('month', date('m', $content['end_time'])  , 'end'  , $id);
-			$content['e_year']  = addSelectionBox('year' , date('Y', $content['end_time'])  , 'end'  , $id);
+			$content['e_sec']   = addSelectionBox('sec'  , getSecond($content['end_time'])     , 'end'  , $id);
+			$content['e_min']   = addSelectionBox('min'  , getMinute($content['end_time'])     , 'end'  , $id);
+			$content['e_hour']  = addSelectionBox('hour' , getShortHour($content['end_time'])  , 'end'  , $id);
+			$content['e_day']   = addSelectionBox('day'  , getDay($content['end_time'])        , 'end'  , $id);
+			$content['e_month'] = addSelectionBox('month', getMonth($content['end_time'])      , 'end'  , $id);
+			$content['e_year']  = addSelectionBox('year' , getYear($content['end_time'])       , 'end'  , $id);
 
 			// Remember other values
 			$content['templ']      = addReferalRallyeTemplateSelection('templ['.$id.']', $content['template']);
-			$content['sw']         = $SW;
 			$content['id']         = $id;
 
 			// Output row
-			$OUT .= loadTemplate('admin_edit_rallyes_row', true, $content);
-
-			// Color switching
-			$SW = 3 - $SW;
-		}
+			$OUT .= loadTemplate('form_submit_rallyes_row', true, $content);
+		} // END - foreach
 
 		// Load final template
-		loadTemplate('admin_edit_rallyes', false, $OUT);
+		loadTemplate('form_submit_rallyes', false, $OUT);
 	} else {
 		// Nothing selected to edit
-		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SELECTED'));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
 	}
 } elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
 	// List users and their refs before start and current
-	$result = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
+	$result = SQL_QUERY_ESC("SELECT
+	`userid`, `refs`, `curr_points`
+FROM
+	`{?_MYSQL_PREFIX?}_rallye_users`
+WHERE
+	`rallye_id`=%s
+ORDER BY
+	`userid` ASC",
 		array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
-		$OUT = ''; $SW = 2;
+	if (!SQL_HASZERONUMS($result)) {
+		$OUT = '';
 		$content['rallye'] = getRequestParameter('rallye');
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Check for referal count
@@ -248,27 +251,27 @@ LIMIT 1",
 			$br = '';
 
 			// Output row
-			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = '<strong>'; $br = '</strong>'; }
+			if (($row['curr_points'] > 0) && ($cnt > 0)) {
+				$bl = '<strong>';
+				$br = '</strong>';
+			} // END - if
 
 			// Get user points
 			$points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
-			//* DEBUG: */ outputHtml(basename(__FILE__).":userid={$row['userid']},points={$points},opoints={$row['curr_points']}<br />");
+			//* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
 
 			// Prepare content
-			// @TODO Rewritings: opoints->curr_points,old->refs in template
 			$row = array(
-				'sw'      => $SW ,
 				'userid'  => $row['userid'],
 				'bold_l'  => $bl ,
 				'bold_r'  => $br ,
-				'old'     => $row['refs'],
+				'refs'    => $row['refs'],
 				'cnt'     => $cnt,
-				'opoints' => translateComma($points - $row['curr_points']),
+				'opoints' => ($points - $row['curr_points']),
 			);
 
 			// Load row template and switch color
 			$OUT .= loadTemplate('admin_list_rallye_usr_row', true, $row);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Remember rows
@@ -282,106 +285,102 @@ LIMIT 1",
 		loadTemplate('admin_list_rallye_usr', false, $content);
 	} else {
 		// No entries found?
-		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}');
 	}
 } else {
 	// Start listing rallyes
 	$result = SQL_QUERY("SELECT
-	`id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`
+	`id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`,
+	`auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_data`
 ORDER BY
 	`start_time` DESC", __FILE__, __LINE__);
 
 	// Records found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List found rallyes
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Load admin login
 			$data['login'] = getAdminLogin($data['admin_id']);
 
 			// Count joined userids
-			$joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
+			$users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
 			// Did some users joined this rallye?
-			if ($joined > 0) {
+			if ($users > 0) {
 				// List joined users
-				$joined = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=' . $data['id'] . '%}" title="{--RALLYE_LIST_USERS_TITLE--}">' . $joined . '</a>';
+				$users = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=' . $data['id'] . '%}" title="{--RALLYE_LIST_USERS_TITLE--}">' . $users . '</a>';
 			} // END - if
 
 			// Alter some variables
 			if (empty($data['login']))    $data['login']     = '???';
-			if (empty($data['template'])) $data['template']  = '---';
-			if (empty($data['descr']))    $data['descr']     = '---';
 
 			// Transfer data into array for the template
 			$row = array(
-				'select'     => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="admin_normal" value="1" />',
-				'admin_id'   => $data['admin_id'],
-				'admin_link' => generateAdminLink($data['admin_id']),
-				'login'      => $data['login'],
-				'id'         => $data['id'],
-				'sw'         => $SW,
-				'title'      => $data['title'],
-				'template'   => $data['template'],
-				'joined'     => $joined,
-				'start_date' => generateDateTime($data['start_time'], 2),
-				'end_date'   => generateDateTime($data['end_time']  , 2),
-				'active_lnk' => translateYesNo($data['is_active']),
-				'notify_lnk' => translateYesNo($data['send_notify']),
-				'auto_lnk'   => translateYesNo($data['auto_add_new_user']),
-				'notified'   => translateYesNo($data['notified']),
-				'prices_cnt' => translateComma(countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true)),
-				'descr'      => $data['descr'],
-				'min_users'  => $data['min_users'],
-				'min_prices' => $data['min_prices'],
+				'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="form_field" value="1" />',
+				'admin_id'          => $data['admin_id'],
+				'login'             => $data['login'],
+				'id'                => $data['id'],
+				'title'             => $data['title'],
+				'template'          => $data['template'],
+				'users_content'     => $users,
+				'start_date'        => generateDateTime($data['start_time'], 2),
+				'end_date'          => generateDateTime($data['end_time']  , 2),
+				'is_active'         => $data['is_active'],
+				'send_notify'       => $data['send_notify'],
+				'auto_add_new_user' => $data['auto_add_new_user'],
+				'notified'          => $data['notified'],
+				'prices_cnt'        => countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true),
+				'descr'             => $data['descr'],
+				'min_users'         => $data['min_users'],
+				'min_prices'        => $data['min_prices'],
 			);
 
 			// Is the rallye active or not?
 			switch ($data['is_active']) {
 				case 'Y':
 					// Rallye is active so do not edit it!
-					$row['select'] = '<div class="big">' . $row['id'] . '</div>';
-					$row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
-					$row['active'] = '0';
+					$row['select']       = '<div class="big">' . $row['id'] . '</div>';
+					$row['active_title'] = '{--RALLYE_DEACTIVATE_NOW--}';
+					$row['active']       = '0';
 					break;
 
 				case 'N':
-					$row['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
-					$row['active'] = 1;
+					$row['active_title'] = '{--RALLYE_ACTIVATE_NOW--}';
+					$row['active']       = 1;
 					break;
-			}
+			} // END - switch
 
 			// Notification to members?
 			switch ($data['send_notify']) {
 				case 'Y':
-					$row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
-					$row['notify'] = '0';
+					$row['notify_title'] = '{--RALLYE_STOP_NOTIFY_NOW--}';
+					$row['notify']       = '0';
 					break;
 
 				case 'N':
-					$row['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
-					$row['notify'] = 1;
+					$row['notify_title'] = '{--RALLYE_START_NOTIFY_NOW--}';
+					$row['notify']       = 1;
 					break;
-			}
+			} // END - switch
 
 			// Auto-add of new joined members?
 			switch ($data['auto_add_new_user']) {
 				case 'Y':
-					$row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
-					$row['auto'] = '0';
+					$row['auto_title'] = '{--RALLYE_STOP_AUTO_ADD_NOW--}';
+					$row['auto']       = '0';
 					break;
 
 				case 'N':
-					$row['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
-					$row['auto'] = 1;
+					$row['auto_title'] = '{--RALLYE_START_AUTO_ADD_NOW--}';
+					$row['auto']       = 1;
 					break;
-			}
+			} // END - switch
 
 			// Output row
 			$OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory
@@ -394,7 +393,7 @@ ORDER BY
 		loadTemplate('admin_list_rallyes', false, $content);
 	} else {
 		// No rallyes setup so far
-		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
 	}
 }