@@ -23,7 +23,7 @@ |
||
23 | 23 | <div id="heading"> |
24 | 24 | <?php |
25 | 25 | print '<img src="resources/images/consortium_logo.png" alt="Consortium Logo" style="float:right; padding-right:20px; padding-top:20px"/>'; |
26 | - print '<div id="motd">' . ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ' ) . '</div>'; |
|
26 | + print '<div id="motd">' . (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' ') . '</div>'; |
|
27 | 27 | print '<h1 style="padding-bottom:0px; height:1em;">' . sprintf(_("%s Copyright and Licensing"), CONFIG['APPEARANCE']['productname']) . '</h1> |
28 | 28 | <h2 style="padding-bottom:0px; height:0px; vertical-align:bottom;">' . CONFIG['APPEARANCE']['productname_long'] . '</h2>'; |
29 | 29 | echo '<table id="lang_select"><tr><td>'; |
@@ -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 ; |
@@ -46,7 +46,7 @@ |
||
46 | 46 | <body style='background: #fff url(resources/images/bg_grey_tile.png) repeat-x;'> |
47 | 47 | <img src="<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') ?>/resources/images/consortium_logo.png" style="padding-right:20px; padding-top:20px; float:right" alt="logo" /> |
48 | 48 | |
49 | - <div id="motd"><?php print ( isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' '); ?></div> |
|
49 | + <div id="motd"><?php print (isset(CONFIG['APPEARANCE']['MOTD']) ? CONFIG['APPEARANCE']['MOTD'] : ' '); ?></div> |
|
50 | 50 | |
51 | 51 | <h1><a href="<?php echo dirname($_SERVER['SCRIPT_NAME']) . '?lang=' . $langObject->getLang(); ?>"><?php echo CONFIG['APPEARANCE']['productname']; ?></a></h1> |
52 | 52 | <div id="tou"> |
@@ -132,7 +132,7 @@ |
||
132 | 132 | * return string |
133 | 133 | */ |
134 | 134 | private function zipInstaller($attr) { |
135 | - if (count($attr)==0) { |
|
135 | + if (count($attr) == 0) { |
|
136 | 136 | // never mind, just checking. You CAN use the $attr array to extract |
137 | 137 | // information about the IdP/Profile if there's a need |
138 | 138 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * |
20 | 20 | * @package ModuleWriting |
21 | 21 | */ |
22 | -class Devices{ |
|
22 | +class Devices { |
|
23 | 23 | |
24 | 24 | /** |
25 | 25 | * This array lists available configuration options for local device management. |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * The default is unset, so it is not listed in the Options array. |
55 | 55 | */ |
56 | 56 | |
57 | -public static $Options=[ |
|
57 | +public static $Options = [ |
|
58 | 58 | 'sign'=>0, |
59 | 59 | 'no_cache'=>0, |
60 | 60 | 'hidden'=>0, |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | "eduroamCAT", |
299 | 299 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
300 | 300 | "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>", |
301 | - "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
301 | + "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
302 | 302 | ], |
303 | 303 | ], |
304 | 304 | |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | "eduroamCAT", |
315 | 315 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
316 | 316 | "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>", |
317 | - "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
317 | + "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
318 | 318 | ], |
319 | 319 | ], |
320 | 320 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | "eduroamCAT", |
331 | 331 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
332 | 332 | "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>", |
333 | - "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
333 | + "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
334 | 334 | ], |
335 | 335 | ], |
336 | 336 | |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | "eduroamCAT", |
348 | 348 | "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>", |
349 | 349 | "<a target='_blank' href='unbeknownst'>Amazon Appstore</a>", |
350 | - "<a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"), |
|
350 | + "<a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"), |
|
351 | 351 | ], |
352 | 352 | ], |
353 | 353 |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | File "GEANTLink64.msi" |
76 | 76 | nsArray::Set Delete_files "GEANTLink64.msi" |
77 | 77 | DetailPrint "Install GEANTLink installer" |
78 | - MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>" |
|
78 | + MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>" |
|
79 | 79 | !insertmacro debug_cat 1 "Run GEANTLink installer" |
80 | 80 | !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink$Platform.msi" REBOOT=Supress' |
81 | 81 | ClearErrors |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | Push 1 |
87 | 87 | Pop $rebootRequired |
88 | 88 | ${Else} |
89 | - MessageBox MB_OK "<?php WindowsCommon::echo_nsi( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>" |
|
89 | + MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete succesfully."))?>" |
|
90 | 90 | Quit |
91 | 91 | ${EndIf} |
92 | 92 | Cont2: |
@@ -342,7 +342,7 @@ |
||
342 | 342 | $qualClassName = get_class($object); |
343 | 343 | // remove namespace qualifier |
344 | 344 | $pos = strrpos($qualClassName, '\\'); |
345 | - $className = substr($qualClassName, $pos + 1); |
|
345 | + $className = substr($qualClassName, $pos + 1); |
|
346 | 346 | $name = preg_replace("/_/", "-", $className); |
347 | 347 | if ($object->getValue()) { |
348 | 348 | $val = $object->getValue(); |
@@ -50,7 +50,7 @@ |
||
50 | 50 | $Dev = \devices\Devices::listDevices(); |
51 | 51 | if (isset($Dev[$blueprint])) { |
52 | 52 | $this->loggerInstance->debug(4, "loaded: devices/" . $Dev[$blueprint]['directory'] . "/" . $Dev[$blueprint]['module'] . ".php\n"); |
53 | - $class_name = "\devices\\".$Dev[$blueprint]['directory']."\Device_" . $Dev[$blueprint]['module']; |
|
53 | + $class_name = "\devices\\" . $Dev[$blueprint]['directory'] . "\Device_" . $Dev[$blueprint]['module']; |
|
54 | 54 | $this->device = new $class_name(); |
55 | 55 | if (!$this->device) { |
56 | 56 | $this->loggerInstance->debug(2, "module loading failed"); |
@@ -30,18 +30,18 @@ |
||
30 | 30 | * destination. |
31 | 31 | */ |
32 | 32 | |
33 | -$tempdir = __DIR__."/temp_ocsp"; |
|
33 | +$tempdir = __DIR__ . "/temp_ocsp"; |
|
34 | 34 | mkdir($tempdir); |
35 | 35 | |
36 | 36 | $allStatements = $dbLink->exec("SELECT serial_number,OCSP FROM silverbullet_certificate WHERE serial_number IS NOT NULL AND expiry > NOW() AND OCSP_timestamp > DATE_SUB(NOW(), INTERVAL 8 DAY)"); |
37 | 37 | |
38 | 38 | while ($statementRow = mysqli_fetch_object($allStatements)) { |
39 | 39 | # echo "Writing OCSP statement for serial number $statementRow->serial_number\n"; |
40 | - $filename = strtoupper(dechex($statementRow->serial_number)).".der"; |
|
40 | + $filename = strtoupper(dechex($statementRow->serial_number)) . ".der"; |
|
41 | 41 | if (strlen($filename) % 2 == 1) { |
42 | 42 | $filename = "0" . $filename; |
43 | 43 | } |
44 | - $fileHandle = fopen($tempdir."/$filename","w"); |
|
44 | + $fileHandle = fopen($tempdir . "/$filename", "w"); |
|
45 | 45 | fwrite($fileHandle, $statementRow->OCSP); |
46 | 46 | fclose($fileHandle); |
47 | 47 | } |