enwikipedia-acc / waca

includes/DataObjects/Comment.php

Doc Comments +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 
 	/**
 	 * Summary of getUserObject
-	 * @return User|null
+	 * @return DataObject|null
 	 */
 	public function getUserObject()
 	{
@@ -126,7 +126,7 @@ 
 
 	/**
 	 * Summary of getRequestObject
-	 * @return Request|null
+	 * @return DataObject|null
 	 */
 	public function getRequestObject()
 	{

includes/DataObjects/Log.php

Doc Comments +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 	
 	/**
 	 * Summary of getUserObject
-	 * @return User|null
+	 * @return DataObject|null
 	 */
 	public function getUserObject()
 	{

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 		$object = $type::getById($this->objectid, $this->dbObject);
 
 		if ($object === false) {
-			return '[' . $this->objecttype . " " . $this->objectid . ']';
+			return '['.$this->objecttype." ".$this->objectid.']';
 		}
 		
 		return $object->getObjectDescription();

ClearOAuthData.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
 
 $database = gGetDb();
 
-$database->transactionally(function() use ($database)
-{
+$database->transactionally(function() use ($database) {
 	$database->exec(<<<SQL
         UPDATE user 
         SET 

RecreateTrustedIPs.php

Braces +1 added lines, -2 removed lines

@@ -87,8 +87,7 @@
 $database = gGetDb();
 
 echo "Executing transaction...\n";
-$database->transactionally(function() use ($ip, $database)
-{
+$database->transactionally(function() use ($ip, $database) {
 	$database->exec("DELETE FROM xfftrustcache;");
 
 	$insert = $database->prepare("INSERT INTO xfftrustcache (ip) VALUES (:ip);");

index.php

Braces +3 added lines, -6 removed lines

@@ -71,8 +71,7 @@ 
 			return;
 		}
         
-		$database->transactionally(function() use($database, $request, $smarty)
-		{
+		$database->transactionally(function() use($database, $request, $smarty) {
 			if ($request === false) {
 				throw new TransactionException($smarty->fetch('request/request-not-found.tpl'), "Ooops!");
 			}
@@ -136,8 +135,7 @@ 
 		else if ($enableEmailConfirm == 1) {
 			$request->generateEmailConfirmationHash();
 
-			$database->transactionally(function() use($request)
-			{
+			$database->transactionally(function() use($request) {
 				$request->save();
 
 				// checksum depends on the ID, so we have to save again!
@@ -151,8 +149,7 @@ 
 		}
 		else {
 			$request->setEmailConfirm(0); // Since it can't be null
-			$database->transactionally(function() use($request)
-			{
+			$database->transactionally(function() use($request) {
 				$request->save();
 				$request->updateChecksum();
 				$request->save();

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,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");
 			}
             

includes/DataObjects/User.php

Braces +5 added lines, -10 removed lines

@@ -593,8 +593,7 @@ 
     
 	public function approve()
 	{
-		$this->dbObject->transactionally(function()
-		{
+		$this->dbObject->transactionally(function() {
 			$this->status = "User";
 			$this->save();
 			Logger::approvedUser($this->dbObject, $this);
@@ -603,8 +602,7 @@ 
     
 	public function suspend($comment)
 	{
-		$this->dbObject->transactionally(function() use ($comment)
-		{
+		$this->dbObject->transactionally(function() use ($comment) {
 			$this->status = "Suspended";
 			$this->save();
 			Logger::suspendedUser($this->dbObject, $this, $comment);
@@ -613,8 +611,7 @@ 
     
 	public function decline($comment)
 	{
-		$this->dbObject->transactionally(function() use ($comment)
-		{
+		$this->dbObject->transactionally(function() use ($comment) {
 			$this->status = "Declined";
 			$this->save();
 			Logger::declinedUser($this->dbObject, $this, $comment);
@@ -623,8 +620,7 @@ 
     
 	public function promote()
 	{
-		$this->dbObject->transactionally(function()
-		{
+		$this->dbObject->transactionally(function() {
 			$this->status = "Admin";
 			$this->save();
 			Logger::promotedUser($this->dbObject, $this);
@@ -633,8 +629,7 @@ 
     
 	public function demote($comment)
 	{
-		$this->dbObject->transactionally(function() use ($comment)
-		{
+		$this->dbObject->transactionally(function() use ($comment) {
 			$this->status = "User";
 			$this->save();
 			Logger::demotedUser($this->dbObject, $this, $comment);

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

@@ -654,7 +654,7 @@ 
     
 	public function isCheckuser()
 	{
-	    if($this->isCheckuserCache === null) {
+	    if ($this->isCheckuserCache === null) {
 	        $this->isCheckuserCache = $this->checkuser == 1 || $this->oauthCanCheckUser();
         }
 
@@ -794,7 +794,7 @@ 
 				prepare("UPDATE user SET oauthidentitycache = null WHERE id = :id;")->
 				execute(array(":id" => $this->id));
 
-			SessionAlert::warning("OAuth error getting identity from MediaWiki: " . $ex->getMessage());
+			SessionAlert::warning("OAuth error getting identity from MediaWiki: ".$ex->getMessage());
 		}   
 	}
     
@@ -869,7 +869,7 @@ 
     
 	public function getForgottenPasswordHash()
 	{
-		return md5($this->username . $this->email . $this->welcome_template . $this->id . $this->password);
+		return md5($this->username.$this->email.$this->welcome_template.$this->id.$this->password);
 	}
 
 	public function getApprovalDate()
@@ -894,6 +894,6 @@ 
 	
 	public function getObjectDescription()
 	{
-		return '<a href="statistics.php?page=Users&amp;user=' . $this->getId() . '">' . htmlentities($this->username) . "</a>";
+		return '<a href="statistics.php?page=Users&amp;user='.$this->getId().'">'.htmlentities($this->username)."</a>";
 	}
 }

includes/Helpers/Logger.php

Braces +1 added lines, -2 removed lines

@@ -217,8 +217,7 @@
 		
 		$items = array_merge($logs, $comments);
 		
-		$sortKey = function(DataObject $item)
-		{
+		$sortKey = function(DataObject $item) {
 			if ($item instanceof Log) {
 				return $item->getTimestamp();
 			}

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

queryBrowser.php

Spacing +5 added lines, -5 removed lines

@@ -52,18 +52,18 @@ 
 		$out .= '<table class="table table-striped table-hover table-condensed"><tr>';
 
 		if ($this->numberedList == true) {
-			$out .= "<th>" . $this->numberedListTitle . "</th>";
+			$out .= "<th>".$this->numberedListTitle."</th>";
 		}
 
 		if ($this->overrideTableTitles != false) {
 			foreach ($this->overrideTableTitles as $value) {
-				$out .= "<th>" . $value . "</th>"; 
+				$out .= "<th>".$value."</th>"; 
 			}
 		}
 		else {
 			if (count($results) > 0) {
 				foreach ($results[0] as $k => $v) {
-					$out .= "<th>" . $k . "</th>"; 
+					$out .= "<th>".$k."</th>"; 
 				}
 			}
 		}
@@ -80,13 +80,13 @@ 
 				$out .= '<tr>';
                 
 				if ($this->numberedList == true) {
-					$out .= "<th>" . $currentreq . "</th>";
+					$out .= "<th>".$currentreq."</th>";
 				}
 				
 				
 				foreach ($row as $cell) {
 	
-					$out .= "<td>" . $cell . "</td>";
+					$out .= "<td>".$cell."</td>";
 				}
 	
 				

config.inc.php

Spacing +8 added lines, -8 removed lines

@@ -138,7 +138,7 @@ 
 
 $BUbasefile = "backup"; // The basefile's name.
 $BUdir = "/home/project/a/c/c/acc/backups"; // The directory where backups should be stored.
-$BUmonthdir = $BUdir . "/monthly"; // The directory where monthly backups should be stored.
+$BUmonthdir = $BUdir."/monthly"; // The directory where monthly backups should be stored.
 $BUdumper = "/opt/ts/mysql/5.1/bin/mysqldump --defaults-file=~/.my.cnf p_acc_live"; // Add parameters here if they are needed.
 $BUgzip = "/usr/bin/gzip"; // Add the gzip parameters here if needed.
 $BUtar = "/bin/tar -cvf"; // Add the tar parameters here if needed.
@@ -276,17 +276,17 @@ 
 
 $cDatabaseConfig = array(
 	"acc" => array(
-		"dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
+		"dsrcname" => "mysql:host=".$toolserver_host.";dbname=".$toolserver_database,
 		"username" => $toolserver_username,
 		"password" => $toolserver_password
 	),
 	"wikipedia" => array(
-		"dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
+		"dsrcname" => "mysql:host=".$antispoof_host.";dbname=".$antispoof_db,
 		"username" => $toolserver_username,
 		"password" => $toolserver_password
 	),
 	"notifications" => array(
-		"dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
+		"dsrcname" => "mysql:host=".$toolserver_notification_dbhost.";dbname=".$toolserver_notification_database,
 		"username" => $notifications_username,
 		"password" => $notifications_password
 	),
@@ -308,11 +308,11 @@ 
 	"mcrypt", "openssl", // password encryption etc
 	) as $x) {if (!extension_loaded($x)) {die("extension $x is required."); }}
 
-require_once($filepath . "includes/AutoLoader.php");
+require_once($filepath."includes/AutoLoader.php");
 
 spl_autoload_register("AutoLoader::load");
 
 // Extra includes which are just plain awkward wherever they are.
-require_once($filepath . 'oauth/OAuthUtility.php');
-require_once($filepath . 'lib/mediawiki-extensions-OAuth/lib/OAuth.php');
-require_once($filepath . 'lib/mediawiki-extensions-OAuth/lib/JWT.php');
+require_once($filepath.'oauth/OAuthUtility.php');
+require_once($filepath.'lib/mediawiki-extensions-OAuth/lib/OAuth.php');
+require_once($filepath.'lib/mediawiki-extensions-OAuth/lib/JWT.php');