Changeset 6051 for trunk

Timestamp:

May 3, 2010, 11:56:22 AM (14 years ago)

Author:

plg

Message:

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)

Location:

trunk

Files:

• admin/photos_add_direct.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (3 diffs)

trunk/admin/photos_add_direct.php

@@ -445 +445 @@
 $setup_errors = array();
 
-$upload_base_dir = 'upload';
-$upload_dir = PHPWG_ROOT_PATH.$upload_base_dir;
-
-if (!is_dir($upload_dir))
-{
-  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
-          )
-        );
-    }
-  }
+$error_message = ready_for_upload_message();
+if (!empty($error_message))
+{
+  array_push($setup_errors, $error_message);
 }
 

trunk/include/ws_functions.inc.php

@@ -2137 +2137 @@
   }
 
-  $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
@@ -2160 +2172 @@
       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
@@ -2168 +2180 @@
   }
 
-  if (!empty($ret['message']))
-  {
-    $ret['ready_for_upload'] = false;
-  }
-  
-  return $ret;
+  return null;
 }
 ?>