@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | </td> |
| 280 | 280 | <td> |
| 281 | 281 | <input type='checkbox' <?php |
| 282 | - echo ($verify != FALSE ? "checked" : "" ); |
|
| 282 | + echo ($verify != FALSE ? "checked" : ""); |
|
| 283 | 283 | ?> name='verify_support' onclick=' |
| 284 | 284 | if (this.form.elements["verify_support"].checked !== true || this.form.elements["realm"].value.length == 0) { |
| 285 | 285 | this.form.elements["hint_support"].setAttribute("disabled", "disabled"); |
@@ -287,48 +287,48 @@ discard block |
||
| 287 | 287 | this.form.elements["hint_support"].removeAttribute("disabled"); |
| 288 | 288 | } |
| 289 | 289 | ;'/> |
| 290 | - <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'> |
|
| 290 | + <span id='hint_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'> |
|
| 291 | 291 | <?php echo _("Prefill user input with realm suffix:"); ?> |
| 292 | 292 | </span> |
| 293 | - <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : "" ); ?> name='hint_support' <?php echo ( $hint != FALSE ? "checked" : "" ); ?> /> |
|
| 293 | + <input type='checkbox' <?php echo ($verify == FALSE ? "disabled" : ""); ?> name='hint_support' <?php echo ($hint != FALSE ? "checked" : ""); ?> /> |
|
| 294 | 294 | </td> |
| 295 | 295 | </tr> |
| 296 | 296 | <tr> |
| 297 | 297 | |
| 298 | 298 | <!-- checkbox and input field for anonymity support, available only when realm is known--> |
| 299 | 299 | <td> |
| 300 | - <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'> |
|
| 300 | + <span id='anon_support_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'> |
|
| 301 | 301 | <?php echo _("Enable Anonymous Outer Identity:"); ?> |
| 302 | 302 | </span> |
| 303 | 303 | </td> |
| 304 | 304 | <td> |
| 305 | - <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='anon_support' onclick=' |
|
| 305 | + <input type='checkbox' <?php echo ($useAnon != FALSE ? "checked" : "") . ($realm == "" ? " disabled" : ""); ?> name='anon_support' onclick=' |
|
| 306 | 306 | if (this.form.elements["anon_support"].checked !== true) { |
| 307 | 307 | this.form.elements["anon_local"].setAttribute("disabled", "disabled"); |
| 308 | 308 | } else { |
| 309 | 309 | this.form.elements["anon_local"].removeAttribute("disabled"); |
| 310 | 310 | } |
| 311 | 311 | ;'/> |
| 312 | - <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/> |
|
| 312 | + <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='anon_local' value='<?php echo $anonLocal; ?>'/> |
|
| 313 | 313 | </td> |
| 314 | 314 | </tr> |
| 315 | 315 | <tr> |
| 316 | 316 | |
| 317 | 317 | <!-- checkbox and input field for check realm outer id, available only when realm is known--> |
| 318 | 318 | <td> |
| 319 | - <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : "" ); ?>'> |
|
| 319 | + <span id='checkuser_label' style='<?php echo ($realm == "" ? "color:#999999" : ""); ?>'> |
|
| 320 | 320 | <?php echo _("Use special Outer Identity for realm checks:"); ?> |
| 321 | 321 | </span> |
| 322 | 322 | </td> |
| 323 | 323 | <td> |
| 324 | - <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "" ) . ($realm == "" ? " disabled" : "" ); ?> name='checkuser_support' onclick=' |
|
| 324 | + <input type='checkbox' <?php echo ($checkuserOuter != FALSE ? "checked" : "") . ($realm == "" ? " disabled" : ""); ?> name='checkuser_support' onclick=' |
|
| 325 | 325 | if (this.form.elements["checkuser_support"].checked !== true) { |
| 326 | 326 | this.form.elements["checkuser_local"].setAttribute("disabled", "disabled"); |
| 327 | 327 | } else { |
| 328 | 328 | this.form.elements["checkuser_local"].removeAttribute("disabled"); |
| 329 | 329 | } |
| 330 | 330 | ;'/> |
| 331 | - <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : "" ); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/> |
|
| 331 | + <input type='text' <?php echo ($checkuserOuter == FALSE ? "disabled" : ""); ?> name='checkuser_local' value='<?php echo $checkuserValue; ?>'/> |
|
| 332 | 332 | </td> |
| 333 | 333 | </tr> |
| 334 | 334 | </table> |
@@ -344,14 +344,14 @@ discard block |
||
| 344 | 344 | <p> |
| 345 | 345 | |
| 346 | 346 | <?php |
| 347 | - echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "" ) . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span> |
|
| 348 | - <input type='checkbox' name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked " ) . "onclick=' |
|
| 347 | + echo "<span id='redirect_label' style='" . ($realm == "" ? "color:#999999" : "") . "'><label for='redirect'>" . _("Redirect end users to own web page:") . "</label></span> |
|
| 348 | + <input type='checkbox' name='redirect' id='redirect' " . ($blacklisted === FALSE ? "" : "checked ") . "onclick=' |
|
| 349 | 349 | if (this.form.elements[\"redirect\"].checked != true) { |
| 350 | 350 | this.form.elements[\"redirect_target\"].setAttribute(\"disabled\", \"disabled\"); |
| 351 | 351 | } else { |
| 352 | 352 | this.form.elements[\"redirect_target\"].removeAttribute(\"disabled\"); |
| 353 | 353 | };'/> |
| 354 | - <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled" ) . "/>"; |
|
| 354 | + <input type='text' name='redirect_target' " . ($blacklisted !== FALSE ? "value='$blacklisted'" : "disabled") . "/>"; |
|
| 355 | 355 | ?> |
| 356 | 356 | </p> |
| 357 | 357 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | function priority(string $eapType, bool $isenabled, int $priority) { |
| 376 | 376 | echo "<td><select id='$eapType-priority' name='$eapType-priority' " . (!$isenabled ? "disabled='disabled'" : "") . ">"; |
| 377 | 377 | for ($a = 1; $a < 7; $a = $a + 1) { |
| 378 | - echo "<option id='$eapType-$a' value='$a' " . ( $isenabled && $a == $priority ? "selected" : "" ) . ">$a</option>"; |
|
| 378 | + echo "<option id='$eapType-$a' value='$a' " . ($isenabled && $a == $priority ? "selected" : "") . ">$a</option>"; |
|
| 379 | 379 | } |
| 380 | 380 | echo "</select></td>"; |
| 381 | 381 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | 'getUserCerts', |
| 40 | 40 | ]; |
| 41 | 41 | |
| 42 | -function getRequest($varName,$filter) { |
|
| 42 | +function getRequest($varName, $filter) { |
|
| 43 | 43 | $safeText = ["options"=>["regexp"=>"/^[\w\d-]+$/"]]; |
| 44 | 44 | switch ($filter) { |
| 45 | 45 | case 'safe_text': |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | // make sure this is a known action |
| 59 | 59 | $actionR = getRequest('action', 'safe_text'); |
| 60 | -$action = array_search($actionR,LISTOFACTIONS) ? $actionR : FALSE; |
|
| 60 | +$action = array_search($actionR, LISTOFACTIONS) ? $actionR : FALSE; |
|
| 61 | 61 | if ($action === FALSE) { |
| 62 | 62 | exit; |
| 63 | 63 | } |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | $lang = $langR ? $validator->supportedLanguage($langR) : FALSE; |
| 66 | 66 | $deviceR = getRequest('device', 'safe_text'); |
| 67 | 67 | $device = $deviceR ? $validator->Device($deviceR) : FALSE; |
| 68 | -$idpR = getRequest('idp','int'); |
|
| 68 | +$idpR = getRequest('idp', 'int'); |
|
| 69 | 69 | $idp = $idpR ? $validator->IdP($idpR)->identifier : FALSE; |
| 70 | -$profileR = getRequest('profile','int'); |
|
| 70 | +$profileR = getRequest('profile', 'int'); |
|
| 71 | 71 | $profile = $profileR ? $validator->Profile($profileR)->identifier : FALSE; |
| 72 | -$federationR = getRequest('federation','safe_text'); |
|
| 72 | +$federationR = getRequest('federation', 'safe_text'); |
|
| 73 | 73 | $federation = $federationR ? $validator->Federation($deviceR)->identifier : FALSE; |
| 74 | -$disco = getRequest('disco','int'); |
|
| 75 | -$width = getRequest('width','int') ?? 0; |
|
| 76 | -$height = getRequest('height','int') ?? 0; |
|
| 77 | -$sort = getRequest('sort','int') ?? 0; |
|
| 78 | -$generatedforR = getRequest('generatedfor','safe_text') ?? 'user'; |
|
| 79 | -$token = getRequest('token','safe_text'); |
|
| 74 | +$disco = getRequest('disco', 'int'); |
|
| 75 | +$width = getRequest('width', 'int') ?? 0; |
|
| 76 | +$height = getRequest('height', 'int') ?? 0; |
|
| 77 | +$sort = getRequest('sort', 'int') ?? 0; |
|
| 78 | +$generatedforR = getRequest('generatedfor', 'safe_text') ?? 'user'; |
|
| 79 | +$token = getRequest('token', 'safe_text'); |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | switch ($action) { |
@@ -137,7 +137,7 @@ |
||
| 137 | 137 | |
| 138 | 138 | $out .= 'Config.sb_user_file = """' . $this->mkSbUserFile() . '"""' . "\n"; |
| 139 | 139 | if (!empty($this->attributes['internal:realm'][0])) { |
| 140 | - $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n"; |
|
| 140 | + $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n"; |
|
| 141 | 141 | } |
| 142 | 142 | if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
| 143 | 143 | $out .= "Config.hint_user_input = True\n"; |
@@ -124,8 +124,7 @@ |
||
| 124 | 124 | $out .= "Config.eap_inner = '" . $eapMethod['INNER'] . "'\n"; |
| 125 | 125 | if ($this->selectedEap == \core\common\EAP::EAPTYPE_TLS && isset($this->attributes['eap-specific:tls_use_other_id']) && $this->attributes['eap-specific:tls_use_other_id'][0] == 'on') { |
| 126 | 126 | $out .= "Config.use_other_tls_id = True\n"; |
| 127 | - } |
|
| 128 | - else { |
|
| 127 | + } else { |
|
| 129 | 128 | $out .= "Config.use_other_tls_id = False\n"; |
| 130 | 129 | } |
| 131 | 130 | $tou = $this->mkUserConsent(); |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | public function writeInstaller() { |
| 34 | 34 | $installerPath = $this->installerBasename . ".py"; |
| 35 | 35 | $this->copyFile("main.py", $installerPath); |
| 36 | - $installer = fopen($installerPath,"a"); |
|
| 36 | + $installer = fopen($installerPath, "a"); |
|
| 37 | 37 | if ($installer === FALSE) { |
| 38 | 38 | throw new Exception("Unable to open installer file for writing!"); |
| 39 | 39 | } |
| 40 | - fwrite($installer,$this->writeMessages()); |
|
| 41 | - fwrite($installer,$this->writeConfigVars()); |
|
| 40 | + fwrite($installer, $this->writeMessages()); |
|
| 41 | + fwrite($installer, $this->writeConfigVars()); |
|
| 42 | 42 | fwrite($installer, "run_installer()\n"); |
| 43 | 43 | fclose($installer); |
| 44 | 44 | return($installerPath); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $out .= 'Messages.p12_title = "' . _("personal certificate file (p12 or pfx)") . "\"\n"; |
| 105 | 105 | $out .= 'Messages.save_wpa_conf = "' . _("Network Manager configuration failed, but we may generate a wpa_supplicant configuration file if you wish. Be warned that your connection password will be saved in this file as clear text.") . "\"\n"; |
| 106 | 106 | $out .= 'Messages.save_wpa_confirm = "' . _("Write the file") . "\"\n"; |
| 107 | - $out .= 'Messages.wrongUsernameFormat = "' ._("Error: Your username must be of the form 'xxx@institutionID' e.g. '[email protected]'!") . "\"\n"; |
|
| 107 | + $out .= 'Messages.wrongUsernameFormat = "' . _("Error: Your username must be of the form 'xxx@institutionID' e.g. '[email protected]'!") . "\"\n"; |
|
| 108 | 108 | $out .= 'Messages.wrong_realm = "' . _("Error: your username must be in the form of 'xxx@{}'. Please enter the username in the correct format.") . "\"\n"; |
| 109 | 109 | $out .= 'Messages.wrong_realm_suffix = "' . _("Error: your username must be in the form of 'xxx@institutionID' and end with '{}'. Please enter the username in the correct format.") . "\"\n"; |
| 110 | 110 | |
@@ -133,8 +133,8 @@ discard block |
||
| 133 | 133 | $out .= "Config.use_other_tls_id = False\n"; |
| 134 | 134 | } |
| 135 | 135 | $tou = $this->mkUserConsent(); |
| 136 | - $out .= 'Config.tou = ' . ( $tou ? '"""' . $tou . '"""' : 'None' ) . "\n"; |
|
| 137 | - $out .= 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n"; |
|
| 136 | + $out .= 'Config.tou = ' . ($tou ? '"""' . $tou . '"""' : 'None') . "\n"; |
|
| 137 | + $out .= 'Config.CA = """' . $this->mkCAfile() . '"""' . "\n"; |
|
| 138 | 138 | $out .= "Config.anonymous_identity = '" . $this->determineOuterIdString() . "'\n"; |
| 139 | 139 | $out .= 'Config.init_info = """' . $this->mkIntro() . '"""' . "\n"; |
| 140 | 140 | $out .= 'Config.init_confirmation = "' . $this->mkProfileConfirmation() . "\"\n"; |
@@ -143,10 +143,10 @@ discard block |
||
| 143 | 143 | if (!empty($this->attributes['internal:realm'][0])) { |
| 144 | 144 | $out .= 'Config.user_realm = "' . $this->attributes['internal:realm'][0] . "\"\n"; |
| 145 | 145 | } |
| 146 | - if(!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 146 | + if (!empty($this->attributes['internal:hint_userinput_suffix'][0]) && $this->attributes['internal:hint_userinput_suffix'][0] == 1) { |
|
| 147 | 147 | $out .= "Config.hint_user_input = True\n"; |
| 148 | 148 | } |
| 149 | - if(!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 149 | + if (!empty($this->attributes['internal:verify_userinput_suffix'][0]) && $this->attributes['internal:verify_userinput_suffix'][0] == 1) { |
|
| 150 | 150 | $out .= "Config.verify_user_realm_input = True\n"; |
| 151 | 151 | } |
| 152 | 152 | return $out; |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | } |
| 187 | 187 | $out .= "'DNS:$oneServer'"; |
| 188 | 188 | } |
| 189 | - return "[" . $out. "]"; |
|
| 189 | + return "[" . $out . "]"; |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | return '[' . implode(', ', $outArray) . ']'; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - private function mkCAfile(){ |
|
| 213 | + private function mkCAfile() { |
|
| 214 | 214 | $out = ''; |
| 215 | 215 | $cAlist = $this->attributes['internal:CAs'][0]; |
| 216 | 216 | foreach ($cAlist as $oneCa) { |
@@ -29,6 +29,6 @@ |
||
| 29 | 29 | $link = \core\ProfileSilverbullet::generateTokenLink($cleanToken); |
| 30 | 30 | header("Content-Type:text/html;charset=utf-8"); |
| 31 | 31 | ?> |
| 32 | -<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code");?></h1> |
|
| 33 | -<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11));?>'/> |
|
| 34 | -<p>(<a href='<?php echo $link;?>'><?php echo $link;?>)</a></p> |
|
| 35 | 32 | \ No newline at end of file |
| 33 | +<h1 style='text-align:center;'><?php echo _("Invitation Token QR Code"); ?></h1> |
|
| 34 | +<img style='float:none' src='data:image/png;base64,<?php echo base64_encode($uiElements->pngInjectConsortiumLogo(\QRcode::png($link, FALSE, QR_ECLEVEL_Q, 11), 11)); ?>'/> |
|
| 35 | +<p>(<a href='<?php echo $link; ?>'><?php echo $link; ?>)</a></p> |
|
| 36 | 36 | \ No newline at end of file |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | $deco = new \web\lib\admin\PageDecoration(); |
| 62 | 62 | ?> |
| 63 | -<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" /> |
|
| 63 | +<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" /> |
|
| 64 | 64 | <!-- JQuery --> |
| 65 | -<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script> |
|
| 66 | -<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate.js") ?>"></script> |
|
| 67 | -<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script> |
|
| 65 | +<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script> |
|
| 66 | +<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate.js") ?>"></script> |
|
| 67 | +<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script> |
|
| 68 | 68 | <!-- JQuery --> |
| 69 | 69 | <script type="text/javascript"> |
| 70 | 70 | if (screen.width <= 480) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | <div id="heading"> |
| 107 | 107 | <?php |
| 108 | 108 | print '<img src="' . $Gui->skinObject->findResourceUrl("IMAGES", "consortium_logo.png") . '" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
| 109 | - print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; |
|
| 109 | + print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . '</div>'; |
|
| 110 | 110 | print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("Welcome to %s"), CONFIG['APPEARANCE']['productname']) . '</h1> |
| 111 | 111 | <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>'; |
| 112 | 112 | echo '<table id="lang_select"><tr><td>'; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | <span id="line1"><?php printf(_("%s installation made easy:"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?></span> |
| 161 | 161 | <span id="line2"></span> |
| 162 | 162 | <span id="line3"></span> |
| 163 | - <span id="line4"><?php echo sprintf(_("Custom built for your %s"),$Gui->nomenclature_inst) ?></span> |
|
| 163 | + <span id="line4"><?php echo sprintf(_("Custom built for your %s"), $Gui->nomenclature_inst) ?></span> |
|
| 164 | 164 | <span id="line5"> |
| 165 | 165 | <?php |
| 166 | 166 | if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name']) && CONFIG_CONFASSISTANT['CONSORTIUM']['signer_name'] != "") { |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | <?php if (empty($_REQUEST['idp'])) { ?> |
| 82 | 82 | <div id="front_page"> |
| 83 | 83 | <?php |
| 84 | - echo $divs->div_top_welcome(); |
|
| 84 | + echo $divs->div_top_welcome(); |
|
| 85 | 85 | // echo $divs->div_roller(); |
| 86 | 86 | // echo $divs->div_main_button(); ?> |
| 87 | 87 | </div> <!-- id="front_page" --> |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | ?> |
| 19 | 19 | |
| 20 | 20 | <!-- JQuery --> |
| 21 | -<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js") ?>"></script> |
|
| 22 | -<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js") ?>"></script> |
|
| 23 | -<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js") ?>"></script> |
|
| 21 | +<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js") ?>"></script> |
|
| 22 | +<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js") ?>"></script> |
|
| 23 | +<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js") ?>"></script> |
|
| 24 | 24 | <!-- JQuery --> |
| 25 | 25 | |
| 26 | 26 | <script type="text/javascript"> |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | include("user/js/cat_js.php"); |
| 49 | 49 | ?> |
| 50 | 50 | var loading_ico = new Image(); |
| 51 | - loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>"; |
|
| 51 | + loading_ico.src = "<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>"; |
|
| 52 | 52 | </script> |
| 53 | 53 | <?php $Gui->langObject->setTextDomain("web_user"); ?> |
| 54 | 54 | <!-- DiscoJuice --> |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | front_page = 0; |
| 58 | 58 | var lang = "<?php echo($Gui->langObject->getLang()) ?>"; |
| 59 | 59 | </script> |
| 60 | -<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","discojuice/css/discojuice.css")?>" /> |
|
| 60 | +<link rel="stylesheet" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "discojuice/css/discojuice.css")?>" /> |
|
| 61 | 61 | <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"> |
| 62 | -<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" /> |
|
| 62 | +<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" /> |
|
| 63 | 63 | </head> |
| 64 | 64 | <body> |
| 65 | 65 | <div id="wrap"> |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | <?php echo $divs->div_heading($visibility); ?> |
| 68 | 68 | <div id="main_page"> |
| 69 | 69 | <div id="loading_ico"> |
| 70 | - <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/loading51.gif")?>" alt="Authenticating ..."/> |
|
| 70 | + <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif")?>" alt="Authenticating ..."/> |
|
| 71 | 71 | </div> |
| 72 | 72 | <div id="info_overlay"> <!-- device info --> |
| 73 | 73 | <div id="info_window"></div> |
| 74 | - <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/> |
|
| 74 | + <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/> |
|
| 75 | 75 | </div> |
| 76 | 76 | <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu --> |
| 77 | - <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/> |
|
| 77 | + <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/> |
|
| 78 | 78 | <div id="main_menu_content"></div> |
| 79 | 79 | </div> |
| 80 | 80 | <div id="main_body"> |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | font-size:25px; |
| 22 | 22 | font-size:5vw; |
| 23 | 23 | width: 100%; |
| 24 | - background: <?php echo $colour2;?>; |
|
| 24 | + background: <?php echo $colour2; ?>; |
|
| 25 | 25 | color: #ffffff; |
| 26 | 26 | } |
| 27 | 27 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | font-size:25px; |
| 49 | 49 | font-size:5vw; |
| 50 | 50 | width: 100%; |
| 51 | - background: <?php echo $colour2;?>; |
|
| 51 | + background: <?php echo $colour2; ?>; |
|
| 52 | 52 | color: #ffffff; |
| 53 | 53 | border-radius:10px ; |
| 54 | 54 | border-radius:2vw ; |
@@ -137,7 +137,7 @@ |
||
| 137 | 137 | $dummy_inst2 = _("organisation"); |
| 138 | 138 | $dummy_inst3 = _("Identity Provider"); |
| 139 | 139 | // and do something useless with the strings so that there's no "unused" complaint |
| 140 | - if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3) < 0 ) { |
|
| 140 | + if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3) < 0) { |
|
| 141 | 141 | throw new \Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole."); |
| 142 | 142 | } |
| 143 | 143 | |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | namespace core\common; |
| 12 | 12 | use \Exception; |
| 13 | 13 | |
| 14 | -require_once(dirname(dirname(__DIR__))."/config/_config.php"); |
|
| 14 | +require_once(dirname(dirname(__DIR__)) . "/config/_config.php"); |
|
| 15 | 15 | |
| 16 | 16 | class Logging { |
| 17 | 17 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | echo " ($category) "; |
| 87 | 87 | echo " " . $user . ": "; |
| 88 | 88 | if (is_string($message)) { |
| 89 | - echo $message ."\n"; |
|
| 89 | + echo $message . "\n"; |
|
| 90 | 90 | } else { |
| 91 | 91 | var_export($message); |
| 92 | 92 | } |