@@ -19,7 +19,7 @@ |
||
19 | 19 | |
20 | 20 | // extract request parameters; action is mandatory |
21 | 21 | if(!isset($_REQUEST['action'])) { |
22 | - exit; |
|
22 | + exit; |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | $action = $_REQUEST['action']; |
@@ -14,24 +14,24 @@ discard block |
||
14 | 14 | * |
15 | 15 | * @package UserAPI |
16 | 16 | */ |
17 | -include(dirname(dirname(dirname(__FILE__)))."/config/_config.php"); |
|
17 | +include(dirname(dirname(dirname(__FILE__))) . "/config/_config.php"); |
|
18 | 18 | $API = new \core\UserAPI(); |
19 | 19 | |
20 | 20 | // extract request parameters; action is mandatory |
21 | -if(!isset($_REQUEST['action'])) { |
|
21 | +if (!isset($_REQUEST['action'])) { |
|
22 | 22 | exit; |
23 | 23 | } |
24 | 24 | |
25 | 25 | $action = $_REQUEST['action']; |
26 | -$id = ( isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE ); |
|
27 | -$lang = ( isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE ); |
|
28 | -$profile = ( isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE ); |
|
29 | -$disco = ( isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE ); |
|
30 | -$sort = ( isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0 ); |
|
31 | -$generatedfor = ( isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user' ); |
|
26 | +$id = (isset($_REQUEST['id']) ? $_REQUEST['id'] : FALSE); |
|
27 | +$lang = (isset($_REQUEST['lang']) ? $_REQUEST['lang'] : FALSE); |
|
28 | +$profile = (isset($_REQUEST['profile']) ? $_REQUEST['profile'] : FALSE); |
|
29 | +$disco = (isset($_REQUEST['disco']) ? $_REQUEST['disco'] : FALSE); |
|
30 | +$sort = (isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 0); |
|
31 | +$generatedfor = (isset($_REQUEST['generatedfor']) ? $_REQUEST['generatedfor'] : 'user'); |
|
32 | 32 | |
33 | 33 | $loggerInstance = new \core\Logging(); |
34 | -$loggerInstance->debug(4,"cat_back action: ".$action.':'.$id.':'.$lang.':'.$profile.':'.$disco."\n"); |
|
34 | +$loggerInstance->debug(4, "cat_back action: " . $action . ':' . $id . ':' . $lang . ':' . $profile . ':' . $disco . "\n"); |
|
35 | 35 | |
36 | 36 | switch ($action) { |
37 | 37 | case 'listLanguages': |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | if ($id === FALSE) { |
51 | 51 | exit; |
52 | 52 | } |
53 | - $API->JSON_listProfiles($id,$sort); |
|
53 | + $API->JSON_listProfiles($id, $sort); |
|
54 | 54 | break; |
55 | 55 | case 'listDevices': |
56 | 56 | $API->JSON_listDevices($id); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | $validator = new \web\lib\common\InputValidation(); |
69 | 69 | $device = $validator->Device($id); // throws an Exception if unknown |
70 | - $API->downloadInstaller($device, $profile,$generatedfor); |
|
70 | + $API->downloadInstaller($device, $profile, $generatedfor); |
|
71 | 71 | break; |
72 | 72 | case 'profileAttributes': // needs $id set |
73 | 73 | if ($id === FALSE) { |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | ?> |
11 | 11 | <?php |
12 | 12 | function escaped_echo($s) { |
13 | - echo preg_replace('/"/','"',$s); |
|
13 | + echo preg_replace('/"/','"',$s); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | $langObject = new \core\common\Language(); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | if (! is_numeric($profileId)) { |
24 | 24 | exit; |
25 | 25 | } |
26 | - ?> |
|
26 | + ?> |
|
27 | 27 | var n; |
28 | 28 | var profile; |
29 | 29 | // var device_button_bg ="#0a698e"; |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | } |
346 | 346 | |
347 | 347 | <?php if($idpId) { |
348 | - print "front_page = 0;\n"; |
|
348 | + print "front_page = 0;\n"; |
|
349 | 349 | } ?> |
350 | 350 | |
351 | 351 | function showTOU(){ |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | if ($profileId) { |
422 | 422 | print "listProfiles($idpId,$profileId);"; |
423 | 423 | } |
424 | - ?> |
|
424 | + ?> |
|
425 | 425 | |
426 | 426 | $(".signin").click(function(event){ |
427 | 427 | event.preventDefault(); |
@@ -500,12 +500,12 @@ discard block |
||
500 | 500 | }); |
501 | 501 | DiscoJuice.Constants.Countries = { |
502 | 502 | <?php |
503 | - $C = $Gui->printCountryList(1); |
|
504 | - $ret = ''; |
|
505 | - foreach ($C as $key => $val) { |
|
503 | + $C = $Gui->printCountryList(1); |
|
504 | + $ret = ''; |
|
505 | + foreach ($C as $key => $val) { |
|
506 | 506 | $ret .= "'$key': \"$val\","; |
507 | - } |
|
508 | - echo substr($ret, 0, -1); |
|
507 | + } |
|
508 | + echo substr($ret, 0, -1); |
|
509 | 509 | ?> |
510 | 510 | }; |
511 | 511 |
@@ -10,18 +10,18 @@ discard block |
||
10 | 10 | ?> |
11 | 11 | <?php |
12 | 12 | function escaped_echo($s) { |
13 | - echo preg_replace('/"/','"',$s); |
|
13 | + echo preg_replace('/"/', '"', $s); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | $langObject = new \core\common\Language(); |
17 | 17 | $langObject->setTextDomain('web_user'); |
18 | 18 | $cat = new core\CAT(); |
19 | 19 | $idpId = empty($_REQUEST['idp']) ? 0 : $_REQUEST['idp']; |
20 | -if (! is_numeric($idpId)) { |
|
20 | +if (!is_numeric($idpId)) { |
|
21 | 21 | exit; |
22 | 22 | } |
23 | 23 | $profileId = empty($_REQUEST['profile']) ? 0 : $_REQUEST['profile']; |
24 | -if (! is_numeric($profileId)) { |
|
24 | +if (!is_numeric($profileId)) { |
|
25 | 25 | exit; |
26 | 26 | } |
27 | 27 | ?> |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | result = j.status; |
71 | 71 | if(! result) { |
72 | 72 | alert("<?php escaped_echo(_("no matching data found"))?>"); |
73 | - document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>'; |
|
73 | + document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>'; |
|
74 | 74 | } |
75 | 75 | j = j.data; |
76 | 76 | n = j.length; |
@@ -187,8 +187,8 @@ discard block |
||
187 | 187 | j1 = $.parseJSON(data); |
188 | 188 | result = j1.status; |
189 | 189 | if(! result) { |
190 | - alert("<?php escaped_echo( _("no matching data found"))?>"); |
|
191 | - document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>'; |
|
190 | + alert("<?php escaped_echo(_("no matching data found"))?>"); |
|
191 | + document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>'; |
|
192 | 192 | } |
193 | 193 | j = j1.data; |
194 | 194 | if(j.description !== undefined && j.description) { |
@@ -199,15 +199,15 @@ discard block |
||
199 | 199 | $("#profile_desc").text(''); |
200 | 200 | } |
201 | 201 | if(j.local_url !== undefined && j.local_url) |
202 | - txt = txt+'<tr><td><?php escaped_echo(_("WWW:"));?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>'; |
|
202 | + txt = txt+'<tr><td><?php escaped_echo(_("WWW:")); ?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>'; |
|
203 | 203 | if(j.local_email !== undefined && j.local_email) |
204 | - txt = txt+'<tr><td><?php escaped_echo(_("email:"));?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>'; |
|
204 | + txt = txt+'<tr><td><?php escaped_echo(_("email:")); ?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>'; |
|
205 | 205 | if(j.local_phone !== undefined && j.local_phone) |
206 | - txt = txt+'<tr><td><?php escaped_echo(_("tel:"));?></td><td>'+j.local_phone+'</td></tr>'; |
|
206 | + txt = txt+'<tr><td><?php escaped_echo(_("tel:")); ?></td><td>'+j.local_phone+'</td></tr>'; |
|
207 | 207 | if(txt) |
208 | - txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"),$cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>'; |
|
208 | + txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"), $cat->nomenclature_inst)); ?></th></tr>"+txt+'</table>'; |
|
209 | 209 | else |
210 | - txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"),$cat->nomenclature_inst)); ?>.</th></tr></table>"; |
|
210 | + txt = "<table><tr><th colspan='2'><?php escaped_echo(sprintf(_("If you encounter problems you should ask for help at your %s"), $cat->nomenclature_inst)); ?>.</th></tr></table>"; |
|
211 | 211 | $("#user_info").html(txt); |
212 | 212 | $("#user_info").show(); |
213 | 213 | resetDevices(); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | $("#g_"+v.id).addClass('alertButton'); |
221 | 221 | $("#cross_icon_"+v.id).show(); |
222 | 222 | $("#"+v.id).addClass('disabledDevice'); |
223 | - $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>"); |
|
223 | + $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>"); |
|
224 | 224 | $("#info_b_"+v.id+",#g_info_b_"+v.id).hide(); |
225 | 225 | } else { |
226 | 226 | if(v.status == -1) |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | $("#"+v.id+",#g_"+v.id).addClass('additionalInfo'); |
233 | 233 | $("#"+v.id+",#g_"+v.id).click(function(event){ |
234 | 234 | i_div = $("#info_"+$(this).attr('id')); |
235 | - t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue"));?></a></span>"; |
|
235 | + t = "<?php escaped_echo(_("Your site administrator has specified that this device should be configured with resources located on a local page. When you click <b>Continue</b> this page will be opened in a new window/tab."))?>"+"<br><span class='redirect_link'><a href='"+v.redirect+"' target='_blank'><?php escaped_echo(_("Continue")); ?></a></span>"; |
|
236 | 236 | i_div.html(t); |
237 | 237 | $(".redirect_link").click(function(event) { |
238 | 238 | i_div.hide(); |
@@ -240,13 +240,13 @@ discard block |
||
240 | 240 | |
241 | 241 | }); |
242 | 242 | } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) { |
243 | - var continue_text = "<?php escaped_echo(_("Continue"));?>"; |
|
243 | + var continue_text = "<?php escaped_echo(_("Continue")); ?>"; |
|
244 | 244 | $("#"+v.id+",#g_"+v.id).addClass('additionalInfo'); |
245 | 245 | $("#"+v.id+",#g_"+v.id).click(function(event){ |
246 | 246 | i_div = $("#info_"+$(this).attr('id')); |
247 | 247 | if(v.status > 0) { |
248 | - t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>"; |
|
249 | - continue_text = "<?php escaped_echo(_("Close"));?>"; |
|
248 | + t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>"; |
|
249 | + continue_text = "<?php escaped_echo(_("Close")); ?>"; |
|
250 | 250 | } else { |
251 | 251 | t = i_div.html(); |
252 | 252 | if(v.message != '0') { |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | } |
302 | 302 | |
303 | 303 | function infoCAT(k,subK,title) { |
304 | - $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE","user/cat_info.php")?>', {page: k, subpage: subK, lang: lang}, function(data) { |
|
304 | + $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php")?>', {page: k, subpage: subK, lang: lang}, function(data) { |
|
305 | 305 | if(data.substring(0,8) == 'no_title') { |
306 | 306 | data = data.substring(8,data.length); |
307 | 307 | } else { |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $("#loading_ico").css('left',x+'px'); |
324 | 324 | $("#loading_ico").attr('src','resources/images/icons/loading9.gif'); |
325 | 325 | $("#loading_ico").show(); |
326 | - window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE","admin/overview_user.php")?>?lang="+lang); |
|
326 | + window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE", "admin/overview_user.php")?>?lang="+lang); |
|
327 | 327 | } |
328 | 328 | |
329 | 329 | |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | return(Math.round(windowWidth/2)); |
346 | 346 | } |
347 | 347 | |
348 | -<?php if($idpId) { |
|
348 | +<?php if ($idpId) { |
|
349 | 349 | print "front_page = 0;\n"; |
350 | 350 | } ?> |
351 | 351 | |
@@ -384,10 +384,10 @@ discard block |
||
384 | 384 | $("#download_info a").attr('href',download_link); |
385 | 385 | $('#download_info').show(); |
386 | 386 | if( generateTimer > 0 ) { |
387 | - setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link",generateTimer); |
|
387 | + setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link",generateTimer); |
|
388 | 388 | } |
389 | 389 | else { |
390 | - document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link; |
|
390 | + document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link; |
|
391 | 391 | } |
392 | 392 | } |
393 | 393 | } |
@@ -460,13 +460,13 @@ discard block |
||
460 | 460 | "overlay":true,"cookie":true,"type":false, |
461 | 461 | "country":true,"location":true, |
462 | 462 | "title":"<?php escaped_echo($cat->nomenclature_inst) ?>", |
463 | - "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"),$cat->nomenclature_inst)) ?>", |
|
464 | - "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"),$cat->nomenclature_inst)) ?>", |
|
465 | - "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>", |
|
463 | + "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"), $cat->nomenclature_inst)) ?>", |
|
464 | + "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"), $cat->nomenclature_inst)) ?>", |
|
465 | + "textHelpMore": "<?php escaped_echo(sprintf(_("This system relies on information supplied by local %s administrators. If your %s is not on the list, then nag them to add information to the %s database."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'], $cat->nomenclature_inst, CONFIG['APPEARANCE']['productname'])); ?>", |
|
466 | 466 | "textLocateMe": "<?php escaped_echo(_("Locate me more accurately using HTML5 Geo-Location")) ?>", |
467 | 467 | "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"), $cat->nomenclature_inst)) ?>", |
468 | 468 | "textAllCountries": "<?php escaped_echo(_("all countries")) ?>", |
469 | - "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"),$cat->nomenclature_inst)) ?>", |
|
469 | + "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"), $cat->nomenclature_inst)) ?>", |
|
470 | 470 | "textShowAllCountries": "<?php escaped_echo(_("show all countries")) ?>", |
471 | 471 | "textLimited1" : "<?php escaped_echo(_("Results limited to"))?>", |
472 | 472 | "textLimited2" : "<?php escaped_echo(_("entries - show more"))?>", |
@@ -68,13 +68,12 @@ |
||
68 | 68 | |
69 | 69 | <?php |
70 | 70 | /** |
71 | - * The OS object holds operating system descriptions |
|
72 | - * @param name is the main title |
|
73 | - * @param subtitle - the subtitle |
|
74 | - * @param path - the path to the scriin-dump image |
|
75 | - * @param signed - if true show information that the module is signed |
|
76 | - |
|
77 | -*/ |
|
71 | + * The OS object holds operating system descriptions |
|
72 | + * @param name is the main title |
|
73 | + * @param subtitle - the subtitle |
|
74 | + * @param path - the path to the scriin-dump image |
|
75 | + * @param signed - if true show information that the module is signed |
|
76 | + */ |
|
78 | 77 | ?> |
79 | 78 | |
80 | 79 | function OS(name, subtitle, path, signed) { |
@@ -129,12 +129,12 @@ |
||
129 | 129 | */ |
130 | 130 | ?> |
131 | 131 | |
132 | -var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-win8-english-h234.png")?>",true); |
|
133 | -var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-mac-english-h234.png")?>",true); |
|
134 | -var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-android-english-h234.png")?>",false); |
|
135 | -var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-iphone-english-h234.png")?>",true); |
|
136 | -var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-linux-english-h234.png")?>",false); |
|
137 | -var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES","screenshots/sampleinstaller-chromeos-english-h234.png")?>",false); |
|
132 | +var win8 = new OS('<?php echo _("MS Windows")?>', '<?php echo _("10, 8, 7, Vista") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-win8-english-h234.png")?>",true); |
|
133 | +var mac = new OS('<?php echo _("Apple OS X")?>','10.7+',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-mac-english-h234.png")?>",true); |
|
134 | +var android = new OS('<?php echo _("Android")?>','<?php echo _("4.3+") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-android-english-h234.png")?>",false); |
|
135 | +var iphone = new OS('<?php echo _("Apple iOS devices")?>','<?php echo _("iPhone, iPad, iPod touch") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-iphone-english-h234.png")?>",true); |
|
136 | +var linux = new OS('<?php echo _("Linux")?>','<?php echo _("all major distributions") ?>',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-linux-english-h234.png")?>",false); |
|
137 | +var chromeos = new OS('<?php echo _("Chrome OS")?>','',"<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "screenshots/sampleinstaller-chromeos-english-h234.png")?>",false); |
|
138 | 138 | |
139 | 139 | |
140 | 140 |
@@ -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 ; |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | } |
20 | 20 | |
21 | 21 | body { |
22 | - background: <?php echo $colour1;?>; |
|
22 | + background: <?php echo $colour1; ?>; |
|
23 | 23 | color: #000000; |
24 | 24 | font-family:"Open Sans", Helvetica, sans-serif; |
25 | 25 | font-size:11px; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | button { |
37 | - background: <?php echo $colour2;?>; |
|
37 | + background: <?php echo $colour2; ?>; |
|
38 | 38 | color: #FFFFFF; |
39 | 39 | min-height: 23px; |
40 | 40 | border-left-style: outset; |
@@ -188,9 +188,9 @@ discard block |
||
188 | 188 | border-bottom-style:solid; |
189 | 189 | border-top-width:5px; |
190 | 190 | border-bottom-width:5px; |
191 | - border-color: <?php echo $colour1;?>; |
|
191 | + border-color: <?php echo $colour1; ?>; |
|
192 | 192 | padding-left:30px; |
193 | - color: <?php echo $colour2;?>; |
|
193 | + color: <?php echo $colour2; ?>; |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | div.pagecontent { |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | |
384 | 384 | span.edu_cat { |
385 | 385 | font-weight: bold; |
386 | - color: <?php echo $colour2;?>; |
|
386 | + color: <?php echo $colour2; ?>; |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | span.tooltip { |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | border-bottom-style:solid; |
497 | 497 | border-top-width:5px; |
498 | 498 | border-bottom-width:5px; |
499 | - border-color: <?php echo $colour1;?>; |
|
499 | + border-color: <?php echo $colour1; ?>; |
|
500 | 500 | padding-left:30px; |
501 | 501 | } |
502 | 502 | |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | } |
551 | 551 | |
552 | 552 | span.redirect_link { |
553 | - background: <?php echo $colour2;?>; color: #FFFFFF; height: 23px; |
|
553 | + background: <?php echo $colour2; ?>; color: #FFFFFF; height: 23px; |
|
554 | 554 | border-left-style: inset; border-left-width: 1px; border-left-color: #8bbacb; |
555 | 555 | border-top-style: inset; border-top-width: 1px; border-top-color: #8bbacb; |
556 | 556 | border-right-style: outset; border-right-width: 2px; border-right-color: #043d52; |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | width: 30em; |
616 | 616 | padding-left: 10px; |
617 | 617 | padding-right: 00px; |
618 | - background: <?php echo $colour2;?>; |
|
618 | + background: <?php echo $colour2; ?>; |
|
619 | 619 | color: #FFFFFF; |
620 | 620 | box-shadow: 10px 10px 5px #888888; |
621 | 621 | } |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | // border-bottom-width:5px; |
666 | 666 | border-color: #e7e7e7; |
667 | 667 | padding-left:30px; |
668 | - color: <?php echo $colour2;?>; |
|
668 | + color: <?php echo $colour2; ?>; |
|
669 | 669 | } |
670 | 670 | |
671 | 671 | #headingx h1 { |
@@ -684,7 +684,7 @@ discard block |
||
684 | 684 | text-align: justify; |
685 | 685 | border-bottom-style:solid; |
686 | 686 | border-bottom-width:5px; |
687 | - border-color: <?php echo $colour1;?>; |
|
687 | + border-color: <?php echo $colour1; ?>; |
|
688 | 688 | font-size: 11px; |
689 | 689 | font-weight: normal; |
690 | 690 | } |
@@ -693,7 +693,7 @@ discard block |
||
693 | 693 | |
694 | 694 | #faq { |
695 | 695 | padding: 20px; |
696 | - color: <?php echo $colour2;?>; |
|
696 | + color: <?php echo $colour2; ?>; |
|
697 | 697 | background: #ffffff; |
698 | 698 | } |
699 | 699 | |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | |
734 | 734 | #menu_column { |
735 | 735 | border-right:solid; |
736 | - border-color: <?php echo $colour1;?>; |
|
736 | + border-color: <?php echo $colour1; ?>; |
|
737 | 737 | border-width:5px; |
738 | 738 | min-height:400px; |
739 | 739 | padding-left: 10px; |
@@ -751,11 +751,11 @@ discard block |
||
751 | 751 | } |
752 | 752 | |
753 | 753 | a:link { |
754 | - color:<?php echo $colour2;?>; |
|
754 | + color:<?php echo $colour2; ?>; |
|
755 | 755 | } |
756 | 756 | |
757 | 757 | a:visited { |
758 | - color:<?php echo $colour2;?>; |
|
758 | + color:<?php echo $colour2; ?>; |
|
759 | 759 | } |
760 | 760 | |
761 | 761 | a:hover { |
@@ -763,7 +763,7 @@ discard block |
||
763 | 763 | } |
764 | 764 | |
765 | 765 | a:active { |
766 | - color:<?php echo $colour2;?>; |
|
766 | + color:<?php echo $colour2; ?>; |
|
767 | 767 | } |
768 | 768 | |
769 | 769 | .comment { |
@@ -3,9 +3,9 @@ |
||
3 | 3 | <table id='browser'> |
4 | 4 | <tr> |
5 | 5 | <td> |
6 | - <button class='large_button guess_os' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES","vendorlogo/".$operatingSystem['group'].".png")?>' |
|
6 | + <button class='large_button guess_os' style='background-image:url("<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/" . $operatingSystem['group'] . ".png")?>' |
|
7 | 7 | id='g_<?php echo $operatingSystem['device'] ?>'> |
8 | - <img id='cross_icon_<?php echo $operatingSystem['device'] ?>' src='<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/delete_32.png")?>' > |
|
8 | + <img id='cross_icon_<?php echo $operatingSystem['device'] ?>' src='<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/delete_32.png")?>' > |
|
9 | 9 | <div class='download_button_text_1' id='download_button_header_<?php echo $operatingSystem['device'] ?>'> <?php print $downloadMessage ?> |
10 | 10 | </div> |
11 | 11 | <div class='download_button_text'> |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | * @author Zilvinas Vaira |
8 | 8 | * |
9 | 9 | */ |
10 | -class PopupMessageContainer implements PageElementInterface{ |
|
10 | +class PopupMessageContainer implements PageElementInterface { |
|
11 | 11 | |
12 | 12 | protected $id = ''; |
13 | 13 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | $this->pageElement = $pageElement; |
37 | 37 | $this->id = $id; |
38 | 38 | $this->title = $title; |
39 | - if(!$isVisible){ |
|
39 | + if (!$isVisible) { |
|
40 | 40 | $this->disabledStyle = 'style="display:none;"'; |
41 | 41 | } |
42 | 42 | $this->setCloseButtonClass('close'); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * |
48 | 48 | * @param string $token |
49 | 49 | */ |
50 | - public function setCloseButtonClass($token){ |
|
50 | + public function setCloseButtonClass($token) { |
|
51 | 51 | $this->closeButtonClass = $this->id . '-' . $token; |
52 | 52 | } |
53 | 53 |
@@ -13,13 +13,13 @@ |
||
13 | 13 | |
14 | 14 | protected $action = ''; |
15 | 15 | |
16 | - protected $params = array (); |
|
16 | + protected $params = array(); |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * |
20 | 20 | * @param string $action |
21 | 21 | */ |
22 | - public function __construct($action){ |
|
22 | + public function __construct($action) { |
|
23 | 23 | $this->action = $action; |
24 | 24 | } |
25 | 25 |
@@ -172,9 +172,9 @@ |
||
172 | 172 | $totalFailures = 0; |
173 | 173 | foreach ($decoded_response['messages'] as $message) { |
174 | 174 | if ($message['status'] == 0) { |
175 | - $loggerInstance->debug(2, $message['message-id']. ": Success"); |
|
175 | + $loggerInstance->debug(2, $message['message-id'] . ": Success"); |
|
176 | 176 | } else { |
177 | - $loggerInstance->debug(2, $message['message-id']. ": Failed (failure code = ".$message['status'].")"); |
|
177 | + $loggerInstance->debug(2, $message['message-id'] . ": Failed (failure code = " . $message['status'] . ")"); |
|
178 | 178 | $totalFailures++; |
179 | 179 | } |
180 | 180 | } |