Passed
Push — release_2_0 ( c1d988...7be583 )
by Stefan
06:55
created
web/diag/findRealm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
  * @return boolean
37 37
  */
38 38
 
39
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
39
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
40 40
 
41 41
 // we are referring to $_SESSION later in the file
42 42
 CAT_session_start();
Please login to merge, or discard this patch.
web/user/faq.inc.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -23,54 +23,54 @@
 block discarded – undo
23 23
     this is just an include file for Gui class definition
24 24
 */
25 25
     $Faq = [
26
-      [
26
+        [
27 27
         'id'=>'idp_not_listed',
28 28
         'title'=>_("My organisation is not listed. Can't I just use any of the other ones?"),
29 29
         'text'=>_("No! The installers contain security settings which are specific to the organisation. If you are not from that organisation, your device will detect that you are about to send your username and credential to an unauthorised server and will abort the login. Using an installer from a different organisation is <i>guaranteed to not work</i>!")
30
-         ],
31
-      [
30
+            ],
31
+        [
32 32
         'id'=>'idp_not_listed',
33 33
         'title'=>_("What can I do to get my organisation listed?"),
34 34
         'text'=>sprintf(_("Contact %s administrators within your organisation and request that they add their organisation to the system. It will take at most one hour of their time to get things done."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
35 35
 ],
36
-      [
36
+        [
37 37
         'id'=>'device_not_listed',
38 38
         'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
39 39
         'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your organisation to get help in setting up such a device."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
40
-      ],
40
+        ],
41 41
 
42
-      [
42
+        [
43 43
         'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
44 44
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
45 45
 ],
46
-      [
46
+        [
47 47
         'title'=>sprintf(_("Is it safe to use %s installers?"),CONFIG['APPEARANCE']['productname']),
48 48
         'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),CONFIG['APPEARANCE']['productname']).' '.( isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),CONFIG['APPEARANCE']['productname'],CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']):""),
49 49
         
50 50
 ],
51
-      [
51
+        [
52 52
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
53 53
         'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
54 54
         
55 55
 ],
56
-      [
56
+        [
57 57
         'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
58
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
58
+        'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
59 59
 ],
60
-      [
60
+        [
61 61
         'id'=>'contact',
62 62
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
63 63
         'text'=>sprintf(_("You should send a mail to %s."),CONFIG['APPEARANCE']['support-contact']['display'])
64
-      ],
64
+        ],
65 65
 ];
66 66
 
67 67
     if (CONFIG_CONFASSISTANT['CONSORTIUM']['name'] == "eduroam") {
68 68
         $eduroamDb = new core\ExternalEduroamDBData();
69 69
         $SPs = $eduroamDb->allServiceProviders();
70
-       array_push($Faq,
71
-         [
72
-           'id'=>'what_is_'.CONFIG_CONFASSISTANT['CONSORTIUM']['name'],
73
-           'title'=>sprintf(_("What is this %s thing anyway?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
74
-           'text'=>sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than %d hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> or <a href='http://monitor.eduroam.org/map_service_loc.php'>the %s location map</a> for more details."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $SPs, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
75
-         ]);
70
+        array_push($Faq,
71
+            [
72
+            'id'=>'what_is_'.CONFIG_CONFASSISTANT['CONSORTIUM']['name'],
73
+            'title'=>sprintf(_("What is this %s thing anyway?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
74
+            'text'=>sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than %d hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> or <a href='http://monitor.eduroam.org/map_service_loc.php'>the %s location map</a> for more details."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $SPs, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
75
+            ]);
76 76
     }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,36 +31,36 @@  discard block
 block discarded – undo
31 31
       [
32 32
         'id'=>'idp_not_listed',
33 33
         'title'=>_("What can I do to get my organisation listed?"),
34
-        'text'=>sprintf(_("Contact %s administrators within your organisation and request that they add their organisation to the system. It will take at most one hour of their time to get things done."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
34
+        'text'=>sprintf(_("Contact %s administrators within your organisation and request that they add their organisation to the system. It will take at most one hour of their time to get things done."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
35 35
 ],
36 36
       [
37 37
         'id'=>'device_not_listed',
38
-        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
39
-        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your organisation to get help in setting up such a device."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
38
+        'title'=>sprintf(_("My device is not listed! Does that mean I can't do %s?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
39
+        'text'=>sprintf(_("No. The CAT tool can only support Operating Systems which can be automatically configured in some way. Many other devices can still be used with %s, but must be configured manually. Please contact your organisation to get help in setting up such a device."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
40 40
       ],
41 41
 
42 42
       [
43
-        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
43
+        'title'=>sprintf(_("I can connect to %s simply by providing username and password, what is the point of using an installer?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
44 44
         'text'=>sprintf(_("When you are connecting from an unconfigured device your security is at risk. The very point of preconfiguration is to set up security, when this is done, your device will first confirm that it talks to the correct authentication server and will never send your password to an untrusted one."))
45 45
 ],
46 46
       [
47
-        'title'=>sprintf(_("Is it safe to use %s installers?"),CONFIG['APPEARANCE']['productname']),
48
-        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."),CONFIG['APPEARANCE']['productname']).' '.( isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."),CONFIG['APPEARANCE']['productname'],CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']):""),
47
+        'title'=>sprintf(_("Is it safe to use %s installers?"), CONFIG['APPEARANCE']['productname']),
48
+        'text'=>sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), CONFIG['APPEARANCE']['productname']).' '.(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), CONFIG['APPEARANCE']['productname'], CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) : ""),
49 49
         
50 50
 ],
51 51
       [
52 52
         'title'=>_("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
53
-        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."),CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'])." ":"").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."),"<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
53
+        'text'=>_("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
54 54
         
55 55
 ],
56 56
       [
57
-        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
58
-      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
57
+        'title'=>sprintf(_("I can see %s network and my device is configured but it does not connect, what can be the cause?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
58
+      'text'=>sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
59 59
 ],
60 60
       [
61 61
         'id'=>'contact',
62 62
         'title'=>sprintf(_("I have a question about this web site. Whom should I contact?")),
63
-        'text'=>sprintf(_("You should send a mail to %s."),CONFIG['APPEARANCE']['support-contact']['display'])
63
+        'text'=>sprintf(_("You should send a mail to %s."), CONFIG['APPEARANCE']['support-contact']['display'])
64 64
       ],
65 65
 ];
66 66
 
@@ -71,6 +71,6 @@  discard block
 block discarded – undo
71 71
          [
72 72
            'id'=>'what_is_'.CONFIG_CONFASSISTANT['CONSORTIUM']['name'],
73 73
            'title'=>sprintf(_("What is this %s thing anyway?"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']),
74
-           'text'=>sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than %d hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> or <a href='http://monitor.eduroam.org/map_service_loc.php'>the %s location map</a> for more details."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'],CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $SPs, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
74
+           'text'=>sprintf(_("%s is a global WiFi roaming consortium which gives members of education and research access to the internet <i>for free</i> on all %s hotspots on the planet. There are several million %s users already, enjoying free internet access on more than %d hotspots! Visit <a href='http://www.eduroam.org'>the %s homepage</a> or <a href='http://monitor.eduroam.org/map_service_loc.php'>the %s location map</a> for more details."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $SPs, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])
75 75
          ]);
76 76
     }
Please login to merge, or discard this patch.
core/ExternalEduroamDBData.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
             return $this->counter;
105 105
         }
106 106
 
107
-        $cachedNumber = @file_get_contents(ROOT . "/var/tmp/cachedSPNumber.serialised");
107
+        $cachedNumber = @file_get_contents(ROOT."/var/tmp/cachedSPNumber.serialised");
108 108
         if ($cachedNumber !== FALSE) {
109 109
             $numberData = unserialize($cachedNumber);
110 110
             $now = new \DateTime();
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
             while ($iterator = mysqli_fetch_object(/** @scrutinizer ignore-type */ $query)) {
120 120
                 $this->counter = $iterator->total;
121 121
             }
122
-            file_put_contents(ROOT . "/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
122
+            file_put_contents(ROOT."/var/tmp/cachedSPNumber.serialised", serialize(["number" => $this->counter, "timestamp" => new \DateTime()]));
123 123
         }
124 124
     }
125 125
 
Please login to merge, or discard this patch.
web/lib/admin/API.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 use Exception;
31 31
 
32
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
32
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
33 33
 
34 34
 /**
35 35
  * This class defines the various actions doable with the admin API, the
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
     const ACTIONS = [
245 245
         // Inst-level actions.
246 246
         API::ACTION_NEWINST_BY_REF => [
247
-            "REQ" => [API::AUXATTRIB_EXTERNALID,],
247
+            "REQ" => [API::AUXATTRIB_EXTERNALID, ],
248 248
             "OPT" => [
249 249
                 'general:geo_coordinates',
250 250
                 'general:logo_file',
@@ -555,8 +555,8 @@  discard block
 block discarded – undo
555 555
 
556 556
                 case \core\Options::TYPECODE_COORDINATES:
557 557
                     $extension = \core\Options::TYPECODE_TEXT;
558
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
559
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
558
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
559
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
560 560
                     break;
561 561
                 case \core\Options::TYPECODE_TEXT:
562 562
                 // Fall-through: they all get the same treatment.
@@ -566,18 +566,18 @@  discard block
 block discarded – undo
566 566
                 // Fall-through: they all get the same treatment.
567 567
                 case \core\Options::TYPECODE_INTEGER:
568 568
                     $extension = $optionInfo['type'];
569
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
570
-                    $coercedInline["value"][$basename . "-" . $extension] = $oneAttrib['VALUE'];
569
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
570
+                    $coercedInline["value"][$basename."-".$extension] = $oneAttrib['VALUE'];
571 571
                     if ($optionInfo['flag'] == "ML") {
572
-                        $coercedInline["value"][$basename . "-lang"] = $oneAttrib['LANG'];
572
+                        $coercedInline["value"][$basename."-lang"] = $oneAttrib['LANG'];
573 573
                     }
574 574
                     break;
575 575
                 case \core\Options::TYPECODE_FILE:
576 576
                     // Binary data is expected in base64 encoding. This is true also for PEM files!
577 577
                     $extension = $optionInfo['type'];
578
-                    $coercedInline["option"][$basename] = $oneAttrib['NAME'] . "#";
579
-                    file_put_contents($dir['dir'] . "/" . $basename . "-" . $extension, base64_decode($oneAttrib['VALUE']));
580
-                    $coercedFile["value"]['tmp_name'][$basename . "-" . $extension] = $dir['dir'] . "/" . $basename . "-" . $extension;
578
+                    $coercedInline["option"][$basename] = $oneAttrib['NAME']."#";
579
+                    file_put_contents($dir['dir']."/".$basename."-".$extension, base64_decode($oneAttrib['VALUE']));
580
+                    $coercedFile["value"]['tmp_name'][$basename."-".$extension] = $dir['dir']."/".$basename."-".$extension;
581 581
                     break;
582 582
                 default:
583 583
                     throw new Exception("We don't seem to know this type code!");
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
     public function returnSuccess($details) {
607 607
         $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT);
608 608
         if ($output === FALSE) {
609
-            $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg());
609
+            $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ".json_last_error()." - ".json_last_error_msg());
610 610
         }
611 611
         else {
612 612
             echo $output;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -607,8 +607,7 @@
 block discarded – undo
607 607
         $output = json_encode(["result" => "SUCCESS", "details" => $details], JSON_PRETTY_PRINT);
608 608
         if ($output === FALSE) {
609 609
             $this->returnError(API::ERROR_INTERNAL_ERROR, "Unable to JSON encode return data: ". json_last_error(). " - ". json_last_error_msg());
610
-        }
611
-        else {
610
+        } else {
612 611
             echo $output;
613 612
         }
614 613
     }
Please login to merge, or discard this patch.
web/admin/112365365321.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(__DIR__)) . '/config/_config.php';
22
+require_once dirname(dirname(__DIR__)).'/config/_config.php';
23 23
 
24 24
 $uiElements = new web\lib\admin\UIElements();
25 25
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
                         // filesystem cleanup
76 76
                     case web\lib\common\FormElements::BUTTON_DELETE:
77 77
                         $i = web\lib\admin\Maintenance::deleteObsoleteTempDirs();
78
-                        echo "<div class='ca-summary'><table>" . $uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted") . "</table></div>";
78
+                        echo "<div class='ca-summary'><table>".$uiElements->boxRemark(sprintf("Deleted %d cache directories.", $i), "Cache deleted")."</table></div>";
79 79
                         break;
80 80
                     default:
81 81
                         break;
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
                     $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'");
142 142
                     // SELECT -> mysqli_result, not boolean
143 143
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
144
-                        echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>";
144
+                        echo "<td>".$device_array['display']."</td><td>".$a->admin."</td><td>".$a->user."</td><td>".$a->silverbullet."</td><td>".sprintf("%s", $a->user + $a->silverbullet)."</td>";
145 145
                         $gross_admin = $gross_admin + $a->admin;
146 146
                         $gross_user = $gross_user + $a->user;
147 147
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;
Please login to merge, or discard this patch.
core/common/Entity.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
      */
95 95
     public function __construct() {
96 96
         $this->loggerInstance = new Logging();
97
-        $this->loggerInstance->debug(3, "--- BEGIN constructing class " . get_class($this) . " .\n");
97
+        $this->loggerInstance->debug(3, "--- BEGIN constructing class ".get_class($this)." .\n");
98 98
         $this->languageInstance = new Language();
99 99
         Entity::intoThePotatoes();
100 100
         // some config elements are displayable. We need some dummies to 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
         $dummy_inst2 = _("organisation");
107 107
         $dummy_inst3 = _("Identity Provider");
108 108
         // and do something useless with the strings so that there's no "unused" complaint
109
-        if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3) < 0) {
109
+        if (strlen($dummy_NRO.$dummy_inst1.$dummy_inst2.$dummy_inst3) < 0) {
110 110
             throw new \Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole.");
111 111
         }
112 112
         Entity::$nomenclature_fed = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
      * Logs the end of lifetime of the entity to the debug log on level 5.
122 122
      */
123 123
     public function __destruct() {
124
-        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
124
+        (new Logging())->debug(5, "--- KILL Destructing class ".get_class($this)." .\n");
125 125
     }
126 126
 
127 127
     /**
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
      */
152 152
     public function createTemporaryDirectory($purpose = 'installer', $failIsFatal = 1) {
153 153
         $loggerInstance = new Logging();
154
-        $name = md5(time() . rand());
154
+        $name = md5(time().rand());
155 155
         $path = ROOT;
156 156
         switch ($purpose) {
157 157
             case 'silverbullet':
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
             default:
170 170
                 throw new Exception("unable to create temporary directory due to unknown purpose: $purpose\n");
171 171
         }
172
-        $tmpDir = $path . '/' . $name;
172
+        $tmpDir = $path.'/'.$name;
173 173
         $loggerInstance->debug(4, "temp dir: $purpose : $tmpDir\n");
174 174
         if (!mkdir($tmpDir, 0700, true)) {
175 175
             if ($failIsFatal) {
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
      * @return void
190 190
      */
191 191
     public static function rrmdir($dir) {
192
-        foreach (glob($dir . '/*') as $file) {
192
+        foreach (glob($dir.'/*') as $file) {
193 193
             if (is_dir($file)) {
194 194
                 Entity::rrmdir($file);
195 195
             } else {
@@ -214,12 +214,12 @@  discard block
 block discarded – undo
214 214
         }
215 215
         // these substr() are guaranteed to yield actual string data, as the
216 216
         // base string is an MD5 hash - has sufficient length
217
-        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8) . '-';
218
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4) . '-';
219
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4) . '-';
220
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4) . '-';
217
+        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8).'-';
218
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4).'-';
219
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4).'-';
220
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4).'-';
221 221
         $uuid .= /** @scrutinizer ignore-type */ substr($chars, 20, 12);
222
-        return $prefix . $uuid;
222
+        return $prefix.$uuid;
223 223
     }
224 224
 
225 225
     /**
@@ -294,10 +294,10 @@  discard block
 block discarded – undo
294 294
         if ($catalogue === NULL) {
295 295
             $theCatalogue = Entity::determineOwnCatalogue();
296 296
             textdomain($theCatalogue);
297
-            bindtextdomain($theCatalogue, ROOT . "/translation/");
297
+            bindtextdomain($theCatalogue, ROOT."/translation/");
298 298
         } else {
299 299
             textdomain($catalogue);
300
-            bindtextdomain($catalogue, ROOT . "/translation/");
300
+            bindtextdomain($catalogue, ROOT."/translation/");
301 301
         }
302 302
     }
303 303
 
Please login to merge, or discard this patch.