From 73f216fd892f7e1ee9108977b35b53c986983600 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 9 Apr 2010 07:55:37 +0000 Subject: [PATCH] Fix: rename $class to $classname to prevents problems http://www.manuelphp.com/php/reserved.keywords.php --- dev/skeletons/build_class_from_table.php | 8 +- htdocs/admin/expedition.php | 4 +- htdocs/admin/fichinter.php | 6 +- htdocs/categories/categorie.class.php | 4 +- htdocs/comm/action/actioncomm.class.php | 6 +- .../export/modules/compta.export.class.php | 4 +- htdocs/compta/facture/impayees.php | 2 +- htdocs/core/commonobject.class.php | 10 +-- htdocs/core/dolgraph.class.php | 8 +- htdocs/docs/document.class.php | 8 +- htdocs/expedition/expedition.class.php | 4 +- htdocs/expedition/fiche.php | 8 +- htdocs/fourn/facture/impayees.php | 2 +- .../includes/menus/barre_top/auguria.lib.php | 8 +- htdocs/includes/menus/barre_top/eldy.lib.php | 88 +++++++++---------- htdocs/includes/menus/barre_top/empty.php | 10 +-- htdocs/lib/functions.lib.php | 8 +- htdocs/product/fiche.php | 16 ++-- htdocs/product/liste.php | 4 +- htdocs/projet/element.php | 4 +- 20 files changed, 106 insertions(+), 106 deletions(-) diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php index c52e86e87a3..cbbd89e2ce4 100644 --- a/dev/skeletons/build_class_from_table.php +++ b/dev/skeletons/build_class_from_table.php @@ -122,8 +122,8 @@ else // Define working variables $table=strtolower($table); $tablenollx=preg_replace('/llx_/i','',$table); -$class=ucfirst($tablenollx); -$classmin=strtolower($class); +$classname=ucfirst($tablenollx); +$classmin=strtolower($classname); // Read skeleton_class.class.php file @@ -145,7 +145,7 @@ $targetcontent=$sourcecontent; $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent); $targetcontent=preg_replace('/\$element=\'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent); $targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent); -$targetcontent=preg_replace('/Skeleton_class/', $class, $targetcontent); +$targetcontent=preg_replace('/Skeleton_class/', $classname, $targetcontent); // Substitute comments $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent); @@ -376,7 +376,7 @@ $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.ph $targetcontent=preg_replace('/skeleton_script\.php/', $classmin.'_script.php', $targetcontent); $targetcontent=preg_replace('/\$element=\'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent); $targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent); -$targetcontent=preg_replace('/Skeleton_class/', $class, $targetcontent); +$targetcontent=preg_replace('/Skeleton_class/', $classname, $targetcontent); // Substitute comments $targetcontent=preg_replace('/This file is an example to create a new class file/', 'Put here description of this class', $targetcontent); diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index edc145d5f84..a4c8d1ca9d1 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -141,8 +141,8 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod') require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_$module.modules.php"); - $class = "methode_expedition_$module"; - $expem = new $class($db); + $classname = "methode_expedition_$module"; + $expem = new $classname($db); $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition_methode"; $sql.= " WHERE rowid = ".$moduleid; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index cbe654ced24..6e905b07d1d 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -206,7 +206,7 @@ if ($handle) if (preg_match('/^(mod_.*)\.php$/i',$file,$reg)) { $file = $reg[1]; - $className = substr($file,4); + $classname = substr($file,4); require_once($dir.$file.".php"); @@ -227,13 +227,13 @@ if ($handle) print ''.$module->getExample()."\n"; print ''; - if ($conf->global->FICHEINTER_ADDON == $className) + if ($conf->global->FICHEINTER_ADDON == $classname) { print img_picto($langs->trans("Activated"),'on'); } else { - print ''.img_picto($langs->trans("Disabled"),'off').''; + print ''.img_picto($langs->trans("Disabled"),'off').''; } print ''; diff --git a/htdocs/categories/categorie.class.php b/htdocs/categories/categorie.class.php index 8dda84b91d6..99a462afb9d 100644 --- a/htdocs/categories/categorie.class.php +++ b/htdocs/categories/categorie.class.php @@ -430,7 +430,7 @@ class Categorie * \param class PHP Class of object to store entity * \param table Table name for select in table. Full table name will be PREFIX_categorie_table. */ - function get_type($field,$class,$table='') + function get_type($field,$classname,$table='') { $objs = array(); @@ -446,7 +446,7 @@ class Categorie { while ($rec = $this->db->fetch_array($resql)) { - $obj = new $class($this->db); + $obj = new $classname($this->db); $obj->fetch($rec['fk_'.$field]); $objs[] = $obj; } diff --git a/htdocs/comm/action/actioncomm.class.php b/htdocs/comm/action/actioncomm.class.php index c9750e87768..bd7a4b2c51a 100644 --- a/htdocs/comm/action/actioncomm.class.php +++ b/htdocs/comm/action/actioncomm.class.php @@ -544,13 +544,13 @@ class ActionComm * \return string Chaine avec URL * \remarks Utilise $this->id, $this->code et $this->libelle */ - function getNomUrl($withpicto=0,$maxlength=0,$class='',$option='') + function getNomUrl($withpicto=0,$maxlength=0,$classname='',$option='') { global $langs; $result=''; - if ($option=='birthday') $lien = ''; - else $lien = ''; + if ($option=='birthday') $lien = ''; + else $lien = ''; $lienfin=''; if ($langs->trans("Action".$this->type_code) != "Action".$this->type_code || ! $this->libelle) diff --git a/htdocs/compta/export/modules/compta.export.class.php b/htdocs/compta/export/modules/compta.export.class.php index ec0d26bad58..7260b84524a 100644 --- a/htdocs/compta/export/modules/compta.export.class.php +++ b/htdocs/compta/export/modules/compta.export.class.php @@ -41,11 +41,11 @@ class ComptaExport \param USER Object utilisateur \param classe Nom de la classe utilis�e pour formater les rapports */ - function ComptaExport ($DB, $USER, $classe) + function ComptaExport ($DB, $USER, $classname) { $this->db = $DB; $this->user = $USER; - $this->classe_export = $classe; + $this->classe_export = $classname; $this->error_message = ''; } diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 1d541bfe532..4b5497be8af 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -317,7 +317,7 @@ if ($result) $var=!$var; print ""; - $class = "impayee"; + $classname = "impayee"; print ''; diff --git a/htdocs/core/commonobject.class.php b/htdocs/core/commonobject.class.php index c9ca4494eeb..eb34def7d81 100644 --- a/htdocs/core/commonobject.class.php +++ b/htdocs/core/commonobject.class.php @@ -418,8 +418,8 @@ class CommonObject if ($object == 'shipping') $object = 'expedition'; if ($object == 'delivery') $object = 'livraison'; - $class = ucfirst($object); - $this->$object = new $class($this->db); + $classname = ucfirst($object); + $this->$object = new $classname($this->db); $this->$object->fetch($this->origin_id); } @@ -1027,9 +1027,9 @@ class CommonObject // TODO uniformiser emplacement classe require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/facture.class.php'); - $class = ucfirst($object); - if(!class_exists($class)) require(DOL_DOCUMENT_ROOT."/".$object."/class/".$object.".class.php"); - $linkedObjectBlock = new $class($this->db); + $classname = ucfirst($object); + if(!class_exists($classname)) require(DOL_DOCUMENT_ROOT."/".$object."/class/".$object.".class.php"); + $linkedObjectBlock = new $classname($this->db); if ($object == 'facture') $object = 'compta/'.$object; if ($object == 'propal') $object = 'comm/'.$object; include(DOL_DOCUMENT_ROOT.'/'.$object.'/tpl/linkedobjectblock.tpl.php'); diff --git a/htdocs/core/dolgraph.class.php b/htdocs/core/dolgraph.class.php index 86b5d57ff21..97a97394d69 100644 --- a/htdocs/core/dolgraph.class.php +++ b/htdocs/core/dolgraph.class.php @@ -421,10 +421,10 @@ class DolGraph if (! defined('LEGEND_LINE')) define('LEGEND_LINE',1); // Create graph - $class=''; - if ($this->type == 'bars') $class='BarPlot'; - if ($this->type == 'lines') $class='LinePlot'; - include_once DOL_DOCUMENT_ROOT."/includes/artichow/".$class.".class.php"; + $classname=''; + if ($this->type == 'bars') $classname='BarPlot'; + if ($this->type == 'lines') $classname='LinePlot'; + include_once DOL_DOCUMENT_ROOT."/includes/artichow/".$classname.".class.php"; // Definition de couleurs $bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]); diff --git a/htdocs/docs/document.class.php b/htdocs/docs/document.class.php index 92e3e73369d..ff22f16e8ce 100644 --- a/htdocs/docs/document.class.php +++ b/htdocs/docs/document.class.php @@ -38,7 +38,7 @@ class Document /** - \brief G�n�re le document + \brief Genere le document \return int 0= ok, <> 0 = ko */ function Generate ($id) @@ -47,11 +47,11 @@ class Document dol_syslog("Document::Generate id=$id", LOG_DEBUG ); $this->id = $id; - $class = $id; - $classfile = 'docs/class/'.$class.'.class.php'; + $classname = $id; + $classfile = 'docs/class/'.$classname.'.class.php'; require DOL_DOCUMENT_ROOT.'/'.$classfile; - $obj = new $class($this->db); + $obj = new $classname($this->db); $this->db->begin(); diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index 787b2cdd3b5..146d8ee154b 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -848,9 +848,9 @@ class Expedition extends CommonObject } if ($code) { - $classe = "methode_expedition_".strtolower($code); + $classname = "methode_expedition_".strtolower($code); require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_".strtolower($code).".modules.php"); - $obj = new $classe; + $obj = new $classname(); $url = $obj->provider_url_status($this->tracking_number); if ($url) { diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index d8d58f60040..54366d0a989 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -84,8 +84,8 @@ if ($_POST["action"] == 'add') // On boucle sur chaque ligne du document d'origine pour completer objet expedition // avec qte a livrer - $class = ucfirst($expedition->origin); - $object = new $class($db); + $classname = ucfirst($expedition->origin); + $object = new $classname($db); $object->fetch($expedition->origin_id); //$object->fetch_lines(); @@ -257,9 +257,9 @@ if ($_GET["action"] == 'create') if ($origin) { - $class = ucfirst($origin); + $classname = ucfirst($origin); - $object = new $class($db); + $object = new $classname($db); if ($object->fetch($origin_id)) { diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 680a84ceca9..83e50beeb4f 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -202,7 +202,7 @@ if ($user->rights->fournisseur->facture->lire) $var=!$var; print ""; - $class = "impayee"; + $classname = "impayee"; print ''; $facturestatic->id=$objp->facid; diff --git a/htdocs/includes/menus/barre_top/auguria.lib.php b/htdocs/includes/menus/barre_top/auguria.lib.php index 77c15186a0d..bdac0139082 100644 --- a/htdocs/includes/menus/barre_top/auguria.lib.php +++ b/htdocs/includes/menus/barre_top/auguria.lib.php @@ -73,14 +73,14 @@ function print_auguria_menu($db,$atarget,$hideifnotallowed) } // Define the class (top menu selected or not) - if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; - else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; - else $class='class="tmenu"'; + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $classname='class="tmenusel"'; + else $classname='class="tmenu"'; print ''; print '
'; - print ''; + print ''; print $tabMenu[$i]['titre']; print ''; diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index 6470d3a6ee2..51549ab288b 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -45,19 +45,19 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) print ''; // Home - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='home'; print ''; @@ -67,14 +67,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $langs->load("companies"); $langs->load("suppliers"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='companies'; @@ -83,7 +83,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -104,14 +104,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("products"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $chaine=""; if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); } @@ -123,7 +123,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -143,14 +143,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("commercial"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='commercial'; @@ -158,7 +158,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -179,14 +179,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("compta"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='accountancy'; @@ -195,7 +195,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -215,14 +215,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("projects"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='project'; @@ -230,7 +230,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -250,14 +250,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("other"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='tools'; @@ -265,7 +265,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -285,20 +285,20 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("shop"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='shop'; print ''; } @@ -307,20 +307,20 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $langs->load("shop"); - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='shop'; print ''; } @@ -329,14 +329,14 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { // $langs->load("members"); Added in main file - $class=""; + $classname=""; if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") { - $class='class="tmenusel"'; $_SESSION['idmenu']=''; + $classname='class="tmenusel"'; $_SESSION['idmenu']=''; } else { - $class = 'class="tmenu"'; + $classname = 'class="tmenu"'; } $idsel='members'; @@ -344,7 +344,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { print ''; } else @@ -393,13 +393,13 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) } // Define the class (top menu selected or not) - if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; - else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; - else $class='class="tmenu"'; + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $classname='class="tmenusel"'; + else $classname='class="tmenu"'; print ''; diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php index be0bef54554..4d72e9f7607 100644 --- a/htdocs/includes/menus/barre_top/empty.php +++ b/htdocs/includes/menus/barre_top/empty.php @@ -62,10 +62,10 @@ class MenuTop { // ***** START ***** // print ''; // print ''; // ... @@ -90,10 +90,10 @@ class MenuTop { else $url.='&'; $url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu='; $url.="&idmenu=".$tabMenu[$i]['rowid']; - if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; - else $class='class="tmenu"'; + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"'; + else $classname='class="tmenu"'; print ''; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 718b95687b9..cf723785b81 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -2721,15 +2721,15 @@ function yn($yesno, $case=1, $color=0) if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') // A mettre avant test sur no a cause du == 0 { $result=($case?$langs->trans("Yes"):$langs->trans("yes")); - $class='ok'; + $classname='ok'; } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') { $result=($case?$langs->trans("No"):$langs->trans("no")); - if ($color == 2) $class='ok'; - else $class='error'; + if ($color == 2) $classname='ok'; + else $classname='error'; } - if ($color) return ''.$result.''; + if ($color) return ''.$result.''; return $result; } diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 1ea84f20fa9..62f01e95141 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -123,9 +123,9 @@ if ($_POST["action"] == 'add' && ($user->rights->produit->creer || $user->rights { if ($_POST["canvas"] <> '' && file_exists('canvas/'.$_POST["canvas"].'/product.'.$_POST["canvas"].'.class.php') ) { - $class = 'Product'.ucfirst($_POST["canvas"]); + $classname = 'Product'.ucfirst($_POST["canvas"]); include_once('canvas/'.$_POST["canvas"].'/product.'.$_POST["canvas"].'.class.php'); - $product = new $class($db); + $product = new $classname($db); } else { @@ -256,10 +256,10 @@ if ($_POST["action"] == 'update' && ($user->rights->produit->creer || $user->rig // Specific product if ($product->canvas <> '' && file_exists('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php') ) { - $class = 'Product'.ucfirst($product->canvas); + $classname = 'Product'.ucfirst($product->canvas); include_once('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php'); - $product = new $class($db); + $product = new $classname($db); if ($product->FetchCanvas($_POST["id"])) { $product->UpdateCanvas($_POST); @@ -624,11 +624,11 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ if (! isset($product)) { $filecanvas = DOL_DOCUMENT_ROOT.'/product/canvas/'.$_GET["canvas"].'/product.'.$_GET["canvas"].'.class.php'; - $class = 'Product'.ucfirst($_GET["canvas"]); + $classname = 'Product'.ucfirst($_GET["canvas"]); include_once($filecanvas); - $product = new $class($db,0,$user); + $product = new $classname($db,0,$user); } $product->assign_smarty_values($smarty, 'create'); @@ -859,9 +859,9 @@ if ($_GET["id"] || $_GET["ref"]) // Gestion des produits specifiques if ($product->canvas <> '' && file_exists('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php') ) { - $class = 'Product'.ucfirst($product->canvas); + $classname = 'Product'.ucfirst($product->canvas); include_once('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php'); - $product = new $class($db); + $product = new $classname($db); $result = $product->fetchCanvas($_GET["id"],'',$_GET["action"]); diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 2c164ce20c3..53f411e69fe 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -93,10 +93,10 @@ $htmlother=new FormOther($db); if ($_GET["canvas"] <> '' && file_exists('canvas/'.$_GET["canvas"].'/product.'.$_GET["canvas"].'.class.php') ) { - $class = 'Product'.ucfirst($_GET["canvas"]); + $classname = 'Product'.ucfirst($_GET["canvas"]); include_once('canvas/'.$_GET["canvas"].'/product.'.$_GET["canvas"].'.class.php'); - $object = new $class($db); + $object = new $classname($db); $object->getFieldList(); $object->LoadListDatas($limit, $offset, $sortfield, $sortorder); $title = $object->getTitle(); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index eae46ff0ef5..05604de0b4d 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -159,7 +159,7 @@ $listofreferent=array( foreach ($listofreferent as $key => $value) { $title=$value['title']; - $class=$value['class']; + $classname=$value['class']; $qualified=$value['test']; if ($qualified) { @@ -181,7 +181,7 @@ foreach ($listofreferent as $key => $value) $total = 0; for ($i = 0; $ifetch($elementarray[$i]); $var=!$var;
'; - // print 'My menu entry 1'; // print ''; - // print 'My menu entry 2'; // print ''; - print 'atarget?" target=$this->atarget":($this->atarget?" target=$this->atarget":"")).'>'; + print 'atarget?" target=$this->atarget":($this->atarget?" target=$this->atarget":"")).'>'; print $tabMenu[$i]['titre']; print ''; print '