nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 16:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix coding style part 2

Browse Source
This commit is contained in:
Job Snijders
2015-07-14 17:41:54 +02:00
parent ad9590df9b
commit 361653aa81
731 changed files with 37529 additions and 33991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
upgrade-scripts/fix-billing-2758.inc.php
+35 -38
View File
@@ -11,28 +11,28 @@ include("config.php");
echo("Updating Billing...");
$create_sql = "CREATE TABLE IF NOT EXISTS `bill_history` (
`bill_hist_id` int(11) NOT NULL AUTO_INCREMENT,
`bill_id` int(11) NOT NULL,
`updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`bill_datefrom` datetime NOT NULL,
`bill_dateto` datetime NOT NULL,
`bill_type` text NOT NULL,
`bill_allowed` bigint(20) NOT NULL,
`bill_used` bigint(20) NOT NULL,
`bill_overuse` bigint(20) NOT NULL,
`bill_percent` decimal(10,2) NOT NULL,
`rate_95th_in` bigint(20) NOT NULL,
`rate_95th_out` bigint(20) NOT NULL,
`rate_95th` bigint(20) NOT NULL,
`dir_95th` varchar(3) NOT NULL,
`rate_average` bigint(20) NOT NULL,
`rate_average_in` bigint(20) NOT NULL,
`rate_average_out` bigint(20) NOT NULL,
`traf_in` bigint(20) NOT NULL,
`traf_out` bigint(20) NOT NULL,
`traf_total` bigint(20) NOT NULL,
`pdf` longblob,
PRIMARY KEY (`bill_hist_id`),
`bill_hist_id` int(11) NOT NULL AUTO_INCREMENT,
`bill_id` int(11) NOT NULL,
`updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`bill_datefrom` datetime NOT NULL,
`bill_dateto` datetime NOT NULL,
`bill_type` text NOT NULL,
`bill_allowed` bigint(20) NOT NULL,
`bill_used` bigint(20) NOT NULL,
`bill_overuse` bigint(20) NOT NULL,
`bill_percent` decimal(10,2) NOT NULL,
`rate_95th_in` bigint(20) NOT NULL,
`rate_95th_out` bigint(20) NOT NULL,
`rate_95th` bigint(20) NOT NULL,
`dir_95th` varchar(3) NOT NULL,
`rate_average` bigint(20) NOT NULL,
`rate_average_in` bigint(20) NOT NULL,
`rate_average_out` bigint(20) NOT NULL,
`traf_in` bigint(20) NOT NULL,
`traf_out` bigint(20) NOT NULL,
`traf_total` bigint(20) NOT NULL,
`pdf` longblob,
PRIMARY KEY (`bill_hist_id`),
UNIQUE KEY `unique_index` (`bill_id`,`bill_datefrom`,`bill_dateto`),
KEY `bill_id` (`bill_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;";
@@ -66,23 +66,20 @@ mysql_query("ALTER TABLE `bills` ADD `rate_average` bigint(20) NOT NULL;");
mysql_query("ALTER TABLE `bills` ADD `bill_last_calc` datetime NOT NULL;");
mysql_query("ALTER TABLE `bills` CHANGE `bill_cdr` bigint(20) NOT NULL;");
foreach (dbFetchRows("SELECT * FROM `bills`") as $bill_data)
{
echo("Bill ".$bill['bill_id']." ".$bill['bill_name']);
if($bill_data['bill_gb'] > 0)
{
$bill_data['bill_quota'] = $bill_data['bill_gb'] * $config['billing']['base'] * $config['billing']['base'];
dbUpdate(array('bill_quota' => $bill_data['bill_quota']), 'bills', '`bill_id` = ?', array($bill_data['bill_id']));
echo("Quota -> ".$bill_data['bill_quota']);
}
foreach (dbFetchRows("SELECT * FROM `bills`") as $bill_data) {
echo("Bill ".$bill['bill_id']." ".$bill['bill_name']);
if($bill_data['bill_gb'] > 0) {
$bill_data['bill_quota'] = $bill_data['bill_gb'] * $config['billing']['base'] * $config['billing']['base'];
dbUpdate(array('bill_quota' => $bill_data['bill_quota']), 'bills', '`bill_id` = ?', array($bill_data['bill_id']));
echo("Quota -> ".$bill_data['bill_quota']);
}
if($bill_data['bill_cdr'] > 0)
{
$bill_data['bill_cdr'] = $bill_data['bill_cdr'] * 1000;
dbUpdate(array('bill_cdr' => $bill_data['bill_cdr']), 'bills', '`bill_id` = ?', array($bill_data['bill_id']));
echo("CDR -> ".$bill_data['bill_cdr']);
}
echo("\n");
if($bill_data['bill_cdr'] > 0) {
$bill_data['bill_cdr'] = $bill_data['bill_cdr'] * 1000;
dbUpdate(array('bill_cdr' => $bill_data['bill_cdr']), 'bills', '`bill_id` = ?', array($bill_data['bill_id']));
echo("CDR -> ".$bill_data['bill_cdr']);
}
echo("\n");
}
mysql_query("ALTER TABLE `bills` DROP `bill_gb`");
upgrade-scripts/fix-events.php
+9 -14
View File
@@ -4,22 +4,17 @@
// 3 ALTERS
// 1 SELECT
// 1 UPDATE
mysql_query('ALTER TABLE `eventlog` DROP `id`');
mysql_query('ALTER TABLE `eventlog` ADD `event_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST');
mysql_query("ALTER TABLE `eventlog` DROP `id`");
mysql_query("ALTER TABLE `eventlog` ADD `event_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
$s = "SELECT * FROM eventlog";
$s = 'SELECT * FROM eventlog';
$q = mysql_query($s);
while ($event = mysql_fetch_assoc($q))
{
if ($event['interface'])
{
mysql_query("UPDATE `eventlog` SET `interface` = NULL, `type` = 'interface', `reference` = '".$event['interface']."' WHERE `event_id` = '".$event['event_id']."'");
}
while ($event = mysql_fetch_assoc($q)) {
if ($event['interface']) {
mysql_query("UPDATE `eventlog` SET `interface` = NULL, `type` = 'interface', `reference` = '".$event['interface']."' WHERE `event_id` = '".$event['event_id']."'");
}
$i++;
$i++;
}
mysql_query("ALTER TABLE `eventlog` DROP `interface`");
?>
mysql_query('ALTER TABLE `eventlog` DROP `interface`');