@@ -150,8 +150,8 @@ discard block |
||
150 | 150 | <td> |
151 | 151 | <?php |
152 | 152 | echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
153 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
154 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
153 | + "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
154 | + "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
155 | 155 | ?> |
156 | 156 | </td> |
157 | 157 | </tr> |
@@ -173,8 +173,8 @@ discard block |
||
173 | 173 | <td> |
174 | 174 | <?php |
175 | 175 | echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
176 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
177 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
176 | + "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
177 | + "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
178 | 178 | ?> |
179 | 179 | </td> |
180 | 180 | </tr> |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <?php |
29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $deco = new \web\lib\admin\PageDecoration(); |
32 | 32 | $validator = new \web\lib\common\InputValidation(); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | } else { |
39 | 39 | $link = 'http://'; |
40 | 40 | } |
41 | -$link .= $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME']; |
|
41 | +$link .= $_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']; |
|
42 | 42 | $link = htmlspecialchars($link); |
43 | 43 | |
44 | 44 | echo $deco->defaultPagePrelude(sprintf(_("%s: %s Dashboard"), \config\Master::APPEARANCE['productname'], $uiElements->nomenclatureHotspot)); |
@@ -102,21 +102,21 @@ discard block |
||
102 | 102 | <?php |
103 | 103 | if (\config\Master::FUNCTIONALITY_LOCATIONS['DIAGNOSTICS'] !== NULL) { |
104 | 104 | echo "<tr> |
105 | - <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"),$uiElements->nomenclatureInst) . "</td> |
|
105 | + <td>" . sprintf(_("Diagnose reachability and connection parameters of %ss"), $uiElements->nomenclatureInst)."</td> |
|
106 | 106 | <td><form method='post' action='../diag/action_realmcheck.php?inst_id=$my_inst->identifier' accept-charset='UTF-8'> |
107 | 107 | <!--<input type='text' name='realm' id='realm'>--> |
108 | 108 | <input type='hidden' name='comefrom' id='comefrom' value='$link'/> |
109 | - <button id='realmcheck' style='cursor:pointer;' type='submit'>" . _("Go!") . "</button> |
|
109 | + <button id='realmcheck' style='cursor:pointer;' type='submit'>"._("Go!")."</button> |
|
110 | 110 | </form> |
111 | 111 | </td> |
112 | 112 | </tr>"; |
113 | 113 | } |
114 | 114 | if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam") { // SW: APPROVED |
115 | 115 | echo "<tr> |
116 | - <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed) . "</td> |
|
116 | + <td>" . sprintf(_("Check %s server status"), $uiElements->nomenclatureFed)."</td> |
|
117 | 117 | <td> |
118 | 118 | <form action='https://monitor.eduroam.org/mon_direct.php' accept-charset='UTF-8'> |
119 | - <button style='cursor:pointer;' type='submit'>" . _("Go!") . "</button> |
|
119 | + <button style='cursor:pointer;' type='submit'>" . _("Go!")."</button> |
|
120 | 120 | </form> |
121 | 121 | </td> |
122 | 122 | </tr>"; |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | <?php |
128 | 128 | $hotspotProfiles = $my_inst->listDeployments(); |
129 | 129 | if (count($hotspotProfiles) == 0) { // no profiles yet. |
130 | - echo "<h2>" . sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot) . "</h2>"; |
|
130 | + echo "<h2>".sprintf(_("There are not yet any known deployments for your %s."), $uiElements->nomenclatureHotspot)."</h2>"; |
|
131 | 131 | } |
132 | 132 | if (count($hotspotProfiles) > 0) { // no profiles yet. |
133 | - echo "<h2>" . sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot) . "</h2>"; |
|
133 | + echo "<h2>".sprintf(_("Deployments for this %s"), $uiElements->nomenclatureHotspot)."</h2>"; |
|
134 | 134 | // display an info box with the connection data |
135 | 135 | } |
136 | 136 | |
@@ -149,19 +149,19 @@ discard block |
||
149 | 149 | ?> |
150 | 150 | <div style='display: table-row; margin-bottom: 20px;'> |
151 | 151 | <div class='profilebox' style='display: table-cell;'> |
152 | - <h2><?php echo core\DeploymentManaged::PRODUCTNAME . " (<span style='color:" . ( $deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>" . _("inactive") : "green;'>" . _("active") ) . "</span>)"; ?></h2> |
|
152 | + <h2><?php echo core\DeploymentManaged::PRODUCTNAME." (<span style='color:".($deploymentObject->status == \core\AbstractDeployment::INACTIVE ? "red;'>"._("inactive") : "green;'>"._("active"))."</span>)"; ?></h2> |
|
153 | 153 | <table> |
154 | 154 | <tr> |
155 | 155 | <td><strong><?php echo _("Your primary RADIUS server") ?></strong><br/> |
156 | 156 | <?php |
157 | 157 | if ($deploymentObject->host1_v4 !== NULL) { |
158 | - echo _("IPv4") . ": " . $deploymentObject->host1_v4; |
|
158 | + echo _("IPv4").": ".$deploymentObject->host1_v4; |
|
159 | 159 | } |
160 | 160 | if ($deploymentObject->host1_v4 !== NULL && $deploymentObject->host1_v6 !== NULL) { |
161 | 161 | echo "<br/>"; |
162 | 162 | } |
163 | 163 | if ($deploymentObject->host1_v6 !== NULL) { |
164 | - echo _("IPv6") . ": " . $deploymentObject->host1_v6; |
|
164 | + echo _("IPv6").": ".$deploymentObject->host1_v6; |
|
165 | 165 | } |
166 | 166 | ?> |
167 | 167 | </td> |
@@ -169,9 +169,9 @@ discard block |
||
169 | 169 | <td><?php echo $deploymentObject->port1; ?></td> |
170 | 170 | <td> |
171 | 171 | <?php |
172 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_1]['icon'] . |
|
173 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . |
|
174 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_1]['text'] . "'>"; |
|
172 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_1]['icon']. |
|
173 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_1]['text']. |
|
174 | + "' title='".$radiusMessages[$deploymentObject->radius_status_1]['text']."'>"; |
|
175 | 175 | ?> |
176 | 176 | </td> |
177 | 177 | </tr> |
@@ -179,22 +179,22 @@ discard block |
||
179 | 179 | <td><strong><?php echo _("Your backup RADIUS server") ?><br/></strong> |
180 | 180 | <?php |
181 | 181 | if ($deploymentObject->host2_v4 !== NULL) { |
182 | - echo _("IPv4") . ": " . $deploymentObject->host2_v4; |
|
182 | + echo _("IPv4").": ".$deploymentObject->host2_v4; |
|
183 | 183 | } |
184 | 184 | if ($deploymentObject->host2_v4 !== NULL && $deploymentObject->host2_v6 !== NULL) { |
185 | 185 | echo "<br/>"; |
186 | 186 | } |
187 | 187 | if ($deploymentObject->host2_v6 !== NULL) { |
188 | - echo _("IPv6") . ": " . $deploymentObject->host2_v6; |
|
188 | + echo _("IPv6").": ".$deploymentObject->host2_v6; |
|
189 | 189 | } |
190 | 190 | ?></td> |
191 | 191 | <td><?php echo _("RADIUS port number: ") ?></td> |
192 | 192 | <td><?php echo $deploymentObject->port2; ?></td> |
193 | 193 | <td> |
194 | 194 | <?php |
195 | - echo "<img src='" . $radiusMessages[$deploymentObject->radius_status_2]['icon'] . |
|
196 | - "' alt='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . |
|
197 | - "' title='" . $radiusMessages[$deploymentObject->radius_status_2]['text'] . "'>"; |
|
195 | + echo "<img src='".$radiusMessages[$deploymentObject->radius_status_2]['icon']. |
|
196 | + "' alt='".$radiusMessages[$deploymentObject->radius_status_2]['text']. |
|
197 | + "' title='".$radiusMessages[$deploymentObject->radius_status_2]['text']."'>"; |
|
198 | 198 | ?> |
199 | 199 | </td> |
200 | 200 | </tr> |
@@ -245,12 +245,12 @@ discard block |
||
245 | 245 | if (array_key_exists('FAILURE', $res) && $res['FAILURE'] > 0) { |
246 | 246 | echo '<br>'; |
247 | 247 | if ($res['FAILURE'] == 2) { |
248 | - echo ' <span style="color: red;">' . _("Activation failure.") . '</span>'; |
|
248 | + echo ' <span style="color: red;">'._("Activation failure.").'</span>'; |
|
249 | 249 | } else { |
250 | 250 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
251 | - echo ' <span style="color: red;">' . _("Activation failure for your primary RADIUS server.") . '</span>'; |
|
251 | + echo ' <span style="color: red;">'._("Activation failure for your primary RADIUS server.").'</span>'; |
|
252 | 252 | } else { |
253 | - echo ' <span style="color: red;">' . _("Activation failure for your backup RADIUS server.") . '</span>'; |
|
253 | + echo ' <span style="color: red;">'._("Activation failure for your backup RADIUS server.").'</span>'; |
|
254 | 254 | } |
255 | 255 | } |
256 | 256 | } |
@@ -270,12 +270,12 @@ discard block |
||
270 | 270 | if ($res['FAILURE'] > 0) { |
271 | 271 | echo '<br>'; |
272 | 272 | if ($res['FAILURE'] == 2) { |
273 | - echo ' <span style="color: red;">' . _("Failure during deactivation, your request is queued for handling") . '</span>'; |
|
273 | + echo ' <span style="color: red;">'._("Failure during deactivation, your request is queued for handling").'</span>'; |
|
274 | 274 | } else { |
275 | 275 | if (isset($_GET['res'][1]) && $_GET['res']['1'] == 'FAILURE') { |
276 | - echo ' <span style="color: red;">' . _("Deactivation failure for your primary RADIUS server, your request is queued.") . '</span>'; |
|
276 | + echo ' <span style="color: red;">'._("Deactivation failure for your primary RADIUS server, your request is queued.").'</span>'; |
|
277 | 277 | } else { |
278 | - echo ' <span style="color: red;">' . _("Deactivation failure for your backup RADIUS server, your request is queued.") . '</span>'; |
|
278 | + echo ' <span style="color: red;">'._("Deactivation failure for your backup RADIUS server, your request is queued.").'</span>'; |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <?php |
29 | -require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
29 | +require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
30 | 30 | |
31 | 31 | $deco = new \web\lib\admin\PageDecoration(); |
32 | 32 | $validator = new \web\lib\common\InputValidation(); |
@@ -36,12 +36,12 @@ discard block |
||
36 | 36 | $myfed = new \core\Federation($my_inst->federation); |
37 | 37 | |
38 | 38 | if (!isset($_GET['deployment_id'])) { |
39 | - if (isset($_POST['consortium']) && ( $_POST['consortium'] == "eduroam" || |
|
40 | - ( $_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0 ) |
|
39 | + if (isset($_POST['consortium']) && ($_POST['consortium'] == "eduroam" || |
|
40 | + ($_POST['consortium'] == "OpenRoaming" && count($myfed->getAttributes("fed:openroaming")) > 0) |
|
41 | 41 | ) |
42 | 42 | ) { |
43 | 43 | $my_inst->newDeployment(\core\AbstractDeployment::DEPLOYMENTTYPE_MANAGED, $_POST['consortium']); |
44 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
44 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
45 | 45 | exit(0); |
46 | 46 | } else { |
47 | 47 | throw new Exception("Desired consortium for Managed SP needs to be specified, and allowed!"); |
@@ -99,19 +99,19 @@ discard block |
||
99 | 99 | if (isset($_POST['agreement']) && $_POST['agreement'] == "true") { |
100 | 100 | $deployment->addAttribute("hiddenmanagedsp:tou_accepted", NULL, 1); |
101 | 101 | } |
102 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
102 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
103 | 103 | exit(0); |
104 | 104 | case web\lib\common\FormElements::BUTTON_DELETE: |
105 | 105 | $response = $deployment->setRADIUSconfig(); |
106 | 106 | if (in_array('OK', $response)) { |
107 | 107 | $deployment->deactivate(); |
108 | 108 | } |
109 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
109 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
110 | 110 | exit(0); |
111 | 111 | case web\lib\common\FormElements::BUTTON_REMOVESP: |
112 | 112 | error_log("MGW Remove deployment ".serialize($deployment)); |
113 | 113 | $deployment->remove(); |
114 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier); |
|
114 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier); |
|
115 | 115 | exit(0); |
116 | 116 | case web\lib\common\FormElements::BUTTON_ACTIVATE: |
117 | 117 | if (count($deployment->getAttributes("hiddenmanagedsp:tou_accepted")) > 0) { |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | if (in_array('OK', $response)) { |
120 | 120 | $deployment->activate(); |
121 | 121 | } |
122 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
122 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
123 | 123 | exit(0); |
124 | 124 | } else { |
125 | 125 | throw new Exception("Activate button pushed without acknowledged ToUs!"); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } else { |
149 | 149 | $response = ['NOOP', 'NOOP']; |
150 | 150 | } |
151 | - header("Location: overview_org.php?inst_id=" . $my_inst->identifier . '&' . urldecode(http_build_query($response))); |
|
151 | + header("Location: overview_org.php?inst_id=".$my_inst->identifier.'&'.urldecode(http_build_query($response))); |
|
152 | 152 | exit(0); |
153 | 153 | default: |
154 | 154 | throw new Exception("Unknown button action requested!"); |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | echo $uiElements->instLevelInfoBoxes($my_inst); |
178 | 178 | $deploymentOptions = $deployment->getAttributes(); |
179 | 179 | echo "<form enctype='multipart/form-data' action='edit_hotspot.php?inst_id=$my_inst->identifier&deployment_id=$deployment->identifier' method='post' accept-charset='UTF-8'> |
180 | - <input type='hidden' name='MAX_FILE_SIZE' value='" . \config\Master::MAX_UPLOAD_SIZE . "'>"; |
|
180 | + <input type='hidden' name='MAX_FILE_SIZE' value='".\config\Master::MAX_UPLOAD_SIZE."'>"; |
|
181 | 181 | $optionDisplay = new \web\lib\admin\OptionDisplay($deploymentOptions, \core\Options::LEVEL_PROFILE); |
182 | 182 | ?> |
183 | 183 | <fieldset class='option_container' id='managedsp_override'> |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | <!-- input for VLAN identifier for home users--> |
212 | 212 | <td> |
213 | 213 | <span id='vlan_label'> |
214 | - <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " " . _("(unset with '0')"))); ?> |
|
214 | + <?php echo sprintf(_("VLAN tag for own users%s:"), ($vlan === NULL ? "" : " "._("(unset with '0')"))); ?> |
|
215 | 215 | </span> |
216 | 216 | </td> |
217 | 217 | <td> |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | </fieldset> |
232 | 232 | |
233 | 233 | <?php |
234 | - echo "<p><button type='submit' name='submitbutton' value='" . web\lib\common\FormElements::BUTTON_SAVE . "'>" . _("Save data") . "</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>" . _("Discard changes") . "</button></p></form>"; |
|
234 | + echo "<p><button type='submit' name='submitbutton' value='".web\lib\common\FormElements::BUTTON_SAVE."'>"._("Save data")."</button><button type='button' class='delete' name='abortbutton' value='abort' onclick='javascript:window.location = \"overview_org.php?inst_id=$my_inst->identifier\"'>"._("Discard changes")."</button></p></form>"; |
|
235 | 235 | echo $deco->footer(); |
236 | 236 | |
237 | 237 | |
238 | 238 | \ No newline at end of file |