mdaniels5757 / waca

includes/StatisticsPage.php

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
 		if (file_exists($filepath . "/includes/statistics/Stats" . $pageName . ".php")) {
 		// and include it.
 			require_once($filepath . "/includes/statistics/Stats" . $pageName . ".php");
-		}
-		else {
+		} else {
 			// class def doesn't exist: error
 			die("Unknown statistics page");
 		}
@@ -48,13 +47,11 @@ 
 			if (get_parent_class($object) == "StatisticsPage") {
 				// all is good, return the new statistics page object
 				return $object;
-			}
-			else {
+			} else {
 				// oops. this is our class, named correctly, but it's a bad definition.
 				die("Unrecognised statistics page definition.");
 			}
-		}
-		else {
+		} else {
 			// file exists, but no definition of the class
 			die("No definition for statistics page: " . $statsPage);
 		}

redir.php

Braces +2 added lines, -4 removed lines

@@ -16,15 +16,13 @@
 if(!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
-)
-{
+) {
 	header("HTTP/1.1 403 Forbidden");
 	return;
 }
 
 if (isset($_GET['round2'])) {
 	echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", urlencode($_GET['data']), $toolList[$_GET['tool']])) . '</script>';
-}
-else {
+} else {
 	header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	'bgpview' => 'https://bgpview.io/ip/%DATA%'
 );
 
