From 668bec37755280795bb8fcbe76cbbbfe551b5f59 Mon Sep 17 00:00:00 2001 From: FHenry Date: Fri, 20 Apr 2012 15:48:48 +0200 Subject: [PATCH 1/4] Remove Eclipse Warning (Undeclare variable) --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 493b89581ad..971ab45376b 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2915,7 +2915,7 @@ class Form } else { - $this->error = ''.$langs->trans("ErrorNoVATRateDefinedForSellerCountry",$code_pays).''; + $this->error = ''.$langs->trans("ErrorNoVATRateDefinedForSellerCountry",$country_code).''; return -1; } } From 07fc51b7ffa0c39d512e850c8a9f9a43e4ec367e Mon Sep 17 00:00:00 2001 From: FHenry Date: Fri, 20 Apr 2012 15:54:37 +0200 Subject: [PATCH 2/4] Remove Eclipse variable warning --- htdocs/core/modules/fichinter/modules_fichinter.php | 2 +- .../core/modules/supplier_invoice/pdf/pdf_canelle.modules.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index de1a1c79ee2..edd5be4401a 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -156,7 +156,7 @@ abstract class ModeleNumRefFicheinter */ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) { - global $conf,$langs; + global $conf,$langs,$user; $langs->load("ficheinter"); $error=0; diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 9a62c42947d..3fc64061d0b 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -398,7 +398,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->Output($file,'F'); // Actions on extra fields (by external module or standard code) - if (! is_object($hookmanager)) + if (!is_object($hookmanager)) { include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); $hookmanager=new HookManager($this->db); From 5ed77c8d408dd0807a67b1551706ca767394a770 Mon Sep 17 00:00:00 2001 From: FHenry Date: Sun, 22 Apr 2012 11:19:04 +0200 Subject: [PATCH 3/4] Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation --- htdocs/admin/mailing.php | 4 ++-- htdocs/comm/mailing/fiche.php | 6 +++--- htdocs/public/emailing/mailing-read.php | 2 +- htdocs/public/emailing/mailing-unsubscribe.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 8808849b7ca..80d7ba16dff 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -50,7 +50,7 @@ if ($action == 'setvalue' && $user->admin) if (! $res > 0) $error++; $res=dolibarr_set_const($db, "MAILING_EMAIL_ERRORSTO",$mailerror,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; - $res=dolibarr_set_const($db, "MAIN_SOCIETE_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity); + $res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; if (! $error) @@ -107,7 +107,7 @@ print ''; $var=!$var; print ''; print $langs->trans("ActivateCheckRead").''; -if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE==1) +if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE==1) { print ''; print img_picto($langs->trans("Enabled"),'switch_on'); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index bf74bf0ad08..bcea8ad2a22 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -58,7 +58,7 @@ $substitutionarray=array( '__SIGNATURE__' => 'Signature', '__PERSONALIZED__' => 'Personalized' ); -if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE) +if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) { $substitutionarray=array_merge( $substitutionarray, @@ -83,7 +83,7 @@ $substitutionarrayfortest=array( '__SIGNATURE__' => 'TESTSignature', '__PERSONALIZED__' => 'TESTPersonalized' ); -if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE) +if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) { $substitutionarrayfortest=array_merge( $substitutionarrayfortest, @@ -1046,7 +1046,7 @@ else print '
'.$langs->trans("CommonSubstitutions").':
'; print '__ID__ = '.$langs->trans("IdRecord").'
'; print '__EMAIL__ = '.$langs->trans("EMail").'
'; - if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE) + if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) { print '__CHECK_READ__ = '.$langs->trans("CheckRead").'
'; print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'
'; diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php index b9fb643f626..884509eebde 100644 --- a/htdocs/public/emailing/mailing-read.php +++ b/htdocs/public/emailing/mailing-read.php @@ -32,7 +32,7 @@ require("../../main.inc.php"); $id=GETPOST('tag'); -if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled'); +if (empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) accessforbidden('Option not enabled'); /* diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php index c3614023fae..57a4a6fa2f7 100644 --- a/htdocs/public/emailing/mailing-unsubscribe.php +++ b/htdocs/public/emailing/mailing-unsubscribe.php @@ -39,7 +39,7 @@ $langs->load("mails"); $id=GETPOST('tag'); $unsuscrib=GETPOST('unsuscrib'); -if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled'); +if (empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) accessforbidden('Option not enabled'); /* From 07bff417e82bb10134b96599b8f7af1f1076d94f Mon Sep 17 00:00:00 2001 From: FHenry Date: Tue, 24 Apr 2012 16:15:46 +0200 Subject: [PATCH 4/4] remove useless line --- htdocs/projet/class/project.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 68af1d9aee3..483d2034553 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -736,7 +736,6 @@ class Project extends CommonObject $this->id = 0; $this->ref = 'SPECIMEN'; $this->specimen = 1; - $socid = rand(1, $num_socs); $this->socid = 1; $this->date_c = $now; $this->date_m = $now;