GEANT / CAT

web/lib/admin/OptionDisplay.php

Spacing +33 added lines, -33 removed lines

@@ -85,7 +85,7 @@ 
      * @return string HTML code <table>
      */
     public function prefilledOptionTable(string $attributePrefix) {
-        $retval = "<table id='expandable_$attributePrefix" . "_options'>";
+        $retval = "<table id='expandable_$attributePrefix"."_options'>";
 
         $prepopulate = [];
         foreach ($this->listOfOptions as $existingAttribute) {
@@ -93,7 +93,7 @@ 
                 $prepopulate[] = $existingAttribute;
             }
         }
-        if (is_array($prepopulate) && ( count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific" )) { // editing... fill with values
+        if (is_array($prepopulate) && (count($prepopulate) > 0 || $attributePrefix == "device-specific" || $attributePrefix == "eap-specific")) { // editing... fill with values
             $retval .= $this->addOptionEdit($attributePrefix, $prepopulate);
         } else {
             $retval .= $this->addOptionNew($attributePrefix);
@@ -125,7 +125,7 @@ 
                 $optiontypearray = $optioninfo->optionType($option['name']);
                 $loggerInstance = new \core\common\Logging();
                 $loggerInstance->debug(5, "About to execute optiontext with PREFILL!\n");
-                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-' . $option['level'] . '-' . $option['row'] : $option['value']), $option['lang']);
+                $retval .= $this->optiontext([$option['name']], ($optiontypearray["type"] == "file" ? 'ROWID-'.$option['level'].'-'.$option['row'] : $option['value']), $option['lang']);
             }
         }
         return $retval;
@@ -197,7 +197,7 @@ 
         if (!isset($descriptions[$input])) {
             return "";
         }
-        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>";
+        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>";
     }
 
     /**
@@ -210,18 +210,18 @@ 
      */
     private function selectElement($rowid, $list) {
         $jsmagic = "onchange='
-                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
+                               if (/#ML#/.test(document.getElementById(\"option-S" . $rowid."-select\").value)) {
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"block\";
                                    } else {
                                    document.getElementById(\"S$rowid-input-langselect\").style.display = \"none\";
                                    }";
         foreach (array_keys(OptionDisplay::HTML_DATATYPE_TEXTS) as $key) {
-            $jsmagic .= "if (/#" . $key . "#/.test(document.getElementById(\"option-S" . $rowid . "-select\").value)) {
-                                  document.getElementById(\"S$rowid-input-file\").style.display = \"" . ($key == \core\Options::TYPECODE_FILE ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-text\").style.display = \"" . ($key == \core\Options::TYPECODE_TEXT ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-string\").style.display = \"" . ($key == \core\Options::TYPECODE_STRING ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"" . ($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none") . "\";
-                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"" . ($key == \core\Options::TYPECODE_INTEGER ? "block" : "none") . "\";
+            $jsmagic .= "if (/#".$key."#/.test(document.getElementById(\"option-S".$rowid."-select\").value)) {
+                                  document.getElementById(\"S$rowid-input-file\").style.display = \"".($key == \core\Options::TYPECODE_FILE ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-text\").style.display = \"".($key == \core\Options::TYPECODE_TEXT ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-string\").style.display = \"".($key == \core\Options::TYPECODE_STRING ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-boolean\").style.display = \"".($key == \core\Options::TYPECODE_BOOLEAN ? "block" : "none")."\";
+                                  document.getElementById(\"S$rowid-input-integer\").style.display = \"".($key == \core\Options::TYPECODE_INTEGER ? "block" : "none")."\";
                              }
                              ";
             // hide all tooltips (each is a <span>, and there are no other <span>s)
@@ -252,7 +252,7 @@ 
                 $value = array_shift($list);
                 $listtype = $optioninfo->optionType($value);
                 $retval .= $uiElements->displayName($value);
-                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#'/>";
+                $retval .= "<input type='hidden' name='option[S$rowid]' value='$value#".$listtype["type"]."#".$listtype["flag"]."#'/>";
                 $activelisttype = $listtype;
                 $tooltips = $this->tooltip($rowid, $value, TRUE);
                 break;
@@ -260,7 +260,7 @@ 
                 $retval .= "<select id='option-S$rowid-select' name='option[S$rowid]' $jsmagic>";
                 foreach ($list as $value) {
                     $listtype = $optioninfo->optionType($value);
-                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ";
+                    $retval .= "<option id='option-S$rowid-v-$value' value='$value#".$listtype["type"]."#".$listtype["flag"]."#' ";
                     if ($iterator == $this->optionIterator) {
                         $retval .= "selected='selected'";
                         $activelisttype = $listtype;
@@ -268,7 +268,7 @@ 
                     } else {
                         $tooltips .= $this->tooltip($rowid, $value, FALSE);
                     }
-                    $retval .= ">" . $uiElements->displayName($value) . "</option>";
+                    $retval .= ">".$uiElements->displayName($value)."</option>";
                     $iterator++;
                 }
 
@@ -293,9 +293,9 @@ 
      */
     private function selectLanguage($rowid, $makeVisible) {
         \core\common\Entity::intoThePotatoes();
-        $retval = "<select style='display:" . ($makeVisible ? "block" : "none") . "' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect'>
-            <option value='' name='select_language' selected>" . _("select language") . "</option>
-            <option value='C' name='all_languages'>" . _("default/other languages") . "</option>";
+        $retval = "<select style='display:".($makeVisible ? "block" : "none")."' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect'>
+            <option value='' name='select_language' selected>" . _("select language")."</option>
+            <option value='C' name='all_languages'>" . _("default/other languages")."</option>";
         foreach (\config\Master::LANGUAGES as $langindex => $possibleLang) {
             $thislang = $possibleLang['display'];
             $retval .= "<option value='$langindex' name='$langindex'>$thislang</option>";
@@ -323,7 +323,7 @@ 
     private function inputFields($rowid, $activetype) {
         $retval = "";
         foreach (OptionDisplay::HTML_DATATYPE_TEXTS as $key => $type) {
-            $retval .= "<" . $type['html'] . " style='display:" . ($activetype['type'] == $key ? "block" : "none") . "' name='value[S$rowid-$key]' id='S" . $rowid . "-input-" . $key . "'" . $type['tail'] . ">";
+            $retval .= "<".$type['html']." style='display:".($activetype['type'] == $key ? "block" : "none")."' name='value[S$rowid-$key]' id='S".$rowid."-input-".$key."'".$type['tail'].">";
         }
         return $retval;
     }
@@ -338,11 +338,11 @@ 
     private function noPrefillText(int $rowid, array $list) {
         // first column: the <select> element with the names of options and their field-toggling JS magic
         $selectorInfo = $this->selectElement($rowid, $list);
-        $retval = "<td>" . $selectorInfo["TEXT"] . "</td>";
+        $retval = "<td>".$selectorInfo["TEXT"]."</td>";
         // second column: the <select> element for language selection - only visible if the active option is multi-lang
-        $retval .= "<td>" . $this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML") . "</td>";
+        $retval .= "<td>".$this->selectLanguage($rowid, $selectorInfo['ACTIVE']['flag'] == "ML")."</td>";
         // third column: the actual input fields; the data type of the active option is visible, all others hidden
-        $retval .= "<td>" . $this->inputFields($rowid, $selectorInfo['ACTIVE']) . "</td>";
+        $retval .= "<td>".$this->inputFields($rowid, $selectorInfo['ACTIVE'])."</td>";
         return $retval;
     }
 
@@ -365,20 +365,20 @@ 
         $retval .= "<td>";
         $uiElements = new UIElements();
         $listtype = $optioninfo->optionType($optionName);
-        $retval .= "<span style='display:flex;'>" . $uiElements->displayName($optionName);
-        $retval .= $this->tooltip($rowid, $optionName, TRUE) . "</span>";
-        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#" . $listtype["type"] . "#" . $listtype["flag"] . "#' ></td>";
+        $retval .= "<span style='display:flex;'>".$uiElements->displayName($optionName);
+        $retval .= $this->tooltip($rowid, $optionName, TRUE)."</span>";
+        $retval .= "<input type='hidden' id='option-S$rowid-select' name='option[S$rowid]' value='$optionName#".$listtype["type"]."#".$listtype["flag"]."#' ></td>";
 
         // language tag if any
         $retval .= "<td>";
         if ($listtype["flag"] == "ML") {
 
-            $language = "(" . strtoupper($optionLang) . ")";
+            $language = "(".strtoupper($optionLang).")";
             if ($optionLang == 'C') {
                 $language = _("(default/other languages)");
             }
             $retval .= $language;
-            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S" . $rowid . "-input-langselect' value='" . $optionLang . "' style='display:block'>";
+            $retval .= "<input type='hidden' name='value[S$rowid-lang]' id='S".$rowid."-input-langselect' value='".$optionLang."' style='display:block'>";
         }
         $retval .= "</td>";
 // attribute content
@@ -388,12 +388,12 @@ 
             case \core\Options::TYPECODE_COORDINATES:
                 $this->allLocationCount = $this->allLocationCount + 1;
                 // display of the locations varies by map provider
-                $classname = "\web\lib\admin\Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'];
+                $classname = "\web\lib\admin\Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'];
                 $link = $classname::optionListDisplayCode($optionValue, $this->allLocationCount);
-                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-" . \core\Options::TYPECODE_TEXT . "]' id='S$rowid-input-text' value='$optionValue'>$link";
+                $retval .= "<input readonly style='display:none' type='text' name='value[S$rowid-".\core\Options::TYPECODE_TEXT."]' id='S$rowid-input-text' value='$optionValue'>$link";
                 break;
             case \core\Options::TYPECODE_FILE:
-                $retval .= "<input readonly type='text' name='value[S$rowid-" . \core\Options::TYPECODE_STRING . "]' id='S" . $rowid . "-input-string' style='display:none' value='" . urlencode($optionValue) . "'>";
+                $retval .= "<input readonly type='text' name='value[S$rowid-".\core\Options::TYPECODE_STRING."]' id='S".$rowid."-input-string' style='display:none' value='".urlencode($optionValue)."'>";
                 $uiElements = new UIElements();
                 switch ($optionName) {
                     case "eap:ca_file":
@@ -423,7 +423,7 @@ 
                 if ($listtype['type'] == \core\Options::TYPECODE_BOOLEAN) {// only modify in this one case
                     $displayedVariant = ($optionValue == "on" ? _("on") : _("off"));
                 }
-                $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'>";
+                $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'>";
                 break;
             default:
                 // this should never happen!
@@ -468,10 +468,10 @@ 
        <td>
           <button type='button' class='delete' onclick='";
         if ($prefillValue !== NULL && $item == "general:geo_coordinates") {
-            $funcname = "Map" . \config\ConfAssistant::MAPPROVIDER['PROVIDER'] . 'DeleteCoord';
-            $retval .= 'if (typeof ' . $funcname . ' === "function") { ' . $funcname . '(' . $this->allLocationCount . '); } ';
+            $funcname = "Map".\config\ConfAssistant::MAPPROVIDER['PROVIDER'].'DeleteCoord';
+            $retval .= 'if (typeof '.$funcname.' === "function") { '.$funcname.'('.$this->allLocationCount.'); } ';
         }
-        $retval .= 'deleteOption("option-S' . $rowid . '")';
+        $retval .= 'deleteOption("option-S'.$rowid.'")';
         $retval .= "'>-</button>
        </td>
     </tr>";

web/lib/user/TextTemplates.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 const DOWNLOAD_REDIRECT_CONTINUE = 1054;
 const SB_GO_AWAY = 1060;
 const SB_FRONTPAGE_BIGDOWNLOADBUTTON = 1061;
-const SB_FRONTPAGE_ROLLER_CUSTOMBUILT= 1062;
+const SB_FRONTPAGE_ROLLER_CUSTOMBUILT = 1062;
 
 
 /**
@@ -87,7 +87,7 @@ 
         $this->templates[WELCOME_ABOARD_BACKTODOWNLOADS] = _("Back to downloads");
         $this->templates[EDUROAM_WELCOME_ADVERTISING] = sprintf(_("we would like to warmly welcome you among the several million users of %s! From now on, you will be able to use internet access resources on thousands of universities, research centres and other places all over the globe. All of this completely free of charge!"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[HEADING_TOPLEVEL_GREET] = sprintf(_("Welcome to %s"), \config\Master::APPEARANCE['productname']);
-        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"),\config\ConfAssistant::CONSORTIUM['display_name']);
+        $this->templates[HEADING_TOPLEVEL_PURPOSE] = sprintf(_("Connect your device to %s"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_EASY] = sprintf(_("%s installation made easy:"), \config\ConfAssistant::CONSORTIUM['display_name']);
         $this->templates[FRONTPAGE_ROLLER_CUSTOMBUILT] = _("Custom built for your organisation");
         $this->templates[FRONTPAGE_BIGDOWNLOADBUTTON] = sprintf(_("Click here to download your %s installer"), \config\ConfAssistant::CONSORTIUM['display_name'], \config\ConfAssistant::CONSORTIUM['display_name']);

web/skins/modern/Menu.php

Spacing +6 added lines, -6 removed lines

@@ -40,9 +40,9 @@ 
         $langsArray = [];
         foreach (\config\Master::LANGUAGES as $lang => $value) {
             if ($lang == $selectedLang) {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")', 'class'=>'selected-lang'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")', 'class'=>'selected-lang'];
             } else {
-                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("' . $lang . '")'];
+                $langsArray[] = ['text'=>$value['display'], 'link'=>'javascript:changeLang("'.$lang.'")'];
             }
         }
         $this->menu = [['id' => 'start',
@@ -101,13 +101,13 @@ 
                 $iD = $menuItem['id'] ?? $id;
                 $catInfo = NULL;
                 if (!empty($menuItem['catInfo'])) {
-                    $catInfo = 'javascript:infoCAT("' . $iD . '", "' . $menuItem['catInfo'][0] . '","' . $menuItem['catInfo'][1] . '")';
+                    $catInfo = 'javascript:infoCAT("'.$iD.'", "'.$menuItem['catInfo'][0].'","'.$menuItem['catInfo'][1].'")';
                 }
                 if (!empty($menuItem['link']) && substr($menuItem['link'], 0, 1) === '/') {
-                    $menuItem['link'] = \core\CAT::getRootUrlPath() . $menuItem['link'];
+                    $menuItem['link'] = \core\CAT::getRootUrlPath().$menuItem['link'];
                 }
                 $link = $catInfo ?? $menuItem['link'] ?? '';
-                $class = empty($menuItem['class']) ? '' : ' class="' . $menuItem['class'] . '"';
+                $class = empty($menuItem['class']) ? '' : ' class="'.$menuItem['class'].'"';
                 $submenu = $menuItem['submenu'] ?? [];
                 $out .= $this->printMenuItem($menuItem['text'], $link, $class);
                 $out .= $this->printMenu($submenu, $iD);
@@ -131,7 +131,7 @@ 
         if ($itemLink === '') {
             return("<li><span>$itemText</span>");
         }
-        return "<li><a href='" . $itemLink . "'" . $itemClass . '>' . $itemText . "</a>";
+        return "<li><a href='".$itemLink."'".$itemClass.'>'.$itemText."</a>";
     }
     
     /**

core/User.php

Spacing +5 added lines, -5 removed lines

@@ -154,8 +154,8 @@ 
         common\Entity::intoThePotatoes();
         $mail = \core\common\OutsideComm::mailHandle();
 // who to whom?
-        $mail->FromName = \config\Master::APPEARANCE['productname'] . " Notification System";
-        $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname'] . " " . _("Feedback"));
+        $mail->FromName = \config\Master::APPEARANCE['productname']." Notification System";
+        $mail->addReplyTo(\config\Master::APPEARANCE['support-contact']['developer-mail'], \config\Master::APPEARANCE['productname']." "._("Feedback"));
         $mail->addAddress($mailaddr[0]["value"]);
 // what do we want to say?
         $mail->Subject = $subject;
@@ -218,7 +218,7 @@ 
                 }
                 $lookFor .= "$name";
             }
-            $finding = preg_match("/^(" . $lookFor . "):(.*)/", $oneRow->user_id, $matches);
+            $finding = preg_match("/^(".$lookFor."):(.*)/", $oneRow->user_id, $matches);
             if ($finding === 0 || $finding === FALSE) {
                 return FALSE;
             }
@@ -236,7 +236,7 @@ 
                         $matchedProviders[] = $idp;
                         $name = $idp;
                         if ($skipCurl == 0) {
-                            $url = \config\Diagnostics::EDUGAINRESOLVER['url'] . "?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
+                            $url = \config\Diagnostics::EDUGAINRESOLVER['url']."?action=get_entity_name&type=idp&e_id=$idp&lang=$lang";
                             $ch = curl_init($url);
                             if ($ch === FALSE) {
                                 $loggerInstance->debug(2, "Unable ask eduGAIN about IdP - CURL init failed!");
@@ -252,7 +252,7 @@ 
                             }
                             curl_close($ch);
                         }
-                        $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]] . " - IdP: " . $name;
+                        $listOfProviders[] = User::PROVIDER_STRINGS[$providerStrings[0]]." - IdP: ".$name;
                     }
                     break;
                 case $providerStrings[1]:

core/diag/Logopath.php

Spacing +7 added lines, -7 removed lines

@@ -104,11 +104,11 @@ 
         $this->possibleFailureReasons = $_SESSION["SUSPECTS"] ?? []; // if we know nothing, don't talk to anyone
         $this->additionalFindings = $_SESSION["EVIDENCE"] ?? [];
 
-        $this->subjectPrefix = _("[eduroam Diagnostics]") . " ";
+        $this->subjectPrefix = _("[eduroam Diagnostics]")." ";
         $this->finalGreeting = "\n"
                 . _("(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 cat-devel@lists.geant.org, forwarding the entire message (including the 'SUSPECTS' and 'EVIDENCE' data at the end), and explain why this is a false positive.)")
                 . "\n"
-                . _("Yours sincerely,") . "\n"
+                . _("Yours sincerely,")."\n"
                 . "\n"
                 . _("Ed U. Roam, the eduroam diagnostics algorithm");
 
@@ -119,13 +119,13 @@ 
                 "bcc" => [],
                 "reply-to" => [Logopath::EDUROAM_OT],
                 "subject" => _("[POLICYVIOLATION NATIONAL] IdP with no entry in eduroam database"),
-                "body" => _("Dear NRO administrator,") . "\n"
+                "body" => _("Dear NRO administrator,")."\n"
                 . "\n"
-                . 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."), "foo.bar")) . "\n"
+                . 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."), "foo.bar"))."\n"
                 . "\n"
-                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.") . "\n"
+                . _("By not listing IdPs in the eduroam database, you are violating the eduroam policy.")."\n"
                 . "\n"
-                . _("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"
+                . _("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"
                 . "\n"
                 . "Please stop the policy violation ASAP by listing the IdP which is associated to this realm.",
             ],
@@ -279,7 +279,7 @@ 
 
             $handle = \core\common\OutsideComm::mailHandle();
             // let's identify outselves
-            $handle->FromName = \config\Master::APPEARANCE['productname'] . " Real-Time Diagnostics System";
+            $handle->FromName = \config\Master::APPEARANCE['productname']." Real-Time Diagnostics System";
             // add recipients
             foreach (Logopath::CATEGORYBINDING as $arrayName => $functionName) {
                 foreach ($theMail[$arrayName] as $onePrincipal) {

web/user/faq.php

Spacing +5 added lines, -5 removed lines

@@ -50,19 +50,19 @@ 
 
 array_push($FAQ, [
     'title' => sprintf(_("Is it safe to use %s installers?"), \config\Master::APPEARANCE['productname']),
-    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']) . ' ' . ( isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
+    'text' => sprintf(_("%s installers configure security settings on your device, therefore you should be sure that you are using genuine ones."), \config\Master::APPEARANCE['productname']).' '.(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("This is why %s installers are digitally signed by %s. Watch out for a system message confirming this."), \config\Master::APPEARANCE['productname'], \config\ConfAssistant::CONSORTIUM['signer_name']) : ""),
 ]);
 
 array_push($FAQ, [
     'title' => _("Windows 'SmartScreen' or 'Internet Explorer' tell me that the file is not commonly downloaded and possibly harmful. Should I be concerned?"),
-    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.") . " " . (isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name']) . " " : "") . sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
+    'text' => _("Contrary to what the name suggests, 'SmartScreen' isn't actually very smart. The warning merely means that the file has not yet been downloaded by enough users to make Microsoft consider it popular (which would strangely enough make it be considered 'safe'). This message alone is not a security problem.")." ".(isset(\config\ConfAssistant::CONSORTIUM['signer_name']) && \config\ConfAssistant::CONSORTIUM['signer_name'] != "" ? sprintf(_("So long as the file is carrying a valid signature from %s, the download is safe."), \config\ConfAssistant::CONSORTIUM['signer_name'])." " : "").sprintf(_("Please see also Microsoft's FAQ regarding SmartScreen at %s."), "<a href='http://windows.microsoft.com/en-US/windows7/SmartScreen-Filter-frequently-asked-questions-IE9?SignedIn=1'>Microsoft FAQ</a>")
 ]);
 
 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == NULL) {
     $text = sprintf(_("There can be a number of different reasons. The network you see may not be a genuine %s one and your device silently drops the connection attempt; there may be something wrong with the configuration of the network; your account may have expired; there may be a connection problem with your home authentication server; you may have broken the regulations of the network you are using and have been refused access as a consequence. You should contact your organisation and report the problem, the administrators should be able to trace your connections."), \config\ConfAssistant::CONSORTIUM['display_name']);
 } else {
     if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == 'LOCAL') {
-        $diagUrl = \config\Master::PATHS['cat_base_url'] . "diag/";
+        $diagUrl = \config\Master::PATHS['cat_base_url']."diag/";
     } else {
         $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'];
     }
@@ -99,8 +99,8 @@ 
     $tocText = "";
     $fullText = "";
     foreach ($FAQ as $faq) {
-        $tocText .= '<a href="#toc' . $counter . '">' . $faq['title'] . "</a><br>\n";
-        $fullText .= "<dt><a name=toc$counter>" . $faq['title'] . "</a></dt>\n<dd>" . $faq['text'] . "</dd>\n";
+        $tocText .= '<a href="#toc'.$counter.'">'.$faq['title']."</a><br>\n";
+        $fullText .= "<dt><a name=toc$counter>".$faq['title']."</a></dt>\n<dd>".$faq['text']."</dd>\n";
         $counter++;
     }
     ?>

web/admin/edit_federation.php

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
  */
 ?>
 <?php
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -61,7 +61,7 @@ 
         ?>
     </h1>
     <div class='infobox'>
-        <h2><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></h2>
+        <h2><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></h2>
         <table>
             <tr>
                 <td><?php echo _("Country:"); ?></td>
@@ -72,11 +72,11 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld" . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_federation_result.php?fed_id=$my_fed->tld"."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
     ?>
     <fieldset class="option_container">
-        <legend><strong><?php echo sprintf(_("%s Properties"),$uiElements->nomenclatureFed); ?></strong></legend>
+        <legend><strong><?php echo sprintf(_("%s Properties"), $uiElements->nomenclatureFed); ?></strong></legend>
         <?php
         $optionDisplay = new \web\lib\admin\OptionDisplay($fed_options, "FED");
         echo $optionDisplay->prefilledOptionTable("fed");
@@ -84,5 +84,5 @@ 
         <button type='button' class='newoption' onclick='getXML("fed")'><?php echo _("Add new option"); ?></button>
     </fieldset>
     <?php
-    echo "<div><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_federation.php\"'>" . _("Discard changes") . "</button></div></form>";
+    echo "<div><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_federation.php\"'>"._("Discard changes")."</button></div></form>";
     echo $deco->footer();

web/admin/edit_participant.php

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $auth = new \web\lib\admin\Authentication();
 $deco = new \web\lib\admin\PageDecoration();
@@ -39,7 +39,7 @@ 
 $inst_name = $my_inst->name;
 
 if ($wizardStyle) {
-    echo $deco->defaultPagePrelude(sprintf(_("%s: %s enrollment wizard (step 2)"), \config\Master::APPEARANCE['productname'],  $uiElements->nomenclatureParticipant));
+    echo $deco->defaultPagePrelude(sprintf(_("%s: %s enrollment wizard (step 2)"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant));
 } else {
     echo $deco->defaultPagePrelude(sprintf(_("%s: Editing %s '%s'"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureParticipant, $inst_name));
 }
@@ -94,12 +94,12 @@ 
         </table>
     </div>
     <?php
-    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier" . ($wizardStyle ? "&wizard=true" : "") . "' method='post' accept-charset='UTF-8'>
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
+    echo "<form enctype='multipart/form-data' action='edit_participant_result.php?inst_id=$my_inst->identifier".($wizardStyle ? "&wizard=true" : "")."' method='post' accept-charset='UTF-8'>
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
 
     if ($wizardStyle) {
-        echo "<p>" .
-        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant) . "</p>";
+        echo "<p>".
+        sprintf(_("Hello, newcomer. The %s is new to us. This wizard will ask you several questions about it, so that we can generate beautiful profiles for you in the end. All of the information below is optional, but it is important to fill out as many fields as possible for the benefit of your end users."), $uiElements->nomenclatureParticipant)."</p>";
     }
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, "IdP");
     ?>
@@ -107,11 +107,11 @@ 
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:") . "</p>
+            echo "<p>".
+            _("Some properties are valid across all deployment profiles. This is the place where you can describe those properties in a fine-grained way. The solicited information is used as follows:")."</p>
                       <ul>
-                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).") . "</li>
-                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."),$uiElements->nomenclatureParticipant) . "</li>";
+                         <li>" . _("<strong>Logo</strong>: When you submit a logo, we will embed this logo into all installers where a custom logo is possible. We accept any image format, but for best results, we suggest SVG. If you don't upload a logo, we will use the generic logo instead (see top-right corner of this page).")."</li>
+                         <li>" . sprintf(_("<strong>Name</strong>: The %s may have names in multiple languages. It is recommended to always populate at least the 'default/other' language, as it is used as a fallback if the system does not have a name in the exact language the user requests a download in."), $uiElements->nomenclatureParticipant)."</li>";
             echo "</ul>";
         }
         echo $optionDisplay->prefilledOptionTable("general");
@@ -125,47 +125,47 @@ 
         <legend><strong><?php echo _("Media Properties"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            echo "<p>" .
-            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>
+            echo "<p>".
+            sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>
           <ul>";
             echo "<li>";
-            echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
+            echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>";
             if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
                 $ssidlist = "";
                 foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) {
-                    $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
+                    $ssidlist .= ", '<strong>".$ssid."</strong>'";
                 }
                 $ssidlist = substr($ssidlist, 2);
                 echo sprintf(ngettext("We will always configure this SSID for WPA2/AES: %s.", "We will always configure these SSIDs for WPA2/AES: %s.", count(\config\ConfAssistant::CONSORTIUM['ssid'])), $ssidlist);
                 if (\config\ConfAssistant::CONSORTIUM['tkipsupport']) {
-                    echo " " . _("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
+                    echo " "._("They will also be configured for WPA/TKIP if the device supports multiple encryption types.");
                 }
-                echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the options '%s' and '%s' below."), $uiElements->displayName("media:SSID"), $uiElements->displayName("media:SSID_with_legacy"));
+                echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the options '%s' and '%s' below."), $uiElements->displayName("media:SSID"), $uiElements->displayName("media:SSID_with_legacy"));
             } else {
                 echo _("Please configure which SSIDs should be configured in the installers.");
             }
-            echo " " . _("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
+            echo " "._("By default, we will only configure the SSIDs with WPA2/AES encryption. By using the '(with WPA/TKIP)' option you can specify that we should include legacy support for WPA/TKIP where possible.");
             echo "</li>";
 
             echo "<li>";
-            echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
+            echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>";
             if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) {
                 $consortiumlist = "";
                 foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) {
-                    $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
+                    $consortiumlist .= ", '<strong>".$oi."</strong>'";
                 }
                 $consortiumlist = substr($consortiumlist, 2);
                 echo sprintf(ngettext("We will always configure this Consortium OI: %s.", "We will always configure these Consortium OIs: %s.", count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'])), $consortiumlist);
 
-                echo "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
+                echo "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
             } else {
                 echo _("Please configure which Consortium OIs should be configured in the installers.");
             }
             echo "</li>";
-            echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
-            . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).") .
+            echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
+            . _("If you want to configure your users' devices with IEEE 802.1X support for wired ethernet, please check the corresponding box. Note that this makes the installation process a bit more difficult on some platforms (Windows: needs administrator privileges; Apple: attempting to install a profile with wired support on a device without an active wired ethernet card will fail).").
             "</li>";
-            echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
+            echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
             . _("If you use a captive portal to distribute configurations, you may want to unconfigure/disable that SSID after the bootstrap process. With this option, the SSID will either be removed, or be defined as 'Only connect manually'.")
             . "</li>";
             echo "</ul>";
@@ -181,16 +181,16 @@ 
             echo "<p>"._("This section can be used to upload specific Terms of Use for your users and to display details of how your users can reach your local helpdesk.")."</p>";
             
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
-                echo "<p>" .
+                echo "<p>".
                         
-                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."),$uiElements->nomenclatureParticipant)  . "</p>" .
-                "<p>" .
-                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.") . "</p>";
+                sprintf(_("Do you provide helpdesk services for your users? If so, it would be nice if you would tell us the pointers to this helpdesk."), $uiElements->nomenclatureParticipant)."</p>".
+                "<p>".
+                _("If you enter a value here, it will be added to the installers for all your users, and will be displayed on the download page. If you operate separate helpdesks for different user groups (we call this 'profiles') specify per-profile helpdesk information later in this wizard. If you operate no help desk at all, just leave these fields empty.")."</p>";
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME) ." " . _("This is the contact point for your end users' level 1 support.") . "</p>";
+                echo "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), core\ProfileSilverbullet::PRODUCTNAME)." "._("This is the contact point for your end users' level 1 support.")."</p>";
                 }
             } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                echo "<p>". _("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
+                echo "<p>"._("Providing at least a local support e-mail contact is required.")." "._("This is the contact point for your end users' level 1 support.")."</p>";
             }
             
         }
@@ -200,8 +200,8 @@ 
         <button type='button' class='newoption' onclick='getXML("support")'><?php echo _("Add new option"); ?></button></fieldset>
     <?php
     if ($wizardStyle) {
-        echo "<p>" . sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_CONTINUE . "'>", "</button>") . "</p></form>";
+        echo "<p>".sprintf(_("When you are sure that everything is correct, please click on %sContinue ...%s"), "<button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_CONTINUE."'>", "</button>")."</p></form>";
     } else {
-        echo "<div><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_user.php\"'>" . _("Discard changes") . "</button></div></form>";
+        echo "<div><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_user.php\"'>"._("Discard changes")."</button></div></form>";
     }
     echo $deco->footer();

web/admin/sanity_tests.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  *          <base_url>/copyright.php after deploying the software
  */
 
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
 
 $Tests = [
     'CatBaseUrl',
@@ -42,7 +42,7 @@ 
 
 $uiElements = new \web\lib\admin\UIElements();
 
-if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL" ) {
+if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL" || \config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
     $Tests[] = 'Makensis';
     $Tests[] = 'Makensis=>NSISmodules';
 }