mdaniels5757 / waca

zoompage.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 	$viewableDataStatement->bindValue(":email", $request->getEmail());
 	$viewableDataStatement->bindValue(":reserved", User::getCurrent()->getId());
 	$viewableDataStatement->bindValue(":trustedIp", $request->getTrustedIp());
-	$viewableDataStatement->bindValue(":trustedProxy", '%' . $request->getTrustedIp() . '%');
+	$viewableDataStatement->bindValue(":trustedProxy", '%'.$request->getTrustedIp().'%');
     
 	$viewableDataStatement->execute();
     
@@ -77,11 +77,11 @@ 
 	#endregion
 	
 	if ($request->getStatus() == "Closed") {
-		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp() . microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
+		$hash = md5($request->getId().$request->getEmail().$request->getTrustedIp().microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
 		$smarty->assign("isclosed", true);
 	}
 	else {
-		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp());
+		$hash = md5($request->getId().$request->getEmail().$request->getTrustedIp());
 		$smarty->assign("isclosed", false);
 	}
 	$smarty->assign("hash", $hash);
@@ -257,10 +257,10 @@ 
 	$userListData = $userListResult->fetchAll(PDO::FETCH_COLUMN);
 	$userListProcessedData = array();
 	foreach ($userListData as $userListItem) {
-		$userListProcessedData[] = "\"" . htmlentities($userListItem) . "\"";
+		$userListProcessedData[] = "\"".htmlentities($userListItem)."\"";
 	}
     
-	$userList = '[' . implode(",", $userListProcessedData) . ']';	
+	$userList = '['.implode(",", $userListProcessedData).']';	
 	$smarty->assign("jsuserlist", $userList);
 	// end: assign to user
     

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
 
 	if (isset($_GET['ecoverride']) && User::getCurrent()->isAdmin()) {
 		$smarty->assign('ecoverride', true);
-	}
-	else {
+	} else {
 		$smarty->assign('ecoverride', false);
 	}
         
@@ -79,16 +78,14 @@ 
 	if ($request->getStatus() == "Closed") {
 		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp() . microtime()); //If the request is closed, change the hash based on microseconds similar to the checksums.
 		$smarty->assign("isclosed", true);
-	}
-	else {
+	} else {
 		$hash = md5($request->getId() . $request->getEmail() . $request->getTrustedIp());
 		$smarty->assign("isclosed", false);
 	}
 	$smarty->assign("hash", $hash);
 	if ($hash == $urlhash) {
 		$correcthash = true;
-	}
-	else {
+	} else {
 		$correcthash = false;
 	}
 	
