GEANT / CAT

web/admin/edit_participant.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(__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();
@@ -116,12 +116,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);
     ?>
@@ -163,9 +163,9 @@ 
         $discardLabel = _("Discard changes");
     }
     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' id='submitbutton' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button> <button type='button' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>".$discardLabel."</button></div></form>";
+        echo "<div><button type='submit' id='submitbutton' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button> <button type='button' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>".$discardLabel."</button></div></form>";
     }
     echo $deco->footer();
     
\ No newline at end of file

web/admin/sort_profiles.php

Indentation +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
     foreach ($D as $id=>$priority) {
         echo "<input type='hidden' class='profiles' id='profile-$id' name='profile-$id' value='$priority'>";
     }
-  ?>
+    ?>
 </form>
 <?php echo $deco->footer();
 

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 ?>
 
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();

web/admin/css/wizard.css.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 // we need to know if we are serving a RTL language so we can flip some heading
 // items
 header("Content-Type:text/css");
-require_once dirname(dirname(dirname(__DIR__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__DIR__)))."/config/_config.php";
 $langInstance = new core\common\Language();
 $start = $langInstance->rtl ? "right" : "left";
 $end = $langInstance->rtl ? "left" : "right";

web/admin/edit_profile.php

Indentation +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@ 
         </legend>
         <?php
         if ($wizardStyle) {
-             echo "<p>" . _("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>";
+                echo "<p>" . _("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>";
         }
-         ?>
+            ?>
         <h3><?php echo _("Profile Name and RADIUS realm"); ?>
         </h3>
         <?php    
@@ -330,7 +330,7 @@ 
 
     <?php
     echo $wizard->displayHelp("redirect");
-     ?>
+        ?>
     <p>
 
         <?php

Spacing +28 added lines, -28 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";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();
@@ -127,7 +127,7 @@ 
         $detectRealm = $validator->string($_POST['realm_to_detect']);
         $localname = $validator->string($_POST['username_to_detect']);
         $checker = new \core\diag\RADIUSTests($detectRealm, $localname);
-        $detectionResult = $checker->autodetectCAWithProbe($localname . "@" . $detectRealm);
+        $detectionResult = $checker->autodetectCAWithProbe($localname."@".$detectRealm);
         $loggerInstance->debug(2, "CA Auto-Detection yields:");
         $loggerInstance->debug(2, $detectionResult);
         if ($detectionResult['ROOT_CA'] !== NULL) { // we are lucky!
@@ -171,8 +171,8 @@ 
     <?php
     echo $uiElements->instLevelInfoBoxes($my_inst);
 
-    echo "<form enctype='multipart/form-data' action='edit_profile_result.php?inst_id=$my_inst->identifier" . ($my_profile !== NULL ? "&amp;profile_id=" . $my_profile->identifier : "") . "' 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_profile_result.php?inst_id=$my_inst->identifier".($my_profile !== NULL ? "&amp;profile_id=".$my_profile->identifier : "")."' method='post' accept-charset='UTF-8'>
+                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
     $optionDisplay = new \web\lib\admin\OptionDisplay($profile_options, \core\Options::LEVEL_PROFILE);
     ?>
     <fieldset class="option_container">
@@ -181,7 +181,7 @@ 
         </legend>
         <?php
         if ($wizardStyle) {
-             echo "<p>" . _("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.") . "</p>";
+             echo "<p>"._("We will now define a profile for your user group(s).  You can add as many profiles as you like by choosing the appropriate button on the end of the page. After we are done, the wizard is finished and you will be taken to the main IdP administration page.")."</p>";
         }
          ?>
         <h3><?php echo _("Profile Name and RADIUS realm"); ?>
@@ -258,37 +258,37 @@ 
             <tr>
                 <!-- checkbox and input field for anonymity support, available only when realm is known-->
                 <td>
-                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Enable Anonymous Outer Identity:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='anon_support' onclick='
+                    <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "").($realm == "" ? " disabled" : ""); ?> name='anon_support' onclick='
                             if (this.form.elements["anon_support"].checked !== true) {
                                 this.form.elements["anon_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["anon_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($useAnon == FALSE ? "disabled" : "" ); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
+                    <input type='text' <?php echo ($useAnon == FALSE ? "disabled" : ""); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
                 </td>
             </tr>
             <tr>
                 <!-- checkbox and input field for check realm outer id, available only when realm is known-->
                 <td>
-                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Use special Outer Identity for realm checks:"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='checkuser_support' onclick='
+                    <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "").($realm == "" ? " disabled" : ""); ?> name='checkuser_support' onclick='
                             if (this.form.elements["checkuser_support"].checked !== true) {
                                 this.form.elements["checkuser_local"].setAttribute("disabled", "disabled");
                             } else {
                                 this.form.elements["checkuser_local"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/>
+                    <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/>
                 </td>
             </tr>
             <tr>
@@ -303,7 +303,7 @@ 
                 </td>
                 <td>
                     <input type='checkbox' <?php
-                    echo ($verify != FALSE ? "checked" : "" );
+                    echo ($verify != FALSE ? "checked" : "");
                     ?> name='verify_support' onclick='
                                 if (this.form.elements["verify_support"].checked !== true || this.form.elements["realm"].value.length == 0) {
                                     this.form.elements["hint_support"].setAttribute("disabled", "disabled");
@@ -315,12 +315,12 @@ 
             </tr>
             <tr>
                 <td>
-                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Enforce exact realm in username"); ?>
                     </span>
                 </td>
                 <td>
-                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : "" ); ?> name='hint_support' <?php echo ( $hint != FALSE ? "checked" : "" ); ?> />
+                    <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : ""); ?> name='hint_support' <?php echo ($hint != FALSE ? "checked" : ""); ?> />
                 </td>
             </tr>
         </table>
@@ -334,14 +334,14 @@ 
     <p>
 
         <?php
-        echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span>
-                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked " ) . "onclick='
+        echo "<span id='redirect_label' style='".($realm == "" ? "color:#999999" : "")."'><label for='redirect'>"._("Redirect end users to own web page:")."</label></span>
+                          <input type='checkbox'  name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked ")."onclick='
                               if (this.form.elements[\"redirect\"].checked != true) {
                                 this.form.elements[\"redirect_target\"].setAttribute(\"disabled\", \"disabled\");
                               } else {
                                 this.form.elements[\"redirect_target\"].removeAttribute(\"disabled\");
                               };'/>
-                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled" ) . "/>";
+                          <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled")."/>";
         ?>
     </p>
 
@@ -381,7 +381,7 @@ 
                         <?php
                         $D = [];
                         foreach ($prefill_methods as $prio => $value) {
-                            print '<li>' . $value->getPrintableRep() . "</li>\n";
+                            print '<li>'.$value->getPrintableRep()."</li>\n";
                             $D[$value->getPrintableRep()] = $prio;
                         }
                         ?>
@@ -407,7 +407,7 @@ 
                             }
                             $display = $a->getPrintableRep();
                             if (!isset($D[$a->getPrintableRep()])) {
-                                print '<li class="eap1">' . $a->getPrintableRep() . "</li>\n";
+                                print '<li class="eap1">'.$a->getPrintableRep()."</li>\n";
                             }
                         }
                         ?>
@@ -420,8 +420,8 @@ 
     foreach ($methods as $a) {
         $display = $a->getPrintableRep();
         $v = isset($D[$display]) ? $D[$display] : '';
-        print '<input type="hidden" class="eapm" name="' . $display . '" id="EAP-' . $display . '" value="' . $display . '">';
-        print '<input type="hidden" class="eapmv" name="' . $display . '-priority" id="EAP-' . $display . '-priority" value="' . $v . '">';
+        print '<input type="hidden" class="eapm" name="'.$display.'" id="EAP-'.$display.'" value="'.$display.'">';
+        print '<input type="hidden" class="eapmv" name="'.$display.'-priority" id="EAP-'.$display.'-priority" value="'.$v.'">';
     }
     ?>
     <br style="clear:both;" />
@@ -441,11 +441,11 @@ 
 foreach ($optionsAlreadySet as $optionNames) {
     if (preg_match("/^support:/", $optionNames)) {
         $has_support_options[$optionNames] = "SET";
-        $support_text .= "<li><strong>" . $uiElements->displayName($optionNames) . "</strong></li>";
+        $support_text .= "<li><strong>".$uiElements->displayName($optionNames)."</strong></li>";
     }
     if (preg_match("/^media:/", $optionNames)) {
         $has_media_options[$optionNames] = "SET";
-        $media_text .= "<li><strong>" . $uiElements->displayName($optionNames) . "</strong></li>";
+        $media_text .= "<li><strong>".$uiElements->displayName($optionNames)."</strong></li>";
     }
 }
 $fields = [
@@ -454,12 +454,12 @@ 
     "media" => _("Media Properties for this profile")];
 
 foreach ($fields as $name => $description) {
-    echo "<fieldset class='option_container' id='" . $name . "_override'>
+    echo "<fieldset class='option_container' id='".$name."_override'>
     <legend><strong>$description</strong></legend>
     <p>";
     echo $wizard->displayHelp($name);
-    if (count(${"has_" . $name . "_options"}) > 0) {
-        printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count(${"has_" . $name . "_options"})), "<ul>" . ${$name . "_text"} . "</ul>");
+    if (count(${"has_".$name."_options"}) > 0) {
+        printf(ngettext("The option %s is already defined IdP-wide. If you set it here on profile level, this setting will override the IdP-wide one.", "The options %s are already defined IdP-wide. If you set them here on profile level, these settings will override the IdP-wide ones.", count(${"has_".$name."_options"})), "<ul>".${$name."_text"}."</ul>");
     }
     echo "</p>";
     echo $optionDisplay->prefilledOptionTable($name, $my_inst->federation);
@@ -469,7 +469,7 @@ 
     echo "</fieldset>";
 }
 if ($wizardStyle) {
-    echo "<p>" . _("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.") . "</p>";
+    echo "<p>"._("When you are sure that everything is correct, please click on 'Save data' and you will be taken to your IdP Dashboard page.")."</p>";
 }
 if ($editMode == 'readonly') {
     $discardLabel = _("Return");
@@ -477,6 +477,6 @@ 
 if ($editMode == 'fullaccess') {
     $discardLabel = _("Discard changes");
 }
-echo "<p><button type='submit' id='submitbutton' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' id=='abortbutton' style='visibility: visible' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>".$discardLabel."</button></p></form>";
+echo "<p><button type='submit' id='submitbutton' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' id=='abortbutton' style='visibility: visible' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>".$discardLabel."</button></p></form>";
 echo $deco->footer();
 

web/lib/admin/AbstractMap.php

Spacing +2 added lines, -2 removed lines

@@ -140,7 +140,7 @@ 
         
         
         $retval = "<fieldset class='option_container'>
-        <legend><strong>" . _("Location") . "</strong></legend>";
+        <legend><strong>" . _("Location")."</strong></legend>";
         $retval .= $wizard->displayHelp("location");
         if ($additional) {
             $retval .= _("You can enter an <strong>additional</strong> location here. You can see the already defined locations in the 'General Information' field.");
@@ -157,7 +157,7 @@ 
      */
     protected function htmlPostEdit($allowDirectInput) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<br/>" . _("Latitude:") . " <input style='width:80px' name='geo_lat' id='geo_lat' " .($allowDirectInput ? "": "readonly"). ">" . _("Longitude:") . " <input name='geo_long' id='geo_long' style='width:80px' " .($allowDirectInput ? "": "readonly"). "></fieldset>";
+        $retval = "<br/>"._("Latitude:")." <input style='width:80px' name='geo_lat' id='geo_lat' ".($allowDirectInput ? "" : "readonly").">"._("Longitude:")." <input name='geo_long' id='geo_long' style='width:80px' ".($allowDirectInput ? "" : "readonly")."></fieldset>";
         \core\common\Entity::outOfThePotatoes();
         return $retval;
     }

web/lib/admin/Wizard.php

Indentation +9 added lines, -9 removed lines

@@ -89,13 +89,13 @@ 
                 $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
             }
             $ssidlist = substr($ssidlist, 2);
-             $h .= 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);
-             $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
+                $h .= 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);
+                $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
         } else {
-             $h .=  _("Please configure which SSIDs should be configured in the installers.");
+                $h .=  _("Please configure which SSIDs should be configured in the installers.");
         }
-         $h .= " " . _("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.");
-         $h .= "</li>";
+            $h .= " " . _("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.");
+            $h .= "</li>";
 
         $h .= "<li>";
         $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
@@ -135,19 +135,19 @@ 
             "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>".
             "<p>" . _("You can also tell us your RADIUS realm. ");
             if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
-               $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']);
+                $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']);
             }
         $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>";
         $this->helpMessage['profile'] = $h;
         
         // REALM
         $h = "<p>".sprintf(_("Some installers support a feature called 'Anonymous outer identity'. If you don't know what this is, please read <a href='%s'>this article</a>."), "https://confluence.terena.org/display/H2eduroam/eap-types")."</p>".
