smrealms / smr

engine/Default/help.inc

Braces +30 added lines, -22 removed lines

@@ -22,16 +22,18 @@ 
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id - 1));
 
 		// no result?
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE topic_id = '.$db2->escapeNumber($parent_topic_id));
+		}
 
 		echo ('<th width="32">');
 		if ($db2->nextRecord()) {
 			$previous_topic_id = $db2->getInt('topic_id');
 			$previous_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$previous_topic_id.'"><img src="/images/help/previous.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -43,8 +45,9 @@ 
 			$up_topic_id = $db2->getInt('topic_id');
 			$up_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$up_topic_id.'"><img src="/images/help/up.jpg" width="32" height="32" border="0"></a>');
-		} else
-			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		} else {
+					echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
+		}
 		echo ('</th>');
 
 		// **************************
@@ -52,8 +55,9 @@ 
 		// **************************
 		$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($topic_id).' AND order_id = 1');
 
-		if (!$db2->getNumRows())
-			$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		if (!$db2->getNumRows()) {
+					$db2->query('SELECT * FROM manual WHERE parent_topic_id = '.$db2->escapeNumber($parent_topic_id).' AND order_id = '.$db2->escapeNumber($order_id + 1));
+		}
 
 		$seenParentIDs = array(0);
 		$curr_parent_topic_id = $parent_topic_id;
@@ -72,8 +76,7 @@ 
 			$next_topic_id = $db2->getInt('topic_id');
 			$next_topic = stripslashes($db2->getField('topic'));
 			echo ('<a href="/manual.php?'.$next_topic_id.'"><img src="/images/help/next.jpg" width="32" height="32" border="0"></a>');
-		}
-		else {
+		} else {
 			echo ('<img src="/images/help/empty.jpg" width="32" height="32">');
 		}
 		echo ('</th>');
@@ -85,18 +88,22 @@ 
 
 		echo ('<tr>');
 		echo ('<td colspan="5">');
-		if (isset($previous_topic_id) && $previous_topic_id > 0)
-			echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($up_topic_id) && $up_topic_id > 0)
-			echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
-		if (isset($next_topic_id) && $next_topic_id > 0)
-			echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		if (isset($previous_topic_id) && $previous_topic_id > 0) {
+					echo ('<b>Previous:</b> <a href="/manual.php?'.$previous_topic_id.'">' . get_numbering($previous_topic_id) . $previous_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($up_topic_id) && $up_topic_id > 0) {
+					echo ('<b>Up:</b> <a href="/manual.php?'.$up_topic_id.'">' . get_numbering($up_topic_id) . $up_topic.'</a>&nbsp;&nbsp;&nbsp;');
+		}
+		if (isset($next_topic_id) && $next_topic_id > 0) {
+					echo ('<b>Next:</b> <a href="/manual.php?'.$next_topic_id.'">' . get_numbering($next_topic_id) . $next_topic.'</a>');
+		}
 		echo ('</tr>');
 
 		echo ('</table>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_content($topic_id) {
 	// database object
@@ -114,9 +121,10 @@ 
 		echo ('<h1>' . get_numbering($topic_id) . $topic.'</h1>');
 		echo ('<p>'.$text.'<p>');
 		echo ('</div>');
-	} else
-		echo ('Invalid Topic!');
-}
+	} else {
+			echo ('Invalid Topic!');
+	}
+	}
 
 function echo_subsection($topic_id) {
 	// database object

engine/Default/current_sector.php

Braces +19 added lines, -12 removed lines

@@ -35,9 +35,13 @@ 
 
 foreach ($links as $key => $linkArray) {
 	if ($linkArray['ID'] > 0 && $linkArray['ID'] != $player->getSectorID()) {
-		if ($player->getLastSectorID() == $linkArray['ID']) $class = 'lastVisited';
-		else if (isset($unvisited[$linkArray['ID']])) $class = 'unvisited';
-		else $class = 'visited';
+		if ($player->getLastSectorID() == $linkArray['ID']) {
+			$class = 'lastVisited';
+		} else if (isset($unvisited[$linkArray['ID']])) {
+			$class = 'unvisited';
+		} else {
+			$class = 'visited';
+		}
 		$links[$key]['Class'] = $class;
 	}
 }
@@ -80,18 +84,18 @@ 
 if ($player->getNewbieTurns()) {
 	if ($player->getNewbieTurns() < 25) {
 		$protectionMessage = '<span class="blue">PROTECTION</span>: You are almost out of <span class="green">NEWBIE</span> protection.';
+	} else {
+			$protectionMessage = '<span class="blue">PROTECTION</span>: You are under <span class="green">NEWBIE</span> protection.';
 	}
-	else
-		$protectionMessage = '<span class="blue">PROTECTION</span>: You are under <span class="green">NEWBIE</span> protection.';
-}
-elseif ($player->hasFederalProtection()) {
+	} elseif ($player->hasFederalProtection()) {
 	$protectionMessage = '<span class="blue">PROTECTION</span>: You are under <span class="blue">FEDERAL</span> protection.';
-}
-elseif ($sector->offersFederalProtection())
+} elseif ($sector->offersFederalProtection()) {
 	$protectionMessage = '<span class="blue">PROTECTION</span>: You are <span class="red">NOT</span> under protection.';
+}
 
