@@ -156,8 +156,8 @@ |
||
| 156 | 156 | // replace namespace separators with directory separators |
| 157 | 157 | // in the relative class name, append with .php |
| 158 | 158 | $file = $base_dir |
| 159 | - . str_replace('\\', '/', $relative_class) |
|
| 160 | - . '.php'; |
|
| 159 | + . str_replace('\\', '/', $relative_class) |
|
| 160 | + . '.php'; |
|
| 161 | 161 | |
| 162 | 162 | // if the mapped file exists, require it |
| 163 | 163 | if ($this->requireFile($file)) { |
@@ -97,10 +97,10 @@ |
||
| 97 | 97 | public function addNamespace($prefix, $base_dir, $prepend = false) |
| 98 | 98 | { |
| 99 | 99 | // normalize namespace prefix |
| 100 | - $prefix = trim($prefix, '\\') . '\\'; |
|
| 100 | + $prefix = trim($prefix, '\\').'\\'; |
|
| 101 | 101 | |
| 102 | 102 | // normalize the base directory with a trailing separator |
| 103 | - $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . '/'; |
|
| 103 | + $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR).'/'; |
|
| 104 | 104 | |
| 105 | 105 | // initialize the namespace prefix array |
| 106 | 106 | if (isset($this->prefixes[$prefix]) === false) { |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | */ |
| 10 | 10 | ?> |
| 11 | 11 | <h1>Example Skin (main user frontpage)</h1> |
| 12 | -<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","consortium_logo.png");?>"/> |
|
| 12 | +<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "consortium_logo.png"); ?>"/> |
|
| 13 | 13 | <p>This skin is much more sober and less bloated than the default one. As it happens, it also doesn't do anything.</p> |
| 14 | 14 | <p>But at least it goes to show that it's possible to include custom images/CSS/external software using findResourceUrl(..., $filename): |
| 15 | -<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES","custom.png");?>"/> |
|
| 15 | +<img src="<?php echo $Gui->skinObject->findresourceUrl("IMAGES", "custom.png"); ?>"/> |
|
@@ -246,11 +246,11 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | - * This function parses a X.509 cert and returns all certificatePolicies OIDs |
|
| 250 | - * |
|
| 251 | - * @param array $cert (returned from openssl_x509_parse) |
|
| 252 | - * @return array of OIDs |
|
| 253 | - */ |
|
| 249 | + * This function parses a X.509 cert and returns all certificatePolicies OIDs |
|
| 250 | + * |
|
| 251 | + * @param array $cert (returned from openssl_x509_parse) |
|
| 252 | + * @return array of OIDs |
|
| 253 | + */ |
|
| 254 | 254 | private function propertyCheckPolicy($cert) { |
| 255 | 255 | $oids = []; |
| 256 | 256 | if ($cert['extensions']['certificatePolicies']) { |
@@ -263,11 +263,11 @@ discard block |
||
| 263 | 263 | return $oids; |
| 264 | 264 | } |
| 265 | 265 | /** |
| 266 | - * This function parses a X.509 cert and returns the value of $field |
|
| 267 | - * |
|
| 268 | - * @param array $cert (returned from openssl_x509_parse) |
|
| 269 | - * @return string value of the issuer field or '' |
|
| 270 | - */ |
|
| 266 | + * This function parses a X.509 cert and returns the value of $field |
|
| 267 | + * |
|
| 268 | + * @param array $cert (returned from openssl_x509_parse) |
|
| 269 | + * @return string value of the issuer field or '' |
|
| 270 | + */ |
|
| 271 | 271 | private function getCertificateIssuer($cert) { |
| 272 | 272 | $issuer = ''; |
| 273 | 273 | foreach ($cert['issuer'] as $key => $val) { |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | use \Exception; |
| 25 | 25 | |
| 26 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
| 26 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * Test suite to verify that a given NAI realm has NAPTR records according to |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['status'] = $cert['status']; |
| 145 | 145 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']]; |
| 146 | 146 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected']; |
| 147 | - $add = ' -cert ' . ROOT . '/config/cli-certs/' . $cert['public'] . ' -key ' . ROOT . '/config/cli-certs/' . $cert['private']; |
|
| 147 | + $add = ' -cert '.ROOT.'/config/cli-certs/'.$cert['public'].' -key '.ROOT.'/config/cli-certs/'.$cert['private']; |
|
| 148 | 148 | if (!isset($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k])) { |
| 149 | 149 | $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = []; |
| 150 | 150 | } |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | // but code analysers want this more explicit, so here is this extra |
| 189 | 189 | // call to escapeshellarg() |
| 190 | 190 | $escapedHost = escapeshellarg($host); |
| 191 | - $this->loggerInstance->debug(4, CONFIG['PATHS']['openssl'] . " s_client -connect " . $escapedHost . " -tls1 -CApath " . ROOT . "/config/ca-certs/ $arg 2>&1\n"); |
|
| 191 | + $this->loggerInstance->debug(4, CONFIG['PATHS']['openssl']." s_client -connect ".$escapedHost." -tls1 -CApath ".ROOT."/config/ca-certs/ $arg 2>&1\n"); |
|
| 192 | 192 | $time_start = microtime(true); |
| 193 | 193 | $opensslbabble = []; |
| 194 | 194 | $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures |
| 195 | - exec(CONFIG['PATHS']['openssl'] . " s_client -connect " . $escapedHost . " -tls1 -CApath " . ROOT . "/config/ca-certs/ $arg 2>&1", $opensslbabble, $result); |
|
| 195 | + exec(CONFIG['PATHS']['openssl']." s_client -connect ".$escapedHost." -tls1 -CApath ".ROOT."/config/ca-certs/ $arg 2>&1", $opensslbabble, $result); |
|
| 196 | 196 | $time_stop = microtime(true); |
| 197 | 197 | $testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000); |
| 198 | 198 | $testresults['returncode'] = $result; |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | they are from the same user group. You are not allowed to share them to an unlimited |
| 53 | 53 | audience (e.g. on a publicly accessible web server).</li> |
| 54 | 54 | <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to |
| 55 | -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> |
|
| 55 | +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> |
|
| 56 | 56 | <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on |
| 57 | 57 | the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li> |
| 58 | 58 | </ul> |
@@ -53,14 +53,14 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | switch ($_GET['token']) { |
| 56 | - case "SELF-REGISTER": |
|
| 57 | - $token = "SELF-REGISTER"; |
|
| 58 | - $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; |
|
| 59 | - $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; |
|
| 60 | - break; |
|
| 61 | - default: |
|
| 62 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
| 63 | - $checkval = $usermgmt->checkTokenValidity($token); |
|
| 56 | + case "SELF-REGISTER": |
|
| 57 | + $token = "SELF-REGISTER"; |
|
| 58 | + $checkval = \core\UserManagement::TOKENSTATUS_OK_NEW; |
|
| 59 | + $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; |
|
| 60 | + break; |
|
| 61 | + default: |
|
| 62 | + $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
| 63 | + $checkval = $usermgmt->checkTokenValidity($token); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | if ($checkval < 0) { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ?> |
| 31 | 31 | <?php |
| 32 | 32 | |
| 33 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 33 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 34 | 34 | |
| 35 | 35 | $auth = new \web\lib\admin\Authentication(); |
| 36 | 36 | $deco = new \web\lib\admin\PageDecoration(); |
@@ -70,22 +70,22 @@ discard block |
||
| 70 | 70 | $federation = CONFIG_CONFASSISTANT['CONSORTIUM']['selfservice_registration']; |
| 71 | 71 | break; |
| 72 | 72 | default: |
| 73 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
| 73 | + $token = $validator->token(filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING)); |
|
| 74 | 74 | $checkval = $usermgmt->checkTokenValidity($token); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if ($checkval < 0) { |
| 78 | 78 | echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP"); |
| 79 | - echo "<h1>" . _("Error creating new IdP binding!") . "</h1>"; |
|
| 79 | + echo "<h1>"._("Error creating new IdP binding!")."</h1>"; |
|
| 80 | 80 | switch ($checkval) { |
| 81 | 81 | case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED: |
| 82 | - echo "<p>" . sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureInst) . "</p>"; |
|
| 82 | + echo "<p>".sprintf(_("Sorry... this token has already been used. The %s is already created. If you got the invitation from a mailing list, probably someone else used it before you."), $elements->nomenclatureInst)."</p>"; |
|
| 83 | 83 | break; |
| 84 | 84 | case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED: |
| 85 | - echo "<p>" . sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed) . "</p>"; |
|
| 85 | + echo "<p>".sprintf(_("Sorry... this token has expired. Invitation tokens are valid for 24 hours. The %s administrator can create a new one for you."), $elements->nomenclatureFed)."</p>"; |
|
| 86 | 86 | break; |
| 87 | 87 | default: |
| 88 | - echo "<p>" . _("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.") . "</p>"; |
|
| 88 | + echo "<p>"._("Sorry... you have come to the enrollment page without a valid token. Are you a nasty person? If not, you should go to <a href='overview_user.php'>your profile page</a> instead.")."</p>"; |
|
| 89 | 89 | } |
| 90 | 90 | echo $deco->footer(); |
| 91 | 91 | throw new Exception("Terminating because something is wrong with the token we received."); |
@@ -100,12 +100,12 @@ discard block |
||
| 100 | 100 | case "SELF-REGISTER": |
| 101 | 101 | $fed = new \core\Federation($federation); |
| 102 | 102 | $newidp = new \core\IdP($fed->newIdP(core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE")); |
| 103 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration"); |
|
| 103 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration"); |
|
| 104 | 104 | break; |
| 105 | 105 | default: |
| 106 | 106 | $newidp = $usermgmt->createIdPFromToken($token, $user); |
| 107 | 107 | $usermgmt->invalidateToken($token); |
| 108 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated"); |
|
| 108 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated"); |
|
| 109 | 109 | break; |
| 110 | 110 | } |
| 111 | 111 | |
@@ -185,7 +185,6 @@ |
||
| 185 | 185 | * - RETVAL_NOTCONFIGURED; needs CONFIG_DIAGNOSTICS['RADIUSTESTS']['TLS-discoverytag'] |
| 186 | 186 | * - RETVAL_INVALID (at least one format error) |
| 187 | 187 | * - RETVAL_OK (all fine) |
| 188 | - |
|
| 189 | 188 | * @return int one of two RETVALs above |
| 190 | 189 | */ |
| 191 | 190 | public function relevantNAPTRcompliance() { |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | namespace core\diag; |
| 23 | 23 | |
| 24 | -require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
| 24 | +require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Test suite to verify that a given NAI realm has NAPTR records according to |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $this->NAPTR_executed = RADIUSTests::RETVAL_NOTCONFIGURED; |
| 170 | 170 | return RADIUSTests::RETVAL_NOTCONFIGURED; |
| 171 | 171 | } |
| 172 | - $NAPTRs = dns_get_record($this->realm . ".", DNS_NAPTR); |
|
| 172 | + $NAPTRs = dns_get_record($this->realm.".", DNS_NAPTR); |
|
| 173 | 173 | if ($NAPTRs === FALSE || count($NAPTRs) == 0) { |
| 174 | 174 | $this->NAPTR_executed = RFC7585Tests::RETVAL_NONAPTR; |
| 175 | 175 | return RFC7585Tests::RETVAL_NONAPTR; |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | - * Various paths. |
|
| 63 | - * 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. |
|
| 64 | - * 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. |
|
| 65 | - * See also NSIS_VERSION further down |
|
| 66 | - * @var array |
|
| 67 | - */ |
|
| 62 | + * Various paths. |
|
| 63 | + * 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. |
|
| 64 | + * 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. |
|
| 65 | + * See also NSIS_VERSION further down |
|
| 66 | + * @var array |
|
| 67 | + */ |
|
| 68 | 68 | 'PATHS' => [ |
| 69 | 69 | 'c_rehash' => 'c_rehash', |
| 70 | 70 | 'eapol_test' => 'eapol_test', |
@@ -101,45 +101,45 @@ discard block |
||
| 101 | 101 | ], |
| 102 | 102 | |
| 103 | 103 | 'TLS-clientcerts' => [ |
| 104 | - 'CA1' => [ |
|
| 104 | + 'CA1' => [ |
|
| 105 | 105 | 'status' => 'ACCREDITED', |
| 106 | 106 | 'issuerCA' => '/DC=org/DC=pki1/CN=PKI 1', |
| 107 | 107 | 'certificates' => [ |
| 108 | - [ |
|
| 108 | + [ |
|
| 109 | 109 | 'status' => 'CORRECT', |
| 110 | 110 | 'public' => 'ca1-client-cert.pem', |
| 111 | 111 | 'private' => 'ca1-client-key.pem', |
| 112 | 112 | 'expected' => 'PASS'], |
| 113 | - [ |
|
| 113 | + [ |
|
| 114 | 114 | 'status' => 'WRONGPOLICY', |
| 115 | 115 | 'public' => 'ca1-nopolicy-cert.pem', |
| 116 | 116 | 'private' => 'ca1-nopolicy-key.key', |
| 117 | 117 | 'expected' => 'FAIL'], |
| 118 | - [ |
|
| 118 | + [ |
|
| 119 | 119 | 'status' => 'EXPIRED', |
| 120 | 120 | 'public' => 'ca1-exp.pem', |
| 121 | 121 | 'private' => 'ca1-exp.key', |
| 122 | 122 | 'expected' => 'FAIL'], |
| 123 | - [ |
|
| 123 | + [ |
|
| 124 | 124 | 'status' => 'REVOKED', |
| 125 | 125 | 'public' => 'ca1-revoked.pem', |
| 126 | 126 | 'private' => 'ca1-revoked.key', |
| 127 | 127 | 'expected' => 'FAIL'], |
| 128 | 128 | ] |
| 129 | - ], |
|
| 130 | - 'CA-N' => [ |
|
| 129 | + ], |
|
| 130 | + 'CA-N' => [ |
|
| 131 | 131 | 'status' => 'NONACCREDITED', |
| 132 | 132 | 'issuerCA' => '/DC=org/DC=pkiN/CN=PKI N', |
| 133 | 133 | 'certificates' => [ |
| 134 | - [ |
|
| 134 | + [ |
|
| 135 | 135 | 'status' => 'CORRECT', |
| 136 | 136 | 'public' => 'caN-client-cert.pem', |
| 137 | 137 | 'private' => 'caN-client-cert.key', |
| 138 | 138 | 'expected' => 'FAIL'], |
| 139 | - ] |
|
| 140 | - ] |
|
| 141 | - ], |
|
| 142 | - 'accreditedCAsURL' => '', |
|
| 139 | + ] |
|
| 140 | + ] |
|
| 141 | + ], |
|
| 142 | + 'accreditedCAsURL' => '', |
|
| 143 | 143 | ], |
| 144 | 144 | 'eduGainResolver' => [ |
| 145 | 145 | 'url' => 'https://technical.edugain.org/api.php', |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | ], |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | - * Configuration for GeoIP2 |
|
| 122 | - * Beware, the legacy version does not really work with IPv6 addresses |
|
| 123 | - * 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 |
|
| 124 | - * geoip2-path-to-autoloader: points to the GeoIP2 autoloader |
|
| 125 | - * geoip2-path-to-db: points to the GeoIP2 city database |
|
| 126 | - * @var array |
|
| 127 | - */ |
|
| 121 | + * Configuration for GeoIP2 |
|
| 122 | + * Beware, the legacy version does not really work with IPv6 addresses |
|
| 123 | + * 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 |
|
| 124 | + * geoip2-path-to-autoloader: points to the GeoIP2 autoloader |
|
| 125 | + * geoip2-path-to-db: points to the GeoIP2 city database |
|
| 126 | + * @var array |
|
| 127 | + */ |
|
| 128 | 128 | |
| 129 | 129 | 'GEOIP' => [ |
| 130 | 130 | 'version' => 2, |
@@ -152,7 +152,6 @@ discard block |
||
| 152 | 152 | * mails, just configure the signing cert with these parameters. All must |
| 153 | 153 | * be non-NULL for signing to happen. If you don't need a keypass, make |
| 154 | 154 | * it an empty string instead. |
| 155 | - |
|
| 156 | 155 | * @var array |
| 157 | 156 | */ |
| 158 | 157 | 'MAILSETTINGS' => [ // we always use Submission |
@@ -172,25 +171,25 @@ discard block |
||
| 172 | 171 | * @var array |
| 173 | 172 | */ |
| 174 | 173 | 'LANGUAGES' => [ |
| 175 | - 'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE], |
|
| 176 | - 'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE], |
|
| 177 | - 'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE], |
|
| 178 | - 'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE], |
|
| 179 | - 'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE], |
|
| 180 | - 'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE], |
|
| 181 | - 'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE], |
|
| 182 | - 'et' => ['display' => 'Eesti', 'locale' => 'et_EE.utf8', 'latin_based' => TRUE], |
|
| 183 | - 'fr' => ['display' => 'Français', 'locale' => 'fr_FR.utf8', 'latin_based' => TRUE], |
|
| 184 | - 'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE], |
|
| 185 | - 'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE], |
|
| 186 | - 'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE], |
|
| 187 | - 'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE], |
|
| 188 | - 'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE], |
|
| 189 | - 'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE], |
|
| 190 | - 'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE], |
|
| 191 | - 'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE], |
|
| 192 | - 'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE], |
|
| 193 | - 'tr' => ['display' => 'Türkçe', 'locale' => 'tr_TR.utf8', 'latin_based' => TRUE], |
|
| 174 | + 'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE], |
|
| 175 | + 'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE], |
|
| 176 | + 'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE], |
|
| 177 | + 'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE], |
|
| 178 | + 'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE], |
|
| 179 | + 'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE], |
|
| 180 | + 'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE], |
|
| 181 | + 'et' => ['display' => 'Eesti', 'locale' => 'et_EE.utf8', 'latin_based' => TRUE], |
|
| 182 | + 'fr' => ['display' => 'Français', 'locale' => 'fr_FR.utf8', 'latin_based' => TRUE], |
|
| 183 | + 'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE], |
|
| 184 | + 'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE], |
|
| 185 | + 'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE], |
|
| 186 | + 'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE], |
|
| 187 | + 'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE], |
|
| 188 | + 'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE], |
|
| 189 | + 'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE], |
|
| 190 | + 'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE], |
|
| 191 | + 'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE], |
|
| 192 | + 'tr' => ['display' => 'Türkçe', 'locale' => 'tr_TR.utf8', 'latin_based' => TRUE], |
|
| 194 | 193 | |
| 195 | 194 | |
| 196 | 195 | |
@@ -267,7 +266,7 @@ discard block |
||
| 267 | 266 | 'user' => 'customerservice', |
| 268 | 267 | 'pass' => '2lame4u', |
| 269 | 268 | 'readonly' => TRUE, ], |
| 270 | - 'enforce-external-sync' => TRUE, |
|
| 269 | + 'enforce-external-sync' => TRUE, |
|
| 271 | 270 | ], |
| 272 | 271 | |
| 273 | 272 | /** |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | |
| 156 | 156 | * @var array |
| 157 | 157 | */ |
| 158 | - 'MAILSETTINGS' => [ // we always use Submission |
|
| 158 | + 'MAILSETTINGS' => [// we always use Submission |
|
| 159 | 159 | 'host' => 'submission.capable.mta', |
| 160 | 160 | 'user'=> 'mailuser', |
| 161 | 161 | 'pass' => 'mailpass', |
@@ -172,25 +172,25 @@ discard block |
||
| 172 | 172 | * @var array |
| 173 | 173 | */ |
| 174 | 174 | 'LANGUAGES' => [ |
| 175 | - 'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE], |
|
| 176 | - 'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE], |
|
| 177 | - 'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE], |
|
| 178 | - 'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE], |
|
| 179 | - 'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE], |
|
| 180 | - 'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE], |
|
| 181 | - 'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE], |
|
| 182 | - 'et' => ['display' => 'Eesti', 'locale' => 'et_EE.utf8', 'latin_based' => TRUE], |
|
| 183 | - 'fr' => ['display' => 'Français', 'locale' => 'fr_FR.utf8', 'latin_based' => TRUE], |
|
| 184 | - 'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE], |
|
| 185 | - 'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE], |
|
| 186 | - 'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE], |
|
| 187 | - 'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE], |
|
| 188 | - 'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE], |
|
| 189 | - 'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE], |
|
| 190 | - 'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE], |
|
| 191 | - 'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE], |
|
| 192 | - 'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE], |
|
| 193 | - 'tr' => ['display' => 'Türkçe', 'locale' => 'tr_TR.utf8', 'latin_based' => TRUE], |
|
| 175 | + 'bg' => ['display' => 'Български', 'locale' => 'bg_BG.utf8', 'latin_based' => FALSE], |
|
| 176 | + 'ca' => ['display' => 'Català', 'locale' => 'ca_ES.utf8', 'latin_based' => TRUE], |
|
| 177 | + 'cs' => ['display' => 'Čeština', 'locale' => 'cs_CZ.utf8', 'latin_based' => TRUE], |
|
| 178 | + 'de' => ['display' => 'Deutsch', 'locale' => 'de_DE.utf8', 'latin_based' => TRUE], |
|
| 179 | + 'el' => ['display' => 'Ελληνικά', 'locale' => 'el_GR.utf8', 'latin_based' => FALSE], |
|
| 180 | + 'en' => ['display' => 'English(GB)', 'locale' => 'en_GB.utf8', 'latin_based' => TRUE], |
|
| 181 | + 'es' => ['display' => 'Español', 'locale' => 'es_ES.utf8', 'latin_based' => TRUE], |
|
| 182 | + 'et' => ['display' => 'Eesti', 'locale' => 'et_EE.utf8', 'latin_based' => TRUE], |
|
| 183 | + 'fr' => ['display' => 'Français', 'locale' => 'fr_FR.utf8', 'latin_based' => TRUE], |
|
| 184 | + 'hr' => ['display' => 'Hrvatski', 'locale' => 'hr_HR.utf8', 'latin_based' => TRUE], |
|
| 185 | + 'hu' => ['display' => 'Magyar', 'locale' => 'hu_HU.utf8', 'latin_based' => TRUE], |
|
| 186 | + 'it' => ['display' => 'Italiano', 'locale' => 'it_IT.utf8', 'latin_based' => TRUE], |
|
| 187 | + 'nb' => ['display' => 'Norsk', 'locale' => 'nb_NO.utf8', 'latin_based' => TRUE], |
|
| 188 | + 'pl' => ['display' => 'Polski', 'locale' => 'pl_PL.utf8', 'latin_based' => TRUE], |
|
| 189 | + 'pt' => ['display' => 'Português', 'locale' => 'pt_PT.utf8', 'latin_based' => TRUE], |
|
| 190 | + 'sl' => ['display' => 'Slovenščina', 'locale' => 'sl_SI.utf8', 'latin_based' => TRUE], |
|
| 191 | + 'sr' => ['display' => 'Srpski', 'locale' => 'sr_RS@latin', 'latin_based' => TRUE], |
|
| 192 | + 'fi' => ['display' => 'Suomi', 'locale' => 'fi_FI.utf8', 'latin_based' => TRUE], |
|
| 193 | + 'tr' => ['display' => 'Türkçe', 'locale' => 'tr_TR.utf8', 'latin_based' => TRUE], |
|
| 194 | 194 | |
| 195 | 195 | |
| 196 | 196 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once __DIR__ . "/../core/Psr4Autoloader.php"; |
|
| 22 | +require_once __DIR__."/../core/Psr4Autoloader.php"; |
|
| 23 | 23 | use core\autoloader\Psr4Autoloader; |
| 24 | 24 | |
| 25 | 25 | // instantiate the loader |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | // register the base directories for the namespace prefix |
| 32 | 32 | // include CAT/core library |
| 33 | -$loader->addNamespace('core', __DIR__ . "/../core"); |
|
| 33 | +$loader->addNamespace('core', __DIR__."/../core"); |
|
| 34 | 34 | // include CAT/devices library |
| 35 | -$loader->addNamespace('devices', __DIR__ . "/../devices"); |
|
| 35 | +$loader->addNamespace('devices', __DIR__."/../devices"); |
|
| 36 | 36 | // include CAT/web library |
| 37 | -$loader->addNamespace('web', __DIR__ . "/../web"); |
|
| 37 | +$loader->addNamespace('web', __DIR__."/../web"); |
|
| 38 | 38 | |
| 39 | 39 | // include PHPMailer library |
| 40 | -$loader->addNamespace('PHPMailer\PHPMailer', __DIR__ . "/../core/PHPMailer/src"); |
|
| 40 | +$loader->addNamespace('PHPMailer\PHPMailer', __DIR__."/../core/PHPMailer/src"); |
|