GEANT / CAT

core/ProfileSilverbullet.php

Spacing +6 added lines, -6 removed lines

@@ -100,7 +100,7 @@ 
 // realm is automatically calculated, then stored in DB
 
         $this->realm = "opaquehash@$myInst->identifier-$this->identifier." . strtolower($myInst->federation) . CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix'];
-        $this->setRealm($myInst->identifier."-".$this->identifier."." . strtolower($myInst->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
+        $this->setRealm($myInst->identifier . "-" . $this->identifier . "." . strtolower($myInst->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
         $localValueIfAny = "";
 
 // but there's some common internal attributes populated directly
@@ -176,11 +176,11 @@ 
     public function invitationMailBody($invitationLink) {
         $text = _("Hello!");
         $text .= "\n\n";
-        $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= " ";
         $text .= sprintf(_("Please follow the following link with the device you want to enable for %s to get a custom %s installation program just for you. You can click on the link, copy and paste it into a browser or scan the attached QR code."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= "\n\n$invitationLink\n\n"; // gets replaced with the token value by getBody()
-        $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $text .= "\n\n";
         $text .= _("Regards,");
         $text .= "\n\n";
@@ -464,7 +464,7 @@ 
                 $indexStatement = "$certstatus\t$expiryIndexTxt\t" . ($certstatus == "R" ? "$nowIndexTxt,unspecified" : "") . "\t$serialHex\tunknown\t/O=" . CONFIG_CONFASSISTANT['CONSORTIUM']['name'] . "/OU=$federation/CN=$cn/emailAddress=$cn\n";
                 $logHandle->debug(4, "index.txt contents-to-be: $indexStatement");
                 if (!file_put_contents($tempdir . "/index.txt", $indexStatement)) {
-                $logHandle->debug(1,"Unable to write openssl index.txt file for revocation handling!");
+                $logHandle->debug(1, "Unable to write openssl index.txt file for revocation handling!");
                 }
                 // index.txt.attr is dull but needs to exist
                 file_put_contents($tempdir . "/index.txt.attr", "unique_subject = yes\n");
@@ -574,7 +574,7 @@ 
         if ($invitationsResult->num_rows == 0) {
             $loggerInstance->debug(2, "Token  $tokenvalue not found in database or database query error!\n");
             return ["status" => self::SB_TOKENSTATUS_INVALID,
-                "cert_status" => [],];
+                "cert_status" => [], ];
         }
         // if not returned, we found the token in the DB
         $invitationRow = mysqli_fetch_object(/** @scrutinizer ignore-type */ $invitationsResult);
@@ -744,7 +744,7 @@ 
                 throw new Exception("Impossible: the string ends with '/admin' but it's not possible to cut six characters from the end?!");
             }
         }
-        $link .= '/accountstatus/accountstatus.php?token='.$token;
+        $link .= '/accountstatus/accountstatus.php?token=' . $token;
         return $link;
     }
 

Doc Comments +5 added lines

@@ -56,6 +56,9 @@ 
 
     const PRODUCTNAME = "Managed IdP";
 
+    /**
+     * @param integer $length
+     */
     public static function randomString(
     $length, $keyspace = '23456789abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
     ) {
@@ -238,6 +241,7 @@ 
     /**
      * create a CSR
      * 
+     * @param resource $privateKey
      * @return 
      */
     private function generateCsr($privateKey) {
@@ -277,6 +281,7 @@ 
      * take a CSR and sign it with our issuing CA's certificate
      * 
      * @param mixed $csr the CSR
+     * @param integer $expiryDays
      */
     private function signCsr($csr, $expiryDays) {
         switch (CONFIG_CONFASSISTANT['SILVERBULLET']['CA']['type']) {

core/UserManagement.php

Spacing +2 added lines, -2 removed lines

@@ -276,9 +276,9 @@
         $retval = [];
         $invitations = $this->databaseHandle->exec("SELECT cat_institution_id, country, name, invite_issuer_level, invite_dest_mail, invite_token 
                                         FROM invitations 
-                                        WHERE cat_institution_id " . ( $idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
+                                        WHERE cat_institution_id " . ($idpIdentifier != 0 ? "= $idpIdentifier" : "IS NULL") . " AND invite_created >= TIMESTAMPADD(DAY, -1, NOW()) AND used = 0");
         // SELECT -> resource, not boolean
-        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation" ) . ".\n");
+        $this->loggerInstance->debug(4, "Retrieving pending invitations for " . ($idpIdentifier != 0 ? "IdP $idpIdentifier" : "IdPs awaiting initial creation") . ".\n");
         while ($invitationQuery = mysqli_fetch_object(/** @scrutinizer ignore-type */ $invitations)) {
             $retval[] = ["country" => $invitationQuery->country, "name" => $invitationQuery->name, "mail" => $invitationQuery->invite_dest_mail, "token" => $invitationQuery->invite_token];
         }

devices/ms/WindowsCommon.php

Spacing +7 added lines, -7 removed lines

@@ -188,11 +188,11 @@ 
         $logoCount = count($logosToPlace);
         if ($logoCount > 0) {
             $voffset = $freeTop;
-            $freeSpace = (int)round($this->background['freeHeight'] / ($logoCount + 1));
+            $freeSpace = (int) round($this->background['freeHeight'] / ($logoCount + 1));
             foreach ($logosToPlace as $logo) {
                 $voffset += $freeSpace;
                 $logoSize = $logo->getImageGeometry();
-                $hoffset = (int)round(($bgImageSize['width'] - $logoSize['width']) / 2);
+                $hoffset = (int) round(($bgImageSize['width'] - $logoSize['width']) / 2);
                 $bgImage->compositeImage($logo, $logo->getImageCompose(), $hoffset, $voffset);
                 $voffset += $logoSize['height'];
                 }
@@ -232,7 +232,7 @@ 
             $fcontents .= "\n" . '!define USER_GROUP "' . $this->translateString(str_replace('"', '$\\"', $attr['profile:name'][0]), $this->codePage) . '"
 ';
         }
-        $fcontents .=  '
+        $fcontents .= '
 Caption "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
 !define APPLICATION "' . $this->translateString(sprintf(WindowsCommon::sprint_nsi(_("%s installer for %s")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $attr['general:instname'][0]), $this->codePage) . '"
 !define VERSION "' . \core\CAT::VERSION_MAJOR . '.' . \core\CAT::VERSION_MINOR . '"
@@ -241,8 +241,8 @@ 
 !define LOCALE "' . preg_replace('/\..*$/', '', CONFIG['LANGUAGES'][$this->languageInstance->getLang()]['locale']) . '"
 ;--------------------------------
 !define ORGANISATION "' . $this->translateString($attr['general:instname'][0], $this->codePage) . '"
-!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0] ) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
-!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0] ) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
+!define SUPPORT "' . ((isset($attr['support:email'][0]) && $attr['support:email'][0]) ? $attr['support:email'][0] : $this->translateString($this->support_email_substitute, $this->codePage)) . '"
+!define URL "' . ((isset($attr['support:url'][0]) && $attr['support:url'][0]) ? $attr['support:url'][0] : $this->translateString($this->support_url_substitute, $this->codePage)) . '"
     ';
 
 
@@ -256,11 +256,11 @@ 
             $fcontents .= '!define REALM "' . $attr['internal:realm'][0] . '"
 ';
         }
-        if(!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
+        if (!empty($attr['internal:hint_userinput_suffix'][0]) && $attr['internal:hint_userinput_suffix'][0] == 1) {
             $fcontents .= '!define HINT_USER_INPUT "' . $attr['internal:hint_userinput_suffix'][0] . '"
 ';
         }
-        if(!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
+        if (!empty($attr['internal:verify_userinput_suffix'][0]) && $attr['internal:verify_userinput_suffix'][0] == 1) {
             $fcontents .= '!define VERIFY_USER_REALM_INPUT "' . $attr['internal:verify_userinput_suffix'][0] . '"
 ';
         }

schema/1_1-2_0-script.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 
 while ($oneAttrib = mysqli_fetch_object(/** @scrutinizer ignore-type */ $idpWideOptionsQuery)) {
     if (!isset($profiles[$oneAttrib->institution_id])) {
-        $idp = new \core\IdP((int)$oneAttrib->institution_id);
+        $idp = new \core\IdP((int) $oneAttrib->institution_id);
         $profiles[$oneAttrib->institution_id] = ['IdP' => $idp, 'Profiles' => $idp->listProfiles()];
         echo "Debug: IdP " . $idp->identifier . " has profiles ";
         foreach ($profiles[$oneAttrib->institution_id]['Profiles'] as $oneProfileObject) {

web/diag/radius_tests.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 
 function disp_name($eap) {
     $displayName = \core\common\EAP::eapDisplayName($eap);
-    return $displayName['OUTER'] . ( $displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
+    return $displayName['OUTER'] . ($displayName['INNER'] != '' ? '-' . $displayName['INNER'] : '');
 }
 
 if (!isset($_REQUEST['test_type']) || !$_REQUEST['test_type']) {
@@ -50,7 +50,7 @@ 
     $testsuite = new \core\diag\RADIUSTests($check_realm, $my_profile->getRealmCheckOuterUsername(), $my_profile->getEapMethodsinOrderOfPreference(1), $my_profile->getCollapsedAttributes()['eap:server_name'], $my_profile->getCollapsedAttributes()['eap:ca_file']);
 } else {
     $my_profile = NULL;
-    $testsuite = new \core\diag\RADIUSTests($check_realm, "@".$check_realm);
+    $testsuite = new \core\diag\RADIUSTests($check_realm, "@" . $check_realm);
 }
 
 
@@ -66,7 +66,7 @@ 
     // contains port number; needs to be redacted for filter_var to work
     // in any case, it's a printable string, so filter it initially
     
-    $filteredHost = filter_input(INPUT_GET,'src', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST,'src', FILTER_SANITIZE_STRING);
+    $filteredHost = filter_input(INPUT_GET, 'src', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'src', FILTER_SANITIZE_STRING);
     $hostonly1 = preg_replace('/:[0-9]*$/', "", $filteredHost);
     $hostonly2 = preg_replace('/^\[/', "", $hostonly1);
     $hostonly3 = preg_replace('/\]$/', "", $hostonly2);
@@ -295,12 +295,12 @@ 
         $returnarray['time_millisec'] = sprintf("%d", $testsuite->UDP_reachability_result[$host]['time_millisec']);
 
         if (preg_match('/verify error:num=19/', implode($opensslbabble))) {
-            $printedres .= "<tr><td>"._("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!") . $measure ."</td></tr>";
+            $printedres .= "<tr><td>" . _("<strong>ERROR</strong>: the server presented a certificate which is from an unknown authority!") . $measure . "</td></tr>";
             $my_ip_addrs[$key]["status"] = "FAILED";
             $goterror = 1;
         }
         if (preg_match('/verify return:1/', implode($opensslbabble))) {
-            $printedres .= "<tr><td>"._("Completed.") . $measure . "</td></tr>";
+            $printedres .= "<tr><td>" . _("Completed.") . $measure . "</td></tr>";
             $printedres .= "<tr><td></td><td><div class=\"more\">";
             $my_ip_addrs[$key]["status"] = "OK";
             $servercertRaw = implode("\n", $opensslbabble);

web/lib/admin/UIElements.php

Spacing +3 added lines, -3 removed lines

@@ -184,7 +184,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>";
@@ -309,7 +309,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.");
         }
     }
@@ -332,7 +332,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>";
         }

Doc Comments +3 added lines

@@ -123,6 +123,9 @@
         return $find[0];
     }
 
+    /**
+     * @param string $input
+     */
     public function tooltip($input) {
         $descriptions = [];
         if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {

web/lib/user/TextTemplates.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  */
 namespace web\lib\user;
 
-require_once(ROOT."/config/_config.php");
+require_once(ROOT . "/config/_config.php");
 /**
  * these constants live in the global space just to ease their use - with class
  * prefix, the names simply get too long for comfort
@@ -72,9 +72,9 @@ 
         $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
         $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']);
-        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
+        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
-        $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = sprintf(_("Custom built for your %s"),$parent->nomenclature_inst);       
+        $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = sprintf(_("Custom built for your %s"), $parent->nomenclature_inst);       
         $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
         $this->templates[PROFILE_SELECTION] = _("Select the user group");
         $this->templates[INSTITUTION_SELECTION] = _("select another");

devices/ms/Device_Vista7.php

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
             $profileFileCont .= '
 </ServerSideCredential>
 <InnerAuthenticationMethod>
-<NonEAPAuthMethod>' .$innerMethod. '</NonEAPAuthMethod>
+<NonEAPAuthMethod>' .$innerMethod . '</NonEAPAuthMethod>
 </InnerAuthenticationMethod>
 <VendorSpecific>
 <SessionResumption>false</SessionResumption>

core/EntityWithDBProperties.php

Spacing +1 added lines, -1 removed lines

@@ -225,7 +225,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)) {