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

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

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(