-          "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>".
-          "<p>"._("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.")."</p>";
+            "<p>"._("On some platforms, the installers can suggest username endings and/or verify the user input to contain the realm suffix.")."</p>".
+            "<p>"._("The realm check feature needs to know an outer ID which actually gets a chance to authenticate. If your RADIUS server lets only select usernames pass, it is useful to supply the information which of those (outer ID) username we can use for testing.")."</p>";
         $this->helpMessage['realm'] = $h;
         
         // REDIRECT
-         $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
+            $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
         $this->helpMessage['redirect'] = $h;
         
         // EAP

Spacing +34 added lines, -34 removed lines

@@ -64,80 +64,80 @@ 
     
     private function setMessages() {
         // SUPPORT
-        $h = "<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>";
+        $h = "<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") {
-            $h .= "<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."), $this->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>";
+            $h .= "<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."), $this->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") {
-                $h .= "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), \config\ConfAssistant::SILVERBULLET['product_name']) . " " . _("This is the contact point for your organisation. It may be displayed publicly.") . "</p>";
+                $h .= "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), \config\ConfAssistant::SILVERBULLET['product_name'])." "._("This is the contact point for your organisation. It may be displayed publicly.")."</p>";
             }
         } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-            $h .= "<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>";
+            $h .= "<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>";
         }
         $this->helpMessage['support'] = $h;
 
         // MEDIA
