From 94714d0c41048a2847c603500a6952ddea3e1d26 Mon Sep 17 00:00:00 2001 From: erics Date: Fri, 10 Sep 2004 19:30:08 +0000 Subject: [PATCH] =?UTF-8?q?juste=20un=20test=20pour=20v=E9rifier=20qu'on?= =?UTF-8?q?=20ne=20fait=20pas=20un=20opendir=20d'un=20truc=20qui=20n'exist?= =?UTF-8?q?e=20pas,=20et=20correction=20d'un=20petit=20bug=20(manquait=20l?= =?UTF-8?q?es=20points=20pour=20concat=20les=20chaines)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/expedition.php | 207 +++++++++++++++++++----------------- 1 file changed, 109 insertions(+), 98 deletions(-) diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index aefb33a8b5c..6029b6489ae 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -3,6 +3,7 @@ * Copyright (C) 2004 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004 Eric Seigne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -61,18 +62,18 @@ if ($_GET["action"] == 'set') $classname = 'methode_expedition_'.$_GET["value"]; require_once($file); - $obj = new $classname(); - $sql = "delete from ".MAIN_DB_PREFIX."expedition_methode where rowid = "$obj->id";"; - $db->query($sql); - $sql=''; - $sql = "insert into ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle,description,status) VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].");"; - + $obj = new $classname(); + $sql = "delete from ".MAIN_DB_PREFIX."expedition_methode where rowid = ".$obj->id.";"; + $db->query($sql); + $sql=''; + $sql = "insert into ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle,description,status) VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].");"; + //$sql = "REPLACE INTO ".MAIN_DB_PREFIX."expedition_methode (rowid,code,libelle, description, statut)"; //$sql .= " VALUES (".$obj->id.",'".$obj->code."','".$obj->name."','".addslashes($obj->description)."',".$_GET["statut"].")"; - + if ($db->query($sql)) { - + } } @@ -167,60 +168,65 @@ print 'Actif'; print 'Défaut'; print "\n"; -$handle=opendir($dir); +if(is_dir($dir)) { + $handle=opendir($dir); -while (($file = readdir($handle))!==false) -{ - if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,19) == 'methode_expedition_') + while (($file = readdir($handle))!==false) { - $name = substr($file, 19, strlen($file) - 31); - $classname = substr($file, 0, strlen($file) - 12); - - require_once($dir.$file); - - $obj = new $classname(); - - print ''; - echo $obj->name; - print "\n"; - - print $obj->description; - - print ''; - - if (in_array($name, $def)) + if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,19) == 'methode_expedition_') { - print ''; + $name = substr($file, 19, strlen($file) - 31); + $classname = substr($file, 0, strlen($file) - 12); + + require_once($dir.$file); + + $obj = new $classname(); + + print ''; + echo $obj->name; print "\n"; - print 'désactiver'; - } - else - { - print " "; + + print $obj->description; + + print ''; + + if (in_array($name, $def)) + { + print ''; + print "\n"; + print 'désactiver'; + } + else + { + print " "; + print "\n"; + print 'activer'; + } + + print ''; + + if ($expedition_default == "$name") + { + print ''; + } + else + { + print " "; + } + print "\n"; - print 'activer'; + + print 'activer'; + + print ''; } - - print ''; - - if ($expedition_default == "$name") - { - print ''; - } - else - { - print " "; - } - - print "\n"; - - print 'activer'; - - print ''; } + closedir($handle); +} +else +{ + print "ERROR: $dir is not a directory !\n"; } -closedir($handle); - print ''; print '
'; @@ -240,58 +246,63 @@ print "\n"; clearstatcache(); -$handle=opendir($dir); +if(is_dir($dir)) { + $handle=opendir($dir); -while (($file = readdir($handle))!==false) -{ - if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,15) == 'pdf_expedition_') + while (($file = readdir($handle))!==false) { - $name = substr($file, 15, strlen($file) - 27); - $classname = substr($file, 0, strlen($file) - 12); - - print ''; - echo "$name"; - print "\n"; - require_once($dir.$file); - $obj = new $classname(); - - print $obj->description; - - print ''; - - if (in_array($name, $def)) + if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,15) == 'pdf_expedition_') { - print ''; + $name = substr($file, 15, strlen($file) - 27); + $classname = substr($file, 0, strlen($file) - 12); + + print ''; + echo "$name"; print "\n"; - print 'désactiver'; - } - else - { - print " "; + require_once($dir.$file); + $obj = new $classname(); + + print $obj->description; + + print ''; + + if (in_array($name, $def)) + { + print ''; + print "\n"; + print 'désactiver'; + } + else + { + print " "; + print "\n"; + print 'activer'; + } + + print ''; + + if ($expedition_addon_var_pdf == "$name") + { + print ''; + } + else + { + print " "; + } + print "\n"; - print 'activer'; + + print 'activer'; + + print ''; } - - print ''; - - if ($expedition_addon_var_pdf == "$name") - { - print ''; - } - else - { - print " "; - } - - print "\n"; - - print 'activer'; - - print ''; } + closedir($handle); +} +else +{ + print "ERROR: $dir is not a directory !\n"; } -closedir($handle); - print ''; /*