X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=b8bb61dc81b8187484329e6a750299bedc91cfc9;hp=e9bd50bb2e84e8faf7b257f27de29866d506df2e;hb=ca256746fe0757a23df4064824c8fe2087ad5634;hpb=b4042713447d2eb3777a49f24523511dbba8970f

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index e9bd50bb2e..b8bb61dc81 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } elseif (!isMember()) {
 	redirectToIndexMemberOnlyModule();
 }
@@ -53,8 +53,8 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
 
 // Check for mode in GET
 $mode = '';
-if (isGetRequestElementSet('mode')) {
-	$mode = getRequestElement('mode');
+if (isGetRequestElementSet('do')) {
+	$mode = getRequestElement('do');
 } // END - if
 
 // Check for "faker"
@@ -78,7 +78,7 @@ switch ($mode) {
 				$valid_code = ($code == postRequestElement('code'));
 			} else {
 				// Zero length (= disabled) is always valid!
-				$valid_code = true;
+				$valid_code = TRUE;
 			}
 
 			// Test password
@@ -91,16 +91,16 @@ switch ($mode) {
 			$valid_reason = (isPostRequestElementSet('reason'));
 
 			// Test if a recipient is selected
-			$valid_recipient = isValidUserId(postRequestElement('to_userid'));
+			$valid_recipient = isValidId(postRequestElement('to_userid'));
 
 			// Re-check receivers and own personal data
-			$result = SQL_QUERY_ESC("SELECT `userid`,`gender`,`surname`,`family`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
+			$result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED'" . runFilterChain('user_exclusion_sql', ' ') . " LIMIT 2",
 				array(
 					getMemberId(),
 					bigintval(postRequestElement('to_userid'))
 				), __FILE__, __LINE__);
 
-			// Do we have two entries?
+			// Is there two entries?
 			$valid_data = (SQL_NUMROWS($result) == 2);
 
 			// Final check if all is fine
@@ -140,10 +140,10 @@ switch ($mode) {
 				$content['reason']  = postRequestElement('reason');
 
 				// Generate tranafer id
-				$content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestElement('reason')));
+				$content['trans_id'] = bigintval(generateRandomCode('10', getRandomTan(), getMemberId(), postRequestElement('reason')));
 
 				// Add entries to both tables
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`,`from_userid`,`points`,`reason`,`time_trans`,`trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
 					array(
 						bigintval(postRequestElement('to_userid')),
 						getMemberId(),
@@ -151,7 +151,7 @@ switch ($mode) {
 						postRequestElement('reason'),
 						$content['trans_id']
 					), __FILE__, __LINE__);
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`,`to_userid`,`points`,`reason`,`time_trans`,`trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES (%s,%s,%s,'%s', UNIX_TIMESTAMP(),%s)",
 					array(
 						getMemberId(),
 						bigintval(postRequestElement('to_userid')),
@@ -176,34 +176,34 @@ switch ($mode) {
 				sendEmail($content['sender']['userid'], '{--TRANSFER_MEMBER_SENDER_SUBJECT--}' . ': ' . $RECIPIENT, $message);
 
 				// At last send admin mail(s)
-				$adminSubject = sprintf("%s (%s->%s)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT);
+				$adminSubject = sprintf("%s (%s->%s)", '{--ADMIN_TRANSFER_SUBJECT--}', $SENDER, $RECIPIENT);
 				sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
 				// Transfer is completed
-				displayMessage('<div>{--TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
-			} elseif ($valid_code === false) {
+				displayMessage('<div>{--MEMBER_TRANSFER_COMPLETED--}' . '</div><div><a href="{%url=modules.php?module=login&amp;what=transfer%}">{--MEMBER_TRANSFER_CONTINUE_OVERVIEW--}</a></div>');
+			} elseif ($valid_code === FALSE) {
 				// Invalid Touring code!
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_CODE--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_CODE--}');
 				unsetPostRequestElement('ok');
-			} elseif ($valid_pass === false) {
+			} elseif ($valid_pass === FALSE) {
 				// Wrong password entered
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_PASSWORD--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_PASSWORD--}');
 				unsetPostRequestElement('ok');
-			} elseif ($valid_amount === false) {
+			} elseif ($valid_amount === FALSE) {
 				// Too much points entered
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_POINTS--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_POINTS--}');
 				unsetPostRequestElement('ok');
-			} elseif ($valid_reason === false) {
+			} elseif ($valid_reason === FALSE) {
 				// No transfer reason entered
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_REASON--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_REASON--}');
 				unsetPostRequestElement('ok');
-			} elseif ($valid_recipient === false) {
+			} elseif ($valid_recipient === FALSE) {
 				// No recipient selected
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_RECIPIENT--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_RECIPIENT--}');
 				unsetPostRequestElement('ok');
