Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-02-03 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf

 interface/web/admin/software_package_list.php

@@ -49,7 +49,7 @@
      if(is_array($packages)) {
         foreach($packages as $p) {
            $package_name = $app->db->quote($p['name']);
            $tmp = $app->db->queryOneRecord("SELECT package_id FROM software_package WHERE package_name = '$package_name'");
            $tmp = $app->db->queryOneRecord("SELECT package_id FROM software_package WHERE package_name = '".$app->db->quote($package_name)."'");

            $package_title = $app->db->quote($p['title']);
            $package_description = $app->db->quote($p['description']);
@@ -150,7 +150,7 @@
   foreach($packages as $key => $p) {
      $installed_txt = '';
      foreach($servers as $s) {
         $inst = $app->db->queryOneRecord("SELECT * FROM software_update, software_update_inst WHERE software_update_inst.software_update_id = software_update.software_update_id AND software_update_inst.package_name = '".addslashes($p["package_name"])."' AND server_id = '".$s["server_id"]."'");
         $inst = $app->db->queryOneRecord("SELECT * FROM software_update, software_update_inst WHERE software_update_inst.software_update_id = software_update.software_update_id AND software_update_inst.package_name = '".$app->db->quote($p["package_name"])."' AND server_id = '".$app->functions->intval($s["server_id"])."'");
         $version = $inst['v1'].'.'.$inst['v2'].'.'.$inst['v3'].'.'.$inst['v4'];

         if($inst['status'] == 'installed') {
@@ -165,7 +165,7 @@
            if($p['package_installable'] == 'no') {
               $installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."<br />";
            } else {
               $installed_txt .= $s['server_name'].": <a href=\"#\" onclick=\"loadContent('admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."');\">Install now</a><br />";
               $installed_txt .= $s['server_name'].": <a href=\"#\" data-load-content=\"admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."\">Install now</a><br />";
            }
         }
      }