-        $h = "<p>" .
-            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p><ul>";
+        $h = "<p>".
+            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p><ul>";
         $h .= "<li>";
-        $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+        $h .= "<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);
              $h .= 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);
-             $h .= "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
+             $h .= "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $this->displayName("media:SSID"));
         } else {
-             $h .=  _("Please configure which SSIDs should be configured in the installers.");
+             $h .= _("Please configure which SSIDs should be configured in the installers.");
         }
-         $h .= " " . _("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.");
+         $h .= " "._("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.");
          $h .= "</li>";
 
         $h .= "<li>";
-        $h .= "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+        $h .= "<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);
             $h .= 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);
 
-            $h .= "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $this->displayName("media:consortium_OI"));
+            $h .= "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $this->displayName("media:consortium_OI"));
         } else {
             $h .= _("Please configure which Consortium OIs should be configured in the installers.");
         }
         $h .= "</li>";
-        $h .= "<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).") .
+        $h .= "<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>";
-        $h .= "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
+        $h .= "<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>";
         $h .= "</ul>";
         $this->helpMessage['media'] = $h;
         
         // IDP GENERAL
-        $h = "<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>".
+        $h = "<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."), $this->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."), $this->nomenclatureParticipant)."</li>".
             "</ul>";
         $this->helpMessage['idp_general'] = $h;
         
         // PROFILE GENERAL
