@@ -207,70 +207,70 @@ discard block |
||
207 | 207 | </div> |
208 | 208 | <?php |
209 | 209 | break; |
210 | - case "core\ProfileRADIUS": |
|
211 | - ?> |
|
212 | - <div style='padding-bottom:20px;'> |
|
210 | + case "core\ProfileRADIUS": |
|
211 | + ?> |
|
212 | + <div style='padding-bottom:20px;'> |
|
213 | 213 | <?php $profile_name = $profile_list->name; ?> |
214 | - <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2> |
|
214 | + <h2 style='overflow:auto; display:inline; padding-bottom: 10px;'><?php printf(_("Profile: %s"), $profile_name); ?></h2> |
|
215 | 215 | <?php |
216 | - // see if there are any profile-level overrides |
|
217 | - $attribs = $profile_list->getAttributes(); |
|
218 | - // write things into a buffer; we need some function calls to determine |
|
219 | - // readiness - but want to display it before! |
|
220 | - $has_overrides = FALSE; |
|
221 | - foreach ($attribs as $attrib) { |
|
222 | - if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) { |
|
223 | - $has_overrides = TRUE; |
|
216 | + // see if there are any profile-level overrides |
|
217 | + $attribs = $profile_list->getAttributes(); |
|
218 | + // write things into a buffer; we need some function calls to determine |
|
219 | + // readiness - but want to display it before! |
|
220 | + $has_overrides = FALSE; |
|
221 | + foreach ($attribs as $attrib) { |
|
222 | + if ($attrib['level'] == \core\Options::LEVEL_PROFILE && !preg_match("/^(internal:|profile:name|profile:description|eap:)/", $attrib['name'])) { |
|
223 | + $has_overrides = TRUE; |
|
224 | + } |
|
224 | 225 | } |
225 | - } |
|
226 | - $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
227 | - $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
|
228 | - $allcomplete = TRUE; |
|
229 | - foreach ($typelist as $eaptype) { |
|
230 | - $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
|
231 | - $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
|
232 | - if ($completeness === true) { |
|
233 | - $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
234 | - } else { |
|
235 | - $buffer_eaptypediv .= " <div class='notacceptable'>"; |
|
236 | - $buffer_eaptypediv .= _("Information needed!"); |
|
237 | - if (is_array($completeness)) { |
|
238 | - $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
|
239 | - foreach ($completeness as $missing_attrib) { |
|
240 | - $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
226 | + $buffer_eaptypediv = "<div style='margin-bottom:40px; float:left;'>" . _("<strong>EAP Types</strong> (in order of preference):") . "<br/>"; |
|
227 | + $typelist = $profile_list->getEapMethodsinOrderOfPreference(); |
|
228 | + $allcomplete = TRUE; |
|
229 | + foreach ($typelist as $eaptype) { |
|
230 | + $buffer_eaptypediv .= $eaptype->getPrintableRep(); |
|
231 | + $completeness = $profile_list->isEapTypeDefinitionComplete($eaptype); |
|
232 | + if ($completeness === true) { |
|
233 | + $buffer_eaptypediv .= " <div class='acceptable'>" . _("OK") . "</div>"; |
|
234 | + } else { |
|
235 | + $buffer_eaptypediv .= " <div class='notacceptable'>"; |
|
236 | + $buffer_eaptypediv .= _("Information needed!"); |
|
237 | + if (is_array($completeness)) { |
|
238 | + $buffer_eaptypediv .= "<ul style='margin:1px'>"; |
|
239 | + foreach ($completeness as $missing_attrib) { |
|
240 | + $buffer_eaptypediv .= "<li>" . $uiElements->displayName($missing_attrib) . "</li>"; |
|
241 | + } |
|
242 | + $buffer_eaptypediv .= "</ul>"; |
|
241 | 243 | } |
242 | - $buffer_eaptypediv .= "</ul>"; |
|
244 | + $buffer_eaptypediv .= "</div>"; |
|
245 | + $allcomplete = FALSE; |
|
243 | 246 | } |
244 | - $buffer_eaptypediv .= "</div>"; |
|
245 | - $allcomplete = FALSE; |
|
246 | - } |
|
247 | - $attribs = $profile_list->getAttributes(); |
|
248 | - $justOnce = FALSE; |
|
249 | - foreach ($attribs as $attrib) { |
|
250 | - if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
|
251 | - $justOnce = TRUE; |
|
252 | - $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
247 | + $attribs = $profile_list->getAttributes(); |
|
248 | + $justOnce = FALSE; |
|
249 | + foreach ($attribs as $attrib) { |
|
250 | + if ($attrib['level'] == \core\Options::LEVEL_METHOD && !preg_match("/^internal:/", $attrib['name']) && !$justOnce) { |
|
251 | + $justOnce = TRUE; |
|
252 | + $buffer_eaptypediv .= "<img src='../resources/images/icons/Letter-E-blue-icon.png' alt='" . _("Options on EAP Method/Device level are in effect.") . "'>"; |
|
253 | + } |
|
253 | 254 | } |
255 | + $buffer_eaptypediv .= "<br/>"; |
|
254 | 256 | } |
255 | - $buffer_eaptypediv .= "<br/>"; |
|
256 | - } |
|
257 | - $buffer_eaptypediv .= "</div>"; |
|
257 | + $buffer_eaptypediv .= "</div>"; |
|
258 | 258 | |
259 | - $buffer_headline = "<span style='float:right;'>"; |
|
260 | - $readiness = $profile_list->readinessLevel(); |
|
261 | - if ($has_overrides) { |
|
262 | - $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE); |
|
263 | - } |
|
264 | - if (!$allcomplete) { |
|
265 | - $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE); |
|
266 | - } |
|
267 | - switch ($readiness) { |
|
259 | + $buffer_headline = "<span style='float:right;'>"; |
|
260 | + $readiness = $profile_list->readinessLevel(); |
|
261 | + if ($has_overrides) { |
|
262 | + $buffer_headline .= $uiElements->boxRemark("", _("Option override on profile level is in effect."), TRUE); |
|
263 | + } |
|
264 | + if (!$allcomplete) { |
|
265 | + $buffer_headline .= $uiElements->boxError("", _("The information in this profile is incomplete."), TRUE); |
|
266 | + } |
|
267 | + switch ($readiness) { |
|
268 | 268 | case core\AbstractProfile::READINESS_LEVEL_SHOWTIME: |
269 | 269 | $buffer_headline .= $uiElements->boxOkay("", _("This profile is shown on the user download interface."), TRUE); |
270 | 270 | break; |
271 | 271 | case core\AbstractProfile::READINESS_LEVEL_SUFFICIENTCONFIG: |
272 | 272 | $buffer_headline .= $uiElements->boxWarning("", sprintf(_("This profile is NOT shown on the user download interface, even though we have enough information to show. To enable the profile, add the attribute \"%s\" and tick the corresponding box."), $uiElements->displayName("profile:production")), TRUE); |
273 | - } |
|
273 | + } |
|
274 | 274 | |
275 | 275 | $buffer_headline .= "</span></div>"; |
276 | 276 | |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | </div> |
354 | 354 | <?php |
355 | 355 | break; |
356 | - default: |
|
357 | - throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!"); |
|
356 | + default: |
|
357 | + throw new Exception("We were asked to operate on something that is neither a RADIUS nor Silverbullet profile!"); |
|
358 | 358 | } |
359 | 359 | ?> |
360 | 360 | <!-- dummy width to keep a little distance --> |