Changeset 4789

Timestamp:

Jan 29, 2010, 12:28:14 AM (14 years ago)

Author:

plg

Message:

feature 1405 added: explicit errors when the "upload" directory is missing or
not writable.

Location:

extensions/upload_form

Files:

• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• upload.php (modified) (1 diff)
• upload.tpl (modified) (2 diffs)

extensions/upload_form/language/en_UK/plugin.lang.php

@@ -25 +25 @@
 $lang['+ Add an upload box'] = '+ Add an upload box';
 $lang['Upload'] = 'Upload';
+$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Create the "%s" directory at the root of your Piwigo installation';
+$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation';
 ?>

extensions/upload_form/language/fr_FR/plugin.lang.php

@@ -25 +25 @@
 $lang['+ Add an upload box'] = '+ Ajouter une autre boîte de transfert';
 $lang['Upload'] = 'Transférer';
+$lang['Create the "%s" directory at the root of your Piwigo installation'] = 'Créez le répertoire "%s" à la racine de votre installation Piwigo';
+$lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Donnez les droits en écriture (chmod 777) sur le répertoire "%s" à la racine de votre installation Piwigo';
 ?>

extensions/upload_form/upload.php

@@ -90 +90 @@
 
 // +-----------------------------------------------------------------------+
+// |                             setup errors                              |
+// +-----------------------------------------------------------------------+
+
+$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
+          )
+        );
+    }
+  }
+}
+
+$template->assign(
+    array(
+      'setup_errors'=> $setup_errors,
+    )
+  );
+
+// +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+

extensions/upload_form/upload.tpl

@@ -15 +15 @@
 </div>
 
+{if count($setup_errors) > 0}
+<div class="errors">
+  <ul>
+  {foreach from=$setup_errors item=error}
+    <li>{$error}</li>
+  {/foreach}
+  </ul>
+</div>
+{else}
 <form enctype="multipart/form-data" method="post" action="{$F_ACTION}" class="properties">
   <fieldset>
@@ -48 +57 @@
   </fieldset>
 </form>
+{/if}