mdaniels5757 / waca

includes/Providers/CachedApiAntispoofProvider.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 		$cacheResult = AntiSpoofCache::getByUsername($username, gGetDb());
 		if ($cacheResult == false) {
 			// get the data from the API
-			$data = file_get_contents($mediawikiWebServiceEndpoint . "?action=antispoof&format=php&username=" . urlencode($username));
+			$data = file_get_contents($mediawikiWebServiceEndpoint."?action=antispoof&format=php&username=".urlencode($username));
 
 			$cacheEntry = new AntiSpoofCache();
 			$cacheEntry->setDatabase(gGetDb());
@@ -35,7 +35,7 @@ 
 			$cacheResult->delete();
 
 			if (isset($result['error']['info'])) {
-				throw new Exception("Unrecognised API response to query: " . $result['error']['info']);
+				throw new Exception("Unrecognised API response to query: ".$result['error']['info']);
 			}
 
 			throw new Exception("Unrecognised API response to query.");
@@ -53,7 +53,7 @@ 
 
 		if ($result['antispoof']['result'] == "error") {
 			// we've got conflicts, let's do something with them.
-			throw new Exception("Encountered error while getting result: " . $result['antispoof']['error']);
+			throw new Exception("Encountered error while getting result: ".$result['antispoof']['error']);
 		}
 
 		throw new Exception("Unrecognised API response to query.");

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 			$cacheEntry->save();
 
 			$cacheResult = $cacheEntry;
-		}
-		else {
+		} else {
 			$data = $cacheResult->getData();
 		}
 

includes/AutoLoader.php

Spacing +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@
 		}
 
 		$paths = array(
-			$filepath . 'includes/' . $class . ".php",
-			$filepath . 'includes/DataObjects/' . $class . ".php",
-			$filepath . 'includes/Providers/' . $class . ".php",
-			$filepath . 'includes/Providers/Interfaces/' . $class . ".php",
-			$filepath . 'includes/Validation/' . $class . ".php",
-			$filepath . 'includes/Helpers/' . $class . ".php",
-			$filepath . 'includes/Helpers/Interfaces/' . $class . ".php",
-			$filepath . $class . ".php",
+			$filepath.'includes/'.$class.".php",
+			$filepath.'includes/DataObjects/'.$class.".php",
+			$filepath.'includes/Providers/'.$class.".php",
+			$filepath.'includes/Providers/Interfaces/'.$class.".php",
+			$filepath.'includes/Validation/'.$class.".php",
+			$filepath.'includes/Helpers/'.$class.".php",
+			$filepath.'includes/Helpers/Interfaces/'.$class.".php",
+			$filepath.$class.".php",
 		);
 
 		foreach ($paths as $file) {

includes/AuthUtility.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 	 */
 	private static function encryptVersion1($password, $salt)
 	{
-		return ':1:' . $salt . ':' . md5($salt . '-' . md5($password));
+		return ':1:'.$salt.':'.md5($salt.'-'.md5($password));
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	private static function encryptVersion2($password)
 	{
-		return ':2:x:' . password_hash($password, PASSWORD_BCRYPT);
+		return ':2:x:'.password_hash($password, PASSWORD_BCRYPT);
 	}
 
 	/**

includes/BootstrapSkin.php

Spacing +4 added lines, -4 removed lines

@@ -118,13 +118,13 @@ 
 
 		// not equal to one, as zero uses the plural form too.
 		if ($resultSetCount != 1) {
-			$onlinemessage = $resultSetCount . " Account Creators currently online (past 5 minutes): $creators";
+			$onlinemessage = $resultSetCount." Account Creators currently online (past 5 minutes): $creators";
 		}
 		else {
-			$onlinemessage = $resultSetCount . " Account Creator currently online (past 5 minutes): $creators";
+			$onlinemessage = $resultSetCount." Account Creator currently online (past 5 minutes): $creators";
 		}
 
-		$online = '<p class="span6 text-right"><small>' . $onlinemessage . '</small></p>';
+		$online = '<p class="span6 text-right"><small>'.$onlinemessage.'</small></p>';
 
 		if (isset($_SESSION['user'])) {
 			$smarty->assign("onlineusers", $online);
@@ -171,7 +171,7 @@ 
 		$returnData = $smarty->fetch("alert.tpl");
 
 		if ($centre) {
-			$returnData = '<div class="row-fluid"><div class="span8 offset2">' . $returnData . '</div></div>';
+			$returnData = '<div class="row-fluid"><div class="span8 offset2">'.$returnData.'</div></div>';
 		}
 
 		if ($return) {

Braces +3 added lines, -6 removed lines

@@ -119,8 +119,7 @@ 
 		// not equal to one, as zero uses the plural form too.
 		if ($resultSetCount != 1) {
 			$onlinemessage = $resultSetCount . " Account Creators currently online (past 5 minutes): $creators";
-		}
-		else {
+		} else {
 			$onlinemessage = $resultSetCount . " Account Creator currently online (past 5 minutes): $creators";
 		}
 
@@ -128,8 +127,7 @@ 
 
 		if (isset($_SESSION['user'])) {
 			$smarty->assign("onlineusers", $online);
-		}
-		else {
+		} else {
 			$emptystring = "";
 			$smarty->assign("onlineusers", $emptystring);
 		}
@@ -176,8 +174,7 @@ 
 
 		if ($return) {
 			return $returnData;
-		}
-		else {
+		} else {
 			echo $returnData;
 			return null;
 		}

includes/request.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		}
 		
 		// Generates a new host name by means of the IP array and TOR string.
-		$ahbladdr = $p['3'] . "." . $p['2'] . "." . $p['1'] . "." . $p['0'] . "." . "tor.ahbl.org";
+		$ahbladdr = $p['3'].".".$p['2'].".".$p['1'].".".$p['0']."."."tor.ahbl.org";
 
 		// Get the IP address corresponding to a given host name.
 		$ahbl = gethostbyname($ahbladdr);

includes/DataObject.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 	 */
 	public static function getById($id, PdoDatabase $database)
 	{
-		$statement = $database->prepare("SELECT * FROM `" . strtolower(get_called_class()) . "` WHERE id = :id LIMIT 1;");
+		$statement = $database->prepare("SELECT * FROM `".strtolower(get_called_class())."` WHERE id = :id LIMIT 1;");
 		$statement->bindValue(":id", $id);
 
 		$statement->execute();
@@ -98,6 +98,6 @@ 
 	
 	public function getObjectDescription()
 	{
-		return '[' . get_called_class() . " " . $this->getId() . ']';	
+		return '['.get_called_class()." ".$this->getId().']';	
 	}
 }

includes/PdoDatabase.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 			}
 			catch (PDOException $ex) {
 				// wrap around any potential stack traces which may include passwords
-				throw new Exception("Error connecting to database '$connectionName': " . $ex->getMessage());
+				throw new Exception("Error connecting to database '$connectionName': ".$ex->getMessage());
 			}
 
 			$databaseObject->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -186,7 +186,7 @@ 
 				);
 			}
 			catch (Exception $ex) {
-				trigger_error("Error logging query. Disabling for this request. " . $ex->getMessage(), E_USER_NOTICE);
+				trigger_error("Error logging query. Disabling for this request. ".$ex->getMessage(), E_USER_NOTICE);
 				$enableQueryLog = false;
 			}
 		}

