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

Till Brehm

2014-12-11 6935aa30cb402e25335ba730ee5657f6020c7cc5

 interface/web/sites/web_vhost_domain_edit.php

@@ -121,6 +121,10 @@
         $server_id = intval($settings['default_webserver']);
         $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = $server_id;
      }
      if(!$server_id){
         $default_web_server = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = ? ORDER BY server_id LIMIT 0,1", 1);
         $server_id = $default_web_server['server_id'];
      }
      $web_config = $app->getconf->get_server_config($server_id, 'web');
      $app->tform->formDef['tabs']['domain']['fields']['php']['default'] = $web_config['php_handler'];
      $app->tform->formDef['tabs']['domain']['readonly'] = false;
@@ -187,7 +191,7 @@
         if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
            // check if server is in client's servers or add it.
            $chk_sid = explode(',', $client['web_servers']);
            if(in_array($this->dataRecord["server_id"], $client['web_servers']) == false) {
            if(in_array($this->dataRecord["server_id"], explode(',', $client['web_servers'])) == false) {
               if($client['web_servers'] != '') $client['web_servers'] .= ',';
               $client['web_servers'] .= $app->functions->intval($this->dataRecord["server_id"]);
            }