archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improvement: use the same code to check upload readiness in admin>photos>add

Browse source 
screen and in web API.

bug fixed: UploadForm partly takes into account the configurable upload
directory (must be propagated everywhere in the UploadForm process)

git-svn-id: http://piwigo.org/svn/trunk@6051 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-05-03 09:56:22 +00:00
commit 89384aa6b1
2 changed files with 21 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

35
admin/photos_add_direct.php
View file

@ -444,39 +444,10 @@ $template->assign(
$setup_errors = array();
$upload_base_dir = 'upload';
$upload_dir = PHPWG_ROOT_PATH.$upload_base_dir;
if (!is_dir($upload_dir))
$error_message = ready_for_upload_message();
if (!empty($error_message))
{
if (!is_writable(PHPWG_ROOT_PATH))
{
array_push(
$setup_errors,
sprintf(
l10n('Create the "%s" directory at the root of your Piwigo installation'),
$upload_base_dir
)
);
}
}
else
{
if (!is_writable($upload_dir))
{
@chmod($upload_dir, 0777);
if (!is_writable($upload_dir))
{
array_push(
$setup_errors,
sprintf(
l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'),
$upload_base_dir
)
);
}
}
array_push($setup_errors, $error_message);
}
$template->assign(

29
include/ws_functions.inc.php
View file

@ -2136,16 +2136,28 @@ function ws_images_checkUpload($params, &$service)
return new PwgError(401, 'Access denied');
}
$relative_dir = preg_replace('#^'.PHPWG_ROOT_PATH.'#', '', $conf['upload_dir']);
$ret['message'] = null;
$ret['message'] = ready_for_upload_message();
$ret['ready_for_upload'] = true;
if (!empty($ret['message']))
{
$ret['ready_for_upload'] = false;
}
return $ret;
}
function ready_for_upload_message()
{
global $conf;
$relative_dir = preg_replace('#^'.PHPWG_ROOT_PATH.'#', '', $conf['upload_dir']);
if (!is_dir($conf['upload_dir']))
{
if (!is_writable(dirname($conf['upload_dir'])))
{
$ret['message'] = sprintf(
return sprintf(
l10n('Create the "%s" directory at the root of your Piwigo installation'),
$relative_dir
);
@ -2159,7 +2171,7 @@ function ws_images_checkUpload($params, &$service)
if (!is_writable($conf['upload_dir']))
{
$ret['message'] = sprintf(
return sprintf(
l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'),
$relative_dir
);
@ -2167,11 +2179,6 @@ function ws_images_checkUpload($params, &$service)
}
}
if (!empty($ret['message']))
{
$ret['ready_for_upload'] = false;
}
return $ret;
return null;
}
?>