From b4f64756bc97a85b2ab5c5047d2fa1fa2eae4bd3 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 1 Jun 2010 14:42:27 +0000 Subject: [PATCH] 2010-06-01 Miguel de Dios * DEBIAN/conffiles: added file config.php as conf file for package Debian. * DEBIAN/make_deb_package.sh: changed the source to "touch" conf file. * index.php: fixed the tests for config.php, now check if empty file then call installer.php. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2834 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/DEBIAN/conffiles | 2 ++ pandora_console/DEBIAN/make_deb_package.sh | 1 + pandora_console/index.php | 4 ++++ 4 files changed, 16 insertions(+) create mode 100644 pandora_console/DEBIAN/conffiles diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 284397752a..8a0531d80d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2010-06-01 Miguel de Dios + + * DEBIAN/conffiles: added file config.php as conf file for package Debian. + + * DEBIAN/make_deb_package.sh: changed the source to "touch" conf file. + + * index.php: fixed the tests for config.php, now check if empty file then + call installer.php. + 2010-06-01 Sergio Martin * include/functions_visual_map.php: Fixed a diff --git a/pandora_console/DEBIAN/conffiles b/pandora_console/DEBIAN/conffiles new file mode 100644 index 0000000000..68f31fde02 --- /dev/null +++ b/pandora_console/DEBIAN/conffiles @@ -0,0 +1,2 @@ +/var/www/pandora_console/include/config.php +/var/www/pandora_console/extensions diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 59eea6445b..311383536f 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -95,6 +95,7 @@ then find temp_package/var/www/pandora_console -name ".svn" | xargs rm -Rf rm -Rf temp_package/var/www/pandora_console/pandora_console.spec chmod 755 -R temp_package/DEBIAN + touch temp_package/var/www/pandora_console/include/config.php echo "Calculate md5sum for md5sums package control file." for item in `find temp_package` diff --git a/pandora_console/index.php b/pandora_console/index.php index 579a6ac318..dd49190038 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -34,6 +34,10 @@ if ($develop_bypass != 1) { exit; } } + if (filesize("include/config.php") == 0) { + include ("install.php"); + exit; + } // Check for installer presence if (file_exists ("install.php")) { include "general/error_install.php";