Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

 server/plugins-available/ftpuser_base_plugin.inc.php

@@ -75,7 +75,7 @@
      $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']) {
     if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) {
      $app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
      return false;
     }
@@ -97,7 +97,7 @@
      $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']) {
     if(substr($data['new']['dir'],0,strlen($web['document_root'])) != $web['document_root']) {
      $app->log('User dir is outside of docroot.',LOGLEVEL_WARN);
      return false;
     }