- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 server/plugins-available/ftpuser_base_plugin.inc.php

@@ -74,7 +74,7 @@
      if(!is_dir($data['new']['dir'])) {
         $app->log("FTP User directory '".$data['new']['dir']."' does not exist. Creating it now.", LOGLEVEL_DEBUG);

         $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
         $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $data['new']['parent_domain_id']);

         //* Check if the resulting path is inside the docroot
         if(substr($data['new']['dir'], 0, strlen($web['document_root'])) != $web['document_root']) {
@@ -100,7 +100,7 @@
      if(!is_dir($data['new']['dir'])) {
         $app->log("FTP User directory '".$data['new']['dir']."' does not exist. Creating it now.", LOGLEVEL_DEBUG);

         $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($data['new']['parent_domain_id']));
         $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $data['new']['parent_domain_id']);

         //* Check if the resulting path is inside the docroot
         if(substr($data['new']['dir'], 0, strlen($web['document_root'])) != $web['document_root']) {
@@ -112,13 +112,24 @@
         exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
         exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);
         $app->system->web_folder_protection($web['document_root'], true);
			
			

         $app->log("Added ftpuser_dir: ".$data['new']['dir'], LOGLEVEL_DEBUG);
      }
		
      // When the directory has changed, delete the old .ftpquota file
      if($data['old']['dir'] != '' && $data['old']['dir'] != $data['new']['dir']) {
         if(is_file($data['old']['dir'].'/.ftpquota')) unlink($data['old']['dir'].'/.ftpquota');
      }
		
   }

   function delete($event_name, $data) {
      global $app, $conf;
		
      // Delete the .ftpquota file
      if(is_file($data['old']['dir'].'/.ftpquota')) unlink($data['old']['dir'].'/.ftpquota');

      $app->log("Ftpuser:".$data['new']['username']." deleted.", LOGLEVEL_DEBUG);