From de18d159527b888a17dd3200710b72c19e2a03a6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 28 Jul 2009 12:33:53 +0000
Subject: [PATCH] Fix: bad value in eregi function
---
htdocs/core/menubase.class.php | 18 +++---------------
.../menus/barre_top/auguria_backoffice.php | 2 +-
.../menus/barre_top/auguria_frontoffice.php | 2 +-
.../menus/barre_top/eldy_backoffice.php | 2 +-
.../menus/barre_top/eldy_frontoffice.php | 2 +-
htdocs/includes/menus/barre_top/rodolphe.php | 2 +-
6 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/htdocs/core/menubase.class.php b/htdocs/core/menubase.class.php
index 4f5ceb402f4..22951118e81 100644
--- a/htdocs/core/menubase.class.php
+++ b/htdocs/core/menubase.class.php
@@ -409,15 +409,7 @@ class Menubase
$perms = $this->verifCond($menu['perms']);
//print "verifCond rowid=".$menu['rowid']." ".$menu['right'].":".$perms."<br>\n";
}
-/*
- // Define $constraint
- $constraint = true;
- if ($menu['action'])
- {
- $constraint = $this->verifCond($menu['action']);
- //print "verifCond rowid=".$menu['rowid']." ".$menu['action'].":".$constraint."<br>\n";
- }
-*/
+
// Define $enabled
$enabled = true;
if ($menu['enabled'])
@@ -432,7 +424,7 @@ class Menubase
$tabMenu[$b][0] = $menu['rowid'];
$tabMenu[$b][1] = $menu['fk_menu'];
$tabMenu[$b][2] = $menu['url'];
- if (! eregi($tabMenu[$b][2],"^(http:\/\/|https:\/\/)"))
+ if (! eregi("^(http:\/\/|https:\/\/)",$tabMenu[$b][2]))
{
if (eregi('\?',$tabMenu[$b][2])) $tabMenu[$b][2].='&idmenu='.$menu['rowid'];
else $tabMenu[$b][2].='?idmenu='.$menu['rowid'];
@@ -442,8 +434,6 @@ class Menubase
$tabMenu[$b][6] = $menu['leftmenu'];
if (! isset($tabMenu[$b][4])) $tabMenu[$b][4] = $perms;
else $tabMenu[$b][4] = ($tabMenu[$b][4] && $perms);
- //if (! isset($tabMenu[$b][7])) $tabMenu[$b][7] = $constraint;
- //else $tabMenu[$b][7] = ($tabMenu[$b][7] && $constraint);
if (! isset($tabMenu[$b][7])) $tabMenu[$b][7] = $enabled;
else $tabMenu[$b][7] = ($tabMenu[$b][7] && $enabled);
@@ -510,7 +500,7 @@ class Menubase
{
// print "x".$pere." ".$tab[$x][6];
- $this->newmenu->add((! eregi($tab[$x][2],"^(http:\/\/|https:\/\/)")) ? DOL_URL_ROOT . $tab[$x][2] : $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5]);
+ $this->newmenu->add((! eregi("^(http:\/\/|https:\/\/)",$tab[$x][2])) ? DOL_URL_ROOT . $tab[$x][2] : $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5]);
$this->recur($tab, $tab[$x][0], $rang +1);
}
}
@@ -672,8 +662,6 @@ class Menubase
$tabMenu[$b]['atarget'] = $objm->target;
if (! isset($tabMenu[$b]['right'])) $tabMenu[$b]['right'] = $perms;
else $tabMenu[$b]['right'] = ($tabMenu[$b]['right'] && $perms);
- //if (! isset($tabMenu[$b]['enabled'])) $tabMenu[$b]['enabled'] = $constraint;
- //else $tabMenu[$b]['enabled'] = ($tabMenu[$b]['enabled'] && $constraint);
if (! isset($tabMenu[$b]['enabled'])) $tabMenu[$b]['enabled'] = $enabled;
else $tabMenu[$b]['enabled'] = ($tabMenu[$b]['enabled'] && $enabled);
diff --git a/htdocs/includes/menus/barre_top/auguria_backoffice.php b/htdocs/includes/menus/barre_top/auguria_backoffice.php
index a2ec6d03847..7ece8684146 100644
--- a/htdocs/includes/menus/barre_top/auguria_backoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_backoffice.php
@@ -80,7 +80,7 @@ class MenuTop {
if ($tabMenu[$i]['right'] == true) // Is allowed
{
// Define url
- if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+ if (eregi("^(http:\/\/|https:\/\/)",$tabMenu[$i]['url']))
{
$url = $tabMenu[$i]['url'];
}
diff --git a/htdocs/includes/menus/barre_top/auguria_frontoffice.php b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
index e629c29adcc..3a55dcef942 100644
--- a/htdocs/includes/menus/barre_top/auguria_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
@@ -80,7 +80,7 @@ class MenuTop {
if ($tabMenu[$i]['right'] == true) // Is allowed
{
// Define url
- if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+ if (eregi("^(http:\/\/|https:\/\/)",$tabMenu[$i]['url']))
{
$url = $tabMenu[$i]['url'];
}
diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index 8edea1d1202..3a8982c30e5 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -416,7 +416,7 @@ class MenuTop {
$idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
if ($tabMenu[$i]['right'] == true) // Is allowed
{
- if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+ if (eregi("^(http:\/\/|https:\/\/)",$tabMenu[$i]['url']))
{
$url = $tabMenu[$i]['url'];
}
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 7342e65ed86..26dc0514208 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -415,7 +415,7 @@ class MenuTop {
$idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
if ($tabMenu[$i]['right'] == true) // Is allowed
{
- if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+ if (eregi("^(http:\/\/|https:\/\/)",$tabMenu[$i]['url']))
{
$url = $tabMenu[$i]['url'];
}
diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php
index e4ae1d36f1d..694c933c59e 100644
--- a/htdocs/includes/menus/barre_top/rodolphe.php
+++ b/htdocs/includes/menus/barre_top/rodolphe.php
@@ -358,7 +358,7 @@ class MenuTop {
$idsel=(empty($tabMenu[$i]['mainmenu'])?'id="none" ':'id="'.$tabMenu[$i]['mainmenu'].'" ');
if ($tabMenu[$i]['right'] == true)
{
- if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+ if (eregi("^(http:\/\/|https:\/\/)",$tabMenu[$i]['url']))
{
$url = $tabMenu[$i]['url'];
}
--
GitLab