GEANT / CAT

config/config-diagnostics-template.php

Indentation +18 added lines, -18 removed lines

@@ -59,12 +59,12 @@ 
      */
 
         /**
-     * Various paths.
-     * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
-     * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
-     *   See also NSIS_VERSION further down
-     * @var array
-     */
+         * Various paths.
+         * eapol_test: absolute path to the eapol_test executable. If you just fill in "eapol_test" the one from the system $PATH will be taken.
+         * c_rehash: absolute path to the c_rehash executable. If you just fill in "c_rehash" the one from the system $PATH will be taken.
+         *   See also NSIS_VERSION further down
+         * @var array
+         */
     'PATHS' => [
         'c_rehash' => 'c_rehash',
         'eapol_test' => 'eapol_test',
@@ -101,44 +101,44 @@ 
         ],
 
         'TLS-clientcerts' => [
-          'CA1' => [
+            'CA1' => [
             'status' => 'ACCREDITED',
             'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1',
             'certificates' => [
-              [
+                [
                 'status' => 'CORRECT',
                 'public' => 'ca1-client-cert.pem',
                 'private' => 'ca1-client-key.pem',
                 'expected' => 'PASS'],
-              [
+                [
                 'status' => 'WRONGPOLICY',
                 'public' => 'ca1-nopolicy-cert.pem',
                 'private' => 'ca1-nopolicy-key.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'EXPIRED',
                 'public' => 'ca1-exp.pem',
                 'private' => 'ca1-exp.key',
                 'expected' => 'FAIL'],
-              [
+                [
                 'status' => 'REVOKED',
                 'public' => 'ca1-revoked.pem',
                 'private' => 'ca1-revoked.key',
                 'expected' => 'FAIL'],
             ]
-          ],
-          'CA-N' => [
+            ],
+            'CA-N' => [
             'status' => 'NONACCREDITED',
             'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N',
             'certificates' => [
-               [
+                [
                 'status' => 'CORRECT',
                 'public' => 'caN-client-cert.pem',
                 'private' => 'caN-client-cert.key',
                 'expected' => 'FAIL'],
-               ]
-          ]
-      ],
-      'accreditedCAsURL' => '',
+                ]
+            ]
+        ],
+        'accreditedCAsURL' => '',
     ],
 ];

web/admin/overview_idp.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
         <div class='infobox' style='text-align:center;'>
             <h2><?php echo sprintf(_("QR Code for %s download area"), $uiElements->nomenclature_inst); ?></h2>
             <?php
-            $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
+            $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier;
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));
             $size = getimagesize($uri);
             echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
@@ -117,7 +117,7 @@ 
             </td>
             <td>
                 <form action='edit_idp_result.php?inst_id=<?php echo $my_inst->identifier; ?>' method='post' accept-charset='UTF-8'>
-                    <button class='delete' type='submit' name='submitbutton' value='<?php echo web\lib\admin\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo ( CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL ? sprintf(_("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclature_fed) . " " : "" ) . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclature_inst, $my_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclature_inst); ?></button>
+                    <button class='delete' type='submit' name='submitbutton' value='<?php echo web\lib\admin\FormElements::BUTTON_DELETE; ?>' onclick="return confirm('<?php echo (CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration'] === NULL ? sprintf(_("After deleting the IdP, you can not recreate it yourself - you need a new invitation token from the %s administrator!"), $uiElements->nomenclature_fed) . " " : "") . sprintf(_("Do you really want to delete your %s %s?"), $uiElements->nomenclature_inst, $my_inst->name); ?>')"><?php echo sprintf(_("Delete %s"), $uiElements->nomenclature_inst); ?></button>
                 </form>
 
             </td>
@@ -326,7 +326,7 @@ 
             if (isset($URL['device-specific:redirect'])) {
                 $displayurl = $URL['device-specific:redirect'][0];
             } else {
-                $displayurl = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
+                $displayurl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $my_inst->identifier . "&amp;profile=" . $profile_list->identifier;
             }
             echo "<a href='$displayurl' style='white-space: nowrap; text-align: center;'>";
             $uri = "data:image/png;base64," . base64_encode(png_inject_consortium_logo(QRcode::png($displayurl, FALSE, QR_ECLEVEL_Q, 12)));

config/config-confassistant-template.php

