Passed
Push — release_2_0 ( fe77e4...cb72b5 )
by Tomasz
08:34
created
web/lib/admin/Authentication.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 
24 24
 use Exception;
25 25
 
26
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
26
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
27 27
 require_once CONFIG['AUTHENTICATION']['ssp-path-to-autoloader'];
28 28
 
29 29
 /**
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         if ($trailerPosition !== FALSE) {
123 123
             $base = substr($scriptself, 0, $trailerPosition);
124 124
             if ($base !== FALSE) {
125
-                $url = "//$servername" . $base . "/logout_check.php";
125
+                $url = "//$servername".$base."/logout_check.php";
126 126
             }
127 127
         }
128 128
 
Please login to merge, or discard this patch.
web/lib/admin/MapNone.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
      */
84 84
     public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
85 85
         if (!$this->readOnly) {
86
- //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
86
+    //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
87 87
             return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
88 88
         }
89 89
     }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 namespace web\lib\admin;
23 23
 
24
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
24
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
25 25
 
26 26
 /**
27 27
  * This class provides map display functionality
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
     public function htmlShowtime($wizard = FALSE, $additional = FALSE) {
85 85
         if (!$this->readOnly) {
86 86
  //           return $this->htmlPreEdit($wizard, $additional) . $this->htmlPostEdit(TRUE);
87
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . $this->htmlPostEdit(TRUE);
87
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml().$this->htmlPostEdit(TRUE);
88 88
         }
89 89
     }
90 90
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         // quiesce warnings about unused parameter
109 109
         sprintf("%d", $number);
110 110
         $pair = json_decode($coords, true);
111
-        return "<table><tr><td>Latitude</td><td><strong>" . $pair['lat'] . "</strong></td></tr><tr><td>Longitude</td><td><strong>" . $pair['lon'] . "</strong></td></tr></table>";
111
+        return "<table><tr><td>Latitude</td><td><strong>".$pair['lat']."</strong></td></tr><tr><td>Longitude</td><td><strong>".$pair['lon']."</strong></td></tr></table>";
112 112
     }
113 113
     
114 114
     /**
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
      */
119 119
     private function findLocationHtml() {
120 120
         \core\common\Entity::intoThePotatoes();
121
-        $retval = "<button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
121
+        $retval = "<button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
122 122
         \core\common\Entity::outOfThePotatoes();
123 123
         return $retval;
124 124
     }
Please login to merge, or discard this patch.
web/lib/admin/MapOpenLayers.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 namespace web\lib\admin;
24 24
 
25
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
25
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
26 26
 
27 27
 /**
28 28
  * This class provides map display functionality
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         
86 86
 // use HTML5 geolocation
87 87
         function locateMe() {
88
-            $('#address').val(\"" . _("locating") . "\");
88
+            $('#address').val(\"" . _("locating")."\");
89 89
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
90 90
         }
91 91
         
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
                 view.fit(extent, {padding: [10, 0, 10, 0]});
208 208
             } else {
209 209
                 view.setCenter([0,0]);
210
-                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)] . "'); // use the federation code to locate the country
210
+                locate_country('" . $cat->knownFederations[strtoupper($this->fedName)]."'); // use the federation code to locate the country
211 211
                 map.setView(view);
212 212
             }
213 213
             view.setMaxZoom(20);
@@ -229,14 +229,14 @@  discard block
 block discarded – undo
229 229
         function getAddressLocation() {
230 230
             var city = $('#address').val();
231 231
             if(city == '') {
232
-                alert(\"" . _("nothing entered in the address field") . "\");
232
+                alert(\"" . _("nothing entered in the address field")."\");
233 233
                 return false;
234 234
             }
235 235
             city = city.replace(/\s*,\s*/g,',+');
236 236
             city = city.replace(/ +/,'+');
