GEANT / CAT

web/admin/sanity_tests.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     'mailer',
 ];
 
-if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'makensis';
     $Tests[] = 'makensis=>NSISmodules';
 }

core/SanityTests.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
             }
             if ($passedTheWindmill) {
                 if (substr($schemaLine, 0, 1) == '(') { // a relevant line in schema
-                    $this->profile_option_ct = $this->profile_option_ct+1;
+                    $this->profile_option_ct = $this->profile_option_ct + 1;
                 } else { // anything else, quit parsing
                     break;
                 }

core/diag/Logopath.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
             // leave his mail address, remove him/her from the list of recipients
             foreach (Logopath::CATEGORYBINDING as $index => $functionName) {
                 if (in_array(Logopath::ENDUSER, $theMail[$index]) && $this->userEmail === FALSE) {
-                    $theMail[$index] = array_diff($theMail[$index], [Logopath::ENDUSER] );
+                    $theMail[$index] = array_diff($theMail[$index], [Logopath::ENDUSER]);
                 }
             }
             

core/DeviceConfig.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
         $dummy_inst2 = _("organisation");
         // and do something useless with the strings so that there's no "unused" complaint
         // by Scrutinizer
-        if( $dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
+        if ($dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
             // oh well.
         }
 
@@ -213,7 +213,7 @@ 
         }
         if (isset($this->attributes['general:logo_file'])) {
             $this->loggerInstance->debug(5, "saving IDP logo\n");
-            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'],'idp');
+            $this->attributes['internal:logo_file'] = $this->saveLogoFile($this->attributes['general:logo_file'], 'idp');
         }
         if (isset($this->attributes['fed:logo_file'])) {
             $this->loggerInstance->debug(5, "saving FED logo\n");
@@ -585,7 +585,7 @@ 
      * @return array list of filenames and the mime types
      * @throws Exception
      */
-    private function saveLogoFile($logos,$type) {
+    private function saveLogoFile($logos, $type) {
         $iterator = 0;
         $returnarray = [];
         foreach ($logos as $blob) {

core/diag/Telepath.php

Doc Comments +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
      * realm (and indirectly that of the links and statuses of involved proxies
      * and returns a judgment whether external Monitoring API tests are warranted
      * or not
-     * @return boolean TRUE if external tests have to be run
+     * @return boolean|null TRUE if external tests have to be run
      */
     private function CATInternalTests() {
         // we are expecting to get a REJECT from all runs, because that means the packet got through to the IdP.

web/admin/112365365321.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
                     <th>Device</th>
                     <th>Admin Downloads</th>
                     <th>User Downloads (classic)</th>
-                    <th>User Downloads (<?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</th>
+                    <th>User Downloads (<?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</th>
                     <th>User Downloads (total)</th>
                 </tr>
                 <?php
@@ -130,7 +130,7 @@ 
                     $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'");
                     // SELECT -> mysqli_result, not boolean
                     while ($a = mysqli_fetch_object(/** @scrutinizer ignore-type */ $admin_query)) {
-                        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>";
+                        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>";
                         $gross_admin = $gross_admin + $a->admin;
                         $gross_user = $gross_user + $a->user;
                         $gross_silverbullet = $gross_silverbullet + $a->silverbullet;

core/UserAPI.php

Doc Comments +2 added lines

@@ -131,6 +131,7 @@ 
      * 
      * @param string $device
      * @param AbstractProfile $profile
+     * @param string $generatedFor
      * @return array info about the new installer (mime and link)
      */
     private function generateNewInstaller($device, $profile, $generatedFor, $token, $password) {
@@ -719,6 +720,7 @@ 
     /**
      * Order active identity providers according to their distance and name
      * @param array $currentLocation - current location
+     * @param string $country
      * @return array $IdPs -  list of arrays ('id', 'name');
      */
     public function orderIdentityProviders($country, $currentLocation = NULL) {

web/user/API.php

Spacing +11 added lines, -11 removed lines

@@ -39,7 +39,7 @@ 
     'getUserCerts',
 ];
 
-function getRequest($varName,$filter) {
+function getRequest($varName, $filter) {
     $safeText = ["options"=>["regexp"=>"/^[\w\d-]+$/"]];
     switch ($filter) {
         case 'safe_text':
@@ -57,7 +57,7 @@ 
 
 // make sure this is a known action
 $actionR = getRequest('action', 'safe_text');
-$action = array_search($actionR,LISTOFACTIONS) ? $actionR : FALSE;
+$action = array_search($actionR, LISTOFACTIONS) ? $actionR : FALSE;
 if ($action === FALSE) {
     exit;
 }
@@ -65,18 +65,18 @@ 
 $lang = $langR ? $validator->supportedLanguage($langR) : FALSE;
 $deviceR = getRequest('device', 'safe_text');
 $device = $deviceR ? $validator->Device($deviceR) : FALSE;
-$idpR = getRequest('idp','int');
+$idpR = getRequest('idp', 'int');
 $idp = $idpR ? $validator->IdP($idpR)->identifier : FALSE;
-$profileR = getRequest('profile','int');
+$profileR = getRequest('profile', 'int');
 $profile = $profileR ? $validator->Profile($profileR)->identifier : FALSE;
-$federationR = getRequest('federation','safe_text');
+$federationR = getRequest('federation', 'safe_text');
 $federation = $federationR ? $validator->Federation($deviceR)->tld : FALSE;
-$disco = getRequest('disco','int');
-$width = getRequest('width','int') ?? 0;
-$height = getRequest('height','int') ?? 0;
-$sort = getRequest('sort','int') ?? 0;
-$generatedforR = getRequest('generatedfor','safe_text') ?? 'user';
-$token = getRequest('token','safe_text');
+$disco = getRequest('disco', 'int');
+$width = getRequest('width', 'int') ?? 0;
+$height = getRequest('height', 'int') ?? 0;
+$sort = getRequest('sort', 'int') ?? 0;
+$generatedforR = getRequest('generatedfor', 'safe_text') ?? 'user';
+$token = getRequest('token', 'safe_text');
 
 
 switch ($action) {

web/skins/classic/basic.php

Spacing +3 added lines, -3 removed lines

@@ -141,7 +141,7 @@ 
     public function listIdPs() {
         $instList = $this->orderIdentityProviders($this->country->tld);
         $out = '';
-        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst );
+        $out .= sprintf(_("Select your %s"), $this->nomenclature_inst);
         $out .= '<select name="idp" onchange="submit_form(this)">';
         if (!empty($instList)) {
             if (!isset($this->idp)) {
@@ -235,7 +235,7 @@ 
                 }
             }
             $out .= '>' . $disp . '</option>';
-            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ( $oneDevice['redirect'] ? 1 : 0 ) . ';';
+            $deviceRedirects .= 'redirects[' . $iterator . '] = ' . ($oneDevice['redirect'] ? 1 : 0) . ';';
             $iterator++;
         }
         $out .= '</select>';
@@ -429,7 +429,7 @@ 
         </script>
     </head>
     <body style="">
-        <?php print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp' ) . '</div>'; ?>
+        <?php print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : '&nbsp') . '</div>'; ?>
         <form name="my_form" method="POST" action="<?php echo $_SERVER['SCRIPT_NAME'] ?>" accept-charset='UTF-8'>
             <img src="<?php echo $skinObject->findResourceUrl("IMAGES", "consortium_logo.png"); ?>" style="width: 20%; padding-right:20px; padding-top:0px; float:right" alt="logo" />
             <?php