Indentation +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
         'server_suffix' => '.hosted.eduroam.org',
         'gracetime' => 90,
         'CA' => ["type" => "embedded"], # OCSP URL needs to be configured in openssl.cnf
-      # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"],
+        # 'CA' => ["type" => "DFN", "SOAP_API_ENDPOINT" => "http://no.idea.where/"],
 
     ],
     /**

config/config-master-template.php

Indentation +29 added lines, -30 removed lines

@@ -103,13 +103,13 @@ 
     ],
 
     /**
-      * Configuration for GeoIP2 
-      * Beware, the legacy version does not really work with IPv6 addresses
-      * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
-      * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
-      * geoip2-path-to-db: points to the GeoIP2 city database
-      * @var array
-      */
+     * Configuration for GeoIP2 
+     * Beware, the legacy version does not really work with IPv6 addresses
+     * version: set to 2 if you wish to use GeoIP2, to 1 for the legacy version or set to 0 to turn off geolocation service
+     * geoip2-path-to-autoloader: points to the GeoIP2 autoloader 
+     * geoip2-path-to-db: points to the GeoIP2 city database
+     * @var array
+     */
       
     'GEOIP' => [
         'version' => 0,
@@ -127,7 +127,6 @@ 
      *    mails, just configure the signing cert with these parameters. All must
      *    be non-NULL for signing to happen. If you don't need a keypass, make 
      *    it an empty string instead.
-
      * @var array
      */
     'MAILSETTINGS' => [ // we always use Submission
@@ -146,25 +145,25 @@ 
      * @var array
      */
     'LANGUAGES' => [
-      'bg' => ['display' => 'Български',   'locale' => 'bg_BG.utf8',    'latin_based' => FALSE],
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
-      'cs' => ['display' => 'Čeština',     'locale' => 'cs_CZ.utf8',    'latin_based' => TRUE],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
-      'fr' => ['display' => 'Français',    'locale' => 'fr_FR.utf8',    'latin_based' => TRUE],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
-      'lt' => ['display' => 'lietuvių',    'locale' => 'lt_LT.utf8',    'latin_based' => TRUE],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',   'latin_based' => TRUE],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
+        'bg' => ['display' => 'Български',   'locale' => 'bg_BG.utf8',    'latin_based' => FALSE],
+        'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
+        'cs' => ['display' => 'Čeština',     'locale' => 'cs_CZ.utf8',    'latin_based' => TRUE],
+        'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
+        'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
+        'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
+        'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
+        'fr' => ['display' => 'Français',    'locale' => 'fr_FR.utf8',    'latin_based' => TRUE],
+        'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
+        'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
+        'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
+        'lt' => ['display' => 'lietuvių',    'locale' => 'lt_LT.utf8',    'latin_based' => TRUE],
+        'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
+        'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
+        'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
+        'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',   'latin_based' => TRUE],
+        'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
+        'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
+        'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not
@@ -217,11 +216,11 @@ 
             'db' => 'customer_db',
             'user' => 'customerservice',
             'pass' => '2lame4u'],
-         'enforce-external-sync' => TRUE,
-         /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
+            'enforce-external-sync' => TRUE,
+            /* if you feed your user database from a third-party source and do not want CAT to update it on its own, you can 
           * make it read-only
           */
-         'userdb-readonly' => FALSE,
+            'userdb-readonly' => FALSE,
     ],
 
     /**

Spacing +20 added lines, -20 removed lines

@@ -130,7 +130,7 @@ 
 
      * @var array
      */
