Tentative de régler le bordel

phpbb/filesystem/filesystem.php

@@ -67,7 +67,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
 		}
 	}
 
@@ -124,14 +124,14 @@ class filesystem implements filesystem_interface
 			{
 				if (true !== @chmod($file, $dir_perm))
 				{
-					throw new filesystem_exception('CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
+					throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
 				}
 			}
 			else if (is_file($file))
 			{
 				if (true !== @chmod($file, $file_perm))
 				{
-					throw new filesystem_exception('CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
+					throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS', $file,  array());
 				}
 			}
 		}
@@ -153,7 +153,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CHANGE_FILE_GROUP', $file, array(), $e);
 		}
 	}
 
@@ -195,7 +195,7 @@ class filesystem implements filesystem_interface
 		}
 		catch (\Symfony\Component\Filesystem\Exception\IOException $e)
 		{
-			throw new filesystem_exception('CANNOT_COPY_FILES', '', array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_COPY_FILES', '', array(), $e);
 		}
 	}
 
@@ -210,7 +210,7 @@ class filesystem implements filesystem_interface
 		}
 		catch (\Symfony\Component\Filesystem\Exception\IOException $e)
 		{
-			throw new filesystem_exception('CANNOT_DUMP_FILE', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_DUMP_FILE', $filename, array(), $e);
 		}
 	}
 
@@ -322,7 +322,7 @@ class filesystem implements filesystem_interface
 			$msg = $e->getMessage();
 			$filename = substr($msg, strpos($msg, '"'), strrpos($msg, '"'));
 
-			throw new filesystem_exception('CANNOT_MIRROR_DIRECTORY', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_MIRROR_DIRECTORY', $filename, array(), $e);
 		}
 	}
 
@@ -340,7 +340,7 @@ class filesystem implements filesystem_interface
 			$msg = $e->getMessage();
 			$filename = substr($msg, strpos($msg, '"'), strrpos($msg, '"'));
 
-			throw new filesystem_exception('CANNOT_CREATE_DIRECTORY', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CREATE_DIRECTORY', $filename, array(), $e);
 		}
 	}
 
@@ -525,7 +525,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_DELETE_FILES', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_DELETE_FILES', $file, array(), $e);
 		}
 	}
 
@@ -543,7 +543,7 @@ class filesystem implements filesystem_interface
 			$msg = $e->getMessage();
 			$filename = substr($msg, strpos($msg, '"'), strrpos($msg, '"'));
 
-			throw new filesystem_exception('CANNOT_RENAME_FILE', $filename, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_RENAME_FILE', $filename, array(), $e);
 		}
 	}
 
@@ -558,7 +558,7 @@ class filesystem implements filesystem_interface
 		}
 		catch (\Symfony\Component\Filesystem\Exception\IOException $e)
 		{
-			throw new filesystem_exception('CANNOT_CREATE_SYMLINK', $origin_dir, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_CREATE_SYMLINK', $origin_dir, array(), $e);
 		}
 	}
 
@@ -578,7 +578,7 @@ class filesystem implements filesystem_interface
 			$error = trim($e->getMessage());
 			$file = substr($error, strrpos($error, ' '));
 
-			throw new filesystem_exception('CANNOT_TOUCH_FILES', $file, array(), $e);
+			throw new filesystem_exception('FILESYSTEM_CANNOT_TOUCH_FILES', $file, array(), $e);
 		}
 	}
 
@@ -835,7 +835,7 @@ class filesystem implements filesystem_interface
 				$current_path = $resolved_path . '/' . $path_part;
 
 				// Resolve symlinks
-				if (is_link($current_path))
+				if (@is_link($current_path))
 				{
 					if (!function_exists('readlink'))
 					{
@@ -872,12 +872,12 @@ class filesystem implements filesystem_interface
 
 					$resolved_path = false;
 				}
-				else if (is_dir($current_path . '/'))
+				else if (@is_dir($current_path . '/'))
 				{
 					$resolved[] = $path_part;
 					$resolved_path = $current_path;
 				}
-				else if (is_file($current_path))
+				else if (@is_file($current_path))
 				{
 					$resolved[] = $path_part;
 					$resolved_path = $current_path;

phpbb/filesystem/filesystem_interface.php

@@ -204,7 +204,7 @@ interface filesystem_interface
 	 * This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions.
 	 * The function determines owner and group from common.php file and sets the same to the provided file.
 	 * The function uses bit fields to build the permissions.
-	 * The function sets the appropiate execute bit on directories.
+	 * The function sets the appropriate execute bit on directories.
 	 *
 	 * Supported constants representing bit fields are:
 	 *