gitlabFork/ISPConfig3.git - Solinfo Gitblit

parent: 7bc0f15d | patch | commit | ignore whitespace

Fixed: FS#1045 - Error when a reseller edit site

tbrehm

2010-01-26 327f28a3e300b3e5c7000cbb0763cc8314b1c45b

Fixed: FS#1045 - Error when a reseller edit site

4 files modified

	interface/web/dns/dns_soa_edit.php	6 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/mail/mail_domain_edit.php	6 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/sites/database_edit.php	6 ●●●●● patch \| view \| raw \| blame \| history
	interface/web/sites/web_domain_edit.php	6 ●●●●● patch \| view \| raw \| blame \| history

 interface/web/dns/dns_soa_edit.php

@@ -76,9 +76,10 @@
            $clients = $app->db->queryAllRecords($sql);
            $client_select = '';
            if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = ($client["groupid"] == @$this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = ($client["groupid"] == @$tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }
@@ -93,9 +94,10 @@
            $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
            $clients = $app->db->queryAllRecords($sql);
            $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }

 interface/web/mail/mail_domain_edit.php

@@ -80,9 +80,10 @@
            $clients = $app->db->queryAllRecords($sql);
            $client_select = '';
            if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = ($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }
@@ -103,9 +104,10 @@
            $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
            $clients = $app->db->queryAllRecords($sql);
            $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }

 interface/web/sites/database_edit.php

@@ -96,9 +96,10 @@
            $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
            $clients = $app->db->queryAllRecords($sql);
            $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }
@@ -133,9 +134,10 @@
            $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
            $clients = $app->db->queryAllRecords($sql);
            $client_select = "<option value='0'></option>";
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }

 interface/web/sites/web_domain_edit.php

@@ -114,9 +114,10 @@
            $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
            $records = $app->db->queryAllRecords($sql);
            $client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($records)) {
                foreach( $records as $rec) {
                    $selected = @($rec["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = @($rec["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$rec[groupid]' $selected>$rec[name]</option>\r\n";
                }
            }
@@ -169,9 +170,10 @@
            $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
            $clients = $app->db->queryAllRecords($sql);
            $client_select = "<option value='0'></option>";
            $tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
                foreach( $clients as $client) {
                    $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
                    $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                    $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
                }
            }

			@@ -76,9 +76,10 @@
			$clients = $app->db->queryAllRecords($sql);
			$client_select = '';
			if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = ($client["groupid"] == @$this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = ($client["groupid"] == @$tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}
			@@ -93,9 +94,10 @@
			$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
			$clients = $app->db->queryAllRecords($sql);
			$client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}

			@@ -80,9 +80,10 @@
			$clients = $app->db->queryAllRecords($sql);
			$client_select = '';
			if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = ($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = ($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}
			@@ -103,9 +104,10 @@
			$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
			$clients = $app->db->queryAllRecords($sql);
			$client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}

			@@ -96,9 +96,10 @@
			$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
			$clients = $app->db->queryAllRecords($sql);
			$client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}
			@@ -133,9 +134,10 @@
			$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
			$clients = $app->db->queryAllRecords($sql);
			$client_select = "<option value='0'></option>";
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}

			@@ -114,9 +114,10 @@
			$sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY name";
			$records = $app->db->queryAllRecords($sql);
			$client_select = '<option value="'.$client['client_id'].'">'.$client['contact_name'].'</option>';
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($records)) {
			foreach( $records as $rec) {
			$selected = @($rec["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = @($rec["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$rec[groupid]' $selected>$rec[name]</option>\r\n";
			}
			}
			@@ -169,9 +170,10 @@
			$sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
			$clients = $app->db->queryAllRecords($sql);
			$client_select = "<option value='0'></option>";
			$tmp_data_record = $app->tform->getDataRecord($this->id);
			if(is_array($clients)) {
			foreach( $clients as $client) {
			$selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':'';
			$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
			$client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
			}
			}