Fix coding style part 2

This commit is contained in:
Job Snijders
2015-07-13 20:10:26 +02:00
parent ad9590df9b
commit d8693f05ae
733 changed files with 37359 additions and 33947 deletions

View File

@@ -3,7 +3,8 @@
// MYSQL Check - FIXME
// 1 UNKNOWN
/* Observium Network Management and Monitoring System
/*
* Observium Network Management and Monitoring System
* Copyright (C) 2006-2012, Observium Developers - http://www.observium.org
*
* This program is free software: you can redistribute it and/or modify
@@ -14,134 +15,133 @@
* See COPYING for more details.
*/
if (!isset($debug))
{
# Not called from within discovery, let's load up the necessary stuff.
if (!isset($debug)) {
// Not called from within discovery, let's load up the necessary stuff.
include 'includes/defaults.inc.php';
include 'config.php';
include 'includes/definitions.inc.php';
include 'includes/functions.php';
include("includes/defaults.inc.php");
include("config.php");
include("includes/definitions.inc.php");
include("includes/functions.php");
$options = getopt("d");
if (isset($options['d']))
{
$debug = TRUE;
}
else
{
$debug = FALSE;
}
$options = getopt('d');
if (isset($options['d'])) {
$debug = true;
}
else {
$debug = false;
}
}
$insert = 0;
if ($db_rev = @dbFetchCell("SELECT version FROM `dbSchema` ORDER BY version DESC LIMIT 1")) {} else
{
$db_rev = 0;
$insert = 1;
if ($db_rev = @dbFetchCell('SELECT version FROM `dbSchema` ORDER BY version DESC LIMIT 1')) {
}
else {
$db_rev = 0;
$insert = 1;
}
# For transition from old system
if ($old_rev = @dbFetchCell("SELECT revision FROM `dbSchema`"))
{
echo "-- Transitioning from old revision-based schema to database version system\n";
$db_rev = 6;
// For transition from old system
if ($old_rev = @dbFetchCell('SELECT revision FROM `dbSchema`')) {
echo "-- Transitioning from old revision-based schema to database version system\n";
$db_rev = 6;
if ($old_rev <= 1000) { $db_rev = 1; }
if ($old_rev <= 1435) { $db_rev = 2; }
if ($old_rev <= 2245) { $db_rev = 3; }
if ($old_rev <= 2804) { $db_rev = 4; }
if ($old_rev <= 2827) { $db_rev = 5; }
if ($old_rev <= 1000) {
$db_rev = 1;
}
$insert = 1;
}
if ($old_rev <= 1435) {
$db_rev = 2;
}
if ($old_rev <= 2245) {
$db_rev = 3;
}
if ($old_rev <= 2804) {
$db_rev = 4;
}
if ($old_rev <= 2827) {
$db_rev = 5;
}
$insert = 1;
}//end if
$updating = 0;
$include_dir_regexp = "/\.sql$/";
$include_dir_regexp = '/\.sql$/';
if ($handle = opendir($config['install_dir'] . '/sql-schema'))
{
while (false !== ($file = readdir($handle)))
{
if (filetype($config['install_dir'] . '/sql-schema/' . $file) == 'file' && preg_match($include_dir_regexp, $file))
{
$filelist[] = $file;
if ($handle = opendir($config['install_dir'].'/sql-schema')) {
while (false !== ($file = readdir($handle))) {
if (filetype($config['install_dir'].'/sql-schema/'.$file) == 'file' && preg_match($include_dir_regexp, $file)) {
$filelist[] = $file;
}
}
}
closedir($handle);
closedir($handle);
}
asort($filelist);
foreach ($filelist as $file)
{
list($filename,$extension) = explode('.',$file,2);
if ($filename > $db_rev)
{
if (!$updating)
{
echo "-- Updating database schema\n";
}
echo sprintf("%03d",$db_rev) . " -> " . sprintf("%03d",$filename) . " ...";
$err = 0;
if ($fd = @fopen($config['install_dir'] . '/sql-schema/' . $file,'r'))
{
$data = fread($fd,4096);
while (!feof($fd))
{
$data .= fread($fd,4096);
}
foreach (explode("\n", $data) as $line)
{
if (trim($line))
{
if ($debug) { echo("$line \n"); }
if ($line[0] != "#")
{
$update = mysql_query($line);
if (!$update)
{
$err++;
if ($debug) { echo(mysql_error() . "\n"); }
}
}
foreach ($filelist as $file) {
list($filename,$extension) = explode('.', $file, 2);
if ($filename > $db_rev) {
if (!$updating) {
echo "-- Updating database schema\n";
}
}
if ($db_rev < 5)
{
echo(" done.\n");
}
else
{
echo(" done ($err errors).\n");
}
echo sprintf('%03d', $db_rev).' -> '.sprintf('%03d', $filename).' ...';
$err = 0;
if ($fd = @fopen($config['install_dir'].'/sql-schema/'.$file, 'r')) {
$data = fread($fd, 4096);
while (!feof($fd)) {
$data .= fread($fd, 4096);
}
foreach (explode("\n", $data) as $line) {
if (trim($line)) {
if ($debug) {
echo "$line \n";
}
if ($line[0] != '#') {
$update = mysql_query($line);
if (!$update) {
$err++;
if ($debug) {
echo mysql_error()."\n";
}
}
}
}
}
if ($db_rev < 5) {
echo " done.\n";
}
else {
echo " done ($err errors).\n";
}
}
else {
echo " Could not open file!\n";
}//end if
$updating++;
$db_rev = $filename;
}//end if
}//end foreach
if ($updating) {
if ($insert) {
dbInsert(array('version' => $db_rev), 'dbSchema');
}
else
{
echo(" Could not open file!\n");
else {
dbUpdate(array('version' => $db_rev), 'dbSchema');
}
$updating++;
$db_rev = $filename;
}
echo "-- Done\n";
}
if ($updating)
{
if ($insert)
{
dbInsert(array('version' => $db_rev), 'dbSchema');
} else {
dbUpdate(array('version' => $db_rev), 'dbSchema');
}
echo "-- Done\n";
}
?>