@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * License: see the web/copyright.inc.php file in the file structure or |
| 20 | 20 | * <base_url>/copyright.php after deploying the software |
| 21 | 21 | */ |
| 22 | - ?> |
|
| 22 | + ?> |
|
| 23 | 23 | <?php |
| 24 | 24 | $Gui = new \web\lib\user\Gui(); |
| 25 | 25 | $Gui->languageInstance->setTextDomain("diagnostics"); |
@@ -326,9 +326,9 @@ |
||
| 326 | 326 | $otherTlsName = \core\common\Entity::getAttributeValue($this->attributes, 'eap-specific:tls_use_other_id', 0) === 'on' ? 'true' : 'false'; |
| 327 | 327 | if (isset(\core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0]) && |
| 328 | 328 | \core\common\Entity::getAttributeValue($this->attributes, 'device-specific:geantlink', $this->device_id)[0] === 'on') { |
| 329 | - $this->useGeantLink = true; |
|
| 329 | + $this->useGeantLink = true; |
|
| 330 | 330 | } else { |
| 331 | - $this->useGeantLink = false; |
|
| 331 | + $this->useGeantLink = false; |
|
| 332 | 332 | } |
| 333 | 333 | $eapConfig = $this->setEapObject(); |
| 334 | 334 | $eapConfig->setInnerType($this->selectedEap['INNER']); |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | " . $Tou['title'] . " |
| 52 | 52 | </h1> |
| 53 | 53 | <div id='tou_1'>" . $Tou['subtitle'] . |
| 54 | - '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 54 | + '<div style="direction:ltr">' . $Tou['short'] . "</div> |
|
| 55 | 55 | </div> |
| 56 | 56 | <div id='all_tou_link'><a href='javascript:showTOU()'>Click here to see the full terms</a></div> |
| 57 | 57 | <div id='tou_2' style='display:none; padding-top:20px; direction:ltr'>" . |
@@ -278,7 +278,7 @@ |
||
| 278 | 278 | <tr> |
| 279 | 279 | <td>" . |
| 280 | 280 | $cat->catVersion |
| 281 | - ." |
|
| 281 | + ." |
|
| 282 | 282 | </td>"; |
| 283 | 283 | |
| 284 | 284 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | public function divSilverbullet() { |
| 125 | 125 | $retval = " |
| 126 | 126 | <div id='silverbullet'>" |
| 127 | - .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 127 | + .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] . |
|
| 128 | 128 | "</div> |
| 129 | 129 | "; |
| 130 | 130 | return $retval; |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | $retval .= "<td><button name='$d' class='other_os' id='$d'>".$D['display']."</button>" |
| 296 | - ."</td>" |
|
| 297 | - ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n"; |
|
| 296 | + ."</td>" |
|
| 297 | + ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n"; |
|
| 298 | 298 | $deviceIndex++; |
| 299 | 299 | } |
| 300 | 300 | $retval .= "</tbody>"; |
@@ -341,11 +341,11 @@ discard block |
||
| 341 | 341 | <tr> |
| 342 | 342 | <td>" . |
| 343 | 343 | $this->Gui->catVersion |
| 344 | - ." |
|
| 344 | + ." |
|
| 345 | 345 | </td>"; |
| 346 | 346 | |
| 347 | 347 | if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) { |
| 348 | - $retval .= "<td>".$this->Gui->catCopyrifhtAndLicense."<br><span id='privacy_notice_cons'>".\config\ConfAssistant::CONSORTIUM['display_name']."</span> <a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), '')."</a></td>"; |
|
| 348 | + $retval .= "<td>".$this->Gui->catCopyrifhtAndLicense."<br><span id='privacy_notice_cons'>".\config\ConfAssistant::CONSORTIUM['display_name']."</span> <a href='".\config\Master::APPEARANCE['privacy_notice_url']."'>".sprintf(_("%s Privacy Notice"), '')."</a></td>"; |
|
| 349 | 349 | } |
| 350 | 350 | $retval .= "<td>"; |
| 351 | 351 | if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { |
@@ -218,7 +218,7 @@ |
||
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | - break; |
|
| 221 | + break; |
|
| 222 | 222 | default: |
| 223 | 223 | break; |
| 224 | 224 | } |
@@ -150,7 +150,6 @@ discard block |
||
| 150 | 150 | * mails, just configure the signing cert with these parameters. All must |
| 151 | 151 | * be non-NULL for signing to happen. If you don't need a keypass, make |
| 152 | 152 | * it an empty string instead. |
| 153 | - |
|
| 154 | 153 | * @var array |
| 155 | 154 | */ |
| 156 | 155 | const MAILSETTINGS = [// we always use Submission |
@@ -163,8 +162,8 @@ discard block |
||
| 163 | 162 | 'keyfilename' => NULL, |
| 164 | 163 | 'keypass' => NULL, |
| 165 | 164 | 'notify_nro' => false, // normally should be set to TRUE abd causes |
| 166 | - // notifications being sent to NRO admins when |
|
| 167 | - // important changes are made |
|
| 165 | + // notifications being sent to NRO admins when |
|
| 166 | + // important changes are made |
|
| 168 | 167 | ]; |
| 169 | 168 | /** |
| 170 | 169 | * List of all supported languages in CAT. Comment some if you want to disable them |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | $result = $this->databaseHandle->exec($query); |
| 455 | 455 | $rows = $result->fetch_all(); |
| 456 | 456 | foreach ($rows as $row) { |
| 457 | - $activeProfiles[] = $row[0]; |
|
| 457 | + $activeProfiles[] = $row[0]; |
|
| 458 | 458 | } |
| 459 | 459 | $query = "SELECT institution.inst_id AS inst_id, profile.profile_id AS profile_id, profile_option.option_value AS cert FROM profile_option JOIN profile ON profile_option.profile_id=profile.profile_id JOIN institution ON profile.inst_id=institution.inst_id WHERE profile_option.option_name='eap:ca_file' and institution.country='".$this->tld."'"; |
| 460 | 460 | $result = $this->databaseHandle->exec($query); |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | 'country' => strtoupper($idp->federation), |
| 532 | 532 | 'instance' => $idp, |
| 533 | 533 | 'realms' => $idpQuery->realms] |
| 534 | - ; |
|
| 534 | + ; |
|
| 535 | 535 | $returnarray[$idp->identifier] = $idpInfo; |
| 536 | 536 | } |
| 537 | 537 | if ($activeOnly != 0) { // we're only doing this once. |