Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2014-11-06 208a069f90fe68ecf2242b8ef177b1a5a0095f00

 server/lib/classes/cron.d/100-monitor_raid.inc.php

@@ -177,7 +177,9 @@
      system('which tw_cli', $retval);
      if($retval === 0) {

         $data['output'] = shell_exec('tw_cli info c0');
         // TYPOWORX FIX | Determine Controler-ID
         $availableControlers = shell_exec('tw_cli info | grep -Eo "c[0-9]+');
         $data['output'] = shell_exec('tw_cli info ' . $availableControlers);

         $state = 'ok';
         if(is_array($data['output'])) {