Test Setup Failed
Push — master ( 02cf43...0e19c1 )
by Tomasz
06:11
created
web/admin/edit_hotspot.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  */
27 27
 ?>
28 28
 <?php
29
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
29
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30 30
 
31 31
 $deco = new \web\lib\admin\PageDecoration();
32 32
 $validator = new \web\lib\common\InputValidation();
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 if (!isset($_GET['deployment_id'])) {
39 39
     if (isset($_POST['consortium']) && count($myfed->getAttributes("fed:openroaming")) > 0) {
40 40
         $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']);
41
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier);
41
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier);
42 42
         exit(0);
43 43
     } else {
44 44
         throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!");
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         if (in_array('OK', $response)) {
54 54
             $deployment->deactivate();
55 55
         }
56
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
56
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
57 57
         exit(0);
58 58
     }
59 59
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         if (in_array('OK', $response)) {
63 63
             $deployment->activate();
64 64
         }
65
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
65
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
66 66
         exit(0);
67 67
     }
68 68
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             $deployment->status = core\DeploymentManaged::INACTIVE;
84 84
             $response = $deployment->setRADIUSconfig();
85 85
         }
86
-        header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response)));
86
+        header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response)));
87 87
         exit(0);
88 88
     }
89 89
 }
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     echo $uiElements->instLevelInfoBoxes($my_inst);
112 112
     $deploymentOptions = $deployment->getAttributes();
113 113
     echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&amp;deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'>
114
-                <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
114
+                <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>";
115 115
     $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE);
116 116
     ?>
117 117
     <fieldset class='option_container' id='managedsp_override'>
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
                 <!-- input for VLAN identifier for home users-->
144 144
                 <td>
145 145
                     <span id='vlan_label'>
146
-<?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?>
146
+<?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?>
147 147
                     </span>
148 148
                 </td>
149 149
                 <td>
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
     </fieldset>
164 164
 
165 165
     <?php
166
-    echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>";
166
+    echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>";
167 167
     echo $deco->footer();
168 168
 
169 169
     
170 170
\ No newline at end of file
Please login to merge, or discard this patch.
core/DeploymentManaged.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
                 $serverCandidates[IdPlist::geoDistance($adminLocation, ['lat' => $iterator->location_lat, 'lon' => $iterator->location_lon])] = $iterator->server_id;
271 271
             }
272 272
             if ($clients > $maxSupportedClients * 0.9) {
273
-                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (" . $iterator->server_id . ") is serving at more than 90% capacity!");
273
+                $this->loggerInstance->debug(1, "A RADIUS server for Managed SP (".$iterator->server_id.") is serving at more than 90% capacity!");
274 274
             }
275 275
         }
276 276
         if (count($serverCandidates) == 0 && $federation != "DEFAULT") {
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
             return $this->findGoodServerLocation($adminLocation, "DEFAULT", $blacklistedServers);
280 280
         }
281 281
         if (count($serverCandidates) == 0) {
282
-            throw new Exception("No available server found for new SP! $federation " . /** @scrutinizer ignore-type */ print_r($serverCandidates, true));
282
+            throw new Exception("No available server found for new SP! $federation "./** @scrutinizer ignore-type */ print_r($serverCandidates, true));
283 283
         }
284 284
         // put the nearest server on top of the list
285 285
         ksort($serverCandidates);
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
         $foundFreePort1 = 0;
308 308
         while ($foundFreePort1 == 0) {
309 309
             $portCandidate = random_int(1200, 65535);
310
-            $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '" . $ourserver . "' AND port_instance_1 = $portCandidate");
310
+            $check = $this->databaseHandle->exec("SELECT port_instance_1 FROM deployment WHERE radius_instance_1 = '".$ourserver."' AND port_instance_1 = $portCandidate");
311 311
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) {
312 312
                 $foundFreePort1 = $portCandidate;
313 313
             }
@@ -316,14 +316,14 @@  discard block
 block discarded – undo
316 316
         $foundFreePort2 = 0;
317 317
         while ($foundFreePort2 == 0) {
318 318
             $portCandidate = random_int(1200, 65535);
319
-            $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '" . $ourSecondServer . "' AND port_instance_2 = $portCandidate");
319
+            $check = $this->databaseHandle->exec("SELECT port_instance_2 FROM deployment WHERE radius_instance_2 = '".$ourSecondServer."' AND port_instance_2 = $portCandidate");
320 320
             if (mysqli_num_rows(/** @scrutinizer ignore-type */ $check) == 0) {
321 321
                 $foundFreePort2 = $portCandidate;
322 322
             }
323 323
         }
324 324
         // and make up a shared secret that is halfways readable
325 325
         $futureSecret = $this->randomString(16, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
326
-        $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '" . $ourserver . "', radius_instance_2 = '" . $ourSecondServer . "', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret', consortium = '$this->consortium' WHERE deployment_id = $this->identifier");
326
+        $this->databaseHandle->exec("UPDATE deployment SET radius_instance_1 = '".$ourserver."', radius_instance_2 = '".$ourSecondServer."', port_instance_1 = $foundFreePort1, port_instance_2 = $foundFreePort2, secret = '$futureSecret', consortium = '$this->consortium' WHERE deployment_id = $this->identifier");
327 327
         return ["port_instance_1" => $foundFreePort1, "port_instance_2" => $foundFreePort2, "secret" => $futureSecret, "radius_instance_1" => $ourserver, "radius_instance_2" => $ourserver];
328 328
     }
329 329
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
      */
371 371
     public function deactivate()
372 372
     {
373
-        $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::INACTIVE . " WHERE deployment_id = $this->identifier");
373
+        $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::INACTIVE." WHERE deployment_id = $this->identifier");
374 374
     }
375 375
 
376 376
     /**
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
      */
382 382
     public function activate()
383 383
     {
384
-        $this->databaseHandle->exec("UPDATE deployment SET status = " . DeploymentManaged::ACTIVE . " WHERE deployment_id = $this->identifier");
384
+        $this->databaseHandle->exec("UPDATE deployment SET status = ".DeploymentManaged::ACTIVE." WHERE deployment_id = $this->identifier");
385 385
     }
386 386
 
