GEANT / CAT

web/user/tou.php

Spacing +1 added lines, -1 removed lines

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

utils/notify_invitation_expiry.php

Spacing +2 added lines, -2 removed lines

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

web/admin/inc/sendinvite.inc.php

Spacing +1 added lines, -2 removed lines

@@ -169,8 +169,7 @@
         _("and enter the invitation token") . "
     $newtoken
 " . ( /* $new_idp_authorized_fedadmin */ FALSE ?
-        wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) :
-        wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
+        wordwrap(sprintf(_("manually. If you reply to this mail, you will reach your %s administrators."), $uiElements->nomenclature_fed), 72) : wordwrap(_("manually. Please do not reply to this mail; this is a send-only address.")) ) . "
 
 " . wordwrap(_("Do NOT forward the mail before the token has expired - or the recipients may be able to consume the token on your behalf!"), 72) . "
 

Switch Indentation +73 added lines, -73 removed lines

@@ -77,84 +77,84 @@
 }
 
 switch ($operationMode) {
-    case OPERATION_MODE_EDIT:
-        $idp = $validator->IdP($_GET['inst_id']);
-        // editing IdPs is done from within the popup. When we're done, send the 
-        // user back to the popup (append the result of the operation later)
-        $redirect_destination = "manageAdmins.inc.php?inst_id=" . $idp->identifier . "&";
-        $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
-        // is the user primary admin of this IdP?
-        $is_owner = $idp->isPrimaryOwner($_SESSION['user']);
-        // check if he is (also) federation admin for the federation this IdP is in. His invitations have more blessing then.
-        $fedadmin = $userObject->isFederationAdmin($idp->federation);
-        // check if he is either one, if not, complain
-        if (!$is_owner && !$fedadmin) {
-            echo "<p>" . sprintf(_("Something's wrong... you are a %s admin, but not for the %s the requested %s belongs to!"), $uiElements->nomenclature_fed, $uiElements->nomenclature_fed, $uiElements->nomenclature_inst) . "</p>";
-            exit(1);
-        }
+        case OPERATION_MODE_EDIT:
+            $idp = $validator->IdP($_GET['inst_id']);
+            // editing IdPs is done from within the popup. When we're done, send the 
+            // user back to the popup (append the result of the operation later)
+            $redirect_destination = "manageAdmins.inc.php?inst_id=" . $idp->identifier . "&";
+            $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
+            // is the user primary admin of this IdP?
+            $is_owner = $idp->isPrimaryOwner($_SESSION['user']);
+            // check if he is (also) federation admin for the federation this IdP is in. His invitations have more blessing then.
+            $fedadmin = $userObject->isFederationAdmin($idp->federation);
+            // check if he is either one, if not, complain
+            if (!$is_owner && !$fedadmin) {
+                echo "<p>" . sprintf(_("Something's wrong... you are a %s admin, but not for the %s the requested %s belongs to!"), $uiElements->nomenclature_fed, $uiElements->nomenclature_fed, $uiElements->nomenclature_inst) . "</p>";
+                exit(1);
+            }
 
-        $prettyprintname = $idp->name;
-        $newtoken = $mgmt->createToken($fedadmin, $mailaddress, $idp);
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $idp->identifier . " - Token created for " . $mailaddress);
-        $introtext = sprintf(_("a %s of the %s %s \"%s\" has invited you to manage the %s together with him."), $uiElements->nomenclature_fed, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_inst, $prettyprintname, $uiElements->nomenclature_inst) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
-        break;
-    case OPERATION_MODE_NEWUNLINKED:
-        $redirect_destination = "../overview_federation.php?";
-        $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
-        // run an input check and conversion of the raw inputs... just in case
-        $newinstname = $validator->string($_POST['name']);
-        $newcountry = $validator->string($_POST['country']);
-        $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($newcountry);
-        if ($new_idp_authorized_fedadmin !== TRUE) {
-            throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
-        }
-        $federation = $validator->Federation($newcountry);
-        $prettyprintname = $newinstname;
-        $introtext = sprintf(_("a %s %s has invited you to manage the future %s  \"%s\" (%s)."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname, $newcountry) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
-        // send the user back to his federation overview page, append the result of the operation later
-        // do the token creation magic
-        $newtoken = $mgmt->createToken(TRUE, $mailaddress, $newinstname, 0, $newcountry);
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
-        break;
-    case OPERATION_MODE_NEWFROMDB:
-        $redirect_destination = "../overview_federation.php?";
-        $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
-        // a real external DB entry was submitted and all the required parameters are there
-        $newexternalid = $validator->string($_POST['externals']);
-        $extinfo = $catInstance->getExternalDBEntityDetails($newexternalid);
-        $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($extinfo['country']);
-        if ($new_idp_authorized_fedadmin !== TRUE) {
-            throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
-        }
-        $federation = $validator->Federation($extinfo['country']);
-        $newcountry = $extinfo['country'];
-        // see if the inst name is defined in the currently set language; if not, pick its English name; if N/A, pick the last in the list
-        $prettyprintname = "";
-        foreach ($extinfo['names'] as $lang => $name) {
-            if ($lang == $languageInstance->getLang()) {
-                $prettyprintname = $name;
+            $prettyprintname = $idp->name;
+            $newtoken = $mgmt->createToken($fedadmin, $mailaddress, $idp);
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $idp->identifier . " - Token created for " . $mailaddress);
+            $introtext = sprintf(_("a %s of the %s %s \"%s\" has invited you to manage the %s together with him."), $uiElements->nomenclature_fed, CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_inst, $prettyprintname, $uiElements->nomenclature_inst) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
+            break;
+        case OPERATION_MODE_NEWUNLINKED:
+            $redirect_destination = "../overview_federation.php?";
+            $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
+            // run an input check and conversion of the raw inputs... just in case
+            $newinstname = $validator->string($_POST['name']);
+            $newcountry = $validator->string($_POST['country']);
+            $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($newcountry);
+            if ($new_idp_authorized_fedadmin !== TRUE) {
+                throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
             }
-        }
-        if ($prettyprintname == "" && isset($extinfo['names']['en'])) {
-            $prettyprintname = $extinfo['names']['en'];
-        }
-        if ($prettyprintname == "") {
-            foreach ($extinfo['names'] as $name) {
-                $prettyprintname = $name;
+            $federation = $validator->Federation($newcountry);
+            $prettyprintname = $newinstname;
+            $introtext = sprintf(_("a %s %s has invited you to manage the future %s  \"%s\" (%s)."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname, $newcountry) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
+            // send the user back to his federation overview page, append the result of the operation later
+            // do the token creation magic
+            $newtoken = $mgmt->createToken(TRUE, $mailaddress, $newinstname, 0, $newcountry);
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
+            break;
+        case OPERATION_MODE_NEWFROMDB:
+            $redirect_destination = "../overview_federation.php?";
+            $mailaddress = abortOnBogusMail($newmailaddress, $redirect_destination);
+            // a real external DB entry was submitted and all the required parameters are there
+            $newexternalid = $validator->string($_POST['externals']);
+            $extinfo = $catInstance->getExternalDBEntityDetails($newexternalid);
+            $new_idp_authorized_fedadmin = $userObject->isFederationAdmin($extinfo['country']);
+            if ($new_idp_authorized_fedadmin !== TRUE) {
+                throw new Exception("Something's wrong... you want to create a new " . $uiElements->nomenclature_inst . ", but are not a " . $uiElements->nomenclature_fed . " admin for the " . $uiElements->nomenclature_fed . " it should be in!");
             }
-        }
-        // fill the rest of the text
-        $introtext = sprintf(_("a %s %s has invited you to manage the %s  \"%s\"."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
-        // do the token creation magic
-        $newtoken = $mgmt->createToken(TRUE, $mailaddress, $prettyprintname, $newexternalid);
-        $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
-        break;
-    default: // includes OPERATION_MODE_INVALID
-        $wrongcontent = print_r($_POST, TRUE);
-        echo "<pre>Wrong parameters in POST:
+            $federation = $validator->Federation($extinfo['country']);
+            $newcountry = $extinfo['country'];
+            // see if the inst name is defined in the currently set language; if not, pick its English name; if N/A, pick the last in the list
+            $prettyprintname = "";
+            foreach ($extinfo['names'] as $lang => $name) {
+                if ($lang == $languageInstance->getLang()) {
+                    $prettyprintname = $name;
+                }
+            }
+            if ($prettyprintname == "" && isset($extinfo['names']['en'])) {
+                $prettyprintname = $extinfo['names']['en'];
+            }
+            if ($prettyprintname == "") {
+                foreach ($extinfo['names'] as $name) {
+                    $prettyprintname = $name;
+                }
+            }
+            // fill the rest of the text
+            $introtext = sprintf(_("a %s %s has invited you to manage the %s  \"%s\"."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $uiElements->nomenclature_fed, $uiElements->nomenclature_inst, $prettyprintname) . " " . sprintf(_("This invitation is valid for 24 hours from now, i.e. until %s."), strftime("%x %X", time() + 86400));
+            // do the token creation magic
+            $newtoken = $mgmt->createToken(TRUE, $mailaddress, $prettyprintname, $newexternalid);
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP FUTURE  - Token created for " . $mailaddress);
+            break;
+        default: // includes OPERATION_MODE_INVALID
+            $wrongcontent = print_r($_POST, TRUE);
+            echo "<pre>Wrong parameters in POST:
 " . htmlspecialchars($wrongcontent) . "
 </pre>";
-        exit(1);
+            exit(1);
 }
 // are we on https?
 $proto = "http://";

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

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

Indentation +27 added lines, -28 removed lines

@@ -104,13 +104,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,
@@ -128,7 +128,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
@@ -147,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
@@ -242,7 +241,7 @@ 
             'user' => 'customerservice',
             'pass' => '2lame4u',
             'readonly' => TRUE, ],
-         'enforce-external-sync' => TRUE,
+            'enforce-external-sync' => TRUE,
     ],
 
     /**

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_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++;
 }
 ?>

web/index.php

Spacing +1 added lines, -1 removed lines

@@ -26,4 +26,4 @@
 $Gui->defaultPagePrelude();
 
 // and now, serve actual data
-include("skins/".$Gui->skinObject->skin."/index.php");
+include("skins/" . $Gui->skinObject->skin . "/index.php");

devices/xml/Device_XML.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
  * @package ModuleWriting
  */
 namespace devices\xml;
-require_once(dirname(__FILE__).'/XML.inc.php');
+require_once(dirname(__FILE__) . '/XML.inc.php');
 
 /**
  * This class implements full functionality of the generic XML device
@@ -154,7 +154,7 @@ 
         $objs = [];
         if ($this->langScope === 'global') {
             foreach ($attributeList['langs'] as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $obj = new $className();
                 $obj->setValue($value);
                 $obj->setAttributes(['lang' => $language]);
@@ -178,7 +178,7 @@ 
                 $profileNameLangs = $attr['profile:name']['langs'];
             }
             foreach ($instNameLangs as $language => $value) {
-                $language = ( $language === 'C' ? 'any' : $language );
+                $language = ($language === 'C' ? 'any' : $language);
                 $displayname = new DisplayName();
                 if (isset($profileNameLangs)) {
                     $langOrC = isset($profileNameLangs[$language]) ? $profileNameLangs[$language] : $profileNameLangs['C'];
@@ -351,7 +351,7 @@ 
             $clientCertificateObject->setValue(base64_encode($this->clientCert["certdata"]));
             $clientCertificateObject->setAttributes(['format' => 'PKCS12', 'encoding' => 'base64']);
             
-            $clientsidecredential->setProperty('ClientCertificate',$clientCertificateObject);
+            $clientsidecredential->setProperty('ClientCertificate', $clientCertificateObject);
         }
         
         $authmethod->setProperty('ClientSideCredential', $clientsidecredential);