@@ -136,19 +136,19 @@ discard block |
||
| 136 | 136 | protected function htmlPreEdit($wizardMode, $additional) { |
| 137 | 137 | \core\common\Entity::intoThePotatoes(); |
| 138 | 138 | $retval = "<fieldset class='option_container'> |
| 139 | - <legend><strong>" . _("Location") . "</strong></legend>"; |
|
| 139 | + <legend><strong>" . _("Location")."</strong></legend>"; |
|
| 140 | 140 | |
| 141 | 141 | if ($wizardMode) { |
| 142 | - $retval .= "<p>" . |
|
| 143 | - _("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.") . |
|
| 142 | + $retval .= "<p>". |
|
| 143 | + _("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."). |
|
| 144 | 144 | "</p> |
| 145 | 145 | <ul>" . |
| 146 | 146 | _("<li>Drag the marker in the map to your place, or</li> |
| 147 | 147 | <li>enter your street address in the field below for lookup, or</li> |
| 148 | -<li>use the 'Locate Me!' button</li>") . |
|
| 148 | +<li>use the 'Locate Me!' button</li>"). |
|
| 149 | 149 | "</ul> |
| 150 | 150 | <strong>" . |
| 151 | - _("We will use the coordinates as indicated by the marker for geolocation.") . |
|
| 151 | + _("We will use the coordinates as indicated by the marker for geolocation."). |
|
| 152 | 152 | "</strong>"; |
| 153 | 153 | } |
| 154 | 154 | if ($additional) { |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | */ |
| 167 | 167 | protected function htmlPostEdit($allowDirectInput) { |
| 168 | 168 | \core\common\Entity::intoThePotatoes(); |
| 169 | - $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>"; |
|
| 169 | + $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>"; |
|
| 170 | 170 | \core\common\Entity::outOfThePotatoes(); |
| 171 | 171 | return $retval; |
| 172 | 172 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | * <base_url>/copyright.php after deploying the software |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 23 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 24 | 24 | |
| 25 | 25 | // no SAML auth on this page. The API key authenticates the entity |
| 26 | 26 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $inputRaw = file_get_contents('php://input'); |
| 39 | 39 | $inputDecoded = json_decode($inputRaw, TRUE); |
| 40 | 40 | if (!is_array($inputDecoded)) { |
| 41 | - $adminApi->returnError(web\lib\admin\API::ERROR_MALFORMED_REQUEST, "Unable to decode JSON POST data." . json_last_error_msg() . $inputRaw); |
|
| 41 | + $adminApi->returnError(web\lib\admin\API::ERROR_MALFORMED_REQUEST, "Unable to decode JSON POST data.".json_last_error_msg().$inputRaw); |
|
| 42 | 42 | exit(1); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | throw new Exception("A required parameter is missing, and this wasn't caught earlier?!"); |
| 133 | 133 | } |
| 134 | 134 | $newtokens = $mgmt->createTokens(true, [$admin], $idp); |
| 135 | - $URL = "https://" . $_SERVER['SERVER_NAME'] . dirname($_SERVER['SCRIPT_NAME']) . "/action_enrollment.php?token=" . array_keys($newtokens)[0]; |
|
| 135 | + $URL = "https://".$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME'])."/action_enrollment.php?token=".array_keys($newtokens)[0]; |
|
| 136 | 136 | $success = ["TOKEN URL" => $URL, "TOKEN" => array_keys($newtokens)[0]]; |
| 137 | 137 | // done with the essentials - display in response. But if we also have an email address, send it there |
| 138 | 138 | $email = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_TARGETMAIL); |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | if ($found) { |
| 170 | 170 | $adminApi->returnSuccess([]); |
| 171 | 171 | } |
| 172 | - $adminApi->returnError(web\lib\admin\API::ERROR_INVALID_PARAMETER, "The admin with ID $toBeDeleted is not associated to IdP " . $idp->identifier); |
|
| 172 | + $adminApi->returnError(web\lib\admin\API::ERROR_INVALID_PARAMETER, "The admin with ID $toBeDeleted is not associated to IdP ".$idp->identifier); |
|
| 173 | 173 | break; |
| 174 | 174 | case web\lib\admin\API::ACTION_STATISTICS_FED: |
| 175 | 175 | $adminApi->returnSuccess($fed->downloadStats("array")); |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | $outer = ""; |
| 217 | 217 | $profile->setAnonymousIDSupport(FALSE); |
| 218 | 218 | } else { |
| 219 | - $outer = $outer . "@"; |
|
| 219 | + $outer = $outer."@"; |
|
| 220 | 220 | $profile->setAnonymousIDSupport(TRUE); |
| 221 | 221 | } |
| 222 | - $profile->setRealm($outer . $realm); |
|
| 222 | + $profile->setRealm($outer.$realm); |
|
| 223 | 223 | } |
| 224 | 224 | /* const AUXATTRIB_PROFILE_TESTUSER = 'ATTRIB-PROFILE-TESTUSER'; */ |
| 225 | 225 | $testuser = $adminApi->firstParameterInstance($scrubbedParameters, web\lib\admin\API::AUXATTRIB_PROFILE_TESTUSER); |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | // extract relevant subset of information from cert objects |
| 448 | 448 | $certDetails = []; |
| 449 | 449 | foreach ($certs as $cert) { |
| 450 | - $certDetails[$cert->ca_type . ":" . $cert->serial] = ["ISSUED" => $cert->issued, "EXPIRY" => $cert->expiry, "STATUS" => $cert->status, "DEVICE" => $cert->device, "CN" => $cert->username, "ANNOTATION" => $cert->annotation]; |
|
| 450 | + $certDetails[$cert->ca_type.":".$cert->serial] = ["ISSUED" => $cert->issued, "EXPIRY" => $cert->expiry, "STATUS" => $cert->status, "DEVICE" => $cert->device, "CN" => $cert->username, "ANNOTATION" => $cert->annotation]; |
|
| 451 | 451 | } |
| 452 | 452 | $adminApi->returnSuccess($certDetails); |
| 453 | 453 | break; |
@@ -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,10 +30,10 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | // register the base directories for the namespace prefix |
| 32 | 32 | // include configuration |
| 33 | -$loader->addNamespace('config', __DIR__ ); |
|
| 33 | +$loader->addNamespace('config', __DIR__); |
|
| 34 | 34 | // include CAT/core library |
| 35 | -$loader->addNamespace('core', __DIR__ . "/../core"); |
|
| 35 | +$loader->addNamespace('core', __DIR__."/../core"); |
|
| 36 | 36 | // include CAT/devices library |
| 37 | -$loader->addNamespace('devices', __DIR__ . "/../devices"); |
|
| 37 | +$loader->addNamespace('devices', __DIR__."/../devices"); |
|
| 38 | 38 | // include CAT/web library |
| 39 | -$loader->addNamespace('web', __DIR__ . "/../web"); |
|
| 40 | 39 | \ No newline at end of file |
| 40 | +$loader->addNamespace('web', __DIR__."/../web"); |
|
| 41 | 41 | \ No newline at end of file |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | exec("openssl ocsp -reqin $derFilePath -req_text", $output, $retval); |
| 98 | 98 | |
| 99 | 99 | if ($retval !== 0) { |
| 100 | - throw new Exception("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: " . base64_encode($ocspRequestDer)); |
|
| 100 | + throw new Exception("openssl ocsp returned a non-zero return code. The DER data is probably bogus. B64 representation of DER data is: ".base64_encode($ocspRequestDer)); |
|
| 101 | 101 | } |
| 102 | 102 | if ($output === NULL) { // this can't really happen, but makes Scrutinizer happier |
| 103 | 103 | $output = []; |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | * back (if we have it). |
| 128 | 128 | */ |
| 129 | 129 | if (strcasecmp($nameHash, OUR_NAME_HASH) != 0 || strcasecmp($keyHash, OUR_KEY_HASH) != 0) { |
| 130 | - throw new Exception("The request is about a different Issuer name / public key. Expected vs. actual name hash: " . OUR_NAME_HASH . " / $nameHash, " . OUR_KEY_HASH . " / $keyHash"); |
|
| 130 | + throw new Exception("The request is about a different Issuer name / public key. Expected vs. actual name hash: ".OUR_NAME_HASH." / $nameHash, ".OUR_KEY_HASH." / $keyHash"); |
|
| 131 | 131 | } |
| 132 | -error_log("base64-encoded request: " . base64_encode($ocspRequestDer)); |
|
| 132 | +error_log("base64-encoded request: ".base64_encode($ocspRequestDer)); |
|
| 133 | 133 | |
| 134 | -$response = fopen(__DIR__ . "/statements/" . $serialHex . ".der", "r"); |
|
| 134 | +$response = fopen(__DIR__."/statements/".$serialHex.".der", "r"); |
|
| 135 | 135 | if ($response === FALSE) { // not found |
| 136 | 136 | // first lets load the unauthorised response, which is the default reply |
| 137 | - $unauthResponse = fopen(__DIR__ . "/statements/UNAUTHORIZED.der", "r"); |
|
| 137 | + $unauthResponse = fopen(__DIR__."/statements/UNAUTHORIZED.der", "r"); |
|
| 138 | 138 | if ($unauthResponse === FALSE) { |
| 139 | 139 | throw new Exception("Unable to open our canned UNAUTHORIZED response!"); |
| 140 | 140 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | $responseContent = fread($response, 1000000); |
| 178 | 178 | fclose($response); |
| 179 | -error_log("base64-encoded response: " . base64_encode($responseContent)); |
|
| 179 | +error_log("base64-encoded response: ".base64_encode($responseContent)); |
|
| 180 | 180 | header('Content-Type: application/ocsp-response'); |
| 181 | -header('Content-Length: ' . strlen($responseContent)); |
|
| 181 | +header('Content-Length: '.strlen($responseContent)); |
|
| 182 | 182 | echo $responseContent; |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | * |
| 56 | 56 | */ |
| 57 | 57 | public function writeInstaller() { |
| 58 | - $installerPath = $this->installerBasename . ".py"; |
|
| 58 | + $installerPath = $this->installerBasename.".py"; |
|
| 59 | 59 | $this->copyFile("main.py", $installerPath); |
| 60 | - $installer = fopen($installerPath,"a"); |
|
| 60 | + $installer = fopen($installerPath, "a"); |
|
| 61 | 61 | if ($installer === FALSE) { |
| 62 | 62 | throw new Exception("Unable to open installer file for writing!"); |
| 63 | 63 | } |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | $out .= "<p>"; |
| 85 | 85 | if ($ssidCount > 1) { |
| 86 | 86 | if ($ssidCount > 2) { |
| 87 | - $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " "; |
|
| 87 | + $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to the following networks:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." "; |
|
| 88 | 88 | } else { |
| 89 | - $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid'])) . " "; |
|
| 89 | + $out .= sprintf(_("In addition to <strong>%s</strong> the installer will also configure access to:"), implode(', ', \config\ConfAssistant::CONSORTIUM['ssid']))." "; |
|
| 90 | 90 | } |
| 91 | 91 | $iterator = 0; |
| 92 | 92 | foreach ($this->attributes['internal:SSID'] as $ssid => $v) { |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | * @return void |
| 125 | 125 | */ |
| 126 | 126 | private function writeConfigLine($file, $prefix, $name, $text) { |
| 127 | - $out = $prefix . $name . ' = "' . $text; |
|
| 128 | - fwrite($file, wordwrap($out, 70, " \" \\\n \"") . "\n"); |
|
| 127 | + $out = $prefix.$name.' = "'.$text; |
|
| 128 | + fwrite($file, wordwrap($out, 70, " \" \\\n \"")."\n"); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | 'user_cert_missing' => _("personal certificate file not found"), |
| 165 | 165 | ]; |
| 166 | 166 | foreach ($messages as $name => $value) { |
| 167 | - $this->writeConfigLine($file, 'Messages.', $name, $value . '"'); |
|
| 167 | + $this->writeConfigLine($file, 'Messages.', $name, $value.'"'); |
|
| 168 | 168 | } |
| 169 | 169 | \core\common\Entity::outOfThePotatoes(); |
| 170 | 170 | } |
@@ -208,39 +208,39 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if ($outerId !== NULL) { |
| 211 | - $configRaw['anonymous_identity'] = '"' . $outerId . '"'; |
|
| 211 | + $configRaw['anonymous_identity'] = '"'.$outerId.'"'; |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | if (!empty($this->attributes['internal:realm'][0])) { |
| 215 | 215 | $config['user_realm'] = $this->attributes['internal:realm'][0]; |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 218 | + if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 219 | 219 | $configRaw['hint_user_input'] = "True"; |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | - if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 222 | + if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 223 | 223 | $configRaw['verify_user_realm_input'] = "True"; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | foreach ($config as $name => $value) { |
| 227 | - $this->writeConfigLine($file, 'Config.', $name, $value . '"'); |
|
| 227 | + $this->writeConfigLine($file, 'Config.', $name, $value.'"'); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | foreach ($configRaw as $name => $value) { |
| 231 | - fwrite($file, 'Config.' . $name . ' = ' . $value . "\n"); |
|
| 231 | + fwrite($file, 'Config.'.$name.' = '.$value."\n"); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | if ($tou === '') { |
| 235 | - fwrite($file, 'Config.tou = ""' . "\n"); |
|
| 235 | + fwrite($file, 'Config.tou = ""'."\n"); |
|
| 236 | 236 | } else { |
| 237 | - fwrite($file, 'Config.tou = """' . $tou . '"""' . "\n"); |
|
| 237 | + fwrite($file, 'Config.tou = """'.$tou.'"""'."\n"); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | - fwrite($file, 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n"); |
|
| 240 | + fwrite($file, 'Config.CA = """'.$this->mkCAfile().'"""'."\n"); |
|
| 241 | 241 | $sbUserFile = $this->mkSbUserFile(); |
| 242 | 242 | if ($sbUserFile !== '') { |
| 243 | - fwrite($file, 'Config.sb_user_file = """' . $sbUserFile . '"""' . "\n"); |
|
| 243 | + fwrite($file, 'Config.sb_user_file = """'.$sbUserFile.'"""'."\n"); |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | } |
| 293 | 293 | $out .= "'DNS:$oneServer'"; |
| 294 | 294 | } |
| 295 | - return "[" . $out. "]"; |
|
| 295 | + return "[".$out."]"; |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | /** |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | foreach ($ssids as $ssid => $cipher) { |
| 307 | 307 | $outArray[] = "'$ssid'"; |
| 308 | 308 | } |
| 309 | - return '[' . implode(', ', $outArray) . ']'; |
|
| 309 | + return '['.implode(', ', $outArray).']'; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | $outArray[] = "'$ssid'"; |
| 323 | 323 | } |
| 324 | 324 | } |
| 325 | - return '[' . implode(', ', $outArray) . ']'; |
|
| 325 | + return '['.implode(', ', $outArray).']'; |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | /** |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | * |
| 331 | 331 | * @return string |
| 332 | 332 | */ |
| 333 | - private function mkCAfile(){ |
|
| 333 | + private function mkCAfile() { |
|
| 334 | 334 | $out = ''; |
| 335 | 335 | $cAlist = $this->attributes['internal:CAs'][0]; |
| 336 | 336 | foreach ($cAlist as $oneCa) { |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | */ |
| 347 | 347 | private function mkIntro() { |
| 348 | 348 | \core\common\Entity::intoThePotatoes(); |
| 349 | - $out = _("This installer has been prepared for {0}") . '\n\n' . _("More information and comments:") . '\n\nEMAIL: {1}\nWWW: {2}\n\n' . |
|
| 349 | + $out = _("This installer has been prepared for {0}").'\n\n'._("More information and comments:").'\n\nEMAIL: {1}\nWWW: {2}\n\n'. |
|
| 350 | 350 | _("Installer created with software from the GEANT project."); |
| 351 | 351 | \core\common\Entity::outOfThePotatoes(); |
| 352 | 352 | return $out; |
@@ -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(); |
@@ -41,11 +41,11 @@ discard block |
||
| 41 | 41 | $auth->authenticate(); |
| 42 | 42 | |
| 43 | 43 | if (!isset($_GET['token'])) { |
| 44 | - $elements->errorPage(_("Error creating new IdP binding!"),_("This page needs to be called with a valid invitation token!")); |
|
| 44 | + $elements->errorPage(_("Error creating new IdP binding!"), _("This page needs to be called with a valid invitation token!")); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | if (\config\ConfAssistant::CONSORTIUM['selfservice_registration'] === NULL && $_GET['token'] == "SELF-REGISTER") { |
| 48 | - $elements->errorPage(_("Error creating new IdP binding!"),_("You tried to register in self-service, but this deployment does not allow self-service!")); |
|
| 48 | + $elements->errorPage(_("Error creating new IdP binding!"), _("You tried to register in self-service, but this deployment does not allow self-service!")); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | switch ($_GET['token']) { |
@@ -55,22 +55,22 @@ discard block |
||
| 55 | 55 | $federation = \config\ConfAssistant::CONSORTIUM['selfservice_registration']; |
| 56 | 56 | break; |
| 57 | 57 | default: |
| 58 | - $token = $validator->token(filter_input(INPUT_GET,'token',FILTER_SANITIZE_STRING)); |
|
| 58 | + $token = $validator->token(filter_input(INPUT_GET, 'token', FILTER_SANITIZE_STRING)); |
|
| 59 | 59 | $checkval = $usermgmt->checkTokenValidity($token); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | if ($checkval < 0) { |
| 63 | 63 | echo $deco->pageheader(_("Error creating new IdP binding!"), "ADMIN-IDP"); |
| 64 | - echo "<h1>" . _("Error creating new IdP binding!") . "</h1>"; |
|
| 64 | + echo "<h1>"._("Error creating new IdP binding!")."</h1>"; |
|
| 65 | 65 | switch ($checkval) { |
| 66 | 66 | case \core\UserManagement::TOKENSTATUS_FAIL_ALREADYCONSUMED: |
| 67 | - 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>"; |
|
| 67 | + 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>"; |
|
| 68 | 68 | break; |
| 69 | 69 | case \core\UserManagement::TOKENSTATUS_FAIL_EXPIRED: |
| 70 | - 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>"; |
|
| 70 | + 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>"; |
|
| 71 | 71 | break; |
| 72 | 72 | default: |
| 73 | - 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>"; |
|
| 73 | + 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>"; |
|
| 74 | 74 | } |
| 75 | 75 | echo $deco->footer(); |
| 76 | 76 | throw new Exception("Terminating because something is wrong with the token we received."); |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | case "SELF-REGISTER": |
| 86 | 86 | $fed = new \core\Federation($federation); |
| 87 | 87 | $newidp = new \core\IdP($fed->newIdP(core\IdP::TYPE_IDPSP, $user, "FED", "SELFSERVICE")); |
| 88 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - selfservice registration"); |
|
| 88 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - selfservice registration"); |
|
| 89 | 89 | break; |
| 90 | 90 | default: |
| 91 | 91 | $newidp = $usermgmt->createIdPFromToken($token, $user); |
| 92 | 92 | $usermgmt->invalidateToken($token); |
| 93 | - $loggerInstance->writeAudit($user, "MOD", "IdP " . $newidp->identifier . " - Token used and invalidated"); |
|
| 93 | + $loggerInstance->writeAudit($user, "MOD", "IdP ".$newidp->identifier." - Token used and invalidated"); |
|
| 94 | 94 | break; |
| 95 | 95 | } |
| 96 | 96 | |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | they are from the same user group. You are not allowed to share them to an unlimited |
| 63 | 63 | audience (e.g. on a publicly accessible web server).</li> |
| 64 | 64 | <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to |
| 65 | -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> |
|
| 65 | +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> |
|
| 66 | 66 | <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on |
| 67 | 67 | the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li> |
| 68 | 68 | </ul> |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $this->activationsTotal = $invitationRow->quantity; |
| 146 | 146 | $certificatesResult = $this->databaseHandle->exec("SELECT `serial_number`, `ca_type` FROM `silverbullet_certificate` WHERE `silverbullet_invitation_id` = ? ORDER BY `revocation_status`, `expiry` DESC", "i", $this->identifier); |
| 147 | 147 | $certificatesNumber = ($certificatesResult ? $certificatesResult->num_rows : 0); |
| 148 | - $this->loggerInstance->debug(5, "At token validation level, " . $certificatesNumber . " certificates exist.\n"); |
|
| 148 | + $this->loggerInstance->debug(5, "At token validation level, ".$certificatesNumber." certificates exist.\n"); |
|
| 149 | 149 | // SELECT -> resource, no boolean |
| 150 | 150 | while ($runner = mysqli_fetch_object(/** @scrutinizer ignore-type */ $certificatesResult)) { |
| 151 | 151 | $this->associatedCertificates[] = new \core\SilverbulletCertificate($runner->serial_number, $runner->ca_type); |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | throw new Exception("Uh. Something went seriously wrong with URL path mangling."); |
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | - $link = $link . $relPath; |
|
| 207 | + $link = $link.$relPath; |
|
| 208 | 208 | |
| 209 | 209 | if (preg_match('/admin$/', $link)) { |
| 210 | 210 | $link = substr($link, 0, -6); |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - return $link . '/accountstatus/accountstatus.php?token=' . $this->invitationTokenString; |
|
| 216 | + return $link.'/accountstatus/accountstatus.php?token='.$this->invitationTokenString; |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $text .= sprintf(_("A new %s access credential has been created for you by your network administrator."), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 241 | 241 | $text .= " "; |
| 242 | 242 | $text .= sprintf(_("Please follow the following link with the device you want to enable for %s to get a custom %s installation program just for you. You can click on the link, copy and paste it into a browser or scan the attached QR code."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
| 243 | - $text .= "\n\n" . $this->link() . "\n\n"; // gets replaced with the token value by getBody() |
|
| 243 | + $text .= "\n\n".$this->link()."\n\n"; // gets replaced with the token value by getBody() |
|
| 244 | 244 | $text .= sprintf(_("Please keep this email or bookmark this link for future use. After picking up your %s installation program, you can use the same link to get status information about your %s account."), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
| 245 | 245 | $text .= "\n\n"; |
| 246 | 246 | $text .= _("Regards,"); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | // please run this as a cron job every hour |
| 23 | 23 | |
| 24 | -require_once dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 24 | +require_once dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 25 | 25 | |
| 26 | 26 | // iterate through all federations and see if there are recently expired |
| 27 | 27 | // invitations for any of them |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $admins = $this_fed->listFederationAdmins(); |
| 56 | 56 | $mailtext = "Hello, |
| 57 | 57 | |
| 58 | -invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] ." have recently expired: |
|
| 58 | +invitation tokens for the following new ". \config\ConfAssistant::CONSORTIUM['nomenclature_institution']." have recently expired: |
|
| 59 | 59 | |
| 60 | 60 | "; |
| 61 | 61 | foreach ($listofinstnames as $instname) { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | if ($numberofexistingidps > 0) { |
| 66 | 66 | $mailtext .= " |
| 67 | 67 | |
| 68 | -Additionally, $numberofexistingidps invitations for an existing ". \config\ConfAssistant::CONSORTIUM['nomenclature_institution']." have expired. |
|
| 68 | +Additionally, $numberofexistingidps invitations for an existing ".\config\ConfAssistant::CONSORTIUM['nomenclature_institution']." have expired. |
|
| 69 | 69 | "; |
| 70 | 70 | } |
| 71 | 71 | $mailtext .= " |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | Greetings, |
| 75 | 75 | |
| 76 | -A humble " . \config\Master::APPEARANCE['productname'] . " cron job |
|
| 76 | +A humble " . \config\Master::APPEARANCE['productname']." cron job |
|
| 77 | 77 | "; |
| 78 | 78 | |
| 79 | 79 | foreach ($admins as $admin) { |