Merged revisions 2943-3026 from stable branch.

tbrehm

2012-04-05 b67344233b509c97ba118a209e82386d698ba068

 server/plugins-available/ftpuser_base_plugin.inc.php

@@ -74,6 +74,12 @@
      
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
      
     //* Check if the resulting path is inside the docroot
     if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
      $app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
      return false;
     }
	  
      exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
      exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);
      
@@ -90,6 +96,12 @@
      
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
      
     //* Check if the resulting path is inside the docroot
     if(substr(realpath($data['new']['dir']),0,strlen($web['document_root'])) != $web['document_root']) {
      $app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
      return false;
     }
	  
      exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
      exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);