GEANT / CAT

core/diag/Logopath.php

Spacing +14 added lines, -14 removed lines

@@ -117,11 +117,11 @@ 
         $this->possibleFailureReasons = $_SESSION["SUSPECTS"] ?? []; // if we know nothing, don't talk to anyone
         $this->additionalFindings = $_SESSION["EVIDENCE"] ?? [];
 
-        $this->subjectPrefix = _("[eduroam Diagnostics]") . " ";
+        $this->subjectPrefix = _("[eduroam Diagnostics]")." ";
         $this->finalGreeting = "\n"
                 . _("(This service is in an early stage. We apologise if this is a false alert. If this is the case, please send an email report to cat-devel@lists.geant.org, forwarding the entire message (including the 'SUSPECTS' and 'EVIDENCE' data at the end), and explain why this is a false positive.)")
                 . "\n"
-                . _("Yours sincerely,") . "\n"
+                . _("Yours sincerely,")."\n"
                 . "\n"
                 . _("Ed U. Roam, the eduroam diagnostics algorithm");
 
@@ -132,13 +132,13 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::TARGET_EDUROAM_OT],
                 "subject" => _("[POLICYVIOLATION NATIONAL] IdP with no entry in eduroam database"),
-                "body" => _("Dear NRO administrator,") . "\n"
+                "body" => _("Dear NRO administrator,")."\n"
                 . "\n"
-                . wordwrap(sprintf(_("an end-user requested diagnostics for realm %s. Real-time connectivity checks determined that the realm exists, but we were unable to find an IdP with that realm in the eduroam database."), $this->additionalFindings['REALM'])) . "\n"
+                . wordwrap(sprintf(_("an end-user requested diagnostics for realm %s. Real-time connectivity checks determined that the realm exists, but we were unable to find an IdP with that realm in the eduroam database."), $this->additionalFindings['REALM']))."\n"
                 . "\n"
-                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.") . "\n"
+                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.")."\n"
                 . "\n"
-                . _("Additionally, this creates operational issues. In particular, we are unable to direct end users to their IdP for further diagnosis/instructions because there are no contact points for that IdP in the database.") . "\n"
+                . _("Additionally, this creates operational issues. In particular, we are unable to direct end users to their IdP for further diagnosis/instructions because there are no contact points for that IdP in the database.")."\n"
                 . "\n"
                 . _("Please stop the policy violation ASAP by listing the IdP which is associated to this realm.")
                 . "\n",
@@ -149,11 +149,11 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::TARGET_ENDUSER],
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
-                "body" => _("Dear IdP administrator,") . "\n"
+                "body" => _("Dear IdP administrator,")."\n"
                 . "\n"
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM'])
                 . "\n"
-                . _("Real-time connectivity checks determined that the realm appears to be working in acceptable parameters, but the administrator insisted to contact you with the supplemental information below.") . "\n"
+                . _("Real-time connectivity checks determined that the realm appears to be working in acceptable parameters, but the administrator insisted to contact you with the supplemental information below.")."\n"
                 . "\n",
             ],
             Logopath::IDP_SUSPECTED_PROBLEM_INTERACTIVE_EVIDENCED => [
@@ -162,11 +162,11 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::TARGET_ENDUSER],
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
-                "body" => _("Dear IdP administrator,") . "\n"
+                "body" => _("Dear IdP administrator,")."\n"
                 . "\n"
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM'])
                 . "\n"
-                . _("Real-time connectivity checks determined that the realm indeed has an operational problem at this point in time. Please see the supplemental information below.") . "\n"
+                . _("Real-time connectivity checks determined that the realm indeed has an operational problem at this point in time. Please see the supplemental information below.")."\n"
                 . "\n",
             ],
         ];
