GEANT / CAT

web/admin/overview_org.php

Spacing +35 added lines, -35 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";
 
 function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) {
     ?>
@@ -43,14 +43,14 @@ 
                 <ul style='margin:1px'>
                     <?php
                     foreach ($completeness as $missing_attrib) {
-                        echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                        echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
                     }
                     ?>
                 </ul>
             </div>
             <?php
         } else {
-            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value']) . "<br/>" . sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
+            echo sprintf(_("You can create up to %d users."), $maxusers[0]['value'])."<br/>".sprintf(_("Their credentials will carry the name <strong>%s</strong>."), $theProfile->realm);
         }
         ?>
         <br/>
@@ -59,7 +59,7 @@ 
         if ($readonly === FALSE) {
             ?>
             <form action='edit_silverbullet.php?inst_id=<?php echo $my_inst->identifier; ?>&amp;profile_id=<?php echo $theProfile->identifier; ?>' method='POST'>
-                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
+                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
             </form>
             <?php
         }
@@ -92,21 +92,21 @@ 
                 $has_overrides = TRUE;
             }
         }
-        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
+        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
         $typelist = $theProfile->getEapMethodsinOrderOfPreference();
         $allcomplete = TRUE;
         foreach ($typelist as $eaptype) {
             $buffer_eaptypediv .= $eaptype->getPrintableRep();
             $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype);
             if ($completeness === true) {
-                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
+                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
             } else {
                 $buffer_eaptypediv .= " <div class='notacceptable'>";
                 $buffer_eaptypediv .= _("Information needed!");
                 if (is_array($completeness)) {
                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
                     foreach ($completeness as $missing_attrib) {
-                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
+                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
                     }
                     $buffer_eaptypediv .= "</ul>";
                 }
@@ -118,7 +118,7 @@ 
             foreach ($attribs as $attrib) {
                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
                     $justOnce = TRUE;
-                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
+                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
                 }
             }
             $buffer_eaptypediv .= "<br/>";
@@ -164,11 +164,11 @@ 
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
                     $diagUrl = "../diag/";
                 } else {
-                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
+                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
                 }
                 ?>
-                <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
-                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/>
+                <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
+                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/>
                     <button type='submit' name='profile_action' value='check' <?php echo ($has_realm ? "" : "disabled='disabled'"); ?> title='<?php echo _("The realm can only be checked if you configure the realm!"); ?>'>
                         <?php echo _("Check realm reachability"); ?>
                     </button>
@@ -201,9 +201,9 @@ 
                 ?>
                 <div style='display: flex;'>
                     <?php
-                    $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution;
-                    $displayurl = $idpLevelUrl . "&amp;profile=" . $theProfile->identifier;
-                    $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier;
+                    $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution;
+                    $displayurl = $idpLevelUrl."&amp;profile=".$theProfile->identifier;
+                    $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier;
                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -215,9 +215,9 @@ 
                     if (empty($rawQr)) {
                         throw new Exception("Something went seriously wrong during QR code generation!");
                     }
-                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
+                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
                     $size = getimagesize($uri);
-                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
+                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
 
                     //echo "<nobr>$displayurl</nobr></a>";
                     echo "<p>$displayurl</p></a>";
@@ -249,7 +249,7 @@ 
             <h2><?php
                 switch ($deploymentObject->consortium) {
                     case "eduroam":
-                        $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME;
+                        $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME;
                         break;
                     case "OpenRoaming":
                         $displayname = "OpenRoaming ANP";
@@ -257,7 +257,7 @@ 
                     default:
                         throw new Exception("We are supposed to operate on a roaming consortium we don't know.");
                 }
-                echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)";
+                echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)";
                 ?></h2>
             <table>
                 <caption><?php echo _("Deployment Details"); ?></caption>
@@ -271,13 +271,13 @@ 
                     <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
                         <?php
                         if ($deploymentObject->host1_v4 !== NULL) {
-                            echo _("IPv4") . ": " . $deploymentObject->host1_v4;
+                            echo _("IPv4").": ".$deploymentObject->host1_v4;
                         }
                         if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
                             echo "<br/>";
                         }
                         if ($deploymentObject->host1_v6 !== NULL) {
-                            echo _("IPv6") . ": " . $deploymentObject->host1_v6;
+                            echo _("IPv6").": ".$deploymentObject->host1_v6;
                         }
                         ?>
                     </td>
@@ -285,9 +285,9 @@ 
                     <td><?php echo $deploymentObject->port1; ?></td>
                     <td>
                         <?php
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
                         ?>
                     </td>
                 </tr>
@@ -295,22 +295,22 @@ 
                     <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
                         <?php
                         if ($deploymentObject->host2_v4 !== NULL) {
-                            echo _("IPv4") . ": " . $deploymentObject->host2_v4;
+                            echo _("IPv4").": ".$deploymentObject->host2_v4;
                         }
                         if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
                             echo "<br/>";
                         }
                         if ($deploymentObject->host2_v6 !== NULL) {
-                            echo _("IPv6") . ": " . $deploymentObject->host2_v6;
+                            echo _("IPv6").": ".$deploymentObject->host2_v6;
                         }
                         ?></td>
                     <td><?php echo _("RADIUS port number: ") ?></td>
                     <td><?php echo $deploymentObject->port2; ?></td>
                     <td>
                         <?php
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
                         ?>
                     </td>
                 </tr>
@@ -362,12 +362,12 @@ 
                             if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
                                 echo '<br>';
                                 if ($res['FAILURE'] == 2) {
-                                    echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
+                                    echo ' <span style="color: red;">'._("Activation failure.").'</span>';
                                 } else {
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                        echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
                                     } else {
-                                        echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
                                     }
                                 }
                             }
@@ -387,12 +387,12 @@ 
                             if ($res['FAILURE'] > 0) {
                                 echo '<br>';
                                 if ($res['FAILURE'] == 2) {
-                                    echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
+                                    echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
                                 } else {
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
-                                        echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
                                     } else {
-                                        echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
+                                        echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
                                     }
                                 }
                             }
@@ -588,7 +588,7 @@ 
                         <div>
                             <input type="hidden" name="consortium" value="eduroam"/>
                             <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'>
-                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?>
+                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?>
                             </button>
 
                         </div>

web/admin/edit_participant.php

Spacing +30 added lines, -30 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();
@@ -102,12 +102,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, \core\Options::LEVEL_IDP);
     ?>
@@ -115,11 +115,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", $my_inst->federation);
@@ -134,44 +134,44 @@ 
             <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);
-                    echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
+                    echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
                 } 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>";
@@ -187,18 +187,18 @@ 
         <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend>
         <?php
         if ($wizardStyle) {
-            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>";
+            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>" .
-                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>";
+                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>";
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
-                    echo "<p>" . sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), config\ConfAssistant::SILVERBULLET['product_name']) . " " . _("This is the contact point for your organisation. It may be displayed publicly.") . "</p>";
+                    echo "<p>".sprintf(_("For %s deployments, providing at least a local e-mail contact is required."), config\ConfAssistant::SILVERBULLET['product_name'])." "._("This is the contact point for your organisation. It may be displayed publicly.")."</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>";
             }
         }
         echo $optionDisplay->prefilledOptionTable("support", $fed->tld);
@@ -207,9 +207,9 @@ 
         <button type='button' class='newoption' onclick='getXML("support", "<?php echo $my_inst->federation ?>")'><?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();
     
\ No newline at end of file