From 8c46f64b8a9835973e592d4b0a5c7fe91cef3dbd Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 18 Aug 2015 19:13:56 +0200 Subject: asterisk - code style cleanup - Fix copyright header - Code style and indentation fixes - XHTML validation --- config/asterisk/asterisk_edit_file.php | 425 ++++++++++++++++----------------- 1 file changed, 212 insertions(+), 213 deletions(-) (limited to 'config/asterisk') diff --git a/config/asterisk/asterisk_edit_file.php b/config/asterisk/asterisk_edit_file.php index 1c992d26..353ecd07 100644 --- a/config/asterisk/asterisk_edit_file.php +++ b/config/asterisk/asterisk_edit_file.php @@ -1,8 +1,10 @@ Copyright (C) 2013 robi + Copyright (C) 2015 ESF, LLC All rights reserved. Redistribution and use in source and binary forms, with or without @@ -27,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_MODULE: shell + pfSense_MODULE: asterisk */ ##|+PRIV @@ -37,21 +39,19 @@ ##|*MATCH=asterisk_edit_file.php* ##|-PRIV -$pgtitle = array(gettext("Status"),gettext("Asterisk configuration files")); require("guiconfig.inc"); - $backup_dir = "/conf"; $backup_filename = "asterisk_config.bak.tgz"; $backup_path = "{$backup_dir}/{$backup_filename}"; $files_dir = "/conf/asterisk"; $host = "{$config['system']['hostname']}.{$config['system']['domain']}"; -$downname = "asterisk-config-{$host}-".date("YmdHis").".bak.tgz"; //put the date in the filename +// Put the date in the filename +$downname = "asterisk-config-{$host}-" . date("YmdHis") . ".bak.tgz"; if (($_GET['a'] == "download") && $_GET['t'] == "backup") { conf_mount_rw(); -// system("cd {$files_dir} && tar czf {$backup_path} *"); - system("cd {$files_dir} && tar czf {$backup_path} --exclude 'dist/*' --exclude dist *"); + system("cd {$files_dir} && /usr/bin/tar czf {$backup_path} --exclude 'dist/*' --exclude dist *"); conf_mount_ro(); } @@ -63,8 +63,8 @@ if (($_GET['a'] == "download") && file_exists("{$backup_path}")) { header("Content-Type: application/download"); header("Content-Description: File Transfer"); header("Content-Disposition: attachment; filename=\"{$downname}\""); - header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1 - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past + header("Cache-Control: no-cache, must-revalidate"); + header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); header("Content-Length: " . filesize("{$backup_path}")); fpassthru($fd); exit; @@ -72,40 +72,38 @@ if (($_GET['a'] == "download") && file_exists("{$backup_path}")) { if ($_GET['a'] == "other") { if ($_GET['t'] == "restore") { - //extract files to $files_dir (/conf/asterisk) + // Extract files to $files_dir (/conf/asterisk) if (file_exists($backup_path)) { - //echo "The file $filename exists"; conf_mount_rw(); - exec("tar -xzC {$files_dir} -f {$backup_path} 2>&1", $sysretval); + exec("/usr/bin/tar -xzC {$files_dir} -f {$backup_path} 2>&1", $sysretval); $savemsg = "Backup has been restored, please restart Asterisk now " . $sysretval[1]; - system("chmod -R 644 {$files_dir}/*"); - header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ; + system("/bin/chmod -R 644 {$files_dir}/*"); + header('Location: asterisk_edit_file.php?savemsg=' . $savemsg); conf_mount_ro(); } else { - header( 'Location: asterisk_edit_file.php?savemsg=Restore+failed.+Backup+file+not+found.' ) ; + header('Location: asterisk_edit_file.php?savemsg=Restore+failed.+Backup+file+not+found.'); } exit; } if ($_GET['t'] == "factrest") { - //extract files to $files_dir (/conf/asterisk) + // Extract files to $files_dir (/conf/asterisk) if (file_exists('/conf.default/asterisk_factory_defaults_config.tgz')) { - //echo "The file $filename exists"; conf_mount_rw(); - exec("tar -xzC {$files_dir} -f /conf.default/asterisk_factory_defaults_config.tgz 2>&1", $sysretval); + exec("/usr/bin/tar -xzC {$files_dir} -f /conf.default/asterisk_factory_defaults_config.tgz 2>&1", $sysretval); $savemsg = "Factory configuration restored, please restart Asterisk now " . $sysretval[1]; - system("chmod -R 644 {$files_dir}/*"); - header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ; + system("/bin/chmod -R 644 {$files_dir}/*"); + header('Location: asterisk_edit_file.php?savemsg=' . $savemsg); conf_mount_ro(); } exit; } if ($_GET['t'] == "deldist") { - //delete dist directory from $files_dir/dist (/conf/asterisk/dist) + // Delete dist directory from $files_dir/dist (/conf/asterisk/dist) if (file_exists($files_dir . "/dist")) { conf_mount_rw(); - exec("rm -r {$files_dir}/dist 2>&1", $sysretval); + exec("/bin/rm -r {$files_dir}/dist 2>&1", $sysretval); $savemsg = "Deleted dist files " . $sysretval[1]; - header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ; + header('Location: asterisk_edit_file.php?savemsg=' . $savemsg); conf_mount_ro(); } exit; @@ -114,53 +112,55 @@ if ($_GET['a'] == "other") { if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) { $upfilnam = $_FILES['ulfile']['name']; - $upfiltim = strtotime(str_replace(".bak.tgz","",end(explode("-",$upfilnam)))); + $upfiltim = strtotime(str_replace(".bak.tgz", "", end(explode("-", $upfilnam)))); conf_mount_rw(); move_uploaded_file($_FILES['ulfile']['tmp_name'], "{$backup_path}"); - $savemsg = "Uploaded ". htmlentities($_FILES['ulfile']['name']) . " file as " . $backup_path . "." ; - system('chmod -R 644 {$backup_path}'); - if ($upfiltim) { //take the date from the filename and update modified time accordingly + $savemsg = "Uploaded " . htmlentities($_FILES['ulfile']['name']) . " file as " . $backup_path . "."; + system("/bin/chmod -R 644 {$backup_path}"); + // Take the date from the filename and update modified time accordingly + if ($upfiltim) { touch($backup_path, $upfiltim); } unset($_POST['txtCommand']); conf_mount_ro(); - header( 'Location: asterisk_edit_file.php?savemsg=' . $savemsg ) ; + header('Location: asterisk_edit_file.php?savemsg=' . $savemsg); } -if($_REQUEST['action']) { +if ($_REQUEST['action']) { switch($_REQUEST['action']) { case 'load': - if(strlen($_REQUEST['file']) < 1) { + if (strlen($_REQUEST['file']) < 1) { echo "|5|" . gettext("No file name specified") . ".|"; - } elseif(is_dir($_REQUEST['file'])) { + } elseif (is_dir($_REQUEST['file'])) { echo "|4|" . gettext("Loading a directory is not supported") . ".|"; - } elseif(! is_file($_REQUEST['file'])) { + } elseif (! is_file($_REQUEST['file'])) { echo "|3|" . gettext("File does not exist or is not a regular file") . ".|"; } else { $data = file_get_contents(urldecode($_REQUEST['file'])); - if($data === false) { + if ($data === false) { echo "|1|" . gettext("Failed to read file") . ".|"; } else { - echo "|0|{$_REQUEST['file']}|{$data}|"; + echo "|0|{$_REQUEST['file']}|{$data}|"; } } exit; case 'save': - if(strlen($_REQUEST['file']) < 1) { + if (strlen($_REQUEST['file']) < 1) { echo "|" . gettext("No file name specified") . ".|"; } else { conf_mount_rw(); $_REQUEST['data'] = str_replace("\r", "", base64_decode($_REQUEST['data'])); $ret = file_put_contents($_REQUEST['file'], $_REQUEST['data']); conf_mount_ro(); - if($_REQUEST['file'] == "/conf/config.xml" || $_REQUEST['file'] == "/cf/conf/config.xml") { - if(file_exists("/tmp/config.cache")) + if ($_REQUEST['file'] == "/conf/config.xml" || $_REQUEST['file'] == "/cf/conf/config.xml") { + if (file_exists("/tmp/config.cache")) { unlink("/tmp/config.cache"); + } disable_security_checks(); } - if($ret === false) { + if ($ret === false) { echo "|" . gettext("Failed to write file") . ".|"; - } elseif($ret <> strlen($_REQUEST['data'])) { + } elseif ($ret <> strlen($_REQUEST['data'])) { echo "|" . gettext("Error while writing file") . ".|"; } else { echo "|" . gettext("File successfully saved") . ".|"; @@ -170,10 +170,10 @@ if($_REQUEST['action']) { } exit; } + $shortcut_section = "asterisk"; +$pgtitle = array(gettext("Status"), gettext("Asterisk configuration files")); require("head.inc"); -outputJavaScriptFileInline("filebrowser/browser.js"); -outputJavaScriptFileInline("javascript/base64.js"); ?> @@ -181,21 +181,34 @@ outputJavaScriptFileInline("javascript/base64.js"); - + + + + - - - - - - +
- -
-
- - -
-
-
- - - - +
- Backup / Restore - The 'Backup' button will tar gzip asterisk configuration files to it then offers it to download.
- The 'Restore' button will be visible only if the backup file exists.
- You can upload a backup file to the system, if one already exists at , it will be overwritten. -
- 		+ + + + + +
+ +
+
+ +
+

