Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method)

mcramer

2012-11-27 7990f8881b085279269d35cf9dd2787b88ae1c08

 interface/web/sites/web_vhost_subdomain_edit.php

@@ -85,7 +85,7 @@

        $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
      
        $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"]));
        
      //* Client: If the logged in user is not admin and has no sub clients (no reseller)
      if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
@@ -197,6 +197,51 @@
         unset($php_records);

            foreach($read_limits as $limit) $app->tpl->setVar($limit, ($limit == 'force_suexec' ? 'n' : 'y'));
			
         // Directive Snippets
         $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
         $php_directive_snippets_txt = '';
         if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
               foreach($php_directive_snippets as $php_directive_snippet){
                  $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
               }
         }
         if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
         $app->tpl->setVar("php_directive_snippets_txt",$php_directive_snippets_txt);
			
         if($server_type == 'apache'){
            $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
            $apache_directive_snippets_txt = '';
            if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
                  foreach($apache_directive_snippets as $apache_directive_snippet){
                     $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
                  }
            }
            if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
            $app->tpl->setVar("apache_directive_snippets_txt",$apache_directive_snippets_txt);
         }
			
         if($server_type == 'nginx'){
            $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
            $nginx_directive_snippets_txt = '';
            if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
                  foreach($nginx_directive_snippets as $nginx_directive_snippet){
                     $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
                  }
            }
            if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
            $app->tpl->setVar("nginx_directive_snippets_txt",$nginx_directive_snippets_txt);
         }
			
         $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);
      }

      $ssl_domain_select = '';
@@ -252,7 +297,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 {
@@ -279,7 +324,13 @@
      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"]));
        if(!@$this->dataRecord["parent_domain_id"] && $this->id) {
            $tmp = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
            if($tmp) $this->dataRecord["parent_domain_id"] = $tmp['parent_domain_id'];
            unset($tmp);
        }
        
      $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));

      // Set a few fixed values
      $this->dataRecord["type"] = 'vhostsubdomain';
@@ -288,7 +339,6 @@
      $this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
      $this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
      $this->dataRecord["vhost_type"] = 'name';
      $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];

      $this->parent_domain_record = $parent_domain;
        
