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) {
@@ -97,7 +88,7 @@
                  $domain_select .= " selected";
                        $selected_domain = $domain['domain'];
               }
               $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
               $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
            }
         }
         else {
@@ -113,12 +104,25 @@
      } else {
        
            // Get the record of the parent domain
            $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".intval(@$this->dataRecord["parent_domain_id"]));
            $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
            
            // remove the parent domain part of the domain name before we show it in the text field.
            $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"],'',$this->dataRecord["domain"]);
        }
        $app->tpl->setVar("domain",$this->dataRecord["domain"]);
		
      if($_SESSION["s"]["user"]["typ"] == 'admin') {
         // Directive Snippets		
         $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
         $proxy_directive_snippets_txt = '';
         if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
            foreach($proxy_directive_snippets as $proxy_directive_snippet){
               $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
            }
         }
         if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
         $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
      }
      
      parent::onShowEnd();
      
@@ -128,21 +132,26 @@
      global $app, $conf;
      
        // Get the record of the parent domain
        $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval(@$this->dataRecord["parent_domain_id"]));
        $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
        
      $app->uses('ini_parser,getconf');
      $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 = ".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';
@@ -159,7 +168,7 @@
   function onAfterInsert() {
      global $app, $conf;
      
      $app->db->query('UPDATE web_domain SET sys_groupid = '.intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
      $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
      
   }
   
@@ -170,7 +179,7 @@
      if($this->dataRecord['parent_domain_id'] != $this->oldDataRecord['parent_domain_id']) {
         
         //* Update the domain owner
         $app->db->query('UPDATE web_domain SET sys_groupid = '.intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
         $app->db->query('UPDATE web_domain SET sys_groupid = '.$app->functions->intval($this->parent_domain_record['sys_groupid']).' WHERE domain_id = '.$this->id);
         
         //* Update the old website, so that the vhost alias gets removed
         //* We force the update by inserting a transaction record without changes manually.