From 324c82e37900b3681c6bcff4df91bfc22e8dc493 Mon Sep 17 00:00:00 2001 From: Bryan Paradis Date: Fri, 21 Feb 2014 10:45:02 -0500 Subject: Moved php files into additional files bin folder renamed to www abc files renamed to php removed delete lines in vnstat2.inc for php files removed install lines in vnstat2.inc for php files --- config/vnstat2/bin/diag_vnstat.abc | 115 ------------------------------ config/vnstat2/bin/diag_vnstat2.abc | 137 ------------------------------------ config/vnstat2/bin/vnstat2_img.abc | 6 -- config/vnstat2/bin/vnstati.abc | 17 ----- config/vnstat2/vnstat2.inc | 9 --- config/vnstat2/www/diag_vnstat.php | 115 ++++++++++++++++++++++++++++++ config/vnstat2/www/diag_vnstat2.php | 137 ++++++++++++++++++++++++++++++++++++ config/vnstat2/www/vnstat2_img.php | 6 ++ config/vnstat2/www/vnstati.php | 17 +++++ 9 files changed, 275 insertions(+), 284 deletions(-) delete mode 100644 config/vnstat2/bin/diag_vnstat.abc delete mode 100644 config/vnstat2/bin/diag_vnstat2.abc delete mode 100644 config/vnstat2/bin/vnstat2_img.abc delete mode 100644 config/vnstat2/bin/vnstati.abc create mode 100644 config/vnstat2/www/diag_vnstat.php create mode 100644 config/vnstat2/www/diag_vnstat2.php create mode 100644 config/vnstat2/www/vnstat2_img.php create mode 100644 config/vnstat2/www/vnstati.php (limited to 'config/vnstat2') diff --git a/config/vnstat2/bin/diag_vnstat.abc b/config/vnstat2/bin/diag_vnstat.abc deleted file mode 100644 index afef3849..00000000 --- a/config/vnstat2/bin/diag_vnstat.abc +++ /dev/null @@ -1,115 +0,0 @@ -"; - echo $text; - exit; -} - -include("head.inc"); - -?> - - - -
-{$pgtitle}

"; - echo "Go Back
"; - if($savemsg) { - echo "
"; - print_info_box($savemsg); - echo "
"; - } - if ($input_errors) - print_input_errors($input_errors); -?> - - - - -
- - - - -
-
- - -
-
- -
-
-
- -
- - - - diff --git a/config/vnstat2/bin/diag_vnstat2.abc b/config/vnstat2/bin/diag_vnstat2.abc deleted file mode 100644 index ec19a0b2..00000000 --- a/config/vnstat2/bin/diag_vnstat2.abc +++ /dev/null @@ -1,137 +0,0 @@ - - -
- -
-{$pgtitle}

"; - echo "Go Back
"; - if($savemsg) { - echo "
"; - print_info_box($savemsg); - echo "
"; - } - if ($input_errors) - print_input_errors($input_errors); -?> - - - -

- - - - -
- - - - -
-
- - -
-
- -
-
-
- -
-

- - - diff --git a/config/vnstat2/bin/vnstat2_img.abc b/config/vnstat2/bin/vnstat2_img.abc deleted file mode 100644 index 85644309..00000000 --- a/config/vnstat2/bin/vnstat2_img.abc +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/config/vnstat2/bin/vnstati.abc b/config/vnstat2/bin/vnstati.abc deleted file mode 100644 index e5ddcd21..00000000 --- a/config/vnstat2/bin/vnstati.abc +++ /dev/null @@ -1,17 +0,0 @@ -Go Back
"; -echo "

{$pgtitle}

"; -?> -

-

-

-

