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

NEW Can use an url like $conf->global>-MYPARAM for menu urls

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-23 03:22:48 +02:00
parent a94f2b07e1
commit 839f3ca41d
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/menus/standard/auguria.lib.php
View File

@ -73,6 +73,13 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$m
$showmode=dol_auguria_showmenu($type_user,$newTabMenu[$i],$listofmodulesforexternal); $showmode=dol_auguria_showmenu($type_user,$newTabMenu[$i],$listofmodulesforexternal);
if ($showmode == 1) if ($showmode == 1)
{ {
// $menu_array[$i]['url'] can be a relative url, a full external url or a dynamic value like '$conf->global->APARAM)
if (preg_match('/^\$conf->global->([^\?]+)/', $newTabMenu[$i]['url'], $reg))
{
$keyforsconst=$reg[1];
$newTabMenu[$i]['url'] = $conf->global->$keyforsconst;
}
$url = $shorturl = $newTabMenu[$i]['url']; $url = $shorturl = $newTabMenu[$i]['url'];
if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url'])) if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))

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

@ -1598,6 +1598,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
} }
} }
// $menu_array[$i]['url'] can be a relative url, a full external url or a dynamic value like '$conf->global->APARAM)
if (preg_match('/^\$conf->global->([^\?]+)/', $menu_array[$i]['url'], $reg))
{
$keyforsconst=$reg[1];
$menu_array[$i]['url'] = $conf->global->$keyforsconst;
}
$url = $shorturl = $menu_array[$i]['url']; $url = $shorturl = $menu_array[$i]['url'];
if (! preg_match("/^(http:\/\/|https:\/\/)/i",$menu_array[$i]['url'])) if (! preg_match("/^(http:\/\/|https:\/\/)/i",$menu_array[$i]['url']))

4
htdocs/theme/eldy/style.css.php
View File

@ -52,7 +52,7 @@ $colortexttitlenotab='100,60,20';
$colortexttitle='0,0,0'; $colortexttitle='0,0,0';
$colortext='0,0,0'; $colortext='0,0,0';
$colortextlink='0,0,100'; $colortextlink='0,0,100';
$fontsize='14'; $fontsize='13';
$fontsizesmaller='12'; $fontsizesmaller='12';
if (defined('THEME_ONLY_CONSTANT')) return; if (defined('THEME_ONLY_CONSTANT')) return;
@ -118,7 +118,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
$conf->global->THEME_ELDY_TEXT='0,0,0'; $conf->global->THEME_ELDY_TEXT='0,0,0';
$conf->global->THEME_ELDY_FONT_SIZE1='14'; $conf->global->THEME_ELDY_FONT_SIZE1='13';
$conf->global->THEME_ELDY_FONT_SIZE2='12'; $conf->global->THEME_ELDY_FONT_SIZE2='12';
} }

4
htdocs/theme/md/style.css.php
View File

@ -53,7 +53,7 @@ $colortexttitlenotab='90,90,90';
$colortexttitle='20,20,20'; $colortexttitle='20,20,20';
$colortext='0,0,0'; $colortext='0,0,0';
$colortextlink='0,0,120'; $colortextlink='0,0,120';
$fontsize='14'; $fontsize='13';
$fontsizesmaller='11'; $fontsizesmaller='11';
if (defined('THEME_ONLY_CONSTANT')) return; if (defined('THEME_ONLY_CONSTANT')) return;
@ -120,7 +120,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
$conf->global->THEME_ELDY_TEXT='0,0,0'; $conf->global->THEME_ELDY_TEXT='0,0,0';
$conf->global->THEME_ELDY_FONT_SIZE1='14'; $conf->global->THEME_ELDY_FONT_SIZE1='13';
$conf->global->THEME_ELDY_FONT_SIZE2='11'; $conf->global->THEME_ELDY_FONT_SIZE2='11';
} }