enwikipedia-acc / waca

includes/DataObjects/User.php

Spacing +5 added lines, -5 removed lines

@@ -131,7 +131,7 @@ 
 			$user->setDatabase($database); 
 
 			// Using cached data here!
-			if($user->getOAuthOnWikiName(true) == $username) {
+			if ($user->getOAuthOnWikiName(true) == $username) {
 				// Success.
 				return $user;
 			}
@@ -144,7 +144,7 @@ 
 			$user->setDatabase($database); 
 
 			// Don't use the cached data, but instead query the API.
-			if($user->getOAuthOnWikiName(false) == $username) {
+			if ($user->getOAuthOnWikiName(false) == $username) {
 				// Success.
 				return $user;
 			}
@@ -202,7 +202,7 @@ 
 			$u->setDatabase($database);
 			$u->isNew = false;
 
-			if(! $u->isCheckuser()) {
+			if (!$u->isCheckuser()) {
 				continue;
 			}
 
@@ -690,7 +690,7 @@ 
 			$this->identityCache->aud == $oauthConsumerToken &&
 			$this->identityCache->iss == $oauthMediaWikiCanonicalServer
 			) {
-			if(
+			if (
 				$useCached || (
 					DateTime::createFromFormat("U", $this->identityCache->iat) < new DateTime() &&
 					DateTime::createFromFormat("U", $this->identityCache->exp) > new DateTime()
@@ -714,7 +714,7 @@ 
 	private function getOAuthOnWikiName($useCached = false)
 	{
 		$identity = $this->getOAuthIdentity($useCached);
-		if($identity !== null) {
+		if ($identity !== null) {
 			return $identity->username;
 		}
 

Braces +4 added lines, -2 removed lines

@@ -822,11 +822,13 @@
     
 	#endregion
     
-	public function getForgottenPasswordHash() {
+	public function getForgottenPasswordHash()
+	{
 		return md5($this->username . $this->email . $this->welcome_template . $this->id . $this->password);
 	}
 
-	public function getApprovalDate() {
+	public function getApprovalDate()
+	{
 		$query = $this->dbObject->prepare(<<<SQL
 			SELECT timestamp 
 			FROM log 

includes/Helpers/Logger.php

Braces +1 added lines, -2 removed lines

@@ -425,8 +425,7 @@
 			);
 		
 		$statement = $database->query("SELECT CONCAT('Closed ', id) as k, CONCAT('closed (',name,')') as v FROM emailtemplate;");
-		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row)
-		{
+		foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {
 			$lookup[$row['k']] = $row['v'];
 		}
 		

includes/DataObjects/EmailTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 
 		$statement = $database->prepare("SELECT * FROM `emailtemplate` WHERE defaultaction = :forcreated AND active = 1;");
 
-		if($defaultAction === false) {
+		if ($defaultAction === false) {
 			$statement = $database->prepare(
 				"SELECT * FROM `emailtemplate` WHERE defaultaction not in ('created', 'not created') AND active = 1;");
 		}

acc.php

Braces +2 added lines, -2 removed lines

@@ -1281,7 +1281,7 @@ 
 		if ($_POST['action'] == EmailTemplate::CREATED || $_POST['action'] == EmailTemplate::NOT_CREATED) {
 			$request->setStatus('Closed');
 
-			if($_POST['action'] == EmailTemplate::CREATED){
+			if($_POST['action'] == EmailTemplate::CREATED) {
 				$gem  = 'custom-y';
 				$crea = "Custom, Created";
 			}
@@ -1331,7 +1331,7 @@ 
 		BootstrapSkin::displayInternalFooter();
 		die();		
 	}
-	else{
+	else {
 		// Not a custom close, just a normal close
 	    
 		$request->setStatus('Closed');

Spacing +4 added lines, -4 removed lines

@@ -1218,7 +1218,7 @@ 
 	if ($gem == 1 && !$exists && !isset($_GET['createoverride'])) {
 		$alertContent = "<p>You have chosen to mark this request as \"created\", but the account does not exist on the English Wikipedia, proceed?</p><br />";
 		$alertContent .= "<div class=\"row-fluid\">";
-		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] ."&amp;createoverride=yes\">Yes</a>";
+		$alertContent .= "<a class=\"btn btn-success offset3 span3\"  href=\"$baseurl/acc.php?" . $_SERVER["QUERY_STRING"] . "&amp;createoverride=yes\">Yes</a>";
 		$alertContent .= "<a class=\"btn btn-danger span3\" href=\"$baseurl/acc.php\">No</a>";
 		$alertContent .= "</div>";
         
@@ -1286,7 +1286,7 @@ 
 		if ($_POST['action'] == EmailTemplate::CREATED || $_POST['action'] == EmailTemplate::NOT_CREATED) {
 			$request->setStatus('Closed');
 
-			if($_POST['action'] == EmailTemplate::CREATED){
+			if ($_POST['action'] == EmailTemplate::CREATED) {
 				$gem  = 'custom-y';
 				$crea = "Custom, Created";
 			}
@@ -1311,7 +1311,7 @@ 
 			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']);
@@ -1345,7 +1345,7 @@ 
 		BootstrapSkin::displayInternalFooter();
 		die();		
 	}
-	else{
+	else {
 		// Not a custom close, just a normal close
 	    
 		$request->setStatus('Closed');

tests/includes/IrcColourCodeTest.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
         $i = $this->irc;
 
-        $this->assertEquals($i::BOLD,"\x02");
+        $this->assertEquals($i::BOLD, "\x02");
         $this->assertEquals($i::ITALIC, "\x09");
         $this->assertEquals($i::STRIKE, "\x13");
         $this->assertEquals($i::UNDERLINE, "\x15");
@@ -43,7 +43,7 @@ 
         $this->assertEquals($i::DARK_GREY, "\x0314");
         $this->assertEquals($i::LIGHT_GREY, "\x0315");
 
-        $this->assertNotEquals($i::BOLD,"\x021");
+        $this->assertNotEquals($i::BOLD, "\x021");
         $this->assertNotEquals($i::ITALIC, "\x091");
         $this->assertNotEquals($i::STRIKE, "\x131");
         $this->assertNotEquals($i::UNDERLINE, "\x151");

Braces +4 added lines, -2 removed lines

@@ -10,11 +10,13 @@
 		$this->irc = new IrcColourCode();
 	}
 
-	public function tearDown() {
+	public function tearDown()
+	{
         $this->irc = NULL;
     }
 
-    public function test_colorCodes() {
+    public function test_colorCodes()
+    {
 
         $i = $this->irc;
 

tests/includes/StringFunctionsTest.php

Braces +6 added lines, -3 removed lines

@@ -10,11 +10,13 @@ 
 		$this->e = new StringFunctions();
 	}
 
-	public function tearDown() {
+	public function tearDown()
+	{
         $this->e = NULL;
     }
 
-    public function test_formatAsUsername() {
+    public function test_formatAsUsername()
+    {
         // Happy path
         $this->assertEquals($this->e->formatAsUsername("this"), "This");
         $this->assertEquals($this->e->formatAsUsername("1this"), "1this");
@@ -29,7 +31,8 @@ 
         $this->assertNotEquals($this->e->formatAsUsername("1this"), "1This");
     }
 
-    public function test_formatAsEmail() {
+    public function test_formatAsEmail()
+    {
         $this->assertEquals($this->e->formatAsEmail("this@example.com"), "this@example.com");
         $this->assertEquals($this->e->formatAsEmail("1this12345@example.com"), "1this12345@example.com");
         $this->assertEquals($this->e->formatAsEmail(" 1this12345@example.com"), "1this12345@example.com");

tests/includes/stringsTest.php

Braces +6 added lines, -3 removed lines

@@ -10,11 +10,13 @@ 
 		$this->e = new strings();
 	}
 
-	public function tearDown() {
+	public function tearDown()
+	{
         $this->e = NULL;
     }
 
-    public function test_struname() {
+    public function test_struname()
+    {
         // Happy path
         $this->assertEquals($this->e->struname("this"), "This");
         $this->assertEquals($this->e->struname("1this"), "1this");
@@ -29,7 +31,8 @@ 
         $this->assertNotEquals($this->e->struname("1this"), "1This");
     }
 
-    public function test_stremail() {
+    public function test_stremail()
+    {
         $this->assertEquals($this->e->stremail("this@example.com"), "this@example.com");
         $this->assertEquals($this->e->stremail("1this12345@example.com"), "1this12345@example.com");
         $this->assertEquals($this->e->stremail(" 1this12345@example.com"), "1this12345@example.com");

functions.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
  */
 function isHttps() {
 	if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-		if($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+		if ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
 			// Client <=> Proxy is encrypted
 			return true;
 		}
@@ -61,12 +61,12 @@ 
 	}
 
 	if (isset($_SERVER['HTTPS'])) {
-		if($_SERVER['HTTPS'] === 'off') {
+		if ($_SERVER['HTTPS'] === 'off') {
 			// ISAPI on IIS breaks the spec. :(
 			return false;
 		}
 
-		if($_SERVER['HTTPS'] !== '') {
+		if ($_SERVER['HTTPS'] !== '') {
 			// Set to a non-empty value
 			return true;
 		}

Braces +4 added lines, -2 removed lines

@@ -48,7 +48,8 @@ 
  * Returns a value indicating whether the current request was issued over HTTPSs
  * @return bool true if HTTPS
  */
-function isHttps() {
+function isHttps()
+{
 	if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
 		if($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
 			// Client <=> Proxy is encrypted
@@ -399,7 +400,8 @@ 
  * @param $users string[] Array of usernames as strings
  * @return string
  */
-function getTypeaheadSource($users) {
+function getTypeaheadSource($users)
+{
 	$userList = "";
 	foreach ($users as $v) {
 		$userList .= "\"" . htmlentities($v) . "\", ";

includes/DataObjects/Notification.php

Braces +4 added lines, -2 removed lines

@@ -330,7 +330,8 @@ 
 	 * Summary of sentMail
 	 * @param Request $request
 	 */
-	public static function sentMail(Request $request) {
+	public static function sentMail(Request $request)
+	{
 		self::send(User::getCurrent()->getUsername() 
 			. " sent an email related to Request {$request->getId()} ({$request->getName()})");
 	}
@@ -371,7 +372,8 @@ 
 	 * @param Request $request
 	 * @param User $target
 	 */
-	public static function requestReservationSent(Request $request, User $target) {
+	public static function requestReservationSent(Request $request, User $target)
+	{
 		self::send(
 			"Reservation of request {$request->getId()} ({$request->getName()}) sent to {$target->getUsername()} by " 
 			. User::getCurrent()->getUsername());