Merged revisions 4069-4117 from stable branch.

tbrehm

2013-08-21 7b47c0aa0aeee6f059f00008e36cc210ca89ecb9

 interface/web/sites/web_folder_edit.php

@@ -55,7 +55,8 @@
      global $app, $conf;
      
      // Get the record of the parent domain
      $parent_domain = $app->db->queryOneRecord("select server_id FROM web_domain WHERE domain_id = ".$app->functions->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"]) . " 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["server_id"] = $parent_domain["server_id"];