Test Failed
Pull Request — master (#252)
by Dimitri
23:52
created
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 thoroughly 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.
web/skins/modern/diag/diag.php 1 patch
Spacing   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 $Gui->loggerInstance->debug(4, $operatingSystem);
48 48
 $uiElements = new web\lib\admin\UIElements();
49 49
 if ($operatingSystem) {
50
-    print "recognisedOS = '" . $operatingSystem['device'] . "';\n";
50
+    print "recognisedOS = '".$operatingSystem['device']."';\n";
51 51
 }
52
-require dirname(__DIR__) . '/user/js/cat_js.php';
52
+require dirname(__DIR__).'/user/js/cat_js.php';
53 53
 
54 54
 ?>
55 55
 </script>
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 <?php
64 64
 echo $divs->divHeading($visibility);
65 65
 $Gui->languageInstance->setTextDomain("diagnostics");
66
-require dirname(__DIR__) . '/diag/js/diag_js.php';
66
+require dirname(__DIR__).'/diag/js/diag_js.php';
67 67
 ?>
68 68
 <div id="main_page">
69 69
     <div id="loading_ico">
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
     </div>
80 80
     <div id="main_body">
81 81
         <div id="user_page">
82
-            <?php echo $divs->divPagetitle(_("Diagnostics site") . " (<span style='color:red'>beta</span>)", ""); ?>
82
+            <?php echo $divs->divPagetitle(_("Diagnostics site")." (<span style='color:red'>beta</span>)", ""); ?>
83 83
             <div id="user_info" style='padding-top: 10px;'>
84 84
             <div id='diagnostic_choice'>
85
-                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!") . ' ' . _("Please help the system by answering the questions as precisely as possible.") . "<br/>" . _("Are you a") . ' '; ?>
86
-                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user") . ' ' . _("or"); ?>   
87
-                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator") .'?'; ?>
85
+                <?php echo _("The diagnostics system will do its best to identify and resolve your problems!").' '._("Please help the system by answering the questions as precisely as possible.")."<br/>"._("Are you a").' '; ?>
86
+                <input type='radio' name='diagnostic_usertype' value='0'><?php echo _("end-user").' '._("or"); ?>   
87
+                <input type='radio' name='diagnostic_usertype' value='1' <?php if ($admin == 1) { echo " checked"; } ?> > <?php echo _("eduroam administrator").'?'; ?>
88 88
             </div>
89 89
             <div id='diagnostic_enduser' style='display: none;'>
90 90
                 <h2><?php echo _("Tools for End Users"); ?></h2>
@@ -94,24 +94,24 @@  discard block
 block discarded – undo
94 94
                 ?>
95 95
                 </p>
96 96
                 <?php
97
-                    echo '<div id="before_stage_1"><h3>' . _("The system needs some information on your home institution - issuer of your account") . '</h3>';
97
+                    echo '<div id="before_stage_1"><h3>'._("The system needs some information on your home institution - issuer of your account").'</h3>';
98 98
                     echo _("What is the realm part of your user account (the part behind the @ of 'your.username@<strong>realm.tld</strong>'):");
99 99
                 ?>
100 100
                 <input type='text' name='user_realm' id='user_realm' value=''>
101 101
                 <?php
102
-                    echo '<div id="realm_by_select"><br/>' . _("alternatively") . '<br/>';
103
-                    echo _("You can select your home institution from the following list") . '<br/>';
102
+                    echo '<div id="realm_by_select"><br/>'._("alternatively").'<br/>';
103
+                    echo _("You can select your home institution from the following list").'<br/>';
104 104
                     echo '<div id="select_idp_country"><a href="" id="idp_countries_list">';    
105
-                    echo '<span id="realmselect">' . _("Click to select your country/region and organisation") . '</span></a></div>';
105
+                    echo '<span id="realmselect">'._("Click to select your country/region and organisation").'</span></a></div>';
106 106
                 ?>
107 107
                 <div id="select_idp_area" style="display:none;">
108 108
                 </div>
109 109
                 </div>
110 110
                 <div id="position_info">
111 111
                     <?php
112
-                        echo '<h3>' . _("Optionally, to improve tests, you can provide information on your current location") . '</h3>';
112
+                        echo '<h3>'._("Optionally, to improve tests, you can provide information on your current location").'</h3>';
113 113
                         echo '<div id="select_sp_country"><a href="" id="sp_countries_list">';    
114
-                        echo '<span id="spselect">' . _("Click to select a location in which you have an eduroam problem") . '</span></a></div>';
114
+                        echo '<span id="spselect">'._("Click to select a location in which you have an eduroam problem").'</span></a></div>';
115 115
                     ?>
116 116
                     <div id="select_sp_area" style="display:none;">
117 117
                     </div>
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
144 144
                             echo 'none';
145 145
                         }
146 146
                         echo ";'>";
147
-                        echo '<h3>' . _("What is the nature of the problem?") . '</h3>';
148
-                        echo '<input type="radio" name="problem_type" value="0"' . (($sp==1)? ' checked' : '') . '>';
149
-                        echo _("I suspect a technical problem at a particular IdP") . '<br>';
147
+                        echo '<h3>'._("What is the nature of the problem?").'</h3>';
148
+                        echo '<input type="radio" name="problem_type" value="0"'.(($sp == 1) ? ' checked' : '').'>';
149
+                        echo _("I suspect a technical problem at a particular IdP").'<br>';
150 150
                         echo '<input type="radio" name="problem_type" value="1">';
151
-                        echo _("I want to report abuse of network resources by a roaming user") . '<br>';
151
+                        echo _("I want to report abuse of network resources by a roaming user").'<br>';
152 152
                         echo '<input type="radio" name="problem_type" value="2">';
153 153
                         echo _("I suspect a technical problem for one of my users at a particular SP");
154 154
                         echo "<div id='idp_contact_area'></div>";
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
                         echo "</div>"; 