237 237
             $.get(addressService+'?format=json&addressdetails=0&q='+city, '',  function(data) {
238 238
                 if (data[0] === undefined) {
239
-                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.") . "');
239
+                    alert('" . _("Address not found, perhaps try another form, like putting the street number to the front.")."');
240 240
                     return;
241 241
                 }
242 242
                 showTmpPointer(data[0].lon, data[0].lat);
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
         if ($this->readOnly) {
288 288
             return "<div id='map' class='locationmap'></div><script>generateMap('map')</script>";
289 289
         } else {
290
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>" . $this->htmlPostEdit(FALSE);
290
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<span id='location-prompt'>You can drag the pointer to the final location before you save the results.</span><div id='map' class='locationmap'></div><script>generateMap('map')</script>".$this->htmlPostEdit(FALSE);
291 291
         }
292 292
     }
293 293
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
      */
311 311
     public static function optionListDisplayCode($coords, $number) {
312 312
         \core\common\Entity::intoThePotatoes();
313
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
313
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
314 314
         \core\common\Entity::outOfThePotatoes();
315 315
         return $retval;
316 316
     }
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
      */
323 323
     private function findLocationHtml() {
324 324
         \core\common\Entity::intoThePotatoes();
325
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
325
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
326 326
         \core\common\Entity::outOfThePotatoes();
327 327
         return $retval;
328 328
     }
Please login to merge, or discard this patch.
web/lib/admin/Maintenance.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public static function deleteObsoleteTempDirs() {
36 36
         $downloadsDirs = [
37
-            'site_installers' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/installer_cache",
38
-            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__)))) . "/var/silverbullet"
37
+            'site_installers' => dirname(dirname(dirname(dirname(__FILE__))))."/var/installer_cache",
38
+            'silverbullet' => dirname(dirname(dirname(dirname(__FILE__))))."/var/silverbullet"
39 39
         ];
40 40
         $tm = time();
41 41
         $i = 0;
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
                     if ($entry === '.' || $entry === '..' || $entry === '.gitignore') {
55 55
                         continue;
56 56
                     }
57
-                    $ftime = $tm - filemtime($downloads . '/' . $entry);
57
+                    $ftime = $tm - filemtime($downloads.'/'.$entry);
58 58
                     if ($ftime < 3600) {
59 59
                         continue;
60 60
                     }
61 61
                     if (isset($Cache[$entry])) {
62 62
                         continue;
63 63
                     }
64
-                    \core\common\Entity::rrmdir($downloads . '/' . $entry);
64
+                    \core\common\Entity::rrmdir($downloads.'/'.$entry);
65 65
                     $i = $i + 1;
66 66
                     print "$entry\n";
67 67
                 }
Please login to merge, or discard this patch.
web/lib/admin/MapGoogle.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 namespace web\lib\admin;
23 23
 
24
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
24
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
25 25
 
26 26
 /**
27 27
  * This class provides map display functionality
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     public function htmlHeadCode() {
50 50
         $cat = new \core\CAT();
51 51
         \core\common\Entity::intoThePotatoes();
52
-        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
52
+        $retval = "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
53 53
     <script type='text/javascript'>
54 54
         // some global variables;
55 55
         var center_lat=49.6114885608729;
@@ -105,19 +105,19 @@  discard block
 block discarded – undo
105 105
          *
106 106
          */
