Failed Conditions
Pull Request — newinternal (#527)
by Simon
17:20 queued 07:22
created
includes/Pages/PageViewRequest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
             }
131 131
         }
132 132
 
133
-        $this->setHtmlTitle($statusSymbol . ' #' . $request->getId());
133
+        $this->setHtmlTitle($statusSymbol.' #'.$request->getId());
134 134
     }
135 135
 
136 136
     /**
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 
228 228
                 $entryComment = $entry->getComment();
229 229
 
230
-                if($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest'){
230
+                if ($entry->getAction() === 'JobIssueRequest' || $entry->getAction() === 'JobCompletedRequest') {
231 231
                     $data = unserialize($entry->getComment());
232 232
                     /** @var JobQueue $job */
233 233
                     $job = JobQueue::getById($data['job'], $database);
Please login to merge, or discard this patch.
includes/Pages/UserAuth/PagePreferences.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
         // this has the side effect of allowing them to keep a selected mode that either has been changed for them,
82 82
         // or that they have kept from when they previously had certain access.
83 83
         $creationMode = WebRequest::postInt('creationmode');
84
-        if($this->barrierTest($creationMode, $user, 'RequestCreation')){
84
+        if ($this->barrierTest($creationMode, $user, 'RequestCreation')) {
85 85
             $user->setCreationMode($creationMode);
86 86
         }
87 87
     }
Please login to merge, or discard this patch.
includes/Pages/UserAuth/PageLogin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
             }
39 39
             else {
40 40
                 // This is the login form, not the request form. We need protection here.
41
-                $this->redirectUrl('https://' . WebRequest::serverName() . WebRequest::requestUri());
41
+                $this->redirectUrl('https://'.WebRequest::serverName().WebRequest::requestUri());
42 42
 
43 43
                 return;
44 44
             }
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
                 $this->getSiteConfiguration());
68 68
 
69 69
             if ($oauth->isFullyLinked()) {
70
-                try{
70
+                try {
71 71
                     // Reload the user's identity ticket.
72 72
                     $oauth->refreshIdentity();
73 73
 
74 74
                     // Check for blocks
75
-                    if($oauth->getIdentity()->getBlocked()) {
75
+                    if ($oauth->getIdentity()->getBlocked()) {
76 76
                         // blocked!
77 77
                         SessionAlert::error("You are currently blocked on-wiki. You will not be able to log in until you are unblocked.");
78 78
                         $this->redirect('login');
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
                         return;
81 81
                     }
82 82
                 }
83
-                catch(OAuthException $ex) {
83
+                catch (OAuthException $ex) {
84 84
                     // Oops. Refreshing ticket failed. Force a re-auth.
85 85
                     $authoriseUrl = $oauth->getRequestToken();
86 86
                     WebRequest::setPartialLogin($user);
Please login to merge, or discard this patch.
config.inc.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
 $BUbasefile = "backup"; // The basefile's name.
132 132
 $BUdir = "/home/project/a/c/c/acc/backups"; // The directory where backups should be stored.
133
-$BUmonthdir = $BUdir . "/monthly"; // The directory where monthly backups should be stored.
133
+$BUmonthdir = $BUdir."/monthly"; // The directory where monthly backups should be stored.
134 134
 $BUdumper = "/opt/ts/mysql/5.1/bin/mysqldump --defaults-file=~/.my.cnf p_acc_live"; // Add parameters here if they are needed.
135 135
 $BUgzip = "/usr/bin/gzip"; // Add the gzip parameters here if needed.
136 136
 $BUtar = "/bin/tar -cvf"; // Add the tar parameters here if needed.
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 $curlDisableSSLVerifyPeer = false;
247 247
 
248 248
 // Change this to be outside the web directory.
249
-$curlCookieJar = __DIR__ . '/../cookies.txt';
249
+$curlCookieJar = __DIR__.'/../cookies.txt';
250 250
 
251 251
 /**************************************************************************
252 252
  **********                   IMPORTANT NOTICE                    **********
@@ -260,17 +260,17 @@  discard block
 block discarded – undo
260 260
 
261 261
 $cDatabaseConfig = array(
262 262
     "acc"           => array(
263
-        "dsrcname" => "mysql:host=" . $toolserver_host . ";dbname=" . $toolserver_database,
263
+        "dsrcname" => "mysql:host=".$toolserver_host.";dbname=".$toolserver_database,
264 264
         "username" => $toolserver_username,
265 265
         "password" => $toolserver_password,
266 266
     ),
267 267
     "wikipedia"     => array(
268
-        "dsrcname" => "mysql:host=" . $antispoof_host . ";dbname=" . $antispoof_db,
268
+        "dsrcname" => "mysql:host=".$antispoof_host.";dbname=".$antispoof_db,
269 269
         "username" => $toolserver_username,
270 270
         "password" => $toolserver_password,
271 271
     ),
272 272
     "notifications" => array(
273
-        "dsrcname" => "mysql:host=" . $toolserver_notification_dbhost . ";dbname=" . $toolserver_notification_database,
273
+        "dsrcname" => "mysql:host=".$toolserver_notification_dbhost.";dbname=".$toolserver_notification_database,
274 274
         "username" => $notifications_username,
275 275
         "password" => $notifications_password,
276 276
     ),
@@ -300,13 +300,13 @@  discard block
 block discarded – undo
300 300
 }
301 301
 
302 302
 // Set up the AutoLoader
303
-require_once(__DIR__ . "/includes/AutoLoader.php");
303
+require_once(__DIR__."/includes/AutoLoader.php");
304 304
 spl_autoload_register('Waca\\AutoLoader::load');
305
-require_once(__DIR__ . '/vendor/autoload.php');
305
+require_once(__DIR__.'/vendor/autoload.php');
306 306
 
307 307
 // Extra includes which are just plain awkward wherever they are.
308
-require_once(__DIR__ . '/lib/mediawiki-extensions-OAuth/lib/OAuth.php');
309
-require_once(__DIR__ . '/lib/mediawiki-extensions-OAuth/lib/JWT.php');
308
+require_once(__DIR__.'/lib/mediawiki-extensions-OAuth/lib/OAuth.php');
309
+require_once(__DIR__.'/lib/mediawiki-extensions-OAuth/lib/JWT.php');
310 310
 
311 311
 // Crap that's needed for libraries. >:(
312 312
 /**
Please login to merge, or discard this patch.