stwalkerster / waca

includes/DataObjects/User.php

Indentation +3 added lines, -3 removed lines

@@ -654,9 +654,9 @@
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
-	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
-        }
+		if($this->isCheckuserCache === null) {
+			$this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
+		}
 
 		return $this->isCheckuserCache;
 	}

Spacing +1 added lines, -1 removed lines

@@ -654,7 +654,7 @@
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
+	    if ($this->isCheckuserCache === null) {
 	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
         }
 

PrecacheGeolocation.php

Indentation +40 added lines, -40 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (isset($_SERVER['REQUEST_METHOD'])) {
-    die();
+	die();
 } // Web clients die.
 
 ini_set('display_errors', 1);
@@ -17,19 +17,19 @@ 
 $locationProvider = new IpLocationProvider($database, $locationProviderApiKey);
 
 while (true) {
-    echo "Beginning txn\n";
-    $database->beginTransaction();
+	echo "Beginning txn\n";
+	$database->beginTransaction();
 
-    try {
-        // 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
+	try {
+		// 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
@@ -46,38 +46,38 @@ 
             WHERE NOT EXISTS (SELECT 1 FROM geolocation g WHERE g.address = p.prox)
             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

@@ -68,12 +68,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

@@ -67,13 +67,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";
         }

ClearOldData.php

Braces +1 added lines, -2 removed lines

@@ -10,8 +10,7 @@
 
 $db = gGetDb( );
 
-$db->transactionally(function() use ($db)
-{
+$db->transactionally(function() use ($db) {
 	global $cDataClearIp, $cDataClearEmail, $dataclear_interval, $enableEmailConfirm;
     
 	$query = $db->prepare("UPDATE request SET ip = :ip, forwardedip = null, email = :mail, useragent = '' WHERE date < DATE_SUB(curdate(), INTERVAL $dataclear_interval) AND status = 'Closed';");

functions.php

Indentation +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 
 /** Initialises the PHP Session */
 function initialiseSession() {
-    session_start();
+	session_start();
 }
 
 /**
@@ -160,7 +160,7 @@ 
 			"requests" => $requests, 
 			"total" => $totalRequests, 
 			"api" => $v['api'],
-            "type" => $type);
+			"type" => $type);
 	}
     
 	global $smarty;

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
 $session = new session();
 
 /** Initialises the PHP Session */
-function initialiseSession() {
+function initialiseSession()
+{
     session_start();
 }
 

acc.php

Indentation +25 added lines, -25 removed lines

@@ -2035,41 +2035,41 @@
 	});
 }
 elseif ($action == "listall") {
-    global $availableRequestStates, $enableEmailConfirm;
+	global $availableRequestStates, $enableEmailConfirm;
 
 	if (isset($_GET['status']) && isset($availableRequestStates[$_GET['status']])) {
 		$type = $_GET['status']; // safe, we've verified it's sane in the above if statement.
 
-	    $database = gGetDb();
+		$database = gGetDb();
 
-	    if ($enableEmailConfirm == 1) {
-	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
-	        $query = "SELECT * FROM request WHERE status = :type;";
-	    }
+		if ($enableEmailConfirm == 1) {
+			$query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
+		} else {
+			$query = "SELECT * FROM request WHERE status = :type;";
+		}
 
-	    $statement = $database->prepare($query);
+		$statement = $database->prepare($query);
 
-        $statement->bindValue(":type", $type);
-        $statement->execute();
+		$statement->bindValue(":type", $type);
+		$statement->execute();
 
-        $requests = $statement->fetchAll(PDO::FETCH_CLASS, "Request");
-        foreach ($requests as $req) {
-        	/** @var Request $req */
-            $req->setDatabase($database);
-        }
+		$requests = $statement->fetchAll(PDO::FETCH_CLASS, "Request");
+		foreach ($requests as $req) {
+			/** @var Request $req */
+			$req->setDatabase($database);
+		}
 
-        global $smarty;
-        $smarty->assign("requests", $requests);
-        $smarty->assign("showStatus", false);
-        $html = $smarty->fetch("mainpage/requesttable.tpl");
-        echo $html;
-    } else {
-        echo defaultpage();
-    }
+		global $smarty;
+		$smarty->assign("requests", $requests);
+		$smarty->assign("showStatus", false);
+		$html = $smarty->fetch("mainpage/requesttable.tpl");
+		echo $html;
+	} else {
+		echo defaultpage();
+	}
 
-    BootstrapSkin::displayInternalFooter();
-    die();
+	BootstrapSkin::displayInternalFooter();
+	die();
 }
 # If the action specified does not exist, goto the default page.
 else {

Braces +22 added lines, -35 removed lines

@@ -152,8 +152,7 @@ 
 
 	$database = gGetDb();
     
-	$database->transactionally(function() use ($database, $useOauthSignup)
-	{
+	$database->transactionally(function() use ($database, $useOauthSignup) {
     
 		$newUser = new User();
 		$newUser->setDatabase($database);
@@ -481,8 +480,7 @@ 
         
 		$database = gGetDb();
         
-		$database->transactionally(function() use ($database)
-		{
+		$database->transactionally(function() use ($database) {
 			global $smarty;
             
 			$message = InterfaceMessage::getById($_GET['edit'], $database);
@@ -570,8 +568,7 @@ 
             
 			$database = gGetDb();
             
-			$database->transactionally(function() use ($database, $baseurl)
-			{
+			$database->transactionally(function() use ($database, $baseurl) {
 				$template = new WelcomeTemplate();
 				$template->setDatabase($database);
 				$template->setUserCode($_POST['usercode']);
@@ -656,8 +653,7 @@ 
 			die();
 		}
         
-		$database->transactionally(function() use($database, $template)
-		{
+		$database->transactionally(function() use($database, $template) {
 			$tid = $template->getId();
             
 			$database
@@ -693,8 +689,7 @@ 
 		}
 
 		if (isset($_POST['submit'])) {
-			$database->transactionally(function() use($database, $template)
-			{
+			$database->transactionally(function() use($database, $template) {
 				$template->setUserCode($_POST['usercode']);
 				$template->setBotCode($_POST['botcode']);
 				$template->save();
@@ -825,8 +820,7 @@ 
     
 	$currentUsername = User::getCurrent()->getUsername();
     
-	$database->transactionally(function() use ($database, $ban, $duration, $currentUsername)
-	{
+	$database->transactionally(function() use ($database, $ban, $duration, $currentUsername) {
 		$ban->setDatabase($database);
 		$ban->setActive(1);
 		$ban->setType($_POST['type']);
@@ -891,8 +885,7 @@ 
 		else {
 			$database = gGetDb();
             
-			$database->transactionally(function() use ($database, $ban)
-			{
+			$database->transactionally(function() use ($database, $ban) {
 				$ban->setActive(0);
 				$ban->save();
                 
@@ -1041,8 +1034,7 @@ 
 		}
         
 		$database = gGetDb();
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			global $availableRequestStates;
                 
 			$request->setReserved(0);
@@ -1192,7 +1184,8 @@ 
 	$emailTemplate = EmailTemplate::getById($gem, gGetDb());
 	if ($emailTemplate instanceof EmailTemplate) {
 		$isForCreated = $emailTemplate->getDefaultAction() === EmailTemplate::CREATED;
-	} else {
+	}
+	else {
 		$isForCreated = false;
 	}
 
@@ -1461,8 +1454,7 @@ 
 elseif ($action == "reserve") {
 	$database = gGetDb();
     
-	$database->transactionally(function() use ($database)
-	{
+	$database->transactionally(function() use ($database) {
 		$request = Request::getById($_GET['resid'], $database);
         
 		if ($request == false) {
@@ -1565,8 +1557,7 @@ 
 	if ($reservedUser->getId() != User::getCurrent()->getId()) {
 		if (User::getCurrent()->isAdmin()) {
 			if (isset($_GET['confirm']) && $_GET['confirm'] == 1) {
-				$database->transactionally(function() use($database, $request)
-				{
+				$database->transactionally(function() use($database, $request) {
 					$request->setReserved(0);
 					$request->save();
 
@@ -1591,8 +1582,7 @@ 
 		}
 	}
 	else {
-		$database->transactionally(function() use ($database, $request)
-		{
+		$database->transactionally(function() use ($database, $request) {
 			$request->setReserved(0);
 			$request->save();
 
@@ -1785,8 +1775,7 @@ 
 	
 	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 		$database = gGetDb();
-		$database->transactionally(function() use ($database, $comment, $baseurl)
-		{
+		$database->transactionally(function() use ($database, $comment, $baseurl) {
             
 			$comment->setComment($_POST['newcomment']);
 			$comment->setVisibility($_POST['visibility']);
@@ -1834,8 +1823,7 @@ 
 		die();
 	}
     
-	$database->transactionally(function() use ($database, $user, $requestObject, $curuser)
-	{
+	$database->transactionally(function() use ($database, $user, $requestObject, $curuser) {
 		$updateStatement = $database->prepare("UPDATE request SET reserved = :userid WHERE id = :request LIMIT 1;");
 		$updateStatement->bindValue(":userid", $user->getId());
 		$updateStatement->bindValue(":request", $requestObject->getId());
@@ -1863,8 +1851,7 @@ 
 		}
 		if (isset($_POST['submit'])) {
 			$database = gGetDb();
-			$database->transactionally(function() use ($database)
-			{
+			$database->transactionally(function() use ($database) {
 				global $baseurl;
                 
 				$emailTemplate = new EmailTemplate();
@@ -1942,8 +1929,7 @@ 
 				die();
 			}
 
-			$database->transactionally(function() use ($database, $emailTemplate)
-			{
+			$database->transactionally(function() use ($database, $emailTemplate) {
 				$emailTemplate->save();
                 
 				Logger::editedEmail($database, $emailTemplate);
@@ -2008,8 +1994,7 @@ 
 }
 elseif ($action == "oauthattach") {
 	$database = gGetDb();
-	$database->transactionally(function() use ($database)
-	{
+	$database->transactionally(function() use ($database) {
 		try {
 			global $oauthConsumerToken, $oauthSecretToken, $oauthBaseUrl, $oauthBaseUrlInternal;
             
@@ -2044,7 +2029,8 @@ 
 
 	    if ($enableEmailConfirm == 1) {
 	        $query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	    } else {
+	    }
+	    else {
 	        $query = "SELECT * FROM request WHERE status = :type;";
 	    }
 
@@ -2064,7 +2050,8 @@ 
         $smarty->assign("showStatus", false);
         $html = $smarty->fetch("mainpage/requesttable.tpl");
         echo $html;
-    } else {
+    }
+    else {
         echo defaultpage();
     }