-        $h = "<p>" . _("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.") . "</p>".
-            "<p>" . _("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.") . "</p>".
-            "<p>" . _("You can also tell us your RADIUS realm. ");
+        $h = "<p>"._("First of all we need a name for the profile. This will be displayed to end users, so you may want to choose a descriptive name like 'Professors', 'Students of the Faculty of Bioscience', etc.")."</p>".
+            "<p>"._("Optionally, you can provide a longer descriptive text about who this profile is for. If you specify it, it will be displayed on the download page after the user has selected the profile name in the list.")."</p>".
+            "<p>"._("You can also tell us your RADIUS realm. ");
             if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) {
                $h .= sprintf(_("This is useful if you want to use the sanity check module later, which tests reachability of your realm in the %s infrastructure. "), \config\ConfAssistant::CONSORTIUM['display_name']);
             }
-        $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).") . "</p>";
+        $h .= _("It is required to enter the realm name if you want to support anonymous outer identities (see below).")."</p>";
         $this->helpMessage['profile'] = $h;
         
         // REALM
@@ -147,24 +147,24 @@ 
         $this->helpMessage['realm'] = $h;
         
         // REDIRECT
-         $h ="<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).") . "</p>";
+         $h = "<p>"._("The CAT has a download area for end users. There, they will, for example, learn about the support pointers you entered earlier. The CAT can also immediately offer the installers for the profile for download. If you don't want that, you can instead enter a web site location where you want your users to be redirected to. You, as the administrator, can still download the profiles to place them on that page (see the 'Compatibility Matrix' button on the dashboard).")."</p>";
         $this->helpMessage['redirect'] = $h;
         
         // EAP
