Completed
Pull Request — master (#257)
by Matthew
03:28
created
ClearOAuthData.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,7 @@
 block discarded – undo
12 12
 
13 13
 $database = gGetDb();
14 14
 
15
-$database->transactionally(function() use ($database)
16
-{
15
+$database->transactionally(function() use ($database) {
17 16
 	$database->exec(<<<SQL
18 17
         UPDATE user 
19 18
         SET 
Please login to merge, or discard this patch.
ClearOldData.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,8 +10,7 @@
 block discarded – undo
10 10
 
11 11
 $db = gGetDb( );
12 12
 
13
-$db->transactionally(function() use ($db)
14
-{
13
+$db->transactionally(function() use ($db) {
15 14
 	global $cDataClearIp, $cDataClearEmail, $dataclear_interval;
16 15
     
17 16
 	$query = $db->prepare("UPDATE request SET ip = :ip, forwardedip = null, email = :mail, useragent = '' WHERE date < DATE_SUB(curdate(), INTERVAL $dataclear_interval);");
Please login to merge, or discard this patch.
RecreateTrustedIPs.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,8 +87,7 @@
 block discarded – undo
87 87
 $database = gGetDb();
88 88
 
89 89
 echo "Executing transaction...\n";
90
-$database->transactionally(function() use ($ip, $database)
91
-{
90
+$database->transactionally(function() use ($ip, $database) {
92 91
 	$database->exec("DELETE FROM xfftrustcache;");
93 92
 
94 93
 	$insert = $database->prepare("INSERT INTO xfftrustcache (ip) VALUES (:ip);");
Please login to merge, or discard this patch.
includes/BootstrapSkin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -103,8 +103,7 @@
 block discarded – undo
103 103
 		$creators = implode(
104 104
 			", ",
105 105
 			array_map(
106
-				function($arg)
107
-				{
106
+				function($arg) {
108 107
 					global $baseurl;
109 108
 
110 109
 					/** @var User $arg */
Please login to merge, or discard this patch.
index.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -71,8 +71,7 @@  discard block
 block discarded – undo
71 71
 			return;
72 72
 		}
73 73
         
74
-		$database->transactionally(function() use($database, $request, $smarty)
75
-		{
74
+		$database->transactionally(function() use($database, $request, $smarty) {
76 75
 			if ($request === false) {
77 76
 				throw new TransactionException($smarty->fetch('request/request-not-found.tpl'), "Ooops!");
78 77
 			}
@@ -136,8 +135,7 @@  discard block
 block discarded – undo
136 135
 		else if ($enableEmailConfirm == 1) {
137 136
 			$request->generateEmailConfirmationHash();
138 137
 
139
-			$database->transactionally(function() use($request)
140
-			{
138
+			$database->transactionally(function() use($request) {
141 139
 				$request->save();
142 140
 
143 141
 				// checksum depends on the ID, so we have to save again!
@@ -151,8 +149,7 @@  discard block
 block discarded – undo
151 149
 		}
152 150
 		else {
153 151
 			$request->setEmailConfirm(0); // Since it can't be null
154
-			$database->transactionally(function() use($request)
155
-			{
152
+			$database->transactionally(function() use($request) {
156 153
 				$request->save();
157 154
 				$request->updateChecksum();
158 155
 				$request->save();
Please login to merge, or discard this patch.
includes/DataObjects/User.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -593,8 +593,7 @@  discard block
 block discarded – undo
593 593
     
594 594
 	public function approve()
595 595
 	{
596
-		$this->dbObject->transactionally(function()
597
-		{
596
+		$this->dbObject->transactionally(function() {
598 597
 			$this->status = "User";
599 598
 			$this->save();
600 599
 			Logger::approvedUser($this->dbObject, $this);
@@ -603,8 +602,7 @@  discard block
 block discarded – undo
603 602
     
604 603
 	public function suspend($comment)
605 604
 	{
606
-		$this->dbObject->transactionally(function() use ($comment)
607
-		{
605
+		$this->dbObject->transactionally(function() use ($comment) {
608 606
 			$this->status = "Suspended";
609 607
 			$this->save();
610 608
 			Logger::suspendedUser($this->dbObject, $this, $comment);
@@ -613,8 +611,7 @@  discard block
 block discarded – undo
613 611
     
614 612
 	public function decline($comment)
615 613
 	{
616
-		$this->dbObject->transactionally(function() use ($comment)
617
-		{
614
+		$this->dbObject->transactionally(function() use ($comment) {
618 615
 			$this->status = "Declined";
619 616
 			$this->save();
620 617
 			Logger::declinedUser($this->dbObject, $this, $comment);
@@ -623,8 +620,7 @@  discard block
 block discarded – undo
623 620
     
624 621
 	public function promote()
625 622
 	{
626
-		$this->dbObject->transactionally(function()
627
-		{
623
+		$this->dbObject->transactionally(function() {
628 624
 			$this->status = "Admin";
629 625
 			$this->save();
630 626
 			Logger::promotedUser($this->dbObject, $this);
@@ -633,8 +629,7 @@  discard block
 block discarded – undo
633 629
     
634 630
 	public function demote($comment)
635 631
 	{
636
-		$this->dbObject->transactionally(function() use ($comment)
637
-		{
632
+		$this->dbObject->transactionally(function() use ($comment) {
638 633
 			$this->status = "User";
639 634
 			$this->save();
640 635
 			Logger::demotedUser($this->dbObject, $this, $comment);
Please login to merge, or discard this patch.
includes/Helpers/Logger.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -217,8 +217,7 @@
 block discarded – undo
217 217
 		
218 218
 		$items = array_merge($logs, $comments);
219 219
 		
220
-		$sortKey = function(DataObject $item)
221
-		{
220
+		$sortKey = function(DataObject $item) {
222 221
 			if ($item instanceof Log) {
223 222
 				return $item->getTimestamp();
224 223
 			}
Please login to merge, or discard this patch.
acc.php 1 patch
Braces   +18 added lines, -33 removed lines patch added patch discarded remove patch
@@ -154,8 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
 	$database = gGetDb();
156 156
     
157
-	$database->transactionally(function() use ($database, $useOauthSignup)
158
-	{
157
+	$database->transactionally(function() use ($database, $useOauthSignup) {
159 158
     
160 159
 		$newUser = new User();
161 160
 		$newUser->setDatabase($database);
@@ -483,8 +482,7 @@  discard block
 block discarded – undo
483 482
         
484 483
 		$database = gGetDb();
485 484
         
486
-		$database->transactionally(function() use ($database)
487
-		{
485
+		$database->transactionally(function() use ($database) {
488 486
 			global $smarty;
489 487
             
490 488
 			$message = InterfaceMessage::getById($_GET['edit'], $database);
@@ -572,8 +570,7 @@  discard block
 block discarded – undo
572 570
             
573 571
 			$database = gGetDb();
574 572
             
575
-			$database->transactionally(function() use ($database, $baseurl)
576
-			{
573
+			$database->transactionally(function() use ($database, $baseurl) {
577 574
 				$template = new WelcomeTemplate();
578 575
 				$template->setDatabase($database);
579 576
 				$template->setUserCode($_POST['usercode']);
@@ -658,8 +655,7 @@  discard block
 block discarded – undo
658 655
 			die();
659 656
 		}
660 657
         
661
-		$database->transactionally(function() use($database, $template)
662
-		{
658
+		$database->transactionally(function() use($database, $template) {
663 659
 			$tid = $template->getId();
664 660
             
665 661
 			$database
@@ -695,8 +691,7 @@  discard block
 block discarded – undo
695 691
 		}
696 692
 
697 693
 		if (isset($_POST['submit'])) {
698
-			$database->transactionally(function() use($database, $template)
699
-			{
694
+			$database->transactionally(function() use($database, $template) {
700 695
 				$template->setUserCode($_POST['usercode']);
701 696
 				$template->setBotCode($_POST['botcode']);
702 697
 				$template->save();
@@ -827,8 +822,7 @@  discard block
 block discarded – undo
827 822
     
828 823
 	$currentUsername = User::getCurrent()->getUsername();
829 824
     
830
-	$database->transactionally(function() use ($database, $ban, $duration, $currentUsername)
831
-	{
825
+	$database->transactionally(function() use ($database, $ban, $duration, $currentUsername) {
832 826
 		$ban->setDatabase($database);
833 827
 		$ban->setActive(1);
834 828
 		$ban->setType($_POST['type']);
@@ -893,8 +887,7 @@  discard block
 block discarded – undo
893 887
 		else {
894 888
 			$database = gGetDb();
895 889
             
896
-			$database->transactionally(function() use ($database, $ban)
897
-			{
890
+			$database->transactionally(function() use ($database, $ban) {
898 891
 				$ban->setActive(0);
899 892
 				$ban->save();
900 893
                 
@@ -1043,8 +1036,7 @@  discard block
 block discarded – undo
1043 1036
 		}
1044 1037
         
1045 1038
 		$database = gGetDb();
1046
-		$database->transactionally(function() use ($database, $request)
1047
-		{
1039
+		$database->transactionally(function() use ($database, $request) {
1048 1040
 			global $availableRequestStates;
1049 1041
                 
1050 1042
 			$request->setReserved(0);
@@ -1194,7 +1186,8 @@  discard block
 block discarded – undo
1194 1186
 	$emailTemplate = EmailTemplate::getById($gem, gGetDb());
1195 1187
 	if ($emailTemplate instanceof EmailTemplate) {
1196 1188
 		$isForCreated = $emailTemplate->getDefaultAction() === EmailTemplate::CREATED;
1197
-	} else {
1189
+	}
1190
+	else {
1198 1191
 		$isForCreated = false;
1199 1192
 	}
1200 1193
 
@@ -1463,8 +1456,7 @@  discard block
 block discarded – undo
1463 1456
 elseif ($action == "reserve") {
1464 1457
 	$database = gGetDb();
1465 1458
     
1466
-	$database->transactionally(function() use ($database)
1467
-	{
1459
+	$database->transactionally(function() use ($database) {
1468 1460
 		$request = Request::getById($_GET['resid'], $database);
1469 1461
         
1470 1462
 		if ($request == false) {
@@ -1567,8 +1559,7 @@  discard block
 block discarded – undo
1567 1559
 	if ($reservedUser->getId() != User::getCurrent()->getId()) {
1568 1560
 		if (User::getCurrent()->isAdmin()) {
1569 1561
 			if (isset($_GET['confirm']) && $_GET['confirm'] == 1) {
1570
-				$database->transactionally(function() use($database, $request)
1571
-				{
1562
+				$database->transactionally(function() use($database, $request) {
1572 1563
 					$request->setReserved(0);
1573 1564
 					$request->save();
1574 1565
 
@@ -1593,8 +1584,7 @@  discard block
 block discarded – undo
1593 1584
 		}
1594 1585
 	}
1595 1586
 	else {
1596
-		$database->transactionally(function() use ($database, $request)
1597
-		{
1587
+		$database->transactionally(function() use ($database, $request) {
1598 1588
 			$request->setReserved(0);
1599 1589
 			$request->save();
1600 1590
 
@@ -1787,8 +1777,7 @@  discard block
 block discarded – undo
1787 1777
 	
1788 1778
 	if ($_SERVER['REQUEST_METHOD'] == 'POST') {
1789 1779
 		$database = gGetDb();
1790
-		$database->transactionally(function() use ($database, $comment, $baseurl)
1791
-		{
1780
+		$database->transactionally(function() use ($database, $comment, $baseurl) {
1792 1781
             
1793 1782
 			$comment->setComment($_POST['newcomment']);
1794 1783
 			$comment->setVisibility($_POST['visibility']);
@@ -1835,8 +1824,7 @@  discard block
 block discarded – undo
1835 1824
 		die();
1836 1825
 	}
1837 1826
     
1838
-	$database->transactionally(function() use ($database, $user, $request, $curuser)
1839
-	{
1827
+	$database->transactionally(function() use ($database, $user, $request, $curuser) {
1840 1828
 		$updateStatement = $database->prepare("UPDATE request SET reserved = :userid WHERE id = :request LIMIT 1;");
1841 1829
 		$updateStatement->bindValue(":userid", $user->getId());
1842 1830
 		$updateStatement->bindValue(":request", $request);
@@ -1864,8 +1852,7 @@  discard block
 block discarded – undo
1864 1852
 		}
1865 1853
 		if (isset($_POST['submit'])) {
1866 1854
 			$database = gGetDb();
1867
-			$database->transactionally(function() use ($database)
1868
-			{
1855
+			$database->transactionally(function() use ($database) {
1869 1856
 				global $baseurl;
1870 1857
                 
1871 1858
 				$emailTemplate = new EmailTemplate();
@@ -1943,8 +1930,7 @@  discard block
 block discarded – undo
1943 1930
 				die();
1944 1931
 			}
1945 1932
 
1946
-			$database->transactionally(function() use ($database, $emailTemplate)
1947
-			{
1933
+			$database->transactionally(function() use ($database, $emailTemplate) {
1948 1934
 				$emailTemplate->save();
1949 1935
                 
1950 1936
 				Logger::editedEmail($database, $emailTemplate);
@@ -2009,8 +1995,7 @@  discard block
 block discarded – undo
2009 1995
 }
2010 1996
 elseif ($action == "oauthattach") {
2011 1997
 	$database = gGetDb();
2012
-	$database->transactionally(function() use ($database)
2013
-	{
1998
+	$database->transactionally(function() use ($database) {
2014 1999
 		try {
2015 2000
 			global $oauthConsumerToken, $oauthSecretToken, $oauthBaseUrl, $oauthBaseUrlInternal;
2016 2001
             
Please login to merge, or discard this patch.