GEANT / CAT

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;

utils/ocsp_update.php

Spacing +3 added lines, -3 removed lines

@@ -30,16 +30,16 @@
   * destination.
   */
 
-$tempdir = __DIR__."/temp_ocsp";
+$tempdir = __DIR__ . "/temp_ocsp";
 mkdir($tempdir);
 
 $allStatements = $dbLink->exec("SELECT serial_number,OCSP FROM silverbullet_certificate WHERE serial_number IS NOT NULL AND expiry > NOW() AND OCSP_timestamp > DATE_SUB(NOW(), INTERVAL 8 DAY)");
 // SELECT -> mysqli_result, not boolean
 while ($statementRow = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allStatements)) {
 #    echo "Writing OCSP statement for serial number $statementRow->serial_number\n";
-    $filename = strtoupper(dechex($statementRow->serial_number)).".der";
+    $filename = strtoupper(dechex($statementRow->serial_number)) . ".der";
     if (strlen($filename) % 2 == 1) {
         $filename = "0" . $filename;
     }
-    file_put_contents($tempdir."/$filename", $statementRow->OCSP);
+    file_put_contents($tempdir . "/$filename", $statementRow->OCSP);
 }

core/EntityWithDBProperties.php

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
             case "core\User":
                 return $this->userName;
             default:
-                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - ".get_class($this)."!");
+                throw new Exception("Operating on a class where we don't know the relevant identifier in the DB - " . get_class($this) . "!");
         }
     }
     
@@ -245,7 +245,7 @@ 
         $handle = DBConnection::handle("INST");
         $blobQuery = $handle->exec("SELECT option_value from $table WHERE row = $row");
         // SELECT -> returns resource, not boolean
-        while ($returnedData =  /** @scrutinizer ignore-type */ mysqli_fetch_object($blobQuery)) {
+        while ($returnedData = /** @scrutinizer ignore-type */ mysqli_fetch_object($blobQuery)) {
             $blob = $returnedData->option_value;
         }
         if (!isset($blob)) {

core/UserAPI.php

Spacing +1 added lines, -1 removed lines

@@ -549,7 +549,7 @@
             if (count($logoAttribute) == 0) {
                 return(NULL);
             }
-            $this->loggerInstance->debug(4,"RESIZE:$width:$height\n");
+            $this->loggerInstance->debug(4, "RESIZE:$width:$height\n");
             $meta = $this->processImage($logoAttribute[0]['value'], $logoFile, $width, $height, $resize);
             $filetype = $meta['filetype'];
             $expiresString = $meta['expires'];

devices/test_module/Device_TestModule.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
      * @return string
      */
     private function zipInstaller($attr) {
-        if (count($attr)==0) {
+        if (count($attr) == 0) {
             // never mind, just checking. You CAN use the $attr array to extract
             // information about the IdP/Profile if there's a need
         }

core/DeviceConfig.php

Spacing +4 added lines, -4 removed lines

@@ -103,9 +103,9 @@ 
         $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.
-            explode(' ',$dummy_NRO);
+            explode(' ', $dummy_NRO);
         }
 
         $this->nomenclature_fed = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']);
@@ -214,7 +214,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");
@@ -586,7 +586,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) {

web/lib/admin/UIElements.php

Spacing +5 added lines, -5 removed lines

@@ -47,9 +47,9 @@ 
         $dummy_inst1 = _("identity provider");
         $dummy_inst2 = _("organisation");
         // and do something useless with the strings so that there's no "unused" complaint
-        if ( $dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
+        if ($dummy_NRO . $dummy_inst1 . $dummy_inst2 == "") {
             // Oh well.
-            explode(' ',$dummy_NRO);
+            explode(' ', $dummy_NRO);
         }
         $this->nomenclature_fed = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']);
         $this->nomenclature_inst = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']);
@@ -187,7 +187,7 @@ 
                         }
                         break;
                     case "boolean":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                         break;
                     default:
                         $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
@@ -314,7 +314,7 @@ 
     
     private function checkROWIDpresence($reference) {
         $found = preg_match("/^ROWID-.*/", $reference);
-        if ($found  != 1) { // get excited on not-found AND on execution error
+        if ($found != 1) { // get excited on not-found AND on execution error
             throw new Exception("Error, ROWID expected.");
         }
     }
@@ -337,7 +337,7 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
         if ($details['ca'] == 0 && $details['root'] != 1) {
             return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
         }

web/diag/testTelepath.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 $validator = new \web\lib\common\InputValidation();
 
 echo "<pre>";
-echo "Testing ".$validator->realm(filter_input(INPUT_GET,'realm', FILTER_SANITIZE_STRING))." in ".$validator->string(filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING));
+echo "Testing " . $validator->realm(filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING)) . " in " . $validator->string(filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING));
 print_r($telepath->magic());
 echo "</pre>";

web/admin/inc/displayQRcode.inc.php

Spacing +3 added lines, -3 removed lines

@@ -29,6 +29,6 @@
 $link = \core\ProfileSilverbullet::generateTokenLink($cleanToken);
 header("Content-Type:text/html;charset=utf-8");
 ?>
-<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1>
-<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11));?>'/>
-<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p>
+<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1>
+<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/>
+<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p>