removed hardcoded width for list search_limit select-element -> css defined

cfoe

2012-07-07 b5715fb4a82d6494e6fba5ffcc1b0af3c9d2421c

 install/lib/install.lib.php

@@ -57,7 +57,7 @@

//** Get distribution identifier
//** IMPORTANT!
//   This is the same code as in server/mods-available/monitor_core_module.inc.php
//   This is the same code as in server/lib/classes/monitor_tools.inc.php
//   So if you change it here, you also have to change it in there!
function get_distname() {
   
@@ -68,8 +68,81 @@
   
   //** Debian or Ubuntu
   if(file_exists('/etc/debian_version')) {
	
      if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
      if (strstr(trim(file_get_contents('/etc/issue')), 'Ubuntu')) {
         if (strstr(trim(file_get_contents('/etc/issue')), 'LTS')) {
            $lts=" LTS";
         } else {
            $lts="";
         }

         $issue=file_get_contents('/etc/issue');
         $distname = 'Ubuntu';
         $distid = 'debian40';
         $distbaseid = 'debian';
         $ver = explode(' ',$issue);
         $ver = array_filter($ver);
         $ver = next($ver);
         $mainver = explode('.',$ver);
         $mainver = array_filter($mainver);
         $mainver = current($mainver).'.'.next($mainver);
         switch ($mainver){
            case "12.10":
               $relname = "(Quantal Quetzal)";
            break;
            case "12.04":
               $relname = "(Precise Pangolin)";
            break;
            case "11.10":
               $relname = "(Oneiric Ocelot)";
            break;
            case "11.14":
               $relname = "(Natty Narwhal)";
            break;
            case "10.10":
               $relname = "(Maverick Meerkat)";
            break;
            case "10.04":
               $relname = "(Lucid Lynx)";
            break;
            case "9.10":
               $relname = "(Karmic Koala)";
            break;
            case "9.04":
               $relname = "(Jaunty Jackpole)";
            break;
            case "8.10":
            $relname = "(Intrepid Ibex)";
            break;
            case "8.04":
               $relname = "(Hardy Heron)";
            break;
            case "7.10":
               $relname = "(Gutsy Gibbon)";
            break;
            case "7.04":
               $relname = "(Feisty Fawn)";
            break;
            case "6.10":
               $relname = "(Edgy Eft)";
            break;
            case "6.06":
               $relname = "(Dapper Drake)";
            break;
            case "5.10":
               $relname = "(Breezy Badger)";
            break;
            case "5.04":
               $relname = "(Hoary Hedgehog)";
            break;
            case "4.10":
               $relname = "(Warty Warthog)";
            break;
            default:
               $relname = "UNKNOWN";
         }
         $distver = $ver.$lts." ".$relname;
         swriteln("Operating System: ".$distver."\n");		
      } elseif(trim(file_get_contents('/etc/debian_version')) == '4.0') {
         $distname = 'Debian';
         $distver = '4.0';
         $distid = 'debian40';
@@ -582,8 +655,8 @@
}

function is_installed($appname) {
   exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
   if(isset($out[0]) && stristr($out[0],$appname)) {
   exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out,$returncode);
   if(isset($out[0]) && stristr($out[0],$appname) && $returncode == 0) {
      return true;
   } else {
      return false;
@@ -633,11 +706,17 @@

function get_ispconfig_port_number() {
   global $conf;
   $ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';

   if($conf['nginx']['installed'] == true){
      $ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost';
      $regex = '/listen (\d+)/';
   } else {
      $ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
      $regex = '/\<VirtualHost.*\:(\d{1,})\>/';
   }
	
   if(is_file($ispconfig_vhost_file)) {
      $tmp = file_get_contents($ispconfig_vhost_file);
      preg_match('/\<VirtualHost.*\:(\d{1,})\>/',$tmp,$matches);
      preg_match($regex,$tmp,$matches);
      $port_number = intval($matches[1]);
      if($port_number > 0) {
         return $port_number;