@@ -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"> |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | $this->realm = $profileQuery->realm; |
| 81 | 81 | |
| 82 | - $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous" ); |
|
| 82 | + $localValueIfAny = (preg_match('/@/', $this->realm) ? substr($this->realm, 0, strpos($this->realm, '@')) : "anonymous"); |
|
| 83 | 83 | |
| 84 | 84 | $internalAttributes = [ |
| 85 | 85 | "internal:profile_count" => $this->idpNumberOfProfiles, |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | public function setRealmCheckUser($shallwe, $localpart = NULL) { |
| 251 | 251 | $this->databaseHandle->exec("UPDATE profile SET checkuser_outer = " . ($shallwe === true ? "1" : "0") . |
| 252 | - ( $localpart !== NULL ? ", checkuser_value = '$localpart' " : "") . |
|
| 252 | + ($localpart !== NULL ? ", checkuser_value = '$localpart' " : "") . |
|
| 253 | 253 | " WHERE profile_id = $this->identifier"); |
| 254 | 254 | } |
| 255 | 255 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | <th>Device</th> |
| 174 | 174 | <th>Admin Downloads</th> |
| 175 | 175 | <th>User Downloads (classic)</th> |
| 176 | - <th>User Downloads (<?php echo \core\ProfileSilverbullet::PRODUCTNAME;?>)</th> |
|
| 176 | + <th>User Downloads (<?php echo \core\ProfileSilverbullet::PRODUCTNAME; ?>)</th> |
|
| 177 | 177 | <th>User Downloads (total)</th> |
| 178 | 178 | </tr> |
| 179 | 179 | <?php |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | echo "<tr>"; |
| 185 | 185 | $admin_query = $dbHandle->exec("SELECT SUM(downloads_admin) AS admin, SUM(downloads_user) AS user, SUM(downloads_silverbullet) as silverbullet FROM downloads WHERE device_id = '$index'"); |
| 186 | 186 | while ($a = mysqli_fetch_object($admin_query)) { |
| 187 | - echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s",$a->user + $a->silverbullet) . "</td>"; |
|
| 187 | + echo "<td>" . $device_array['display'] . "</td><td>" . $a->admin . "</td><td>" . $a->user . "</td><td>" . $a->silverbullet . "</td><td>" . sprintf("%s", $a->user + $a->silverbullet) . "</td>"; |
|
| 188 | 188 | $gross_admin = $gross_admin + $a->admin; |
| 189 | 189 | $gross_user = $gross_user + $a->user; |
| 190 | 190 | $gross_silverbullet = $gross_silverbullet + $a->silverbullet; |
@@ -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(); |