enwikipedia-acc / waca

users.php

Spacing +10 added lines, -10 removed lines

@@ -106,7 +106,7 @@ 
 	$user->approve();
 
 	BootstrapSkin::displayAlertBox(
-		"Approved user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+		"Approved user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 		"alert-info", 
 		"", 
 		false);
@@ -115,7 +115,7 @@ 
 
 	$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
 	// TODO: move to template?
-	mail($user->getEmail(), "ACC Account Approved", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been approved by " . User::getCurrent()->getUsername() . ". To login please go to $baseurl/acc.php.\nPlease note that if you cannot login immediately, we may be updating your identification information in the system.  Please let us know if you continue to have issues if you cannot login after 12 hours pass from the time you receive this approval.\n- The English Wikipedia Account Creation Team", $headers);
+	mail($user->getEmail(), "ACC Account Approved", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been approved by ".User::getCurrent()->getUsername().". To login please go to $baseurl/acc.php.\nPlease note that if you cannot login immediately, we may be updating your identification information in the system.  Please let us know if you continue to have issues if you cannot login after 12 hours pass from the time you receive this approval.\n- The English Wikipedia Account Creation Team", $headers);
 	BootstrapSkin::displayInternalFooter();
 	die();
 }
@@ -159,7 +159,7 @@ 
 		$user->demote($_POST['reason']);
 
 		BootstrapSkin::displayAlertBox( 
-			"Changed " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8') . "'s access to 'User'", 
+			"Changed ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8')."'s access to 'User'", 
 			"alert-info", 
 			"", 
 			false);
@@ -169,7 +169,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Demoted", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been demoted by " . User::getCurrent()->getUsername() . " because " . User::getCurrent()->getUsername() . ". To contest this demotion please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Demoted", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been demoted by ".User::getCurrent()->getUsername()." because ".User::getCurrent()->getUsername().". To contest this demotion please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
@@ -213,7 +213,7 @@ 
 
 		Notification::userSuspended($user, $_POST['reason']);
 		BootstrapSkin::displayAlertBox(
-			"Suspended user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+			"Suspended user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 			"alert-info", 
 			"", 
 			false);
@@ -221,7 +221,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Suspended", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been suspended by " . User::getCurrent()->getUsername() . " because " . $_POST['reason'] . ". To contest this suspension please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Suspended", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been suspended by ".User::getCurrent()->getUsername()." because ".$_POST['reason'].". To contest this suspension please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}
@@ -257,7 +257,7 @@ 
 	Notification::userPromoted($user);
 
 	BootstrapSkin::displayAlertBox(
-		htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8') . " promoted to 'Admin'", 
+		htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8')." promoted to 'Admin'", 
 		"alert-info", 
 		"", 
 		false);
@@ -265,7 +265,7 @@ 
 	$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
     
 	// TODO: move to template?
-	mail($user->getEmail(), "ACC Account Promoted", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been promted to admin status by " . User::getCurrent()->getUsername() . ".\n- The English Wikipedia Account Creation Team", $headers);
+	mail($user->getEmail(), "ACC Account Promoted", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been promted to admin status by ".User::getCurrent()->getUsername().".\n- The English Wikipedia Account Creation Team", $headers);
 	die();
 }
 
@@ -308,7 +308,7 @@ 
 		Notification::userDeclined($user, $_POST['reason']);
 
 		BootstrapSkin::displayAlertBox(
-			"Declined user " . htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
+			"Declined user ".htmlentities($user->getUsername(), ENT_COMPAT, 'UTF-8'), 
 			"alert-info", 
 			"", 
 			false);
@@ -316,7 +316,7 @@ 
 		$headers = 'From: accounts-enwiki-l@lists.wikimedia.org';
         
 		// TODO: move to template?
-		mail($user->getEmail(), "ACC Account Declined", "Dear " . $user->getOnWikiName() . ",\nYour account " . $user->getUsername() . " has been declined access to the account creation tool by " . User::getCurrent()->getUsername() . " because " . $_POST['reason'] . ". For more infomation please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
+		mail($user->getEmail(), "ACC Account Declined", "Dear ".$user->getOnWikiName().",\nYour account ".$user->getUsername()." has been declined access to the account creation tool by ".User::getCurrent()->getUsername()." because ".$_POST['reason'].". For more infomation please email accounts-enwiki-l@lists.wikimedia.org.\n- The English Wikipedia Account Creation Team", $headers);
 		BootstrapSkin::displayInternalFooter();
 		die();
 	}

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