@@ -300,11 +350,11 @@
            $app->uses('ini_parser,getconf');
            $settings = $app->getconf->get_global_config('domains');
            if ($settings['use_domain_module'] == 'y') {
                $client_group_id = intval($_SESSION["s"]["user"]["default_group"]);
                $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
                
                $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . intval($this->dataRecord['sel_domain']);
                $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['sel_domain']);
                if ($_SESSION["s"]["user"]["typ"] != 'admin') {
                    $sql .= "AND sys_groupid =" . $client_group_id;
                    $sql .= " AND sys_groupid =" . $client_group_id;
                }
                $domain_check = $app->db->queryOneRecord($sql);
                if(!$domain_check) {
@@ -319,15 +369,24 @@
            
            
            $this->dataRecord['web_folder'] = strtolower($this->dataRecord['web_folder']);
            $forbidden_folders = array('', 'cgi-bin', 'web', 'log', 'private', 'ssl', 'tmp', 'webdav');
            if(in_array($this->dataRecord['web_folder'], $forbidden_folders)) {
         if(substr($this->dataRecord['web_folder'], 0, 1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 1);
         if(substr($this->dataRecord['web_folder'], -1) === '/') $this->dataRecord['web_folder'] = substr($this->dataRecord['web_folder'], 0, -1);
            $forbidden_folders = array('', 'cgi-bin', 'log', 'private', 'ssl', 'tmp', 'webdav');
            $check_folder = strtolower($this->dataRecord['web_folder']);
            if(substr($check_folder, 0, 1) === '/') $check_folder = substr($check_folder, 1); // strip / at beginning to check against forbidden entries
            if(strpos($check_folder, '/') !== false) $check_folder = substr($check_folder, 0, strpos($check_folder, '/')); // get the first part of the path to check it
            if(in_array($check_folder, $forbidden_folders)) {
                $app->tform->errorMessage .= $app->tform->lng("web_folder_invalid_txt")."<br>";
            }
            // check for duplicate folder usage
            $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain' AND `parent_domain_id` = '" . intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . intval($this->id) . "'");
         /*
            $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain' AND `parent_domain_id` = '" . $app->functions->intval($this->dataRecord['parent_domain_id']) . "' AND `web_folder` = '" . $app->db->quote($this->dataRecord['web_folder']) . "' AND `domain_id` != '" . $app->functions->intval($this->id) . "'");
            if($check && $check['cnt'] > 0) {
                $app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";
            }
         */
        } else {
            $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
        }
        
      if($_SESSION["s"]["user"]["typ"] != 'admin') {
@@ -347,9 +406,9 @@
            
         //* Check the website quota of the client
         if(isset($_POST["hd_quota"]) && $client["limit_web_quota"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
            $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
            $webquota = $tmp["webquota"];
            $new_web_quota = intval($this->dataRecord["hd_quota"]);
            $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
            if(($webquota + $new_web_quota > $client["limit_web_quota"]) || ($new_web_quota < 0 && $client["limit_web_quota"] >= 0)) {
               $max_free_quota = floor($client["limit_web_quota"] - $webquota);
               if($max_free_quota < 0) $max_free_quota = 0;
@@ -363,9 +422,9 @@

         //* Check the traffic quota of the client
         if(isset($_POST["traffic_quota"]) && $client["limit_traffic_quota"] > 0) {
            $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
            $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
            $trafficquota = $tmp["trafficquota"];
            $new_traffic_quota = intval($this->dataRecord["traffic_quota"]);
            $new_traffic_quota = $app->functions->intval($this->dataRecord["traffic_quota"]);
            if(($trafficquota + $new_traffic_quota > $client["limit_traffic_quota"]) || ($new_traffic_quota < 0 && $client["limit_traffic_quota"] >= 0)) {
               $max_free_quota = floor($client["limit_traffic_quota"] - $trafficquota);
               if($max_free_quota < 0) $max_free_quota = 0;
@@ -383,9 +442,9 @@

            //* Check the website quota of the client
            if(isset($_POST["hd_quota"]) && $reseller["limit_web_quota"] >= 0) {
               $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
               $tmp = $app->db->queryOneRecord("SELECT sum(hd_quota) as webquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
               $webquota = $tmp["webquota"];
               $new_web_quota = intval($this->dataRecord["hd_quota"]);
               $new_web_quota = $app->functions->intval($this->dataRecord["hd_quota"]);
               if(($webquota + $new_web_quota > $reseller["limit_web_quota"]) || ($new_web_quota < 0 && $reseller["limit_web_quota"] >= 0)) {
                  $max_free_quota = floor($reseller["limit_web_quota"] - $webquota);
                  if($max_free_quota < 0) $max_free_quota = 0;
@@ -399,9 +458,9 @@

            //* Check the traffic quota of the client
            if(isset($_POST["traffic_quota"]) && $reseller["limit_traffic_quota"] > 0) {
               $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
               $tmp = $app->db->queryOneRecord("SELECT sum(traffic_quota) as trafficquota FROM web_domain WHERE domain_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
               $trafficquota = $tmp["trafficquota"];
               $new_traffic_quota = intval($this->dataRecord["traffic_quota"]);
               $new_traffic_quota = $app->functions->intval($this->dataRecord["traffic_quota"]);
               if(($trafficquota + $new_traffic_quota > $reseller["limit_traffic_quota"]) || ($new_traffic_quota < 0 && $reseller["limit_traffic_quota"] >= 0)) {
                  $max_free_quota = floor($reseller["limit_traffic_quota"] - $trafficquota);
                  if($max_free_quota < 0) $max_free_quota = 0;
@@ -417,7 +476,7 @@
         // When the record is updated
         if($this->id > 0) {
                // restore the server ID if the user is not admin and record is edited
            $tmp = $app->db->queryOneRecord("SELECT server_id, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".intval($this->id));
            $tmp = $app->db->queryOneRecord("SELECT server_id, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
                $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
                
                // set the settings to current if not provided (or cleared due to limits)
@@ -449,7 +508,7 @@
      
      //* get the server config for this server
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config(intval(isset($this->dataRecord["server_id"]) ? $this->dataRecord["server_id"] : 0),'web');
      $web_config = $app->getconf->get_server_config($app->functions->intval(isset($this->dataRecord["server_id"]) ? $this->dataRecord["server_id"] : 0),'web');
      //* Check for duplicate ssl certs per IP if SNI is disabled
      if(isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y' && $web_config['enable_sni'] != 'y') {
         $sql = "SELECT count(domain_id) as number FROM web_domain WHERE `ssl` = 'y' AND ip_address = '".$app->db->quote($this->dataRecord['ip_address'])."' and domain_id != ".$this->id;
@@ -459,7 +518,7 @@
      
      // Check if pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0
      if(isset($this->dataRecord['pm_max_children']) && $this->dataRecord['pm'] == 'dynamic') {
         if(intval($this->dataRecord['pm_max_children']) >= intval($this->dataRecord['pm_max_spare_servers']) && intval($this->dataRecord['pm_max_spare_servers']) >= intval($this->dataRecord['pm_start_servers']) && intval($this->dataRecord['pm_start_servers']) >= intval($this->dataRecord['pm_min_spare_servers']) && intval($this->dataRecord['pm_min_spare_servers']) > 0){
         if($app->functions->intval($this->dataRecord['pm_max_children'], true) >= $app->functions->intval($this->dataRecord['pm_max_spare_servers'], true) && $app->functions->intval($this->dataRecord['pm_max_spare_servers'], true) >= $app->functions->intval($this->dataRecord['pm_start_servers'], true) && $app->functions->intval($this->dataRecord['pm_start_servers'], true) >= $app->functions->intval($this->dataRecord['pm_min_spare_servers'], true) && $app->functions->intval($this->dataRecord['pm_min_spare_servers'], true) > 0){
      
         } else {
            $app->tform->errorMessage .= $app->tform->lng("error_php_fpm_pm_settings_txt").'<br>';
@@ -475,8 +534,8 @@
      // Get configuration for the web system
      $app->uses("getconf");
      $web_rec = $app->tform->getDataRecord($this->id);
      $web_config = $app->getconf->get_server_config(intval($web_rec["server_id"]),'web');
        var_dump($this->parent_domain_record, $web_rec);
      $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]),'web');
        //var_dump($this->parent_domain_record, $web_rec);
      // Set the values for document_root, system_user and system_group
      $system_user = $app->db->quote($this->parent_domain_record['system_user']);
      $system_group = $app->db->quote($this->parent_domain_record['system_group']);
@@ -487,7 +546,7 @@
      $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$web_rec['domain'],$php_open_basedir));
      $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);

      $sql = "UPDATE web_domain SET sys_groupid = ".intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir'  WHERE domain_id = ".$this->id;
      $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir'  WHERE domain_id = ".$this->id;
      $app->db->query($sql);
   }

@@ -515,7 +574,7 @@
      // Get configuration for the web system
      $app->uses("getconf");
      $web_rec = $app->tform->getDataRecord($this->id);
      $web_config = $app->getconf->get_server_config(intval($web_rec["server_id"]),'web');
      $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]),'web');

      // Set the values for document_root, system_user and system_group
      $system_user = $app->db->quote($this->parent_domain_record['system_user']);
@@ -527,7 +586,7 @@
      $php_open_basedir = $app->db->quote(str_replace("[website_domain]",$web_rec['domain'],$php_open_basedir));
      $htaccess_allow_override = $app->db->quote($this->parent_domain_record['allow_override']);

      $sql = "UPDATE web_domain SET sys_groupid = ".intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir'  WHERE domain_id = ".$this->id;
      $sql = "UPDATE web_domain SET sys_groupid = ".$app->functions->intval($this->parent_domain_record['sys_groupid']).",system_user = '$system_user', system_group = '$system_group', document_root = '$document_root', allow_override = '$htaccess_allow_override', php_open_basedir = '$php_open_basedir'  WHERE domain_id = ".$this->id;
      $app->db->query($sql);
   }