-			} elseif ($valid_data === false) {
+			} elseif ($valid_data === FALSE) {
 				// No recipient/sender selected
-				loadTemplate('admin_settings_unsaved', false, '{--TRANSFER_INVALID_DATA--}');
+				loadTemplate('admin_settings_unsaved', FALSE, '{--MEMBER_TRANSFER_INVALID_DATA--}');
 				unsetPostRequestElement('ok');
 			}
 
@@ -213,7 +213,7 @@ switch ($mode) {
 
 		if (!isFormSent()) {
 			// Load member list
-			$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
+			$result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED'" . runFilterChain('user_exclusion_sql', ' ') . " AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
 				array(getMemberId()), __FILE__, __LINE__);
 
 			if (!SQL_HASZERONUMS($result)) {
@@ -234,7 +234,7 @@ switch ($mode) {
 				SQL_FREERESULT($result);
 			} else {
 				// No one else is opt-in
-				$OUT = displayMessage('{--TRANSFER_NO_ONE_ELSE_OPT_IN--}', true);
+				$OUT = displayMessage('{--MEMBER_TRANSFER_NO_ONE_ELSE_OPT_IN--}', TRUE);
 				$content['to_disabled'] = ' disabled="disabled"';
 			}
 
@@ -244,19 +244,19 @@ switch ($mode) {
 			// Generate Code
 			if (getTransferCode() > 0) {
 				// Generate random number
-				$rand = mt_rand(0, 99999);
+				$rand = getRandomTan();
 
 				// Generate CAPTCHA code
 				$code = generateRandomCode(getTransferCode(), $rand, getMemberId(), $content['max_transferable']);
 
 				// Generate image (HTML code)
-				$img = generateImageOrCode($code, false);
+				$img = generateImageOrCode($code, FALSE);
 
 				// Add all and hidden field
 				$content['captcha_code'] = '<input type="hidden" name="code_chk" value="' . $rand . '" /><input type="text" name="code" class="form_field" size="5" maxlength="7"' . $content['to_disabled'] . ' />&nbsp;' . $img;
 			} else {
 				$code = '00000';
-				$content['captcha_code'] = displayMessage('{--TRANSFER_NO_CODE--}', true);
+				$content['captcha_code'] = displayMessage('{--MEMBER_TRANSFER_NO_CODE--}', TRUE);
 			}
 
 			// Init points/reason
@@ -271,7 +271,7 @@ switch ($mode) {
 			} // END - if
 
 			// Output form
-			loadTemplate('member_transfer_new', false, $content);
+			loadTemplate('member_transfer_new', FALSE, $content);
 		} // END - if
 		break;
 
@@ -281,17 +281,17 @@ switch ($mode) {
 		$nothingMessage = '';
 		switch ($mode) {
 			case 'list_in':
-				$sql = 'SELECT `trans_id`,`from_userid` AS party_userid,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
-				$nothingMessage     = '{--TRANSFER_NO_INCOMING_TRANSFERS--}';
-				$content['balance'] = '{--TRANSFER_TOTAL_INCOMING--}';
-				$content['title']   = '{--TRANSFER_LIST_INCOMING--}';
+				$sql = 'SELECT `trans_id`, `from_userid` AS party_userid,`points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
+				$nothingMessage     = '{--MEMBER_TRANSFER_NO_INCOMING_TRANSFERS--}';
+				$content['balance'] = '{--MEMBER_TRANSFER_TOTAL_INCOMING--}';
+				$content['title']   = '{--MEMBER_LIST_INCOMING_TRANSFER_TITLE--}';
 				break;
 
 			case 'list_out':
-				$sql = 'SELECT `trans_id`,`to_userid` AS party_userid,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
-				$nothingMessage     = '{--TRANSFER_NO_OUTGOING_TRANSFERS--}';
+				$sql = 'SELECT `trans_id`, `to_userid` AS party_userid,`points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}';
+				$nothingMessage     = '{--MEMBER_TRANSFER_NO_OUTGOING_TRANSFERS--}';
 				$content['balance'] = '{--TRANSFER_TOTAL_OUTGOING--}';
-				$content['title']   = '{--TRANSFER_LIST_OUTGOING--}';
+				$content['title']   = '{--MEMBER_LIST_OUTGOING_TRANSFER_TITLE--}';
 				break;
 		} // END - switch
 
@@ -299,7 +299,7 @@ switch ($mode) {
 		$totalPoints = '0';
 		$result = SQL_QUERY_ESC($sql, array(getMemberId()), __FILE__, __LINE__);
 
-		// Do we have entries?
+		// Are there entries?
 		if (!SQL_HASZERONUMS($result)) {
 			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
@@ -312,7 +312,7 @@ switch ($mode) {
 				$$content['time_trans'] = generateDateTime($content['time_trans'], 3);
 
 				// Load row template
-				$OUT .= loadTemplate('member_transfer_row2', true, $content);
+				$OUT .= loadTemplate('member_transfer_row2', TRUE, $content);
 
 				// Add points and switch color
 				$totalPoints += $content['points'];
@@ -324,7 +324,7 @@ switch ($mode) {
 			// Nothing for in or out
 			$OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
-    ' . displayMessage($nothingMessage, true) . '
+    ' . displayMessage($nothingMessage, TRUE) . '
   </td>
 </tr>';
 		}
@@ -336,7 +336,7 @@ switch ($mode) {
 		$content['total_points'] = $totalPoints;
 
 		// Load final template
-		loadTemplate('member_transfer_list', false, $content);
+		loadTemplate('member_transfer_list', FALSE, $content);
 		break;
 
 	case 'list_all': // List all transactions
@@ -358,31 +358,31 @@ INDEX (`party_userid`)
 ) ENGINE = HEAP COMMENT = 'Temporary transfer table'", array(getMemberId()), __FILE__, __LINE__);
 
 		// Let's begin with the incoming list
-		$result = SQL_QUERY_ESC("SELECT `trans_id`,`from_userid`,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT {?transfer_max?}",
+		$result = SQL_QUERY_ESC("SELECT `trans_id`, `from_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT {?transfer_max?}",
 			array(getMemberId()), __FILE__, __LINE__);
 		while ($content = SQL_FETCHROW($result)) {
-			$content[] = 'IN';
+			array_push($content, 'IN');
 			$content = implode("','", $content);
-			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
+			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// As the last table transfer data from outgoing table to temporary
-		$result = SQL_QUERY_ESC("SELECT `trans_id`,`to_userid`,`points`,`reason`,`time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",
+		$result = SQL_QUERY_ESC("SELECT `trans_id`, `to_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",
 			array(getMemberId()), __FILE__, __LINE__);
 		while ($content = SQL_FETCHROW($result)) {
-			$content[] = 'OUT';
+			array_push($content, 'OUT');
 			$content = implode("','", $content);
-			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`,`party_userid`,`points`,`reason`,`time_trans`,`trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
+			$res_temp = SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_%s_transfers_tmp` (`trans_id`, `party_userid`, `points`, `reason`, `time_trans`, `trans_type`) VALUES ('" . $content . "')", array(getMemberId()), __FILE__, __LINE__);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Search for entries
-		$result = SQL_QUERY_ESC("SELECT `party_userid`,`trans_id`,`points`,`reason`,`time_trans`,`trans_type` FROM `{?_MYSQL_PREFIX?}_%s_transfers_tmp` ORDER BY `time_trans` DESC",
+		$result = SQL_QUERY_ESC("SELECT `party_userid`, `trans_id`, `points`, `reason`, `time_trans`, `trans_type` FROM `{?_MYSQL_PREFIX?}_%s_transfers_tmp` ORDER BY `time_trans` DESC",
 			array(getMemberId()), __FILE__, __LINE__);
 
 		$total = '0';
@@ -399,7 +399,7 @@ INDEX (`party_userid`)
 				$content['time']   = generateDateTime($content['time_trans'], 3);
 
 				// Load row template
-				$OUT .= loadTemplate('member_transfer_row', true, $content);
+				$OUT .= loadTemplate('member_transfer_row', TRUE, $content);
 
 				// Add points and switch color
 				$total += $content['points'];
@@ -408,7 +408,7 @@ INDEX (`party_userid`)
 			// Nothing for in and out
 			$OUT = '<tr>
   <td colspan="5" align="center" class="bottom">
-    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', true) . '
+    ' . displayMessage('{--TRANSFER_NO_INOUT_TRANSFERS--}', TRUE) . '
   </td>
 </tr>';
 		}
@@ -417,7 +417,7 @@ INDEX (`party_userid`)
 		SQL_FREERESULT($result);
 
 		// ... and add them to a constant for the template
-		$content['rows'] =  $OUT;
+		$content['rows'] = $OUT;
 
 		// Remeber total amount
 		$content['total_points'] = $total;
@@ -432,7 +432,7 @@ INDEX (`party_userid`)
 		$result = SQL_QUERY_ESC("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_%s_transfers_tmp`", array(getMemberId()), __FILE__, __LINE__);
 
 		// Load final template
-		loadTemplate('member_transfer_list', false, $content);
+		loadTemplate('member_transfer_list', FALSE, $content);
 
 		// Free some memory...
 		SQL_FREERESULT($result);
@@ -440,18 +440,18 @@ INDEX (`party_userid`)
 
 	default: // Overview page
 		// Check incoming transfers
-		$totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);
+		$totalIn = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', TRUE);
 		$content['in_link'] = $totalIn;
 		if ($totalIn > 0) {
-			$content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_in%}">' . $totalIn . '</a>';
+			$content['in_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_in%}">' . $totalIn . '</a>';
 		} // END - if
 
 		// Check outgoing transfers
-		$totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);
+		$totalOut = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', TRUE);
 
 		$content['out_link'] = $totalOut;
 		if ($totalOut > 0) {
-			$content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_out%}">' . $totalOut . '</a>';
+			$content['out_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_out%}">' . $totalOut . '</a>';
 		} // END - if
 
 		// Add all to total amount
@@ -460,7 +460,7 @@ INDEX (`party_userid`)
 		// Total transactions
 		$content['all_link'] = $total;
 		if ($total > 0) {
-			$content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
+			$content['all_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=list_all%}">{%pipe,translateComma=' . $total . '%}</a>';
 		} // END - if
 
 		if (isFormSent()) {
@@ -483,11 +483,11 @@ INDEX (`party_userid`)
 		// Set 'new transfer' link according to above option
 		switch (getUserData('opt_in')) {
 			case 'Y':
-				$content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;mode=new%}" title="{--TRANSFER_NOW_TITLE--}">{--TRANSFER_NOW_LINK--}</a>';
+				$content['new_link'] = '<a href="{%url=modules.php?module=login&amp;what=transfer&amp;do=new%}" title="{--MEMBER_TRANSFER_NOW_LINK_TITLE--}">{--MEMBER_TRANSFER_NOW_LINK--}</a>';
 				break;
 
 			case 'N':
-				$content['new_link'] = '{--TRANSFER_PLEASE_ALLOW_OPT_IN--}';
+				$content['new_link'] = '{--MEMBER_PLEASE_ALLOW_TRANSFER_RECEIVE--}';
 				break;
 		} // END - switch
 
@@ -506,21 +506,21 @@ LIMIT 1",
 				getMemberId()
 			), __FILE__, __LINE__);
 
-		// Do we have an entry?
+		// Is there an entry?
 		if (SQL_NUMROWS($result) == 1) {
 			// Load newest transaction
 			list($newest) = SQL_FETCHROW($result);
-			$content['settings'] = '{%message,TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
+			$content['settings'] = '{%message,MEMBER_TRANSFER_LATEST_IS=' . generateDateTime($newest, '3') . '%}';
 		} else {
 			// Load template
-			$content['settings'] = loadTemplate('member_transfer_settings', true, $content);
+			$content['settings'] = loadTemplate('member_transfer_settings', TRUE, $content);
 		}
 
 		// Free result
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('member_transfer_overview', false, $content);
+		loadTemplate('member_transfer_overview', FALSE, $content);
 		break;
 } // END - switch