-        $h = "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.") . "</p>";
+        $h = "<p>"._("Now, we need to know which EAP types your IdP supports. If you support multiple EAP types, you can assign every type a priority (1=highest). This tool will always generate an automatic installer for the EAP type with the highest priority; only if the user's device can't use that EAP type, we will use an EAP type further down in the list.")."</p>";
         $this->helpMessage['eap_support'] = $h;
         
         // LOCATIOM
-        $h = "<p>" .
-                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.") .
+        $h = "<p>".
+                    _("The user download interface (see <a href='../'>here</a>), uses geolocation to suggest possibly matching IdPs to the user. The more precise you define the location here, the easier your users will find you.").
                     "</p>
                      <ul>" .
                     _("<li>Drag the marker in the map to your place, or</li>
 <li>enter your street address in the field below for lookup, or</li>
-<li>use the 'Locate Me!' button</li>") .
+<li>use the 'Locate Me!' button</li>").
                     "</ul>
                      <strong>" .
-                    _("We will use the coordinates as indicated by the marker for geolocation.") .
+                    _("We will use the coordinates as indicated by the marker for geolocation.").
                     "</strong>";
         $this->helpMessage['location'] = $h;
     }

core/IdP.php

Spacing +14 added lines, -14 removed lines

@@ -115,12 +115,12 @@ 
         $this->name = $this->languageInstance->getLocalisedValue($this->getAttributes('general:instname'));
         $eligibility = $this->eligibility($instQuery->type);
         if (in_array(IdP::ELIGIBILITY_IDP, $eligibility) && in_array(IdP::ELIGIBILITY_SP, $eligibility)) {
-            $eligType = IdP::TYPE_IDPSP . "";
+            $eligType = IdP::TYPE_IDPSP."";
             $this->type = $eligType;
         } elseif (in_array(IdP::ELIGIBILITY_IDP, $eligibility)) {
-            $eligType = IdP::TYPE_IDP . "";
+            $eligType = IdP::TYPE_IDP."";
         } else {
-            $eligType = IdP::TYPE_SP . "";
+            $eligType = IdP::TYPE_SP."";
         }
         $this->type = $eligType;
         $this->loggerInstance->debug(4, "--- END Constructing new IdP object $instId ... ---\n");
@@ -134,7 +134,7 @@ 
      */
     public function listProfiles(bool $activeOnly = FALSE)
     {
-        $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier" . ($activeOnly ? " AND showtime = 1" : "")." ORDER BY preference";
+        $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier".($activeOnly ? " AND showtime = 1" : "")." ORDER BY preference";
         $allProfiles = $this->databaseHandle->exec($query);
         $returnarray = [];
         // SELECT -> resource, not boolean
@@ -144,7 +144,7 @@ 
             $returnarray[] = $oneProfile;
         }
 
