Fixed a problem in domain module.

Till Brehm

2014-02-08 b4284d33cd252addb69963e07c4a90b3b22a445e

Fixed a problem in domain module.

 interface/web/client/domain_edit.php

@@ -52,14 +52,6 @@
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'.lng';
include $lng_file;

if(!$app->tform->checkClientLimit('limit_domainmodule')) {
    $app->uses('ini_parser,getconf');
    $settings = $app->getconf->get_global_config('domains');
    if ($settings['use_domain_module'] == 'y') {
        $app->error($settings['new_domain_html']);
    }
}


class page_action extends tform_actions {

@@ -75,6 +67,16 @@

    function onShowEnd() {
        global $app, $conf, $wb;
		
        if($_SESSION["s"]["user"]["typ"] != 'admin' && $this->id == 0) {
            if(!$app->tform->checkClientLimit('limit_domainmodule')) {
                $app->uses('ini_parser,getconf');
                $settings = $app->getconf->get_global_config('domains');
                if ($settings['use_domain_module'] == 'y') {
                    $app->error($settings['new_domain_html']);
                }
            }
        }

        if($_SESSION["s"]["user"]["typ"] == 'admin') {
            // Getting Clients of the user
@@ -92,6 +94,28 @@
            }
            $app->tpl->setVar("client_group_id", $client_select);

        } else {
            // Get the limits of the client
            $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
            $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
	
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY sys_group.name";
            //die($sql);
            $records = $app->db->queryAllRecords($sql);
            $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
            $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
            //$tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($records)) {
                $selected_client_group_id = 0; // needed to get list of PHP versions
                foreach( $records as $rec) {
                    if(is_array($this->dataRecord) && ($rec["groupid"] == $this->dataRecord['client_group_id'] || $rec["groupid"] == $this->dataRecord['sys_groupid']) && !$selected_client_group_id) $selected_client_group_id = $rec["groupid"];
                    $selected = @(is_array($this->dataRecord) && ($rec["groupid"] == $this->dataRecord['client_group_id'] || $rec["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
                    if($selected == 'SELECTED') $selected_client_group_id = $rec["groupid"];
                    $client_select .= "<option value='$rec[groupid]' $selected>$rec[contactname]</option>\r\n";
                }
            }
            $app->tpl->setVar("client_group_id", $client_select);
        }

        if($this->id > 0) {
@@ -127,6 +151,24 @@
                */
                $this->dataRecord = $app->tform->getDataRecord($this->id);
            }
        } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
            if ($this->id == 0) {
                /*
                 * We create a new record
                */
                // Check if the user is empty
                if(isset($this->dataRecord['client_group_id']) && $this->dataRecord['client_group_id'] == 0) {
                    $app->tform->errorMessage .= $wb['error_client_group_id_empty'];
                }
                //* make sure that the domain is lowercase
                if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);
            }
            else {
                /*
                 * We edit a existing one, but there is nothing to edit
                */
                $this->dataRecord = $app->tform->getDataRecord($this->id);
            }
        } else {
            if($this->id > 0) {
                /*

 interface/web/client/templates/domain_edit.htm

@@ -12,7 +12,6 @@
                <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
                </tmpl_if>
            </div>
            <tmpl_if name="is_admin">
            <div class="ctrlHolder">
                <label for="client_group_id">{tmpl_var name='client_txt'}</label>
                <tmpl_if name="edit_disabled">
@@ -25,7 +24,6 @@
                </select>
                </tmpl_if>
            </div>
            </tmpl_if>
        </fieldset>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">