107 107
         function locator_magic() {
108
-            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName) . "\", 'region':\"" . strtolower($this->fedName) . "\"},
108
+            geocoder.geocode({'address':\"" . preg_replace("/\"/", "&quot;", $this->instName)."\", 'region':\"".strtolower($this->fedName)."\"},
109 109
             function(r,status) {
110 110
                 if(status != google.maps.GeocoderStatus.OK) {
111
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)] . "\");
111
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]."\");
112 112
                 } else {
113 113
                     var i;
114 114
                     for(i = 0; i < r.length; i++) {
115 115
                         Addr = getAddressElements(r[i].address_components);
116
-                        if(Addr.country == \"" . strtoupper($this->fedName) . "\")
116
+                        if(Addr.country == \"" . strtoupper($this->fedName)."\")
117 117
                         break;
118 118
                     }
119
-                    if(Addr.country != \"" . strtoupper($this->fedName) . "\")
120
-                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)] . "\");
119
+                    if(Addr.country != \"" . strtoupper($this->fedName)."\")
120
+                    locate_country(\"" . $cat->knownFederations[strtoupper($this->fedName)]."\");
121 121
                     else {
122 122
                         addMarker(r[i].geometry.location,15,null);
123 123
                     }
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
          */
131 131
         function markerClicked(m) {
132 132
             info_window.close();
133
-            var t = \"" . _("This is location ") . "\"+m.info;
133
+            var t = \"" . _("This is location ")."\"+m.info;
134 134
             info_window.setContent(t);
135 135
             info_window.setPosition(m.getPosition());
136 136
             info_window.open(map,m);
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
         function getAddressLocation() {
210 210
             var city = $('#address').val();
211 211
             if(city == '') {
212
-                alert(\"" . _("nothing entered in the address field") . "\");
212
+                alert(\"" . _("nothing entered in the address field")."\");
213 213
                 return false;
214 214
             }
215 215
             geocoder.geocode( { 'address': city}, function(results, status) {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
          * trigger geolocation
230 230
          */
231 231
         function locateMe() {
232
-            $('#address').val(\"" . _("locating") . "\");
232
+            $('#address').val(\"" . _("locating")."\");
233 233
             navigator.geolocation.getCurrentPosition(locate_succes,locate_fail,{maximumAge:3600000, timeout:5000});
234 234
         }
235 235
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
         if ($this->readOnly) {
348 348
             return "<div id='map' class='googlemap'></div>";
349 349
         } else {
350
-            return $this->htmlPreEdit($wizard, $additional) . $this->findLocationHtml() . "<div id='map' class='googlemap'></div>" . $this->htmlPostEdit(FALSE);
350
+            return $this->htmlPreEdit($wizard, $additional).$this->findLocationHtml()."<div id='map' class='googlemap'></div>".$this->htmlPostEdit(FALSE);
351 351
         }
352 352
     }
353 353
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
         // quiesce warnings about unused variable
363 363
         sprintf("%s", $coords);
364 364
         \core\common\Entity::intoThePotatoes();
365
-        $retval = "<button id='location_b_" . $number . "' class='location_button'>" . _("Click to see location") . " $number</button>";
365
+        $retval = "<button id='location_b_".$number."' class='location_button'>"._("Click to see location")." $number</button>";
366 366
         \core\common\Entity::outOfThePotatoes();
367 367
         return $retval;
368 368
     }
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
      * @return string
374 374
      */
375 375
     public function bodyTagCode() {
376
-        return "onload='load(" . ($this->readOnly ? "0" : "1") . ")'";
376
+        return "onload='load(".($this->readOnly ? "0" : "1").")'";
377 377
     }
378 378
 
379 379
     /**
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
      */
384 384
     private function findLocationHtml() {
385 385
         \core\common\Entity::intoThePotatoes();
386
-        $retval = "<p>" . _("Address:") . " <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>" . _("Find address") . "</button> <button type='button' onclick='locateMe()'>" . _("Locate Me!") . "</button></p>";
386
+        $retval = "<p>"._("Address:")." <input name='address' id='address' /><button type='button' onclick='getAddressLocation()'>"._("Find address")."</button> <button type='button' onclick='locateMe()'>"._("Locate Me!")."</button></p>";
387 387
         \core\common\Entity::outOfThePotatoes();
388 388
         return $retval;
389 389
     }
Please login to merge, or discard this patch.
web/lib/admin/OptionParser.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 ?>
27 27
 <?php
28 28
 
29
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
29
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
30 30
 
31 31
 /**
32 32
  * This class parses HTML field input from POST and FILES and extracts valid and authorized options to be set.
@@ -344,14 +344,14 @@  discard block
 block discarded – undo
344 344
                     case \core\Options::TYPECODE_TEXT:
345 345
                     case \core\Options::TYPECODE_COORDINATES:
346 346
                     case \core\Options::TYPECODE_INTEGER:
347
-                        $varName = "$objId-" . $validators[$optioninfo['type']]['field'];
347
+                        $varName = "$objId-".$validators[$optioninfo['type']]['field'];
348 348
                         if (!empty($listOfEntries[$varName])) {
349 349
                             $content = call_user_func_array([$this->validator, $validators[$optioninfo['type']]['function']], array_merge([$listOfEntries[$varName]], $validators[$optioninfo['type']]['extraarg']));
350 350
                             break;
351 351
                         }
352 352
                         continue 2;
353 353
                     case \core\Options::TYPECODE_BOOLEAN:
354
-                        $varName = "$objId-" . \core\Options::TYPECODE_BOOLEAN;
354
+                        $varName = "$objId-".\core\Options::TYPECODE_BOOLEAN;
355 355
                         if (!empty($listOfEntries[$varName])) {
356 356
                             $contentValid = $this->validator->boolean($listOfEntries[$varName]);
357 357
                             if ($contentValid) {
@@ -364,24 +364,24 @@  discard block
 block discarded – undo
364 364
                         }
365 365
                         continue 2;
366 366
                     case \core\Options::TYPECODE_STRING:
367
-                        if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) {
367
+                        if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) {
368 368
                             switch ($objValue) {
369 369
                                 case "media:consortium_OI":
370
-                                    $content = $this->validator->consortiumOI($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
370
+                                    $content = $this->validator->consortiumOI($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
371 371
                                     if ($content === FALSE) {
372 372
                                         $bad[] = $objValue;
373 373
                                         continue 3;
374 374
                                     }
375 375
                                     break;
376 376
                                 case "media:remove_SSID":
377
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
377
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
378 378
                                     if ($content == "eduroam") {
379 379
                                         $bad[] = $objValue;
380 380
                                         continue 3;
381 381
                                     }
382 382
                                     break;
383 383
                                 case "media:force_proxy":
384
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
384
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
385 385
                                     $serverAndPort = explode(':', strrev($content), 2);
386 386
                                     if (count($serverAndPort) != 2) {
387 387
                                         $bad[] = $objValue;
@@ -394,33 +394,33 @@  discard block
 block discarded – undo
394 394
                                     }
395 395
                                     break;
396 396
                                 case "support:url":
397
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
398
-                                    if (preg_match("/^http/",$content) != 1) {
397
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
398
+                                    if (preg_match("/^http/", $content) != 1) {
399 399
                                         $bad[] = $objValue;
400 400
                                         continue 3;
401 401
                                     }
402 402
                                     break;
403 403
                                 case "support:email":
404
-                                    $content = $this->validator->email($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
404
+                                    $content = $this->validator->email($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
405 405
                                     if ($content === FALSE) {
406 406
                                         $bad[] = $objValue;
407 407
                                         continue 3;
408 408
                                     }
409 409
                                     break;
410 410
                                 default:
411
-                                    $content = $this->validator->string($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]);
411
+                                    $content = $this->validator->string($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]);
412 412
                                     break;
413 413
                             }
414 414
                             break;
415 415
                         }
416 416
                         continue 2;
417 417
                     case \core\Options::TYPECODE_FILE:
418
-                        if (!empty($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
418
+                        if (!empty($listOfEntries["$objId-".\core\Options::TYPECODE_STRING])) { // was already in, by ROWID reference, extract
419 419
                             // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
420
-                            $content = $this->validator->string(urldecode($listOfEntries["$objId-" . \core\Options::TYPECODE_STRING]), TRUE);
420
+                            $content = $this->validator->string(urldecode($listOfEntries["$objId-".\core\Options::TYPECODE_STRING]), TRUE);
421 421
                             break;
422
-                        } else if (isset($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] != "")) { // let's do the download
423
-                            $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE]);
422
+                        } else if (isset($listOfEntries["$objId-".\core\Options::TYPECODE_FILE]) && ($listOfEntries["$objId-".\core\Options::TYPECODE_FILE] != "")) { // let's do the download
423
+                            $rawContent = \core\common\OutsideComm::downloadFile("file:///".$listOfEntries["$objId-".\core\Options::TYPECODE_FILE]);
424 424
 
425 425
                             if ($rawContent === FALSE || !$this->checkUploadSanity($objValue, $rawContent)) {
426 426
                                 $bad[] = $objValue;
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
                         }
432 432
                         continue 2;
433 433
                     default:
434
-                        throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
434
+                        throw new Exception("Internal Error: Unknown option type ".$objValue."!");
435 435
                 }
436 436
                 // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
437 437
                 $retval[] = ["$objValue" => ["lang" => $lang, "content" => $content]];
Please login to merge, or discard this patch.
web/lib/admin/AbstractMap.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 namespace web\lib\admin;
23 23
 
24
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
24
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
25 25
 
26 26
 /**
27 27
  * This class provides map display functionality
@@ -121,19 +121,19 @@  discard block
 block discarded – undo
121 121
     protected function htmlPreEdit($wizardMode, $additional) {
122 122
         \core\common\Entity::intoThePotatoes();
123 123
         $retval = "<fieldset class='option_container'>
124
-        <legend><strong>" . _("Location") . "</strong></legend>";
124
+        <legend><strong>" . _("Location")."</strong></legend>";
125 125
 
126 126
         if ($wizardMode) {
127
-            $retval .= "<p>" .
128
-                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") .
127
+            $retval .= "<p>".
128
+                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
129 129
                     "</p>
130 130
                      <ul>" .
131 131
                     _("<li>Drag the marker in the map to your place, or</li>
132 132
 <li>enter your street address in the field below for lookup, or</li>
133
-<li>use the 'Locate Me!' button</li>") .
133
+<li>use the 'Locate Me!' button</li>").
134 134
                     "</ul>
135 135
                      <strong>" .
136
-                    _("We will use the coordinates as indicated by the marker for geolocation.") .
136
+                    _("We will use the coordinates as indicated by the marker for geolocation.").
137 137
                     "</strong>";
138 138
         }
139 139
         if ($additional) {
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
      */
152 152
     protected function htmlPostEdit($allowDirectInput) {
153 153
         \core\common\Entity::intoThePotatoes();
154
-        $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
154
+        $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
155 155
         \core\common\Entity::outOfThePotatoes();
156 156
         return $retval;
157 157
     }
Please login to merge, or discard this patch.
web/accountstatus/accountstatus.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  * @author Stefan Winter <[email protected]>
27 27
  * @package Core
28 28
  */
29
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
29
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30 30
 
31 31
 $cleanToken = FALSE;
32 32
 $invitationObject = new core\SilverbulletInvitation("INVALID");
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 $statusInfo = ["token" => $cleanToken,
75 75
     "invitation_object" => $invitationObject,
76
-    "OS" => $Gui->operatingSystem,];
76
+    "OS" => $Gui->operatingSystem, ];
77 77
 
78 78
 if ($profile !== NULL) {
79 79
     $attributes = $Gui->profileAttributes($profile->identifier);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 $caAndSerial = filter_input(INPUT_GET, 'serial', FILTER_SANITIZE_STRING);
87 87
 
88 88
 if ($action !== NULL && $action !== FALSE && $action === \web\lib\common\FormElements::BUTTON_DELETE && $caAndSerial !== NULL && $caAndSerial !== FALSE) {
89
-    $tuple = explode(':',$caAndSerial);
89
+    $tuple = explode(':', $caAndSerial);
90 90
     $ca_type = $tuple[0];
91 91
     $serial = $tuple[1];
92 92
     if ($statusInfo['invitation_object']->invitationTokenStatus != \core\SilverbulletInvitation::SB_TOKENSTATUS_INVALID) {
@@ -101,12 +101,12 @@  discard block
 block discarded – undo
101 101
                 print "//REVOKING\n";
102 102
                 $certObject = new \core\SilverbulletCertificate($serial, $ca_type);
103 103
                 $certObject->revokeCertificate();
104
-                header("Location: accountstatus.php?token=" . $statusInfo['token']);
104
+                header("Location: accountstatus.php?token=".$statusInfo['token']);
105 105
                 exit;
106 106
             }
107 107
         }
108 108
     }
109
-    header("Location: accountstatus.php?token=" . $statusInfo['token']);
109
+    header("Location: accountstatus.php?token=".$statusInfo['token']);
110 110
     exit;
111 111
 }
112 112
 
@@ -131,4 +131,4 @@  discard block
 block discarded – undo
131 131
 $skinObject = new \web\lib\user\Skinjob($_REQUEST['skin'] ?? $_SESSION['skin'] ?? $fedskin[0] ?? CONFIG['APPEARANCE']['skins'][0]);
132 132
 
133 133
 // and now, serve actual data
134
-require "../skins/" . $skinObject->skin . "/accountstatus/accountstatus.php";
134
+require "../skins/".$skinObject->skin."/accountstatus/accountstatus.php";
Please login to merge, or discard this patch.
web/copyright.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
  * @author Stefan Winter <[email protected]>
26 26
  * @package Core
27 27
  */
28
-require_once dirname(dirname(__FILE__)) . "/config/_config.php";
28
+require_once dirname(dirname(__FILE__))."/config/_config.php";
29 29
 
30 30
 $Gui = new \web\lib\user\Gui();
31 31
 // ... unless overwritten by direct GET/POST parameter in the request or a SESSION setting
Please login to merge, or discard this patch.