Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-02-17 ebbe6374fc9c308daf729d2ad1b2f8007ed771ce

 interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php

@@ -80,10 +80,14 @@
            $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval(@$page_form->dataRecord["client_group_id"]));
            $client_id = $app->functions->intval($client["client_id"]);
         } else {
            $client_group_id = $page_form->dataRecord["client_group_id"];
            $client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".$app->functions->intval($page_form->dataRecord["client_group_id"]));
            $client_id = $app->functions->intval($client["client_id"]);
         }

         $tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = $client_group_id");
         $client_user_id = $app->functions->intval(($tmp['userid'] > 0)?$tmp['userid']:1);

         // Set the values for document_root, system_user and system_group
         $system_user     = $app->db->quote('web'.$page_form->id);
         $system_group     = $app->db->quote('client'.$client_id);