GEANT /
CAT
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * @package UserGUI |
| 27 | 27 | */ |
| 28 | 28 | error_reporting(E_ALL | E_STRICT); |
| 29 | -require dirname(dirname(__FILE__)) . "/config/_config.php"; |
|
| 29 | +require dirname(dirname(__FILE__))."/config/_config.php"; |
|
| 30 | 30 | |
| 31 | 31 | $langObject = new \core\common\Language(); |
| 32 | 32 | $langObject->setTextDomain("web_user"); |
@@ -39,24 +39,24 @@ discard block |
||
| 39 | 39 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
| 40 | 40 | <div id="heading"> |
| 41 | 41 | <?php |
| 42 | - print '<img src="'. dirname($_SERVER['SCRIPT_NAME']) .'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
| 43 | - print '<div id="motd">' . ( isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : ' ' ) . '</div>'; |
|
| 44 | - print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']) . '</h1> |
|
| 45 | -<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'] . '</h2>'; |
|
| 42 | + print '<img src="'.dirname($_SERVER['SCRIPT_NAME']).'/resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
|
| 43 | + print '<div id="motd">'.(isset(\config\Master::APPEARANCE['MOTD']) ? \config\Master::APPEARANCE['MOTD'] : ' ').'</div>'; |
|
| 44 | + print '<h1 style="padding-bottom:0px; height:1em;">'.sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']).'</h1> |
|
| 45 | +<h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . \config\Master::APPEARANCE['productname_long'].'</h2>'; |
|
| 46 | 46 | echo '<table id="lang_select"><tr><td>'; |
| 47 | 47 | echo _("View this page in"); |
| 48 | 48 | ?> |
| 49 | 49 | <?php |
| 50 | 50 | foreach (\config\Master::LANGUAGES as $lang => $value) { |
| 51 | - echo "<a href='javascript:changeLang(\"$lang\")'>" . $value['display'] . "</a> "; |
|
| 51 | + echo "<a href='javascript:changeLang(\"$lang\")'>".$value['display']."</a> "; |
|
| 52 | 52 | } |
| 53 | - echo '</td><td style="text-align:right;padding-right:20px"><a href="' . dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang() . '">' . _("Start page") . '</a></td></tr></table>'; |
|
| 53 | + echo '</td><td style="text-align:right;padding-right:20px"><a href="'.dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang().'">'._("Start page").'</a></td></tr></table>'; |
|
| 54 | 54 | ?> |
| 55 | 55 | </div> <!-- id="heading" --> |
| 56 | 56 | <div id="main_body" style='padding:20px;'> |
| 57 | - <h1><?php echo _("Maybe this is the CAT you are looking for...");?></h1> |
|
| 58 | - <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as");?></p> |
|
| 57 | + <h1><?php echo _("Maybe this is the CAT you are looking for..."); ?></h1> |
|
| 58 | + <p><?php echo _("but we don't want to show it to you. You need to be authenticated and authorised to see this content. Since you are not, you got this error page usually known as"); ?></p> |
|
| 59 | 59 | <h2>401/403</h2> |
| 60 | - <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang())?></p> |
|
| 60 | + <p><?php echo sprintf(_("Your mistake? Our error? Who knows! Maybe you should go back to the <a href='%s'>Start Page</a>."), dirname($_SERVER['SCRIPT_NAME']).'?lang='.$langObject->getLang())?></p> |
|
| 61 | 61 | </div> |
| 62 | 62 | <?php echo $deco->footer(); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * @return string HTML code <table> |
| 86 | 86 | */ |
| 87 | 87 | public function prefilledOptionTable(string $attributePrefix) { |
| 88 | - $retval = "<table id='expandable_$attributePrefix" . "_options'>"; |
|
| 88 | + $retval = "<table id='expandable_$attributePrefix"."_options'>"; |
|
| 89 | 89 | |
| 90 | 90 | $prepopulate = []; |
| 91 | 91 | foreach ($this->listOfOptions as $existingAttribute) { |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $prepopulate[] = $existingAttribute; |
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | - if (is_array($prepopulate) && ( count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific" )) { // editing... fill with values |
|
| 96 | + if (is_array($prepopulate) && (count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific")) { // editing... fill with values |
|
| 97 | 97 | $retval .= $this->addOptionEdit($attributePrefix, $prepopulate); |
| 98 | 98 | } else { |
| 99 | 99 | $retval .= $this->addOptionNew($attributePrefix); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | $optiontypearray = $optioninfo->optionType($option['name']); |
| 126 | 126 | $loggerInstance = new \core\common\Logging(); |
| 127 | 127 | $loggerInstance->debug(5, "About to execute optiontext with PREFILL!\n"); |
| 128 | - $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row'] : $option['value']), $option['lang']); |
|
| 128 | + $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-'.$option['level'].'-'.$option['row'] : $option['value']), $option['lang']); |
|
| 129 | 129 | } |
| 130 | 130 | } |
| 131 | 131 | return $retval; |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | if (!isset($descriptions[$input])) { |
| 198 | 198 | return ""; |
| 199 | 199 | } |
| 200 | - return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:" . ($isVisible ? "block" : "none") . "' onclick='alert(\"" . $descriptions[$input] . "\")'><img src='../resources/images/icons/question-mark-icon.png" . "'></span>"; |
|
| 200 | + return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:".($isVisible ? "block" : "none")."' onclick='alert(\"".$descriptions[$input]."\")'><img src='../resources/images/icons/question-mark-icon.png"."'></span>"; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | /** |
@@ -210,18 +210,18 @@ discard block |
||
| 210 | 210 | */ |
| 211 | 211 | private function selectElement($rowid, $list) { |
| 212 | 212 | $jsmagic = "onchange=' |
| 213 | - if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) { |
|
| 213 | + if (/#ML#/.test(document.getElementById(\"option-S" . $rowid."-select\").value)) { |
|
| 214 | 214 | document.getElementById(\"S$rowid-input-langselect\").style.display = \"block\"; |
| 215 | 215 | } else { |
| 216 | 216 | document.getElementById(\"S$rowid-input-langselect\").style.display = \"none\"; |
| 217 | 217 | }"; |
| 218 | 218 | foreach (array_keys(OptionDisplay::HTML_DATATYPE_TEXTS) as $key) { |
| 219 | - $jsmagic .= "if (/#" . $key . "#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) { |
|
| 220 | - document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($key == \core\Options::TYPECODE_FILE ? "block" : "none") . "\"; |
|
| 221 | - document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($key == \core\Options::TYPECODE_TEXT ? "block" : "none") . "\"; |
|
| 222 | - document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($key == \core\Options::TYPECODE_STRING ? "block" : "none") . "\"; |
|
| 223 | - document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none") . "\"; |
|
| 224 | - document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($key == \core\Options::TYPECODE_INTEGER ? "block" : "none") . "\"; |
|
| 219 | + $jsmagic .= "if (/#".$key."#/.test(document.getElementById(\"option-S".$rowid."-select\").value)) { |
|
| 220 | + document.getElementById(\"S$rowid-input-file\").style.display = \"".($key == \core\Options::TYPECODE_FILE ? "block" : "none")."\"; |
|
| 221 | + document.getElementById(\"S$rowid-input-text\").style.display = \"".($key == \core\Options::TYPECODE_TEXT ? "block" : "none")."\"; |
|
| 222 | + document.getElementById(\"S$rowid-input-string\").style.display = \"".($key == \core\Options::TYPECODE_STRING ? "block" : "none")."\"; |
|
| 223 | + document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none")."\"; |
|
| 224 | + document.getElementById(\"S$rowid-input-integer\").style.display = \"".($key == \core\Options::TYPECODE_INTEGER ? "block" : "none")."\"; |
|
| 225 | 225 | } |
| 226 | 226 | "; |
| 227 | 227 | // hide all tooltips (each is a <span>, and there are no other <span>s) |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | $value = array_shift($list); |
| 253 | 253 | $listtype = $optioninfo->optionType($value); |
| 254 | 254 | $retval .= $uiElements->displayName($value); |
| 255 | - $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#'/>"; |
|
| 255 | + $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#".$listtype["type"]."#".$listtype["flag"]."#'/>"; |
|
| 256 | 256 | $activelisttype = $listtype; |
| 257 | 257 | $tooltips = $this->tooltip($rowid, $value, TRUE); |
| 258 | 258 | break; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | $retval .= "<select id='option-S$rowid-select' name='option[S$rowid]' $jsmagic>"; |
| 261 | 261 | foreach ($list as $value) { |
| 262 | 262 | $listtype = $optioninfo->optionType($value); |
| 263 | - $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' "; |
|
| 263 | + $retval .= "<option id='option-S$rowid-v-$value' value='$value#".$listtype["type"]."#".$listtype["flag"]."#' "; |
|
| 264 | 264 | if ($iterator == $this->optionIterator) { |
| 265 | 265 | $retval .= "selected='selected'"; |
| 266 | 266 | $activelisttype = $listtype; |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | } else { |
| 269 | 269 | $tooltips .= $this->tooltip($rowid, $value, FALSE); |
| 270 | 270 | } |
| 271 | - $retval .= ">" . $uiElements->displayName($value) . "</option>"; |
|
| 271 | + $retval .= ">".$uiElements->displayName($value)."</option>"; |
|
| 272 | 272 | $iterator++; |
| 273 | 273 | } |
| 274 | 274 | |
@@ -293,9 +293,9 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | private function selectLanguage($rowid, $makeVisible) { |
| 295 | 295 | \core\common\Entity::intoThePotatoes(); |
| 296 | - $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'> |
|
| 297 | - <option value='' name='select_language' selected>" . _("select language") . "</option> |
|
| 298 | - <option value='C' name='all_languages'>" . _("default/other languages") . "</option>"; |
|
| 296 | + $retval = "<select style='display:".($makeVisible ? "block" : "none")."' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect'> |
|
| 297 | + <option value='' name='select_language' selected>" . _("select language")."</option> |
|
| 298 | + <option value='C' name='all_languages'>" . _("default/other languages")."</option>"; |
|
| 299 | 299 | foreach (\config\Master::LANGUAGES as $langindex => $possibleLang) { |
| 300 | 300 | $thislang = $possibleLang['display']; |
| 301 | 301 | $retval .= "<option value='$langindex' name='$langindex'>$thislang</option>"; |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | private function inputFields($rowid, $activetype) { |
| 324 | 324 | $retval = ""; |
| 325 | 325 | foreach (OptionDisplay::HTML_DATATYPE_TEXTS as $key => $type) { |
| 326 | - $retval .= "<" . $type['html'] . " style='display:" . ($activetype['type'] == $key ? "block" : "none") . "' name='value[S$rowid-$key]' id='S" . $rowid . "-input-" . $key . "'" . $type['tail'] . ">"; |
|
| 326 | + $retval .= "<".$type['html']." style='display:".($activetype['type'] == $key ? "block" : "none")."' name='value[S$rowid-$key]' id='S".$rowid."-input-".$key."'".$type['tail'].">"; |
|
| 327 | 327 | } |
| 328 | 328 | return $retval; |
| 329 | 329 | } |
@@ -338,11 +338,11 @@ discard block |
||
| 338 | 338 | private function noPrefillText(int $rowid, array $list) { |
| 339 | 339 | // first column: the <select> element with the names of options and their field-toggling JS magic |
| 340 | 340 | $selectorInfo = $this->selectElement($rowid, $list); |
| 341 | - $retval = "<td>" . $selectorInfo["TEXT"] . "</td>"; |
|
| 341 | + $retval = "<td>".$selectorInfo["TEXT"]."</td>"; |
|
| 342 | 342 | // second column: the <select> element for language selection - only visible if the active option is multi-lang |
| 343 | - $retval .= "<td>" . $this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML") . "</td>"; |
|
| 343 | + $retval .= "<td>".$this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML")."</td>"; |
|
| 344 | 344 | // third column: the actual input fields; the data type of the active option is visible, all others hidden |
| 345 | - $retval .= "<td>" . $this->inputFields($rowid, $selectorInfo['ACTIVE']) . "</td>"; |
|
| 345 | + $retval .= "<td>".$this->inputFields($rowid, $selectorInfo['ACTIVE'])."</td>"; |
|
| 346 | 346 | return $retval; |
| 347 | 347 | } |
| 348 | 348 | |
@@ -365,20 +365,20 @@ discard block |
||
| 365 | 365 | $retval .= "<td>"; |
| 366 | 366 | $uiElements = new UIElements(); |
| 367 | 367 | $listtype = $optioninfo->optionType($optionName); |
| 368 | - $retval .= "<span style='display:flex;'>" . $uiElements->displayName($optionName); |
|
| 369 | - $retval .= $this->tooltip($rowid, $optionName, TRUE) . "</span>"; |
|
| 370 | - $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ></td>"; |
|
| 368 | + $retval .= "<span style='display:flex;'>".$uiElements->displayName($optionName); |
|
| 369 | + $retval .= $this->tooltip($rowid, $optionName, TRUE)."</span>"; |
|
| 370 | + $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#".$listtype["type"]."#".$listtype["flag"]."#' ></td>"; |
|
| 371 | 371 | |
| 372 | 372 | // language tag if any |
| 373 | 373 | $retval .= "<td>"; |
| 374 | 374 | if ($listtype["flag"] == "ML") { |
| 375 | 375 | |
| 376 | - $language = "(" . strtoupper($optionLang) . ")"; |
|
| 376 | + $language = "(".strtoupper($optionLang).")"; |
|
| 377 | 377 | if ($optionLang == 'C') { |
| 378 | 378 | $language = _("(default/other languages)"); |
| 379 | 379 | } |
| 380 | 380 | $retval .= $language; |
| 381 | - $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $optionLang . "' style='display:block'>"; |
|
| 381 | + $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect' value='".$optionLang."' style='display:block'>"; |
|
| 382 | 382 | } |
| 383 | 383 | $retval .= "</td>"; |
| 384 | 384 | // attribute content |
@@ -388,12 +388,12 @@ discard block |
||
| 388 | 388 | case \core\Options::TYPECODE_COORDINATES: |
| 389 | 389 | $this->allLocationCount = $this->allLocationCount + 1; |
| 390 | 390 | // display of the locations varies by map provider |
| 391 | - $classname = "\web\lib\admin\Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER']; |
|
| 391 | + $classname = "\web\lib\admin\Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER']; |
|
| 392 | 392 | $link = $classname::optionListDisplayCode($optionValue, $this->allLocationCount); |
| 393 | - $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link"; |
|
| 393 | + $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-".\core\Options::TYPECODE_TEXT."]' id='S$rowid-input-text' value='$optionValue'>$link"; |
|
| 394 | 394 | break; |
| 395 | 395 | case \core\Options::TYPECODE_FILE: |
| 396 | - $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>"; |
|
| 396 | + $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S".$rowid."-input-string' style='display:none' value='".urlencode($optionValue)."'>"; |
|
| 397 | 397 | $uiElements = new UIElements(); |
| 398 | 398 | switch ($optionName) { |
| 399 | 399 | case "eap:ca_file": |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | if ($listtype['type'] == \core\Options::TYPECODE_BOOLEAN) {// only modify in this one case |
| 424 | 424 | $displayedVariant = ($optionValue == "on" ? _("on") : _("off")); |
| 425 | 425 | } |
| 426 | - $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>"; |
|
| 426 | + $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>"; |
|
| 427 | 427 | break; |
| 428 | 428 | default: |
| 429 | 429 | // this should never happen! |
@@ -468,10 +468,10 @@ discard block |
||
| 468 | 468 | <td> |
| 469 | 469 | <button type='button' class='delete' onclick='"; |
| 470 | 470 | if ($prefillValue !== NULL && $item == "general:geo_coordinates") { |
| 471 | - $funcname = "Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'] . 'DeleteCoord'; |
|
| 472 | - $retval .= 'if (typeof ' . $funcname . ' === "function") { ' . $funcname . '(' . $this->allLocationCount . '); } '; |
|
| 471 | + $funcname = "Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'].'DeleteCoord'; |
|
| 472 | + $retval .= 'if (typeof '.$funcname.' === "function") { '.$funcname.'('.$this->allLocationCount.'); } '; |
|
| 473 | 473 | } |
| 474 | - $retval .= 'deleteOption("option-S' . $rowid . '")'; |
|
| 474 | + $retval .= 'deleteOption("option-S'.$rowid.'")'; |
|
| 475 | 475 | $retval .= "'>-</button> |
| 476 | 476 | </td> |
| 477 | 477 | </tr>"; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | const DOWNLOAD_REDIRECT_CONTINUE = 1054; |
| 49 | 49 | const SB_GO_AWAY = 1060; |
| 50 | 50 | const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061; |
| 51 | -const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062; |
|
| 51 | +const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062; |
|
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads"); |
| 88 | 88 | $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 89 | 89 | $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']); |
| 90 | - $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']); |
|
| 90 | + $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']); |
|
| 91 | 91 | $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 92 | 92 | $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation"); |
| 93 | 93 | $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']); |
@@ -40,9 +40,9 @@ discard block |
||
| 40 | 40 | $langsArray = []; |
| 41 | 41 | foreach (\config\Master::LANGUAGES as $lang => $value) { |
| 42 | 42 | if ($lang == $selectedLang) { |
| 43 | - $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang']; |
|
| 43 | + $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang']; |
|
| 44 | 44 | } else { |
| 45 | - $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")']; |
|
| 45 | + $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")']; |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | $this->menu = [['id' => 'start', |
@@ -101,13 +101,13 @@ discard block |
||
| 101 | 101 | $iD = $menuItem['id'] ?? $id; |
| 102 | 102 | $catInfo = NULL; |
| 103 | 103 | if (!empty($menuItem['catInfo'])) { |
| 104 | - $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")'; |
|
| 104 | + $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")'; |
|
| 105 | 105 | } |
| 106 | 106 | if (!empty($menuItem['link']) && substr($menuItem['link'], 0, 1) === '/') { |
| 107 | - $menuItem['link'] = \core\CAT::getRootUrlPath() . $menuItem['link']; |
|
| 107 | + $menuItem['link'] = \core\CAT::getRootUrlPath().$menuItem['link']; |
|
| 108 | 108 | } |
| 109 | 109 | $link = $catInfo ?? $menuItem['link'] ?? ''; |
| 110 | - $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"'; |
|
| 110 | + $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"'; |
|
| 111 | 111 | $submenu = $menuItem['submenu'] ?? []; |
| 112 | 112 | $out .= $this->printMenuItem($menuItem['text'], $link, $class); |
| 113 | 113 | $out .= $this->printMenu($submenu, $iD); |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | if ($itemLink === '') { |
| 132 | 132 | return("<li><span>$itemText</span>"); |
| 133 | 133 | } |
| 134 | - return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>"; |
|
| 134 | + return "<li><a href='".$itemLink."'".$itemClass.'>'.$itemText."</a>"; |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | /** |
@@ -154,8 +154,8 @@ discard block |
||
| 154 | 154 | common\Entity::intoThePotatoes(); |
| 155 | 155 | $mail = \core\common\OutsideComm::mailHandle(); |
| 156 | 156 | // who to whom? |
| 157 | - $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System"; |
|
| 158 | - $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname'] . " " . _("Feedback")); |
|
| 157 | + $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System"; |
|
| 158 | + $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname']." "._("Feedback")); |
|
| 159 | 159 | $mail->addAddress($mailaddr[0]["value"]); |
| 160 | 160 | // what do we want to say? |
| 161 | 161 | $mail->Subject = $subject; |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | } |
| 219 | 219 | $lookFor .= "$name"; |
| 220 | 220 | } |
| 221 | - $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches); |
|
| 221 | + $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches); |
|
| 222 | 222 | if ($finding === 0 || $finding === FALSE) { |
| 223 | 223 | return FALSE; |
| 224 | 224 | } |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | $matchedProviders[] = $idp; |
| 237 | 237 | $name = $idp; |
| 238 | 238 | if ($skipCurl == 0) { |
| 239 | - $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=$lang"; |
|
| 239 | + $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$idp&lang=$lang"; |
|
| 240 | 240 | $ch = curl_init($url); |
| 241 | 241 | if ($ch === FALSE) { |
| 242 | 242 | $loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!"); |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | } |
| 253 | 253 | curl_close($ch); |
| 254 | 254 | } |
| 255 | - $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]] . " - IdP: " . $name; |
|
| 255 | + $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]]." - IdP: ".$name; |
|
| 256 | 256 | } |
| 257 | 257 | break; |
| 258 | 258 | case $providerStrings[1]: |
@@ -50,19 +50,19 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | array_push($FAQ, [ |
| 52 | 52 | 'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']), |
| 53 | - 'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""), |
|
| 53 | + 'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""), |
|
| 54 | 54 | ]); |
| 55 | 55 | |
| 56 | 56 | array_push($FAQ, [ |
| 57 | 57 | 'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"), |
| 58 | - 'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>") |
|
| 58 | + 'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>") |
|
| 59 | 59 | ]); |
| 60 | 60 | |
| 61 | 61 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == NULL) { |
| 62 | 62 | $text = sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), \config\ConfAssistant::CONSORTIUM['display_name']); |
| 63 | 63 | } else { |
| 64 | 64 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') { |
| 65 | - $diagUrl = \config\Master::PATHS['cat_base_url'] . "diag/"; |
|
| 65 | + $diagUrl = \config\Master::PATHS['cat_base_url']."diag/"; |
|
| 66 | 66 | } else { |
| 67 | 67 | $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']; |
| 68 | 68 | } |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | $tocText = ""; |
| 100 | 100 | $fullText = ""; |
| 101 | 101 | foreach ($FAQ as $faq) { |
| 102 | - $tocText .= '<a href="#toc' . $counter . '">' . $faq['title'] . "</a><br>\n"; |
|
| 103 | - $fullText .= "<dt><a name=toc$counter>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n"; |
|
| 102 | + $tocText .= '<a href="#toc'.$counter.'">'.$faq['title']."</a><br>\n"; |
|
| 103 | + $fullText .= "<dt><a name=toc$counter>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n"; |
|
| 104 | 104 | $counter++; |
| 105 | 105 | } |
| 106 | 106 | ?> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * <base_url>/copyright.php after deploying the software |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
| 22 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
| 23 | 23 | |
| 24 | 24 | $Tests = [ |
| 25 | 25 | 'CatBaseUrl', |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | $uiElements = new \web\lib\admin\UIElements(); |
| 44 | 44 | |
| 45 | -if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) { |
|
| 45 | +if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") { |
|
| 46 | 46 | $Tests[] = 'Makensis'; |
| 47 | 47 | $Tests[] = 'Makensis=>NSISmodules'; |
| 48 | 48 | } |
@@ -142,17 +142,17 @@ discard block |
||
| 142 | 142 | foreach (array_keys($this->typeDb) as $name) { |
| 143 | 143 | if ($className === 0) { |
| 144 | 144 | $tempArray[] = $name; |
| 145 | - } elseif (preg_match('/^' . $className . ':/', $name) > 0) { |
|
| 145 | + } elseif (preg_match('/^'.$className.':/', $name) > 0) { |
|
| 146 | 146 | $tempArray[] = $name; |
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | $returnArray = $tempArray; |
| 150 | 150 | // remove silverbullet-specific options if this deployment is not SB |
| 151 | 151 | foreach ($tempArray as $key => $val) { |
| 152 | - if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) { |
|
| 152 | + if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] != 'LOCAL') && (preg_match('/^fed:silverbullet/', $val) > 0)) { |
|
| 153 | 153 | unset($returnArray[$key]); |
| 154 | 154 | } |
| 155 | - if (( \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) { |
|
| 155 | + if ((\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] != 'LOCAL') && (preg_match('/^fed:minted_ca_file/', $val) > 0)) { |
|
| 156 | 156 | unset($returnArray[$key]); |
| 157 | 157 | } |
| 158 | 158 | } |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if (isset($this->typeDb[$optionname])) { |
| 173 | 173 | return $this->typeDb[$optionname]; |
| 174 | 174 | } |
| 175 | - throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: " . htmlentities($optionname)); |
|
| 175 | + throw new Exception("Metadata about an option was requested, but the option name does not exist in the system: ".htmlentities($optionname)); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | /** |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | require_once "autoloader.php"; |
| 24 | -require_once __DIR__ . "/../packageRoot.php"; |
|
| 24 | +require_once __DIR__."/../packageRoot.php"; |
|
| 25 | 25 | |
| 26 | 26 | // enable Composer autoloader, if exists |
| 27 | -if (file_exists(__DIR__ . "/../vendor/autoload.php") !== FALSE) { |
|
| 28 | - include_once __DIR__ . "/../vendor/autoload.php"; |
|
| 27 | +if (file_exists(__DIR__."/../vendor/autoload.php") !== FALSE) { |
|
| 28 | + include_once __DIR__."/../vendor/autoload.php"; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | -if (!file_exists(ROOT . "/config/Master.php")) { |
|
| 31 | +if (!file_exists(ROOT."/config/Master.php")) { |
|
| 32 | 32 | echo "Master configuration file not found. You need to configure the product! At least config/Master.php is required!"; |
| 33 | 33 | throw new Exception("Master config file not found!"); |
| 34 | 34 | } |
@@ -36,14 +36,14 @@ discard block |
||
| 36 | 36 | /* load sub-configs if we are dealing with those in this installation */ |
| 37 | 37 | |
| 38 | 38 | if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == 'LOCAL' || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == 'LOCAL') { |
| 39 | - if (!file_exists(ROOT . "/config/ConfAssistant.php")) { |
|
| 39 | + if (!file_exists(ROOT."/config/ConfAssistant.php")) { |
|
| 40 | 40 | echo "ConfAssistant configuration file not found. You need to configure the product!"; |
| 41 | 41 | throw new Exception("ConfAssistant config file not found!"); |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') { |
| 46 | - if (!file_exists(ROOT . "/config/Diagnostics.php")) { |
|
| 46 | + if (!file_exists(ROOT."/config/Diagnostics.php")) { |
|
| 47 | 47 | echo "Diagnostics configuration file not found. You need to configure the product!"; |
| 48 | 48 | throw new Exception("Diagnostics config file not found!"); |
| 49 | 49 | } |