-if (!empty($protectionMessage))
+if (!empty($protectionMessage)) {
 	$template->assign('ProtectionMessage', $protectionMessage);
+}
 
 //enableProtectionDependantRefresh($template,$player);
 
@@ -115,7 +119,9 @@ 
 }
 
 //error msgs take precedence
-if (isset($var['errorMsg'])) $template->assign('ErrorMessage', $var['errorMsg']);
+if (isset($var['errorMsg'])) {
+	$template->assign('ErrorMessage', $var['errorMsg']);
+}
 
 // *******************************************
 // *
@@ -150,8 +156,9 @@ 
 				$remainingTime = $db->getInt('refresh_at') - TIME;
 				$forceRefreshMessage = '<span class="green">REFRESH</span>: All forces will be refreshed in ' . $remainingTime . ' seconds.';
 				$db->query('REPLACE INTO sector_message (game_id, account_id, message) VALUES (' . $db->escapeNumber($player->getGameID()) . ', ' . $db->escapeNumber($player->getAccountID()) . ', \'[Force Check]\')');
+			} else {
+				$forceRefreshMessage = '<span class="green">REFRESH</span>: All forces have finished refreshing.';
 			}
-			else $forceRefreshMessage = '<span class="green">REFRESH</span>: All forces have finished refreshing.';
 			$template->assign('ForceRefreshMessage', $forceRefreshMessage);
 		}
 	}

admin/Default/album_moderate_processing.php

Braces +12 added lines, -12 removed lines

@@ -10,10 +10,11 @@ 
 
 	$db->lockTable('album_has_comments');
 	$db->query('SELECT MAX(comment_id) FROM album_has_comments WHERE album_id = ' . $db->escapeNumber($account_id));
-	if ($db->nextRecord())
-		$comment_id = $db->getInt('MAX(comment_id)') + 1;
-	else
-		$comment_id = 1;
+	if ($db->nextRecord()) {
+			$comment_id = $db->getInt('MAX(comment_id)') + 1;
+	} else {
+			$comment_id = 1;
+	}
 
 	$db->query('INSERT INTO album_has_comments
 				(album_id, comment_id, time, post_id, msg)
@@ -31,17 +32,17 @@ 
 		$mail->send();
 	}
 
