X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=4ebd29f3bf7c27f0e429581353a0ca7c71131bb2;hb=01c643fbb3dabb7953a6e9646113eb5742ebe3be;hp=1ddccd1cac9dd9c42f6a889a211099d6085e49ca;hpb=88624bbf36f5b3cb5ef796a662853a6d38c4ce64;p=mailer.git

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 1ddccd1cac..4ebd29f3bf 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/29/2004 *
- * ================                             Last change: 02/11/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 06/29/2004 *
+ * ===================                          Last change: 02/11/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_rallyes.php                            *
@@ -39,12 +39,12 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (!isGetRequestElementSet('sub')) setRequestGetElement('sub', '');
+// Init message
 $message = '';
 
 // Quick actions on a rallye
@@ -66,7 +66,7 @@ if (isGetRequestElementSet('rallye')) {
 					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
-		}
+		} // END - switch
 	} elseif (isGetRequestElementSet('notify')) {
 		// Automatic notification
 		switch (getRequestElement('notify')) {
@@ -81,7 +81,7 @@ if (isGetRequestElementSet('rallye')) {
 					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
-		}
+		} // END - switch
 	} elseif (isGetRequestElementSet('auto')) {
 		// Automatic adding of new members
 		switch (getRequestElement('auto')) {
@@ -96,15 +96,14 @@ if (isGetRequestElementSet('rallye')) {
 					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
-		}
+		} // END - switch
 	}
 
 	// Run SQL command
 	runFilterChain('run_sqls');
 } elseif (isPostRequestElementSet('remove')) {
 	// Delete rallyes
-	$SEL = countPostSelection();
-	if ($SEL > 0) {
+	if (countPostSelection() > 0) {
 		// Init SQLs
 		initSqls();
 
@@ -113,9 +112,9 @@ if (isGetRequestElementSet('rallye')) {
 			// Remove selected rallye entirely...
 			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
 				array(bigintval($id)), __FILE__, __LINE__, false));
-			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s",
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",
 				array(bigintval($id)), __FILE__, __LINE__, false));
-			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s",
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",
 				array(bigintval($id)), __FILE__, __LINE__, false));
 		} // END - foreach
 
@@ -130,8 +129,7 @@ if (isGetRequestElementSet('rallye')) {
 	}
 } elseif (isPostRequestElementSet('change')) {
 	// Change rallye
-	$SEL = countSelection(postRequestElement('title'));
-	if ($SEL > 0) {
+	if (countSelection(postRequestElement('title')) > 0) {
 		// Init SQLs
 		initSqls();
 
@@ -180,8 +178,7 @@ LIMIT 1",
 
 if (isPostRequestElementSet('edit')) {
 	// Check for selections
-	$SEL = countPostSelection();
-	if ($SEL > 0) {
+	if (countPostSelection() > 0) {
 		// Make all selected and deactivated rallyes editable
 		$OUT = ''; $SW = 2;
 		foreach (postRequestElement('sel') as $id => $selected) {
@@ -250,23 +247,17 @@ LIMIT 1",
 			$br = '';
 
 			// Output row
-			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = "<strong>"; $br = "</strong>"; }
-			if (($row['refs'] > 0) || ($cnt > 0)) {
-				// Insert link to referal list
-				//* DEBUG: */ outputHtml('-'.$row['userid'].'/'.$cnt.'/'.$row['refs']."-<br />");
-				$cnt = generateUserProfileLink($row['userid'], $cnt, 'list_refs');
-				$row['refs'] = generateUserProfileLink($row['userid'], $row['refs'], 'list_refs');
-			} // END - if
+			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = '<strong>'; $br = '</strong>'; }
 
 			// 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 />");
 
 			// Prepare content
-			// @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
+			// @TODO Rewritings: opoints->curr_points,old->refs in template
 			$row = array(
 				'sw'      => $SW ,
-				'userid'     => $row['userid'],
+				'userid'  => $row['userid'],
 				'bold_l'  => $bl ,
 				'bold_r'  => $br ,
 				'old'     => $row['refs'],
@@ -315,7 +306,7 @@ ORDER BY
 			// Did some users joined this rallye?
 			if ($joined > 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>";
+				$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>';
 			} // END - if
 
 			// Alter some variables
@@ -325,9 +316,9 @@ ORDER BY
 
 			// Transfer data into array for the template
 			$row = array(
-				'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
+				'select'     => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="admin_normal" value="1" />',
 				'admin_id'   => $data['admin_id'],
-				'email_link' => generateEmailLink($data['admin_id']),
+				'admin_link' => generateAdminLink($data['admin_id']),
 				'login'      => $data['login'],
 				'id'         => $data['id'],
 				'sw'         => $SW,
@@ -350,7 +341,7 @@ ORDER BY
 			switch ($data['is_active']) {
 				case 'Y':
 					// Rallye is active so do not edit it!
-					$row['select'] = "<div class=\"big\">".$row['id']."</div>";
+					$row['select'] = '<div class="big">' . $row['id'] . '</div>';
 					$row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
 					$row['active'] = '0';
 					break;