Passed
Push — master ( 76c0e9...3fd9e0 )
by Tomasz
03:58
created
web/skins/eduroam2016/accountstatus/accountstatus.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
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 
52
-             switch ($statusInfo['errorcode']) {
52
+                switch ($statusInfo['errorcode']) {
53 53
                     case "GENERATOR_CONSUMED":
54 54
                         echo $uiElements->boxError(_("You attempted to download an installer that was already downloaded before. Please request a new token from your administrator instead."), _("Attempt to re-use download link"), TRUE) . "<p>";
55 55
                         break;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
                         }
148 148
 
149 149
                         echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
150
- //                       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']);
150
+    //                       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']);
151 151
                         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']);
152 152
                         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>";
153 153
                         echo "<p>" . _("During the installation process, you will be asked for the following import PIN. This only happens once during the installation. You do not have to write down this PIN.") . "</p></div>";
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 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 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                                 foreach ($allcerts as $oneCredential) {
103 103
                                     if ($oneCredential['status'] == $category) {
104 104
                                         $categoryCount++;
105
-                                        ${$categoryCountVar} ++;
105
+                                        ${$categoryCountVar}++;
106 106
                                         $categoryText .= "<tr style='color:$color;'>";
107 107
                                         $categoryText .= "<td>" . $oneCredential['name'] . "</td>";
108 108
                                         $categoryText .= "<td>" . $oneCredential['device'] . "</td>";
@@ -135,18 +135,18 @@  discard block
 block discarded – undo
135 135
                             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>";
136 136
                         }
137 137
                         if (!$statusInfo["OS"]) {
138
-                            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>";
138
+                            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>";
139 139
                             break;
140 140
                         }
141 141
 
142 142
                         $dev = new \core\DeviceFactory($statusInfo['OS']['device']);
143 143
                         $dev->device->calculatePreferredEapType([new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET)]);
144 144
                         if ($dev->device->selectedEap == []) {
145
-                            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>";
145
+                            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>";
146 146
                             break;
147 147
                         }
148 148
 
149
-                        echo "<div id='sb_download_message'><p>".sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
149
+                        echo "<div id='sb_download_message'><p>" . sprintf(_("You can now download a personalised  %s installation program."), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']);
150 150
  //                       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']);
151 151
                         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']);
152 152
                         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>";
@@ -198,9 +198,9 @@  discard block
 block discarded – undo
198 198
             $supportInfo .= '<tr><td>' . ("tel:") . '</td><td><a href="' . $attributes['local_phone'] . '" target="_blank">' . $attributes['local_phone'] . '</a></td></tr>';
199 199
         }
200 200
         if ($supportInfo != '') {
201
-            $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>";
201
+            $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>";
202 202
         } else {
203
-            $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>";
203
+            $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>";
204 204
         }
205 205
 ?>
206 206
     <script>
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
     $("#inst_name").val(idpName);
212 212
     $("#inst_name_span").html(idpName);
213 213
     $(".inst_name").text(idpName);
214
-    $("#inst_extra_text").html("<?php escaped_echo(sprintf(_("Your personal %s account status page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']));?>");
214
+    $("#inst_extra_text").html("<?php escaped_echo(sprintf(_("Your personal %s account status page"), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])); ?>");
215 215
         if(logo) {
216 216
     $("#idp_logo").attr("src","<?php echo $skinObject->findResourceUrl("BASE", "user/API.php"); ?>?action=sendLogo&api_version=2&idp="+idpId);
217 217
     $("#idp_logo").show();
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
         
227 227
         $("#user_button_sb").click(function(event){
228 228
             event.preventDefault();
229
-            $("#cat_form").attr('action','<?php echo $Gui->skinObject->findResourceUrl("BASE","user/sb_download.php");?>');
229
+            $("#cat_form").attr('action','<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/sb_download.php"); ?>');
230 230
             $("#cat_form").submit();
231 231
         });
232 232
 
Please login to merge, or discard this patch.