Test Setup Failed
Push — master ( 47156c...cfde7f )
by Stefan
06:38
created
web/admin/edit_participant.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  *          <base_url>/copyright.php after deploying the software
20 20
  */
21 21
 
22
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
22
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
23 23
 
24 24
 $auth = new \web\lib\admin\Authentication();
25 25
 $deco = new \web\lib\admin\PageDecoration();
@@ -102,12 +102,12 @@  discard block
 block discarded – undo
102 102
         </table>
103 103
     </div>
104 104
     <?php
105
-    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'>
106
-              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>";
105
+    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'>
106
+              <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE."'>";
107 107
 
108 108
     if ($wizardStyle) {
109
-        echo "<p>" .
110
-        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>";
109
+        echo "<p>".
110
+        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>";
111 111
     }
112 112
     $optionDisplay = new web\lib\admin\OptionDisplay($idpoptions, \core\Options::LEVEL_IDP);
113 113
     ?>
@@ -115,11 +115,11 @@  discard block
 block discarded – undo
115 115
         <legend><strong><?php echo _("General Information"); ?></strong></legend>
116 116
         <?php
117 117
         if ($wizardStyle) {
118
-            echo "<p>" .
119
-            _("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>
118
+            echo "<p>".
119
+            _("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>
120 120
                       <ul>
121
-                         <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>
122
-                         <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>";
121
+                         <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>
122
+                         <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>";
123 123
             echo "</ul>";
124 124
         }
125 125
         echo $optionDisplay->prefilledOptionTable("general", $my_inst->federation);
@@ -134,44 +134,44 @@  discard block
 block discarded – undo
134 134
             <legend><strong><?php echo _("Media Properties"); ?></strong></legend>
135 135
             <?php
136 136
             if ($wizardStyle) {
137
-                echo "<p>" .
138
-                sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name']) . "</p>
137
+                echo "<p>".
138
+                sprintf(_("In this section, you define on which media %s should be configured on user devices."), \config\ConfAssistant::CONSORTIUM['display_name'])."</p>
139 139
           <ul>";
140 140
                 echo "<li>";
141
-                echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:")) . " </strong>";
141
+                echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional SSIDs:") : _("SSIDs:"))." </strong>";
142 142
                 if (count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0) {
143 143
                     $ssidlist = "";
144 144
                     foreach (\config\ConfAssistant::CONSORTIUM['ssid'] as $ssid) {
145
-                        $ssidlist .= ", '<strong>" . $ssid . "</strong>'";
145
+                        $ssidlist .= ", '<strong>".$ssid."</strong>'";
146 146
                     }
147 147
                     $ssidlist = substr($ssidlist, 2);
148 148
                     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);
149
-                    echo "<br/>" . sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
149
+                    echo "<br/>".sprintf(_("It is also possible to define custom additional SSIDs with the option '%s' below."), $uiElements->displayName("media:SSID"));
150 150
                 } else {
151 151
                     echo _("Please configure which SSIDs should be configured in the installers.");
152 152
                 }
153
-                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.");
153
+                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.");
154 154
                 echo "</li>";
155 155
 
156 156
                 echo "<li>";
157
-                echo "<strong>" . ( count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:")) . " </strong>";
157
+                echo "<strong>".(count(\config\ConfAssistant::CONSORTIUM['ssid']) > 0 ? _("Additional Hotspot 2.0 / Passpoint Consortia:") : _("Hotspot 2.0 / Passpoint Consortia:"))." </strong>";
158 158
                 if (count(\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi']) > 0) {
159 159
                     $consortiumlist = "";
160 160
                     foreach (\config\ConfAssistant::CONSORTIUM['interworking-consortium-oi'] as $oi) {
161
-                        $consortiumlist .= ", '<strong>" . $oi . "</strong>'";
161
+                        $consortiumlist .= ", '<strong>".$oi."</strong>'";
162 162
                     }
163 163
                     $consortiumlist = substr($consortiumlist, 2);
164 164
                     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);
165 165
 
166
-                    echo "<br/>" . sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
166
+                    echo "<br/>".sprintf(_("It is also possible to define custom additional OIs with the option '%s' below."), $uiElements->displayName("media:consortium_OI"));
167 167
                 } else {
168 168
                     echo _("Please configure which Consortium OIs should be configured in the installers.");
169 169
                 }
170 170
                 echo "</li>";
171
-                echo "<li><strong>" . _("Support for wired IEEE 802.1X:") . " </strong>"
172
-                . _("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).") .
171
+                echo "<li><strong>"._("Support for wired IEEE 802.1X:")." </strong>"
172
+                . _("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).").
173 173
                 "</li>";
174
-                echo "<li><strong>" . _("Removal of bootstrap/onboarding SSIDs:") . " </strong>"
174
+                echo "<li><strong>"._("Removal of bootstrap/onboarding SSIDs:")." </strong>"
175 175
                 . _("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'.")
176 176
                 . "</li>";
177 177
                 echo "</ul>";
@@ -187,18 +187,18 @@  discard block
 block discarded – undo
187 187
         <legend><strong><?php echo _("Helpdesk Details for all users"); ?></strong></legend>
188 188
         <?php
189 189
         if ($wizardStyle) {
190
-            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>";
190
+            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>";
191 191
 
192 192
             if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_RADIUS'] == "LOCAL") {
193
-                echo "<p>" .
194
-                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>" .
195
-                "<p>" .
196
-                _("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>";
193
+                echo "<p>".
194
+                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>".
195
+                "<p>".
196
+                _("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>";
197 197
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
198
-                    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>";
198
+                    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>";
199 199
                 }
200 200
             } elseif (\config\Master::FUNCTIONALITY_LOCATIONS['CONFASSISTANT_SILVERBULLET'] == "LOCAL") {
201
-                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>";
201
+                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>";
202 202
             }
203 203
         }
204 204
         echo $optionDisplay->prefilledOptionTable("support", $fed->tld);
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
         <button type='button' class='newoption' onclick='getXML("support", "<?php echo $my_inst->federation ?>")'><?php echo _("Add new option"); ?></button></fieldset>
208 208
     <?php
209 209
     if ($wizardStyle) {
210
-        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>";
210
+        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>";
211 211
     } else {
212
-        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>";
212
+        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>";
213 213
     }
214 214
     echo $deco->footer();
215 215
     
216 216
\ No newline at end of file
Please login to merge, or discard this patch.
web/admin/overview_org.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  */
27 27
 ?>
28 28
 <?php
29
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php";
29
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php";
30 30
 
31 31
 function displaySilverbulletPropertyWidget(&$theProfile, $readonly, &$uiElements) {
32 32
     ?>
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
                 <ul style='margin:1px'>
44 44
                     <?php
45 45
                     foreach ($completeness as $missing_attrib) {
46
-                        echo "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
46
+                        echo "<li>".$uiElements->displayName($missing_attrib)."</li>";
47 47
                     }
48 48
                     ?>
49 49
                 </ul>
50 50
             </div>
51 51
             <?php
52 52
         } else {
53
-            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);
53
+            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);
54 54
         }
55 55
         ?>
56 56
         <br/>
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         if ($readonly === FALSE) {
60 60
             ?>
61 61
             <form action='edit_silverbullet.php?inst_id=<?php echo $theProfile->institution; ?>&amp;profile_id=<?php echo $theProfile->identifier; ?>' method='POST'>
62
-                <button <?php echo ( is_array($completeness) ? "disabled" : "" ); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
62
+                <button <?php echo (is_array($completeness) ? "disabled" : ""); ?> type='submit' name='sb_action' value='sb_edit'><?php echo _("Manage User Base"); ?></button>
63 63
             </form>
64 64
             <?php
65 65
         }
@@ -92,21 +92,21 @@  discard block
 block discarded – undo
92 92
                 $has_overrides = TRUE;
93 93
             }