-if(!isset($_GET['tool'])
+if (!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
 )

queryBrowser.php

Braces +2 added lines, -4 removed lines

@@ -59,8 +59,7 @@ 
 			foreach ($this->overrideTableTitles as $value) {
 				$out .= "<th>" . $value . "</th>"; 
 			}
-		}
-		else {
+		} else {
 			if (count($results) > 0) {
 				foreach ($results[0] as $k => $v) {
 					$out .= "<th>" . $k . "</th>"; 
@@ -75,8 +74,7 @@ 
 			$currentreq++;
 			if (function_exists($this->tableCallbackFunction)) {
 				$out .= call_user_func($this->tableCallbackFunction, $row, $currentreq);	
-			}
-			else {
+			} else {
 				$out .= '<tr>';
                 
 				if ($this->numberedList == true) {

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 +17 added lines, -31 removed lines

@@ -27,7 +27,8 @@ 
 $session = new session();
 
 /** Initialises the PHP Session */
-function initialiseSession() {
+function initialiseSession()
+{
     session_start();
 }
 
@@ -43,8 +44,7 @@ 
 	if (User::getCurrent()->getEmailSig() != "") {
 		$emailsig = html_entity_decode(User::getCurrent()->getEmailSig(), ENT_QUOTES, "UTF-8");
 		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText() . "\n\n" . $emailsig, $headers);
-	}
-	else {
+	} else {
 		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText(), $headers);
 	}
 }
@@ -59,8 +59,7 @@ 
 		if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
 			// Client <=> Proxy is encrypted
 			return true;
-		}
-		else {
+		} else {
 			// Proxy <=> Server link is encrypted, but not Client <=> Proxy.
 			return false;
 		}
@@ -93,11 +92,9 @@ 
 	if (isset($_GET['error'])) {
 		if ($_GET['error'] == 'authfail') {
 			$errorbartext = BootstrapSkin::displayAlertBox("Username and/or password incorrect. Please try again.", "alert-error", "Auth failure", true, false, true);
-		}
-		elseif ($_GET['error'] == 'noid') {
+		} elseif ($_GET['error'] == 'noid') {
 			$errorbartext = BootstrapSkin::displayAlertBox("It doesn't look like you've signed the most recent version of the <a href=\"https://meta.wikimedia.org/wiki/Access_to_nonpublic_personal_data_policy\">access to nonpublic personal data policy</a>.</p><p>Please email accounts-enwiki-l@lists.wikimedia.org if you believe this is in error.", "alert-error", "Auth failure", true, false, true);
-		}
-		elseif ($_GET['error'] == 'newacct') {
+		} elseif ($_GET['error'] == 'newacct') {
 			$errorbartext = BootstrapSkin::displayAlertBox("I'm sorry, but, your account has not been approved by a site administrator yet. Please stand by.", "alert-info", "Account pending", true, false, true);
 		}
 	}
@@ -108,8 +105,7 @@ 
 		if (isHttps()) {
 			// Client can clearly use HTTPS, so let's enforce it for all connections.
 			header("Strict-Transport-Security: max-age=15768000");
-		}
-		else {
+		} else {
 			// This is the login form, not the request form. We need protection here.
 			$path = 'https://' . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
 			header("Location: " . $path);
@@ -130,8 +126,7 @@ 
 	if ($enableEmailConfirm == 1) {
 		$query = "SELECT * FROM request WHERE status = :type AND emailconfirm = 'Confirmed' LIMIT :lim;";
 		$totalquery = "SELECT COUNT(*) FROM request WHERE status = :type AND emailconfirm = 'Confirmed';";
-	}
-	else {
+	} else {
 		$query = "SELECT * FROM request WHERE status = :type LIMIT :lim;";
 		$totalquery = "SELECT COUNT(*) FROM request WHERE status = :type;";
 	}
@@ -195,8 +190,7 @@ 
 
 		if ($val === $needle) {
 				return $path2;
-		}
-		else if (is_array($val)) {
+		} else if (is_array($val)) {
 				if ($ret = array_search_recursive($needle, $val, $path2)) {
 						return $ret;
 				}
@@ -336,29 +330,21 @@ 
 	if ($secs <= 10) {
 		$output = "just now";
 		$pluralise = false;
-	}
-	elseif ($secs > 10 && $secs < $minuteCut) {
+	} elseif ($secs > 10 && $secs < $minuteCut) {
 		$output = round($secs / $second) . " second";
-	}
-	elseif ($secs >= $minuteCut && $secs < $hourCut) {
+	} elseif ($secs >= $minuteCut && $secs < $hourCut) {
 		$output = round($secs / $minute) . " minute";
-	}
-	elseif ($secs >= $hourCut && $secs < $dayCut) {
+	} elseif ($secs >= $hourCut && $secs < $dayCut) {
 		$output = round($secs / $hour) . " hour";
-	}
-	elseif ($secs >= $dayCut && $secs < $weekCut) {
+	} elseif ($secs >= $dayCut && $secs < $weekCut) {
 		$output = round($secs / $day) . " day";
-	}
-	elseif ($secs >= $weekCut && $secs < $month) {
+	} elseif ($secs >= $weekCut && $secs < $month) {
 		$output = round($secs / $week) . " week";
-	}
-	elseif ($secs >= $month && $secs < $year) {
+	} elseif ($secs >= $month && $secs < $year) {
 		$output = round($secs / $month) . " month";
-	}
-	elseif ($secs >= $year && $secs < $year * 10) {
+	} elseif ($secs >= $year && $secs < $year * 10) {
 		$output = round($secs / $year) . " year";
-	}
-	else {
+	} else {
 		$output = "a long time ago";
 		$pluralise = false;
 	}

search.php

Braces +5 added lines, -10 removed lines

@@ -32,8 +32,7 @@ 
 
 if (isset($_SESSION['user'])) {
 	$sessionuser = $_SESSION['user'];
-}
-else {
+} else {
 	$sessionuser = "";
 }
 
@@ -96,8 +95,7 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	elseif ($_GET['type'] == 'IP') {
+	} elseif ($_GET['type'] == 'IP') {
 		$qterm = '%' . $term . '%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE email <> 'acc@toolserver.org' and ip <> '127.0.0.1' and ip LIKE :term or forwardedip LIKE :term2;");
@@ -115,8 +113,7 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	elseif ($_GET['type'] == 'Request') {
+	} elseif ($_GET['type'] == 'Request') {
 		$qterm = '%' . $term . '%';
         
 		$statement = gGetDb()->prepare("SELECT * FROM request WHERE name LIKE :term;");
@@ -133,15 +130,13 @@ 
 		$smarty->assign("target", $target);
         
 		$smarty->display("search/searchresult.tpl");
-	}
-	else {
+	} else {
 		BootstrapSkin::displayAlertBox("Unknown search type", "alert-error", "Error");
 		$smarty->display("search/searchform.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-else {
+} else {
 	$smarty->display("search/searchform.tpl");
 }
 

acc.php

Indentation +25 added lines, -25 removed lines

@@ -2043,41 +2043,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 {

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 elseif ($action == "sreg") {
 	global $useOauthSignup, $smarty, $allowRegistration;
 
-	if(!$allowRegistration) {
+	if (!$allowRegistration) {
 		$smarty->display("registration/registerdisabled.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
@@ -214,7 +214,7 @@ 
 }
 elseif ($action == "register") {
 	global $useOauthSignup, $smarty, $allowRegistration;
-	if($allowRegistration) {
+	if ($allowRegistration) {
 		$smarty->assign("useOauthSignup", $useOauthSignup);
 		$smarty->display("registration/register.tpl");
 	} else {

Braces +72 added lines, -144 removed lines

@@ -77,8 +77,7 @@ 
 		echo showlogin();
 		BootstrapSkin::displayInternalFooter();
 		die();
-	}
-	else {
+	} else {
 		// A content block is created if the action is none of the above.
 		// This block would later be used to keep all the HTML except the header and footer.
 		$out = "<div id=\"content\">";
@@ -101,8 +100,7 @@ 
 	echo defaultpage();
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "sreg") {
+} elseif ($action == "sreg") {
 	global $useOauthSignup, $smarty, $allowRegistration;
 
 	if(!$allowRegistration) {
@@ -202,8 +200,7 @@ 
 					0, 
 					$ex);
 			}
-		}
-		else {
+		} else {
 			global $baseurl;
 			Notification::userNew($newUser);
 			header("Location: {$baseurl}/acc.php?action=registercomplete");
@@ -211,8 +208,7 @@ 
 	});
     
 	die();
-}
-elseif ($action == "register") {
+} elseif ($action == "register") {
 	global $useOauthSignup, $smarty, $allowRegistration;
 	if($allowRegistration) {
 		$smarty->assign("useOauthSignup", $useOauthSignup);
@@ -222,12 +218,10 @@ 
 	}
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "registercomplete") {
+} elseif ($action == "registercomplete") {
 	$smarty->display("registration/alert-registrationcomplete.tpl");
 	BootstrapSkin::displayInternalFooter();
-}
-elseif ($action == "forgotpw") {
+} elseif ($action == "forgotpw") {
 	global $baseurl, $smarty;
     
 	if (isset ($_GET['si']) && isset ($_GET['id'])) {
@@ -256,14 +250,12 @@ 
                     
 					BootstrapSkin::displayInternalFooter();
 					die();
-				}
-				else {
+				} else {
 					BootstrapSkin::displayAlertBox("Passwords did not match!", "alert-error", "Error", true, false);
 					BootstrapSkin::displayInternalFooter();
 					die();
 				}
-			}
-			else {
+			} else {
 				BootstrapSkin::displayAlertBox("Invalid request<!-- 1 -->", "alert-error", "Error", true, false);
 				BootstrapSkin::displayInternalFooter();
 				die();
@@ -277,8 +269,7 @@ 
 			$smarty->assign('si', $_GET['si']);
 			$smarty->assign('id', $_GET['id']);
 			$smarty->display('forgot-password/forgotpwreset.tpl');
-		}
-		else {
+		} else {
 			BootstrapSkin::displayAlertBox(
 				"The hash supplied in the link did not match the hash in the database!", 
 				"alert-error", 
@@ -304,8 +295,7 @@ 
             
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (strtolower($_POST['email']) != strtolower($user->getEmail())) {
+		} elseif (strtolower($_POST['email']) != strtolower($user->getEmail())) {
 			BootstrapSkin::displayAlertBox("Could not find user with that username and email address!", 
 				"alert-error", 
 				"Error", 
@@ -314,8 +304,7 @@ 
             
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		else {
+		} else {
 			$hash = $user->getForgottenPasswordHash();
                        
 			$smarty->assign("user", $user);
@@ -347,8 +336,7 @@ 
 
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "login") {
+} elseif ($action == "login") {
 	global $baseurl, $smarty;
     
 	if (!isset($_POST['username'])) {
@@ -379,8 +367,7 @@ 
             
 			reattachOAuthAccount($user);
 		}
-	}
-	else {
+	} else {
 		global $enforceOAuth;
         
 		if ($enforceOAuth) {
@@ -463,8 +450,7 @@ 
 	}
     
 	header("Location: $baseurl/acc.php");
-}
-elseif ($action == "messagemgmt") {
+} elseif ($action == "messagemgmt") {
 	global $smarty;
     
 	if (isset($_GET['view'])) {
@@ -548,8 +534,7 @@ 
    
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "templatemgmt") {
+} elseif ($action == "templatemgmt") {
 	global $baseurl, $smarty;
     
 	if (isset($_GET['view'])) {
@@ -595,15 +580,13 @@ 
 				SessionAlert::success("Template successfully created.");
 				header("Location: $baseurl/acc.php?action=templatemgmt");
 			});
-		}
-		else {
+		} else {
 			
 			if (isset($_POST['preview'])) {
 				$usercode = $_POST['usercode'];
 				$botcode = $_POST['botcode'];
 				echo displayPreview($usercode);
-			}
-			else {
+			} else {
 				$usercode = '';
 				$botcode = '';
 			}
@@ -629,8 +612,7 @@ 
 			SessionAlert::success("Disabled automatic user welcoming.");
 			header("Location: {$baseurl}/acc.php?action=templatemgmt");
 			die();
-		}
-		else {
+		} else {
 			$template = WelcomeTemplate::getById($_GET['select'], gGetDb());
 			if ($template !== false) {
 				$user->setWelcomeTemplate($template->getId());
@@ -639,8 +621,7 @@ 
 				SessionAlert::success("Updated selected welcome template for automatic welcoming.");
 				header("Location: {$baseurl}/acc.php?action=templatemgmt");
 				die();
-			}
-			else {
+			} else {
 				SessionAlert::error("Something went wrong, we can't find the template you asked for!");
 				header("Location: {$baseurl}/acc.php?action=templatemgmt");
 				die();
@@ -717,8 +698,7 @@ 
             
 			header("Location: $baseurl/acc.php?action=templatemgmt");
 			die();
-		}
-		else {
+		} else {
 			$smarty->assign("template", $template);
 			$smarty->display("welcometemplate/edit.tpl");
             
@@ -734,8 +714,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "sban") {
+} elseif ($action == "sban") {
 	global $smarty;
     
 	// Checks whether the current user is an admin.
@@ -763,21 +742,18 @@ 
     
 	if ($duration == "-1") {
 		$duration = -1;
-	}
-	elseif ($duration == "other") {
+	} elseif ($duration == "other") {
 		$duration = strtotime($_POST['otherduration']);
 		if (!$duration) {
 			BootstrapSkin::displayAlertBox("Invalid ban time", "alert-error", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		elseif (time() > $duration) {
+		} elseif (time() > $duration) {
 			BootstrapSkin::displayAlertBox("Ban time has already expired!", "alert-error", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
 		}
-	}
-	else {
+	} else {
 		$duration = $duration + time();
 	}
     
@@ -857,8 +833,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "unban") {
+} elseif ($action == "unban") {
 	global $smarty;
     
 	if (!isset($_GET['id']) || $_GET['id'] == "") {
@@ -897,8 +872,7 @@ 
 			BootstrapSkin::displayAlertBox("You must enter an unban reason!", "alert-error", "", false, false);
 			BootstrapSkin::displayInternalFooter();
 			die();
-		}
-		else {
+		} else {
 			$database = gGetDb();
             
 			$database->transactionally(function() use ($database, $ban)
@@ -917,15 +891,13 @@ 
 			Notification::unbanned($ban, $_POST['unbanreason']);
 			die();
 		}
-	}
-	else {
+	} else {
 		$smarty->assign("ban", $ban);
 		$smarty->display("bans/unban.tpl");
         
 		BootstrapSkin::displayInternalFooter();
 	}
-}
-elseif ($action == "ban") {
+} elseif ($action == "ban") {
 	global $smarty;
     
 	if (isset ($_GET['ip']) || isset ($_GET['email']) || isset ($_GET['name'])) {
@@ -945,8 +917,7 @@ 
 			$row = $statement->fetch(PDO::FETCH_ASSOC);
 			$target = getTrustedClientIP($row['ip'], $row['forwardedip']);
 			$type = "IP";
-		}
-		elseif (isset($_GET['email'])) {
+		} elseif (isset($_GET['email'])) {
 			$query = "SELECT email FROM request WHERE id = :ip;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":ip", $_GET['email']);
@@ -954,8 +925,7 @@ 
 			$row = $statement->fetch(PDO::FETCH_ASSOC);
 			$target = $row['email'];
 			$type = "EMail";
-		}
-		elseif (isset($_GET['name'])) {
+		} elseif (isset($_GET['name'])) {
 			$query = "SELECT name FROM request WHERE id = :ip;";
 			$statement = $database->prepare($query);
 			$statement->bindValue(":ip", $_GET['name']);
@@ -963,8 +933,7 @@ 
 			$row = $statement->fetch(PDO::FETCH_ASSOC);
 			$target = $row['name'];
 			$type = "Name";
-		}
-		else {
+		} else {
 			BootstrapSkin::displayAlertBox("Unknown ban type.", "alert-error");
 			BootstrapSkin::displayInternalFooter();
 			die();    
@@ -979,8 +948,7 @@ 
 		$smarty->assign("bantype", $type);
 		$smarty->assign("bantarget", trim($target));
 		$smarty->display("bans/banform.tpl");
-	}
-	else {
+	} else {
 		$bans = Ban::getActiveBans();
   
 		$smarty->assign("activebans", $bans);
@@ -989,8 +957,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "defer" && $_GET['id'] != "" && $_GET['sum'] != "") {
+} elseif ($action == "defer" && $_GET['id'] != "" && $_GET['sum'] != "") {
 	global $availableRequestStates;
 	
 	if (array_key_exists($_GET['target'], $availableRequestStates)) {
@@ -1071,14 +1038,12 @@ 
 		});
         
 		die();
-	}
-	else {
+	} else {
 		BootstrapSkin::displayAlertBox("Defer target not valid.", "alert-error", "Error", true, false);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-elseif ($action == "prefs") {
+} elseif ($action == "prefs") {
 	global $smarty, $enforceOAuth;
     
 	if (isset ($_POST['sig'])) {
@@ -1092,8 +1057,7 @@ 
             
 			if ($mailisvalid === false) {
 				BootstrapSkin::displayAlertBox("Invalid email address", "alert-error", "Error!");
-			}
-			else {
+			} else {
 				$user->setEmail(trim($_POST['email']));
 			}
 		}
@@ -1114,20 +1078,17 @@ 
 	$smarty->display("prefs.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "done" && $_GET['id'] != "") {
+} elseif ($action == "done" && $_GET['id'] != "") {
 	// check for valid close reasons
 	global $messages, $baseurl, $smarty;
 	
 	if (isset($_GET['email'])) {
 		if ($_GET['email'] == 0 || $_GET['email'] == "custom") {
 			$validEmail = true;
-		}
-		else {
+		} else {
 			$validEmail = EmailTemplate::getById($_GET['email'], gGetDb()) != false;
 		}
-	}
-	else {
+	} else {
 		$validEmail = false;
 	}
     
@@ -1193,8 +1154,7 @@ 
 	$ue = unserialize($userexist);
 	if (!isset ($ue['query']['users']['0']['missing'])) {
 		$exists = true;
-	}
-	else {
+	} else {
 		$exists = false;
 	}
 
@@ -1236,8 +1196,7 @@ 
 				$preloadTitle = $template->getName();
 				$preloadText = $template->getText();
 				$preloadAction = $template->getDefaultAction();
-			}
-			else {
+			} else {
 				$preloadText = "";
 				$preloadTitle = "";
 				$preloadAction = "";
@@ -1275,8 +1234,7 @@ 
 		if (User::getCurrent()->getEmailSig() != "") {
 			$emailsig = html_entity_decode(User::getCurrent()->getEmailSig(), ENT_QUOTES, "UTF-8");
 			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'] . "\n\n" . $emailsig, $headers);
-		}
-		else {
+		} else {
 			mail($request->getEmail(), "RE: [ACC #{$request->getId()}] English Wikipedia Account Request", $_POST['msgbody'], $headers);
 		}
 
@@ -1289,8 +1247,7 @@ 
 			if ($_POST['action'] == EmailTemplate::CREATED) {
 				$gem  = 'custom-y';
 				$crea = "Custom, Created";
-			}
-			else {
+			} else {
 				$gem  = 'custom-n';
 				$crea = "Custom, Not Created";
 			}
@@ -1301,8 +1258,7 @@ 
 			BootstrapSkin::displayAlertBox(
 				"Request " . $request->getId() . " (" . htmlentities($request->getName(), ENT_COMPAT, 'UTF-8') . ") marked as '" . htmlentities($crea, ENT_COMPAT, 'UTF-8') . "'.", 
 				"alert-success");
-		}
-		else if ($_POST['action'] == "mail") {
+		} else if ($_POST['action'] == "mail") {
 			// no action other than send mail!
 			Logger::sentMail(gGetDb(), $request, $messageBody);
 			Logger::unreserve(gGetDb(), $request);
@@ -1310,8 +1266,7 @@ 
 			Notification::sentMail($request);
 			BootstrapSkin::displayAlertBox("Sent mail to Request {$request->getId()}", 
 				"alert-success");
-		}
-		else if (array_key_exists($_POST['action'], $availableRequestStates)) {
+		} else if (array_key_exists($_POST['action'], $availableRequestStates)) {
 			// Defer
 
 			$request->setStatus($_POST['action']);
@@ -1324,8 +1279,7 @@ 
 			Notification::requestDeferredWithMail($request);
 			BootstrapSkin::displayAlertBox("Request {$request->getId()} deferred to $deto, sending an email.", 
 				"alert-success");
-		}
-		else {
+		} else {
 			// hmm. not sure what happened. Log that we sent the mail anyway.
 			Logger::sentMail(gGetDb(), $request, $messageBody);
 			Logger::unreserve(gGetDb(), $request);
@@ -1344,8 +1298,7 @@ 
 		echo defaultpage();
 		BootstrapSkin::displayInternalFooter();
 		die();		
-	}
-	else {
+	} else {
 		// Not a custom close, just a normal close
 	    
 		$request->setStatus('Closed');
@@ -1358,8 +1311,7 @@ 
 		
 		if ($gem == '0') {
 			$crea = "Dropped";
-		}
-		else {
+		} else {
 			$template = EmailTemplate::getById($gem, gGetDb());
 			$crea = $template->getName();
 		}
@@ -1380,8 +1332,7 @@ 
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-elseif ($action == "zoom") {
+} elseif ($action == "zoom") {
 	if (!isset($_GET['id'])) {
 		BootstrapSkin::displayAlertBox("No request specified!", "alert-error", "Error!", true, false);
 		BootstrapSkin::displayInternalFooter();
@@ -1390,8 +1341,7 @@ 
     
 	if (isset($_GET['hash'])) {
 		$urlhash = $_GET['hash'];
-	}
-	else {
+	} else {
 		$urlhash = "";
 	}
 	echo zoomPage($_GET['id'], $urlhash);
@@ -1399,8 +1349,7 @@ 
 	$tailscript = getTypeaheadSource(User::getAllUsernames(gGetDb()));
 	BootstrapSkin::displayInternalFooter($tailscript);
 	die();
-}
-elseif ($action == "logs") {
+} elseif ($action == "logs") {
 	global $baseurl;
 	
 	$filterUser = isset($_GET['filterUser']) && $_GET['filterUser'] != "" ? $_GET['filterUser'] : false;
@@ -1448,11 +1397,9 @@ 
 	if ($pageCount < $pageLimit) {
 		if ($pageData['lowpage'] == 1 && $pageData['hipage'] == $pageData['maxpage']) {
 			// nothing to do, we're already at max range.	
-		}
-		elseif ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
+		} elseif ($pageData['lowpage'] == 1 && $pageData['hipage'] < $pageData['maxpage']) {
 			$pageData['hipage'] = min($pageLimit, $pageData['maxpage']);
-		}
-		elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
+		} elseif ($pageData['lowpage'] > 1 && $pageData['hipage'] == $pageData['maxpage']) {
 			$pageData['lowpage'] = max(1, $pageData['maxpage'] - $pageLimit + 1);
 		}
 	}
@@ -1475,8 +1422,7 @@ 
 	
 	BootstrapSkin::displayInternalFooter($tailscript);
 	die();
-}
-elseif ($action == "reserve") {
+} elseif ($action == "reserve") {
 	$database = gGetDb();
     
 	$database->transactionally(function() use ($database)
@@ -1552,8 +1498,7 @@ 
 	});
 	    
 	die();	
-}
-elseif ($action == "breakreserve") {
+} elseif ($action == "breakreserve") {
 	global $smarty;
     
 	$database = gGetDb();
@@ -1595,20 +1540,17 @@ 
 				});
                 
 				die();
-			}
-			else {
+			} else {
 				global $baseurl;
 				$smarty->assign("reservedUser", $reservedUser);
 				$smarty->assign("request", $request);
                 
 				$smarty->display("confirmations/breakreserve.tpl");
 			}
-		}
-		else {
+		} else {
 			echo "You cannot break " . htmlentities($reservedUser->getUsername()) . "'s reservation";
 		}
-	}
-	else {
+	} else {
 		$database->transactionally(function() use ($database, $request)
 		{
 			$request->setReserved(0);
@@ -1625,8 +1567,7 @@ 
     
 	BootstrapSkin::displayInternalFooter();
 	die();		
-}
-elseif ($action == "comment") {
+} elseif ($action == "comment") {
 	global $smarty;
     
 	$request = Request::getById($_GET['id'], gGetDb());
@@ -1634,8 +1575,7 @@ 
 	$smarty->display("commentform.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "comment-add") {
+} elseif ($action == "comment-add") {
 	global $baseurl, $smarty;
     
 	$request = Request::getById($_POST['id'], gGetDb());
@@ -1680,8 +1620,7 @@ 
     
 	if (isset($_GET['hash'])) {
 		$urlhash = urlencode(htmlentities($_GET['hash']));
-	}
-	else {
+	} else {
 		$urlhash = "";
 	}
 
@@ -1695,8 +1634,7 @@ 
         
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "comment-quick") {
+} elseif ($action == "comment-quick") {
 	$request = Request::getById($_POST['id'], gGetDb());
 	if ($request == false) {
 		BootstrapSkin::displayAlertBox("Could not find request!", "alert-error", "Error", true, false);
@@ -1739,8 +1677,7 @@ 
 	Notification::commentCreated($comment);
     
 	header("Location: acc.php?action=zoom&id=" . $request->getId());
-}
-elseif ($action == "changepassword") {
+} elseif ($action == "changepassword") {
 	if ((!isset($_POST['oldpassword'])) || $_POST['oldpassword'] == "") {
 		//Throw an error if old password is not specified.
 		BootstrapSkin::displayAlertBox("You did not enter your old password.", "alert-error", "Error", true, false);
@@ -1777,8 +1714,7 @@ 
 	BootstrapSkin::displayAlertBox("Password successfully changed!", "alert-success", "", false, false);
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "ec") {
+} elseif ($action == "ec") {
 	// edit comment
   
 	global $smarty, $baseurl;
@@ -1820,15 +1756,13 @@ 
 		});
         
 		die();    
-	}
-	else {
+	} else {
 		$smarty->assign("comment", $comment);
 		$smarty->display("edit-comment.tpl");
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
-}
-elseif ($action == "sendtouser") {
+} elseif ($action == "sendtouser") {
 	global $baseurl;
     
 	$database = gGetDb();
@@ -1867,8 +1801,7 @@ 
 	Notification::requestReservationSent($requestObject, $user);
 	SessionAlert::success("Reservation sent successfully");
 	header("Location: $baseurl/acc.php?action=zoom&id=$request");
-}
-elseif ($action == "emailmgmt") {
+} elseif ($action == "emailmgmt") {
 	global $smarty, $createdid, $availableRequestStates;
     
 	/* New page for managing Emails, since I would rather not be handling editing
@@ -1945,8 +1878,7 @@ 
 				$emailTemplate->setDefaultAction(EmailTemplate::CREATED);
 				$emailTemplate->setActive(1);
 				$emailTemplate->setPreloadOnly(0);
-			}
-			else {
+			} else {
 				$emailTemplate->setDefaultAction($_POST['defaultaction']);
 				$emailTemplate->setActive(isset($_POST['active']));
 				$emailTemplate->setPreloadOnly(isset($_POST['preloadonly']));
@@ -2001,16 +1933,14 @@ 
  
 	if (count($inactiverows) > 0) {
 		$smarty->assign('displayinactive', true);
-	}
-	else {
+	} else {
 		$smarty->assign('displayinactive', false);
 	}
     
 	$smarty->display("email-management/main.tpl");
 	BootstrapSkin::displayInternalFooter();
 	die();
-}
-elseif ($action == "oauthdetach") {
+} elseif ($action == "oauthdetach") {
 	if ($enforceOAuth) {
 		BootstrapSkin::displayAccessDenied();
 		BootstrapSkin::displayInternalFooter();
@@ -2023,8 +1953,7 @@ 
 	$currentUser->detachAccount();
         
 	header("Location: {$baseurl}/acc.php?action=logout");
-}
-elseif ($action == "oauthattach") {
+} elseif ($action == "oauthattach") {
 	$database = gGetDb();
 	$database->transactionally(function() use ($database)
 	{
@@ -2051,8 +1980,7 @@ 
 			throw new TransactionException($ex->getMessage(), "Connection to Wikipedia failed.", "alert-error", 0, $ex);
 		}
 	});
-}
-elseif ($action == "listall") {
+} elseif ($action == "listall") {
     global $availableRequestStates, $enableEmailConfirm;
 
 	if (isset($_GET['status']) && isset($availableRequestStates[$_GET['status']])) {

zoompage.php

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;

index.php

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();
 	}

RecreateTrustedIPs.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
 	$hashPos = strpos($rawline, '#');
 	if ($hashPos !== false) {
 		$line = substr($rawline, 0, $hashPos);
-	}
-	else {
+	} else {
 		$line = $rawline;
 	}