From 9021d7fc7ee308c0df84ad29da0bf316f592ce89 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Tue, 13 Jan 2015 10:48:15 -0500 Subject: [PATCH] - cleaned up javascript --- interface/web/admin/software_update_list.php | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-) diff --git a/interface/web/admin/software_update_list.php b/interface/web/admin/software_update_list.php index 8bc8b79..321c42b 100644 --- a/interface/web/admin/software_update_list.php +++ b/interface/web/admin/software_update_list.php @@ -176,37 +176,13 @@ 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; - - } -} -*/ -- Gitblit v1.9.1