smrealms / smr

lib/db_mysql_debug.inc

Spacing +21 added lines, -21 removed lines

@@ -2,12 +2,12 @@ 
 
   function table_names() {
     $this->query('SHOW TABLES');
-    $i=0;
-    while ($info=mysql_fetch_row($this->Query_ID))
+    $i = 0;
+    while ($info = mysql_fetch_row($this->Query_ID))
      {
-      $return[$i]['table_name']= $info[0];
-      $return[$i]['tablespace_name']=$this->Database;
-      $return[$i]['database']=$this->Database;
+      $return[$i]['table_name'] = $info[0];
+      $return[$i]['tablespace_name'] = $this->Database;
+      $return[$i]['database'] = $this->Database;
       $i++;
      }
    return $return;
@@ -19,7 +19,7 @@ 
 
     if ($this->lockTable($this->Seq_Table)) {
       /* get sequence number (locked) and increment */
-      $q  = sprintf('select nextid from %s where seq_name = \'%s\'',
+      $q = sprintf('select nextid from %s where seq_name = \'%s\'',
                 $this->Seq_Table,
                 $seq_name);
       $id  = @mysql_query($q, $this->Link_ID);
@@ -44,14 +44,14 @@ 
       $id = @mysql_query($q, $this->Link_ID);
       $this->unlock();
     } else {
-      $this->halt('cannot lock '.$this->Seq_Table.' - has it been created?');
+      $this->halt('cannot lock ' . $this->Seq_Table . ' - has it been created?');
       return 0;
     }
     return $nextid;
   }
 
   /* public: return table metadata */
-  function metadata($table='',$full=false) {
+  function metadata($table = '', $full = false) {
     $count = 0;
     $id    = 0;
     $res   = array();
@@ -99,22 +99,22 @@ 
 
     // made this IF due to performance (one if is faster than $count if's)
     if (!$full) {
-      for ($i=0; $i<$count; $i++) {
-        $res[$i]['table'] = @mysql_field_table ($id, $i);
-        $res[$i]['name']  = @mysql_field_name  ($id, $i);
-        $res[$i]['type']  = @mysql_field_type  ($id, $i);
-        $res[$i]['len']   = @mysql_field_len   ($id, $i);
-        $res[$i]['flags'] = @mysql_field_flags ($id, $i);
+      for ($i = 0; $i < $count; $i++) {
+        $res[$i]['table'] = @mysql_field_table($id, $i);
+        $res[$i]['name']  = @mysql_field_name($id, $i);
+        $res[$i]['type']  = @mysql_field_type($id, $i);
+        $res[$i]['len']   = @mysql_field_len($id, $i);
+        $res[$i]['flags'] = @mysql_field_flags($id, $i);
       }
     } else { // full
-      $res['num_fields']= $count;
+      $res['num_fields'] = $count;
 
-      for ($i=0; $i<$count; $i++) {
-        $res[$i]['table'] = @mysql_field_table ($id, $i);
-        $res[$i]['name']  = @mysql_field_name  ($id, $i);
-        $res[$i]['type']  = @mysql_field_type  ($id, $i);
-        $res[$i]['len']   = @mysql_field_len   ($id, $i);
-        $res[$i]['flags'] = @mysql_field_flags ($id, $i);
+      for ($i = 0; $i < $count; $i++) {
+        $res[$i]['table'] = @mysql_field_table($id, $i);
+        $res[$i]['name']  = @mysql_field_name($id, $i);
+        $res[$i]['type']  = @mysql_field_type($id, $i);
+        $res[$i]['len']   = @mysql_field_len($id, $i);
+        $res[$i]['flags'] = @mysql_field_flags($id, $i);
         $res['meta'][$res[$i]['name']] = $i;
       }
     }

lib/Album/album_functions.php

Spacing +23 added lines, -23 removed lines

@@ -35,7 +35,7 @@ 
 			$page_views = $db->getField('page_views');
 			$nick = get_album_nick($db->getField('account_id'));
 
-			echo('<a href="?' . urlencode($nick) . '">'.$nick.'</a> ('.$page_views.')<br />');
+			echo('<a href="?' . urlencode($nick) . '">' . $nick . '</a> (' . $page_views . ')<br />');
 		}
 	}
 
@@ -51,7 +51,7 @@ 
 			$created = $db->getField('created');
 			$nick = get_album_nick($db->getField('account_id'));
 
-			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="?' . urlencode($nick) . '">'.$nick.'</a> added</span><br />');
+			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="?' . urlencode($nick) . '">' . $nick . '</a> added</span><br />');
 		}
 	}
 	else
@@ -69,12 +69,12 @@ 
 	if (SmrSession::$account_id != 0 && $album_id != SmrSession::$account_id)
 		$db->query('UPDATE album
 				SET page_views = page_views + 1
-				WHERE account_id = '.$db->escapeNumber($album_id).' AND
+				WHERE account_id = '.$db->escapeNumber($album_id) . ' AND
 					approved = \'YES\'');
 
 	$db->query('SELECT *
 				FROM album
-				WHERE account_id = '.$db->escapeNumber($album_id).' AND
+				WHERE account_id = '.$db->escapeNumber($album_id) . ' AND
 					approved = \'YES\'');
 	if ($db->nextRecord()) {
 		$location = stripslashes($db->getField('location'));
@@ -112,10 +112,10 @@ 
 	echo '<td style="text-align: center; width: 30%" valign="middle">';
 	if ($db->nextRecord()) {
 		$priv_nick = $db->getField('hof_name');
-		echo '<a href="?' . urlencode($priv_nick) . '"><img src="/images/album/rew.jpg" alt="'.$priv_nick.'" border="0"></a>&nbsp;&nbsp;&nbsp;';
+		echo '<a href="?' . urlencode($priv_nick) . '"><img src="/images/album/rew.jpg" alt="' . $priv_nick . '" border="0"></a>&nbsp;&nbsp;&nbsp;';
 	}
 	echo '</td>';
-	echo('<td style="text-align: center;" valign="middle"><span style="font-size:150%;">'.$nick.'</span><br /><span style="font-size:75%;">Views: '.$page_views.'</span></td>');
+	echo('<td style="text-align: center;" valign="middle"><span style="font-size:150%;">' . $nick . '</span><br /><span style="font-size:75%;">Views: ' . $page_views . '</span></td>');
 
 	$db->query('SELECT hof_name
 				FROM album JOIN account USING(account_id)
@@ -126,7 +126,7 @@ 
 	echo '<td style="text-align: center; width: 30%" valign="middle">';
 	if ($db->nextRecord()) {
 		$next_nick = $db->getField('hof_name');
-		echo '&nbsp;&nbsp;&nbsp;<a href="?' . urlencode($next_nick) . '"><img src="/images/album/fwd.jpg" alt="'.$next_nick.'" border="0"></a>';
+		echo '&nbsp;&nbsp;&nbsp;<a href="?' . urlencode($next_nick) . '"><img src="/images/album/fwd.jpg" alt="' . $next_nick . '" border="0"></a>';
 	}
 	echo '</td>';
 
@@ -139,7 +139,7 @@ 
 	echo('<td colspan="2" align="center" valign="middle">');
 
 	if ($disabled == false)
-		echo('<img src="../upload/'.$album_id.'">');
+		echo('<img src="../upload/' . $album_id . '">');
 	else
 		echo('<img src="../images/album/disabled.jpg">');
 
@@ -149,37 +149,37 @@ 
 	if (empty($location))
 		$location = 'N/A';
 	echo('<tr>');
-	echo('<td align="right" width="10%" style="font-weight:bold;">Location:</td><td>'.$location.'</td>');
+	echo('<td align="right" width="10%" style="font-weight:bold;">Location:</td><td>' . $location . '</td>');
 	echo('</tr>');
 
 	if (empty($email))
 		$email = 'N/A';
 	echo('<tr>');
-	echo('<td align="right" width="10%" style="font-weight:bold;">eMail:</td><td>'.$email.'</td>');
+	echo('<td align="right" width="10%" style="font-weight:bold;">eMail:</td><td>' . $email . '</td>');
 	echo('</tr>');
 
 	if (empty($website))
 		$website = 'N/A';
 	else
-		$website = '<a href="'.$website.'" target="_new">'.$website.'</a>';
+		$website = '<a href="' . $website . '" target="_new">' . $website . '</a>';
 	echo('<tr>');
-	echo('<td align="right" width="10%" style="font-weight:bold;">Website:</td><td>'.$website.'</td>');
+	echo('<td align="right" width="10%" style="font-weight:bold;">Website:</td><td>' . $website . '</td>');
 	echo('</tr>');
 
 	echo('<tr>');
 	if (!empty($day) && !empty($month) && !empty($year))
-		$birthdate = $month.' / '.$day.' / '.$year;
+		$birthdate = $month . ' / ' . $day . ' / ' . $year;
 	if (empty($birthdate) && !empty($year))
-		$birthdate = 'Year '.$year;
+		$birthdate = 'Year ' . $year;
 	if (empty($birthdate))
 		$birthdate = 'N/A';
-	echo('<td align="right" width="10%" style="font-weight:bold;">Birthdate:</td><td>'.$birthdate.'</td>');
+	echo('<td align="right" width="10%" style="font-weight:bold;">Birthdate:</td><td>' . $birthdate . '</td>');
 	echo('</tr>');
 
 	if (empty($other))
 		$other = 'N/A';
 	echo('<tr>');
-	echo('<td align="right" valign="top" width="10%" style="font-weight:bold;">Other&nbsp;Info:<br /><small>(AIM/ICQ)&nbsp;&nbsp;</small></td><td>'.$other.'</td>');
+	echo('<td align="right" valign="top" width="10%" style="font-weight:bold;">Other&nbsp;Info:<br /><small>(AIM/ICQ)&nbsp;&nbsp;</small></td><td>' . $other . '</td>');
 	echo('</tr>');
 
 	echo('<tr>');
@@ -190,16 +190,16 @@ 
 				FROM album_has_comments
 				WHERE album_id = '.$db->escapeNumber($album_id));
 	while ($db->nextRecord()) {
-		$time	= $db->getField('time');
-		$postee	= get_album_nick($db->getField('post_id'));
-		$msg	= stripslashes($db->getField('msg'));
+		$time = $db->getField('time');
+		$postee = get_album_nick($db->getField('post_id'));
+		$msg = stripslashes($db->getField('msg'));
 
-		echo('<span style="font-size:85%;">[' . date(defined('DATE_FULL_SHORT')?DATE_FULL_SHORT:DEFAULT_DATE_FULL_SHORT, $time) . '] &lt;'.$postee.'&gt; '.$msg.'</span><br />');
+		echo('<span style="font-size:85%;">[' . date(defined('DATE_FULL_SHORT') ?DATE_FULL_SHORT:DEFAULT_DATE_FULL_SHORT, $time) . '] &lt;' . $postee . '&gt; ' . $msg . '</span><br />');
 	}
 
 	if (SmrSession::$account_id > 0) {
 		echo('<form action="album_comment.php">');
-		echo('<input type="hidden" name="album_id" value="'.$album_id.'">');
+		echo('<input type="hidden" name="album_id" value="' . $album_id . '">');
 		echo('<table>');
 		echo('<tr>');
 		echo('<td style="color:green; font-size:70%;">Nick:<br /><input type="text" size="10" name="nick" value="' . htmlspecialchars(get_album_nick(SmrSession::$account_id)) . '" id="InputFields" readonly></td>');
@@ -207,7 +207,7 @@ 
 		echo('<td style="color:green; font-size:70%;"><br /><input type="submit" value="Send" id="InputFields"></td>');
 		$db->query('SELECT *
 					FROM account_has_permission
-					WHERE account_id = '.$db->escapeNumber(SmrSession::$account_id).' AND
+					WHERE account_id = '.$db->escapeNumber(SmrSession::$account_id) . ' 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" id="InputFields"></td>');
@@ -242,7 +242,7 @@ 
 
 		$nick = get_album_nick($album_id);
 
-		echo('<a href="?' . urlencode($nick) . '" style="font-size:80%;">'.$nick.'</a><br />');
+		echo('<a href="?' . urlencode($nick) . '" style="font-size:80%;">' . $nick . '</a><br />');
 
 		if (floor(sizeof($album_ids) / 4) > 0 && $count % floor(sizeof($album_ids) / 4) == 0)
 			echo('</td><td width="25%" valign="top">');

lib/Hunter Wars/SmrLocation.class.inc

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 class SmrLocation extends AbstractSmrLocation {
 
 	public function &getShipsSold() {
-		if(!isset($this->shipsSold)) {
+		if (!isset($this->shipsSold)) {
 			$this->shipsSold = array();
 			$this->db->query('SELECT * FROM location_sells_ships
 			                  JOIN ship_type USING (ship_type_id)
 			                  WHERE ' . $this->SQL . '
 			                    AND ship_class_id != ' . $this->db->escapeNumber(SmrShip::SHIP_CLASS_RAIDER) . '
 			                    AND ship_type_id != ' . $this->db->escapeNumber(SHIP_TYPE_PLANETARY_SUPER_FREIGHTER));
-			while($this->db->nextRecord()) {
+			while ($this->db->nextRecord()) {
 				$shipTypeID = $this->db->getInt('ship_type_id');
 				$this->shipsSold[$shipTypeID] = AbstractSmrShip::getBaseShip(Globals::getGameType(SmrSession::getGameID()), $shipTypeID);
 			}

config/SmrMySqlSecrets.sample.inc

Spacing +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 trait SmrMySqlSecrets {
 	private static $databaseName = 'smr_live';
 	private static $host = 'smr-mysql'; // must match MYSQL_HOST in .env
-	private static $user = 'smr';       // must match MYSQL_USER in .env
-	private static $password = 'smr';   // must match MYSQL_PASSWORD in .env
+	private static $user = 'smr'; // must match MYSQL_USER in .env
+	private static $password = 'smr'; // must match MYSQL_PASSWORD in .env
 
 	// Set to null to use defaults
 	private static $port = null;

engine/Default/rankings_player_kills.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$template->assign('PageTopic','Kill Rankings');
+$template->assign('PageTopic', 'Kill Rankings');
 
 Menu::rankings(0, 2);
 

engine/Default/bounty_claim.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-$template->assign('PageTopic','Bounty Payout');
+$template->assign('PageTopic', 'Bounty Payout');
 
 require_once(get_file_loc('menu_hq.inc'));
 if ($sector->hasHQ()) {
@@ -12,11 +12,11 @@ 
 	$bounties = $player->getClaimableBounties('UG');
 }
 
-$claimText='';
+$claimText = '';
 
-if(!isset($var['ClaimText'])) {
+if (!isset($var['ClaimText'])) {
 	if (!empty($bounties)) {
-		$claimText.=('You have claimed the following bounties<br /><br />');
+		$claimText .= ('You have claimed the following bounties<br /><br />');
 	
 		foreach ($bounties as $bounty) {
 			// get bounty id from db
@@ -30,12 +30,12 @@ 
 			// add bounty to our cash
 			$player->increaseCredits($amount);
 			$account->increaseSmrCredits($smrCredits);
-			$claimText.=('<span class="yellow">'.$bounty['player']->getPlayerName().'</span> : <span class="creds">' . number_format($amount) . '</span> credits and <span class="red">' . number_format($smrCredits) . '</span> SMR credits<br />');
+			$claimText .= ('<span class="yellow">' . $bounty['player']->getPlayerName() . '</span> : <span class="creds">' . number_format($amount) . '</span> credits and <span class="red">' . number_format($smrCredits) . '</span> SMR credits<br />');
 	
 			// add HoF stat
-			$player->increaseHOF(1,array('Bounties','Claimed','Results'), HOF_PUBLIC);
-			$player->increaseHOF($amount,array('Bounties','Claimed','Money'), HOF_PUBLIC);
-			$player->increaseHOF($smrCredits,array('Bounties','Claimed','SMR Credits'), HOF_PUBLIC);
+			$player->increaseHOF(1, array('Bounties', 'Claimed', 'Results'), HOF_PUBLIC);
+			$player->increaseHOF($amount, array('Bounties', 'Claimed', 'Money'), HOF_PUBLIC);
+			$player->increaseHOF($smrCredits, array('Bounties', 'Claimed', 'SMR Credits'), HOF_PUBLIC);
 	
 			// delete bounty
 			$db->query('DELETE FROM bounty
@@ -45,9 +45,9 @@ 
 		}
 	}
 	else {
-		$claimText.=('You have no claimable bounties<br /><br />');
+		$claimText .= ('You have no claimable bounties<br /><br />');
 	}
 	
-	SmrSession::updateVar('ClaimText',$claimText);
+	SmrSession::updateVar('ClaimText', $claimText);
 }
-$PHP_OUTPUT.=$var['ClaimText'];
+$PHP_OUTPUT .= $var['ClaimText'];

engine/Default/album_delete_processing.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 }
 
 $container = create_container('skeleton.php');
-if(!is_object($player)) {
+if (!is_object($player)) {
 	$container['body'] = 'game_play.php';
 } else {
 	$container['body'] = 'current_sector.php';

engine/Default/message_blacklist_add.php

Spacing +4 added lines, -4 removed lines

@@ -4,12 +4,12 @@ 
 $container['url'] = 'skeleton.php';
 $container['body'] = 'message_blacklist.php';
 
-if(!isset($_REQUEST['PlayerName']) && !isset($var['account_id'])) {
+if (!isset($_REQUEST['PlayerName']) && !isset($var['account_id'])) {
 	$container['error'] = 1;
 	forward($container);
 }
 
-if(isset($var['account_id'])) {
+if (isset($var['account_id'])) {
 	$blacklisted_id = $var['account_id'];
 }
 else {
@@ -17,7 +17,7 @@ 
 
 	$db->query('SELECT account_id FROM player WHERE player_name=' . $db->escapeString($_REQUEST['PlayerName']) . ' AND game_id=' . $db->escapeNumber($player->getGameID()) . ' LIMIT 1');
 
-	if(!$db->nextRecord()) {
+	if (!$db->nextRecord()) {
 		$container['error'] = 1;
 		forward($container);
 	}
@@ -26,7 +26,7 @@ 
 
 $db->query('SELECT account_id FROM message_blacklist WHERE account_id=' . $db->escapeNumber($player->getAccountID()) . ' AND blacklisted_id=' . $db->escapeNumber($blacklisted_id) . ' AND game_id=' . $db->escapeNumber($player->getGameID()) . ' LIMIT 1');
 
-if($db->nextRecord()) {
+if ($db->nextRecord()) {
 	$container['error'] = 2;
 	forward($container);
 }

engine/Default/rankings_alliance_vs_alliance.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$template->assign('PageTopic','Alliance VS Alliance Rankings');
+$template->assign('PageTopic', 'Alliance VS Alliance Rankings');
 
 Menu::rankings(1, 4);
 $db2 = new SmrMySqlDatabase();