Refs #1041:

* Speculative fix, extended blacklist of invalid characters for user signup
* Mapping some filestore matrix characters (notable '.') to a safe char

git-svn-id: https://code.elgg.org/elgg/trunk@3329 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 9 insertions, 1 deletions

diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 2f65ccc2f..89aee0d8d 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -319,6 +319,8 @@
 		 */
 		protected function make_file_matrix($filename)
 		{
+			$invalid_fs_chars = '*\'\\/"!$%^&*.%(){}[]#~?<>;|¬`@-+=';
+			
 			$matrix = "";
 			
 			$name = $filename;
@@ -330,7 +332,13 @@
 				$len = $this->matrix_depth;
 			
 			for ($n = 0; $n < $len; $n++) {
-				$matrix .= $filename[$n] . "/";
+				
+				// Prevent a matrix being formed with unsafe characters
+				$char = $filename[$n];
+				if (strpos($invalid_fs_chars, $char)!==false)
+					$char = '_';
+				
+				$matrix .= $char . "/";
 			}	
 	
 			return $matrix.$name."/";