Changeset 6049

Timestamp:

05/03/10 11:09:40 (3 years ago)

Author:

plg

Message:

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)

Location:

trunk

Files:

• include/ws_functions.inc.php (modified) (1 diff)
• ws.php (modified) (1 diff)

trunk/include/ws_functions.inc.php

@@ -2127 +2127 @@
     );
 }
+
+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;
+}
 ?>

trunk/ws.php

@@ -277 +277 @@
 
   $service->addMethod(
+    'pwg.images.checkUpload',
+    'ws_images_checkUpload',
+    null,
+    'check if Piwigo is ready for upload'
+    );
+
+  $service->addMethod(
     'pwg.images.setInfo',
     'ws_images_setInfo',