Merge branch 'master' into 'master'

Marius Cramer

2014-11-06 a66bbd6cba18494f48190025b525f903ef3d384d

 server/lib/classes/system.inc.php

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

   function mount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh'){
      $mounted = true;
      if (    is_file($mount_cmd) &&
            is_executable($mount_cmd) &&
            fileowner($mount_cmd) === 0
      ) {
         if (!$this->is_mounted($backup_dir)){
            exec($backup_dir_mount_cmd);
            sleep(1);
            if (!$this->is_mounted($backup_dir)) $mounted = false;
         }
      } else $mounted = false;

      return $mounted;
   }
				
   function getinitcommand($servicename, $action, $init_script_directory = ''){
      global $conf;
      // upstart