@@ -174,13 +174,13 @@ 
         // add exalted human-readable information to main mail body
         foreach ($this->mailStack as $oneEntry) {
             if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
-                $oneEntry["body"] .= _("Authentication/Attempt Timestamp of user session:") . " " . $this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'] . "\n";
+                $oneEntry["body"] .= _("Authentication/Attempt Timestamp of user session:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
             }
             if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_MAC'])) {
-                $oneEntry["body"] .= _("MAC address of end user in question:") . " " . $this->additionalFindings['INTERACTIVE_ENDUSER_MAC'] . "\n";
+                $oneEntry["body"] .= _("MAC address of end user in question:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
             }
             if (isset($this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'])) {
-                $oneEntry["body"] .= _("Additional Comments:") . " " . $this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'] . "\n";
+                $oneEntry["body"] .= _("Additional Comments:")." ".$this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS']."\n";
             }
         }
 
@@ -340,7 +340,7 @@ 
 
             $handle = \core\common\OutsideComm::mailHandle();
             // let's identify outselves
-            $handle->FromName = \config\Master::APPEARANCE['productname'] . " Real-Time Diagnostics System";
+            $handle->FromName = \config\Master::APPEARANCE['productname']." Real-Time Diagnostics System";
             // add recipients
             foreach (Logopath::CATEGORYBINDING as $arrayName => $functionName) {
                 foreach ($theMail[$arrayName] as $onePrincipal) {

web/diag/adminQuery.php

Spacing +44 added lines, -44 removed lines

@@ -19,7 +19,7 @@ 
  * License: see the web/copyright.inc.php file in the file structure or
  *          <base_url>/copyright.php after deploying the software
  */
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 $languageInstance = new \core\common\Language();
 $languageInstance->setTextDomain("diagnostics");
 $loggerInstance = new \core\common\Logging();
@@ -61,43 +61,43 @@ 
     $select = "<div id='sp_abuse_problem'>
 <select style='margin-left: 0px;' id='select_sp_problem'>";
     foreach ($sp_problem as $pname => $pdesc) {
-        $select = $select . "<option value='$pname'>$pdesc</option>\n";
+        $select = $select."<option value='$pname'>$pdesc</option>\n";
     }
-    $select = $select . "</select></div>";
+    $select = $select."</select></div>";
     $res = "
 <input type='hidden' name='token' id='token' value=''>
 <input type='hidden' name='tests_result' id='tests_result' value=''>
 <table id='sp_questions'>
     <tr id='sp_problem_selector'>
-        <td>" . _("Select your problem") . "</td>
+        <td>" . _("Select your problem")."</td>
         <td>$select</td>
     </tr>
     <tr>
-        <td>" . _("What is the realm of the IdP in question?") . "</td>
+        <td>"._("What is the realm of the IdP in question?")."</td>
         <td>
                 <input type='text' name='admin_realm' id='admin_realm' value='$realmFromURL'>
-                <button class='diag_button' id='realm_in_db_admin' style='display: none;' accesskey='R' type='button'>" .
-                _("Check this realm") .
+                <button class='diag_button' id='realm_in_db_admin' style='display: none;' accesskey='R' type='button'>".
+                _("Check this realm").
                 "</button>
                 <div id='tests_info_area'></div>
         </td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("What is the authentication timestamp of the user session in question?") . "</td>
+        <td>" . _("What is the authentication timestamp of the user session in question?")."</td>
         <td><input type='text' id='timestamp' name='timestamp'>
             <div id='datepicker'></div>
         </td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("What is the MAC address of the user session in question?") . "</td>
+        <td>" . _("What is the MAC address of the user session in question?")."</td>
         <td><input type='text' id='mac' name='mac'></td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("Additional comments") . "</td>
+        <td>" . _("Additional comments")."</td>
         <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td>
     </tr>
     <tr class='hidden_row'>
-        <td>" . _("Please specify an email address on which the IdP can contact you") . "</td>
+        <td>" . _("Please specify an email address on which the IdP can contact you")."</td>
         <td><input type='text' id='email' name='email'></td>
     </tr>
     <tr>
@@ -105,82 +105,82 @@ 
         <td></td>
     </tr>
     <tr class='hidden_row' id='send_query_to_idp'>
-        <td>" . _("Now you can send your query") . "</td>
-        <td><button type='submit' class='diag_button' id='submit_idp_query' name='go'>" . _("Send") . "</button></td>
+        <td>" . _("Now you can send your query")."</td>
+        <td><button type='submit' class='diag_button' id='submit_idp_query' name='go'>" . _("Send")."</button></td>
     </tr>
  </table>";
-    $res = $res . $javascript;
+    $res = $res.$javascript;
 }
 if ($queryType == 'idp') {
     $select = "<div id='idp_reported_problem' style='display:;'>
 <select style='margin-left:0px;' id='select_idp_problem'>";
     foreach ($idp_problem as $pname => $pdesc) {
-        $select = $select . "<option value='$pname'>$pdesc</option>\n";
+        $select = $select."<option value='$pname'>$pdesc</option>\n";
     }
-    $select = $select . "</select></div>";
+    $select = $select."</select></div>";
     $res = "
 <table id='idp_questions'>
     <tr>
-        <td>" . _("Select your problem") . "</td>
+        <td>" . _("Select your problem")."</td>
         <td>$select</td>
     </tr>
     <tr>
-        <td>" . _("Identify the SP by one of following means") . "</td>
+        <td>"._("Identify the SP by one of following means")."</td>
         <td></td>
     </tr>
     <tr id='by_opname'>
-        <td>" . _("SP Operator-Name attribute") . "</td>
+        <td>" . _("SP Operator-Name attribute")."</td>
         <td><input type='text' id='opname' name='opname' value=''></td>
     </tr>
     <tr id='spmanually'>
-        <td>" . _("Select the SP manually:") . "</td>
+        <td>" . _("Select the SP manually:")."</td>
         <td>
             <div id='select_asp_country'><a href='' id='asp_countries_list'>
-            <span id='opnameselect'>" . _("click to select country and organisation") . "</a></span>
+            <span id='opnameselect'>" . _("click to select country and organisation")."</a></span>
             </div>
             <div id='select_asp_area'></div>
         </td>
     </tr>
     <tr id='asp_desc' style='display: none;'>
-        <td>" . _("or") . ' ' . _("at least describe the SP location") . "</td>
+        <td>" . _("or").' '._("at least describe the SP location")."</td>
         <td><input type='text' id='asp_location' name='asp_location' value=''></td>
     </tr>
     <tr>
-        <td>" . _("What is the outer ID of the user session in question?") . "</td>
+        <td>" . _("What is the outer ID of the user session in question?")."</td>
         <td><input type='text' id='outer_id' name='outer_id' value=''></td>
     </tr>
     <tr>
-        <td>" . _("What is the authentication timestamp of the user session in question?") . "</td>
+        <td>" . _("What is the authentication timestamp of the user session in question?")."</td>
         <td>
             <input type='text' id='timestamp' name='timestamp'>
             <div id='datepicker'></div>
         </td>
     </tr>
     <tr>
-        <td>" . _("What is the MAC address of the user session in question?") . "</td>
+        <td>" . _("What is the MAC address of the user session in question?")."</td>
         <td><input type='text' id='mac' name='mac'></td>
     </tr>
     <tr>
-        <td>" . _("Additional comments about the problem") . "</td>
+        <td>" . _("Additional comments about the problem")."</td>
         <td><textarea id='freetext' name='freetext' cols='60' rows='5'></textarea></td>
     </tr>
     <tr>
-        <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?") . "</td>
+        <td>" . _("Do you have any contact details by which the user wishes to be contacted by the SP?")."</td>
         <td><textarea id='c_details' name='c_details' cols='60' rows='5'></textarea></td>
     </tr>
     <tr>
-        <td>" . _("Please specify an email address on which the SP can contact you") . "</td>
+        <td>" . _("Please specify an email address on which the SP can contact you")."</td>
         <td><input type='text' id='email' name='email'></td>
     </tr>
     <tr class='hidden_row' id='send_query_to_sp'>
-        <td>" . _("Now you can send your query") . "</td>
-        <td><button type='submit' class='diag_button' id='submit_sp_query' name='go'>" . _("Send") . "</button></td>
+        <td>" . _("Now you can send your query")."</td>
+        <td><button type='submit' class='diag_button' id='submit_sp_query' name='go'>" . _("Send")."</button></td>
     </tr>
 </table>";
-    $res = $res . $javascript;
+    $res = $res.$javascript;
 }
 if ($queryType == 'idp_send' || $queryType == 'sp_send') {
-    include_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+    include_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
     $cat = new \core\CAT();
     $returnArray = array();
     if (count((array) $o) > 0) {
@@ -189,8 +189,8 @@ 
             switch ($key) {
                 case 'realm':
                     $pos = strpos($value, '@');
-                    if ($pos !== FALSE ) {
-                        $value = substr($value, $pos+1);
+                    if ($pos !== FALSE) {
+                        $value = substr($value, $pos + 1);
                     }
                 case 'email':
                     $returnArray[$key] = filter_var($value, FILTER_VALIDATE_EMAIL);
@@ -231,7 +231,7 @@ 
         $mail = \core\common\OutsideComm::mailHandle();
         $emails = ['mgw@umk.pl'];
         //$emails = explode(',', $returnArray['idpcontact']);
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
         foreach ($emails as $email) {
             $mail->addAddress($email);
         }
@@ -241,11 +241,11 @@ 
         } else {
             $link = 'http://';
         }
-        $link .= $_SERVER['SERVER_NAME'] . \core\CAT::getRootUrlPath() . '/diag/show_realmcheck.php?token=' . $returnArray['token'];
+        $link .= $_SERVER['SERVER_NAME'].\core\CAT::getRootUrlPath().'/diag/show_realmcheck.php?token='.$returnArray['token'];
         $returnArray['testurl'] = $link;
         $mail->Subject = _('Suspected a technical problem with the IdP');
-        $txt = _("We suspect a technical problem with the IdP handling the realm") . ' ' . 
-                $returnArray['realm'] . ".\n";
+        $txt = _("We suspect a technical problem with the IdP handling the realm").' '. 
+                $returnArray['realm'].".\n";
         $txt .= _("The CAT diagnostic test was run for this realm during reporting.\n");
         $txt .= _("The overall result was ");
         if ($returnArray['tests_result'] == 0) {
@@ -253,15 +253,15 @@ 
         } else {
             $txt .= _("failure");
         }
-        $txt .= ".\n" . _("To see details go to ");
+        $txt .= ".\n"._("To see details go to ");
         $txt .= "$link\n\n";
-        $txt .= _("The reported problem details are as follows") . "\n";
-        $txt .= _("timestamp") . ": " . $returnArray['timestamp'] . "\n";
-        $txt .= _("client MAC address") . ": " . $returnArray['mac'] . "\n";
+        $txt .= _("The reported problem details are as follows")."\n";
+        $txt .= _("timestamp").": ".$returnArray['timestamp']."\n";
+        $txt .= _("client MAC address").": ".$returnArray['mac']."\n";
         if ($returnArray['freetext']) {
-            $txt .= _("additional comments") . ': ' . $returnArray['freetext'] . "\n";
+            $txt .= _("additional comments").': '.$returnArray['freetext']."\n";
         }
-        $txt .= "\n" . _("You can contact the incident reporter at") . ' ' . $returnArray['email'];
+        $txt .= "\n"._("You can contact the incident reporter at").' '.$returnArray['email'];
         
         $mail->Body = $txt;
         $sent = $mail->send();

web/admin/edit_federation.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -61,13 +61,13 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php $tablecaption = sprintf(_("%s Properties"),$uiElements->nomenclatureFed); echo $tablecaption?></h2>
+        <h2><?php $tablecaption = sprintf(_("%s Properties"), $uiElements->nomenclatureFed); echo $tablecaption?></h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -78,11 +78,11 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld" . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld"."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
     ?>
     <fieldset class="option_container">
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></strong></legend>
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></strong></legend>
         <?php
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, \core\Options::LEVEL_FED);
         echo $optionDisplay->prefilledOptionTable("fed", $my_fed->tld);
@@ -90,5 +90,5 @@ 
         <button type='button' class='newoption' onclick='getXML("fed", "<?php echo $my_fed->tld ?>")'><?php echo _("Add new option"); ?></button>
     </fieldset>
     <?php
-    echo "<div><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php\"'>" . _("Discard changes") . "</button></div></form>";
+    echo "<div><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_federation.php\"'>"._("Discard changes")."</button></div></form>";
     echo $deco->footer();

web/admin/edit_participant.php

Spacing +35 added lines, -35 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -39,7 +39,7 @@ 
 $inst_name = $my_inst->name;
 
 if ($wizardStyle) {
-    echo $deco->defaultPagePrelude(sprintf(_("%s: %s enrollment wizard (step 2)"), \config\Master::APPEARANCE['productname'],  $uiElements->nomenclatureParticipant));
+    echo $deco->defaultPagePrelude(sprintf(_("%s: %s enrollment wizard (step 2)"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant));
 } else {
     echo $deco->defaultPagePrelude(sprintf(_("%s: Editing %s '%s'"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant, $inst_name));
 }
@@ -80,13 +80,13 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php $tablecaption = sprintf(_("%s general properties"), $uiElements->nomenclatureParticipant); echo $tablecaption;?></h2>
+        <h2><?php $tablecaption = sprintf(_("%s general properties"), $uiElements->nomenclatureParticipant); echo $tablecaption; ?></h2>
         <table>
-            <caption><?php echo $tablecaption;?></caption>
+            <caption><?php echo $tablecaption; ?></caption>
             <tr>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Type");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable");?></th>
-                <th class="wai-invisible" scope="col"><?php echo _("Property Value");?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Type"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Language if applicable"); ?></th>
+                <th class="wai-invisible" scope="col"><?php echo _("Property Value"); ?></th>
             </tr>
 
             <tr>
@@ -101,12 +101,12 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier" . ($wizardStyle ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier".($wizardStyle ? "&wizard=true" : "")."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
 
     if ($wizardStyle) {
-        echo "<p>" .
-        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant) . "</p>";
+        echo "<p>".
+        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant)."</p>";
     }
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, \core\Options::LEVEL_IDP);
     ?>
@@ -114,11 +114,11 @@ 
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p>
+            echo "<p>".
+            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p>
                       <ul>
-                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li>
-                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."),$uiElements->nomenclatureParticipant) . "</li>";
+                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li>
+                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant)."</li>";
             echo "</ul>";
         }
         echo $optionDisplay->prefilledOptionTable("general", $my_inst->federation);
