In-Portal Issue Tracker

Index: units/helpers/file_helper.php
===================================================================
--- units/helpers/file_helper.php	(revision 14474)
+++ units/helpers/file_helper.php	(working copy)
@@ -258,7 +258,7 @@
 			$result = true;
 
 			if (!file_exists($path) || !is_dir($path)) {
-				$parent_path = preg_replace('#/[^/]+/?$#', '', $path);
+				$parent_path = preg_replace('#(/|\\\)[^/\\\]+(/|\\\)?$#', '', $path);
 				$result = $this->CheckFolder($parent_path);
 
 				if ($result) {
@@ -393,8 +393,11 @@
 		function urlToPath($url)
 		{
 			$base_url = rtrim($this->Application->BaseURL(), '/');
-			$path = preg_replace('/^' . preg_quote($base_url, '/') . '(.*)/', FULL_PATH . '\\1', $url);
 
+			// escape replacement patterns, like "\<number>"
+			$full_path = preg_replace('/(\\\[\d]+)/', '\\\\\1', FULL_PATH);
+			$path = preg_replace('/^' . preg_quote($base_url, '/') . '(.*)/', $full_path . '\\1', $url, 1);
+
 			return str_replace('/', DIRECTORY_SEPARATOR, rawurldecode($path));
 		}
 	}
\ No newline at end of file
Index: units/helpers/image_helper.php
===================================================================
--- units/helpers/image_helper.php	(revision 14474)
+++ units/helpers/image_helper.php	(working copy)
@@ -114,7 +114,8 @@
 
 				if ($needs_resize || array_intersect(array_keys($params), $transform_keys)) {
 					// resize required OR watermarking required -> change resulting image name !
-					$dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path . DIRECTORY_SEPARATOR . 'resized\\1_' . crc32(serialize($params)) . '.\\2', $src_image);
+					$src_path_escaped = preg_replace('/(\\\[\d]+)/', '\\\\\1', $src_path); // escape replacement patterns, like "\<number>"
+					$dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path_escaped . DIRECTORY_SEPARATOR . 'resized\\1_' . crc32(serialize($params)) . '.\\2', $src_image);
 
 					$this->fileHelper->CheckFolder( dirname($dst_image) );
 
Index: units/images/image_tag_processor.php
===================================================================
--- units/images/image_tag_processor.php	(revision 14474)
+++ units/images/image_tag_processor.php	(working copy)
@@ -90,14 +90,14 @@
 		$image_name = $this->SelectParam($params, 'name,Name');
 		$image_field = $this->SelectParam($params, 'field,Field'); // ie. virtual names PrimaryImage, Image1, Image2
 		$image_id = $this->Application->GetVar($this->Prefix.'_id');
-		
+
 		if (
 			// is primary, when primary mark set OR name & field not given
 			($is_primary || !($image_name || $image_field)) &&
 
 			// primary image is preloaded AND direct id not given
 			isset($parent_item->Fields['ThumbPath']) && !$image_id
-		) {			
+		) {
 			$object->SetDefaultValues();
 
 			if (is_null($parent_item->GetDBField('SameImages'))) {
@@ -199,13 +199,13 @@
 	function makeRelativePaths(&$object)
 	{
 		$thumb_path = $object->GetDBField('ThumbPath');
-		if ($thumb_path && substr($thumb_path, 0, 1) != '/') {
-			$object->SetDBField('ThumbPath', '/'.$thumb_path);
+		if ($thumb_path && substr($thumb_path, 0, 1) != DIRECTORY_SEPARATOR) {
+			$object->SetDBField('ThumbPath', DIRECTORY_SEPARATOR . $thumb_path);
 		}
 
 		$local_path = $object->GetDBField('LocalPath');
-		if ($local_path && substr($local_path, 0, 1) != '/') {
-			$object->SetDBField('LocalPath', '/'.$local_path);
+		if ($local_path && substr($local_path, 0, 1) != DIRECTORY_SEPARATOR) {
+			$object->SetDBField('LocalPath', DIRECTORY_SEPARATOR . $local_path);
 		}
 	}
 
@@ -277,9 +277,11 @@
 			return false;
 		}
 
-		$base_url = rtrim($this->Application->BaseURL(), '/');
-		$dst_image = preg_replace('/^' . preg_quote($base_url, '/') . '/', FULL_PATH, $src_image, 1);
+		$file_helper =& $this->Application->recallObject('FileHelper');
+		/* @var $file_helper FileHelper */
 
+		$dst_image = $file_helper->urlToPath($src_image);
+
 		return $dst_image != $src_image ? $dst_image : false;
 	}
 
@@ -388,9 +390,9 @@
 			return $file_helper->urlToPath($path);
 		}
 
-		// TODO: change to urlToPath usage later		
+		// TODO: change to urlToPath usage later
 		// relative url (we add sort of <inp2:m_TemplatesBase/> does
-		
+
 		return FULL_PATH . '/' . mb_substr(THEMES_PATH, 1) . '/' . rawurldecode($path);
 	}