From b0ebbdedaa0805599b97a9d3bbc96c0a5cf2bbac Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Mar 2010 06:04:32 -0400
Subject: [PATCH] Fixed: FS#1124 - Traffic quota on some systems not working
---
interface/web/admin/software_package_list.php | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php
index 2f632a6..789a71e 100644
--- a/interface/web/admin/software_package_list.php
+++ b/interface/web/admin/software_package_list.php
@@ -55,14 +55,54 @@
$package_title = $app->db->quote($p['title']);
$package_description = $app->db->quote($p['description']);
$software_repo_id = intval($repo['software_repo_id']);
+ $package_type = $app->db->quote($p['type']);
- $sql = "INSERT INTO software_package (software_repo_id, package_name, package_title, package_description) VALUES ($software_repo_id, '$package_name', '$package_title', '$package_description')";
+ $sql = "INSERT INTO software_package (software_repo_id, package_name, package_title, package_description,package_type) VALUES ($software_repo_id, '$package_name', '$package_title', '$package_description','$package_type')";
$app->db->query($sql);
$packages_added++;
}
}
}
-
+
+ $packages = $app->db->queryAllRecords("SELECT software_package.package_name, v1, v2, v3, v4 FROM software_package LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name ) GROUP BY package_name ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC");
+ if(is_array($packages)) {
+ foreach($packages as $p) {
+
+ $version = $p['v1'].'.'.$p['v2'].'.'.$p['v3'].'.'.$p['v4'];
+ $updates = $client->get_updates($p['package_name'], $version,$repo['repo_username'], $repo['repo_password']);
+
+ if(is_array($updates)) {
+ foreach($updates as $u) {
+
+ $version_array = explode('.',$u['version']);
+ $v1 = intval($version_array[0]);
+ $v2 = intval($version_array[1]);
+ $v3 = intval($version_array[2]);
+ $v4 = intval($version_array[3]);
+
+ $package_name = $app->db->quote($u['package_name']);
+ $software_repo_id = intval($repo['software_repo_id']);
+ $update_url = $app->db->quote($u['url']);
+ $update_md5 = $app->db->quote($u['md5']);
+ $update_dependencies = (isset($u['dependencies']))?$app->db->quote($u['dependencies']):'';
+ $update_title = $app->db->quote($u['title']);
+ $type = $app->db->quote($u['type']);
+
+ // Check that we do not have this update in the database yet
+ $sql = "SELECT * FROM software_update WHERE package_name = '$package_name' and v1 = '$v1' and v2 = '$v2' and v3 = '$v3' and v4 = '$v4'";
+ $tmp = $app->db->queryOneRecord($sql);
+ if(!isset($tmp['software_update_id'])) {
+ // Insert the update in the datbase
+ $sql = "INSERT INTO software_update (software_repo_id, package_name, update_url, update_md5, update_dependencies, update_title, v1, v2, v3, v4, type)
+ VALUES ($software_repo_id, '$package_name', '$update_url', '$update_md5', '$update_dependencies', '$update_title', '$v1', '$v2', '$v3', '$v4', '$type')";
+ //die($sql);
+ $app->db->query($sql);
+ }
+
+ }
+ }
+ }
+ }
}
}
@@ -75,6 +115,7 @@
$software_update_id = $tmp['software_update_id'];
$insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$server_id', '$software_update_id','installing')";
+ // $insert_data = "(package_name, server_id, software_update_id, status) VALUES ('$package_name', '$server_id', '$software_update_id','installed')";
$app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
}
@@ -99,8 +140,10 @@
if($inst['status'] == 'installed') {
$installed_txt .= $s['server_name'].": Installed version $version<br />";
- } elseif ($inst['status'] == 'installing') {
- $installed_txt .= $s['server_name'].": Installation in progress<br />";
+ } elseif ($inst['status'] == 'installing') {
+ $installed_txt .= $s['server_name'].": Installation in progress<br />";
+ } elseif ($inst['status'] == 'failed') {
+ $installed_txt .= $s['server_name'].": Installation failed<br />";
} elseif ($inst['status'] == 'deleting') {
$installed_txt .= $s['server_name'].": Deletion in progress<br />";
} else {
--
Gitblit v1.9.1