diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-10-17 14:31:07 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-10-17 14:31:07 +0200 |
| commit | 521277b8b642ee67c7f89682a6bead2faad41c72 (patch) | |
| tree | 8515ea8084467dd197a4fc7cee2d627e2a9dd2c5 | |
| parent | 9c8d1190c0295e4ded8e9812d842af5c65679926 (diff) | |
| download | nextcloud-server-521277b8b642ee67c7f89682a6bead2faad41c72.tar.gz nextcloud-server-521277b8b642ee67c7f89682a6bead2faad41c72.zip | |
only call shell_exec if enabled
| -rw-r--r-- | lib/private/preview/movies.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/office.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php index dc50d160346..4d85e23c63c 100644 --- a/lib/private/preview/movies.php +++ b/lib/private/preview/movies.php @@ -11,7 +11,7 @@ namespace OC\Preview; // movie preview is currently not supported on Windows if (!\OC_Util::runningOnWindows()) { $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions'))); - $whichAVCONV = shell_exec('which avconv'); + $whichAVCONV = ($isShellExecEnabled ? shell_exec('which avconv') : ''); $isAVCONVAvailable = !empty($whichAVCONV); if($isShellExecEnabled && $isAVCONVAvailable) { diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php index 673b16edc19..5b70f5b8d58 100644 --- a/lib/private/preview/office.php +++ b/lib/private/preview/office.php @@ -11,9 +11,9 @@ if (extension_loaded('imagick')) { // movie preview is currently not supported on Windows if (!\OC_Util::runningOnWindows()) { - $whichLibreOffice = shell_exec('which libreoffice'); + $whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : ''); $isLibreOfficeAvailable = !empty($whichLibreOffice); - $whichOpenOffice = shell_exec('which libreoffice'); + $whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : ''); $isOpenOfficeAvailable = !empty($whichOpenOffice); //let's see if there is libreoffice or openoffice on this machine if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) { |