-    'MAILSETTINGS' => [ // we always use Submission
+    'MAILSETTINGS' => [// we always use Submission
         'host' => 'submission.capable.mta',
         'user'=> 'mailuser',
         'pass' => 'mailpass',
@@ -146,25 +146,25 @@ 
      * @var array
      */
     'LANGUAGES' => [
-      'bg' => ['display' => 'Български',   'locale' => 'bg_BG.utf8',    'latin_based' => FALSE],
-      'ca' => ['display' => 'Català',      'locale' => 'ca_ES.utf8',    'latin_based' => TRUE],
-      'cs' => ['display' => 'Čeština',     'locale' => 'cs_CZ.utf8',    'latin_based' => TRUE],
-      'de' => ['display' => 'Deutsch',     'locale' => 'de_DE.utf8',    'latin_based' => TRUE],
-      'el' => ['display' => 'Ελληνικά',    'locale' => 'el_GR.utf8',    'latin_based' => FALSE],
-      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8',    'latin_based' => TRUE],
-      'es' => ['display' => 'Español',     'locale' => 'es_ES.utf8',    'latin_based' => TRUE],
-      'fr' => ['display' => 'Français',    'locale' => 'fr_FR.utf8',    'latin_based' => TRUE],
-      'gl' => ['display' => 'Galego',      'locale' => 'gl_ES.utf8',    'latin_based' => TRUE],
-      'hr' => ['display' => 'Hrvatski',    'locale' => 'hr_HR.utf8',    'latin_based' => TRUE],
-      'it' => ['display' => 'Italiano',    'locale' => 'it_IT.utf8',    'latin_based' => TRUE],
-      'lt' => ['display' => 'lietuvių',    'locale' => 'lt_LT.utf8',    'latin_based' => TRUE],
-      'nb' => ['display' => 'Norsk',       'locale' => 'nb_NO.utf8',    'latin_based' => TRUE],
-      'pl' => ['display' => 'Polski',      'locale' => 'pl_PL.utf8',    'latin_based' => TRUE],
-      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8',    'latin_based' => TRUE],
-      'sr' => ['display' => 'Srpski',      'locale' => 'sr_RS@latin',   'latin_based' => TRUE],
-      'fi' => ['display' => 'Suomi',       'locale' => 'fi_FI.utf8',    'latin_based' => TRUE],
-      'hu' => ['display' => 'Magyar',      'locale' => 'hu_HU.utf8',    'latin_based' => TRUE],
-      'pt' => ['display' => 'Português',   'locale' => 'pt_PT.utf8',    'latin_based' => TRUE],
+      'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE],
+      'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE],
+      'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE],
+      'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE],
+      'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE],
+      'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE],
+      'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE],
+      'fr' => ['display' => 'Français', 'locale' => 'fr_FR.utf8', 'latin_based' => TRUE],
+      'gl' => ['display' => 'Galego', 'locale' => 'gl_ES.utf8', 'latin_based' => TRUE],
+      'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE],
+      'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE],
+      'lt' => ['display' => 'lietuvių', 'locale' => 'lt_LT.utf8', 'latin_based' => TRUE],
+      'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE],
+      'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE],
+      'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE],
+      'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE],
+      'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE],
+      'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE],
+      'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE],
 
 // For the following languages, partial translations exist in Transifex, but
 // they are not complete enough for display. Their Transifex content is not

core/common/Entity.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function __construct() {
         $this->loggerInstance = new Logging();
-        $this->loggerInstance->debug(3, "--- BEGIN constructing class ". get_class($this)." .\n");
+        $this->loggerInstance->debug(3, "--- BEGIN constructing class " . get_class($this) . " .\n");
         $this->languageInstance = new Language();
     }
 
@@ -71,7 +71,7 @@ 
      * Logs the end of lifetime of the entity to the debug log on level 5.
      */
     public function __destruct() {
-        (new Logging())->debug(5,"--- KILL Destructing class ". get_class($this)." .\n");
+        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
     }
     
     /**

web/admin/edit_profile.php

Spacing +15 added lines, -15 removed lines

@@ -281,14 +281,14 @@ 
             <tr>
                 <!-- checkbox for "verify-->
                 <td>
-                    <span id='verify_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='verify_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Verify user input to contain realm suffix:"); ?>
                     </span>
                 </td>
                 <td>
                     <input type='checkbox' <?php
-                    echo ($verify != FALSE ? "checked" : "" );
-                    echo ($realm == "" ? "disabled" : "" );
+                    echo ($verify != FALSE ? "checked" : "");
+                    echo ($realm == "" ? "disabled" : "");
                     ?> name='verify_support' onclick='
                             if (this.form.elements["verify_support"].checked !== true) {
                                 this.form.elements["hint_support"].setAttribute("disabled", "disabled");
@@ -296,48 +296,48 @@ 
                                 this.form.elements["hint_support"].removeAttribute("disabled");
                             }
                             ;'/>
-                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'>
+                    <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'>
                         <?php echo _("Prefill user input with realm suffix:"); ?>
                     </span>
-                    <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>
             <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 ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/>
+                    <input type='text' <?php echo ($checkuserOuter == 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>
         </table>
@@ -353,14 +353,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>
 
@@ -384,7 +384,7 @@ 
     function priority(string $eapType, bool $isenabled, int $priority) {
         echo "<td><select id='$eapType-priority' name='$eapType-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">";
         for ($a = 1; $a < 7; $a = $a + 1) {
-            echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>";
+            echo "<option id='$eapType-$a' value='$a' " . ($isenabled && $a == $priority ? "selected" : "") . ">$a</option>";
         }
         echo "</select></td>";
     }

web/admin/inc/toggleRedirect.inc.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         throw new Exception("POSTed EAP type value is not an integer!");
     }
     // conversion routine throws an exception if the EAP type id is not known
-    $eaptype = \core\common\EAP::eAPMethodArrayIdConversion((int)$posted_eaptype);
+    $eaptype = \core\common\EAP::eAPMethodArrayIdConversion((int) $posted_eaptype);
 }
 
 // there is either one or the other. If both are set, something's fishy.

web/lib/admin/OptionDisplay.php

Doc Comments +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
      * @param int $rowid the HTML field base name of the option to be displayed
      * @param string $optionName the name of the option to display
      * @param string $optionValue the value of the option to display
-     * @param mixed $optionLang the language of the option to display
+     * @param null|string $optionLang the language of the option to display
      * @param int $locationIndex which n of m locations is this, in case we are displaying a coordinate
      * @param int $allLocationCount how many locations in total exist, in case we are displaying a coordinate
      * @return string HTML code

Spacing +7 added lines, -7 removed lines

@@ -89,7 +89,7 @@ 
 
         $optioninfo = \core\Options::instance();
 
-        if (is_array($prepopulate) && ( count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific")) { // editing... fill with values
+        if (is_array($prepopulate) && (count($prepopulate) > 1 || $class == "device-specific" || $class == "eap-specific")) { // editing... fill with values
             $number = 0;
             foreach ($prepopulate as $option) {
                 if (preg_match("/$class:/", $option['name']) && !preg_match("/(profile:QR-user|user:fedadmin)/", $option['name'])) {
@@ -149,11 +149,11 @@ 
         foreach ($dataTypes as $oneDataType) {
             // TODO make this a $jsmagic .= after the update of cat-pilot
             $jsmagic .= "if (/#$oneDataType#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
-                                  document.getElementById(\"S$rowid-input-file\").style.display = \"".($oneDataType == "file" ? "block" : "none")."\";
-                                  document.getElementById(\"S$rowid-input-text\").style.display = \"".($oneDataType == "text" ? "block" : "none")."\";
-                                  document.getElementById(\"S$rowid-input-string\").style.display = \"".($oneDataType == "string" ? "block" : "none")."\";
-                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($oneDataType == "boolean" ? "block" : "none")."\";
-                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"".($oneDataType == "integer" ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($oneDataType == "file" ? "block" : "none") . "\";
+                                  document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($oneDataType == "text" ? "block" : "none") . "\";
+                                  document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($oneDataType == "string" ? "block" : "none") . "\";
+                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($oneDataType == "boolean" ? "block" : "none") . "\";
+                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($oneDataType == "integer" ? "block" : "none") . "\";
                              }
                              ";
         }
@@ -211,7 +211,7 @@ 
      * @return string HTML code
      * @throws Exception
      */
-    private function prefillText(int $rowid, string $optionName, string $optionValue, $optionLang, int &$locationIndex, int &$allLocationCount) {
+    private function prefillText(int $rowid, string $optionName, string $optionValue, $optionLang, int & $locationIndex, int & $allLocationCount) {
         $retval = "";
         $optioninfo = \core\Options::instance();
         $loggerInstance = new \core\common\Logging();

web/admin/edit_user_result.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 
 $i = 0;
 foreach ($salvageFedPrivs as $oneFed) {
-    $_POST['option']["S123456789".$i] = "user:fedadmin#string##";
-    $_POST['value']["S123456789".$i."-0"] = $oneFed;
+    $_POST['option']["S123456789" . $i] = "user:fedadmin#string##";
+    $_POST['value']["S123456789" . $i . "-0"] = $oneFed;
     $i++;
 }
 ?>