Revision af0edce6
Added by Steve Beaver about 7 years ago
src/etc/inc/acb.inc | ||
---|---|---|
104 | 104 |
unlink("/cf/conf/lastpfSbackup.txt"); |
105 | 105 |
conf_mount_ro(); |
106 | 106 |
} |
107 |
|
|
107 | 108 |
if (!function_exists("filter_configure")) { |
108 | 109 |
require_once("filter.inc"); |
109 | 110 |
} |
111 |
|
|
110 | 112 |
filter_configure(); |
113 |
|
|
111 | 114 |
if ($savemsg) { |
112 | 115 |
$savemsg .= "<br/>"; |
113 | 116 |
} |
117 |
|
|
114 | 118 |
$savemsg .= "A configuration backup has been queued."; |
115 | 119 |
} |
116 | 120 |
|
... | ... | |
159 | 163 |
// Populate available backups |
160 | 164 |
$curl_session = curl_init(); |
161 | 165 |
curl_setopt($curl_session, CURLOPT_URL, $get_url); |
166 |
|
|
162 | 167 |
if ($legacy) { |
163 | 168 |
curl_setopt($curl_session, CURLOPT_HTTPHEADER, array("Authorization: Basic " . base64_encode("{$username}:{$password}"))); |
164 | 169 |
} |
170 |
|
|
165 | 171 |
curl_setopt($curl_session, CURLOPT_SSL_VERIFYPEER, 1); |
166 | 172 |
curl_setopt($curl_session, CURLOPT_POST, 1); |
167 | 173 |
curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1); |
... | ... | |
222 | 228 |
|
223 | 229 |
$last_config_change = $config['revision']['time']; |
224 | 230 |
$hostname = $config['system']['hostname'] . "." . $config['system']['domain']; |
231 |
|
|
225 | 232 |
if ($reasonm) { |
226 | 233 |
$reason = $reasonm; |
227 | 234 |
} else { |
src/usr/local/www/services_acb.php | ||
---|---|---|
63 | 63 |
$myhostname = $config['system']['hostname'] . "." . $config['system']['domain']; |
64 | 64 |
|
65 | 65 |
if (!$decrypt_password) { |
66 |
Header("Location: /services+acb_settings.php");
|
|
66 |
Header("Location: /services_acb_settings.php");
|
|
67 | 67 |
exit; |
68 | 68 |
} |
69 | 69 |
|
... | ... | |
321 | 321 |
|
322 | 322 |
$data = curl_exec($curl_session); |
323 | 323 |
|
324 |
if (!curl_errno($curl_session)) {
|
|
324 |
if (curl_errno($curl_session)) { |
|
325 | 325 |
$fd = fopen("/tmp/acb_backupdebug.txt", "w"); |
326 | 326 |
fwrite($fd, $get_url . "" . "action=showbackups" . "\n\n"); |
327 | 327 |
fwrite($fd, $data); |
... | ... | |
600 | 600 |
$legacyready = "yes"; |
601 | 601 |
} |
602 | 602 |
|
603 |
$legacynotready = "Please configure your \"Gold\" membershipt settings on the Settings page " . |
|
604 |
"before accessing the legacy backup features"; |
|
603 |
$legacynotready = gettext("Please configure your \"Gold\" membershipt settings on the Settings page " .
|
|
604 |
"before accessing the legacy backup features");
|
|
605 | 605 |
?> |
606 | 606 |
|
607 | 607 |
<script type="text/javascript"> |
Also available in: Unified diff
Add gettext() and other cosmetic changes