-} else if ($var['task'] == 'reset_location')
+} else if ($var['task'] == 'reset_location') {
 	$db->query('UPDATE album SET location = \'\' WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_email')
+} else if ($var['task'] == 'reset_email') {
 	$db->query('UPDATE album SET email = \'\' WHERE account_id =' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_website')
+} else if ($var['task'] == 'reset_website') {
 	$db->query('UPDATE album SET website = \'\' WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_birthdate')
+} else if ($var['task'] == 'reset_birthdate') {
 	$db->query('UPDATE album SET day = 0, month = 0, year = 0 WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'reset_other')
+} else if ($var['task'] == 'reset_other') {
 	$db->query('UPDATE album SET other = \'\' WHERE account_id = ' . $db->escapeNumber($account_id));
-else if ($var['task'] == 'delete_comment') {
+} else if ($var['task'] == 'delete_comment') {
 	$comment_ids = $_REQUEST['comment_ids'];
 	// we just ignore if nothing was set
 	if (count($comment_ids) > 0) {
@@ -50,8 +51,7 @@ 
 					WHERE album_id = '.$db->escapeNumber($account_id) . ' AND
 						  comment_id IN ('.$db->escapeArray($comment_ids) . ')');
 	}
-}
-else {
+} else {
 	create_error('No action chosen!');
 }
 

admin/Default/game_delete_processing.php

Braces +37 added lines, -17 removed lines

@@ -11,8 +11,7 @@ 
 $action = $_REQUEST['action'];
 if ($_REQUEST['save'] == 'Yes') {
 	$save = true;
-}
-else {
+} else {
 	$save = false;
 }
 
@@ -42,8 +41,7 @@ 
 				$mines = $db2->getInt('sum_m');
 				$cds = $db2->getInt('cds');
 				$sds = $db2->getInt('sds');
-			}
-			else {
+			} else {
 				$mines = 0;
 				$cds = 0;
 				$sds = 0;
@@ -143,16 +141,25 @@ 
 			$owner = $db->getInt('owner_id');
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 1');
-			if ($db2->nextRecord()) $gens = $db2->getInt('amount');
-			else $gens = 0;
+			if ($db2->nextRecord()) {
+				$gens = $db2->getInt('amount');
+			} else {
+				$gens = 0;
+			}
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 2');
-			if ($db2->nextRecord()) $hangs = $db2->getInt('amount');
-			else $hangs = 0;
+			if ($db2->nextRecord()) {
+				$hangs = $db2->getInt('amount');
+			} else {
+				$hangs = 0;
+			}
 
 			$db2->query('SELECT * FROM planet_has_building WHERE game_id = '.$game_id.' AND sector_id = '.$sector.' AND construction_id = 3');
-			if ($db2->nextRecord()) $turs = $db2->getInt('amount');
-			else $turs = 0;
+			if ($db2->nextRecord()) {
+				$turs = $db2->getInt('amount');
+			} else {
+				$turs = 0;
+			}
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO planet (game_id, sector_id, owner_id, generators, hangers, turrets) VALUES ' .
@@ -189,14 +196,21 @@ 
 			$smrCredits = 0;
 			$db2->query('SELECT sum(amount) as bounty_am, sum(smr_credits) as bounty_cred FROM bounty WHERE game_id = '.$game_id.' AND account_id = '.$acc_id.' AND claimer_id = 0');
 			if ($db2->nextRecord()) {
-				if (is_int($db2->getField('bounty_am'))) $amount = $db2->getInt('bounty_am');
-				if (is_int($db2->getField('bounty_cred'))) $smrCredits = $db2->getInt('bounty_cred');
+				if (is_int($db2->getField('bounty_am'))) {
+					$amount = $db2->getInt('bounty_am');
+				}
+				if (is_int($db2->getField('bounty_cred'))) {
+					$smrCredits = $db2->getInt('bounty_cred');
+				}
 
 			}
 
 			$db2->query('SELECT * FROM ship_has_name WHERE game_id = '.$game_id.' AND account_id = '.$acc_id);
-			if ($db2->nextRecord()) $ship_name = $db2->getField('ship_name');
-			else $ship_name = 'None';
+			if ($db2->nextRecord()) {
+				$ship_name = $db2->getField('ship_name');
+			} else {
+				$ship_name = 'None';
+			}
 
 			// insert into history db
 			$history_db_sql[] = 'INSERT INTO player (account_id, game_id, player_name, player_id, experience, ship, race, alignment, alliance_id, kills, deaths, bounty, bounty_cred, ship_name) ' .
@@ -244,9 +258,15 @@ 
 				$mines = $db2->getInt('sum_mines');
 				$cds = $db2->getInt('cds');
 				$sds = $db2->getInt('sds');
-				if (!is_numeric($mines)) $mines = 0;
-				if (!is_numeric($cds)) $cds = 0;
-				if (!is_numeric($sds)) $sds = 0;
+				if (!is_numeric($mines)) {
+					$mines = 0;
+				}
+				if (!is_numeric($cds)) {
+					$cds = 0;
+				}
+				if (!is_numeric($sds)) {
+					$sds = 0;
+				}
 
 			} else {
 

htdocs/album/index.php

Braces +21 added lines, -20 removed lines

@@ -56,36 +56,37 @@
 						  approved = \'YES\'
 					ORDER BY hof_name');
 			
-			if ($db2->nextRecord())
-				album_entry($db2->getInt('album_id'));
-			else {
+			if ($db2->nextRecord()) {
+							album_entry($db2->getInt('album_id'));
+			} else {
 				// get all id's and build array
 				$album_ids = array();
 		
-				while ($db->nextRecord())
-					$album_ids[] = $db->getInt('album_id');
+				while ($db->nextRecord()) {
+									$album_ids[] = $db->getInt('album_id');
+				}
 		
 				// double check if we have id's
-				if (count($album_ids) > 0)
-					search_result($album_ids);
-				else
-					main_page();
+				if (count($album_ids) > 0) {
+									search_result($album_ids);
+				} else {
+									main_page();
+				}
 			}
 	
+		} elseif ($db->getNumRows() == 1) {
+			if ($db->nextRecord()) {
+							album_entry($db->getInt('album_id'));
+			} else {
+							main_page();
+			}
+		} else {
+					main_page();
 		}
-		elseif ($db->getNumRows() == 1) {
-			if ($db->nextRecord())
-				album_entry($db->getInt('album_id'));
-			else
-				main_page();
-		}
-		else
+	} else {
 			main_page();
 	}
-	else
-		main_page();
-}
-catch (Throwable $e) {
+	} catch (Throwable $e) {
 	handleException($e);
 }
 ?>

htdocs/album/album_comment.php

Braces +25 added lines, -20 removed lines

@@ -14,22 +14,26 @@ 
 		create_error_offline('You need to logged in to post comments!');
 	}
 