158 158
                     } else {
159 159
                         echo "0\">";
160
-                        echo _("This service is for authenticated admins only.") . '<br>';
161
-                        echo "<a href=\"diag.php?admin=1\">" .
162
-                             _("eduroam® admin access is needed") . "</a>";
160
+                        echo _("This service is for authenticated admins only.").'<br>';
161
+                        echo "<a href=\"diag.php?admin=1\">".
162
+                             _("eduroam® admin access is needed")."</a>";
163 163
                     }
164 164
                 ?>
165 165
                 <div id="realm_problem">
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
         return false;
238 238
     });
239 239
     $(document).on('change', '#idp_country' , function() {
240
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
240
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
241 241
         var id = $(this).attr('id');
242 242
         var k = id.indexOf('_');
243 243
         var type = id.substr(0,k);
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
                         var shtml = '';
256 256
                         var select = '';
257 257
                         if (type !== 'asp') {
258
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
258
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
259 259
                         }
260 260
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
261 261
                         for (var i in institutions) {
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
                     } else {
277 277
                         if (data.status === 0) {
278 278
                             inProgress(0);
279
-                            var msg = <?php echo '"' . _("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.") . '"'; ?>;
279
+                            var msg = <?php echo '"'._("The database does not contain the information needed to help you in realm selection for this country. You have to provide the realm you are interested in.").'"'; ?>;
280 280
                             alert(msg);
281 281
                             $('#select_idp_country').show();
282 282
                             $('#select_idp_area').hide();
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
                 },
286 286
                 error:function() {
287 287
                     inProgress(0);
288
-                    var msg = <?php echo '"' . _("Can not search in database. You have to provide the realm you are interested in.") . '"'; ?>;
288
+                    var msg = <?php echo '"'._("Can not search in database. You have to provide the realm you are interested in.").'"'; ?>;
289 289
                     alert(msg);
290 290
                     $('#select_idp_country').show();
291 291
                     $('#select_idp_area').hide();
@@ -301,9 +301,9 @@  discard block
 block discarded – undo
301 301
     });
302 302
     $(document).on('change', '#select_sp_problem' , function() {
303 303
         if ($('#select_sp_problem').val().substr(0,6) == 'abuse-') {
304
-            $('#realm_in_db_admin').text(<?php echo '"' . _("Check if this realm is registered") . '"'; ?>);
304
+            $('#realm_in_db_admin').text(<?php echo '"'._("Check if this realm is registered").'"'; ?>);
305 305
         } else {
306
-            $('#realm_in_db_admin').text(<?php echo '"' . _("Check this realm") . '"'; ?>);
306
+            $('#realm_in_db_admin').text(<?php echo '"'._("Check this realm").'"'; ?>);
307 307
         }
308 308
         $('#realm_in_db_admin').hide();
309 309
         $('#admin_realm').val('');
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
         clear_sp_question();
312 312
     });
313 313
     $(document).on('change', '#sp_country, #asp_country' , function() {
314
-        var comment = <?php echo '"' . _("Fetching institutions list") . '..."'; ?>;  
314
+        var comment = <?php echo '"'._("Fetching institutions list").'..."'; ?>;  
315 315
         var id = $(this).attr('id');
316 316
         var k = id.indexOf('_');
317 317
         var type = id.substr(0,k);
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                         var shtml = '';
330 330
                         var select = '';
331 331
                         if (type !== 'asp') {
332
-                            shtml = <?php echo '"<td>' . _("Select institution:") . '</td><td>"'; ?>;
332
+                            shtml = <?php echo '"<td>'._("Select institution:").'</td><td>"'; ?>;
333 333
                         }
334 334
                         select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value=""></option>';
335 335
                         for (var i in hotspots) {
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
                             inProgress(0);
353 353
                             var select = '<select id="' + type + '_inst" name="' + type + '_inst" style="margin-left:0px; width:400px;"><option value="">';
354 354
                             var shtml = '<td></td><td>';
355
-                            select = select + <?php echo '"' . _("Other location") . '"'; ?> + '</option></select></td>';
355
+                            select = select + <?php echo '"'._("Other location").'"'; ?> + '</option></select></td>';
356 356
                             if (type !== 'asp') {
357 357
                                 $('#row_' + type + '_institution').html('');
358 358
                                 $('#row_' + type + '_institution').append(shtml + select);
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
             $('#start_test_area').hide();
387 387
             return false;
388 388
         }
389
-        var comment = <?php echo '"' . _("Fetching realms list") . '..."'; ?>;
389
+        var comment = <?php echo '"'._("Fetching realms list").'..."'; ?>;
390 390
         inProgress(1, comment);
391 391
         $.ajax({
392 392
             url: "findRealm.php",
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
                     var realms = data.realms;
399 399
                     var realmselect = '';
400 400
                     if (realms.length > 1) {
401
-                        realmselect = <?php echo '"<td>' . _("Check realm(s):") . '</td>"'; ?>;
401
+                        realmselect = <?php echo '"<td>'._("Check realm(s):").'</td>"'; ?>;
402 402
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
403 403
                         for (var i in realms) {
404 404
                             realmselect = realmselect + '<input type="radio" name="realm" ';
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
                         }
411 411
                         realmselect = realmselect + '</span></td>';
412 412
                     } else {
413
-                        realmselect = <?php echo '"<td>' . _("Realm:") . '</td>"'; ?>;
413
+                        realmselect = <?php echo '"<td>'._("Realm:").'</td>"'; ?>;
414 414
                         realmselect = realmselect + '<td>' + "<span style='margin-left: 10px'>";
415 415
                         realmselect = realmselect + realms[0] + '</span>';
416 416
                         realmselect = realmselect + '<input type="hidden" name="realm" value="' + realms[0] + '">';
@@ -462,7 +462,7 @@  discard block
 block discarded – undo
462 462
             clear_sp_question();
463 463
             t = 1;
464 464
         }
465
-        var comment = <?php echo '"' . _("Running realm tests") . '..."'; ?>;
465
+        var comment = <?php echo '"'._("Running realm tests").'..."'; ?>;
466 466
         inProgress(1, comment);
467 467
         /*waiting(comment);*/
468 468
         $.ajax({
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
         testSociopath('', answer);
524 524
     });
525 525
     $('#realmtest').click(function(event){
526
-        var comment = <?php echo '"<br><br>' . _("Running realm tests") . '..."'; ?>;
526
+        var comment = <?php echo '"<br><br>'._("Running realm tests").'..."'; ?>;
527 527
         inProgress(1, comment);
528 528
         $('#start_test_area').hide();
529 529
         if ($('#select_sp_area').is(':hidden')) {
@@ -571,13 +571,13 @@  discard block
 block discarded – undo
571 571
                         reset_footer();
572 572
                         testSociopath(realm, 0);
573 573
                     } else {
574
-                        var title = <?php echo '"' . _("Diagnostics results for selected realms") . '"'; ?>;
575
-                        result = '<div class="padding"><h3>' + <?php echo '"' . _("An unknown problem occurred") . '"'; ?>;
574
+                        var title = <?php echo '"'._("Diagnostics results for selected realms").'"'; ?>;
575
+                        result = '<div class="padding"><h3>' + <?php echo '"'._("An unknown problem occurred").'"'; ?>;
576 576
                         result = result + '</h3>'
577 577
                         if (r.length == 1) {
578
-                            result = result + <?php echo '"' . _("This test includes checking of the following realm") . '"'; ?>;
578
+                            result = result + <?php echo '"'._("This test includes checking of the following realm").'"'; ?>;
579 579
                         } else {    
580
-                            result = result + <?php echo '"' . _("This test includes checking of the following realms") . '"'; ?>;
580
+                            result = result + <?php echo '"'._("This test includes checking of the following realms").'"'; ?>;
581 581
                         }
582 582
                         result = result + ': '
583 583
                         for (var i=0; i < r.length; i++) {
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
                             result = result + r[i];
588 588
                         }
589 589
                         result = result + '.<br>';
590
-                        result = result + <?php echo '"' . _("You should report this to") . '"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
590
+                        result = result + <?php echo '"'._("You should report this to").'"'; ?> + ' <a href="mailto:[email protected]">[email protected]</a>';
591 591
                         result = result + '</div>';
592 592
                         $('#after_stage_1').hide();
593 593
                         $('#before_stage_1').show();
@@ -655,43 +655,43 @@  discard block
 block discarded – undo
655 655
             success:function(data) {
656 656
                 if (data.status === 1) {
657 657
                     var result = '';
658
-                    var title = <?php echo '"' . _("eduroam admin report submission") . '"'; ?>;
658
+                    var title = <?php echo '"'._("eduroam admin report submission").'"'; ?>;
659 659
                     result = '<div class="padding">';
660 660
                     if (type == 'idp_send') {
661
-                        result = result + '<h3>'+ <?php echo '"' . _("SP contacting IdP due to technical problems or abuse") . '"'; ?> + '</h3>';
661
+                        result = result + '<h3>'+ <?php echo '"'._("SP contacting IdP due to technical problems or abuse").'"'; ?> + '</h3>';
662 662
                         result = result + '<table>';
663
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
664
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
665
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
666
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
667
-                        result = result + '<tr><td>' + <?php echo '"' . _("An email to contact the reporter") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
668
-                        result = result + '<tr><td>' + <?php echo '"' . _("Test result") . '" '; ?> +'</td><td>';
663
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
664
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
665
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
666
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
667
+                        result = result + '<tr><td>' + <?php echo '"'._("An email to contact the reporter").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
668
+                        result = result + '<tr><td>' + <?php echo '"'._("Test result").'" '; ?> +'</td><td>';
669 669
                         if (data.tests_result == 1) {
670
-                            result = result + <?php echo '"' . _("failure") . '"'; ?>;
670
+                            result = result + <?php echo '"'._("failure").'"'; ?>;
671 671
                         } else {
672
-                            result = result + <?php echo '"' . _("success") . '"'; ?>;
672
+                            result = result + <?php echo '"'._("success").'"'; ?>;
673 673
                         }
674 674
                         result = result + '</td></tr>';
675
-                        result = result + '<tr><td>' + <?php echo '"' . _("Test URL") . '" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>';
676
-                        result = result + '<tr><td>' + <?php echo '"' . _("Email to IdP administrators ") . '"'; ?> + ' ';
675
+                        result = result + '<tr><td>' + <?php echo '"'._("Test URL").'" '; ?> +'</td><td><a href="' + data.testurl + '">' + data.testurl + '</a></td></tr>';
676
+                        result = result + '<tr><td>' + <?php echo '"'._("Email to IdP administrators ").'"'; ?> + ' ';
677 677
                         if (data.emailsent == 1) {
678
-                            result = result + <?php echo '"' . _("send successfully") . '"'; ?>;
678
+                            result = result + <?php echo '"'._("send successfully").'"'; ?>;
679 679
                         } else {
680
-                            result = result + <?php echo '"' . _("not sent - failure while sending") . '"'; ?>;
680
+                            result = result + <?php echo '"'._("not sent - failure while sending").'"'; ?>;
681 681
                         }
682 682
                         result = result + '</td><td></td></tr>';
683 683
                     }
684 684
                     if (type == 'sp_send') {
685
-                        result = result + '<h3>'+ <?php echo '"' . _("IdP contacting SP due to technical problems or abuse") . '"'; ?> + '</h3>';
685
+                        result = result + '<h3>'+ <?php echo '"'._("IdP contacting SP due to technical problems or abuse").'"'; ?> + '</h3>';
686 686
                         result = result + '<table>';
687
-                        result = result + '<tr><td>' + <?php echo '"' . _("Reason") . '"'; ?> + '</td><td>' + data.reason + '</td></tr>';
688
-                        result = result + '<tr><td>' + <?php echo '"' . _("SP's Operator-Name") . '"'; ?> + '</td><td>' + data.opname + '</td></tr>';
689
-                        result = result + '<tr><td>' + <?php echo '"' . _("User's outer ID") . '"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
690
-                        result = result + '<tr><td>' + <?php echo '"' . _("IdP email") . '"'; ?> + '</td><td>' + data.email + '</td></tr>';
691
-                        result = result + '<tr><td>' + <?php echo '"' . _("Event's timestamp") . '"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
692
-                        result = result + '<tr><td>' + <?php echo '"' . _("Calling-Station-Id") . '"'; ?> + '</td><td>' + data.mac + '</td></tr>';
693
-                        result = result + '<tr><td>' + <?php echo '"' . _("Additional description") . '"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
694
-                        result = result + '<tr><td>' + <?php echo '"' . _("How to contact the user") . '"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
687
+                        result = result + '<tr><td>' + <?php echo '"'._("Reason").'"'; ?> + '</td><td>' + data.reason + '</td></tr>';
688
+                        result = result + '<tr><td>' + <?php echo '"'._("SP's Operator-Name").'"'; ?> + '</td><td>' + data.opname + '</td></tr>';
689
+                        result = result + '<tr><td>' + <?php echo '"'._("User's outer ID").'"'; ?> + '</td><td>' + data.outerid + '</td></tr>';
690
+                        result = result + '<tr><td>' + <?php echo '"'._("IdP email").'"'; ?> + '</td><td>' + data.email + '</td></tr>';
691
+                        result = result + '<tr><td>' + <?php echo '"'._("Event's timestamp").'"'; ?> + '</td><td>' + data.timestamp + '</td></tr>';
692
+                        result = result + '<tr><td>' + <?php echo '"'._("Calling-Station-Id").'"'; ?> + '</td><td>' + data.mac + '</td></tr>';
693
+                        result = result + '<tr><td>' + <?php echo '"'._("Additional description").'"'; ?> +'</td><td>' + data.freetext + '</td></tr>';
694
+                        result = result + '<tr><td>' + <?php echo '"'._("How to contact the user").'"'; ?> +'</td><td>' + data.cdetails + '</td></tr>';
695 695
                     }
696 696
                     result = result + '</div>';
697 697
                     showInfo(result, title);
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
                         $(this).removeClass('visible_row').addClass('hidden_row');
718 718
                     }
719 719
                 });
720
-                $('#admin_realm').attr('title', <?php echo '"' . _("Wrong format of realm") . '"'; ?>);
720
+                $('#admin_realm').attr('title', <?php echo '"'._("Wrong format of realm").'"'; ?>);
721 721
             } else {
722 722
                 $('#admin_realm').removeClass('error_input');
723 723
                 $('#admin_realm').attr('title', '');
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
     $(document).on('keyup change', '#email' , function() {
728 728
         if ($(this).val().length == 0 || !isEmail($(this).val())) {
729 729
             $('#email').addClass('error_input');
730
-            $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
730
+            $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
731 731
         } else {
732 732
             $('#email').removeClass('error_input');
733 733
             $('#email').attr('title', '');
@@ -740,7 +740,7 @@  discard block
 block discarded – undo
740 740
         if ($('#mac').val().length > 0) {
741 741
             if ($('#mac').val().length != 17) {
742 742
                 $('#mac').addClass('error_input');
743
-                $('#mac').attr('title', <?php echo '"' . _("MAC address is incomplete") . '"'; ?>);
743
+                $('#mac').attr('title', <?php echo '"'._("MAC address is incomplete").'"'; ?>);
744 744
             } else {
745 745
                 $('#mac').removeClass('error_input'); 
746 746
                 $('#mac').attr('title', '');
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
         if ($(this).attr('id') == 'email' &&  $(this).val().length > 0) {
750 750
             if (!isEmail($(this).val())) {
751 751
                 $('#email').addClass('error_input');
752
-                $('#email').attr('title', <?php echo '"' . _("Wrong format of email") . '"'; ?>);
752
+                $('#email').attr('title', <?php echo '"'._("Wrong format of email").'"'; ?>);
753 753
             } else {
754 754
                 $('#email').removeClass('error_input');
755 755
                 $('#email').attr('title', '');
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
         if ($(this).attr('id') == 'outer_id' &&  $(this).val().length > 0) {
759 759
             if (!isEmail($(this).val(), true)) {
760 760
                 $('#outer_id').addClass('error_input');
761
-                $('#outer_id').attr('title', <?php echo '"' . _("Wrong format of outer ID") . '"'; ?>);
761
+                $('#outer_id').attr('title', <?php echo '"'._("Wrong format of outer ID").'"'; ?>);
762 762
             } else {
763 763
                 $('#outer_id').removeClass('error_input');
764 764
                 $('#outer_id').attr('title', '');
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
767 767
         if ($(this).attr('id') == 'opname' && $('#opname').val().length > 0) {
768 768
             if (!isOperatorName($(this).val())) {
769 769
                 $('#opname').addClass('error_input');
770
-                $('#opname').attr('title', <?php echo '"' . _("Wrong string given as OperatorName") . '"'; ?>);
770
+                $('#opname').attr('title', <?php echo '"'._("Wrong string given as OperatorName").'"'; ?>);
771 771
                 $('#spmanually').show();
772 772
             } else {
773 773
                 $('#opname').removeClass('error_input');
Please login to merge, or discard this patch.
devices/ms/Files/geant_link.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
   nsArray::Set Delete_files "GEANTLink-ARM64.msi"
93 93
   File "GEANTLink-ARM64.msi"
94 94
   IfSilent +2
95
-  MessageBox MB_OK  "<?php WindowsCommon::echoNsis( _("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
95
+  MessageBox MB_OK  "<?php WindowsCommon::echoNsis(_("An additional piece of software 'GEANTlink' needs to be installed. This installation requires Administrator rights; you will be prompted to give permission for that action."))?>"
96 96
   !insertmacro debug_cat 1 "Run GEANTLink installer"
97 97
   !insertmacro debug_cat 3 'Execute: msiexec.exe /i "$OUTDIR\GEANTLink-$Platform.msi" REBOOT=Supress'
98 98
   ClearErrors
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
   Pop $rebootRequired
105 105
   ${Else}
106 106
   IfSilent +2
107
-  MessageBox MB_OK "<?php WindowsCommon::echoNsis( _("Error installing GEANTLink.\$\\nEmbedded installer didn't complete successfully."))?>"
107
+  MessageBox MB_OK "<?php WindowsCommon::echoNsis(_("Error installing GEANTLink.\$\\nEmbedded installer didn't complete successfully."))?>"
108 108
   Quit
109 109
   ${EndIf}
110 110
   Cont2:
Please login to merge, or discard this patch.
core/diag/Logopath.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
         $this->possibleFailureReasons = $_SESSION["SUSPECTS"] ?? []; // if we know nothing, don't talk to anyone
118 118
         $this->additionalFindings = $_SESSION["EVIDENCE"] ?? [];
119 119
 
120
-        $this->subjectPrefix = _("[eduroam Diagnostics]") . " ";
120
+        $this->subjectPrefix = _("[eduroam Diagnostics]")." ";
121 121
         $this->finalGreeting = "\n"
122 122
                 . _("(This service is in an early stage. We apologise if this is a false alert. If this is the case, please send an email report to [email protected], forwarding the entire message (including the 'SUSPECTS' and 'EVIDENCE' data at the end), and explain why this is a false positive.)")
123 123
                 . "\n"
124
-                . _("Yours sincerely,") . "\n"
124
+                . _("Yours sincerely,")."\n"
125 125
                 . "\n"
126 126
                 . _("Ed U. Roam, the eduroam diagnostics algorithm");
127 127
 
@@ -132,13 +132,13 @@  discard block
 block discarded – undo
132 132
                 "bcc" => [],
133 133
                 "reply-to" => [Logopath::TARGET_EDUROAM_OT],
134 134
                 "subject" => _("[POLICYVIOLATION NATIONAL] IdP with no entry in eduroam database"),
135
-                "body" => _("Dear NRO administrator,") . "\n"
135
+                "body" => _("Dear NRO administrator,")."\n"
136 136
                 . "\n"
137
-                . wordwrap(sprintf(_("an end-user requested diagnostics for realm %s. Real-time connectivity checks determined that the realm exists, but we were unable to find an IdP with that realm in the eduroam database."), $this->additionalFindings['REALM'])) . "\n"
137
+                . wordwrap(sprintf(_("an end-user requested diagnostics for realm %s. Real-time connectivity checks determined that the realm exists, but we were unable to find an IdP with that realm in the eduroam database."), $this->additionalFindings['REALM']))."\n"
138 138
                 . "\n"
139
-                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.") . "\n"
139
+                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.")."\n"
140 140
                 . "\n"
141
-                . _("Additionally, this creates operational issues. In particular, we are unable to direct end users to their IdP for further diagnosis/instructions because there are no contact points for that IdP in the database.") . "\n"
141
+                . _("Additionally, this creates operational issues. In particular, we are unable to direct end users to their IdP for further diagnosis/instructions because there are no contact points for that IdP in the database.")."\n"
142 142
                 . "\n"
143 143
                 . _("Please stop the policy violation ASAP by listing the IdP which is associated to this realm.")
144 144
                 . "\n",
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
149 149
                 "bcc" => [],
150 150
                 "reply-to" => [Logopath::TARGET_ENDUSER],
151 151
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
152
-                "body" => _("Dear IdP administrator,") . "\n"
152
+                "body" => _("Dear IdP administrator,")."\n"
153 153
                 . "\n"
154 154
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM'])
155 155
                 . "\n"
156
-                . _("Real-time connectivity checks determined that the realm appears to be working in acceptable parameters, but the administrator insisted to contact you with the supplemental information below.") . "\n"
156
+                . _("Real-time connectivity checks determined that the realm appears to be working in acceptable parameters, but the administrator insisted to contact you with the supplemental information below.")."\n"
157 157
                 . "\n",
158 158
             ],
159 159
             Logopath::IDP_SUSPECTED_PROBLEM_INTERACTIVE_EVIDENCED => [
@@ -162,11 +162,11 @@  discard block
 block discarded – undo
162 162
                 "bcc" => [],
163 163
                 "reply-to" => [Logopath::TARGET_ENDUSER],
164 164
                 "subject" => _("[TECHNICAL PROBLEM] Administrator suspects technical problem with your IdP"),
165
-                "body" => _("Dear IdP administrator,") . "\n"
165
+                "body" => _("Dear IdP administrator,")."\n"
166 166
                 . "\n"
167 167
                 . sprintf(_("an organisation administrator requested diagnostics for realm %s. "), $this->additionalFindings['REALM'])
168 168
                 . "\n"
169
-                . _("Real-time connectivity checks determined that the realm indeed has an operational problem at this point in time. Please see the supplemental information below.") . "\n"
169
+                . _("Real-time connectivity checks determined that the realm indeed has an operational problem at this point in time. Please see the supplemental information below.")."\n"
170 170
                 . "\n",
171 171
             ],
172 172
         ];
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
         // add exalted human-readable information to main mail body
175 175
         foreach ($this->mailStack as $oneEntry) {
176 176
             if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'])) {
177
-                $oneEntry["body"] .= _("Authentication/Attempt Timestamp of user session:") . " " . $this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP'] . "\n";
177
+                $oneEntry["body"] .= _("Authentication/Attempt Timestamp of user session:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_AUTH_TIMESTAMP']."\n";
178 178
             }
179 179
             if (isset($this->additionalFindings['INTERACTIVE_ENDUSER_MAC'])) {
180
-                $oneEntry["body"] .= _("MAC address of end user in question:") . " " . $this->additionalFindings['INTERACTIVE_ENDUSER_MAC'] . "\n";
180
+                $oneEntry["body"] .= _("MAC address of end user in question:")." ".$this->additionalFindings['INTERACTIVE_ENDUSER_MAC']."\n";
181 181
             }
182 182
             if (isset($this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'])) {
183
-                $oneEntry["body"] .= _("Additional Comments:") . " " . $this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS'] . "\n";
183
+                $oneEntry["body"] .= _("Additional Comments:")." ".$this->additionalFindings['INTERACTIVE_ADDITIONAL_COMMENTS']."\n";
184 184
             }
185 185
         }
186 186
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 
345 345
             $handle = \core\common\OutsideComm::mailHandle();
346 346
             // let's identify ourselves
347
-            $handle->FromName = \config\Master::APPEARANCE['productname'] . " Real-Time Diagnostics System";
347
+            $handle->FromName = \config\Master::APPEARANCE['productname']." Real-Time Diagnostics System";
348 348
             // add recipients
349 349
             foreach (Logopath::CATEGORYBINDING as $arrayName => $functionName) {
350 350
                 foreach ($theMail[$arrayName] as $onePrincipal) {
Please login to merge, or discard this patch.
core/SanityTests.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         $this->test_result = [];
130 130
         $this->test_result['global'] = 0;
131 131
         // parse the schema file to find out the number of expected rows...
132
-        $schema = file(dirname(dirname(__FILE__)) . "/schema/schema.sql");
132
+        $schema = file(dirname(dirname(__FILE__))."/schema/schema.sql");
133 133
         $this->profileOptionCount = 0;
134 134
         $passedTheWindmill = FALSE;
135 135
         foreach ($schema as $schemaLine) {
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
     {
157 157
         $this->out[$test] = [];
158 158
         $this->name = $test;
159
-        $m_name = 'test' . $test;
159
+        $m_name = 'test'.$test;
160 160
         $this->test_result[$test] = 0;
161 161
         if (!method_exists($this, $m_name)) {
162 162
             $this->storeTestResult(\core\common\Entity::L_ERROR, "Configuration error, no test configured for <strong>$test</strong>.");
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
     private function testPhp()
270 270
     {
271 271
         if (version_compare(phpversion(), $this->needversionPHP, '>=')) {
272
-            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running " . phpversion() . ".");
272
+            $this->storeTestResult(\core\common\Entity::L_OK, "<strong>PHP</strong> is sufficiently recent. You are running ".phpversion().".");
273 273
         } else {
274
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have " . phpversion() . ".");
274
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>PHP</strong> is too old. We need at least $this->needversionPHP, but you only have ".phpversion().".");
275 275
         }
276 276
     }
277 277
     
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
284 284
      */
285 285
     private function runConstantsTest($config)
286 286
     {
287
-        $templateConfig = file_get_contents(ROOT . "/config/$config-template.php");
288
-        $newTemplateConfig = preg_replace("/class *$config/", "class $config" . "_template", $templateConfig);
289
-        file_put_contents(ROOT . "/var/tmp/$config-template.php", $newTemplateConfig);
290
-        include(ROOT . "/var/tmp/$config-template.php");
291
-        unlink(ROOT . "/var/tmp/$config-template.php");
292
-        $rft = new \ReflectionClass("\config\\$config" . "_template");
287
+        $templateConfig = file_get_contents(ROOT."/config/$config-template.php");
288
+        $newTemplateConfig = preg_replace("/class *$config/", "class $config"."_template", $templateConfig);
289
+        file_put_contents(ROOT."/var/tmp/$config-template.php", $newTemplateConfig);
290
+        include(ROOT."/var/tmp/$config-template.php");
291
+        unlink(ROOT."/var/tmp/$config-template.php");
292
+        $rft = new \ReflectionClass("\config\\$config"."_template");
293 293
         $templateConstants = $rft->getConstants();
294 294
         $failResults = [];
295 295
         foreach ($templateConstants as $constant => $value) {
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
      * Check if all required constants are set
307 307
      */
308 308
     private function testConfigConstants() {
309
-        set_error_handler(function ($severity, $message, $file, $line) {
309
+        set_error_handler(function($severity, $message, $file, $line) {
310 310
             throw new \ErrorException($message, $severity, $severity, $file, $line);
311 311
         });
312 312
         
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
             $failCount = $failCount + count($failResults);
318 318
             if (count($failResults) > 0) {
319 319
             $this->storeTestResult(\core\common\Entity::L_ERROR, 
320
-                    "<strong>The following constants are not set:</strong>" . implode(', ', $failResults));
320
+                    "<strong>The following constants are not set:</strong>".implode(', ', $failResults));
321 321
             }
322 322
         }
323 323
         
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
             $this->storeTestResult(\core\common\Entity::L_OK, "<strong>cat_base_url</strong> set correctly");
342 342
         } else {
343 343
             $rootFromScript = $m[1] === '' ? '/' : $m[1];
344
-            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>" . \config\Master::PATHS['cat_base_url'] . "</strong> and should be <strong>$rootFromScript</strong>");
344
+            $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>cat_base_url</strong> is set to <strong>".\config\Master::PATHS['cat_base_url']."</strong> and should be <strong>$rootFromScript</strong>");
345 345
         }
346 346
     }
347 347
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
         if (count($probeReturns) == 0) {
363 363
             $this->storeTestResult(common\Entity::L_OK, "All configured RADIUS/UDP probes are reachable.");
364 364
         } else {
365
-            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: " . implode(', ', $probeReturns));
365
+            $this->storeTestResult(common\Entity::L_ERROR, "The following RADIUS probes are NOT reachable: ".implode(', ', $probeReturns));
366 366
         }
367 367
     }
368 368
 
@@ -380,9 +380,9 @@  discard block
 block discarded – undo
380 380
             $SSPconfig = \SimpleSAML\Configuration::getInstance();
381 381
             $sspVersion = explode('.', $SSPconfig->getVersion());
382 382
             if ((int) $sspVersion[0] >= $this->needversionSSP['major'] && (int) $sspVersion[1] >= $this->needversionSSP['minor']) {
383
-                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficiently recent. You are running " . implode('.', $sspVersion));
383
+                $this->storeTestResult(\core\common\Entity::L_OK, "<strong>simpleSAMLphp</strong> is sufficiently recent. You are running ".implode('.', $sspVersion));
384 384
             } else {
385
-                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least " . implode('.', $this->needversionSSP));
385
+                $this->storeTestResult(\core\common\Entity::L_ERROR, "<strong>simpleSAMLphp</strong> is too old. We need at least ".implode('.', $this->needversionSSP));
386 386
             }
387 387
         }
388 388
     }
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
         $A = $this->getExecPath('zip');
410 410
         if ($A['exec'] != "") {
411 411
             $fullOutput = [];
412
-            $t = exec($A['exec'] . ' --version', $fullOutput);
412
+            $t = exec($A['exec'].' --version', $fullOutput);
413 413
             if ($A['exec_is'] == "EXPLICIT") {
414 414
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>".$fullOutput[1]."</strong> was found and is configured explicitly in your config.");
415 415
             } else {
@@ -447,8 +447,8 @@  discard block
 block discarded – undo
447 447
      */
448 448
     private function testLogdir()
449 449
     {
450
-        if (fopen(\config\Master::PATHS['logdir'] . "/debug.log", "a") == FALSE) {
451
-            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>" . \config\Master::PATHS['logdir'] . "</strong> are not writable!");
450
+        if (fopen(\config\Master::PATHS['logdir']."/debug.log", "a") == FALSE) {
451
+            $this->storeTestResult(\core\common\Entity::L_WARN, "Log files in <strong>".\config\Master::PATHS['logdir']."</strong> are not writable!");
452 452
         } else {
453 453
             $this->storeTestResult(\core\common\Entity::L_OK, "Log directory is writable.");
454 454
         }
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
     {
577 577
         $A = $this->getExecPath('openssl');
578 578
         if ($A['exec'] != "") {
579
-            $t = exec($A['exec'] . ' version');
579
+            $t = exec($A['exec'].' version');
580 580
             if ($A['exec_is'] == "EXPLICIT") {
581 581
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>$t</strong> was found and is configured explicitly in your config.");
582 582
             } else {
@@ -604,14 +604,14 @@  discard block
 block discarded – undo
604 604
         }
605 605
         $A = $this->getExecPath('makensis');
606 606
         if ($A['exec'] != "") {
607
-            $t = exec($A['exec'] . ' -VERSION');
607
+            $t = exec($A['exec'].' -VERSION');
608 608
             if ($A['exec_is'] == "EXPLICIT") {
609 609
                 $this->storeTestResult(\core\common\Entity::L_OK, "<strong>makensis $t</strong> was found and is configured explicitly in your config.");
610 610
             } else {
611 611
                 $this->storeTestResult(\core\common\Entity::L_WARN, "<strong>makensis $t</strong> was found, but is not configured with an absolute path in your config.");
612 612
             }
613 613
             $outputArray = [];
614
-            exec($A['exec'] . ' -HELP', $outputArray);
614
+            exec($A['exec'].' -HELP', $outputArray);
615 615
             $t1 = count(preg_grep('/INPUTCHARSET/', $outputArray));
616 616
             if ($t1 == 1 && \config\ConfAssistant::NSIS_VERSION == 2) {
617 617
                 $this->storeTestResult(\core\common\Entity::L_ERROR, "Declared NSIS_VERSION does not seem to match the file pointed to by PATHS['makensis']!");
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
641 641
         $NSIS_Module_status = [];
642 642
         foreach ($this->NSISModules as $module) {
643 643
             unset($out);
644
-            exec(\config\ConfAssistant::PATHS['makensis'] . " -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
644
+            exec(\config\ConfAssistant::PATHS['makensis']." -V1 '-X!include $module' '-XOutFile $exe' '-XSection X' '-XSectionEnd'", $out, $retval);
645 645
             if ($retval > 0) {
646 646
                 $NSIS_Module_status[$module] = 0;
647 647
             } else {
@@ -708,8 +708,8 @@  discard block
 block discarded – undo
708 708
         $locales = shell_exec("locale -a");
709 709
         $allthere = "";
710 710
         foreach (\config\Master::LANGUAGES as $onelanguage) {
711
-            if (preg_match("/" . $onelanguage['locale'] . "/", $locales) == 0) {
712
-                $allthere .= $onelanguage['locale'] . " ";
711
+            if (preg_match("/".$onelanguage['locale']."/", $locales) == 0) {
712
+                $allthere .= $onelanguage['locale']." ";
713 713
             }
714 714
         }
715 715
         if ($allthere == "") {
@@ -723,47 +723,47 @@  discard block
 block discarded – undo
723 723
         ["SETTING" => \config\Master::APPEARANCE['from-mail'],
724 724
             "DEFVALUE" => "[email protected]",
725 725
             "COMPLAINTSTRING" => "APPEARANCE/from-mail ",
726
-            "REQUIRED" => FALSE,],
726
+            "REQUIRED" => FALSE, ],
727 727
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['url'],
728 728
             "DEFVALUE" => "[email protected]?body=Only%20English%20language%20please!",
729 729
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/url ",
730
-            "REQUIRED" => FALSE,],
730
+            "REQUIRED" => FALSE, ],
731 731
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['display'],
732 732
             "DEFVALUE" => "[email protected]",
733 733
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/display ",
734
-            "REQUIRED" => FALSE,],
734
+            "REQUIRED" => FALSE, ],
735 735
         ["SETTING" => \config\Master::APPEARANCE['support-contact']['developer-mail'],
736 736
             "DEFVALUE" => "[email protected]",
737 737
             "COMPLAINTSTRING" => "APPEARANCE/support-contact/mail ",
738
-            "REQUIRED" => FALSE,],
738
+            "REQUIRED" => FALSE, ],
739 739
         ["SETTING" => \config\Master::APPEARANCE['abuse-mail'],
740 740
             "DEFVALUE" => "[email protected]",
741 741
             "COMPLAINTSTRING" => "APPEARANCE/abuse-mail ",
742
-            "REQUIRED" => FALSE,],
742
+            "REQUIRED" => FALSE, ],
743 743
         ["SETTING" => \config\Master::APPEARANCE['MOTD'],
744 744
             "DEFVALUE" => "Release Candidate. All bugs to be shot on sight!",
745 745
             "COMPLAINTSTRING" => "APPEARANCE/MOTD ",
746
-            "REQUIRED" => FALSE,],
746
+            "REQUIRED" => FALSE, ],
747 747
         ["SETTING" => \config\Master::APPEARANCE['webcert_CRLDP'],
748 748
             "DEFVALUE" => ['list', 'of', 'CRL', 'pointers'],
749 749
             "COMPLAINTSTRING" => "APPEARANCE/webcert_CRLDP ",
750
-            "REQUIRED" => TRUE,],
750
+            "REQUIRED" => TRUE, ],
751 751
         ["SETTING" => \config\Master::APPEARANCE['webcert_OCSP'],
752 752
             "DEFVALUE" => ['list', 'of', 'OCSP', 'pointers'],
753 753
             "COMPLAINTSTRING" => "APPEARANCE/webcert_OCSP ",
754
-            "REQUIRED" => TRUE,],
754
+            "REQUIRED" => TRUE, ],
755 755
         ["SETTING" => \config\Master::DB['INST']['host'],
756 756
             "DEFVALUE" => "db.host.example",
757 757
             "COMPLAINTSTRING" => "DB/INST ",
758
-            "REQUIRED" => TRUE,],
758
+            "REQUIRED" => TRUE, ],
759 759
         ["SETTING" => \config\Master::DB['INST']['host'],
760 760
             "DEFVALUE" => "db.host.example",
761 761
             "COMPLAINTSTRING" => "DB/USER ",
762
-            "REQUIRED" => TRUE,],
762
+            "REQUIRED" => TRUE, ],
763 763
         ["SETTING" => \config\Master::DB['EXTERNAL']['host'],
764 764
             "DEFVALUE" => "customerdb.otherhost.example",
765 765
             "COMPLAINTSTRING" => "DB/EXTERNAL ",
766
-            "REQUIRED" => FALSE,],
766
+            "REQUIRED" => FALSE, ],
767 767
     ];
768 768
 
769 769
     /**
@@ -792,11 +792,11 @@  discard block
 block discarded – undo
792 792
         if (isset(\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'])) {
793 793
             foreach (\config\Diagnostics::RADIUSTESTS['TLS-clientcerts'] as $cadata) {
794 794
                 foreach ($cadata['certificates'] as $cert_files) {
795
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['public']) === FALSE) {
796
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['public'] . " ";
795
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['public']) === FALSE) {
796
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['public']." ";
797 797
                     }
798
-                    if (file_get_contents(ROOT . "/config/cli-certs/" . $cert_files['private']) === FALSE) {
799
-                        $defaultvalues .= "CERTIFICATE/" . $cert_files['private'] . " ";
798
+                    if (file_get_contents(ROOT."/config/cli-certs/".$cert_files['private']) === FALSE) {
799
+                        $defaultvalues .= "CERTIFICATE/".$cert_files['private']." ";
800 800
                     }
801 801
                 }
802 802
             }
@@ -889,14 +889,14 @@  discard block
 block discarded – undo
889 889
         if ($global_no_cache) {
890 890
             foreach ($Devs as $dev => $D) {
891 891
                 if (empty($D['options']['no_cache']) || $D['options']['no_cache'] != 0) {
892
-                    $no_cache_dev .= $dev . " ";
892
+                    $no_cache_dev .= $dev." ";
893 893
                     $no_cache_dev_count++;
894 894
                 }
895 895
             }
896 896
         } else {
897 897
             foreach ($Devs as $dev => $D) {
898 898
                 if (!empty($D['options']['no_cache']) && $D['options']['no_cache'] != 0) {
899
-                    $no_cache_dev .= $dev . " ";
899
+                    $no_cache_dev .= $dev." ";
900 900
                     $no_cache_dev_count++;
901 901
                 }
902 902
             }
@@ -935,13 +935,13 @@  discard block
 block discarded – undo
935 935
         $mail->isHTML(FALSE);
936 936
         $mail->CharSet = 'UTF-8';
937 937
         $mail->From = \config\Master::APPEARANCE['from-mail'];
938
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Invitation System";
938
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Invitation System";
939 939
         $mail->addAddress(\config\Master::APPEARANCE['abuse-mail']);
940 940
         $mail->Subject = "testing CAT configuration mail";
941 941
         $mail->Body = "Testing CAT mailing\n";
942 942
         $sent = $mail->send();
943 943
         if ($sent) {
944
-            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check " . \config\Master::APPEARANCE['abuse-mail'] . " mailbox if the message was receiced.");
944
+            $this->storeTestResult(\core\common\Entity::L_OK, "mailer settings appear to be working, check ".\config\Master::APPEARANCE['abuse-mail']." mailbox if the message was receiced.");
945 945
         } else {
946 946
             $this->storeTestResult(\core\common\Entity::L_ERROR, "mailer settings failed, check the Config::MAILSETTINGS");
947 947
         }
Please login to merge, or discard this patch.