From 651514aa5403467cb2e1b6a393a9dfe5fd66b30a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 4 Oct 2013 16:32:10 +0200
Subject: [PATCH] =?UTF-8?q?[=C5=A7icket/223]=20Set=20correct=20permissions?=
 =?UTF-8?q?=20to=20uploaded=20files=20(644)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

phpbb_chmod() only sets the owner permissions. As we need to set the
permissions for all users, it is not possible to use phpbb_chmod().

B3P-223
---
 root/portal/includes/functions_upload.php | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/root/portal/includes/functions_upload.php b/root/portal/includes/functions_upload.php
index 382b289f..785bad52 100755
--- a/root/portal/includes/functions_upload.php
+++ b/root/portal/includes/functions_upload.php
@@ -228,8 +228,8 @@ class portal_upload
 				}
 				else if (is_file($src . '/' . $src_entry) && !is_file($dest . '/' . $src_entry))
 				{
-					copy($src . '/' . $src_entry, $dest . '/' . $src_entry);
-					chmod($dest . '/' . $src_entry, 0644);
+					@copy($src . '/' . $src_entry, $dest . '/' . $src_entry);
+					@chmod($dest . '/' . $src_entry, 0644);
 				}
 			}
 		}
@@ -250,25 +250,25 @@ class portal_upload
 
 		if (!is_dir($dir) && is_file($dir))
 		{
-			phpbb_chmod($dir, CHMOD_ALL);
-			return unlink($dir);
+			@chmod($dir, 0644);
+			return @unlink($dir);
 		}
 
-        foreach (scandir($dir) as $item)
+		foreach (scandir($dir) as $item)
 		{ 
-            if ($item == '.' || $item == '..')
+			if ($item == '.' || $item == '..')
 			{
 				continue;
 			}
-            if (!$this->directory_delete($dir . "/" . $item))
+			if (!$this->directory_delete($dir . "/" . $item))
 			{
-				phpbb_chmod($dir . "/" . $item, CHMOD_ALL);
-                if (!$this->directory_delete($dir . "/" . $item))
+				@chmod($dir . "/" . $item, 0644);
+				if (!$this->directory_delete($dir . "/" . $item))
 				{
 					return false;
 				}
-            }
-        }
+			}
+		}
 
 		return @rmdir($dir);
 	}
@@ -314,18 +314,18 @@ class portal_upload
 			// remove old backup file first
 			if(file_exists($to . '.bak'))
 			{
-				phpbb_chmod($to . '.bak', CHMOD_ALL);
+				@chmod($to . '.bak', 0644);
 				unlink($to . '.bak');
 			}
 			@rename($to, $to . '.bak');
-			phpbb_chmod($to, CHMOD_ALL);
+			@chmod($to, 0644);
 		}
 
 		if (!@copy($from, $to))
 		{
 			return sprintf($user->lang['MODULE_COPY_FAILURE'], $to);
 		}
-		phpbb_chmod($to, CHMOD_ALL);
+		@chmod($to, 0644);
 
 		return true;
 	}
@@ -364,4 +364,4 @@ class portal_upload
 		}
 		return true;
 	}
-}
\ No newline at end of file
+}