lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #897 from grandoc/3.3

Browse Source 
fix some indefined index
This commit is contained in:
Laurent Destailleur 2013-04-29 10:27:25 -07:00
commit 4274a1aa21
5 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/contact/class/contact.class.php
View File

@ -246,11 +246,11 @@ class Contact extends CommonObject
$sql .= ", poste='".$this->db->escape($this->poste)."'"; $sql .= ", poste='".$this->db->escape($this->poste)."'";
$sql .= ", fax='".$this->db->escape($this->fax)."'"; $sql .= ", fax='".$this->db->escape($this->fax)."'";
$sql .= ", email='".$this->db->escape($this->email)."'"; $sql .= ", email='".$this->db->escape($this->email)."'";
$sql .= ", note='".$this->db->escape($this->note)."'"; $sql .= ", note='".(isset($this->db->escape($this->note))?"'".$this->db->escape($this->note)."'":"null")."'";
$sql .= ", phone = '".$this->db->escape($this->phone_pro)."'"; $sql .= ", phone = '".(isset($this->db->escape($this->phone_pro))?"'".$this->db->escape($this->phone_pro)."'":"null")."'";
$sql .= ", phone_perso = '".$this->db->escape($this->phone_perso)."'"; $sql .= ", phone_perso = '".(isset($this->db->escape($this->phone_perso))?"'".$this->db->escape($this->phone_perso)."'":"null")."'";
$sql .= ", phone_mobile = '".$this->db->escape($this->phone_mobile)."'"; $sql .= ", phone_mobile = '".(isset($this->db->escape($this->phone_mobile))?"'".$this->db->escape($this->phone_mobile)."'":"null")."'";
$sql .= ", jabberid = '".$this->db->escape($this->jabberid)."'"; $sql .= ", jabberid = '".(isset($this->db->escape($this->jabberid))?"'".$this->db->escape($this->jabberid)."'":"null")."'";
$sql .= ", priv = '".$this->priv."'"; $sql .= ", priv = '".$this->priv."'";
$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null"); $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"null");
$sql .= ", default_lang=".($this->default_lang?"'".$this->default_lang."'":"null"); $sql .= ", default_lang=".($this->default_lang?"'".$this->default_lang."'":"null");

20
htdocs/core/menus/standard/eldy.lib.php
View File

@ -48,7 +48,7 @@ function print_eldy_menu($db,$atarget,$type_user)
// Home // Home
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "home")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -76,7 +76,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("suppliers"); $langs->load("suppliers");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -117,7 +117,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("products"); $langs->load("products");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -167,7 +167,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("commercial"); $langs->load("commercial");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -209,7 +209,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("compta"); $langs->load("compta");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -252,7 +252,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("banks"); $langs->load("banks");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -294,7 +294,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("projects"); $langs->load("projects");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -336,7 +336,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("other"); $langs->load("other");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -378,7 +378,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$langs->load("shop"); $langs->load("shop");
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "shop")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }
@ -406,7 +406,7 @@ function print_eldy_menu($db,$atarget,$type_user)
if ($showmode) if ($showmode)
{ {
$classname=""; $classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") if (isset($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members")
{ {
$classname='class="tmenusel"'; $_SESSION['idmenu']=''; $classname='class="tmenusel"'; $_SESSION['idmenu']='';
} }

2
htdocs/core/modules/societe/mod_codeclient_monkey.php
View File

@ -43,6 +43,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
var $prefixcustomer='CU'; var $prefixcustomer='CU';
var $prefixsupplier='SU'; var $prefixsupplier='SU';
var $prefixIsRequired; // Le champ prefix du tiers doit etre renseigne quand on utilise {pre}
/** /**
@ -57,6 +58,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
$this->code_modifiable_invalide = 1; $this->code_modifiable_invalide = 1;
$this->code_modifiable_null = 1; $this->code_modifiable_null = 1;
$this->code_auto = 1; $this->code_auto = 1;
$this->prefixIsRequired = 0;
} }

4
htdocs/includes/nusoap/lib/Mail/PEAR.php
View File

@ -559,10 +559,10 @@ class PEAR
$ec = 'PEAR_Error'; $ec = 'PEAR_Error';
} }
if ($skipmsg) { if ($skipmsg) {
$a = &new $ec($code, $mode, $options, $userinfo); $a = new $ec($code, $mode, $options, $userinfo);
return $a; return $a;
} else { } else {
$a = &new $ec($message, $code, $mode, $options, $userinfo); $a = new $ec($message, $code, $mode, $options, $userinfo);
return $a; return $a;
} }
} }

2
htdocs/includes/nusoap/lib/Mail/mimeDecode.php
View File

@ -307,7 +307,7 @@ class Mail_mimeDecode extends PEAR
break; break;
case 'message/rfc822': case 'message/rfc822':
$obj = &new Mail_mimeDecode($body); $obj = new Mail_mimeDecode($body);
$return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies, $return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies,
'decode_bodies' => $this->_decode_bodies, 'decode_bodies' => $this->_decode_bodies,
'decode_headers' => $this->_decode_headers)); 'decode_headers' => $this->_decode_headers));