94 94
         }
95
-        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>";
95
+        $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>"._("<strong>EAP Types</strong> (in order of preference):")."<br/>";
96 96
         $typelist = $theProfile->getEapMethodsinOrderOfPreference();
97 97
         $allcomplete = TRUE;
98 98
         foreach ($typelist as $eaptype) {
99 99
             $buffer_eaptypediv .= $eaptype->getPrintableRep();
100 100
             $completeness = $theProfile->isEapTypeDefinitionComplete($eaptype);
101 101
             if ($completeness === true) {
102
-                $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>";
102
+                $buffer_eaptypediv .= " <div class='acceptable'>"._("OK")."</div>";
103 103
             } else {
104 104
                 $buffer_eaptypediv .= " <div class='notacceptable'>";
105 105
                 $buffer_eaptypediv .= _("Information needed!");
106 106
                 if (is_array($completeness)) {
107 107
                     $buffer_eaptypediv .= "<ul style='margin:1px'>";
108 108
                     foreach ($completeness as $missing_attrib) {
109
-                        $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>";
109
+                        $buffer_eaptypediv .= "<li>".$uiElements->displayName($missing_attrib)."</li>";
110 110
                     }
111 111
                     $buffer_eaptypediv .= "</ul>";
112 112
                 }
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
             foreach ($attribs as $attrib) {
119 119
                 if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) {
120 120
                     $justOnce = TRUE;
121
-                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>";
121
+                    $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='"._("Options on EAP Method/Device level are in effect.")."'>";
122 122
                 }
123 123
             }
124 124
             $buffer_eaptypediv .= "<br/>";
@@ -164,11 +164,11 @@  discard block
 block discarded – undo
164 164
                 if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] == "LOCAL") {
165 165
                     $diagUrl = "../diag/";
166 166
                 } else {
167
-                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] . "/diag/";
167
+                    $diagUrl = \config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS']."/diag/";
168 168
                 }