387 387
     /**
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
     {
394 394
         $customAttrib = $this->getAttributes("managedsp:operatorname");
395 395
         if (count($customAttrib) == 0) {
396
-            return "1sp." . $this->identifier . "-" . $this->institution . \config\ConfAssistant::SILVERBULLET['realm_suffix'];
396
+            return "1sp.".$this->identifier."-".$this->institution.\config\ConfAssistant::SILVERBULLET['realm_suffix'];
397 397
         }
398 398
         return $customAttrib[0]["value"];
399 399
     }
@@ -409,13 +409,13 @@  discard block
 block discarded – undo
409 409
     {
410 410
 
411 411
         $hostname = "radius_hostname_$idx";
412
-        $ch = curl_init("http://" . $this->$hostname);
412
+        $ch = curl_init("http://".$this->$hostname);
413 413
         if ($ch === FALSE) {
414 414
             $res = 'FAILURE';
415 415
         } else {
416 416
             curl_setopt($ch, CURLOPT_POST, 1);
417 417
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
418
-            $this->loggerInstance->debug(1, "Posting to http://" . $this->$hostname . ": $post\n");
418
+            $this->loggerInstance->debug(1, "Posting to http://".$this->$hostname.": $post\n");
419 419
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
420 420
             curl_setopt($ch, CURLOPT_HEADER, 0);
421 421
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
             $this->loggerInstance->debug(1, $this);
432 432
         }
433 433
         $this->loggerInstance->debug(1, "Database update");
434
-        $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = " . ($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE) . " WHERE deployment_id = $this->identifier");
434
+        $this->databaseHandle->exec("UPDATE deployment SET radius_status_$idx = ".($res == 'OK' ? \core\AbstractDeployment::RADIUS_OK : \core\AbstractDeployment::RADIUS_FAILURE)." WHERE deployment_id = $this->identifier");
435 435
         return $res;
436 436
     }
437 437
 
@@ -452,19 +452,19 @@  discard block
 block discarded – undo
452 452
         } else {
453 453
             $txt = $remove ? _('Profile dectivation failed') : _('Profile activation/modification failed');
454 454
         }
455
-        $txt = $txt . ' ';
455
+        $txt = $txt.' ';
456 456
         if (array_count_values($response)[$status] == 2) {
457
-            $txt = $txt . _('on both RADIUS servers: primary and backup') . '.';
457
+            $txt = $txt._('on both RADIUS servers: primary and backup').'.';
458 458
         } else {
459 459
             if ($response['res[1]'] == $status) {
460
-                $txt = $txt . _('on primary RADIUS server') . '.';
460
+                $txt = $txt._('on primary RADIUS server').'.';
461 461
             } else {
462
-                $txt = $txt . _('on backup RADIUS server') . '.';
462
+                $txt = $txt._('on backup RADIUS server').'.';
463 463
             }
464 464
         }
465 465
         $mail = \core\common\OutsideComm::mailHandle();
466 466
         $email = $this->getAttributes("support:email")[0]['value'];
467
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
467
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
468 468
         $mail->addAddress($email);
469 469
         if ($status == 'OK') {
470 470
             $mail->Subject = _('RADIUS profile update problem fixed');
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
             return NULL;
499 499
         }
500 500
         $timeout = 10;
501
-        curl_setopt($ch, CURLOPT_URL, 'http://' . $host);
501
+        curl_setopt($ch, CURLOPT_URL, 'http://'.$host);
502 502
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
503 503
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
504 504
         curl_exec($ch);
@@ -590,35 +590,35 @@  discard block
 block discarded – undo
590 590
     {
591 591
         $remove = ($this->status == \core\AbstractDeployment::INACTIVE) ? 0 : 1;
592 592
         $toPost = ($onlyone ? array($onlyone => '') : array(1 => '', 2 => ''));
593
-        $toPostTemplate = 'instid=' . $this->institution . '&deploymentid=' . $this->identifier . '&secret=' . $this->secret . '&country=' . $this->getAttributes("internal:country")[0]['value'] . '&';
593
+        $toPostTemplate = 'instid='.$this->institution.'&deploymentid='.$this->identifier.'&secret='.$this->secret.'&country='.$this->getAttributes("internal:country")[0]['value'].'&';
594 594
         if ($remove) {
595
-            $toPostTemplate = $toPostTemplate . 'remove=1&';
595
+            $toPostTemplate = $toPostTemplate.'remove=1&';
596 596
         } else {
597 597
             if ($this->getAttributes("managedsp:operatorname")[0]['value'] ?? NULL) {
598
-                $toPostTemplate = $toPostTemplate . 'operatorname=' . $this->getAttributes("managedsp:operatorname")[0]['value'] . '&';
598
+                $toPostTemplate = $toPostTemplate.'operatorname='.$this->getAttributes("managedsp:operatorname")[0]['value'].'&';
599 599
             }
600 600
             if ($this->getAttributes("managedsp:vlan")[0]['value'] ?? NULL) {
601 601
                 $allRealms = $this->getAllRealms();
602 602
                 if (!empty($allRealms)) {
603
-                    $toPostTemplate = $toPostTemplate . 'vlan=' . $this->getAttributes("managedsp:vlan")[0]['value'] . '&';
604
-                    $toPostTemplate = $toPostTemplate . 'realmforvlan[]=' . implode('&realmforvlan[]=', $allRealms) . '&';
603
+                    $toPostTemplate = $toPostTemplate.'vlan='.$this->getAttributes("managedsp:vlan")[0]['value'].'&';
604
+                    $toPostTemplate = $toPostTemplate.'realmforvlan[]='.implode('&realmforvlan[]=', $allRealms).'&';
605 605
                 }
606 606
             }
607 607
         }
608 608
         foreach (array_keys($toPost) as $key) {
609
-            $elem = 'port' . $key;
610
-            $toPost[$key] = $toPostTemplate . 'port=' . $this->$elem;
609
+            $elem = 'port'.$key;
610
+            $toPost[$key] = $toPostTemplate.'port='.$this->$elem;
611 611
         }
612 612
         $response = array();
613 613
         foreach ($toPost as $key => $value) {
614
-            $this->loggerInstance->debug(1, 'toPost ' . $toPost[$key] . "\n");
615
-            $response['res[' . $key . ']'] = $this->sendToRADIUS($key, $toPost[$key]);
614
+            $this->loggerInstance->debug(1, 'toPost '.$toPost[$key]."\n");
615
+            $response['res['.$key.']'] = $this->sendToRADIUS($key, $toPost[$key]);
616 616
         }
617 617
         if ($onlyone) {
618
-            $response['res[' . ($onlyone == 1) ? 2 : 1 . ']'] = \core\AbstractDeployment::RADIUS_OK;
618
+            $response['res['.($onlyone == 1) ? 2 : 1.']'] = \core\AbstractDeployment::RADIUS_OK;
619 619
         }
620 620
         foreach (array('OK', 'FAILURE') as $status) {
621
-            if ( ( ($status == 'OK' && $notify) || ($status == 'FAILURE') ) && ( in_array($status, $response) ) ) {
621
+            if ((($status == 'OK' && $notify) || ($status == 'FAILURE')) && (in_array($status, $response))) {
622 622
                 $this->sendMailtoAdmin($remove, $response, $status);
623 623
             }
624 624
         }
Please login to merge, or discard this patch.
web/lib/admin/OptionParser.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                 $optionClass = \core\Options::instance();
102 102
                 $optionProps = $optionClass->optionType($optiontype);
103 103
                 $allowedValues = explode(',', substr($optionProps["flags"], 7));
104
-                if (in_array($incomingBinary,$allowedValues))  {
104
+                if (in_array($incomingBinary, $allowedValues)) {
105 105
                     return TRUE;
106 106
                 }
107 107
                 return FALSE;
@@ -346,14 +346,14 @@  discard block
 block discarded – undo
346 346
                 case \core\Options::TYPECODE_TEXT:
347 347
                 case \core\Options::TYPECODE_COORDINATES:
348 348
                 case \core\Options::TYPECODE_INTEGER:
349
-                    $varName = $listOfEntries["$objId-" . self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
349
+                    $varName = $listOfEntries["$objId-".self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['field']];
350 350
                     if (!empty($varName)) {
351 351
                         $content = call_user_func_array([$this->validator, self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['function']], array_merge([$varName], self::VALIDATOR_FUNCTIONS[$optioninfo['type']]['extraarg']));
352 352
                         break;
353 353
                     }
354 354
                     continue 2;
355 355
                 case \core\Options::TYPECODE_BOOLEAN:
356
-                    $varName = $listOfEntries["$objId-" . \core\Options::TYPECODE_BOOLEAN];
356
+                    $varName = $listOfEntries["$objId-".\core\Options::TYPECODE_BOOLEAN];
357 357
                     if (!empty($varName)) {
358 358
                         $contentValid = $this->validator->boolean($varName);
359 359
                         if ($contentValid) {
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
                     }
367 367
                     continue 2;
368 368
                 case \core\Options::TYPECODE_STRING:
369
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
369
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
370 370
                     if (!empty($previsionalContent)) {
371 371
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
372 372
                         if ($content === FALSE) {
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
                     continue 2;
378 378
                     
379 379
                 case \core\Options::TYPECODE_ENUM_OPENROAMING:
380
-                    $previsionalContent = $listOfEntries["$objId-" . \core\Options::TYPECODE_ENUM_OPENROAMING];
380
+                    $previsionalContent = $listOfEntries["$objId-".\core\Options::TYPECODE_ENUM_OPENROAMING];
381 381
                     if (!empty($previsionalContent)) {
382 382
                         $content = $this->furtherStringChecks($objValue, $previsionalContent, $bad);
383 383
                         if ($content === FALSE) {
@@ -388,15 +388,15 @@  discard block
 block discarded – undo
388 388
                     continue 2;    
389 389
                 case \core\Options::TYPECODE_FILE:
390 390
                     // this is either actually an uploaded file, or a reference to a DB entry of a previously uploaded file
391
-                    $reference = $listOfEntries["$objId-" . \core\Options::TYPECODE_STRING];
391
+                    $reference = $listOfEntries["$objId-".\core\Options::TYPECODE_STRING];
392 392
                     if (!empty($reference)) { // was already in, by ROWID reference, extract
393 393
                         // ROWID means it's a multi-line string (simple strings are inline in the form; so allow whitespace)
394 394
                         $content = $this->validator->string(urldecode($reference), TRUE);
395 395
                         break;
396 396
                     }
397
-                    $fileName = $listOfEntries["$objId-" . \core\Options::TYPECODE_FILE] ?? "";
397
+                    $fileName = $listOfEntries["$objId-".\core\Options::TYPECODE_FILE] ?? "";
398 398
                     if ($fileName != "") { // let's do the download
399
-                        $rawContent = \core\common\OutsideComm::downloadFile("file:///" . $fileName);
399
+                        $rawContent = \core\common\OutsideComm::downloadFile("file:///".$fileName);
400 400
 
401 401
                         if ($rawContent === FALSE || !$this->checkUploadSanity($objValue, $rawContent)) {
402 402
                             $bad[] = $objValue;
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
                     }
408 408
                     continue 2;
409 409
                 default:
410
-                    throw new Exception("Internal Error: Unknown option type " . $objValue . "!");
410
+                    throw new Exception("Internal Error: Unknown option type ".$objValue."!");
411 411
             }
412 412
             // lang can be NULL here, if it's not a multilang attribute, or a ROWID reference. Never mind that.
413 413
             $retval[] = ["$objValue" => ["lang" => $languageFlag, "content" => $content]];
Please login to merge, or discard this patch.
web/skins/modern/Divs.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     public function divSilverbullet() {
125 125
         $retval = "
126 126
 <div id='silverbullet'>"
127
-               .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
127
+               .$this->Gui->textTemplates->templates[user\SB_GO_AWAY].
128 128
                 "</div>
129 129
     ";
130 130
         return $retval;
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 <div id='profiles'> <!-- this is the profile selection filled during run time -->
223 223
     <div id='profiles_h' class='sub_h'>".$this->Gui->textTemplates->templates[user\PROFILE_SELECTION]."
224 224
     </div>" .
225
-                "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>" .
225
+                "<select id='profile_list'></select><div id='profile_desc' class='profile_desc'></div>".
226 226
                 "</div>";
227 227
     }
228 228
 
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
     public function divInstitution($selectButton = TRUE) {
251 251
         $retval = "<div id='institution_name'>
252 252
     <span id='inst_name_span'></span> <div id='inst_extra_text'></div><!-- this will be filled with the IdP name -->" .
253
-                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "") .
253
+                ($selectButton ? "<a  id='select_another' class='signin' href=\"\">".$this->Gui->textTemplates->templates[user\INSTITUTION_SELECTION]."</a>" : "").
254 254
                 "</div>";
255 255
         $retval .= $this->emptyImage('idp_logo', 'IdP Logo');
256 256
         return $retval;
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
     public function divSilverbullet() {
125 125
         $retval = "
126 126
 <div id='silverbullet'>"
127
-               .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
127
+                .$this->Gui->textTemplates->templates[user\SB_GO_AWAY] .
128 128
                 "</div>
129 129
     ";
130 130
         return $retval;
@@ -293,8 +293,8 @@  discard block
 block discarded – undo
293 293
                 }
294 294
 
295 295
                 $retval .= "<td><button name='$d' class='other_os' id='$d'>".$D['display']."</button>"
296
-                       ."</td>"
297
-                       ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n";
296
+                        ."</td>"
297
+                        ."<td><button name='$d' class='more_info_b' id='info_b_$d'>i</button></td></tr>\n";
298 298
                 $deviceIndex++;
299 299
             }
300 300
             $retval .= "</tbody>";
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
         <tr>
342 342
             <td>" .
343 343
                 $this->Gui->catCopyright
344
-               ."
344
+                ."
345 345
             </td>";
346 346
 
347 347
         if (!empty(\config\Master::APPEARANCE['privacy_notice_url'])) {
Please login to merge, or discard this patch.
web/lib/admin/OptionDisplay.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
      */
