Passed
Push — master ( c13250...aa6318 )
by Tomasz
03:33
created
web/skins/eduroam2016/accountstatus/accountstatus.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@  discard block
 block discarded – undo
3 3
 $Gui->defaultPagePrelude();
4 4
 ?>
5 5
 <!-- JQuery -->
6
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery.js");?>"></script>
7
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-migrate-1.2.1.js");?>"></script>
8
-<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL","jquery/jquery-ui.js");?>"></script>
6
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery.js"); ?>"></script>
7
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-migrate-1.2.1.js"); ?>"></script>
8
+<script type="text/javascript" src="<?php echo $Gui->skinObject->findResourceUrl("EXTERNAL", "jquery/jquery-ui.js"); ?>"></script>
9 9
 <!-- JQuery -->
10 10
 <script type="text/javascript">
11 11
     var recognisedOS = '';
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 ?>
28 28
 var lang = "<?php echo($Gui->langObject->getLang()) ?>";
29 29
 </script>
30
-<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS","cat-user.css");?>" />
30
+<link rel="stylesheet" media="screen" type="text/css" href="<?php echo $Gui->skinObject->findResourceUrl("CSS", "cat-user.css"); ?>" />
31 31
 
32 32
 </head>
33 33
 <body>
@@ -37,15 +37,15 @@  discard block
 block discarded – undo
37 37
     <?php echo $divs->div_heading($visibility); ?>
38 38
     <div id="info_overlay"> <!-- device info -->
39 39
         <div id="info_window"></div>
40
-        <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
40
+        <img id="info_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
41 41
     </div>
42 42
     <div id="main_menu_info" style="display:none"> <!-- stuff triggered form main menu -->
43
-          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES","icons/button_cancel.png")?>" ALT="Close"/>
43
+          <img id="main_menu_close" class="close_button" src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/button_cancel.png")?>" ALT="Close"/>
44 44
           <div id="main_menu_content"></div>
45 45
     </div>
46 46
     <div id="main_body">
47 47
         <div id="user_page">
48
-            <?php  echo $divs->div_institution(FALSE);?>
48
+            <?php  echo $divs->div_institution(FALSE); ?>
49 49
             <div id="user_info"></div> <!-- this will be filled with the profile contact information -->
50 50
             <div id="sb_info">
51 51
                 <?php 
@@ -88,18 +88,18 @@  discard block
 block discarded – undo
88 88
                             echo "<h3>" . sprintf(_("Your invitation token is valid for %d more device activations (%d have already been used)."), $statusInfo['tokenstatus']['activations_remaining'], $statusInfo['tokenstatus']['activations_total'] - $statusInfo['tokenstatus']['activations_remaining']) . "</h3>";
89 89
                         }
90 90
                         if (!$statusInfo["OS"]) {
91
-                            echo "<p>"._("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
91
+                            echo "<p>" . _("Unfortunately, we are unable to determine your device's operating system. If you have made modifications on your device which prevent it from being recognised (e.g. custom 'User Agent' settings), please undo such modifications. You can come back to this page again; the invitation link has not been used up yet.") . "</p>";
92 92
                             break;
93 93
                         }
94 94
 
95 95
                         $dev = new \core\DeviceFactory($statusInfo['OS']['device']);
96 96
                         $dev->device->calculatePreferredEapType([new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET)]);
97 97
                         if ($dev->device->selectedEap == []) {
98
-                            echo "<p>".sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
98
+                            echo "<p>" . sprintf(_("Unfortunately, the operating system your device uses (%s) is currently not supported for hosted end-user accounts. You can visit this page with a supported operating system later; the invitation link has not been used up yet."), $statusInfo['OS']['display']) . "</p>";
99 99
                             break;
100 100
                         }
101 101
 
102
-                        echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
102
+                        echo "<div id='sb_download_message'><p>" . sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
103 103
  //                       echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
104 104
                         echo sprintf(_("The installation program is <span class='emph'>strictly personal</span>, to be used <span class='emph'>only on this device (%s)</span>, and it is <span class='emph'>not permitted to share</span> this information with anyone."), $statusInfo['OS']['display']);
105 105
                         echo "<p style='color:red;'>" . _("When the system detects abuse such as sharing login data with others, all access rights for you will be revoked and you may be sanctioned by your local eduroam administrator.") . "</p>";
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
             $supportInfo .= '<tr><td>' . ("tel:") . '</td><td><a href="' . $attributes['local_phone'] . '" target="_blank">' . $attributes['local_phone'] . '</a></td></tr>';
152 152
         }
