iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-09 23:05:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 897 fixed: controls added in pwg.images.add to have clear error messages

Browse Source 
if permission is denied or any error occur during file write.


git-svn-id: http://piwigo.org/svn/branches/2.0@2785 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2008-10-20 21:04:17 +00:00
parent 2a162361dd
commit 39eb742c25
1 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ws_functions.inc.php
+57 -6
View File
@@ -934,7 +934,21 @@ SELECT
if (!is_dir($upload_dir)) {
umask(0000);
$recursive = true;
mkdir($upload_dir, 0777, $recursive);
if (!@mkdir($upload_dir, 0777, $recursive))
{
return new PwgError(500, 'error during directory creation');
}
}
if (!is_writable($upload_dir))
{
// last chance to make the directory writable
@chmod($upload_dir, 0777);
if (!is_writable($upload_dir))
{
return new PwgError(500, 'directory has no write access');
}
}
// compute file path
@@ -945,7 +959,10 @@ SELECT
// dump the photo file
$fh_file = fopen($file_path, 'w');
fwrite($fh_file, base64_decode($params['file_content']));
if (!fwrite($fh_file, base64_decode($params['file_content'])))
{
return new PwgError(500, 'error while writing file');
}
fclose($fh_file);
chmod($file_path, 0644);
@@ -960,7 +977,21 @@ SELECT
$thumbnail_dir = $upload_dir.'/thumbnail';
if (!is_dir($thumbnail_dir)) {
umask(0000);
mkdir($thumbnail_dir, 0777);
if (!@mkdir($thumbnail_dir, 0777))
{
return new PwgError(500, 'error during thumbnail directory creation');
}
}
if (!is_writable($thumbnail_dir))
{
// last chance to make the directory writable
@chmod($thumbnail_dir, 0777);
if (!is_writable($thumbnail_dir))
{
return new PwgError(500, 'thumbnail directory has no write access');
}
}
// thumbnail path, the filename may use a prefix and the extension is
@@ -975,7 +1006,10 @@ SELECT
// dump the thumbnail
$fh_thumbnail = fopen($thumbnail_path, 'w');
fwrite($fh_thumbnail, base64_decode($params['thumbnail_content']));
if (!fwrite($fh_thumbnail, base64_decode($params['thumbnail_content'])))
{
return new PwgError(500, 'error while writing thumbnail');
}
fclose($fh_thumbnail);
chmod($thumbnail_path, 0644);
@@ -993,9 +1027,23 @@ SELECT
$high_dir = $upload_dir.'/pwg_high';
if (!is_dir($high_dir)) {
umask(0000);
mkdir($high_dir, 0777);
if (!@mkdir($high_dir, 0777))
{
return new PwgError(500, 'error during high directory creation');
}
}
if (!is_writable($high_dir))
{
// last chance to make the directory writable
@chmod($high_dir, 0777);
if (!is_writable($high_dir))
{
return new PwgError(500, 'high directory has no write access');
}
}
// high resolution path, same name as web size file
$high_path = sprintf(
'%s/%s.%s',
@@ -1006,7 +1054,10 @@ SELECT
// dump the high resolution file
$fh_high = fopen($high_path, 'w');
fwrite($fh_high, base64_decode($params['high_content']));
if (!fwrite($fh_high, base64_decode($params['high_content'])))
{
return new PwgError(500, 'error while writing high');
}
fclose($fh_high);
chmod($high_path, 0644);