fix Image module functions

classes/actions/ActionBlog.class.php

@@ -192,7 +192,7 @@ class ActionBlog extends Action {
 		*/			
 		if (isset($_FILES['avatar']) and is_uploaded_file($_FILES['avatar']['tmp_name'])) {
 			if ($sPath=$this->Blog_UploadBlogAvatar($_FILES['avatar'],$oBlog)) {
-				$oBlog->setAvatar($this->Image_GetWebPath($sPath));
+				$oBlog->setAvatar($sPath);
 			} else {
 				$this->Message_AddError($this->Lang_Get('blog_create_avatar_error'),$this->Lang_Get('error'));
 				return false;
@@ -285,7 +285,7 @@ class ActionBlog extends Action {
 			*/			
 			if (isset($_FILES['avatar']) and is_uploaded_file($_FILES['avatar']['tmp_name'])) {
 				if ($sPath=$this->Blog_UploadBlogAvatar($_FILES['avatar'],$oBlog)) {
-					$oBlog->setAvatar($this->Image_GetWebPath($sPath));
+					$oBlog->setAvatar($sPath);
 				} else {
 					$this->Message_AddError($this->Lang_Get('blog_create_avatar_error'),$this->Lang_Get('error'));
 					return false;

classes/actions/ActionSettings.class.php

@@ -271,7 +271,7 @@ class ActionSettings extends Action {
 			 */		
 			if (isset($_FILES['avatar']) and is_uploaded_file($_FILES['avatar']['tmp_name'])) {
 				if($sPath=$this->User_UploadAvatar($_FILES['avatar'],$this->oUserCurrent)) {
-					$this->oUserCurrent->setProfileAvatar($this->Image_GetWebPath($sPath));
+					$this->oUserCurrent->setProfileAvatar($sPath);
 				} else {
 					$bError=true;
 					$this->Message_AddError($this->Lang_Get('settings_profile_avatar_error'),$this->Lang_Get('error'));					
@@ -289,7 +289,7 @@ class ActionSettings extends Action {
 			 */			
 			if (isset($_FILES['foto']) and is_uploaded_file($_FILES['foto']['tmp_name'])) {				
 				if ($sFileFoto=$this->User_UploadFoto($_FILES['foto'],$this->oUserCurrent)) {	
-					$this->oUserCurrent->setProfileFoto($this->Image_GetWebPath($sFileFoto));			
+					$this->oUserCurrent->setProfileFoto($sFileFoto);			
 				} else {
 					$bError=true;
 					$this->Message_AddError($this->Lang_Get('settings_profile_foto_error'),$this->Lang_Get('error'));

classes/modules/blog/Blog.class.php

@@ -777,7 +777,7 @@ class LsBlog extends Module {
 			/**
 			 * Если все нормально, возвращаем расширение загруженного аватара
 			 */
-			return $sFileAvatar;
+			return $this->Image_GetWebPath($sFileAvatar);
 		}
 		/**
 		 * В случае ошибки, возвращаем false

classes/modules/topic/Topic.class.php

@@ -1331,7 +1331,7 @@ class LsTopic extends Module {
 		$aParams=$this->Image_BuildParams('topic');
 		
 		if ($sFileImage=$this->Image_Resize($sFileTmp,$sDirUpload,func_generator(6),3000,3000,Config::Get('view.img_resize_width'),null,true,$aParams)) {
-			return $sFileImage;
+			return $this->Image_GetWebPath($sFileImage);
 		}
 		return false;
 	}
@@ -1347,7 +1347,7 @@ class LsTopic extends Module {
 		 * Проверяем, является ли файл изображением
 		 */
 		if(!@getimagesize($sUrl)) {
-			return self::UPLOAD_IMAGE_ERROR_TYPE;
+			return LsImage::UPLOAD_IMAGE_ERROR_TYPE;
 		}
 		/**
 		 * Открываем файловый поток и считываем файл поблочно,
@@ -1355,7 +1355,7 @@ class LsTopic extends Module {
 		 */
 		$oFile=fopen($sUrl,'r');
 		if(!$oFile) {
-			return self::UPLOAD_IMAGE_ERROR_READ;
+			return LsImage::UPLOAD_IMAGE_ERROR_READ;
 		}
 		
 		$iMaxSizeKb=500;
@@ -1371,7 +1371,7 @@ class LsTopic extends Module {
 		 * значит файл имеет недопустимый размер
 		 */
 		if(!feof($oFile)) {
-			return self::UPLOAD_IMAGE_ERROR_SIZE;
+			return LsImage::UPLOAD_IMAGE_ERROR_SIZE;
 		}
 		fclose($oFile);
 
@@ -1392,11 +1392,11 @@ class LsTopic extends Module {
 		 */
 		if ($sFileImg=$this->Image_Resize($sFileTmp,$sDirSave,func_generator(),3000,3000,Config::Get('view.img_resize_width'),null,true,$aParams)) {
 			@unlink($sFileTmp);
-			return $sFileImg;
+			return $this->Image_GetWebPath($sFileImg);
 		} 		
 		
 		@unlink($sFileTmp);
-		return self::UPLOAD_IMAGE_ERROR;
+		return LsImage::UPLOAD_IMAGE_ERROR;
 	}
 }
 ?>

classes/modules/user/User.class.php

@@ -1085,7 +1085,7 @@ class LsUser extends Module {
 			/**
 			 * Если все нормально, возвращаем расширение загруженного аватара
 			 */
-			return $sFileAvatar;
+			return $this->Image_GetWebPath($sFileAvatar);
 		}
 		/**
 		 * В случае ошибки, возвращаем false
@@ -1130,7 +1130,7 @@ class LsUser extends Module {
 			 * удаляем старое фото
 			 */
 			$this->DeleteFoto($oUser);
-			return Config::Get('path.root.web').'/'.ltrim($sDirUpload,'/').'/'.$sFileFoto;
+			return $this->Image_GetWebPath($sFileFoto);
 		}
 		return false;
 	}

include/ajax/uploadImg.php

@@ -76,7 +76,7 @@ if ($oEngine->User_IsAuthorization()) {
 		$bStateError=false;
 		$sMsgTitle='';
 		$sMsg='';
-		$sText=$oEngine->Image_BuildHTML($oEngine->Image_GetWebPath($sFile), $_REQUEST);
+		$sText=$oEngine->Image_BuildHTML($sFile, $_REQUEST);
 	}	
 } else {
 	$sMsgTitle=$oEngine->Lang_Get('error');