style fixes for preview lib

4 files changed, 8 insertions, 5 deletions

diff --git a/lib/preview/images.php b/lib/preview/image.php
index 9aec967282d..9aec967282d 100644
--- a/lib/preview/images.php
+++ b/lib/preview/image.php
diff --git a/lib/preview/libreoffice-cl.php b/lib/preview/office-cl.php
index 2f1d08499ef..112909d6523 100644
--- a/lib/preview/libreoffice-cl.php
+++ b/lib/preview/office-cl.php
@@ -7,7 +7,7 @@
  */
 namespace OC\Preview;
 
-//we need imagick to convert 
+//we need imagick to convert
 class Office extends Provider {
 
 	private $cmd;
@@ -26,7 +26,10 @@ class Office extends Provider {
 
 		$tmpDir = get_temp_dir();
 
-		$exec = $this->cmd . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ' . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+		$defaultParameters = ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
+		$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
+
+		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
 		$export = 'export HOME=/' . $tmpDir;
 
 		shell_exec($export . "\n" . $exec);
@@ -110,7 +113,7 @@ class MSOffice2007 extends Office {
 
 //.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
 class OpenDocument extends Office {
-	
+
 	public function getMimeType() {
 		return '/application\/vnd.oasis.opendocument.*/';
 	}
diff --git a/lib/preview/msoffice.php b/lib/preview/office-fallback.php
index e69ab0ab8cb..e69ab0ab8cb 100644
--- a/lib/preview/msoffice.php
+++ b/lib/preview/office-fallback.php
diff --git a/lib/preview/office.php b/lib/preview/office.php
index b93e1e57c8b..5287bbd6ac1 100644
--- a/lib/preview/office.php
+++ b/lib/preview/office.php
@@ -14,9 +14,9 @@ if (extension_loaded('imagick')) {
 	$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)))) {
-		require_once('libreoffice-cl.php');
+		require_once('office-cl.php');
 	}else{
 		//in case there isn't, use our fallback
-		require_once('msoffice.php');
+		require_once('office-fallback.php');
 	}
 }
\ No newline at end of file