-	if (!isset($_GET['album_id']) || empty($_GET['album_id']))
-		create_error_offline('Which picture do you want comment?');
-	else
-		$album_id = $_GET['album_id'];
+	if (!isset($_GET['album_id']) || empty($_GET['album_id'])) {
+			create_error_offline('Which picture do you want comment?');
+	} else {
+			$album_id = $_GET['album_id'];
+	}
 
-	if (!is_numeric($album_id))
-		create_error_offline('Picture ID has to be numeric!');
+	if (!is_numeric($album_id)) {
+			create_error_offline('Picture ID has to be numeric!');
+	}
 
-	if ($album_id < 1)
-		create_error_offline('Picture ID has to be positive!');
+	if ($album_id < 1) {
+			create_error_offline('Picture ID has to be positive!');
+	}
 
 	$account = SmrSession::getAccount();
 
 	if (isset($_GET['action']) && $_GET['action'] == 'Moderate') {
-		if (!$account->hasPermission(PERMISSION_MODERATE_PHOTO_ALBUM))
-			create_error_offline('You do not have permission to do that!');
+		if (!$account->hasPermission(PERMISSION_MODERATE_PHOTO_ALBUM)) {
+					create_error_offline('You do not have permission to do that!');
+		}
 		$container = create_container('skeleton.php', 'album_moderate.php');
 		$container['account_id'] = $album_id;
 
@@ -38,10 +42,11 @@ 
 
 	$db = new SmrMySqlDatabase();
 
-	if (!isset($_GET['comment']) || empty($_GET['comment']))
-		create_error_offline('Please enter a comment.');
-	else
-		$comment = $_GET['comment'];
+	if (!isset($_GET['comment']) || empty($_GET['comment'])) {
+			create_error_offline('Please enter a comment.');
+	} else {
+			$comment = $_GET['comment'];
+	}
 
 	// get current time
 	$curr_time = TIME;
@@ -53,10 +58,11 @@ 
 	$db->lockTable('album_has_comments');
 
 	$db->query('SELECT MAX(comment_id) FROM album_has_comments WHERE album_id = ' . $db->escapeNumber($album_id));
-	if ($db->nextRecord())
-		$comment_id = $db->getInt('MAX(comment_id)') + 1;
-	else
-		$comment_id = 1;
+	if ($db->nextRecord()) {
+			$comment_id = $db->getInt('MAX(comment_id)') + 1;
+	} else {
+			$comment_id = 1;
+	}
 
 	$db->query('INSERT INTO album_has_comments
 				(album_id, comment_id, time, post_id, msg)
@@ -65,7 +71,6 @@ 
 
 	header('Location: /album/?' . get_album_nick($album_id));
 	exit;
-}
-catch (Throwable $e) {
+} catch (Throwable $e) {
 	handleException($e);
 }

lib/Album/album_functions.php

Braces +39 added lines, -30 removed lines

@@ -53,9 +53,9 @@ 
 
 			echo('<span style="font-size:85%;"><b>[' . date(defined('DATE_FULL_SHORT') ?DATE_FULL_SHORT:DEFAULT_DATE_FULL_SHORT, $created) . ']</b> Picture of <a href="?nick=' . urlencode($nick) . '">' . $nick . '</a> added</span><br />');
 		}
