Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be mer...

tbrehm

2013-01-17 43b345cabb3e8743a91c39e8d6367c1aa594ebd2

 interface/web/sites/web_subdomain_edit.php

@@ -45,7 +45,7 @@
$app->auth->check_module_permissions('sites');

// Loading classes
$app->uses('tpl,tform,tform_actions');
$app->uses('tpl,tform,tform_actions,tools_sites');
$app->load('tform_actions');

class page_action extends tform_actions {
@@ -77,16 +77,7 @@
         /*
          * The domain-module is in use.
         */
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         /*
          * The admin can select ALL domains, the user only the domains assigned to him
          */
         $sql = "SELECT domain_id, domain FROM domain ";
         if ($_SESSION["s"]["user"]["typ"] != 'admin') {
            $sql .= "WHERE sys_groupid =" . $client_group_id;
         }
         $sql .= " ORDER BY domain";
         $domains = $app->db->queryAllRecords($sql);
         $domains = $app->tools_sites->getDomainModuleDomains();
         $domain_select = '';
            $selected_domain = '';
         if(is_array($domains) && sizeof($domains) > 0) {
@@ -147,15 +138,20 @@
      $settings = $app->getconf->get_global_config('domains');
      if ($settings['use_domain_module'] == 'y') {
            // get the record of the domain module domain
            $domain = $app->db->queryOneRecord("SELECT * FROM domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["sel_domain"]));
            $domain = $app->tools_sites->checkDomainModuleDomain($this->dataRecord['sel_domain']);
            if(!$domain) {
                $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
            } else {
                $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain['domain'];
                $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain;
            }
        } else {
            $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
        }
		
      // nginx: if redirect type is proxy and redirect path is no URL, display error
      if($this->dataRecord["redirect_type"] == 'proxy' && substr($this->dataRecord['redirect_path'],0,1) == '/'){
         $app->tform->errorMessage .= $app->tform->lng("error_proxy_requires_url")."<br />";
      }
        
      // Set a few fixed values
      $this->dataRecord["type"] = 'subdomain';