@@ -127,8 +124,7 @@ 
 				if (!$ipisprivate) {
 					$iprdns = $rdnsProvider->getRdns($p2);
 					$iplocation = $locationProvider->getIpLocation($p2);
-				}
-				else {
+				} else {
 					// this is going to fail, so why bother trying?
 					$iprdns = false;
 					$iplocation = false;

PrecacheGeolocation.php

Indentation +41 added lines, -41 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (isset($_SERVER['REQUEST_METHOD'])) {
-    die();
+	die();
 } // Web clients die.
 
 ini_set('display_errors', 1);
@@ -17,21 +17,21 @@ 
 $locationProvider = new IpLocationProvider($database, $locationProviderApiKey);
 
 while (true) {
-    echo "Beginning txn\n";
-    $database->beginTransaction();
+	echo "Beginning txn\n";
+	$database->beginTransaction();
 
-    try {
-        echo ". Fetching data...\n";
+	try {
+		echo ". Fetching data...\n";
 
-        // fetch a bunch of un-geolocated IPs from the database.
-        // note we have to parse the forwardedip field in the database so we can test against the geolocation table.
-        // This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
-        // Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an IN()
-        // clause dynamically, sending that back to the database to check if there are geolocation entries, then repeating
-        // until we have 10 to process - and the fact that we'd have to potentially retrieve all IPs from the database
-        // before we find any at all. This way keeps all of that legwork in the database, at the cost of a more complex
-        // query.
-        $statement = $database->query(<<<SQL
+		// fetch a bunch of un-geolocated IPs from the database.
+		// note we have to parse the forwardedip field in the database so we can test against the geolocation table.
+		// This guarantees we get ten unlocated IPs back, unless there actually aren't 10 available.
+		// Alternatives include downloading a small set of forwarded IPs, splitting it in PHP, constructing an IN()
+		// clause dynamically, sending that back to the database to check if there are geolocation entries, then repeating
+		// until we have 10 to process - and the fact that we'd have to potentially retrieve all IPs from the database
+		// before we find any at all. This way keeps all of that legwork in the database, at the cost of a more complex
+		// query.
+		$statement = $database->query(<<<SQL
             SELECT p.prox
             FROM (
               SELECT trim(substring_index(substring_index(r.forwardedip, ',', n.n), ',', -1)) prox
@@ -48,38 +48,38 @@ 
             WHERE NOT EXISTS (SELECT 1 FROM geolocation g WHERE g.address = p.prox FOR UPDATE)
             LIMIT 10;
 SQL
-        );
+		);
 
-        $missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
+		$missingIps = $statement->fetchAll(PDO::FETCH_COLUMN);
 
-        $count = count($missingIps);
-        if ($count === 0) {
-            echo ". Found nothing to do.\n";
-            break;
-        }
+		$count = count($missingIps);
+		if ($count === 0) {
+			echo ". Found nothing to do.\n";
+			break;
+		}
 
-        echo ". Picked {$count} IP addresses\n";
+		echo ". Picked {$count} IP addresses\n";
 
-        foreach ($missingIps as $ip) {
-            echo ". . Getting location for {$ip}...\n";
-            $data = json_encode($locationProvider->getIpLocation($ip));
-            echo ". . . {$data}\n";
-        }
+		foreach ($missingIps as $ip) {
+			echo ". . Getting location for {$ip}...\n";
+			$data = json_encode($locationProvider->getIpLocation($ip));
+			echo ". . . {$data}\n";
+		}
 
-        echo ". IP location fetch complete.\n";
-        $database->commit();
-        echo ". Committed txn.\n";
-    } catch (Exception $ex) {
-        echo ". Encountered exception: " . $ex->getMessage(). "\n";
-        $database->rollBack();
-        echo ". Rolled back txn\n";
-        throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
-            $database->rollBack();
-            echo ". Rolled back txn\n";
-        }
-    }
+		echo ". IP location fetch complete.\n";
+		$database->commit();
+		echo ". Committed txn.\n";
+	} catch (Exception $ex) {
+		echo ". Encountered exception: " . $ex->getMessage(). "\n";
+		$database->rollBack();
+		echo ". Rolled back txn\n";
+		throw $ex;
+	} finally {
+		if($database->hasActiveTransaction()){
+			$database->rollBack();
+			echo ". Rolled back txn\n";
+		}
+	}
 }
 
 echo "Done.\n";

Spacing +2 added lines, -2 removed lines

@@ -70,12 +70,12 @@
         $database->commit();
         echo ". Committed txn.\n";
     } catch (Exception $ex) {
-        echo ". Encountered exception: " . $ex->getMessage(). "\n";
+        echo ". Encountered exception: ".$ex->getMessage()."\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
     } finally {
-        if($database->hasActiveTransaction()){
+        if ($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

Braces +5 added lines, -3 removed lines

@@ -69,13 +69,15 @@
         echo ". IP location fetch complete.\n";
         $database->commit();
         echo ". Committed txn.\n";
-    } catch (Exception $ex) {
+    }
+    catch (Exception $ex) {
         echo ". Encountered exception: " . $ex->getMessage(). "\n";
         $database->rollBack();
         echo ". Rolled back txn\n";
         throw $ex;
-    } finally {
-        if($database->hasActiveTransaction()){
+    }
+    finally {
+        if($database->hasActiveTransaction()) {
             $database->rollBack();
             echo ". Rolled back txn\n";
         }

index.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 		if (count($validationErrors) > 0) {
 			foreach ($validationErrors as $validationError) {
 				BootstrapSkin::displayAlertBox(
-					$smarty->fetch("validation/" . $validationError->getErrorCode() . ".tpl"),
+					$smarty->fetch("validation/".$validationError->getErrorCode().".tpl"),
 					"alert-error");
 			}
             

Braces +4 added lines, -8 removed lines

@@ -89,8 +89,7 @@ 
 		BootstrapSkin::displayAlertBox($ex->getMessage(), "alert-error", "Unknown error", true, false);
 		BootstrapSkin::displayPublicFooter();
 	}
-}
-else {
+} else {
 	if ($_SERVER['REQUEST_METHOD'] == "POST") {
 		$errorEncountered = false;
         
@@ -127,8 +126,7 @@ 
 			}
             
 			$smarty->display("request/request-form.tpl");
-		}
-		else if ($enableEmailConfirm == 1) {
+		} else if ($enableEmailConfirm == 1) {
 			$request->generateEmailConfirmationHash();
 
 			$database->transactionally(function() use($request)
@@ -143,8 +141,7 @@ 
 			$request->sendConfirmationEmail();
             
 			$smarty->display("request/email-confirmation.tpl");
-		}
-		else {
+		} else {
 			$request->setEmailConfirm(0); // Since it can't be null
 			$database->transactionally(function() use($request)
 			{
@@ -158,8 +155,7 @@ 
 		}
         
 		BootstrapSkin::displayPublicFooter();
-	}
-	else {
+	} else {
 		$smarty->display("request/request-form.tpl");
 		BootstrapSkin::displayPublicFooter();
 	}

includes/Validation/RequestValidationHelper.php

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
 		}
 
 		// username can't contain #@/<>[]|{}
-		if (preg_match("/[" . preg_quote("#@/<>[]|{}", "/") . "]/", $this->request->getName()) === 1) {
+		if (preg_match("/[".preg_quote("#@/<>[]|{}", "/")."]/", $this->request->getName()) === 1) {
 			$errorList[ValidationError::NAME_INVALIDCHAR] = new ValidationError(ValidationError::NAME_INVALIDCHAR);
 		}
 
@@ -176,7 +176,7 @@ 
 	{
 		global $enableTitleblacklist;
 		if ($enableTitleblacklist == 1) {
-			$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=" . urlencode($this->request->getName()) . "&tbaction=new-account&tbnooverride&format=php");
+			$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=".urlencode($this->request->getName())."&tbaction=new-account&tbnooverride&format=php");
 
 			$data = unserialize($apiResult);
 
@@ -192,7 +192,7 @@ 
 	{
 		global $mediawikiWebServiceEndpoint;
 
-		$userexist = file_get_contents($mediawikiWebServiceEndpoint . "?action=query&list=users&ususers=" . urlencode($this->request->getName()) . "&format=php");
+		$userexist = file_get_contents($mediawikiWebServiceEndpoint."?action=query&list=users&ususers=".urlencode($this->request->getName())."&format=php");
 		$ue = unserialize($userexist);
 		if (!isset ($ue['query']['users']['0']['missing']) && isset ($ue['query']['users']['0']['userid'])) {
 			return true;
@@ -206,7 +206,7 @@ 
 		global $mediawikiWebServiceEndpoint;
 
 		$reqname = str_replace("_", " ", $this->request->getName());
-		$userexist = file_get_contents($mediawikiWebServiceEndpoint . "?action=query&meta=globaluserinfo&guiuser=" . urlencode($reqname) . "&format=php");
+		$userexist = file_get_contents($mediawikiWebServiceEndpoint."?action=query&meta=globaluserinfo&guiuser=".urlencode($reqname)."&format=php");
 		$ue = unserialize($userexist);
 		if (isset ($ue['query']['globaluserinfo']['id'])) {
 			return true;

includes/Helpers/DebugHelper.php

Spacing +2 added lines, -2 removed lines

@@ -26,10 +26,10 @@
 			$output .= "#{$count}: ";
             
 			if (isset($line['type']) && $line['type'] != "") {
-				$output .= $line['class'] . $line['type'];
+				$output .= $line['class'].$line['type'];
 			}
             
-			$output .= $line['function'] . "(...)";
+			$output .= $line['function']."(...)";
 			$output .= " [{$line['file']}#{$line['line']}\r\n";
             
 			$count++;

includes/Helpers/Logger.php

Braces +2 added lines, -4 removed lines

@@ -360,8 +360,7 @@ 
 			$countStatement->bindValue(":userFilter", 0, PDO::PARAM_INT);
 			$searchStatement->bindValue(":userid", 0, PDO::PARAM_INT);
 			$countStatement->bindValue(":userid", 0, PDO::PARAM_INT);
-		}
-		else {
+		} else {
 			$searchStatement->bindValue(":userFilter", 1, PDO::PARAM_INT);
 			$countStatement->bindValue(":userFilter", 1, PDO::PARAM_INT);
 			$searchStatement->bindValue(":userid", User::getByUsername($userFilter, $database)->getId(), PDO::PARAM_INT);
@@ -373,8 +372,7 @@ 
 			$countStatement->bindValue(":actionFilter", 0, PDO::PARAM_INT);
 			$searchStatement->bindValue(":action", "", PDO::PARAM_STR);
 			$countStatement->bindValue(":action", "", PDO::PARAM_STR);
-		}
-		else {
+		} else {
 			$searchStatement->bindValue(":actionFilter", 1, PDO::PARAM_INT);
 			$countStatement->bindValue(":actionFilter", 1, PDO::PARAM_INT);
 			$searchStatement->bindValue(":action", $actionFilter, PDO::PARAM_STR);

Spacing +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 			$template = EmailTemplate::getById((int)$id, $entry->getDatabase());
 			
 			if ($template != false) {
-				return "closed (" . $template->getName() . ")";
+				return "closed (".$template->getName().")";
 			}
 			
 		}

includes/API/Actions/CountAction.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 
 		$statement = $this->database->prepare($query);
 		$statement->bindValue(":username", $this->user->getUsername());
-		$statement->bindValue(":date", date('Y-m-d') . "%");
+		$statement->bindValue(":date", date('Y-m-d')."%");
 		$statement->execute();
 		$today = $statement->fetchColumn();
 		$statement->closeCursor();

includes/API/Actions/StatsAction.php

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
 
 		if ($username !== '') {
 			$this->user = \User::getByUsername($username, $this->database);
-		}
-		else {
+		} else {
 			$this->user = \User::getByOnWikiUsername($wikiusername, $this->database);
 		}
 

includes/API/Api.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 			global $CORSallowed;
 
 			if (in_array($httpOrigin, $CORSallowed)) {
-				header("Access-Control-Allow-Origin: " . $httpOrigin);
+				header("Access-Control-Allow-Origin: ".$httpOrigin);
 			}
 		}
 	}