move to OC namespace

8 files changed, 43 insertions, 21 deletions

diff --git a/lib/preview/images.php b/lib/preview/images.php
index a8f203528c5..c62fc5397e5 100644
--- a/lib/preview/images.php
+++ b/lib/preview/images.php
@@ -6,7 +6,9 @@
  * later.
  * See the COPYING-README file.
  */
-class OC_Preview_Image extends OC_Preview_Provider{
+namespace OC\Preview;
+
+class Image extends Provider{
 
 	public function getMimeType(){
 		return '/image\/.*/';
@@ -31,4 +33,4 @@ class OC_Preview_Image extends OC_Preview_Provider{
 	}
 }
 
-OC_Preview::registerProvider('OC_Preview_Image');
\ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\Image');
\ No newline at end of file
diff --git a/lib/preview/movies.php b/lib/preview/movies.php
index d2aaf730d67..14ac97b552d 100644
--- a/lib/preview/movies.php
+++ b/lib/preview/movies.php
@@ -6,8 +6,10 @@
  * later.
  * See the COPYING-README file.
  */
+namespace OC\Preview;
+
 if(!is_null(shell_exec('ffmpeg -version'))){
-	class OC_Preview_Movie extends OC_Preview_Provider{
+	class Movie extends Provider{
 
 		public function getMimeType(){
 			return '/video\/.*/';
@@ -18,7 +20,7 @@ if(!is_null(shell_exec('ffmpeg -version'))){
 			$fileinfo = $fileview->getFileInfo($path);
 
 			$abspath = $fileview->toTmpFile($path);
-			$tmppath = OC_Helper::tmpFile();
+			$tmppath = \OC_Helper::tmpFile();
 
 			//$cmd = 'ffmpeg -y  -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmppath;
 			$cmd = 'ffmpeg -y  -i ' . escapeshellarg($abspath) . ' -f mjpeg -vframes 1 -ss 1 ' . $tmppath;
@@ -35,5 +37,5 @@ if(!is_null(shell_exec('ffmpeg -version'))){
 		}
 	}
 
-	OC_Preview::registerProvider('OC_Preview_Movie');
+	\OC\Preview::registerProvider('OC\Preview\Movie');
 }
\ No newline at end of file
diff --git a/lib/preview/mp3.php b/lib/preview/mp3.php
index 18f5cfde375..d62c7230788 100644
--- a/lib/preview/mp3.php
+++ b/lib/preview/mp3.php
@@ -5,22 +5,24 @@
  * later.
  * See the COPYING-README file.
  */
+namespace OC\Preview;
+
 require_once('getid3/getid3.php');
 
-class OC_Preview_MP3 extends OC_Preview_Provider{
+class MP3 extends Provider{
 
 	public function getMimeType(){
 		return '/audio\/mpeg/';
 	}
 
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		$getID3 = new getID3();
+		$getID3 = new \getID3();
 
 		$tmppath = $fileview->toTmpFile($path);
 
 		//Todo - add stream support
 		$tags = $getID3->analyze($tmppath); 
-		getid3_lib::CopyTagsToComments($tags); 
+		\getid3_lib::CopyTagsToComments($tags); 
 		$picture = @$tags['id3v2']['APIC'][0]['data'];
 
 		unlink($tmppath);
@@ -38,4 +40,4 @@ class OC_Preview_MP3 extends OC_Preview_Provider{
 
 }
 
-OC_Preview::registerProvider('OC_Preview_MP3');
\ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\MP3');
\ No newline at end of file
diff --git a/lib/preview/pdf.php b/lib/preview/pdf.php
index de5263f91d8..4dd4538545c 100644
--- a/lib/preview/pdf.php
+++ b/lib/preview/pdf.php
@@ -5,9 +5,11 @@
  * later.
  * See the COPYING-README file.
  */
+namespace OC\Preview;
+
 if (extension_loaded('imagick')){
 
-	class OC_Preview_PDF extends OC_Preview_Provider{
+	class PDF extends Provider{
 
 		public function getMimeType(){
 			return '/application\/pdf/';
@@ -17,7 +19,7 @@ if (extension_loaded('imagick')){
 			$tmppath = $fileview->toTmpFile($path);
 
 			//create imagick object from pdf
-			$pdf = new imagick($tmppath . '[0]');
+			$pdf = new \imagick($tmppath . '[0]');
 			$pdf->setImageFormat('jpg');
 
 			unlink($tmppath);
@@ -31,5 +33,5 @@ if (extension_loaded('imagick')){
 		}
 	}
 
-	OC_Preview::registerProvider('OC_Preview_PDF');
+	\OC\Preview::registerProvider('OC\Preview\PDF');
 }
diff --git a/lib/preview/provider.php b/lib/preview/provider.php
index 2f2a0e68486..1e8d537adc8 100644
--- a/lib/preview/provider.php
+++ b/lib/preview/provider.php
@@ -2,7 +2,9 @@
 /**
  * provides search functionalty
  */
-abstract class OC_Preview_Provider{
+namespace OC\Preview;
+
+abstract class Provider{
 	private $options;
 
 	public function __construct($options) {
diff --git a/lib/preview/svg.php b/lib/preview/svg.php
index 415b7751c2b..70be263189d 100644
--- a/lib/preview/svg.php
+++ b/lib/preview/svg.php
@@ -5,18 +5,26 @@
  * later.
  * See the COPYING-README file.
  */
+namespace OC\Preview;
+
 if (extension_loaded('imagick')){
 
-	class OC_Preview_SVG extends OC_Preview_Provider{
+	class SVG extends Provider{
 
 		public function getMimeType(){
 			return '/image\/svg\+xml/';
 		}
 
 		public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) {
-			$svg = new Imagick();
+			$svg = new \Imagick();
 			$svg->setResolution($maxX, $maxY);
-			$svg->readImageBlob('<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $fileview->file_get_contents($path));
+
+			$content = stream_get_contents($fileview->fopen($path, 'r'));
+			if(substr($content, 0, 5) !== '<?xml'){
+				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
+			}
+
+			$svg->readImageBlob($content);
 			$svg->setImageFormat('jpg');
 
 			//new image object
@@ -28,6 +36,6 @@ if (extension_loaded('imagick')){
 		}
 	}
 
-	OC_Preview::registerProvider('OC_Preview_SVG');
+	\OC\Preview::registerProvider('OC\Preview\SVG');
 
 }
\ No newline at end of file
diff --git a/lib/preview/txt.php b/lib/preview/txt.php
index 1e88aec69fd..4004ecd3fce 100644
--- a/lib/preview/txt.php
+++ b/lib/preview/txt.php
@@ -5,7 +5,9 @@
  * later.
  * See the COPYING-README file.
  */
-class OC_Preview_TXT extends OC_Preview_Provider{
+namespace OC\Preview;
+
+class TXT extends Provider{
 
 	public function getMimeType(){
 		return '/text\/.*/';
@@ -46,4 +48,4 @@ class OC_Preview_TXT extends OC_Preview_Provider{
 	}
 }
 
-OC_Preview::registerProvider('OC_Preview_TXT');
\ No newline at end of file
+\OC\Preview::registerProvider('OC\Preview\TXT');
\ No newline at end of file
diff --git a/lib/preview/unknown.php b/lib/preview/unknown.php
index 5bbdcf847f1..6a8d2fbb75c 100644
--- a/lib/preview/unknown.php
+++ b/lib/preview/unknown.php
@@ -6,7 +6,9 @@
  * later.
  * See the COPYING-README file.
  */
-class OC_Preview_Unknown extends OC_Preview_Provider{
+namespace OC\Preview;
+
+class Unknown extends Provider{
 
 	public function getMimeType(){
 		return '/.*/';
@@ -22,4 +24,4 @@ class OC_Preview_Unknown extends OC_Preview_Provider{
 	}
 }
 
-OC_Preview::registerProvider('OC_Preview_Unknown');
+\OC\Preview::registerProvider('OC\Preview\Unknown');