113 113
     public function prefilledOptionTable(string $attributePrefix, $fed)
114 114
     {
115
-        $retval = "<table id='expandable_$attributePrefix" . "_options'>";
115
+        $retval = "<table id='expandable_$attributePrefix"."_options'>";
116 116
 
117 117
         $prepopulate = [];
118 118
         foreach ($this->listOfOptions as $existingAttribute) {
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
                 $prepopulate[] = $existingAttribute;
121 121
             }
122 122
         }
123
-        if (is_array($prepopulate) && ( count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific" )) { // editing... fill with values
123
+        if (is_array($prepopulate) && (count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific")) { // editing... fill with values
124 124
             $retval .= $this->addOptionEdit($attributePrefix, $prepopulate);
125 125
         } else {
126 126
             $retval .= $this->addOptionNew($attributePrefix, $fed);
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
                 $optiontypearray = $optioninfo->optionType($option['name']);
154 154
                 $loggerInstance = new \core\common\Logging();
155 155
                 $loggerInstance->debug(5, "About to execute optiontext with PREFILL!\n");
156
-                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row'] : $option['value']), $option['lang']);
156
+                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-'.$option['level'].'-'.$option['row'] : $option['value']), $option['lang']);
157 157
             }
158 158
         }
159 159
         return $retval;
@@ -252,18 +252,18 @@  discard block
 block discarded – undo
252 252
         }
253 253
         $descriptions["media:force_proxy"] = sprintf(_("The format of this option is: IPv4|IPv6|hostname:port . Forcing your users through a content filter of your own is a significant invasion of user self-determination. It also has technical issues. Please throughly read the discussion at %s before specifying a proxy with this option. This feature is currently experimental and only has an effect in Apple installers."), "https://github.com/GEANT/CAT/issues/96");
254 254
         $descriptions["managedsp:realmforvlan"] = sprintf(_("If you are also using %s, then your own realm is automatically tagged with the VLAN you choose, there is no need to add it here manually."), \core\ProfileSilverbullet::PRODUCTNAME);
255
-        $descriptions["media:openroaming"] = sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy") .
256
-                " " .
257
-                sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']) .
258
-                " " .
259
-                _("You are also aware that for best technical interoperability, you need to add a DNS entry into the DNS zone of your RADIUS realm.") .
260
-                " " .
255
+        $descriptions["media:openroaming"] = sprintf(_("By opting in to OpenRoaming, you agree to be bound by the %s."), "eduroam Ecosystem Broker OpenRoaming Identity Provider Policy").
256
+                " ".
257
+                sprintf(_("Note that your requirement to inform users about the OpenRoaming End User Terms and Conditions is fulfilled when directing your end users to the %s download portal for installer download. Any other means of providing the installers needs to present this information via its own channel."), \config\Master::APPEARANCE['productname']).
258
+                " ".
259
+                _("You are also aware that for best technical interoperability, you need to add a DNS entry into the DNS zone of your RADIUS realm.").
260
+                " ".
261 261
                 _("Read the instructions in the wiki.");
262 262
         \core\common\Entity::outOfThePotatoes();
263 263
         if (!isset($descriptions[$input])) {
264 264
             return "";
265 265
         }
266
-        return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:" . ($isVisible ? "block" : "none") . "' onclick='alert(\"" . $descriptions[$input] . "\")'><img src='../resources/images/icons/question-mark-icon.png" . "'></span>";
266
+        return "<span class='tooltip' id='S$rowid-tooltip-$input' style='display:".($isVisible ? "block" : "none")."' onclick='alert(\"".$descriptions[$input]."\")'><img src='../resources/images/icons/question-mark-icon.png"."'></span>";
267 267
     }
268 268
 
269 269
     /**
@@ -277,19 +277,19 @@  discard block
 block discarded – undo
277 277
     private function selectElement($rowid, $list)
278 278
     {
279 279
         $jsmagic = "onchange='
280
-                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
280
+                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid."-select\").value)) {
281 281
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"block\";
282 282
                                    } else {
283 283
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"none\";
284 284
                                    }";
285 285
         foreach (array_keys($this->htmlDatatypeTexts) as $key) {
286
-            $jsmagic .= "if (/#" . $key . "#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
287
-                                  document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($key == \core\Options::TYPECODE_FILE ? "block" : "none") . "\";
288
-                                  document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($key == \core\Options::TYPECODE_TEXT ? "block" : "none") . "\";
289
-                                  document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($key == \core\Options::TYPECODE_STRING ? "block" : "none") . "\";
290
-                                  document.getElementById(\"S$rowid-input-enum_openroaming\").style.display = \"" . ($key == \core\Options::TYPECODE_ENUM_OPENROAMING ? "block" : "none") . "\";
291
-                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none") . "\";
292
-                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($key == \core\Options::TYPECODE_INTEGER ? "block" : "none") . "\";
286
+            $jsmagic .= "if (/#".$key."#/.test(document.getElementById(\"option-S".$rowid."-select\").value)) {
287
+                                  document.getElementById(\"S$rowid-input-file\").style.display = \"".($key == \core\Options::TYPECODE_FILE ? "block" : "none")."\";
288
+                                  document.getElementById(\"S$rowid-input-text\").style.display = \"".($key == \core\Options::TYPECODE_TEXT ? "block" : "none")."\";
289
+                                  document.getElementById(\"S$rowid-input-string\").style.display = \"".($key == \core\Options::TYPECODE_STRING ? "block" : "none")."\";
290
+                                  document.getElementById(\"S$rowid-input-enum_openroaming\").style.display = \"".($key == \core\Options::TYPECODE_ENUM_OPENROAMING ? "block" : "none")."\";
291
+                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none")."\";
292
+                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"".($key == \core\Options::TYPECODE_INTEGER ? "block" : "none")."\";
293 293
                              }
294 294
                              ";
295 295
             // hide all tooltips (each is a <span>, and there are no other <span>s)
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
                 $value = array_shift($list);
321 321
                 $listtype = $optioninfo->optionType($value);
322 322
                 $retval .= $uiElements->displayName($value);
323
-                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#'/>";
323
+                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#".$listtype["type"]."#".$listtype["flag"]."#'/>";
324 324
                 $activelisttype = $listtype;
325 325
                 $tooltips = $this->tooltip($rowid, $value, TRUE);
326 326
                 break;
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
                 $retval .= "<select id='option-S$rowid-select' name='option[S$rowid]' $jsmagic>";
329 329
                 foreach ($list as $value) {
330 330
                     $listtype = $optioninfo->optionType($value);
331
-                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
331
+                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#".$listtype["type"]."#".$listtype["flag"]."#' ";
332 332
                     if ($iterator == $this->optionIterator) {
333 333
                         $retval .= "selected='selected'";
334 334
                         $activelisttype = $listtype;
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
                     } else {
337 337
                         $tooltips .= $this->tooltip($rowid, $value, FALSE);
338 338
                     }
339
-                    $retval .= ">" . $uiElements->displayName($value) . "</option>";
339
+                    $retval .= ">".$uiElements->displayName($value)."</option>";
340 340
                     $iterator++;
341 341
                 }
342 342
 
@@ -362,9 +362,9 @@  discard block
 block discarded – undo
362 362
     private function selectLanguage($rowid, $makeVisible)
363 363
     {
364 364
         \core\common\Entity::intoThePotatoes();
365
-        $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
366
-            <option value='' name='select_language' selected>" . _("select language") . "</option>
367
-            <option value='C' name='all_languages'>" . _("default/other languages") . "</option>";
365
+        $retval = "<select style='display:".($makeVisible ? "block" : "none")."' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect'>
366
+            <option value='' name='select_language' selected>" . _("select language")."</option>
367
+            <option value='C' name='all_languages'>" . _("default/other languages")."</option>";
368 368
         foreach (\config\Master::LANGUAGES as $langindex => $possibleLang) {
369 369
             $thislang = $possibleLang['display'];
370 370
             $retval .= "<option value='$langindex' name='$langindex'>$thislang</option>";
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
     {
386 386
         $retval = "";
387 387
         foreach ($this->htmlDatatypeTexts as $key => $type) {
388
-            $retval .= "<" . $type['html'] . " style='display:" . ($activetype['type'] == $key ? "block" : "none") . "' name='value[S$rowid-$key]' id='S" . $rowid . "-input-" . $key . "'" . $type['tail'] . ">";
388
+            $retval .= "<".$type['html']." style='display:".($activetype['type'] == $key ? "block" : "none")."' name='value[S$rowid-$key]' id='S".$rowid."-input-".$key."'".$type['tail'].">";
389 389
         }
390 390
         return $retval;
391 391
     }
@@ -401,11 +401,11 @@  discard block
 block discarded – undo
401 401
     {
402 402
         // first column: the <select> element with the names of options and their field-toggling JS magic
403 403
         $selectorInfo = $this->selectElement($rowid, $list);
404
-        $retval = "<td>" . $selectorInfo["TEXT"] . "</td>";
404
+        $retval = "<td>".$selectorInfo["TEXT"]."</td>";
405 405
         // second column: the <select> element for language selection - only visible if the active option is multi-lang
406
-        $retval .= "<td>" . $this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML") . "</td>";
406
+        $retval .= "<td>".$this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML")."</td>";
407 407
         // third column: the actual input fields; the data type of the active option is visible, all others hidden
408
-        $retval .= "<td>" . $this->inputFields($rowid, $selectorInfo['ACTIVE']) . "</td>";
408
+        $retval .= "<td>".$this->inputFields($rowid, $selectorInfo['ACTIVE'])."</td>";
409 409
         return $retval;
410 410
     }
411 411
 
@@ -429,20 +429,20 @@  discard block
 block discarded – undo
429 429
         $retval .= "<td>";
430 430
         $uiElements = new UIElements();
431 431
         $listtype = $optioninfo->optionType($optionName);
432
-        $retval .= "<span style='display:flex;'>" . $uiElements->displayName($optionName);
433
-        $retval .= $this->tooltip($rowid, $optionName, TRUE) . "</span>";
434
-        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ></td>";
432
+        $retval .= "<span style='display:flex;'>".$uiElements->displayName($optionName);
433
+        $retval .= $this->tooltip($rowid, $optionName, TRUE)."</span>";
434
+        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#".$listtype["type"]."#".$listtype["flag"]."#' ></td>";
435 435
 
436 436
         // language tag if any
437 437
         $retval .= "<td>";
438 438
         if ($listtype["flag"] == "ML") {
439 439
 
440
-            $language = "(" . strtoupper($optionLang) . ")";
440
+            $language = "(".strtoupper($optionLang).")";
441 441
             if ($optionLang == 'C') {
442 442
                 $language = _("(default/other languages)");
443 443
             }
444 444
             $retval .= $language;
445
-            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $optionLang . "' style='display:block'>";
445
+            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect' value='".$optionLang."' style='display:block'>";
446 446
         }
447 447
         $retval .= "</td>";
448 448
 // attribute content
@@ -452,12 +452,12 @@  discard block
 block discarded – undo
452 452
             case \core\Options::TYPECODE_COORDINATES:
453 453
                 $this->allLocationCount = $this->allLocationCount + 1;
454 454
                 // display of the locations varies by map provider
455
-                $classname = "\web\lib\admin\Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'];
455
+                $classname = "\web\lib\admin\Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'];
456 456
                 $link = $classname::optionListDisplayCode($optionValue, $this->allLocationCount);
457
-                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link";
457
+                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-".\core\Options::TYPECODE_TEXT."]' id='S$rowid-input-text' value='$optionValue'>$link";
458 458
                 break;
459 459
             case \core\Options::TYPECODE_FILE:
460
-                $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>";
460
+                $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S".$rowid."-input-string' style='display:none' value='".urlencode($optionValue)."'>";
461 461
                 $uiElements = new UIElements();
462 462
                 switch ($optionName) {
463 463
                     case "eap:ca_file":
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
                 break;
480 480
             case \core\Options::TYPECODE_ENUM_OPENROAMING: // is a string after all
481 481
                 $displayedVariant = $this->enumPrettyPrints[$optionValue];
482
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
482
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
483 483
                 break;
484 484
             case \core\Options::TYPECODE_STRING:
485 485
             // fall-thorugh is intentional; mostly identical HTML code for the three types
@@ -487,11 +487,11 @@  discard block
 block discarded – undo
487 487
             // fall-thorugh is intentional; mostly identical HTML code for the three types
488 488
             case \core\Options::TYPECODE_TEXT:
489 489
                 $displayedVariant = $optionValue; // for all three types, value tag and actual display are identical
490
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
490
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
491 491
                 break;
492 492
             case \core\Options::TYPECODE_BOOLEAN:
493 493
                 $displayedVariant = ($optionValue == "on" ? _("on") : _("off"));
494
-                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-" . $listtype['type'] . "]' id='S" . $rowid . "-input-" . $listtype["type"] . "' value=\"" . htmlspecialchars($optionValue) . "\" style='display:block'>";
494
+                $retval .= "<strong>$displayedVariant</strong><input type='hidden' name='value[S$rowid-".$listtype['type']."]' id='S".$rowid."-input-".$listtype["type"]."' value=\"".htmlspecialchars($optionValue)."\" style='display:block'>";
495 495
                 break;
496 496
             default:
497 497
                 // this should never happen!
@@ -537,10 +537,10 @@  discard block
 block discarded – undo
537 537
        <td>
538 538
           <button type='button' class='delete' onclick='";
539 539
         if ($prefillValue !== NULL && $item == "general:geo_coordinates") {
540
-            $funcname = "Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'] . 'DeleteCoord';
541
-            $retval .= 'if (typeof ' . $funcname . ' === "function") { ' . $funcname . '(' . $this->allLocationCount . '); } ';
540
+            $funcname = "Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'].'DeleteCoord';
541
+            $retval .= 'if (typeof '.$funcname.' === "function") { '.$funcname.'('.$this->allLocationCount.'); } ';
542 542
         }
543
-        $retval .= 'deleteOption("option-S' . $rowid . '")';
543
+        $retval .= 'deleteOption("option-S'.$rowid.'")';
544 544
         $retval .= "'>-</button>
545 545
        </td>
546 546
     </tr>";
Please login to merge, or discard this patch.
devices/Devices-template.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
                     'hs20' => 1,
405 405
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
406 406
                             "geteduroam",
407
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
407
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
408 408
                 ],
409 409
             ],            
410 410
             
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
                     'mime' => 'application/eap-config',
419 419
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
420 420
                             "geteduroam",
421
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>" . _("as local download") . "</a>"),
421
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=app.eduroam.geteduroam'>Google Play</a>, <a target='_blank' href='geteduroam-stable.apk'>"._("as local download")."</a>"),
422 422
                 ],
423 423
             ],  
424 424
             'android_4_7' => [
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
                     'mime' => 'application/eap-config',
432 432
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
433 433
                             "eduroamCAT",
434
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
434
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
435 435
                 ],
436 436
             ],            
437 437
             
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
                     'mime' => 'application/eap-config',
447 447
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
448 448
                             "eduroamCAT",
449
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
449
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
450 450
                 ],
451 451
             ],
452 452
             'android_pie' => [
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
                     'mime' => 'application/eap-config',
461 461
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
462 462
                             "eduroamCAT",
463
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
463
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
464 464
                 ],
465 465
             ],
466 466
             'android_oreo' => [
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
                     'mime' => 'application/eap-config',
475 475
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
476 476
                             "eduroamCAT",
477
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
477
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
478 478
                 ],
479 479
             ],
480 480
             'android_nougat' => [
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
                     'mime' => 'application/eap-config',
489 489
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
490 490
                             "eduroamCAT",
491
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
491
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
492 492
                 ],
493 493
             ],
494 494
             'android_marshmallow' => [
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
                     'mime' => 'application/eap-config',
503 503
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
504 504
                             "eduroamCAT",
505
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
505
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
506 506
                 ],
507 507
             ],
508 508
             'android_lollipop' => [
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
                     'mime' => 'application/eap-config',
517 517
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
518 518
                             "eduroamCAT",
519
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
519
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
520 520
                 ],
521 521
             ],
522 522
             'android_kitkat' => [
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
                     'mime' => 'application/eap-config',
531 531
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
532 532
                             "eduroamCAT",
533
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
533
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
534 534
                 ],
535 535
             ],
536 536
             'android_43' => [
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
                     'mime' => 'application/eap-config',
545 545
                     'message' => sprintf(_("Before you proceed with installation on Android systems, please make sure that you have installed the %s application. This application is available from these sites: %s and will use the configuration file downloaded from CAT to create all necessary settings."),
546 546
                             "eduroamCAT",
547
-                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>" . _("as local download") . "</a>"),
547
+                            "<a target='_blank' href='https://play.google.com/store/apps/details?id=uk.ac.swansea.eduroamcat'>Google Play</a>, <a target='_blank' href='https://www.amazon.com/dp/B01EACCX0S/'>Amazon Appstore</a>, <a target='_blank' href='eduroamCAT-stable.apk'>"._("as local download")."</a>"),
548 548
                 ],
549 549
             ],
550 550
             'android_legacy' => [
Please login to merge, or discard this patch.
core/diag/RFC6614Tests.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -166,27 +166,27 @@  discard block
 block discarded – undo
166 166
     {
167 167
         // it could match CN or sAN:DNS, we don't care which
168 168
         if (isset($this->TLS_CA_checks_result[$host]['certdata']['subject'])) {
169
-            $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . " against Subject: ");
169
+            $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName." against Subject: ");
170 170
             $this->loggerInstance->debug(4, $this->TLS_CA_checks_result[$host]['certdata']['subject']);
171 171
             // we are checking against accidental misconfig, not attacks, so loosely checking against end of string is appropriate
172
-            if (preg_match("/CN=" . $this->expectedName . "/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) {
172
+            if (preg_match("/CN=".$this->expectedName."/", $this->TLS_CA_checks_result[$host]['certdata']['subject']) === 1) {
173 173
                 return TRUE;
174 174
             }
175 175
         }
176 176
         if (isset($this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'])) {
177
-            $this->loggerInstance->debug(4, "Checking expected server name " . $this->expectedName . " against sANs: ");
177
+            $this->loggerInstance->debug(4, "Checking expected server name ".$this->expectedName." against sANs: ");
178 178
             $this->loggerInstance->debug(4, $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname']);
179 179
             $testNames = $this->TLS_CA_checks_result[$host]['certdata']['extensions']['subjectaltname'];
180 180
             if (!is_array($testNames)) {
181 181
                 $testNames = [$testNames];
182 182
             }
183 183
             foreach ($testNames as $oneName) {
184
-                if (preg_match("/" . $this->expectedName . "/", $oneName) === 1) {
184
+                if (preg_match("/".$this->expectedName."/", $oneName) === 1) {
185 185
                     return TRUE;
186 186
                 }
187 187
             }
188 188
         }
189
-        $this->loggerInstance->debug(3, "Tried to check expected server name " . $this->expectedName . " but neither CN nor sANs matched.");
189
+        $this->loggerInstance->debug(3, "Tried to check expected server name ".$this->expectedName." but neither CN nor sANs matched.");
190 190
 
191 191
         $this->TLS_CA_checks_result[$host]['cert_oddity'] = RADIUSTests::CERTPROB_DYN_SERVER_NAME_MISMATCH;
192 192
         return FALSE;
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['status'] = $cert['status'];
217 217
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']];
218 218
                 $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected'];
219
-                $add = ' -cert ' . ROOT . '/config/cli-certs/' . $cert['public'] . ' -key ' . ROOT . '/config/cli-certs/' . $cert['private'];
219
+                $add = ' -cert '.ROOT.'/config/cli-certs/'.$cert['public'].' -key '.ROOT.'/config/cli-certs/'.$cert['private'];
220 220
                 if (!isset($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k])) {
221 221
                     $this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = [];
222 222
                 }
@@ -261,11 +261,11 @@  discard block
 block discarded – undo
261 261
 // but code analysers want this more explicit, so here is this extra
262 262
 // call to escapeshellarg()
263 263
         $escapedHost = escapeshellarg($host);
264
-        $this->loggerInstance->debug(4, \config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -tls1 -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1\n");
264
+        $this->loggerInstance->debug(4, \config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -tls1 -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1\n");
265 265
         $time_start = microtime(true);
266 266
         $opensslbabble = [];
267 267
         $result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures
268
-        exec(\config\Master::PATHS['openssl'] . " s_client -connect " . $escapedHost . " -no_ssl3 -CApath " . ROOT . "/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result);
268
+        exec(\config\Master::PATHS['openssl']." s_client -connect ".$escapedHost." -no_ssl3 -CApath ".ROOT."/config/ca-certs/$this->consortium/ $arg 2>&1", $opensslbabble, $result);
269 269
         $time_stop = microtime(true);
270 270
         $testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000);
271 271
         $testresults['returncode'] = $result;
Please login to merge, or discard this patch.
web/admin/edit_profile_result.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
 
24 24
 $auth = new \web\lib\admin\Authentication();
25 25
 $deco = new \web\lib\admin\PageDecoration();
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         }
44 44
         $profileToBeDel = $validator->existingProfile($_GET['profile_id'], $my_inst->identifier);
45 45
         $profileToBeDel->destroy();
46
-        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "Profile " . $profileToBeDel->identifier);
46
+        $loggerInstance->writeAudit($_SESSION['user'], "DEL", "Profile ".$profileToBeDel->identifier);
47 47
         header("Location: overview_org.php?inst_id=$my_inst->identifier");
48 48
         exit;
49 49
     case web\lib\common\FormElements::BUTTON_SAVE:
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             echo $deco->pageheader(sprintf(_("%s: Edit Profile - Result"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
53 53
         } else {
54 54
             $profile = $my_inst->newProfile(core\AbstractProfile::PROFILETYPE_RADIUS);
55
-            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP " . $my_inst->identifier . " - Profile created");
55
+            $loggerInstance->writeAudit($_SESSION['user'], "NEW", "IdP ".$my_inst->identifier." - Profile created");
56 56
             echo $deco->pageheader(sprintf(_("%s: Profile wizard (step 3 completed)"), \config\Master::APPEARANCE['productname']), "ADMIN-IDP");
57 57
         }
58 58
         if (!$profile instanceof \core\ProfileRADIUS) {
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
             $uiElements = new web\lib\admin\UIElements();
122 122
             // set realm info, if submitted
123 123
             if ($realm !== FALSE) {
124
-                $profile->setRealm($anonLocal . "@" . $realm);
124
+                $profile->setRealm($anonLocal."@".$realm);
125 125
                 echo $uiElements->boxOkay(sprintf(_("Realm: <strong>%s</strong>"), $realm));
126 126
             } else {
127 127
                 $profile->setRealm("");
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
                     echo $uiElements->boxError(_("Realm check username cannot be configured: realm is missing!"));
148 148
                 } else {
149 149
                     $profile->setRealmcheckUser(true, $checkuser_name);
150
-                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name . "@" . $realm));
150
+                    echo $uiElements->boxOkay(sprintf(_("Special username for realm check is <strong>%s</strong>, the value is <strong>%s</strong>"), _("ON"), $checkuser_name."@".$realm));
151 151
                 }
152 152
             } else {
153 153
                 $profile->setRealmCheckUser(false);
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
159 159
                 $extratext = "";
160 160
                 if (!empty($realm)) {
161 161
                     if ($hint !== FALSE) {
162
-                        $extratext = " " . sprintf(_("The realm portion MUST be exactly '...@%s'."), $realm);
162
+                        $extratext = " ".sprintf(_("The realm portion MUST be exactly '...@%s'."), $realm);
163 163
                     } else {
164
-                        $extratext = " " . sprintf(_("The realm portion MUST end with '%s' but sub-realms of it are allowed (i.e. 'user@%s' and 'user@<...>.%s' are both acceptable)."), $realm, $realm, $realm);
164
+                        $extratext = " ".sprintf(_("The realm portion MUST end with '%s' but sub-realms of it are allowed (i.e. 'user@%s' and 'user@<...>.%s' are both acceptable)."), $realm, $realm, $realm);
165 165
                     }
166 166
                 }
167
-                echo $uiElements->boxOkay(_("Where possible, supplicants will verify that username inputs contain a syntactically correct realm.") . $extratext);
167
+                echo $uiElements->boxOkay(_("Where possible, supplicants will verify that username inputs contain a syntactically correct realm.").$extratext);
168 168
             } else {
169 169
                 $profile->setInputVerificationPreference(false, false);
170 170
             }
@@ -196,30 +196,30 @@  discard block
 block discarded – undo
196 196
                 echo $uiElements->boxOkay(_("Redirection is <strong>OFF</strong>"));
197 197
             }
198 198
 
199
-            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $profile->identifier . " - attributes changed");
199
+            $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$profile->identifier." - attributes changed");
200 200
             // reload the profile to ingest new CA and server names if any; before checking EAP completeness
201 201
             $reloadedProfileNr1 = \core\ProfileFactory::instantiate($profile->identifier);
202 202
             foreach (\core\common\EAP::listKnownEAPTypes() as $a) {
203 203
                 if ($a->getIntegerRep() == \core\common\EAP::INTEGER_SILVERBULLET) { // do not allow adding silverbullet via the backdoor
204 204
                     continue;
205 205
                 }
206
-                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep() . "-priority"]) && is_numeric($_POST[$a->getPrintableRep() . "-priority"])) {
207
-                    $priority = (int) $_POST[$a->getPrintableRep() . "-priority"];
206
+                if (isset($_POST[$a->getPrintableRep()]) && isset($_POST[$a->getPrintableRep()."-priority"]) && is_numeric($_POST[$a->getPrintableRep()."-priority"])) {
207
+                    $priority = (int) $_POST[$a->getPrintableRep()."-priority"];
208 208
                     // add EAP type to profile as requested, but ...
209 209
                     $reloadedProfileNr1->addSupportedEapMethod($a, $priority);
210
-                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile " . $reloadedProfileNr1->identifier . " - supported EAP types changed");
210
+                    $loggerInstance->writeAudit($_SESSION['user'], "MOD", "Profile ".$reloadedProfileNr1->identifier." - supported EAP types changed");
211 211
                     // see if we can enable the EAP type, or if info is missing
212 212
                     $eapcompleteness = $reloadedProfileNr1->isEapTypeDefinitionComplete($a);
213 213
                     if ($eapcompleteness === true) {
214
-                        echo $uiElements->boxOkay(_("Supported EAP Type: ") . "<strong>" . $a->getPrintableRep() . "</strong>");
214
+                        echo $uiElements->boxOkay(_("Supported EAP Type: ")."<strong>".$a->getPrintableRep()."</strong>");
215 215
                     } else {
216 216
                         $warntext = "";
217 217
                         if (is_array($eapcompleteness)) {
218 218
                             foreach ($eapcompleteness as $item) {
219
-                                $warntext .= "<strong>" . $uiElements->displayName($item) . "</strong> ";
219
+                                $warntext .= "<strong>".$uiElements->displayName($item)."</strong> ";
220 220
                             }
221 221
                         }
222
-                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext) . "<br/>" . _("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
222
+                        echo $uiElements->boxWarning(sprintf(_("Supported EAP Type: <strong>%s</strong> is missing required information %s !"), $a->getPrintableRep(), $warntext)."<br/>"._("The EAP type was added to the profile, but you need to complete the missing information before we can produce installers for you."));
223 223
                     }
224 224
                 }
225 225
             }
@@ -230,23 +230,23 @@  discard block
 block discarded – undo
230 230
             if (count($significantChanges) > 0) {
231 231
                 $myInstOriginal = new \core\IdP($profile->institution);
232 232
                 // send a notification/alert mail to someone we know is in charge
233
-                $text = _("To whom it may concern,") . "\n\n";
233
+                $text = _("To whom it may concern,")."\n\n";
234 234
                 /// were made to the *Identity Provider* *LU* / integer number of IdP / (previously known as) Name
235
-                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name) . "\n\n";
235
+                $text .= sprintf(_("significant changes were made to a RADIUS deployment profile of the %s %s / %s / '%s'."), $ui->nomenclatureInst, strtoupper($myInstOriginal->federation), $myInstOriginal->identifier, $myInstOriginal->name)."\n\n";
236 236
                 if (isset($significantChanges[\core\AbstractProfile::CA_CLASH_ADDED])) {
237
-                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:") . "\n\n";
238
-                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED] . "\n\n";
237
+                    $text .= _("WARNING! A new trusted root CA was added, and it has the exact same name as a previously existing root CA. This may (but does not necessarily) mean that this is an attempt to insert an unauthorised trust root by disguising as the genuine one. The details are below:")."\n\n";
238
+                    $text .= $significantChanges[\core\AbstractProfile::CA_CLASH_ADDED]."\n\n";
239 239
                 }
240 240
                 if (isset($significantChanges[\core\AbstractProfile::CA_ADDED])) {
241
-                    $text .= _("A new trusted root CA was added. The details are below:") . "\n\n";
242
-                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED] . "\n\n";
241
+                    $text .= _("A new trusted root CA was added. The details are below:")."\n\n";
242
+                    $text .= $significantChanges[\core\AbstractProfile::CA_ADDED]."\n\n";
243 243
                 }
244 244
                 if (isset($significantChanges[\core\AbstractProfile::SERVERNAME_ADDED])) {
245
-                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:") . "\n\n";
246
-                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED] . "\n\n";
245
+                    $text .= _("A new acceptable server name for the authentication server was added. The details are below:")."\n\n";
246
+                    $text .= $significantChanges[\core\AbstractProfile::SERVERNAME_ADDED]."\n\n";
247 247
                 }
248
-                $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.") . "\n\n";
249
-                $text .= _("Greetings, ") . "\n\n" . \config\Master::APPEARANCE['productname_long'];
248
+                $text .= _("This mail is merely a cross-check because these changes can be security-relevant. If the change was expected, you do not need to take any action.")."\n\n";
249
+                $text .= _("Greetings, ")."\n\n".\config\Master::APPEARANCE['productname_long'];
250 250
                 // (currently, send hard-wired to NRO - future: for linked insts, check eduroam DBv2 and send to registered admins directly)
251 251
                 $fed = new core\Federation($myInstOriginal->federation);
252 252
                 foreach ($fed->listFederationAdmins() as $id) {
@@ -303,14 +303,14 @@  discard block
 block discarded – undo
303 303
                         $oneHostOkay = FALSE;
304 304
                         $testCandidates = [];
305 305
                         foreach ($dnsChecks->NAPTR_hostname_records as $oneServer) {
306
-                            $testCandidates[$oneServer['hostname']][] = ($oneServer['family'] == "IPv4" ? $oneServer['IP'] : "[" . $oneServer['IP'] . "]") . ":" . $oneServer['port'];
306
+                            $testCandidates[$oneServer['hostname']][] = ($oneServer['family'] == "IPv4" ? $oneServer['IP'] : "[".$oneServer['IP']."]").":".$oneServer['port'];
307 307
                         }
308 308
                         foreach ($testCandidates as $oneHost => $listOfIPs) {
309 309
                             $connectionTests = new core\diag\RFC6614Tests(array_values($listOfIPs), $oneHost, "openroaming");
310 310
                             // for now (no OpenRoaming client certs available) only run server-side tests
311 311
                             foreach ($listOfIPs as $oneIP) {
312 312
                                 $connectionResult = $connectionTests->cApathCheck($oneIP);
313
-                                if ($connectionResult != core\diag\AbstractTest::RETVAL_OK || ( isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) {
313
+                                if ($connectionResult != core\diag\AbstractTest::RETVAL_OK || (isset($connectionTests->TLS_CA_checks_result['cert_oddity']) && count($connectionTests->TLS_CA_checks_result['cert_oddity']) > 0)) {
314 314
                                     $allHostsOkay = FALSE;
315 315
                                 } else {
316 316
                                     $oneHostOkay = TRUE;
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
         <?php
346 346
         if (count($reloadedProfileNr2->getEapMethodsinOrderOfPreference(1)) > 0) {
347 347
             echo "<form method='post' action='overview_installers.php?inst_id=$my_inst->identifier&profile_id=$reloadedProfileNr2->identifier' accept-charset='UTF-8'>
348
-        <button type='submit'>" . _("Continue to Installer Fine-Tuning and Download") . "</button>
348
+        <button type='submit'>"._("Continue to Installer Fine-Tuning and Download")."</button>
349 349
     </form>";
350 350
         }
351 351
         echo $deco->footer();
Please login to merge, or discard this patch.
web/skins/modern/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 $operatingSystem = $Gui->detectOS();
45 45
 $Gui->loggerInstance->debug(4, $operatingSystem);
46 46
 if ($operatingSystem) {
47
-    print "recognisedOS = '".$operatingSystem['device'] . "';\n";
48
-    print "recognisedOShs20 = '".$operatingSystem['hs20'] . "';\n";
47
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
48
+    print "recognisedOShs20 = '".$operatingSystem['hs20']."';\n";
49 49
     $vendorlogo = $Gui->skinObject->findResourceUrl("IMAGES", "vendorlogo/");
50 50
     if ($vendorlogo !== FALSE) {
51 51
         print "vendorlogo = '$vendorlogo';\n";
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     }
55 55
 }
56 56
 
57
-print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE] . '";';
57
+print 'downloadMessage = "'.$Gui->textTemplates->templates[\web\lib\user\DOWNLOAD_MESSAGE].'";';
58 58
 //TODO modify this based on OS detection
59 59
 $userAgent = $_SERVER['HTTP_USER_AGENT'] ?? "";
60 60
 if (preg_match('/Android/', $userAgent)) {
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
     <?php echo $divs->divHeading($visibility); ?>
84 84
     <div id="main_page">
85 85
         <div id="loading_ico">
86
-          <?php echo _("Authenticating") . "..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
86
+          <?php echo _("Authenticating")."..." ?><br><img src="<?php echo $Gui->skinObject->findResourceUrl("IMAGES", "icons/loading51.gif"); ?>" alt="Authenticating ..."/>
87 87
         </div>
88 88
         <div id="info_overlay"> <!-- device info -->
89 89
             <div id="info_window"></div>
Please login to merge, or discard this patch.