@@ -132,44 +132,44 @@ 
         <legend><strong><?php echo _("Media Properties"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>
+            echo "<p>".
+            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>
           <ul>";
             echo "<li>";
-            echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+            echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>";
             if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
                 $ssidlist = "";
                 foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) {
-                    $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+                    $ssidlist .= ", '<strong>".$ssid."</strong>'";
                 }
                 $ssidlist = substr($ssidlist, 2);
                 echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
-                echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
+                echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
             } else {
                 echo _("Please configure which SSIDs should be configured in the installers.");
             }
-            echo " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
+            echo " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
             echo "</li>";
 
             echo "<li>";
-            echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+            echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>";
             if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) {
                 $consortiumlist = "";
                 foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) {
-                    $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+                    $consortiumlist .= ", '<strong>".$oi."</strong>'";
                 }
                 $consortiumlist = substr($consortiumlist, 2);
                 echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
 
-                echo "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
+                echo "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
             } else {
                 echo _("Please configure which Consortium OIs should be configured in the installers.");
             }
             echo "</li>";
-            echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
-            . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") .
+            echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
+            . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).").
             "</li>";
-            echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
+            echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
             . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.")
             . "</li>";
             echo "</ul>";
@@ -185,16 +185,16 @@ 
             echo "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>";
             
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<p>" .
+                echo "<p>".
                         
