GEANT / CAT

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>

web/diag/magicTelepath.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 require_once(dirname(dirname(__DIR__)) . "/config/_config.php");
 $realm = filter_input(INPUT_GET, 'realm', FILTER_SANITIZE_STRING);
-$visited = filter_input(INPUT_GET,'visited', FILTER_SANITIZE_STRING);
+$visited = filter_input(INPUT_GET, 'visited', FILTER_SANITIZE_STRING);
 if (session_status != PHP_SESSION_ACTIVE) {
     session_start();
 }

web/diag/findRealm.php

Spacing +6 added lines, -6 removed lines

@@ -16,11 +16,11 @@ 
  *
  * @package Developer
  */
-function check_my_nonce($nonce, $optSalt='') {
+function check_my_nonce($nonce, $optSalt = '') {
     $remote = filter_input(INPUT_SERVER, 'REMOTE_ADDR');
-    $lasthour = date("G")-1<0 ? date('Ymd').'23' : date("YmdG")-1;
-    if (hash_hmac('sha256', session_id().$optSalt, date("YmdG").'1qaz2wsx3edc!QAZ@WSX#EDC'.$remote) == $nonce || 
-        hash_hmac('sha256', session_id().$optSalt, $lasthour.'1qaz2wsx3edc!QAZ@WSX#EDC'.$remote) == $nonce) {
+    $lasthour = date("G") - 1 < 0 ? date('Ymd') . '23' : date("YmdG") - 1;
+    if (hash_hmac('sha256', session_id() . $optSalt, date("YmdG") . '1qaz2wsx3edc!QAZ@WSX#EDC' . $remote) == $nonce || 
+        hash_hmac('sha256', session_id() . $optSalt, $lasthour . '1qaz2wsx3edc!QAZ@WSX#EDC' . $remote) == $nonce) {
         return true;
     } else {
         return false;
@@ -52,7 +52,7 @@ 
                 foreach ($details['admins'] as $admin) {
                     $admins[] = $admin['email'];
                 }
-                $details['admins'] = base64_encode(join(',',$admins));
+                $details['admins'] = base64_encode(join(',', $admins));
             } else {
                 $details['admins'] = '';
             }
@@ -86,7 +86,7 @@ 
                     $details = $cat->getExternalDBEntityDetails($realmOu);
                     if (!empty($details)) {
                         $returnArray['status'] = 1;
-                        $returnArray['realms'] = explode(',',$details['realmlist']);
+                        $returnArray['realms'] = explode(',', $details['realmlist']);
                     }   
                 }
             }

web/lib/admin/UIElements.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $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.
         }
         $this->nomenclature_fed = _(CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']);
@@ -186,7 +186,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>";
@@ -313,7 +313,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.");
         }
     }
@@ -336,7 +336,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/admin/inc/manageDBLink.inc.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 // if we have a pushed close button, submit attributes and send user back to the overview page
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE ) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\common\FormElements::BUTTON_CLOSE) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
     header("Location: ../overview_federation.php");
     exit;
 }

web/admin/inc/manageAdmins.inc.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 
         echo "</td>
               <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "") . " accept-charset='UTF-8'>
                 <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
                 <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>

core/IdP.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
                 case "SILVERBULLET":
                     $theProfile = new ProfileSilverbullet($identifier, $this);
                     $theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1);
-                    $theProfile->setRealm($this->identifier."-".$theProfile->identifier."." . strtolower($this->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
+                    $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(CONFIG_CONFASSISTANT['SILVERBULLET']['realm_suffix']));
                     return $theProfile;
                 default:
                     throw new Exception("This type of profile is unknown and can not be added.");

core/ProfileSilverbullet.php

Spacing +5 added lines, -5 removed lines

@@ -175,11 +175,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";
@@ -462,7 +462,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");
@@ -572,7 +572,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);
@@ -742,7 +742,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;
     }