- - diff --git a/config/vnstat2/vnstat2.inc b/config/vnstat2/vnstat2.inc index c37314c3..9a684aa1 100644 --- a/config/vnstat2/vnstat2.inc +++ b/config/vnstat2/vnstat2.inc @@ -5,10 +5,6 @@ function vnstat_install_deinstall() { // Remove Vnstat package and files exec("rm -d -R /usr/local/www/vnstat2"); exec("rm -d -R /usr/local/www/vnstati"); - exec("rm /usr/local/www/diag_vnstat.php"); - exec("rm /usr/local/www/diag_vnstat2.php"); - exec("rm /usr/local/www/vnstati.php"); - exec("rm /usr/local/www/vnstat2_img.php"); exec("rm -d -R /usr/local/pkg/vnstat2"); exec("rm /usr/local/etc/vnstat.conf"); @@ -153,11 +149,6 @@ function vnstat_install_config() { // Check for pbi install and arch type then create symlinks if (file_exists('/usr/pbi/vnstat-i386')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-i386/etc/vnstat.conf"); } if (file_exists('/usr/pbi/vnstat-amd64')) { exec("ln -s /usr/local/etc/vnstat.conf /usr/pbi/vnstat-amd64/etc/vnstat.conf"); } -// Copy files to web dir - exec("[ ! -f /usr/local/www/diag_vnstat2.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat2.abc /usr/local/www/diag_vnstat2.php"); - exec("[ ! -f /usr/local/www/diag_vnstat.php ] && cp /usr/local/pkg/vnstat2/diag_vnstat.abc /usr/local/www/diag_vnstat.php"); - exec("[ ! -f /usr/local/www/vnstati.php ] && cp /usr/local/pkg/vnstat2/vnstati.abc /usr/local/www/vnstati.php"); - exec("[ ! -f /usr/local/www/vnstat2_img.php ] && cp /usr/local/pkg/vnstat2/vnstat2_img.abc /usr/local/www/vnstat2_img.php"); // Add MonthRotate value to config.xml and write /usr/local/etc/vnstat.conf $no_monthrotate = $config['installedpackages']['vnstat2']['config'][0]['monthrotate']; if ($no_monthrotate == ""){ diff --git a/config/vnstat2/www/diag_vnstat.php b/config/vnstat2/www/diag_vnstat.php new file mode 100644 index 00000000..afef3849 --- /dev/null +++ b/config/vnstat2/www/diag_vnstat.php @@ -0,0 +1,115 @@ +"; + echo $text; + exit; +} + +include("head.inc"); + +?> + + + +
+{$pgtitle}

"; + echo "Go Back
"; + if($savemsg) { + echo "
"; + print_info_box($savemsg); + echo "
"; + } + if ($input_errors) + print_input_errors($input_errors); +?> + + + + +
+ + + + +
+
+ + +
+
+ +
+
+
+ +
+ + + + diff --git a/config/vnstat2/www/diag_vnstat2.php b/config/vnstat2/www/diag_vnstat2.php new file mode 100644 index 00000000..ec19a0b2 --- /dev/null +++ b/config/vnstat2/www/diag_vnstat2.php @@ -0,0 +1,137 @@ + + +
+ +
+{$pgtitle}

"; + echo "Go Back
"; + if($savemsg) { + echo "
"; + print_info_box($savemsg); + echo "
"; + } + if ($input_errors) + print_input_errors($input_errors); +?> + + + +

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

+ + + diff --git a/config/vnstat2/www/vnstat2_img.php b/config/vnstat2/www/vnstat2_img.php new file mode 100644 index 00000000..85644309 --- /dev/null +++ b/config/vnstat2/www/vnstat2_img.php @@ -0,0 +1,6 @@ + diff --git a/config/vnstat2/www/vnstati.php b/config/vnstat2/www/vnstati.php new file mode 100644 index 00000000..e5ddcd21 --- /dev/null +++ b/config/vnstat2/www/vnstati.php @@ -0,0 +1,17 @@ +Go Back
"; +echo "

{$pgtitle}

"; +?> +

+

+

+

+ + -- cgit v1.2.3