|
@@ -20,7 +20,7 @@ discard block |
|
|
block discarded – undo |
|
20
|
20
|
* <base_url>/copyright.php after deploying the software |
|
21
|
21
|
*/ |
|
22
|
22
|
|
|
23
|
|
-require_once dirname(dirname(dirname(__FILE__))) . "/config/_config.php"; |
|
|
23
|
+require_once dirname(dirname(dirname(__FILE__)))."/config/_config.php"; |
|
24
|
24
|
|
|
25
|
25
|
$auth = new \web\lib\admin\Authentication(); |
|
26
|
26
|
$loggerInstance = new \core\common\Logging(); |
|
@@ -40,7 +40,7 @@ discard block |
|
|
block discarded – undo |
|
40
|
40
|
switch ($_POST['submitbutton']) { |
|
41
|
41
|
case web\lib\common\FormElements::BUTTON_DELETE: |
|
42
|
42
|
$my_inst->destroy(); |
|
43
|
|
- $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP " . $instId); |
|
|
43
|
+ $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP ".$instId); |
|
44
|
44
|
header("Location: overview_user.php"); |
|
45
|
45
|
exit; |
|
46
|
46
|
case web\lib\common\FormElements::BUTTON_FLUSH_AND_RESTART: |
|
@@ -50,7 +50,7 @@ discard block |
|
|
block discarded – undo |
|
50
|
50
|
} |
|
51
|
51
|
// flush all IdP attributes and send user to creation wizard |
|
52
|
52
|
$my_inst->flushAttributes(); |
|
53
|
|
- $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over" . $instId); |
|
|
53
|
+ $loggerInstance->writeAudit($_SESSION['user'], "DEL", "IdP starting over".$instId); |
|
54
|
54
|
header("Location: edit_idp.php?inst_id=$instId&wizard=true"); |
|
55
|
55
|
exit; |
|
56
|
56
|
case web\lib\common\FormElements::BUTTON_SAVE: |
|
@@ -63,19 +63,19 @@ discard block |
|
|
block discarded – undo |
|
63
|
63
|
exit(0); |
|
64
|
64
|
} |
|
65
|
65
|
$inst_name = $my_inst->name; |
|
66
|
|
- echo "<h1>" . sprintf(_("Submitted attributes for IdP '%s'"), $inst_name) . "</h1>"; |
|
|
66
|
+ echo "<h1>".sprintf(_("Submitted attributes for IdP '%s'"), $inst_name)."</h1>"; |
|
67
|
67
|
echo "<table>"; |
|
68
|
68
|
echo $optionParser->processSubmittedFields($my_inst, $_POST, $_FILES); |
|
69
|
69
|
echo "</table>"; |
|
70
|
70
|
// delete cached logo, if present |
|
71
|
|
- $dir = ROOT . '/web/downloads/logos/'; |
|
72
|
|
- $globResult = glob($dir . $my_inst->identifier . "_*.png"); |
|
|
71
|
+ $dir = ROOT.'/web/downloads/logos/'; |
|
|
72
|
+ $globResult = glob($dir.$my_inst->identifier."_*.png"); |
|
73
|
73
|
if ($globResult === FALSE) { // we should catch the improbable error condition |
|
74
|
74
|
$globResult = []; |
|
75
|
75
|
} |
|
76
|
76
|
array_map('unlink', $globResult); |
|
77
|
77
|
$loggerInstance->debug(4, "UNLINK from $dir\n"); |
|
78
|
|
- $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP " . $my_inst->identifier . " - attributes changed"); |
|
|
78
|
+ $loggerInstance->writeAudit($_SESSION['user'], "MOD", "IdP ".$my_inst->identifier." - attributes changed"); |
|
79
|
79
|
|
|
80
|
80
|
// re-instantiate ourselves... profiles need fresh data |
|
81
|
81
|
|
|
@@ -85,15 +85,15 @@ discard block |
|
|
block discarded – undo |
|
85
|
85
|
|
|
86
|
86
|
if (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) && count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) { |
|
87
|
87
|
foreach (CONFIG_CONFASSISTANT['CONSORTIUM']['ssid'] as $ssidname) { |
|
88
|
|
- $ssids[] = $ssidname . " " . (isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)") ); |
|
|
88
|
+ $ssids[] = $ssidname." ".(isset(CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport']) && CONFIG_CONFASSISTANT['CONSORTIUM']['tkipsupport'] === TRUE ? _("(WPA2/AES and WPA/TKIP)") : _("(WPA2/AES)")); |
|
89
|
89
|
} |
|
90
|
90
|
} |
|
91
|
91
|
|
|
92
|
92
|
foreach ($myInstReinstantiated->getAttributes("media:SSID_with_legacy") as $ssidname) { |
|
93
|
|
- $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES and WPA/TKIP)"); |
|
|
93
|
+ $ssids[] = $ssidname['value']." "._("(WPA2/AES and WPA/TKIP)"); |
|
94
|
94
|
} |
|
95
|
95
|
foreach ($myInstReinstantiated->getAttributes("media:SSID") as $ssidname) { |
|
96
|
|
- $ssids[] = $ssidname['value'] . " " . _("(WPA2/AES)"); |
|
|
96
|
+ $ssids[] = $ssidname['value']." "._("(WPA2/AES)"); |
|
97
|
97
|
} |
|
98
|
98
|
|
|
99
|
99
|
echo "<table>"; |
|
@@ -101,7 +101,7 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
if (count($ssids) > 0) { |
|
102
|
102
|
$printedlist = ""; |
|
103
|
103
|
foreach ($ssids as $names) { |
|
104
|
|
- $printedlist = $printedlist . "$names "; |
|
|
104
|
+ $printedlist = $printedlist."$names "; |
|
105
|
105
|
} |
|
106
|
106
|
echo $uiElements->boxOkay(sprintf(_("Your installers will configure the following SSIDs: <strong>%s</strong>"), $printedlist), _("SSIDs configured")); |
|
107
|
107
|
} |
|
@@ -129,7 +129,7 @@ discard block |
|
|
block discarded – undo |
|
129
|
129
|
// did we get an email address? then, show the silverbullet jumpstart button |
|
130
|
130
|
// otherwise, issue a smartass comment |
|
131
|
131
|
if (count($myInstReinstantiated->getAttributes("support:email")) > 0) { |
|
132
|
|
- echo "<form method='post' action='edit_silverbullet.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME) . "</button></form>"; |
|
|
132
|
+ echo "<form method='post' action='edit_silverbullet.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>".sprintf(_("Continue to %s properties"), \core\ProfileSilverbullet::PRODUCTNAME)."</button></form>"; |
|
133
|
133
|
} else { |
|
134
|
134
|
echo "<table>"; |
|
135
|
135
|
echo $uiElements->boxError(sprintf(_("You did not submit an e-mail address. This is required for %s. Please go to the %s dashboard and edit your helpdesk settings to include a helpdesk e-mail address."), core\ProfileSilverbullet::PRODUCTNAME, $ui->nomenclatureInst), _("No support e-mail!")); |
|
@@ -137,10 +137,10 @@ discard block |
|
|
block discarded – undo |
|
137
|
137
|
} |
|
138
|
138
|
} |
|
139
|
139
|
if (CONFIG['FUNCTIONALITY_LOCATIONS']['CONFASSISTANT_RADIUS'] == "LOCAL") { |
|
140
|
|
- echo "<br/><form method='post' action='edit_profile.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to RADIUS/EAP profile definition") . "</button></form>"; |
|
|
140
|
+ echo "<br/><form method='post' action='edit_profile.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to RADIUS/EAP profile definition")."</button></form>"; |
|
141
|
141
|
} |
|
142
|
142
|
} |
|
143
|
|
- echo "<br/><form method='post' action='overview_idp.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>" . _("Continue to dashboard") . "</button></form>"; |
|
|
143
|
+ echo "<br/><form method='post' action='overview_idp.php?inst_id=$myInstReinstantiated->identifier' accept-charset='UTF-8'><button type='submit'>"._("Continue to dashboard")."</button></form>"; |
|
144
|
144
|
echo $deco->footer(); |
|
145
|
145
|
break; |
|
146
|
146
|
default: |