diff --git a/htdocs/webportal/class/webportalmember.class.php b/htdocs/webportal/class/webportalmember.class.php index 3aa73c8985b..624180791ac 100644 --- a/htdocs/webportal/class/webportalmember.class.php +++ b/htdocs/webportal/class/webportalmember.class.php @@ -53,7 +53,7 @@ class WebPortalMember extends Adherent /** * MorPhy list : Moral or Physical */ - const morphy_list = array( + const MORPHY_LIST = array( 'phy' => 'Physical', 'mor' => 'Moral', ); @@ -61,7 +61,7 @@ class WebPortalMember extends Adherent /** * Gender list */ - const gender_list = array( + const GENDER_LIST = array( 'man' => 'Genderman', 'woman' => 'Genderwoman', 'other' => 'Genderother', @@ -121,7 +121,7 @@ class WebPortalMember extends Adherent 'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 4, 'position' => 30, 'showonheader' => 1,), 'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 4, 'position' => 35, 'showonheader' => 1,), - 'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => 4, 'position' => 50, 'arrayofkeyval' => self::gender_list, 'showonheader' => 1,), + 'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => 4, 'position' => 50, 'arrayofkeyval' => self::GENDER_LIST, 'showonheader' => 1,), 'company' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => 4, 'position' => 65, 'showonheader' => 1,), 'address' => array('type' => 'text', 'label' => 'Address', 'enabled' => 1, 'visible' => 4, 'position' => 75, 'showonheader' => 1,), 'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => 4, 'position' => 80, 'showonheader' => 1,), @@ -136,7 +136,7 @@ class WebPortalMember extends Adherent 'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => 4, 'position' => 240,), 'typeid' => array('type' => 'integer:AdherentType:adherents/class/adherent_type.class.php', 'label' => 'Type', 'enabled' => 1, 'visible' => 4, 'notnull' => 1, 'position' => 255), - 'morphy' => array('type' => 'varchar(3)', 'label' => 'MemberNature', 'enabled' => 1, 'visible' => 4, 'notnull' => 1, 'position' => 260, 'arrayofkeyval' => self::morphy_list,), + 'morphy' => array('type' => 'varchar(3)', 'label' => 'MemberNature', 'enabled' => 1, 'visible' => 4, 'notnull' => 1, 'position' => 260, 'arrayofkeyval' => self::MORPHY_LIST,), 'civility_id' => array('type' => 'sellist:c_civility:label:rowid::active=1', 'label' => 'Civility', 'enabled' => 1, 'visible' => 4, 'position' => 270,), 'datefin' => array('type' => 'date', 'label' => 'SubscriptionEndDate', 'enabled' => 1, 'visible' => 5, 'position' => 280,), 'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => 4, 'position' => 290,), diff --git a/htdocs/webportal/public/lib/webportal.lib.php b/htdocs/webportal/public/lib/webportal.lib.php index 67acee2159f..2c67c129ef8 100644 --- a/htdocs/webportal/public/lib/webportal.lib.php +++ b/htdocs/webportal/public/lib/webportal.lib.php @@ -50,12 +50,10 @@ function getNavItem($item, $deep = 0) if (!empty($item['overrride'])) { $menu .= $item['overrride']; } elseif (!empty($item['children'])) { - $menuChildren = ''; $haveChildActive = false; foreach ($item['children'] as $child) { - $item = array_replace($itemDefault, $item); // applique les valeurs par default if (!empty($child['separator'])) { @@ -74,7 +72,6 @@ function getNavItem($item, $deep = 0) } else { $menuChildren .= ''; } - } $active = ''; @@ -86,7 +83,6 @@ function getNavItem($item, $deep = 0) $menu .= ''; $menu .= ''; $menu .= ''; - } else { $menu .= '
  • ' . $item['name'] . '
  • '; } diff --git a/htdocs/webportal/public/tpl/menu.tpl.php b/htdocs/webportal/public/tpl/menu.tpl.php index 4eccaee7a6f..a07aebd4517 100644 --- a/htdocs/webportal/public/tpl/menu.tpl.php +++ b/htdocs/webportal/public/tpl/menu.tpl.php @@ -84,7 +84,6 @@ if ($context->userIsLog()) { 'url' => $context->getControllerUrl() . 'logout.php', 'name' => $langs->trans('Logout'), ); - } // GROUP MENU