From d797d59fc612454ab2a7b82ac556c5418c76d396 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Fri, 15 Apr 2005 12:15:41 +0000
Subject: [PATCH] Utilisation de conf->upload

---
 htdocs/fourn/product/photos.php | 6 +++---
 htdocs/product/fiche.php        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/product/photos.php b/htdocs/fourn/product/photos.php
index 0190c7d4f3c..e89993538fa 100644
--- a/htdocs/fourn/product/photos.php
+++ b/htdocs/fourn/product/photos.php
@@ -43,7 +43,7 @@ $types[1] = $langs->trans("Service");
  *
  */
 
-if ( $_POST["sendit"] && defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1)
+if ( $_POST["sendit"] && $conf->upload)
 {
   if ($_GET["id"])
     {           
@@ -126,7 +126,7 @@ if ($_GET["id"])
        * Ajouter une photo
        *
        */
-      if ($_GET["action"] == 'ajout_photo' && $user->rights->produit->creer  && $product->isproduct)
+      if ($_GET["action"] == 'ajout_photo' && $user->rights->produit->creer  && $product->isproduct && $conf->upload)
 	{
 	  print_titre($langs->trans("AddPhoto"));
 	  
@@ -158,7 +158,7 @@ if ($_GET["id"])
   
   if ($_GET["action"] == '')
     {            
-      if ( $user->rights->produit->creer && $product->isproduct)
+      if ( $user->rights->produit->creer && $product->isproduct && $conf->upload)
 	{
 	  print '<a class="tabAction" href="photos.php?action=ajout_photo&amp;id='.$product->id.'">';
 	  print $langs->trans("AddPhoto").'</a>';
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 823da67fd81..d47d0125020 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -43,7 +43,7 @@ $types[1] = $langs->trans("Service");
 /*
  * Upload photo
  */
-if ( $_POST["sendit"] && defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1)
+if ( $_POST["sendit"] && $conf->upload)
 {
   if ($_POST["id"])
     {           
@@ -550,7 +550,7 @@ else
 	   * Ajouter une photo
 	   *
 	   */
-	  if ($_GET["action"] == 'ajout_photo' && $user->rights->produit->creer  && $product->isproduct)
+	  if ($_GET["action"] == 'ajout_photo' && $conf->upload && $user->rights->produit->creer  && $product->isproduct)
 	    {
 	      print_titre($langs->trans("AddPhoto"));
 
@@ -670,7 +670,7 @@ if ($_GET["action"] == '')
       print $langs->trans("Order").'</a>';
     }
 
-  if ( $user->rights->produit->creer && $product->isproduct)
+  if ( $user->rights->produit->creer && $product->isproduct && $conf->upload)
     {
       print '<a class="tabAction" href="fiche.php?action=ajout_photo&amp;id='.$product->id.'">';
       print $langs->trans("AddPhoto").'</a>';