-                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."),$uiElements->nomenclatureParticipant)  . "</p>" .
-                "<p>" .
-                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>";
+                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant)."</p>".
+                "<p>".
+                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>";
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME) ." " . _("This is the contact point for your end users' level 1 support.") . "</p>";
+                echo "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME)." "._("This is the contact point for your end users' level 1 support.")."</p>";
                 }
             } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>". _("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
+                echo "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
             }
             
         }
@@ -204,8 +204,8 @@ 
         <button type='button' class='newoption' onclick='getXML("support", "<?php echo $my_inst->federation ?>")'><?php echo _("Add new option"); ?></button></fieldset>
     <?php
     if ($wizardStyle) {
-        echo "<p>" . sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CONTINUE . "'>", "</button>") . "</p></form>";
+        echo "<p>".sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CONTINUE."'>", "</button>")."</p></form>";
     } else {
-        echo "<div><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_user.php\"'>" . _("Discard changes") . "</button></div></form>";
+        echo "<div><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button> <button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_user.php\"'>"._("Discard changes")."</button></div></form>";
     }
     echo $deco->footer();

web/admin/inc/option_xhr.inc.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 \core\CAT::sessionStart();
 
-if (!isset($_GET["class"] )) {
+if (!isset($_GET["class"])) {
     throw new Exception("Unknown type of option!");
 }
 

web/admin/inc/toggleRedirect.inc.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . "/config/_config.php";
+require_once dirname(dirname(dirname(dirname(__FILE__))))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $loggerInstance = new \core\common\Logging();
@@ -85,7 +85,7 @@ 
         $remaining_attribs = $my_profile->beginFlushMethodLevelAttributes($eaptype->getIntegerRep(), NULL);
         $optionParser->processSubmittedFields($my_profile, $_POST, $_FILES, $eaptype->getIntegerRep(), NULL);
     }
