diff options
| author | jim-p <jim@pingle.org> | 2009-10-14 17:03:50 -0400 |
|---|---|---|
| committer | jim-p <jim@pingle.org> | 2009-10-14 17:11:33 -0400 |
| commit | a0275915f127d728e5088920bd8da9a944a7d6b4 (patch) | |
| tree | 26c3c75d88fe0ded24979c29fbf4f43f8971efac /config/dashboard/dashboard.inc | |
| parent | 8e4d710a0d8b47bb6ceabe5a640a9097c19223f5 (diff) | |
| download | pfsense-packages-a0275915f127d728e5088920bd8da9a944a7d6b4.tar.gz pfsense-packages-a0275915f127d728e5088920bd8da9a944a7d6b4.tar.bz2 pfsense-packages-a0275915f127d728e5088920bd8da9a944a7d6b4.zip | |
Dashboard 0.8.6: Prevent install on 2.0 (just in case) and remove snort/havp widgets so they can be in their own packages.
Diffstat (limited to 'config/dashboard/dashboard.inc')
| -rw-r--r-- | config/dashboard/dashboard.inc | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/config/dashboard/dashboard.inc b/config/dashboard/dashboard.inc index 9f5d6e8c..61b5c501 100644 --- a/config/dashboard/dashboard.inc +++ b/config/dashboard/dashboard.inc @@ -2,19 +2,26 @@ function dashboard_install() { global $g, $config; - assign_privs(); - /* Copy files for backup. For some odd reason, mv alone does - * not always result in the proper file being used. */ - mwexec("cp /usr/local/www/index.php /usr/local/www/index.php.before_dashboard"); - unlink("/usr/local/www/index.php"); - mwexec("cp /usr/local/www/diag_logs_filter.php /usr/local/www/diag_logs_filter.php.before_dashboard"); - mwexec("cp /usr/local/www/diag_logs_filter_dynamic.php /usr/local/www/diag_logs_filter_dynamic.php.before_dashboard"); - mwexec("tar xzvpUf /usr/local/pkg/widgets.tgz -C /"); - assign_privs(); - /* Clear the APC cache so that the updates to installed files will work. */ - sleep(5); - apc_clear_cache(); + $version = file_get_contents("/etc/version"); + if ($version[0] == "2") { + echo "Skipping install on 2.0, package is redundant."; + exit(1); + } else { + assign_privs(); + + /* Copy files for backup. For some odd reason, mv alone does + * not always result in the proper file being used. */ + mwexec("cp /usr/local/www/index.php /usr/local/www/index.php.before_dashboard"); + unlink("/usr/local/www/index.php"); + mwexec("cp /usr/local/www/diag_logs_filter.php /usr/local/www/diag_logs_filter.php.before_dashboard"); + mwexec("cp /usr/local/www/diag_logs_filter_dynamic.php /usr/local/www/diag_logs_filter_dynamic.php.before_dashboard"); + mwexec("tar xzvpUf /usr/local/pkg/widgets.tgz -C /"); + assign_privs(); + /* Clear the APC cache so that the updates to installed files will work. */ + sleep(5); + apc_clear_cache(); + } } function assign_privs() { |