From 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 03 Feb 2015 04:10:04 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/admin/software_update_list.php | 86 ++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 54 deletions(-)
diff --git a/interface/web/admin/software_update_list.php b/interface/web/admin/software_update_list.php
index 0f09241..321c42b 100644
--- a/interface/web/admin/software_update_list.php
+++ b/interface/web/admin/software_update_list.php
@@ -28,11 +28,12 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('admin');
+$app->auth->check_security_permissions('admin_allow_software_packages');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
@@ -42,7 +43,7 @@
$repos = $app->db->queryAllRecords("SELECT software_repo_id, repo_url, repo_username, repo_password FROM software_repo WHERE active = 'y'");
if(is_array($repos)) {
foreach($repos as $repo) {
-
+
/*
SELECT software_package.package_name, v1, v2, v3, v4
FROM software_package
@@ -51,26 +52,26 @@
GROUP BY package_name
ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC
*/
-
+
$client = new SoapClient(null, array('location' => $repo['repo_url'],
- 'uri' => $repo['repo_url']));
-
+ 'uri' => $repo['repo_url']));
+
$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']);
-
+ $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']);
+
+ $version_array = explode('.', $u['version']);
$v1 = $app->functions->intval($version_array[0]);
$v2 = $app->functions->intval($version_array[1]);
$v3 = $app->functions->intval($version_array[2]);
$v4 = $app->functions->intval($version_array[3]);
-
+
$package_name = $app->db->quote($u['package_name']);
$software_repo_id = $app->functions->intval($repo['software_repo_id']);
$update_url = $app->db->quote($u['url']);
@@ -78,18 +79,18 @@
$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)
+ $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);
}
-
+
}
}
}
@@ -103,11 +104,11 @@
$package_name = $app->db->quote($_GET['package']);
$server_id = $app->functions->intval($_GET['server_id']);
$software_update_id = $app->functions->intval($_GET['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');
-
+
}
@@ -116,7 +117,7 @@
// Loading the template
$app->uses('tpl');
$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/software_update_list.htm');
+$app->tpl->setInclude('content_tpl', 'templates/software_update_list.htm');
/*
SELECT software_package.package_name, software_package.package_title, software_update.update_title, v1, v2, v3, v4, software_update_inst.status
@@ -144,7 +145,7 @@
}
}
-$app->tpl->setLoop('servers',$servers);
+$app->tpl->setLoop('servers', $servers);
$sql = "SELECT v1, v2, v3, v4, software_update.update_title, software_update.software_update_id, software_update.package_name, v1, v2, v3, v4, software_update_inst.status
FROM software_update LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
@@ -159,59 +160,36 @@
if(is_array($installed_packages)) {
foreach($installed_packages as $ip) {
-
+
// Get version number of the latest installed version
- $sql = "SELECT v1, v2, v3, v4 FROM software_update, software_update_inst WHERE software_update.software_update_id = software_update_inst.software_update_id AND server_id = ".$server_id." ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC LIMIT 0,1";
+ $sql = "SELECT v1, v2, v3, v4 FROM software_update, software_update_inst WHERE software_update.software_update_id = software_update_inst.software_update_id AND server_id = ".$app->functions->intval($server_id)." ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC LIMIT 0,1";
$lu = $app->db->queryOneRecord($sql);
-
+
// Get all installable updates
- $sql = "SELECT * FROM software_update WHERE v1 >= $lu[v1] AND v2 >= $lu[v2] AND v3 >= $lu[v3] AND v4 >= $lu[v4] AND package_name = '$ip[package_name]' ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC";
+ $sql = "SELECT * FROM software_update WHERE v1 >= ".$app->functions->intval($lu['v1'])." AND v2 >= ".$app->functions->intval($lu['v2'])." AND v3 >= ".$app->functions->intval($lu['v3'])." AND v4 >= ".$app->functions->intval($lu['v4'])." AND package_name = '".$app->db->quote($ip['package_name'])."' ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC";
$updates = $app->db->queryAllRecords($sql);
//die($sql);
-
+
if(is_array($updates)) {
// Delete the last record as it is already installed
unset($updates[count($updates)-1]);
-
+
foreach($updates as $key => $u) {
$version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
- $installed_txt = "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install Update</a><br />";
+ $installed_txt = "<a href=\"#\" data-load-content=\"admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."\">Install Update</a><br />";
$records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt);
-
+
}
}
}
}
-/*
-$updates = $app->db->queryAllRecords('SELECT software_update.update_title, software_update.software_update_id, software_update.package_name, v1, v2, v3, v4, software_update_inst.status
- FROM software_update LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
- WHERE server_id = '.$server_id.'
- GROUP BY software_update.package_name
- ORDER BY software_update.package_name ASC, v1 DESC , v2 DESC , v3 DESC , v4 DESC');
-
-if(is_array($updates)) {
- foreach($updates as $key => $u) {
- $installed_txt = '';
-
- $version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
- $updates[$key]['version'] = $version;
- if($u['status'] == 'installed' || $u['status'] == 'installing' || $u['status'] == 'deleting') {
- $installed_txt .= "Installed version $version<br />";
- } else {
- $installed_txt .= "<a href=\"#\" onclick=\"loadContent('admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."');\">Install now</a><br />";
- }
- $updates[$key]['installed'] = $installed_txt;
-
- }
-}
-*/
+$app->tpl->setLoop('records', $records_out);
-$app->tpl->setLoop('records',$records_out);
-
-include_once('lib/lang/en_software_update_list.lng');
+$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
+include_once 'lib/lang/'.$language.'_software_update_list.lng';
$app->tpl->setVar($wb);
@@ -219,4 +197,4 @@
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1