mdaniels5757 / waca

includes/DataObjects/Notification.php

Spacing +25 added lines, -25 removed lines

@@ -98,7 +98,7 @@ 
 		$blacklist = array("DCC", "CCTP", "PRIVMSG");
 		$message = str_replace($blacklist, "(IRC Blacklist)", $message); //Lets stop DCC etc
 
-		$msg = IrcColourCode::RESET . IrcColourCode::BOLD . "[$whichami]" . IrcColourCode::RESET . ": $message";
+		$msg = IrcColourCode::RESET.IrcColourCode::BOLD."[$whichami]".IrcColourCode::RESET.": $message";
 
 		try {
 			$database = gGetDb('notifications');
@@ -136,7 +136,7 @@ 
 	 */
 	public static function userApproved(User $user)
 	{
-		self::send("{$user->getUsername()} approved by " . User::getCurrent()->getUsername());
+		self::send("{$user->getUsername()} approved by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	public static function userPromoted(User $user)
 	{
-		self::send("{$user->getUsername()} promoted to tool admin by " . User::getCurrent()->getUsername());
+		self::send("{$user->getUsername()} promoted to tool admin by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -155,7 +155,7 @@ 
 	 */
 	public static function userDeclined(User $user, $reason)
 	{
-		self::send("{$user->getUsername()} declined by " . User::getCurrent()->getUsername() . " ($reason)");
+		self::send("{$user->getUsername()} declined by ".User::getCurrent()->getUsername()." ($reason)");
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 */
 	public static function userDemoted(User $user, $reason)
 	{
-		self::send("{$user->getUsername()} demoted by " . User::getCurrent()->getUsername() . " ($reason)");
+		self::send("{$user->getUsername()} demoted by ".User::getCurrent()->getUsername()." ($reason)");
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	 */
 	public static function userSuspended(User $user, $reason)
 	{
-		self::send("{$user->getUsername()} suspended by " . User::getCurrent()->getUsername() . " ($reason)");
+		self::send("{$user->getUsername()} suspended by ".User::getCurrent()->getUsername()." ($reason)");
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	public static function userPrefChange(User $user)
 	{
-		self::send("{$user->getUsername()}'s preferences were changed by " . User::getCurrent()->getUsername());
+		self::send("{$user->getUsername()}'s preferences were changed by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 	 */
 	public static function userRenamed(User $user, $old)
 	{
-		self::send(User::getCurrent()->getUsername() . " renamed $old to {$user->getUsername()}");
+		self::send(User::getCurrent()->getUsername()." renamed $old to {$user->getUsername()}");
 	}
 
 	#endregion
@@ -207,7 +207,7 @@ 
 	 */
 	public static function interfaceMessageEdited(InterfaceMessage $message)
 	{
-		self::send("Message {$message->getDescription()} ({$message->getId()}) edited by " . User::getCurrent()->getUsername());
+		self::send("Message {$message->getDescription()} ({$message->getId()}) edited by ".User::getCurrent()->getUsername());
 	}
 	#endregion
 
@@ -218,7 +218,7 @@ 
 	 */
 	public static function welcomeTemplateCreated(WelcomeTemplate $template)
 	{
-		self::send("Welcome template {$template->getId()} created by " . User::getCurrent()->getUsername());
+		self::send("Welcome template {$template->getId()} created by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	 */
 	public static function welcomeTemplateDeleted($templateid)
 	{
-		self::send("Welcome template {$templateid} deleted by " . User::getCurrent()->getUsername());
+		self::send("Welcome template {$templateid} deleted by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	public static function welcomeTemplateEdited(WelcomeTemplate $template)
 	{
-		self::send("Welcome template {$template->getId()} edited by " . User::getCurrent()->getUsername());
+		self::send("Welcome template {$template->getId()} edited by ".User::getCurrent()->getUsername());
 	}
 
 	#endregion
@@ -252,7 +252,7 @@ 
 			$duration = "indefinitely";
 		}
 		else {
-			$duration = "until " . date("F j, Y, g:i a", $ban->getDuration());
+			$duration = "until ".date("F j, Y, g:i a", $ban->getDuration());
 		}
 
 		$username = User::getCurrent()->getUsername();
@@ -267,7 +267,7 @@ 
 	 */
 	public static function unbanned(Ban $ban, $unbanreason)
 	{
-		self::send($ban->getTarget() . " unbanned by " . User::getCurrent()->getUsername() . " (" . $unbanreason . ")");
+		self::send($ban->getTarget()." unbanned by ".User::getCurrent()->getUsername()." (".$unbanreason.")");
 	}
 
 	#endregion
@@ -283,15 +283,15 @@ 
 		global $baseurl;
 
 		self::send(
-			IrcColourCode::DARK_GREY . "[["
-			. IrcColourCode::DARK_GREEN . "acc:"
-			. IrcColourCode::ORANGE . $request->getId()
-			. IrcColourCode::DARK_GREY . "]]"
-			. IrcColourCode::RED . " N "
-			. IrcColourCode::DARK_BLUE . $baseurl . "/acc.php?action=zoom&id={$request->getId()} "
-			. IrcColourCode::DARK_RED . "* "
-			. IrcColourCode::DARK_GREEN . $request->getName()
-			. IrcColourCode::DARK_RED . " * "
+			IrcColourCode::DARK_GREY."[["
+			. IrcColourCode::DARK_GREEN."acc:"
+			. IrcColourCode::ORANGE.$request->getId()
+			. IrcColourCode::DARK_GREY."]]"
+			. IrcColourCode::RED." N "
+			. IrcColourCode::DARK_BLUE.$baseurl."/acc.php?action=zoom&id={$request->getId()} "
+			. IrcColourCode::DARK_RED."* "
+			. IrcColourCode::DARK_GREEN.$request->getName()
+			. IrcColourCode::DARK_RED." * "
 			. IrcColourCode::RESET
 			);
 	}
@@ -434,7 +434,7 @@ 
 	 */
 	public static function emailCreated(EmailTemplate $template)
 	{
-		self::send("Email {$template->getId()} ({$template->getName()}) created by " . User::getCurrent()->getUsername());
+		self::send("Email {$template->getId()} ({$template->getName()}) created by ".User::getCurrent()->getUsername());
 	}
 
 	/**
@@ -443,7 +443,7 @@ 
 	 */
 	public static function emailEdited(EmailTemplate $template)
 	{
-		self::send("Email {$template->getId()} ({$template->getName()}) edited by " . User::getCurrent()->getUsername());
+		self::send("Email {$template->getId()} ({$template->getName()}) edited by ".User::getCurrent()->getUsername());
 	}
 
 	#endregion

includes/DataObjects/InterfaceMessage.php

Spacing +1 added lines, -1 removed lines

@@ -118,6 +118,6 @@
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=messagemgmt&amp;view=' . $this->getId() . '">' . htmlentities($this->description) . "</a>";
+		return '<a href="acc.php?action=messagemgmt&amp;view='.$this->getId().'">'.htmlentities($this->description)."</a>";
 	}
 }

includes/DataObjects/WelcomeTemplate.php

Spacing +1 added lines, -1 removed lines

@@ -108,6 +108,6 @@
 	
 	public function getObjectDescription()
 	{
-		return '<a href="acc.php?action=templatemgmt&amp;view=' . $this->getId() . '">' . htmlentities($this->usercode) . "</a>";
+		return '<a href="acc.php?action=templatemgmt&amp;view='.$this->getId().'">'.htmlentities($this->usercode)."</a>";
 	}
 }

includes/DataObjects/Ban.php

Spacing +1 added lines, -1 removed lines

@@ -258,6 +258,6 @@
 	
 	public function getObjectDescription()
 	{
-		return 'Ban #' . $this->getId() . " (" . htmlentities($this->target) . ")</a>";
+		return 'Ban #'.$this->getId()." (".htmlentities($this->target).")</a>";
 	}
 }

includes/DataObjects/Log.php

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

includes/StatisticsPage.php

Spacing +5 added lines, -5 removed lines

@@ -23,13 +23,13 @@ 
 	public static function Create($pageName)
 	{
 		// calculate the name of the statistics page
-		$statsPage = "Stats" . $pageName;
+		$statsPage = "Stats".$pageName;
 
 		global $filepath;
 		// check the stats page definition exists...
-		if (file_exists($filepath . "/includes/statistics/Stats" . $pageName . ".php")) {
+		if (file_exists($filepath."/includes/statistics/Stats".$pageName.".php")) {
 		// and include it.
-			require_once($filepath . "/includes/statistics/Stats" . $pageName . ".php");
+			require_once($filepath."/includes/statistics/Stats".$pageName.".php");
 		}
 		else {
 			// class def doesn't exist: error
@@ -56,7 +56,7 @@ 
 		}
 		else {
 			// file exists, but no definition of the class
-			die("No definition for statistics page: " . $statsPage);
+			die("No definition for statistics page: ".$statsPage);
 		}
 	}
 
@@ -145,7 +145,7 @@ 
 		}
 
 		// not protected or access allowed
-		echo '<div class="page-header"><h1>' . $this->getPageTitle() . '</h1></div>';
+		echo '<div class="page-header"><h1>'.$this->getPageTitle().'</h1></div>';
 
 		if ($this->requiresSimpleHtmlEnvironment()) {
 			echo '<div class="row-fluid"><div class="span12">';

redir.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 	'bgpview' => 'https://bgpview.io/ip/%DATA%'
 );
 
-if(!isset($_GET['tool'])
+if (!isset($_GET['tool'])
 	|| !isset($toolList[$_GET['tool']])
 	|| !isset($_GET['data'])
 )
@@ -23,8 +23,8 @@ 
 }
 
 if (isset($_GET['round2'])) {
-	echo '<script>window.location.href=' . json_encode(str_replace("%DATA%", urlencode($_GET['data']), $toolList[$_GET['tool']])) . '</script>';
+	echo '<script>window.location.href='.json_encode(str_replace("%DATA%", urlencode($_GET['data']), $toolList[$_GET['tool']])).'</script>';
 }
 else {
-	header("Location: " . $_SERVER["REQUEST_URI"] . "&round2=true");
+	header("Location: ".$_SERVER["REQUEST_URI"]."&round2=true");
 }

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

functions.php

Spacing +16 added lines, -16 removed lines

@@ -42,7 +42,7 @@ 
 	// Get the closing user's Email signature and append it to the Email.
 	if (User::getCurrent()->getEmailSig() != "") {
 		$emailsig = html_entity_decode(User::getCurrent()->getEmailSig(), ENT_QUOTES, "UTF-8");
-		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText() . "\n\n" . $emailsig, $headers);
+		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText()."\n\n".$emailsig, $headers);
 	}
 	else {
 		mail($target, "RE: [ACC #$id] English Wikipedia Account Request", $template->getText(), $headers);
@@ -111,8 +111,8 @@ 
 		}
 		else {
 			// This is the login form, not the request form. We need protection here.
-			$path = 'https://' . $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
-			header("Location: " . $path);
+			$path = 'https://'.$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
+			header("Location: ".$path);
 		}
 	}
 
@@ -209,7 +209,7 @@ 
 
 function displayPreview($wikicode)
 {
-	$parseresult = unserialize(file_get_contents('http://en.wikipedia.org/w/api.php?action=parse&format=php&text=' . urlencode($wikicode)));
+	$parseresult = unserialize(file_get_contents('http://en.wikipedia.org/w/api.php?action=parse&format=php&text='.urlencode($wikicode)));
 	$out = "<br />\n<h3>Preview</h3>\n<div style=\"border: 2px dashed rgb(26, 79, 133);\">\n<div style=\"margin: 20px;\">";
 	$out .= $parseresult['parse']['text']['*'];
 	$out .= '</div></div>';
@@ -299,8 +299,8 @@ 
  */
 function welcomerbotRenderSig($creator, $sig)
 {
-	$signature = html_entity_decode($sig) . ' ~~~~~';
-	if (!preg_match("/((\[\[[ ]*(w:)?[ ]*(en:)?)|(\{\{subst:))[ ]*User[ ]*:[ ]*" . $creator . "[ ]*(\]\]|\||\}\}|\/)/i", $signature)) {
+	$signature = html_entity_decode($sig).' ~~~~~';
+	if (!preg_match("/((\[\[[ ]*(w:)?[ ]*(en:)?)|(\{\{subst:))[ ]*User[ ]*:[ ]*".$creator."[ ]*(\]\]|\||\}\}|\/)/i", $signature)) {
 		$signature = "--[[User:$creator|$creator]] ([[User talk:$creator|talk]]) ~~~~~";
 	}
 	return $signature;
@@ -338,25 +338,25 @@ 
 		$pluralise = false;
 	}
 	elseif ($secs > 10 && $secs < $minuteCut) {
-		$output = round($secs / $second) . " second";
+		$output = round($secs / $second)." second";
 	}
 	elseif ($secs >= $minuteCut && $secs < $hourCut) {
-		$output = round($secs / $minute) . " minute";
+		$output = round($secs / $minute)." minute";
 	}
 	elseif ($secs >= $hourCut && $secs < $dayCut) {
-		$output = round($secs / $hour) . " hour";
+		$output = round($secs / $hour)." hour";
 	}
 	elseif ($secs >= $dayCut && $secs < $weekCut) {
-		$output = round($secs / $day) . " day";
+		$output = round($secs / $day)." day";
 	}
 	elseif ($secs >= $weekCut && $secs < $month) {
-		$output = round($secs / $week) . " week";
+		$output = round($secs / $week)." week";
 	}
 	elseif ($secs >= $month && $secs < $year) {
-		$output = round($secs / $month) . " month";
+		$output = round($secs / $month)." month";
 	}
 	elseif ($secs >= $year && $secs < $year * 10) {
-		$output = round($secs / $year) . " year";
+		$output = round($secs / $year)." year";
 	}
 	else {
 		$output = "a long time ago";
@@ -364,7 +364,7 @@ 
 	}
     
 	if ($pluralise) {
-		$output = (substr($output, 0, 2) <> "1 ") ? $output . "s ago" : $output . " ago";
+		$output = (substr($output, 0, 2) <> "1 ") ? $output."s ago" : $output." ago";
 	}
 
 	return $output;
@@ -410,9 +410,9 @@ 
 {
 	$userList = "";
 	foreach ($users as $v) {
-		$userList .= "\"" . htmlentities($v) . "\", ";
+		$userList .= "\"".htmlentities($v)."\", ";
 	}
-	$userList = "[" . rtrim($userList, ", ") . "]";
+	$userList = "[".rtrim($userList, ", ")."]";
 	$tailscript = <<<JS
 $('.username-typeahead').typeahead({
 	source: {$userList}