- Fixed FS#2968 - linux user and group deletion order is wrong when a clien...

ftimme

2013-06-11 0889fc96ec5788d598ad5bc6a69f27330797db44

 server/plugins-available/nginx_plugin.inc.php

@@ -99,7 +99,7 @@
      $app->uses('getconf');
      $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
      if ($web_config['CA_path']!='' && !file_exists($web_config['CA_path'].'/openssl.cnf'))
         $app->log("CA path error, file does not exist:".$web_config['CA_path'].'/openssl.conf',LOGLEVEL_ERROR);	
         $app->log("CA path error, file does not exist:".$web_config['CA_path'].'/openssl.cnf',LOGLEVEL_ERROR);	
      
      //* Only vhosts can have a ssl cert
      if($data["new"]["type"] != "vhost" && $data["new"]["type"] != "vhostsubdomain") return;
@@ -678,6 +678,9 @@
         }
      }

      //* add the nginx user to the client group if this is a vhost and security level is set to high, no matter if this is an insert or update and regardless of set_folder_permissions_on_update
      if($data['new']['type'] == 'vhost' && $web_config['security_level'] == 20) $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));
		
      //* If the security level is set to high
      if(($this->action == 'insert' && $data['new']['type'] == 'vhost') or ($web_config['set_folder_permissions_on_update'] == 'y' && $data['new']['type'] == 'vhost')) {
      
@@ -716,13 +719,10 @@
               //* add the nginx user to the client group in the chroot environment
               $tmp_groupfile = $app->system->server_conf['group_datei'];
               $app->system->server_conf['group_datei'] = $web_config['website_basedir'].'/etc/group';
               $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
               $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));
               $app->system->server_conf['group_datei'] = $tmp_groupfile;
               unset($tmp_groupfile);
            }

            //* add the nginx user to the client group
            $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));
            
            //* Chown all default directories
            $app->system->chown($data['new']['document_root'],'root');
@@ -831,7 +831,7 @@
      if(!is_dir($web_config['website_basedir'].'/conf')) mkdir($web_config['website_basedir'].'/conf');
      if(trim($data['new']['custom_php_ini']) != '') {
         $has_custom_php_ini = true;
         if(!is_dir($custom_php_ini_dir)) $app->system->mkdir($custom_php_ini_dir);
         if(!is_dir($custom_php_ini_dir)) $app->system->mkdirpath($custom_php_ini_dir);
         $php_ini_content = '';
         if($data['new']['php'] == 'mod') {
            $master_php_ini_path = $web_config['php_ini_path_apache'];
@@ -2526,8 +2526,10 @@
            $app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
         }
         
         $this->_exec('groupdel client'.$client_id);
         $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
         if($app->system->is_group('client'.$client_id)){
            $this->_exec('groupdel client'.$client_id);
            $app->log('Removed group client'.$client_id,LOGLEVEL_DEBUG);
         }
      }
      
   }