Merge branch...

Merge branch '6393-websites-php-version-gets-accidentally-altered-by-admin-if-websites-php-version-is-client_id-0' into 'develop'

Resolve "Websites php version gets (accidentally) altered by admin if websites php version is client_id != 0"

Closes #6393

See merge request ispconfig/ispconfig3!1657

interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -66,6 +66,9 @@
                     </div>
                 </tmpl_unless>
             </tmpl_if>
+            <tmpl_if name="domain_option">
+                <input type="hidden" id="client_group_id" name="client_group_id" value="{tmpl_var name='client_group_id_value'}" />
+            </tmpl_if>
             <div class="form-group">
                 <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
                 <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">

interface/web/sites/web_vhost_domain_edit.php

@@ -725,6 +725,12 @@ class page_action extends tform_actions {
 			// remove the parent domain part of the domain name before we show it in the text field.
 			if($this->dataRecord["type"] == 'vhostsubdomain') $this->dataRecord["domain"] = str_replace('.'.$selected_domain, '', $this->dataRecord["domain"]);
 
+			// We have to set the client group id value as the client select field is hidden in this mode
+			if($is_admin) {
+				$app->tpl->setVar("client_group_id_value", $this->dataRecord["sys_groupid"], true);
+			} else {
+				$app->tpl->setVar("client_group_id_value", $_SESSION["s"]["user"]["default_group"], true);
+			}
 
 		} else {
 			// remove the parent domain part of the domain name before we show it in the text field.