Test Failed
Push — master ( a13d19...6b96b9 )
by Tomasz
03:24
created
web/skins/classic/user/js/cat_js.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 <?php 
12 12
 $cat = new core\CAT();
13 13
 function escaped_echo($s) {
14
-   echo preg_replace('/"/','&quot;',$s);
14
+    echo preg_replace('/"/','&quot;',$s);
15 15
 }
16 16
 
17 17
 $langObject = new \core\common\Language();
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 if (! is_numeric($profileId)) {
25 25
     exit;
26 26
 }
27
- ?>
27
+    ?>
28 28
 var n;
29 29
 var profile;
30 30
 var generateTimer;
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 }
360 360
 
361 361
 <?php if($idpId) { 
362
-      print "front_page = 0;\n";
362
+        print "front_page = 0;\n";
363 363
 } ?>
364 364
 
365 365
 function showTOU(){
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 if ($profileId) {
494 494
     print "listProfiles($idpId,$profileId);";
495 495
 }
496
- ?>
496
+    ?>
497 497
 
498 498
 $(".signin").click(function(event){
499 499
      pressedButton = $(this);
@@ -554,12 +554,12 @@  discard block
 block discarded – undo
554 554
         });
555 555
 DiscoJuice.Constants.Countries = {
556 556
 <?php 
557
-  $C = $Gui->printCountryList(1);
558
-     $ret = '';
559
-   foreach ($C as $key => $val) {
557
+    $C = $Gui->printCountryList(1);
558
+        $ret = '';
559
+    foreach ($C as $key => $val) {
560 560
     $ret .= "'$key': \"$val\",";
561
-   }
562
-   echo substr($ret, 0, -1);
561
+    }
562
+    echo substr($ret, 0, -1);
563 563
 ?>
564 564
         };
565 565
 
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -11,17 +11,17 @@  discard block
 block discarded – undo
11 11
 <?php 
12 12
 $cat = new core\CAT();
13 13
 function escaped_echo($s) {
14
-   echo preg_replace('/"/','&quot;',$s);
14
+   echo preg_replace('/"/', '&quot;', $s);
15 15
 }
16 16
 
17 17
 $langObject = new \core\common\Language();
18 18
 $langObject->setTextDomain('web_user');
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
  ?>
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     result = j.status;
77 77
     if(! result) {
78 78
       alert("<?php escaped_echo(_("no matching data found"))?>");
79
-      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
79
+      document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
80 80
     }
81 81
     j = j.data;
82 82
     n = j.length;
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
     inst_name = j[0].idp_name;
85 85
     logo = j[0].logo;
86 86
     $("#inst_name").val(inst_name);
87
-    $("#inst_name_span").html("<?php escaped_echo(sprintf(_("Selected %s:"),$cat->nomenclature_inst))?> <strong>"+inst_name+"</strong>");
87
+    $("#inst_name_span").html("<?php escaped_echo(sprintf(_("Selected %s:"), $cat->nomenclature_inst))?> <strong>"+inst_name+"</strong>");
88 88
     $(".inst_name").text(inst_name);
89 89
     $("#user_page").show();
90 90
     $("#institution_name").show();
@@ -197,8 +197,8 @@  discard block
 block discarded – undo
197 197
        j1 = $.parseJSON(data);
198 198
        result = j1.status;
199 199
        if(! result) {
200
-            alert("<?php escaped_echo( _("no matching data found"))?>");
201
-            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/').'/'?>';
200
+            alert("<?php escaped_echo(_("no matching data found"))?>");
201
+            document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/') . '/'?>';
202 202
        }
203 203
        j = j1.data;
204 204
        if(j.description !== undefined && j.description) {
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
          $("#profile_desc").text('');
210 210
        }
211 211
        if(j.local_url !== undefined && j.local_url) 
212
-         txt = txt+'<tr><td><?php escaped_echo(_("WWW:"));?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
212
+         txt = txt+'<tr><td><?php escaped_echo(_("WWW:")); ?></td><td><a href="'+j.local_url+'" target="_blank">'+j.local_url+'</a></td></tr>';
213 213
        if(j.local_email !== undefined && j.local_email) 
214
-         txt = txt+'<tr><td><?php escaped_echo(_("email:"));?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
214
+         txt = txt+'<tr><td><?php escaped_echo(_("email:")); ?></td><td><a href=mailto:"'+j.local_email+'">'+j.local_email+'</a></td></tr>';
215 215
        if(j.local_phone !== undefined && j.local_phone) 
216
-         txt = txt+'<tr><td><?php escaped_echo(_("tel:"));?></td><td>'+j.local_phone+'</td></tr>';
216
+         txt = txt+'<tr><td><?php escaped_echo(_("tel:")); ?></td><td>'+j.local_phone+'</td></tr>';
217 217
        if(txt) 
218
-         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>';
218
+         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>';
219 219
         else 
220
-         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>";
220
+         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>";
221 221
       $("#user_info").html(txt);
222 222
       $("#user_info").show();
223 223
       if(j.silverbullet) {
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
           $("#g_"+v.id).addClass('alertButton');
236 236
           $("#cross_icon_"+v.id).show();
237 237
           $("#"+v.id).addClass('disabledDevice');
238
-          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>");
238
+          $("#download_button_header_"+v.id).html("<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>");
239 239
           $("#info_b_"+v.id+",#g_info_b_"+v.id).hide();
240 240
         } else  {
241 241
           if(v.status == -1)
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
248 248
           $("#"+v.id+",#g_"+v.id).click(function(event){
249 249
             i_div = $("#info_"+$(this).attr('id'));
250
-            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>";
250
+            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>";
251 251
             i_div.html(t);
252 252
             $(".redirect_link").click(function(event) {
253 253
                i_div.hide();
@@ -255,13 +255,13 @@  discard block
 block discarded – undo
255 255
                
256 256
           });
257 257
         } else if(v.device_customtext != '0' || v.eap_customtext != '0' || v.message != '0' || v.status > 0) {
258
-          var continue_text = "<?php escaped_echo(_("Continue"));?>";
258
+          var continue_text = "<?php escaped_echo(_("Continue")); ?>";
259 259
           $("#"+v.id+",#g_"+v.id).addClass('additionalInfo');
260 260
           $("#"+v.id+",#g_"+v.id).click(function(event){
261 261
             i_div = $("#info_"+$(this).attr('id'));
262 262
             if(v.status > 0) {
263
-              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"),$cat->nomenclature_inst))?>";
264
-              continue_text = "<?php escaped_echo(_("Close"));?>";
263
+              t = "<?php escaped_echo(sprintf(_("This device cannot be configured with settings provided by your %s"), $cat->nomenclature_inst))?>";
264
+              continue_text = "<?php escaped_echo(_("Close")); ?>";
265 265
             } else {
266 266
             t = i_div.html();
267 267
             if(v.message != '0') {
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
   }
319 319
 
320 320
   function infoCAT(k,title) {
321
-      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php");?>', {page: k, lang: lang}, function(data) {
321
+      $.post('<?php echo $Gui->skinObject->findResourceUrl("BASE", "user/cat_info.php"); ?>', {page: k, lang: lang}, function(data) {
322 322
     if(data.substring(0,8) == 'no_title') {
323 323
        data = data.substring(8,data.length);
324 324
     } else {
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
    $("#loading_ico").css('left',x+'px');
338 338
    $("#loading_ico").attr('src','resources/images/icons/loading9.gif');
339 339
    $("#loading_ico").show();
340
-   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE","admin/overview_user.php");?>?lang="+lang);
340
+   window.location.replace("<?php echo $Gui->skinObject->findResourceUrl("BASE", "admin/overview_user.php"); ?>?lang="+lang);
341 341
 }
342 342
 
343 343
 /* Get horizontal center of the Browser Window */
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
     return(Math.round(windowWidth/2));
359 359
 }
360 360
 
361
-<?php if($idpId) { 
361
+<?php if ($idpId) { 
362 362
       print "front_page = 0;\n";
363 363
 } ?>
364 364
 
@@ -396,10 +396,10 @@  discard block
 block discarded – undo
396 396
     $("#download_info a").attr('href',download_link);
397 397
     $('#download_info').show();
398 398
     if( generateTimer > 0 ) {
399
-       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link",generateTimer);
399
+       setTimeout("document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link",generateTimer);
400 400
     }
401 401
     else {
402
-       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']),'/')?>'+'/'+download_link;
402
+       document.location.href='<?php echo rtrim(dirname($_SERVER['SCRIPT_NAME']), '/')?>'+'/'+download_link;
403 403
     }
404 404
   }
405 405
 }
@@ -517,13 +517,13 @@  discard block
 block discarded – undo
517 517
    "overlay":true,"cookie":true,"type":false,
518 518
    "country":true,"location":true,
519 519
    "title":"<?php escaped_echo($cat->nomenclature_inst) ?>",
520
-   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"),$cat->nomenclature_inst)) ?>",
521
-   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"),$cat->nomenclature_inst)) ?>",
522
-   "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'])); ?>",
520
+   "subtitle":"<?php escaped_echo(sprintf(_("Select your <strong>%s<\/strong>"), $cat->nomenclature_inst)) ?>",
521
+   "textHelp": "<?php escaped_echo(sprintf(_("Help, my %s is not on the list"), $cat->nomenclature_inst)) ?>",
522
+   "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'])); ?>",
523 523
    "textLocateMe": "<?php escaped_echo(_("Locate me more accurately using HTML5 Geo-Location")) ?>",
524
-   "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"),$cat->nomenclature_inst)) ?>",
524
+   "textShowProviders": "<?php escaped_echo(sprintf(_("Show %ss in"), $cat->nomenclature_inst)) ?>",
525 525
    "textAllCountries": "<?php escaped_echo(_("all countries")) ?>",
526
-   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"),$cat->nomenclature_inst)) ?>",
526
+   "textSearch" : "<?php escaped_echo(sprintf(_("or search for an %s, in example Univerity of Oslo"), $cat->nomenclature_inst)) ?>",
527 527
    "textShowAllCountries": "<?php escaped_echo(_("show all countries")) ?>",
528 528
    "textLimited1" : "<?php escaped_echo(_("Results limited to"))?>",
529 529
    "textLimited2" : "<?php escaped_echo(_("entries - show more"))?>",
Please login to merge, or discard this patch.
web/admin/edit_federation.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
         ?>
41 41
     </h1>
42 42
     <div class='infobox'>
43
-        <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></h2>
43
+        <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></h2>
44 44
         <table>
45 45
             <tr>
46 46
                 <td><?php echo _("Country:"); ?></td>
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
               <input type='hidden' name='MAX_FILE_SIZE' value='" . CONFIG['MAX_UPLOAD_SIZE'] . "'>";
58 58
     ?>
59 59
     <fieldset class="option_container">
60
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclature_fed); ?></strong></legend>
60
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclature_fed); ?></strong></legend>
61 61
         <?php
62 62
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
63 63
         echo $optionDisplay->prefilledOptionTable("fed");
Please login to merge, or discard this patch.
devices/apple_mobileconfig/mobileconfigSuperclass.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
       <key>PayloadIdentifier</key>
72 72
          <string>" . self::$iPhonePayloadPrefix . ".$this->massagedConsortium.$this->massagedCountry.$this->massagedInst.$this->massagedProfile.$this->lang</string>
73 73
       <key>PayloadOrganization</key>
74
-         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ( $this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
74
+         <string>" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['general:instname'][0]), ENT_XML1, 'UTF-8') . ($this->attributes['internal:profile_count'][0] > 1 ? " (" . htmlspecialchars(iconv("UTF-8", "UTF-8//IGNORE", $this->attributes['profile:name'][0]), ENT_XML1, 'UTF-8') . ")" : "") . "</string>
75 75
       <key>PayloadType</key>
76 76
          <string>Configuration</string>
77 77
       <key>PayloadUUID</key>
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 
120 120
         $this->loggerInstance->debug(5, "List of available attributes: " . var_export($this->attributes, TRUE));
121 121
 
122
-        $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"),$this->nomenclature_inst);
122
+        $this->instName = $this->attributes['general:instname'][0] ?? sprintf(_("Unnamed %s"), $this->nomenclature_inst);
123 123
         $this->profileName = $this->attributes['profile:name'][0] ?? _("Unnamed Profile");
124 124
 
125 125
         $this->massagedInst = $this->massageName($this->instName);
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
                   <key>PayloadVersion</key>
480 480
                      <integer>1</integer>
481 481
                 </dict>",
482
-            "UUID" => $payloadUUID,];
482
+            "UUID" => $payloadUUID, ];
483 483
     }
484 484
 
485 485
     private function expiryBlock() {
Please login to merge, or discard this patch.
web/lib/admin/GeoWidget.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
      */
38 38
     public function insertInHead($inst_country, $inst_name) {
39 39
         $cat = new \core\CAT();
40
-        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=".CONFIG['APPEARANCE']['google_maps_api_key']."'></script>
40
+        return "<script type='text/javascript' src='https://maps.googleapis.com/maps/api/js?key=" . CONFIG['APPEARANCE']['google_maps_api_key'] . "'></script>
41 41
     <script type='text/javascript'>
42 42
         // some global variables;
43 43
         var center_lat=49.6114885608729;
Please login to merge, or discard this patch.
web/admin/edit_silverbullet.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
 $uiElements = new \web\lib\admin\UIElements();
40 40
 
41
-$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'),$uiElements->nomenclature_inst), '1.3.3');
41
+$page = new DefaultHtmlPage(DefaultHtmlPage::ADMIN_IDP_USERS, sprintf(_('Managing %s users'), $uiElements->nomenclature_inst), '1.3.3');
42 42
 // Load global scripts
43 43
 $page->appendScript('js/option_expand.js');
44 44
 $page->appendScript('../external/jquery/jquery.js');
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 $builder = new InstitutionPageBuilder($page);
56 56
 $builder->buildPagePrelude();
57 57
 $builder->buildPageHeader();
58
-if($builder->isReady()){
58
+if ($builder->isReady()) {
59 59
     // this page may have been called for the first time, when the profile does not
60 60
     // actually exist in the DB yet. If so, we will need to create it first.
61 61
     if (!isset($_REQUEST['profile_id'])) {
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
         $fed = new \core\Federation($inst->federation);
70 70
         $allowSb = $fed->getAttributes("fed:silverbullet");
71 71
         if (count($allowSb) == 0) {
72
-            throw new Exception("We were told to create a new SB profile, but this ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." does not allow SB at all!");
72
+            throw new Exception("We were told to create a new SB profile, but this " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " does not allow SB at all!");
73 73
         }
74 74
         // okay, new SB profiles are allowed. Create one.
75 75
         $newProfile = $inst->newProfile("SILVERBULLET");
76 76
         // and modify the REQUEST_URI to add the new profile ID
77
-        $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI']."&profile_id=".$newProfile->identifier;
77
+        $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] . "&profile_id=" . $newProfile->identifier;
78 78
         $_GET['profile_id'] = $newProfile->identifier;
79 79
     }
80 80
     
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     $action = $context->addQuery($_SERVER['SCRIPT_NAME']);
88 88
     
89 89
     //Info block data preparation
90
-    $infoBlock = new InfoBlockTable( sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
90
+    $infoBlock = new InfoBlockTable(sprintf(_('Current %s users'), $uiElements->nomenclature_inst));
91 91
     $infoBlock->addRow(array('The assigned realm', $builder->getRealmName()));
92 92
     $infoBlock->addRow(array('The total number of active users which are allowed for this profile', $stats[SilverbulletContext::STATS_TOTAL]));
93 93
     $infoBlock->addRow(array('The current number of configured active users', $stats[SilverbulletContext::STATS_ACTIVE]));
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
     $builder->addContentElement($infoBlock);
96 96
 
97 97
     //Edit form data preparation
98
-    $acknowledgeText = _ ( 'You need to acknowledge that the created accounts are still valid within the next %s days.'
98
+    $acknowledgeText = _('You need to acknowledge that the created accounts are still valid within the next %s days.'
99 99
                 .' If all accounts shown as active above are indeed still valid, please check the box below and push "Save".'
100
-                .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.' );
100
+                .' If any of the accounts are stale, please deactivate them by pushing the corresponding button before doing this.');
101 101
     $editBlock = new UserCredentialsForm($context, $action, sprintf(_('Manage %s users'), $uiElements->nomenclature_inst), $acknowledgeText, count($users) > 0);
102 102
     foreach ($users as $user) {
103 103
         $editBlock->addUserRow($user);
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     $builder->addContentElement($tabbedBox);
125 125
     
126 126
     //Appending terms of use popup
127
-    if(!$context->isAgreementSigned()){
127
+    if (!$context->isAgreementSigned()) {
128 128
         $termsOfUse = new TermsOfUseBox($action, TermsOfUseCommand::COMMAND, TermsOfUseCommand::AGREEMENT);
129 129
         $termsOfUsePopup = new PopupMessageContainer($termsOfUse, PageElementInterface::MESSAGEPOPUP_CLASS, \core\ProfileSilverbullet::PRODUCTNAME . " - " . _('Terms of Use'));
130 130
         $termsOfUsePopup->setCloseButtonClass('redirect');
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
     
142 142
     //Adding hidden QR code popup template
143 143
     $qrCodeImage = new UnaryTag("img");
144
-    $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS."-image");
144
+    $qrCodeImage->addAttribute("id", PageElementInterface::INVITATION_QR_CODE_CLASS . "-image");
145 145
     $qrCodeImage->addAttribute("alt", _('Invitation QR Code'));
146 146
     $qrCodeImage->addAttribute("width", 400);
147 147
     $qrCodeImage->addAttribute("height", 400);
Please login to merge, or discard this patch.
web/admin/edit_idp_result.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 
91 91
 if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
92 92
     foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) {
93
-        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") );
93
+        $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)"));
94 94
     }
95 95
 }
96 96
 
Please login to merge, or discard this patch.
web/admin/inc/manageDBLink.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 // if we have a pushed close button, submit attributes and send user back to the overview page
27 27
 // if external DB sync is disabled globally, the user never gets to this page. If he came here *anyway* -> send him back immediately.
28
-if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_CLOSE ) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
28
+if ((isset($_POST['submitbutton']) && $_POST['submitbutton'] == web\lib\admin\FormElements::BUTTON_CLOSE) || CONFIG['DB']['enforce-external-sync'] == FALSE) {
29 29
     header("Location: ../overview_federation.php");
30 30
     exit;
31 31
 }
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
         // right-hand side: external DB
108 108
         $externalid = $my_inst->getExternalDBId();
109 109
         if (!$externalid) { // we are in SYNCED state so this cannot happen
110
-            throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']."!");
110
+            throw new Exception("We are in SYNCSTATE_SYNCED but still there is no external DB Id available for the " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . "!");
111 111
         }
112 112
 
113 113
         $extinfo = $cat->getExternalDBEntityDetails($externalid);
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         }
169 169
         // issue a big red warning if there are no link candidates at all in the federation
170 170
         if (empty($buffer) && empty($candidates)) {
171
-            echo "<tr><td style='color:#ff0000' colspan='2'>". sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed)."</td></tr>";
171
+            echo "<tr><td style='color:#ff0000' colspan='2'>" . sprintf(_('There is no single unmapped %s in the external database for this %s!'), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed) . "</td></tr>";
172 172
         }
173 173
         echo "</table><button type='submit' name='submitbutton' id='submit' value='" . web\lib\admin\FormElements::BUTTON_SAVE . "' disabled >" . _("Create Link") . "</button></form>";
174 174
     }
Please login to merge, or discard this patch.
web/user/tou.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 /* 
12 12
 */
13 13
 
14
-        $Tou =  [
14
+        $Tou = [
15 15
     'title' => _("Terms of Use"),
16 16
     'short' => "<p>The purpose of this service is to make eduroam configuration easier for end users and eduroam
17 17
 Identity Providers by making available customised and securely configured eduroam installers.</p>
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     they are from the same user group. You are not allowed to share them to an unlimited
50 50
     audience (e.g. on a publicly accessible web server).</li>
51 51
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
52
-your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']." end users, e.g. on the support web pages of your ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", on Welcome Package CDs or USB sticks, etc.</li>
52
+your own ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . " end users, e.g. on the support web pages of your " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", on Welcome Package CDs or USB sticks, etc.</li>
53 53
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
54 54
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
55 55
 </ul>
Please login to merge, or discard this patch.
web/user/tou.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     they are from the same user group. You are not allowed to share them to an unlimited
53 53
     audience (e.g. on a publicly accessible web server).</li>
54 54
 <li>If You are an eduroam Identity Provider administrator, you are allowed to download and pass on the Installers to
55
-your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'];?>, on Welcome Package CDs or USB sticks, etc.</li>
55
+your own <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?> end users, e.g. on the support web pages of your <?php echo CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution']; ?>, on Welcome Package CDs or USB sticks, etc.</li>
56 56
 <li>If You are a third-party not affiliated with eduroam, you are only allowed to download and pass on
57 57
 the Metadata and/or the Installers after having received written permission by the eduroam Operations team.</li>
58 58
 </ul>
Please login to merge, or discard this patch.