enwikipedia-acc / waca

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,19 +276,19 @@ 
 
 $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,
 		"options"  => array(),
 	),
 	"wikipedia" => array(
-		"dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
+		"dsrcname" => "mysql:host=".$antispoof_host.";dbname=".$antispoof_db,
 		"username" => $toolserver_username,
 		"password" => $toolserver_password,
 		"options"  => array(),
 	),
 	"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,
 		"options"  => array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4'),
@@ -311,11 +311,11 @@ 
 	"openssl", // email confirmation hash gen, oauth stuff
 	) 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');

includes/statistics/StatsIdUsers.php

Indentation +30 added lines, -30 removed lines

@@ -14,31 +14,31 @@ 
 
 class StatsIdUsers extends StatisticsPage
 {
-    protected function execute()
-    {
-        return $this->getUserList();
-    }
+	protected function execute()
+	{
+		return $this->getUserList();
+	}
 
-    public function getPageTitle()
-    {
-        return "User identification status";
-    }
+	public function getPageTitle()
+	{
+		return "User identification status";
+	}
 
-    public function getPageName()
-    {
-        return "IdUsers";
-    }
+	public function getPageName()
+	{
+		return "IdUsers";
+	}
 
-    public function isProtected()
-    {
-        return true;
-    }
+	public function isProtected()
+	{
+		return true;
+	}
 
-    private function getUserList()
-    {
-        global $currentIdentificationVersion, $forceIdentification;
+	private function getUserList()
+	{
+		global $currentIdentificationVersion, $forceIdentification;
 
-        $query = <<<SQL
+		$query = <<<SQL
 select username, status, checkuser, identified, case 
     when coalesce(identified, 0) = 0 then 'Not identified'
     when identified < ${forceIdentification} then 'Expired'
@@ -51,16 +51,16 @@ 
 order by username;
 SQL;
 
-        $qb = new QueryBrowser();
-        $qb->rowFetchMode = PDO::FETCH_NUM;
-        $qb->overrideTableTitles = array("User name", "Access level", "Checkuser?", "Version", "Identification status");
-        $r = $qb->executeQueryToTable($query);
+		$qb = new QueryBrowser();
+		$qb->rowFetchMode = PDO::FETCH_NUM;
+		$qb->overrideTableTitles = array("User name", "Access level", "Checkuser?", "Version", "Identification status");
+		$r = $qb->executeQueryToTable($query);
 
-        return $r;
-    }
+		return $r;
+	}
 
-    public function requiresWikiDatabase()
-    {
-        return false;
-    }
+	public function requiresWikiDatabase()
+	{
+		return false;
+	}
 }

includes/DataObjects/Request.php

Spacing +12 added lines, -12 removed lines

@@ -63,11 +63,11 @@ 
 		if ($this->isNew) {
 // insert
 			$statement = $this->dbObject->prepare(
-				"INSERT INTO `request` (" .
-				"email, ip, name, comment, status, date, checksum, emailsent, emailconfirm, reserved, useragent, forwardedip" .
-				") VALUES (" .
-				":email, :ip, :name, :comment, :status, CURRENT_TIMESTAMP(), :checksum, :emailsent," .
-				":emailconfirm, :reserved, :useragent, :forwardedip" .
+				"INSERT INTO `request` (".
+				"email, ip, name, comment, status, date, checksum, emailsent, emailconfirm, reserved, useragent, forwardedip".
+				") VALUES (".
+				":email, :ip, :name, :comment, :status, CURRENT_TIMESTAMP(), :checksum, :emailsent,".
+				":emailconfirm, :reserved, :useragent, :forwardedip".
 				");");
 			$statement->bindValue(":email", $this->email);
 			$statement->bindValue(":ip", $this->ip);
@@ -90,9 +90,9 @@ 
 		}
 		else {
 // update
-			$statement = $this->dbObject->prepare("UPDATE `request` SET " .
-				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, " .
-				"reserved = :reserved " .
+			$statement = $this->dbObject->prepare("UPDATE `request` SET ".
+				"status = :status, checksum = :checksum, emailsent = :emailsent, emailconfirm = :emailconfirm, ".
+				"reserved = :reserved ".
 				"WHERE id = :id;");
 			$statement->bindValue(":id", $this->id);
 			$statement->bindValue(":status", $this->status);
@@ -196,7 +196,7 @@ 
 
 	public function updateChecksum()
 	{
-		$this->checksum = md5($this->id . $this->name . $this->email . microtime());
+		$this->checksum = md5($this->id.$this->name.$this->email.microtime());
 	}
 
 	public function getEmailSent()
@@ -323,7 +323,7 @@ 
 			$query = $this->dbObject->prepare("SELECT * FROM request WHERE (ip = :ip OR forwardedip LIKE :forwarded) AND ip != :clearedip AND id != :id AND emailconfirm = 'Confirmed';");
 
 			$trustedIp = $this->getTrustedIp();
-			$trustedFilter = '%' . $trustedIp . '%';
+			$trustedFilter = '%'.$trustedIp.'%';
 
 			$query->bindValue(":id", $this->id);
 			$query->bindValue(":ip", $trustedIp);
@@ -351,7 +351,7 @@ 
 			return false;
 		}
 
-		$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=" . urlencode($this->name) . "&tbaction=new-account&tbnooverride&format=php");
+		$apiResult = file_get_contents("https://en.wikipedia.org/w/api.php?action=titleblacklist&tbtitle=".urlencode($this->name)."&tbaction=new-account&tbnooverride&format=php");
 
 		$data = unserialize($apiResult);
 
@@ -423,7 +423,7 @@ 
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=zoom&amp;id=' . $this->getId() . '">Request #' . $this->getId() . " (" . htmlentities($this->name) . ")</a>";
+		return '<a href="acc.php?action=zoom&amp;id='.$this->getId().'">Request #'.$this->getId()." (".htmlentities($this->name).")</a>";
 	}
 
 	public function getClosureReason()