153 153
         if ($supportInfo != '') {
154
-            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"),$cat->nomenclature_inst) . "</th></tr>$supportInfo</table>";
154
+            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems, then you can obtain direct assistance from your %s at:"), $cat->nomenclature_inst) . "</th></tr>$supportInfo</table>";
155 155
         } else {
156
-            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems you should ask for help at your %s"),$cat->nomenclature_inst) . "</th></tr></table>";
156
+            $supportInfo = "<table><tr><th colspan='2'>" . sprintf(_("If you encounter problems you should ask for help at your %s"), $cat->nomenclature_inst) . "</th></tr></table>";
157 157
         }
158 158
 ?>
159 159
     <script>
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     $("#inst_name").val(idpName);
165 165
     $("#inst_name_span").html(idpName);
166 166
     $(".inst_name").text(idpName);
167
-    $("#inst_extra_text").html("<?php escaped_echo(sprintf(_("Your personal %s account status page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']));?>");
167
+    $("#inst_extra_text").html("<?php escaped_echo(sprintf(_("Your personal %s account status page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])); ?>");
168 168
         if(logo) {
169 169
     $("#idp_logo").attr("src","<?php echo $skinObject->findResourceUrl("BASE", "user/API.php"); ?>?action=sendLogo&api_version=2&idp="+idpId);
170 170
     $("#idp_logo").show();
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
         
180 180
         $("#user_button_sb").click(function(event){
181 181
             event.preventDefault();
182
-            $("#cat_form").attr('action','<?php echo $Gui->skinObject->findResourceUrl("BASE","user/sb_download.php");?>');
182
+            $("#cat_form").attr('action','<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/sb_download.php"); ?>');
183 183
             $("#cat_form").submit();
184 184
         });
185 185
         
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
                 var allArray = new Array();
193 193
                 var statusCount = new Array();
194 194
                 
195
-                allArray[<?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_VALID;?>] = {color: "#000000", categoryText: "<?php escaped_echo(_("Current login tokens")) ?>", rows: validCerts};
196
-                allArray[<?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_EXPIRED;?>] = {color: "#999999", categoryText: "<?php escaped_echo(_("Previous login tokens")) ?>", rows: expiredCerts};
197
-                allArray[<?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_REVOKED;?>] = {color: "#ff0000", categoryText: "<?php escaped_echo(_("Revoked login tokens")) ?>", rows: revokedCerts};
198
-                var headerLine = "<tr><th><?php escaped_echo(_("Pseudonym"));?></th><th><?php escaped_echo(_("Device Type"));?></th><th><?php escaped_echo(_("Serial Number"));?></th><th><?php escaped_echo(_("Issue Date"));?></th><th><?php escaped_echo(_("Expiry Date"));?></th></tr>";
195
+                allArray[<?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_VALID; ?>] = {color: "#000000", categoryText: "<?php escaped_echo(_("Current login tokens")) ?>", rows: validCerts};
196
+                allArray[<?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_EXPIRED; ?>] = {color: "#999999", categoryText: "<?php escaped_echo(_("Previous login tokens")) ?>", rows: expiredCerts};
197
+                allArray[<?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_REVOKED; ?>] = {color: "#ff0000", categoryText: "<?php escaped_echo(_("Revoked login tokens")) ?>", rows: revokedCerts};
198
+                var headerLine = "<tr><th><?php escaped_echo(_("Pseudonym")); ?></th><th><?php escaped_echo(_("Device Type")); ?></th><th><?php escaped_echo(_("Serial Number")); ?></th><th><?php escaped_echo(_("Issue Date")); ?></th><th><?php escaped_echo(_("Expiry Date")); ?></th></tr>";
199 199
                 $.each(allArray, function(index, value) {
200 200
                     if(value !== undefined) {
201 201
                         value.rows.push('<tr style="color:' + value.color + ';"><th class="th1" colspan="5">' + value.categoryText + '</th></tr>');
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
                    if (value !== undefined && value.rows.length > 2) {
217 217
                         $.each(value.rows, function(i,line){
218 218
                             if (i > 1) {
219
-                                if (index === <?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_VALID;?>)
219
+                                if (index === <?php echo \core\ProfileSilverbullet::SB_CERTSTATUS_VALID; ?>)
220 220
                                     line = line + '<td class="revoke"><a href="" TITLE="revoke certificate">revoke</a></td></tr>';
221 221
                                 else
222 222
                                     line = line + '</tr>';
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 
235 235
         $("#cert_details").on("click", "td.revoke>a", function(event) {
236 236
             event.preventDefault();
237
-            if (confirm("<?php escaped_echo(_("really revoke this certificate?"));?>"))
237
+            if (confirm("<?php escaped_echo(_("really revoke this certificate?")); ?>"))
238 238
                 alert("deleting - not yet implemented");
239 239
         })
240 240
         loadIdpData();
Please login to merge, or discard this patch.