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

queryBrowser.php

Indentation +12 added lines, -12 removed lines

@@ -22,20 +22,20 @@
 	 */
 	public $numberedList = false;
 	
-    /**
-     * @var string
-     */
-    public $numberedListTitle = "#";
+	/**
+	 * @var string
+	 */
+	public $numberedListTitle = "#";
 	
-    /**
-     * @var boolean|callable
-     */
-    public $tableCallbackFunction = false;
+	/**
+	 * @var boolean|callable
+	 */
+	public $tableCallbackFunction = false;
 	
-    /**
-     * @var boolean|string[]
-     */
-    public $overrideTableTitles = false;
+	/**
+	 * @var boolean|string[]
+	 */
+	public $overrideTableTitles = false;
 
 	/**
 	 * @var int

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

tests/includes/IrcColourCodeTest.php

Indentation +52 added lines, -52 removed lines

@@ -2,7 +2,7 @@ 
 
 class IrcColourCodeTest extends PHPUnit_Framework_TestCase
 {
-    private $irc;
+	private $irc;
 
 	public function setUp()
 	{
@@ -11,62 +11,62 @@ 
 	}
 
 	public function tearDown() {
-        $this->irc = NULL;
-    }
+		$this->irc = NULL;
+	}
 
-    public function test_colorCodes() {
+	public function test_colorCodes() {
 
-        $i = $this->irc;
+		$i = $this->irc;
 
-        $this->assertEquals($i::BOLD,"\x02");
-        $this->assertEquals($i::ITALIC, "\x09");
-        $this->assertEquals($i::STRIKE, "\x13");
-        $this->assertEquals($i::UNDERLINE, "\x15");
-        $this->assertEquals($i::UNDERLINE2, "\x1f");
-        $this->assertEquals($i::REVERSE, "\x16");
-        $this->assertEquals($i::RESET, "\x0f");
+		$this->assertEquals($i::BOLD,"\x02");
+		$this->assertEquals($i::ITALIC, "\x09");
+		$this->assertEquals($i::STRIKE, "\x13");
+		$this->assertEquals($i::UNDERLINE, "\x15");
+		$this->assertEquals($i::UNDERLINE2, "\x1f");
+		$this->assertEquals($i::REVERSE, "\x16");
+		$this->assertEquals($i::RESET, "\x0f");
 
-        $this->assertEquals($i::WHITE, "\x0300");
-        $this->assertEquals($i::BLACK, "\x0301");
-        $this->assertEquals($i::DARK_BLUE, "\x0302");
-        $this->assertEquals($i::DARK_GREEN, "\x0303");
-        $this->assertEquals($i::RED, "\x0304");
-        $this->assertEquals($i::DARK_RED, "\x0305");
-        $this->assertEquals($i::DARK_VIOLET, "\x0306");
-        $this->assertEquals($i::ORANGE, "\x0307");
-        $this->assertEquals($i::YELLOW, "\x0308");
-        $this->assertEquals($i::LIGHT_GREEN, "\x0309");
-        $this->assertEquals($i::CYAN, "\x0310");
-        $this->assertEquals($i::LIGHT_CYAN, "\x0311");
-        $this->assertEquals($i::BLUE, "\x0312");
-        $this->assertEquals($i::VIOLET, "\x0313");
-        $this->assertEquals($i::DARK_GREY, "\x0314");
-        $this->assertEquals($i::LIGHT_GREY, "\x0315");
+		$this->assertEquals($i::WHITE, "\x0300");
+		$this->assertEquals($i::BLACK, "\x0301");
+		$this->assertEquals($i::DARK_BLUE, "\x0302");
+		$this->assertEquals($i::DARK_GREEN, "\x0303");
+		$this->assertEquals($i::RED, "\x0304");
+		$this->assertEquals($i::DARK_RED, "\x0305");
+		$this->assertEquals($i::DARK_VIOLET, "\x0306");
+		$this->assertEquals($i::ORANGE, "\x0307");
+		$this->assertEquals($i::YELLOW, "\x0308");
+		$this->assertEquals($i::LIGHT_GREEN, "\x0309");
+		$this->assertEquals($i::CYAN, "\x0310");
+		$this->assertEquals($i::LIGHT_CYAN, "\x0311");
+		$this->assertEquals($i::BLUE, "\x0312");
+		$this->assertEquals($i::VIOLET, "\x0313");
+		$this->assertEquals($i::DARK_GREY, "\x0314");
+		$this->assertEquals($i::LIGHT_GREY, "\x0315");
 
-        $this->assertNotEquals($i::BOLD,"\x021");
-        $this->assertNotEquals($i::ITALIC, "\x091");
-        $this->assertNotEquals($i::STRIKE, "\x131");
-        $this->assertNotEquals($i::UNDERLINE, "\x151");
-        $this->assertNotEquals($i::UNDERLINE2, "\x1f1");
-        $this->assertNotEquals($i::REVERSE, "\x161");
-        $this->assertNotEquals($i::RESET, "\x0f1");
+		$this->assertNotEquals($i::BOLD,"\x021");
+		$this->assertNotEquals($i::ITALIC, "\x091");
+		$this->assertNotEquals($i::STRIKE, "\x131");
+		$this->assertNotEquals($i::UNDERLINE, "\x151");
+		$this->assertNotEquals($i::UNDERLINE2, "\x1f1");
+		$this->assertNotEquals($i::REVERSE, "\x161");
+		$this->assertNotEquals($i::RESET, "\x0f1");
 
-        $this->assertNotEquals($i::WHITE, "\x03001");
-        $this->assertNotEquals($i::BLACK, "\x03011");
-        $this->assertNotEquals($i::DARK_BLUE, "\x03021");
-        $this->assertNotEquals($i::DARK_GREEN, "\x03031");
-        $this->assertNotEquals($i::RED, "\x03041");
-        $this->assertNotEquals($i::DARK_RED, "\x03051");
-        $this->assertNotEquals($i::DARK_VIOLET, "\x03061");
-        $this->assertNotEquals($i::ORANGE, "\x03071");
-        $this->assertNotEquals($i::YELLOW, "\x03081");
-        $this->assertNotEquals($i::LIGHT_GREEN, "\x03091");
-        $this->assertNotEquals($i::CYAN, "\x03101");
-        $this->assertNotEquals($i::LIGHT_CYAN, "\x03111");
-        $this->assertNotEquals($i::BLUE, "\x03121");
-        $this->assertNotEquals($i::VIOLET, "\x03131");
-        $this->assertNotEquals($i::DARK_GREY, "\x03141");
-        $this->assertNotEquals($i::LIGHT_GREY, "\x03151");
-    }
+		$this->assertNotEquals($i::WHITE, "\x03001");
+		$this->assertNotEquals($i::BLACK, "\x03011");
+		$this->assertNotEquals($i::DARK_BLUE, "\x03021");
+		$this->assertNotEquals($i::DARK_GREEN, "\x03031");
+		$this->assertNotEquals($i::RED, "\x03041");
+		$this->assertNotEquals($i::DARK_RED, "\x03051");
+		$this->assertNotEquals($i::DARK_VIOLET, "\x03061");
+		$this->assertNotEquals($i::ORANGE, "\x03071");
+		$this->assertNotEquals($i::YELLOW, "\x03081");
+		$this->assertNotEquals($i::LIGHT_GREEN, "\x03091");
+		$this->assertNotEquals($i::CYAN, "\x03101");
+		$this->assertNotEquals($i::LIGHT_CYAN, "\x03111");
+		$this->assertNotEquals($i::BLUE, "\x03121");
+		$this->assertNotEquals($i::VIOLET, "\x03131");
+		$this->assertNotEquals($i::DARK_GREY, "\x03141");
+		$this->assertNotEquals($i::LIGHT_GREY, "\x03151");
+	}
 
 }

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");

tests/includes/StringFunctionsTest.php

Indentation +34 added lines, -34 removed lines

@@ -2,7 +2,7 @@ 
 
 class StringFunctionsTest extends PHPUnit_Framework_TestCase
 {
-    private $e;
+	private $e;
 
 	public function setUp()
 	{
@@ -11,38 +11,38 @@ 
 	}
 
 	public function tearDown() {
-        $this->e = NULL;
-    }
-
-    public function test_formatAsUsername() {
-        // Happy path
-        $this->assertEquals($this->e->formatAsUsername("this"), "This");
-        $this->assertEquals($this->e->formatAsUsername("1this"), "1this");
-        $this->assertEquals($this->e->formatAsUsername("This"), "This");
-        $this->assertEquals($this->e->formatAsUsername("This "), "This");
-        $this->assertEquals($this->e->formatAsUsername("This_"), "This");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->formatAsUsername("This "), "This ");
-        $this->assertNotEquals($this->e->formatAsUsername("This_"), "This_");
-        $this->assertNotEquals($this->e->formatAsUsername("this"), "this");
-        $this->assertNotEquals($this->e->formatAsUsername("1this"), "1This");
-    }
-
-    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");
-        $this->assertEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com");
-        $this->assertEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@example.com");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->formatAsEmail(" 1this12345@example.com"), " 1this12345@example.com");
-        $this->assertNotEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com ");
-        $this->assertNotEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345 @example.com");
-        $this->assertNotEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@ example.com");
-
-    }
+		$this->e = NULL;
+	}
+
+	public function test_formatAsUsername() {
+		// Happy path
+		$this->assertEquals($this->e->formatAsUsername("this"), "This");
+		$this->assertEquals($this->e->formatAsUsername("1this"), "1this");
+		$this->assertEquals($this->e->formatAsUsername("This"), "This");
+		$this->assertEquals($this->e->formatAsUsername("This "), "This");
+		$this->assertEquals($this->e->formatAsUsername("This_"), "This");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->formatAsUsername("This "), "This ");
+		$this->assertNotEquals($this->e->formatAsUsername("This_"), "This_");
+		$this->assertNotEquals($this->e->formatAsUsername("this"), "this");
+		$this->assertNotEquals($this->e->formatAsUsername("1this"), "1This");
+	}
+
+	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");
+		$this->assertEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com");
+		$this->assertEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@example.com");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->formatAsEmail(" 1this12345@example.com"), " 1this12345@example.com");
+		$this->assertNotEquals($this->e->formatAsEmail("1this12345@example.com "), "1this12345@example.com ");
+		$this->assertNotEquals($this->e->formatAsEmail("1this12345 @example.com"), "1this12345 @example.com");
+		$this->assertNotEquals($this->e->formatAsEmail("1this12345@ example.com"), "1this12345@ example.com");
+
+	}
 
 }

tests/includes/stringsTest.php

Indentation +34 added lines, -34 removed lines

@@ -2,7 +2,7 @@ 
 
 class stringsTest extends PHPUnit_Framework_TestCase
 {
-    private $e;
+	private $e;
 
 	public function setUp()
 	{
@@ -11,38 +11,38 @@ 
 	}
 
 	public function tearDown() {
-        $this->e = NULL;
-    }
-
-    public function test_struname() {
-        // Happy path
-        $this->assertEquals($this->e->struname("this"), "This");
-        $this->assertEquals($this->e->struname("1this"), "1this");
-        $this->assertEquals($this->e->struname("This"), "This");
-        $this->assertEquals($this->e->struname("This "), "This");
-        $this->assertEquals($this->e->struname("This_"), "This");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->struname("This "), "This ");
-        $this->assertNotEquals($this->e->struname("This_"), "This_");
-        $this->assertNotEquals($this->e->struname("this"), "this");
-        $this->assertNotEquals($this->e->struname("1this"), "1This");
-    }
-
-    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");
-        $this->assertEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com");
-        $this->assertEquals($this->e->stremail("1this12345 @example.com"), "1this12345@example.com");
-        $this->assertEquals($this->e->stremail("1this12345@ example.com"), "1this12345@example.com");
-
-        // Sad Path
-        $this->assertNotEquals($this->e->stremail(" 1this12345@example.com"), " 1this12345@example.com");
-        $this->assertNotEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com ");
-        $this->assertNotEquals($this->e->stremail("1this12345 @example.com"), "1this12345 @example.com");
-        $this->assertNotEquals($this->e->stremail("1this12345@ example.com"), "1this12345@ example.com");
-
-    }
+		$this->e = NULL;
+	}
+
+	public function test_struname() {
+		// Happy path
+		$this->assertEquals($this->e->struname("this"), "This");
+		$this->assertEquals($this->e->struname("1this"), "1this");
+		$this->assertEquals($this->e->struname("This"), "This");
+		$this->assertEquals($this->e->struname("This "), "This");
+		$this->assertEquals($this->e->struname("This_"), "This");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->struname("This "), "This ");
+		$this->assertNotEquals($this->e->struname("This_"), "This_");
+		$this->assertNotEquals($this->e->struname("this"), "this");
+		$this->assertNotEquals($this->e->struname("1this"), "1This");
+	}
+
+	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");
+		$this->assertEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com");
+		$this->assertEquals($this->e->stremail("1this12345 @example.com"), "1this12345@example.com");
+		$this->assertEquals($this->e->stremail("1this12345@ example.com"), "1this12345@example.com");
+
+		// Sad Path
+		$this->assertNotEquals($this->e->stremail(" 1this12345@example.com"), " 1this12345@example.com");
+		$this->assertNotEquals($this->e->stremail("1this12345@example.com "), "1this12345@example.com ");
+		$this->assertNotEquals($this->e->stremail("1this12345 @example.com"), "1this12345 @example.com");
+		$this->assertNotEquals($this->e->stremail("1this12345@ example.com"), "1this12345@ example.com");
+
+	}
 
 }

acc.php

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');

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

includes/DataObjects/Request.php

Indentation +2 added lines, -2 removed lines

@@ -261,8 +261,8 @@
 		}
         
 		if (isset(self::$commentsResults[$this->id])) {
-		    $this->hasCommentsResolved = true;
-		    return $this->hasComments = self::$commentsResults[$this->id];
+			$this->hasCommentsResolved = true;
+			return $this->hasComments = self::$commentsResults[$this->id];
 		}
 
 		if ($this->comment != "") {