Fixed directory separator for all OS - Fixes #4

phiamo · May 2, 2012 · 73bb05b · 73bb05b
1 parent bb67ab1
commit 73bb05b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Model/BarcodeService.php b/Model/BarcodeService.php
@@ -26,7 +26,7 @@ public function saveAs($type, $text, $file){
         @unlink($file);
         switch ($type){
             case $type == 'qr':
-                include __DIR__."/../Resources/phpqrcode/qrlib.php";
+                include __DIR__.DIRECTORY_SEPARATOR."..".DIRECTORY_SEPARATOR."Resources".DIRECTORY_SEPARATOR."phpqrcode".DIRECTORY_SEPARATOR."qrlib.php";
                 \QRcode::png($text, $file);
             break;
             case is_numeric($type):
@@ -59,7 +59,8 @@ public function get($type, $enctext, $absolut = false, $options = array()){
             $this->saveAs($type, $text, $filename);
         }
         if(!$absolut){
-            return "/".$this->webdir.$this->getTypeDir($type).$this->getBarcodeFilename($text);
+            $path = DIRECTORY_SEPARATOR.$this->webdir.$this->getTypeDir($type).$this->getBarcodeFilename($text);
+            return str_replace(DIRECTORY_SEPARATOR, "/", $path);
         }
         return $filename;
     }
@@ -80,6 +81,6 @@ protected function getAbsoluteBarcodeDir($type){
         return $path;
     }
     protected function getAbsolutePath(){
-        return $this->kernelrootdir."/../web/".$this->webdir;
+        return $this->kernelrootdir.DIRECTORY_SEPARATOR."..".DIRECTORY_SEPARATOR."web".DIRECTORY_SEPARATOR.$this->webdir;
     }
 }