Braces +2 added lines, -4 removed lines

@@ -91,8 +91,7 @@ 
 		// all over the rest of the code
 		if ($this->hasActiveTransaction) {
 			return false;
-		}
-		else {
+		} else {
 			// set the transaction isolation level for every transaction.
 			$this->exec("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;");
 
@@ -146,8 +145,7 @@ 
 			// TODO: yuk.
 			if (defined("PUBLICMODE")) {
 				BootstrapSkin::displayPublicFooter();
-			}
-			else {
+			} else {
 				BootstrapSkin::displayInternalFooter();
 			}
 

includes/statistics/StatsMonthlyStats.php

Spacing +9 added lines, -9 removed lines

@@ -34,8 +34,8 @@ 
 		global $showGraphs;
 		if ($showGraphs == 1) {
 			global $filepath;
-			require_once($filepath . 'graph/pChart/pChart.class');
-			require_once($filepath . 'graph/pChart/pData.class');
+			require_once($filepath.'graph/pChart/pChart.class');
+			require_once($filepath.'graph/pChart/pData.class');
 
 			$queries = array();
 
@@ -135,14 +135,14 @@ 
 ORDER BY YEAR(timestamp) , MONTH(timestamp) ASC;
 SQL
 					,
-					'series' => "Requests deferred to " . $state['deferto'] . " by month"
+					'series' => "Requests deferred to ".$state['deferto']." by month"
 				);
 			}
 
 			global $baseurl;
 			foreach ($this->createClosuresGraph($queries) as $i) {
 
-				$out .= '<img src="' . $baseurl . '/render/' . $i[0] . '" alt="' . $i[1] . '"/>';
+				$out .= '<img src="'.$baseurl.'/render/'.$i[0].'" alt="'.$i[1].'"/>';
 			}
 
 		}
@@ -216,7 +216,7 @@ 
 					// Finish the graph
 					$Test->setFontProperties("graph/Fonts/tahoma.ttf", 10);
 					$Test->drawTitle(50, 22, $q['series'], 50, 50, 50, 585);
-					$Test->Render("render/" . $chartname);
+					$Test->Render("render/".$chartname);
 				}
 			}
 		}
@@ -232,11 +232,11 @@ 
 	private function createPathFromHash($imghash, $basedirectory = "render/")
 	{
 		$imghashparts = str_split($imghash);
-		$imgpath = array_shift($imghashparts) . "/";
-		$imgpath .= array_shift($imghashparts) . "/";
-		$imgpath .= array_shift($imghashparts) . "/";
+		$imgpath = array_shift($imghashparts)."/";
+		$imgpath .= array_shift($imghashparts)."/";
+		$imgpath .= array_shift($imghashparts)."/";
 
-		is_dir($basedirectory . $imgpath) || mkdir($basedirectory . $imgpath, 0777, true);
+		is_dir($basedirectory.$imgpath) || mkdir($basedirectory.$imgpath, 0777, true);
 
 		$imgpath .= implode("", $imghashparts);
 		return $imgpath;

Braces +1 added lines, -2 removed lines

@@ -145,8 +145,7 @@
 				$out .= '<img src="' . $baseurl . '/render/' . $i[0] . '" alt="' . $i[1] . '"/>';
 			}
 
-		}
-		else {
+		} else {
 			$out .= BootstrapSkin::displayAlertBox("Graph drawing is currently disabled.", "alert-info", "", false, false, true);
 		}
 

includes/statistics/StatsMain.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 	{
 		global $smarty, $filepath;
 
-		$files = scandir($filepath . "/includes/statistics/");
+		$files = scandir($filepath."/includes/statistics/");
 
 		$statsPageDefinitions = preg_grep("/php$/", $files);
 
@@ -26,7 +26,7 @@ 
 
 		foreach ($statsPageDefinitions as $i) {
 			// TODO: is this require still needed? AutoLoader ftw.
-			require_once($filepath . "/includes/statistics/" . $i);
+			require_once($filepath."/includes/statistics/".$i);
 			$expld = explode('.', $i);
 			$className = $expld[0];