+	} else {
+			echo('<span style="font-size:85%;">no entries</span>');
 	}
-	else
-		echo('<span style="font-size:85%;">no entries</span>');
 	echo('</p>');
 }
 
@@ -87,8 +87,7 @@ 
 		$other = nl2br(stripslashes($db->getField('other')));
 		$page_views = $db->getInt('page_views');
 		$disabled = $db->getBoolean('disabled');
-	}
-	else {
+	} else {
 		echo('<h1>Error</h1>');
 		echo('This user doesn\'t have an entry in our album!');
 		return;
@@ -139,46 +138,54 @@ 
 	echo('<tr>');
 	echo('<td colspan="2" class="center" valign="middle">');
 
-	if ($disabled == false)
-		echo('<img src="../upload/' . $album_id . '">');
-	else
-		echo('<img src="../images/album/disabled.jpg">');
+	if ($disabled == false) {
+			echo('<img src="../upload/' . $album_id . '">');
+	} else {
+			echo('<img src="../images/album/disabled.jpg">');
+	}
 
 	echo('</td>');
 	echo('</tr>');
 
-	if (empty($location))
-		$location = 'N/A';
+	if (empty($location)) {
+			$location = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" width="10%">Location:</td><td>' . $location . '</td>');
 	echo('</tr>');
 
-	if (empty($email))
-		$email = 'N/A';
+	if (empty($email)) {
+			$email = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" width="10%">E-mail:</td><td>' . $email . '</td>');
 	echo('</tr>');
 
-	if (empty($website))
-		$website = 'N/A';
-	else
-		$website = '<a href="' . $website . '" target="_new">' . $website . '</a>';
+	if (empty($website)) {
+			$website = 'N/A';
+	} else {
+			$website = '<a href="' . $website . '" target="_new">' . $website . '</a>';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" width="10%">Website:</td><td>' . $website . '</td>');
 	echo('</tr>');
 
 	echo('<tr>');
-	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month . ' / ' . $day . ' / ' . $year;
-	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year ' . $year;
-	if (empty($birthdate))
-		$birthdate = 'N/A';
+	if (!empty($day) && !empty($month) && !empty($year)) {
+			$birthdate = $month . ' / ' . $day . ' / ' . $year;
+	}
+	if (empty($birthdate) && !empty($year)) {
+			$birthdate = 'Year ' . $year;
+	}
+	if (empty($birthdate)) {
+			$birthdate = 'N/A';
+	}
 	echo('<td class="right bold" width="10%">Birthdate:</td><td>' . $birthdate . '</td>');
 	echo('</tr>');
 
-	if (empty($other))
-		$other = 'N/A';
+	if (empty($other)) {
+			$other = 'N/A';
+	}
 	echo('<tr>');
 	echo('<td class="right bold" valign="top" width="10%">Other&nbsp;Info:</td><td>' . $other . '</td>');
 	echo('</tr>');
@@ -210,15 +217,16 @@ 
 					FROM account_has_permission
 					WHERE account_id = '.$db->escapeNumber(SmrSession::getAccountID()) . ' AND
 						permission_id = '.$db->escapeNumber(PERMISSION_MODERATE_PHOTO_ALBUM));
-		if ($db->nextRecord())
-			echo('<td style="color:green; font-size:70%;"><br /><input type="submit" name="action" value="Moderate" class="InputFields"></td>');
+		if ($db->nextRecord()) {
+					echo('<td style="color:green; font-size:70%;"><br /><input type="submit" name="action" value="Moderate" class="InputFields"></td>');
+		}
 
 		echo('</tr>');
 		echo('</table>');
 		echo('</form>');
+	} else {
+			echo('<p>Please <a href="/login.php?return_page=/album/?nick=' . urlencode($nick) . '"><u>login</u></a> if you want comment on this picture!</p>');
 	}
-	else
-		echo('<p>Please <a href="/login.php?return_page=/album/?nick=' . urlencode($nick) . '"><u>login</u></a> if you want comment on this picture!</p>');
 
 	echo('</td>');
 	echo('</tr>');
@@ -288,8 +296,9 @@ 
 
 
 function get_album_nick($album_id) {
-	if ($album_id == 0)
-		return 'System';
+	if ($album_id == 0) {
+			return 'System';
+	}
 
 	return SmrAccount::getAccount($album_id)->getHofName();
 }

lib/Default/council.inc

Braces +14 added lines, -12 removed lines

@@ -17,17 +17,19 @@ 
 		$race_id_2 = $db->getInt('race_id_2');
 		$action = $db->getField('action');
 
-		if ($action == 'INC')
-			$relation_modifier = RELATIONS_VOTE_CHANGE;
-		else
-			$relation_modifier = -RELATIONS_VOTE_CHANGE;
+		if ($action == 'INC') {
+					$relation_modifier = RELATIONS_VOTE_CHANGE;
+		} else {
+					$relation_modifier = -RELATIONS_VOTE_CHANGE;
+		}
 
 		$db2->query('SELECT * FROM race_has_relation ' .
 					'WHERE race_id_1 = ' . $db2->escapeNumber($race_id_1) . '
 						AND race_id_2 = ' . $db2->escapeNumber($race_id_2) . '
 						AND game_id = ' . $db2->escapeNumber($player->getGameID()));
-		if ($db2->nextRecord())
-			$relation = $db2->getInt('relation') + $relation_modifier;
+		if ($db2->nextRecord()) {
+					$relation = $db2->getInt('relation') + $relation_modifier;
+		}
 
 		if ($relation < MIN_GLOBAL_RELATIONS) {
 			$relation = MIN_GLOBAL_RELATIONS;
@@ -108,10 +110,11 @@ 
 					$expireTime = TIME + TIME_FOR_WAR_VOTE_FED_SAFETY;
 					$query = 'REPLACE INTO player_can_fed (account_id, game_id, race_id, expiry, allowed) VALUES ';
 					foreach ($currentlyParkedAccountIDs as $raceID => $accountIDs) {
-						if ($raceID == $race_id_1)
-							$message = 'We have declared war upon your race';
-						else
-							$message = 'Your race has declared war upon us';
+						if ($raceID == $race_id_1) {
+													$message = 'We have declared war upon your race';
+						} else {
+													$message = 'Your race has declared war upon us';
+						}
 						$message .= ', you have ' . format_time(TIME_FOR_WAR_VOTE_FED_SAFETY) . ' to vacate our federal space, after that time you will no longer be protected (unless you have strong personal relations).';
 						foreach ($accountIDs as $accountID) {
 							$query .= '(' . $db2->escapeNumber($accountID) . ',' . $db2->escapeNumber($player->getGameID()) . ',' . $db2->escapeNumber($raceID) . ',' . $db2->escapeNumber($expireTime) . ',' . $db2->escapeBoolean(true) . '),';
@@ -136,8 +139,7 @@ 
 				$news = 'The [race=' . $race_id_1 . '] have declared <span class="red">WAR</span> on the [race=' . $race_id_2 . ']';
 				$db2->query('INSERT INTO news (game_id, time, news_message) VALUES ' .
 							'(' . $db2->escapeNumber($player->getGameID()) . ', ' . $db2->escapeNumber(TIME) . ', ' . $db2->escapeString($news) . ')');
-			}
-			elseif ($type == 'PEACE') {
+			} elseif ($type == 'PEACE') {
 				// get 'yes' votes
 				$db2->query('SELECT * FROM player_votes_pact
 							WHERE game_id = '.$db2->escapeNumber($player->getGameID()) . '

templates/Default/engine/Default/includes/PlanetCombatResults.inc

Braces +12 added lines, -24 removed lines

@@ -5,8 +5,7 @@ 
 	echo $CombatPlanet->getDisplayName();
 	if($TotalDamage > 0) {
 		?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat of which <span class="red"><?php echo $PlanetCombatResults['TotalDamagePerTargetPlayer'][$ThisPlayer->getAccountID()]; ?></span> was done to you<?php
-	}
-	else {
+	} else {
 		?> does no damage this round<?php
 	} ?>. <?php echo $AttackLogLink;
 	return;
@@ -23,24 +22,19 @@ 
 		if (!$ShotHit || !$ActualDamage['TargetAlreadyDead']) {
 			if(!$ShotHit) {
 				?> and misses<?php
-			}
-			else if($ActualDamage['TotalDamage'] == 0) {
+			} else if($ActualDamage['TotalDamage'] == 0) {
 				if($WeaponDamage['Shield'] > 0) {
 					if($ActualDamage['HasCDs']) {
 						?> which proves ineffective against their combat drones<?php
-					}
-					else {
+					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				}
-				else if($WeaponDamage['Armour'] > 0) {
+				} else if($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
-				}
-				else {
+				} else {
 					?> but it cannot do any damage<?php
 				}
-			}
-			else {
+			} else {
 				?> destroying <?php
 				$DamageTypes = 0;
 				if($ActualDamage['Shield'] > 0){ $DamageTypes = $DamageTypes+1; }
@@ -79,27 +73,22 @@ 
 	echo $CombatPlanet->getDisplayName();
 	if($WeaponDamage['Launched'] == 0) {
 		?> fails to launch it's combat drones<?php
-	}
-	else {
+	} else {
 		?> launches <span class="cds"><?php echo $WeaponDamage['Launched'] ?></span> combat drones at <?php if($ActualDamage['TargetAlreadyDead']){ ?>the debris that was once <?php } echo $TargetPlayer->getDisplayName();
 		if(!$ActualDamage['TargetAlreadyDead']) {
 			if($ActualDamage['TotalDamage'] == 0) {
 				if($WeaponDamage['Shield'] > 0) {
 					if($ActualDamage['HasCDs']) {
 						?> which prove ineffective against their combat drones<?php
-					}
-					else {
+					} else {
 						?> which washes harmlessly over their hull<?php
 					}
-				}
-				else if($WeaponDamage['Armour'] > 0) {
+				} else if($WeaponDamage['Armour'] > 0) {
 					?> which is deflected by their shields<?php
-				}
-				else {
+				} else {
 					?> but they cannot do any damage<?php
 				}
-			}
-			else {
+			} else {
 				?> destroying <?php
 				if($ActualDamage['Shield'] > 0) {
 					?><span class="shields"><?php echo number_format($ActualDamage['Shield']); ?></span> shields<?php
@@ -124,7 +113,6 @@ 
 echo $CombatPlanet->getDisplayName();
 if($TotalDamage > 0) {
 	?> hit for a total of <span class="red"><?php echo $TotalDamage; ?></span> damage in this round of combat<?php
-}
-else {
+} else {
 	?> does no damage this round. You call that a planet? It needs a better builder<?php
 } ?>.