169 169
                 ?>
170
-                <form action='<?php echo $diagUrl . "action_realmcheck.php?inst_id=" . $theProfile->institution . "&profile_id=" . $theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
171
-                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link . $_SERVER['SCRIPT_NAME']); ?>'/>
170
+                <form action='<?php echo $diagUrl."action_realmcheck.php?inst_id=".$theProfile->institution."&profile_id=".$theProfile->identifier ?>' method='post' accept-charset='UTF-8'>
171
+                    <input type='hidden' name='comefrom' value='<?php echo htmlspecialchars($link.$_SERVER['SCRIPT_NAME']); ?>'/>
172 172
                     <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!"); ?>'>
173 173
                         <?php echo _("Check realm reachability"); ?>
174 174
                     </button>
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
                 ?>
202 202
                 <div style='display: flex;'>
203 203
                     <?php
204
-                    $idpLevelUrl = $link . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "?idp=" . $theProfile->institution;
205
-                    $displayurl = $idpLevelUrl . "&amp;profile=" . $theProfile->identifier;
206
-                    $QRurl = $idpLevelUrl . "&profile=" . $theProfile->identifier;
204
+                    $idpLevelUrl = $link.dirname(dirname($_SERVER['SCRIPT_NAME']))."?idp=".$theProfile->institution;
205
+                    $displayurl = $idpLevelUrl."&amp;profile=".$theProfile->identifier;
206
+                    $QRurl = $idpLevelUrl."&profile=".$theProfile->identifier;
207 207
                     $qrCode = new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
208 208
                                 'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_IMAGE_PNG,
209 209
                                 'eccLevel' => \chillerlan\QRCode\QRCode::ECC_H,
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
215 215
                     if (empty($rawQr)) {
216 216
                         throw new Exception("Something went seriously wrong during QR code generation!");
217 217
                     }
218
-                    $uri = "data:image/png;base64," . base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
218
+                    $uri = "data:image/png;base64,".base64_encode($uiElements->pngInjectConsortiumLogo($rawQr, web\lib\admin\UIElements::QRCODE_PIXELS_PER_SYMBOL));
219 219
                     $size = getimagesize($uri);
220
-                    echo "<img width='" . ($size[0] / 4) . "' height='" . ($size[1] / 4) . "' src='$uri' alt='QR-code'/>";
220
+                    echo "<img width='".($size[0] / 4)."' height='".($size[1] / 4)."' src='$uri' alt='QR-code'/>";
221 221
 
222 222
                     //echo "<nobr>$displayurl</nobr></a>";
223 223
                     echo "<p>$displayurl</p></a>";
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
             <h2><?php
262 262
                 switch ($deploymentObject->consortium) {
263 263
                     case "eduroam":
264
-                        $displayname = config\ConfAssistant::CONSORTIUM['name'] . " " . core\DeploymentManaged::PRODUCTNAME;
264
+                        $displayname = config\ConfAssistant::CONSORTIUM['name']." ".core\DeploymentManaged::PRODUCTNAME;
265 265
                         break;
266 266
                     case "OpenRoaming":
267 267
                         $displayname = "OpenRoaming ANP";
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
                     default:
270 270
                         throw new Exception("We are supposed to operate on a roaming consortium we don't know.");
271 271
                 }