-        $this->loggerInstance->debug(4, "listProfiles: " . /** @scrutinizer ignore-type */ print_r($returnarray, true));
+        $this->loggerInstance->debug(4, "listProfiles: "./** @scrutinizer ignore-type */ print_r($returnarray, true));
         return $returnarray;
     }
 
@@ -156,7 +156,7 @@ 
      */
     public function listDeployments(bool $activeOnly = FALSE)
     {
-        $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier" . ($activeOnly ? " AND status = " . AbstractDeployment::ACTIVE : "");
+        $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier".($activeOnly ? " AND status = ".AbstractDeployment::ACTIVE : "");
         $allDeployments = $this->databaseHandle->exec($query);
         $returnarray = [];
         // SELECT -> resource, not boolean
@@ -164,7 +164,7 @@ 
             $returnarray[] = new DeploymentManaged($this, $deploymentQuery->deployment_id);
         }
 
-        $this->loggerInstance->debug(4, "listDeployments: " . /** @scrutinizer ignore-type */ print_r($returnarray, true));
+        $this->loggerInstance->debug(4, "listDeployments: "./** @scrutinizer ignore-type */ print_r($returnarray, true));
         return $returnarray;
     }
 
@@ -190,7 +190,7 @@ 
         $redirectProfileIds = [];
         $allProfileLevels = $this->databaseHandle->exec("SELECT profile_id, sufficient_config + showtime AS maxlevel FROM profile WHERE inst_id = $this->identifier ORDER BY maxlevel DESC");
         // SELECT yields a resource, not a boolean
-        if ($allProfileLevels->num_rows == 0 ) {
+        if ($allProfileLevels->num_rows == 0) {
             return self::PROFILES_INCOMPLETE;
         }
         $allProfilesArray = $allProfileLevels->fetch_all(MYSQLI_ASSOC);
@@ -218,7 +218,7 @@ 
         $allProfiles = $this->databaseHandle->exec("SELECT MIN(openroaming) AS maxlevel FROM profile WHERE inst_id = $this->identifier");
         // SELECT yields a resource, not a boolean
         while ($res = mysqli_fetch_object(/** @scrutinizer ignore-type */ $allProfiles)) {
-            return (is_numeric($res->maxlevel) ? (int)$res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO ); // insts without profiles should get a "NO"
+            return (is_numeric($res->maxlevel) ? (int) $res->maxlevel : AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO); // insts without profiles should get a "NO"
         }
         return AbstractProfile::OVERALL_OPENROAMING_LEVEL_NO;
     }
@@ -349,7 +349,7 @@ 
                 case AbstractProfile::PROFILETYPE_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.");
@@ -492,7 +492,7 @@ 
     public function getExternalDBId()
     {
         if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED
-            $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = " . self::EXTERNAL_DB_SYNCSTATE_SYNCED);
+            $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = ".self::EXTERNAL_DB_SYNCSTATE_SYNCED);
             // SELECT -> it's a resource, not a boolean
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $idQuery) == 0) {
                 return FALSE;
@@ -558,16 +558,16 @@ 
         }
         foreach ($baseline as $lang => $value) {
             if (!key_exists($lang, $newvalues)) {
-                $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] DELETED";
+                $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] DELETED";
             } else {
                 if ($value != $newvalues[$lang]) {
-                    $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] CHANGED from '" . $baseline[$lang] . "' to '" . $newvalues[$lang] . "'";
+                    $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] CHANGED from '".$baseline[$lang]."' to '".$newvalues[$lang]."'";
                 }
             }
         }
         foreach ($newvalues as $lang => $value) {
             if (!key_exists($lang, $baseline)) {
-                $retval[IdP::INSTNAME_CHANGED] .= "#[Language " . strtoupper($lang) . "] ADDED as '" . $value . "'";
+                $retval[IdP::INSTNAME_CHANGED] .= "#[Language ".strtoupper($lang)."] ADDED as '".$value."'";
             }
         }
         return $retval;

web/admin/sort_profiles_result.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 ?>
 
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();

web/admin/duplicate_profile.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 ?>
 
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $deco = new \web\lib\admin\PageDecoration();
 $validator = new \web\lib\common\InputValidation();