Critical Bug Fix: Replace '\\' with DIRECTORY_SEPARATOR

ncjoes · Nov 25, 2016 · 69176e5 · 69176e5
1 parent 3338f7f
commit 69176e5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/OfficeConverter/OfficeConverter.php b/src/OfficeConverter/OfficeConverter.php
@@ -22,7 +22,7 @@ class OfficeConverter
      * @param null $tempPath
      * @param string $bin
      */
-    public function __construct($filename, $tempPath = null, $bin = 'soffice')
+    public function __construct($filename, $tempPath = null, $bin = 'libreoffice')
     {
         if ($this->open($filename)) {
             $this->setup($tempPath, $bin);
@@ -125,12 +125,13 @@ protected function makeCommand($outputDirectory, $outputExtension)
      */
     protected function prepOutput($outdir, $filename, $outputExtension)
     {
+        $DS = DIRECTORY_SEPARATOR;
         $tmpName = str_replace($this->extension, '', $this->basename).$outputExtension;
-        if (rename($outdir.'\\'.$tmpName, $outdir.'\\'.$filename)) {
-            return $outdir.'\\'.$filename;
+        if (rename($outdir.$DS.$tmpName, $outdir.$DS.$filename)) {
+            return $outdir.$DS.$filename;
         }
-        elseif (is_file($outdir.'\\'.$tmpName)) {
-            return $outdir.'\\'.$tmpName;
+        elseif (is_file($outdir.$DS.$tmpName)) {
+            return $outdir.$DS.$tmpName;
         }
 
         return null;