272
-                echo $displayname . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)";
272
+                echo $displayname." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)";
273 273
                 ?></h2>
274 274
             <table>
275 275
                 <caption><?php echo _("Deployment Details"); ?></caption>
@@ -283,13 +283,13 @@  discard block
 block discarded – undo
283 283
                     <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/>
284 284
                         <?php
285 285
                         if ($deploymentObject->host1_v4 !== NULL) {
286
-                            echo _("IPv4") . ": " . $deploymentObject->host1_v4;
286
+                            echo _("IPv4").": ".$deploymentObject->host1_v4;
287 287
                         }
288 288
                         if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) {
289 289
                             echo "<br/>";
290 290
                         }
291 291
                         if ($deploymentObject->host1_v6 !== NULL) {
292
-                            echo _("IPv6") . ": " . $deploymentObject->host1_v6;
292
+                            echo _("IPv6").": ".$deploymentObject->host1_v6;
293 293
                         }
294 294
                         ?>
295 295
                     </td>
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
                     <td><?php echo $deploymentObject->port1; ?></td>
298 298
                     <td>
299 299
                         <?php
300
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] .
301
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] .
302
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>";
300
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon'].
301
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text'].
302
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>";
303 303
                         ?>
304 304
                     </td>
305 305
                 </tr>
@@ -307,22 +307,22 @@  discard block
 block discarded – undo
307 307
                     <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong>
308 308
                         <?php
309 309
                         if ($deploymentObject->host2_v4 !== NULL) {
310
-                            echo _("IPv4") . ": " . $deploymentObject->host2_v4;
310
+                            echo _("IPv4").": ".$deploymentObject->host2_v4;
311 311
                         }
312 312
                         if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) {
313 313
                             echo "<br/>";
314 314
                         }
315 315
                         if ($deploymentObject->host2_v6 !== NULL) {
316
-                            echo _("IPv6") . ": " . $deploymentObject->host2_v6;
316
+                            echo _("IPv6").": ".$deploymentObject->host2_v6;
317 317
                         }
318 318
                         ?></td>
319 319
                     <td><?php echo _("RADIUS port number: ") ?></td>
320 320
                     <td><?php echo $deploymentObject->port2; ?></td>
321 321
                     <td>
322 322
                         <?php
323
-                        echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] .
324
-                        "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] .
325
-                        "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>";
323
+                        echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon'].
324
+                        "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text'].
325
+                        "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>";
326 326
                         ?>
327 327
                     </td>
328 328
                 </tr>
@@ -374,12 +374,12 @@  discard block
 block discarded – undo
374 374
                             if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) {
375 375
                                 echo '<br>';
376 376
                                 if ($res['FAILURE'] == 2) {
377
-                                    echo ' <span style="color: red;">' . _("Activation failure.") . '</span>';
377
+                                    echo ' <span style="color: red;">'._("Activation failure.").'</span>';
378 378
                                 } else {
379 379
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
380
-                                        echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>';
380
+                                        echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>';
381 381
                                     } else {
382
-                                        echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>';
382
+                                        echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>';
383 383
                                     }
384 384
                                 }
385 385
                             }
@@ -399,12 +399,12 @@  discard block
 block discarded – undo
399 399
                             if ($res['FAILURE'] > 0) {
400 400
                                 echo '<br>';
401 401
                                 if ($res['FAILURE'] == 2) {
402
-                                    echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>';
402
+                                    echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>';
403 403
                                 } else {
404 404
                                     if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') {
405
-                                        echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>';
405
+                                        echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>';
406 406
                                     } else {
407
-                                        echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>';
407
+                                        echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>';
408 408
                                     }
409 409
                                 }
410 410
                             }
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
                         <div>
604 604
                             <input type="hidden" name="consortium" value="eduroam"/>
605 605
                             <button type='submit' <?php echo ($hasMail > 0 ? "" : "disabled"); ?> name='profile_action' value='new'>
606
-                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name'] . " " . \core\DeploymentManaged::PRODUCTNAME); ?>
606
+                                <?php echo sprintf(_("Add %s deployment ..."), \config\ConfAssistant::CONSORTIUM['name']." ".\core\DeploymentManaged::PRODUCTNAME); ?>
607 607
                             </button>
608 608
 
609 609
                         </div>
Please login to merge, or discard this patch.