tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-06-21 Ramon Novoa <rnovoa@artica.es>

Browse Source 
* pandoradb_data.sql,
	  DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  include/config_process.php,
	  install.php,
	  pandora_console.spec,
	  pandora_console.redhat.spec: Updated version strings.

	* extensions/update_manager.php: Merged from 4.0 branch. Ignore blank
	  lines in installation SQL file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6670 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2012-06-21 17:38:43 +00:00
parent f1c738c49e
commit e2a32e28c7
9 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2012-06-21 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
DEBIAN/control,
DEBIAN/make_deb_package.sh,
include/config_process.php,
install.php,
pandora_console.spec,
pandora_console.redhat.spec: Updated version strings.
* extensions/update_manager.php: Merged from 4.0 branch. Ignore blank
lines in installation SQL file.
2012-06-21 Miguel de Dios <miguel.dedios@artica.es> 2012-06-21 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php: fixed the lost * extensions/update_manager/load_updatemanager.php: fixed the lost

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 4.0.1 Version: 5.0dev
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="4.0.1" pandora_version="5.0dev"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

2
pandora_console/extensions/update_manager.php
View File

@ -111,6 +111,8 @@ function pandora_update_manager_install () {
break; break;
} }
foreach ($sentences as $sentence) { foreach ($sentences as $sentence) {
if (trim ($sentence) == "")
continue;
$success = db_process_sql ($sentence); $success = db_process_sql ($sentence);
if ($success === false) if ($success === false)
return; return;

4
pandora_console/include/config_process.php
View File

@ -22,8 +22,8 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC120214'; $build_version = 'PC120621';
$pandora_version = 'v5.0-dev'; $pandora_version = 'v5.0dev';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.
$script_tz = @date_default_timezone_get(); $script_tz = @date_default_timezone_get();

4
pandora_console/install.php
View File

@ -66,8 +66,8 @@ function ChangeDBAction(causer) {
<?php <?php
$version = '5.0'; $version = '5.0dev';
$build = '120418'; $build = '120621';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -2,7 +2,7 @@
# Pandora FMS Console # Pandora FMS Console
# #
%define name pandorafms_console %define name pandorafms_console
%define version 4.0 %define version 5.0dev
%define release 1 %define release 1
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -2,7 +2,7 @@
# Pandora FMS Console # Pandora FMS Console
# #
%define name pandorafms_console %define name pandorafms_console
%define version 4.0.1 %define version 5.0dev
%define release 1 %define release 1
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running

4
pandora_console/pandoradb_data.sql
View File

@ -48,8 +48,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('days_compact','0'), ('days_compact','0'),
('graph_res','5'), ('graph_res','5'),
('step_compact','1'), ('step_compact','1'),
('db_scheme_version','5.0'), ('db_scheme_version','5.0dev'),
('db_scheme_build','PD120524'), ('db_scheme_build','PD120621'),
('show_unknown','0'), ('show_unknown','0'),
('show_lastalerts','1'), ('show_lastalerts','1'),
('style','pandora'), ('style','pandora'),