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

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 server/lib/classes/system.inc.php

@@ -1801,16 +1801,71 @@
      return $return_var == 0 ? true : false;
   }

   function mount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh'){
      global $app, $conf;

      $mounted = true;
      if (    is_file($mount_cmd) &&
            is_executable($mount_cmd) &&
            fileowner($mount_cmd) === 0
      ) {
         if (!$this->is_mounted($backup_dir)){
            exec($mount_cmd);
            sleep(1);
            if (!$this->is_mounted($backup_dir)) $mounted = false;
         }
      } else $mounted = false;
      if (!$mounted) {
         //* send email to admin that backup directory could not be mounted
         $global_config = $app->getconf->get_global_config('mail');
         if($global_config['admin_mail'] != ''){
            $subject = 'Backup directory '.$backup_dir.' could not be mounted';
            $message = "Backup directory ".$backup_dir." could not be mounted.\n\nThe command\n\n".$mount_cmd."\n\nfailed.";
            mail($global_config['admin_mail'], $subject, $message);
         }
      }

      return $mounted;
   }

   function umount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_umount.sh'){
      global $app, $conf;

      if (    is_file($mount_cmd) &&
            is_executable($mount_cmd) &&
            fileowner($mount_cmd) === 0
      ) {
         if ($this->is_mounted($backup_dir)){
            exec($mount_cmd);
            sleep(1);
         }
      }

        $unmounted = $this->is_mounted($backup_dir) == 0 ? true : false;
      if(!$unmounted) {
         //* send email to admin that backup directory could not be unmounted
         $global_config = $app->getconf->get_global_config('mail');
         if($global_config['admin_mail'] != ''){
            $subject = 'Backup directory '.$backup_dir.' could not be unmounted';
            $message = "Backup directory ".$backup_dir." could not be unmounted.\n\nThe command\n\n".$mount_cmd."\n\nfailed.";
            mail($global_config['admin_mail'], $subject, $message);
         }
      }

      return $unmounted;

   }

   function getinitcommand($servicename, $action, $init_script_directory = ''){
      global $conf;
      // systemd
      if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
         return 'systemctl '.$action.' '.$servicename.'.service';
      }
      // upstart
      if(is_executable('/sbin/initctl')){
         exec('/sbin/initctl version 2>/dev/null | /bin/grep -q upstart', $retval['output'], $retval['retval']);
         if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
      }
      // systemd
      if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
         return 'systemctl '.$action.' '.$servicename.'.service';
      }
      // sysvinit
      if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
@@ -1847,8 +1902,8 @@
      global $app;
      
      $cmd = '';
      if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
      elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
      if($this->is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
      elseif($this->is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
      else {
         $app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
         return array();