GEANT / CAT

devices/apple_mobileconfig/mobileconfigSuperclass.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
       <key>PayloadIdentifier</key>
          <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
       <key>PayloadOrganization</key>
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
       <key>PayloadType</key>
          <string>Configuration</string>
       <key>PayloadUUID</key>
@@ -119,7 +119,7 @@ 
 
         $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
 
-        $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"),$this->nomenclature_inst);
+        $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"), $this->nomenclature_inst);
         $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
 
         $this->massagedInst = $this->massageName($this->instName);
@@ -479,7 +479,7 @@ 
                   <key>PayloadVersion</key>
                      <integer>1</integer>
                 </dict>",
-            "UUID" => $payloadUUID,];
+            "UUID" => $payloadUUID, ];
     }
 
     private function expiryBlock() {

web/lib/admin/GeoWidget.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function insertInHead($inst_country, $inst_name) {
         $cat = new \core\CAT();
-        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
+        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
     <script type='text/javascript'>
         // some global variables;
         var center_lat=49.6114885608729;

web/admin/edit_silverbullet.php

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
 
 $uiElements = new \web\lib\admin\UIElements();
 
-$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'),$uiElements->nomenclature_inst), '1.3.3');
+$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'), $uiElements->nomenclature_inst), '1.3.3');
 // Load global scripts
 $page->appendScript('js/option_expand.js');
 $page->appendScript('../external/jquery/jquery.js');
@@ -55,7 +55,7 @@ 
 $builder = new InstitutionPageBuilder($page);
 $builder->buildPagePrelude();
 $builder->buildPageHeader();
-if($builder->isReady()){
+if ($builder->isReady()) {
     // this page may have been called for the first time, when the profile does not
     // actually exist in the DB yet. If so, we will need to create it first.
     if (!isset($_REQUEST['profile_id'])) {
@@ -69,12 +69,12 @@ 
         $fed = new \core\Federation($inst->federation);
         $allowSb = $fed->getAttributes("fed:silverbullet");
         if (count($allowSb) == 0) {
-            throw new Exception("We were told to create a new SB profile, but this ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." does not allow SB at all!");
+            throw new Exception("We were told to create a new SB profile, but this " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " does not allow SB at all!");
         }
         // okay, new SB profiles are allowed. Create one.
         $newProfile = $inst->newProfile("SILVERBULLET");
         // and modify the REQUEST_URI to add the new profile ID
-        $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier;
+        $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier;
         $_GET['profile_id'] = $newProfile->identifier;
     }
     
@@ -87,7 +87,7 @@ 
     $action = $context->addQuery($_SERVER['SCRIPT_NAME']);
     
     //Info block data preparation
-    $infoBlock = new InfoBlockTable( sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
+    $infoBlock = new InfoBlockTable(sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
     $infoBlock->addRow(array('The assigned realm', $builder->getRealmName()));
     $infoBlock->addRow(array('The total number of active users which are allowed for this profile', $stats[SilverbulletContext::STATS_TOTAL]));
     $infoBlock->addRow(array('The current number of configured active users', $stats[SilverbulletContext::STATS_ACTIVE]));
@@ -95,9 +95,9 @@ 
     $builder->addContentElement($infoBlock);
 
     //Edit form data preparation
-    $acknowledgeText = _ ( 'You need to acknowledge that the created accounts are still valid within the next %s days.'
+    $acknowledgeText = _('You need to acknowledge that the created accounts are still valid within the next %s days.'
                 .' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".'
-                .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.' );
+                .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.');
     $editBlock = new UserCredentialsForm($context, $action, sprintf(_('Manage %s users'), $uiElements->nomenclature_inst), $acknowledgeText, count($users) > 0);
     foreach ($users as $user) {
         $editBlock->addUserRow($user);
@@ -124,7 +124,7 @@ 
     $builder->addContentElement($tabbedBox);
     
     //Appending terms of use popup
-    if(!$context->isAgreementSigned()){
+    if (!$context->isAgreementSigned()) {
         $termsOfUse = new TermsOfUseBox($action, TermsOfUseCommand::COMMAND, TermsOfUseCommand::AGREEMENT);
         $termsOfUsePopup = new PopupMessageContainer($termsOfUse, PageElementInterface::MESSAGEPOPUP_CLASS, \core\ProfileSilverbullet::PRODUCTNAME . " - " . _('Terms of Use'));
         $termsOfUsePopup->setCloseButtonClass('redirect');
@@ -141,7 +141,7 @@ 
     
     //Adding hidden QR code popup template
     $qrCodeImage = new UnaryTag("img");
-    $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS."-image");
+    $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS . "-image");
     $qrCodeImage->addAttribute("alt", _('Invitation QR Code'));
     $qrCodeImage->addAttribute("width", 400);
     $qrCodeImage->addAttribute("height", 400);

web/admin/edit_idp_result.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
     foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
-        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
+        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
     }
 }
 

web/admin/inc/manageDBLink.inc.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,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\admin\FormElements::BUTTON_CLOSE ) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_CLOSE) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
     header("Location: ../overview_federation.php");
     exit;
 }
@@ -107,7 +107,7 @@ 
         // right-hand side: external DB
         $externalid = $my_inst->getExternalDBId();
         if (!$externalid) { // we are in SYNCED state so this cannot happen
-            throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']."!");
+            throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . "!");
         }
 
         $extinfo = $cat->getExternalDBEntityDetails($externalid);
@@ -168,7 +168,7 @@ 
         }
         // issue a big red warning if there are no link candidates at all in the federation
         if (empty($buffer) && empty($candidates)) {
-            echo "<tr><td style='color:#ff0000' colspan='2'>". sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed)."</td></tr>";
+            echo "<tr><td style='color:#ff0000' colspan='2'>" . sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed) . "</td></tr>";
         }
         echo "</table><button type='submit' name='submitbutton' id='submit' value='" . web\lib\admin\FormElements::BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>";
     }

web/user/tou.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 /* 
 */
 
-        $Tou =  [
+        $Tou = [
     'title' => _("Terms of Use"),
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
 Identity Providers by making available customised and securely configured eduroam installers.</p>
@@ -49,7 +49,7 @@ 
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>

web/user/tou.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     they are from the same user group. You are not allowed to share them to an unlimited
     audience (e.g. on a publicly accessible web server).</li>
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
-your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li>
+your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li>
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
 </ul>

utils/notify_invitation_expiry.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     $admins = $this_fed->listFederationAdmins();
     $mailtext = "Hello,
 
-invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] ." have recently expired:
+invitation tokens for the following new ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have recently expired:
 
 ";
     foreach ($listofinstnames as $instname) {
@@ -54,7 +54,7 @@ 
     if ($numberofexistingidps > 0) {
         $mailtext .= "
 
-Additionally, $numberofexistingidps invitations for an existing ". CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." have expired.
+Additionally, $numberofexistingidps invitations for an existing " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " have expired.
         ";
     }
     $mailtext .= "

core/diag/RFC7585Tests.php

Indentation -1 removed lines

@@ -128,7 +128,6 @@
      * - RETVAL_NOTCONFIGURED; needs CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-discoverytag']
      * - RETVAL_INVALID (at least one format error)
      * - RETVAL_OK (all fine)
-
      * @return int one of two RETVALs above
      */
     public function NAPTR_compliance() {