-    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $my_profile->identifier . " - device/EAP-Type settings changed");
+    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$my_profile->identifier." - device/EAP-Type settings changed");
     header("Location: ../overview_installers.php?inst_id=$my_inst->identifier&profile_id=$my_profile->identifier");
     exit;
 }
@@ -99,7 +99,7 @@ 
     }
     $captiontext = sprintf(_("device <strong>%s</strong>"), $device['display']);
     $keyword = "device-specific";
-    $extrainput = "<input type='hidden' name='device' value='" . $device_key . "'/>";
+    $extrainput = "<input type='hidden' name='device' value='".$device_key."'/>";
 } elseif ($eaptype !== NULL) {
     foreach ($my_profile->getAttributes() as $attrib) {
         if (isset($attrib['eapmethod']) && $attrib['eapmethod'] == $eaptype->getArrayRep()) {
@@ -109,12 +109,12 @@ 
 
     $captiontext = sprintf(_("EAP-Type <strong>%s</strong>"), $eaptype->getPrintableRep());
     $keyword = "eap-specific";
-    $extrainput = "<input type='hidden' name='eaptype' value='" . $eaptype->getIntegerRep() . "'>";
+    $extrainput = "<input type='hidden' name='eaptype' value='".$eaptype->getIntegerRep()."'>";
 } else {
     throw new Exception("previous type checks make it impossible to reach this code path.");
 }
 ?>
-<p><?php echo _("Fine-tuning options for ") . $captiontext; ?></p>
+<p><?php echo _("Fine-tuning options for ").$captiontext; ?></p>
 <hr/>
 
 <form action='inc/toggleRedirect.inc.php?inst_id=<?php echo $my_inst->identifier; ?>&amp;profile_id=<?php echo $my_profile->identifier; ?>' method='post' accept-charset='UTF-8'><?php echo $extrainput; ?>
@@ -123,7 +123,7 @@ 
     $interesting_attribs = [];
 
     foreach ($attribs as $attrib) {
-        if ($attrib['level'] == \core\Options::LEVEL_METHOD && preg_match('/^' . $keyword . ':/', $attrib['name'])) {
+        if ($attrib['level'] == \core\Options::LEVEL_METHOD && preg_match('/^'.$keyword.':/', $attrib['name'])) {
             $interesting_attribs[] = $attrib;
         }
     }
@@ -131,7 +131,7 @@ 
     echo $optionDisplay->prefilledOptionTable($keyword, $my_inst->federation);
     if (\config\Master::DB['INST']['readonly'] === FALSE) {
         ?>
-        <button type='button' class='newoption' onclick='getXML("<?php echo $keyword;?>", "<?php echo $my_inst->federation;?>")'><?php echo _("Add new option"); ?></button>
+        <button type='button' class='newoption' onclick='getXML("<?php echo $keyword; ?>", "<?php echo $my_inst->federation; ?>")'><?php echo _("Add new option"); ?></button>
         <br/>
         <hr/>
         <button type='submit' name='submitbutton' id='submitbutton' value='<?php echo web\lib\common\FormElements::BUTTON_SAVE; ?>'><?php echo _("Save data"); ?></button>

web/lib/admin/OptionDisplay.php

Spacing +34 added lines, -34 removed lines

@@ -86,7 +86,7 @@ 
      * @return string HTML code <table>
      */
     public function prefilledOptionTable(string $attributePrefix, $fed) {
-        $retval = "<table id='expandable_$attributePrefix" . "_options'>";
+        $retval = "<table id='expandable_$attributePrefix"."_options'>";
 
         $prepopulate = [];
         foreach ($this->listOfOptions as $existingAttribute) {
@@ -94,7 +94,7 @@ 
                 $prepopulate[] = $existingAttribute;
             }
         }
-        if (is_array($prepopulate) && ( count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific" )) { // editing... fill with values
+        if (is_array($prepopulate) && (count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific")) { // editing... fill with values
             $retval .= $this->addOptionEdit($attributePrefix, $prepopulate);
         } else {
             $retval .= $this->addOptionNew($attributePrefix, $fed);
@@ -126,7 +126,7 @@ 
                 $optiontypearray = $optioninfo->optionType($option['name']);
                 $loggerInstance = new \core\common\Logging();
                 $loggerInstance->debug(5, "About to execute optiontext with PREFILL!\n");
-                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row'] : $option['value']), $option['lang']);
+                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-'.$option['level'].'-'.$option['row'] : $option['value']), $option['lang']);
             }
         }
         return $retval;
@@ -222,7 +222,7 @@ 
         $descriptions["media:force_proxy"] = sprintf(_("The format of this option is: IPv4|IPv6|hostname:port . Forcing your users through a content filter of your own is a significant invasion of user self-determination. It also has technical issues. Please throughly read the discussion at %s before specifying a proxy with this option. This feature is currently experimental and only has an effect in Apple installers."), "https://github.com/GEANT/CAT/issues/96");
         $descriptions["managedsp:realmforvlan"] = sprintf(_("If you are also using %s, then your own realm is automatically tagged with the VLAN you choose, there is no need to add it here manually."), \core\ProfileSilverbullet::PRODUCTNAME);
         $descriptions["media:openroaming"] = 
-                sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."),"eduroam Ecosystem Broker OpenRoaming Identity Provider Policy").
+                sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy").
                 " ".
                 sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']).
                 " ".
@@ -233,7 +233,7 @@ 
         if (!isset($descriptions[$input])) {
             return "";
         }
-        return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:" . ($isVisible ? "block" : "none") . "' onclick='alert(\"" . $descriptions[$input] . "\")'><img src='../resources/images/icons/question-mark-icon.png" . "'></span>";
+        return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:".($isVisible ? "block" : "none")."' onclick='alert(\"".$descriptions[$input]."\")'><img src='../resources/images/icons/question-mark-icon.png"."'></span>";
     }
 
     /**
@@ -246,18 +246,18 @@ 
      */
     private function selectElement($rowid, $list) {
         $jsmagic = "onchange='
-                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
+                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid."-select\").value)) {
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"block\";
                                    } else {
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"none\";
                                    }";
         foreach (array_keys(OptionDisplay::HTML_DATATYPE_TEXTS) as $key) {
-            $jsmagic .= "if (/#" . $key . "#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
-                                  document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($key == \core\Options::TYPECODE_FILE ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($key == \core\Options::TYPECODE_TEXT ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($key == \core\Options::TYPECODE_STRING ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($key == \core\Options::TYPECODE_INTEGER ? "block" : "none") . "\";
+            $jsmagic .= "if (/#".$key."#/.test(document.getElementById(\"option-S".$rowid."-select\").value)) {
+                                  document.getElementById(\"S$rowid-input-file\").style.display = \"".($key == \core\Options::TYPECODE_FILE ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-text\").style.display = \"".($key == \core\Options::TYPECODE_TEXT ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-string\").style.display = \"".($key == \core\Options::TYPECODE_STRING ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"".($key == \core\Options::TYPECODE_INTEGER ? "block" : "none")."\";
                              }
                              ";
             // hide all tooltips (each is a <span>, and there are no other <span>s)
@@ -288,7 +288,7 @@ 
                 $value = array_shift($list);
                 $listtype = $optioninfo->optionType($value);
                 $retval .= $uiElements->displayName($value);
-                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#'/>";
+                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#".$listtype["type"]."#".$listtype["flag"]."#'/>";
                 $activelisttype = $listtype;
                 $tooltips = $this->tooltip($rowid, $value, TRUE);
                 break;
@@ -296,7 +296,7 @@ 
                 $retval .= "<select id='option-S$rowid-select' name='option[S$rowid]' $jsmagic>";
                 foreach ($list as $value) {
                     $listtype = $optioninfo->optionType($value);
-                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
+                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#".$listtype["type"]."#".$listtype["flag"]."#' ";
                     if ($iterator == $this->optionIterator) {
                         $retval .= "selected='selected'";
                         $activelisttype = $listtype;
@@ -304,7 +304,7 @@ 
                     } else {
                         $tooltips .= $this->tooltip($rowid, $value, FALSE);
                     }
-                    $retval .= ">" . $uiElements->displayName($value) . "</option>";
+                    $retval .= ">".$uiElements->displayName($value)."</option>";
                     $iterator++;
                 }
 
@@ -329,9 +329,9 @@ 
      */
     private function selectLanguage($rowid, $makeVisible) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
-            <option value='' name='select_language' selected>" . _("select language") . "</option>
-            <option value='C' name='all_languages'>" . _("default/other languages") . "</option>";
+        $retval = "<select style='display:".($makeVisible ? "block" : "none")."' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect'>
+            <option value='' name='select_language' selected>" . _("select language")."</option>
+            <option value='C' name='all_languages'>" . _("default/other languages")."</option>";
         foreach (\config\Master::LANGUAGES as $langindex => $possibleLang) {
             $thislang = $possibleLang['display'];
             $retval .= "<option value='$langindex' name='$langindex'>$thislang</option>";
@@ -359,7 +359,7 @@ 
     private function inputFields($rowid, $activetype) {
         $retval = "";
         foreach (OptionDisplay::HTML_DATATYPE_TEXTS as $key => $type) {
-            $retval .= "<" . $type['html'] . " style='display:" . ($activetype['type'] == $key ? "block" : "none") . "' name='value[S$rowid-$key]' id='S" . $rowid . "-input-" . $key . "'" . $type['tail'] . ">";
+            $retval .= "<".$type['html']." style='display:".($activetype['type'] == $key ? "block" : "none")."' name='value[S$rowid-$key]' id='S".$rowid."-input-".$key."'".$type['tail'].">";
         }
         return $retval;
     }
@@ -374,11 +374,11 @@ 
     private function noPrefillText(int $rowid, array $list) {
         // first column: the <select> element with the names of options and their field-toggling JS magic
         $selectorInfo = $this->selectElement($rowid, $list);
-        $retval = "<td>" . $selectorInfo["TEXT"] . "</td>";
+        $retval = "<td>".$selectorInfo["TEXT"]."</td>";
         // second column: the <select> element for language selection - only visible if the active option is multi-lang
-        $retval .= "<td>" . $this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML") . "</td>";
+        $retval .= "<td>".$this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML")."</td>";
         // third column: the actual input fields; the data type of the active option is visible, all others hidden
-        $retval .= "<td>" . $this->inputFields($rowid, $selectorInfo['ACTIVE']) . "</td>";
+        $retval .= "<td>".$this->inputFields($rowid, $selectorInfo['ACTIVE'])."</td>";
         return $retval;
     }
 
@@ -401,20 +401,20 @@ 
         $retval .= "<td>";
         $uiElements = new UIElements();
         $listtype = $optioninfo->optionType($optionName);
-        $retval .= "<span style='display:flex;'>" . $uiElements->displayName($optionName);
-        $retval .= $this->tooltip($rowid, $optionName, TRUE) . "</span>";
-        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ></td>";
+        $retval .= "<span style='display:flex;'>".$uiElements->displayName($optionName);
+        $retval .= $this->tooltip($rowid, $optionName, TRUE)."</span>";
+        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#".$listtype["type"]."#".$listtype["flag"]."#' ></td>";
 
         // language tag if any
         $retval .= "<td>";
         if ($listtype["flag"] == "ML") {
 
-            $language = "(" . strtoupper($optionLang) . ")";
+            $language = "(".strtoupper($optionLang).")";
             if ($optionLang == 'C') {
                 $language = _("(default/other languages)");
             }
             $retval .= $language;
-            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $optionLang . "' style='display:block'>";
+            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect' value='".$optionLang."' style='display:block'>";
         }
         $retval .= "</td>";
 // attribute content
@@ -424,12 +424,12 @@ 
             case \core\Options::TYPECODE_COORDINATES:
                 $this->allLocationCount = $this->allLocationCount + 1;
                 // display of the locations varies by map provider
-                $classname = "\web\lib\admin\Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'];
+                $classname = "\web\lib\admin\Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'];
                 $link = $classname::optionListDisplayCode($optionValue, $this->allLocationCount);
-                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link";
+                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-".\core\Options::TYPECODE_TEXT."]' id='S$rowid-input-text' value='$optionValue'>$link";
                 break;
             case \core\Options::TYPECODE_FILE:
-                $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>";
+                $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S".$rowid."-input-string' style='display:none' value='".urlencode($optionValue)."'>";
                 $uiElements = new UIElements();
                 switch ($optionName) {
                     case "eap:ca_file":
@@ -459,7 +459,7 @@ 
                 if ($listtype['type'] == \core\Options::TYPECODE_BOOLEAN) {// only modify in this one case
                     $displayedVariant = ($optionValue == "on" ? _("on") : _("off"));
                 }
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
                 break;
             default:
                 // this should never happen!
@@ -504,10 +504,10 @@ 
        <td>
           <button type='button' class='delete' onclick='";
         if ($prefillValue !== NULL && $item == "general:geo_coordinates") {
-            $funcname = "Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'] . 'DeleteCoord';
-            $retval .= 'if (typeof ' . $funcname . ' === "function") { ' . $funcname . '(' . $this->allLocationCount . '); } ';
+            $funcname = "Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'].'DeleteCoord';
+            $retval .= 'if (typeof '.$funcname.' === "function") { '.$funcname.'('.$this->allLocationCount.'); } ';
         }
-        $retval .= 'deleteOption("option-S' . $rowid . '")';
+        $retval .= 'deleteOption("option-S'.$rowid.'")';
         $retval .= "'>-</button>
        </td>
     </tr>";

web/skins/modern/user/js/cat_js.php

Spacing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
         otherdata = j.otherdata;
     if(! result) {
       alert(guiTexts.noMatchingData);
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/' ?>';
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/' ?>';
     }
     j = j.data;
     n = j.length;
@@ -284,7 +284,7 @@ 
        result = j1.status;
        if(! result) {
             alert(guiTexts.noMatchingData);
-            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/' ?>';
+            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/').'/' ?>';
        }
        j = j1.data;
        if(j.description !== undefined && j.description) {

config/ConfAssistant-template.php

Spacing +4 added lines, -4 removed lines

@@ -90,7 +90,7 @@ 
                     ], 
                 'condition' => TRUE],
             'OpenRoaming®' => [
-                'ssid' => [],     /* OpenRoaming has left SSIDs behind */
+                'ssid' => [], /* OpenRoaming has left SSIDs behind */
                 'oi' => [
                     '5A03BA0000', /* OpenRoaming/AllIdentities/SettlementFree/NoPersonalData/BaselineQoS */
                     '5A03BA0800', /* OpenRoaming/EduIdentities/SettlementFree/NoPersonalData/BaselineQoS */
@@ -150,7 +150,7 @@ 
     const PATHS = [
         'makensis' => 'makensis',
         'trust-store-mozilla' => '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
-        'trust-store-custom' => __DIR__ . "/known-roots.pem",
+        'trust-store-custom' => __DIR__."/known-roots.pem",
     ];
 
     /**
@@ -188,13 +188,13 @@ 
             'db' => 'radacct',
             'user' => 'someuser',
             'pass' => 'somepass',
-            'readonly' => TRUE,],
+            'readonly' => TRUE, ],
         'RADIUS_2' => [
             'host' => 'auth-2.hosted.eduroam.org',
             'db' => 'radacct',
             'user' => 'someuser',
             'pass' => 'somepass',
-            'readonly' => TRUE,],
+            'readonly' => TRUE, ],
     ];
 
     /**