diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 73ea52ce705..8f6dcfe783b 100755 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -18,15 +18,15 @@ /** * \file htdocs/product/canvas/product/actions_card_product.class.php * \ingroup produit - * \brief Fichier de la classe des produits par defaut + * \brief File with class of actions for canvas product */ include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); + /** - * \class ActionsCardProduct - * \brief Class with controller methods for product canvas + * Class with controller methods for product canvas */ -class ActionsCardProduct extends Product +class ActionsCardProduct { var $targetmodule; var $canvas; diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index b21db469db1..29d7624c3c9 100755 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -18,15 +18,15 @@ /** * \file htdocs/product/canvas/service/actions_card_service.class.php * \ingroup service - * \brief Fichier de la classe des services par defaut + * \brief File with class of actions for canvas service */ include_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); + /** - * \class ActionsCardService - * \brief Class with controller methods for product canvas + * Class with controller methods for product canvas */ -class ActionsCardService extends Product +class ActionsCardService { var $targetmodule; var $canvas; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index e1e8b227d24..db53b525217 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -112,6 +112,7 @@ class User extends CommonObject $this->all_permissions_are_loaded = 0; $this->admin=0; + $this->conf = (object) array(); $this->rights = (object) array(); $this->rights->user = (object) array(); $this->rights->user->user = (object) array(); @@ -530,16 +531,12 @@ class User extends CommonObject if ($perms) { - if (! is_object($this->rights->$module)) $this->rights->$module = (object) array(); - if (! is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = (object) array(); + if (! isset($this->rights) || ! is_object($this->rights)) $this->rights = (object) array(); // For avoid error + if (! isset($this->rights->$module) || ! is_object($this->rights->$module)) $this->rights->$module = (object) array(); if ($subperms) { - if (! isset($this->rights->$module) || - (is_object($this->rights->$module) && ! isset($this->rights->$module->$perms)) || - (is_object($this->rights->$module->$perms)) ) - { - $this->rights->$module->$perms->$subperms = 1; - } + if (! isset($this->rights->$module->$perms) || ! is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = (object) array(); + $this->rights->$module->$perms->$subperms = 1; } else { @@ -581,8 +578,11 @@ class User extends CommonObject if ($perms) { + if (! isset($this->rights) || ! is_object($this->rights)) $this->rights = (object) array(); // For avoid error + if (! isset($this->rights->$module) || ! is_object($this->rights->$module)) $this->rights->$module = (object) array(); if ($subperms) { + if (! isset($this->rights->$module->$perms) || ! is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = (object) array(); $this->rights->$module->$perms->$subperms = 1; } else