+ + + + -
+ Backup / Restore + The 'Backup' button will tar gzip asterisk configuration files to it then offers it to download.
+ The 'Restore' button will be visible only if the backup file exists.
+ You can upload a backup file to the system, if one already exists at , it will be overwritten.
+ 		\n"; - if (file_exists($backup_path)) { - echo " \n"; - } + echo "\n"; + if (file_exists($backup_path)) { + echo "\n"; + } ?> -

- - - + +
+
+
+ + + - + - -
" . date ("Y F d H:i:s.", filemtime($backup_path)); + echo $backup_filename . " date:
" . date ("Y F d H:i:s.", filemtime($backup_path)); } ?> - 		-
+
+ Upload backup file: - - + + -

-
-
- - - - - - - -
- - - - - - -
- : - - - - -
-
- - - - - - - - - - - - - - - -
-
- -
-
- -
- - - - -
-
- - - - -

- enable   \n"; - } - if (file_exists("/conf.default/asterisk_factory_defaults_config.tgz")) { - echo "enable \n"; - } - ?> -

-
-
- - +
+
+ + + + + - -
+ + + + + +
+ : + + + +
+
+ + +
+ -

+ +

+ + + + + + +
+
+ +
+
+
+ + + +
+
+ + + + +

+ enable   \n"; + } + if (file_exists("/conf.default/asterisk_factory_defaults_config.tgz")) { + echo "enable \n"; + } + ?> +
+
+
+
+
+
+
+ +

 -
+

- - + -- cgit v1.2.3