aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-05-03 09:09:40 +0000
committerplegall <plg@piwigo.org>2010-05-03 09:09:40 +0000
commit2de8344c97468ea9a833f470885243fc94ee7742 (patch)
treecdb9427718265520c178c811a40dc43c15fec7fa
parente803366a57cd7e3784609f4f6c1ec23a0408d3e2 (diff)
bug 1635 fixed: new API method pwg.images.checkUpload tells pLoader if Piwigo
is ready for upload (currently, it checks write access on the upload directory) git-svn-id: http://piwigo.org/svn/trunk@6049 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/ws_functions.inc.php48
-rw-r--r--ws.php7
2 files changed, 55 insertions, 0 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 6f2adbf2d..87cb72393 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -2126,4 +2126,52 @@ function ws_logfile($string)
FILE_APPEND
);
}
+
+function ws_images_checkUpload($params, &$service)
+{
+ global $conf;
+
+ if (!is_admin() or is_adviser())
+ {
+ return new PwgError(401, 'Access denied');
+ }
+
+ $relative_dir = preg_replace('#^'.PHPWG_ROOT_PATH.'#', '', $conf['upload_dir']);
+
+ $ret['message'] = null;
+ $ret['ready_for_upload'] = true;
+
+ if (!is_dir($conf['upload_dir']))
+ {
+ if (!is_writable(dirname($conf['upload_dir'])))
+ {
+ $ret['message'] = sprintf(
+ l10n('Create the "%s" directory at the root of your Piwigo installation'),
+ $relative_dir
+ );
+ }
+ }
+ else
+ {
+ if (!is_writable($conf['upload_dir']))
+ {
+ @chmod($conf['upload_dir'], 0777);
+
+ if (!is_writable($conf['upload_dir']))
+ {
+ $ret['message'] = sprintf(
+ l10n('Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'),
+ $relative_dir
+ );
+ }
+ }
+ }
+
+ if (!empty($ret['message']))
+ {
+ $ret['ready_for_upload'] = false;
+ }
+
+ return $ret;
+}
?>
diff --git a/ws.php b/ws.php
index f100afa6c..1287a3c12 100644
--- a/ws.php
+++ b/ws.php
@@ -276,6 +276,13 @@ function ws_addDefaultMethods( $arr )
);
$service->addMethod(
+ 'pwg.images.checkUpload',
+ 'ws_images_checkUpload',
+ null,
+ 'check if Piwigo is ready for upload'
+ );
+
+ $service->addMethod(
'pwg.images.setInfo',
'ws_images_setInfo',
array(