Marius Cramer
2014-01-24 9a02e2405f8296c50de0e5a493f6674a80856910
Resolved differences in aliasdomain/subdomain files
2 files modified
12 ■■■■■ changed files
interface/web/sites/web_aliasdomain_edit.php 10 ●●●●● patch | view | raw | blame | history
interface/web/sites/web_subdomain_edit.php 2 ●●● patch | view | raw | blame | history
interface/web/sites/web_aliasdomain_edit.php
@@ -124,6 +124,9 @@
    function onSubmit() {
        global $app, $conf;
        // Get the record of the parent domain
        $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
        if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
        /* check if the domain module is used - and check if the selected domain can be used! */
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
@@ -142,14 +145,9 @@
            $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
        }
        // Get the record of the parent domain
        $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
        if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
        // Set a few fixed values
        $this->dataRecord["type"] = 'alias';
        $this->dataRecord["server_id"] = $parent_domain["server_id"];
        //$this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
        $this->parent_domain_record = $parent_domain;
@@ -178,7 +176,7 @@
            //* Update the old website, so that the vhost alias gets removed
            //* We force the update by inserting a transaction record without changes manually.
            $old_website = $app->db->queryOneRecord('SELECT * FROM web_domain WHERE domain_id = '.$app->functions->intval($this->oldDataRecord['domain_id']));
            $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $this->oldDataRecord['parent_domain_id'], $old_website, $old_website, true);
            $app->db->datalogSave('web_domain', 'UPDATE', 'domain_id', $app->functions->intval($this->oldDataRecord['parent_domain_id']), $old_website, $old_website, true);
        }
    }
interface/web/sites/web_subdomain_edit.php
@@ -134,7 +134,7 @@
        // Get the record of the parent domain
        $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]) . " AND ".$app->tform->getAuthSQL('r'));
        if(!$parent_domain || $parent_domain['domain_id'] != @$this->dataRecord['parent_domain_id']) $app->tform->errorMessage .= $app->tform->lng("no_domain_perm");
        /* check if the domain module is used - and check if the selected domain can be used! */
        $app->uses('ini_parser,getconf');
        $settings = $app->getconf->get_global_config('domains');
        if ($settings['use_domain_module'] == 'y') {