diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 9561aa288fb..36eb166f499 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -51,7 +51,14 @@ abstract class CommonDocGenerator
'myuser_firstname'=>$user->firstname,
'myuser_login'=>$user->login,
'myuser_phone'=>$user->office_phone,
- 'myuser_fax'=>$user->office_fax,
+ 'myuser_address'=>$user->address,
+ 'myuser_zip'=>$user->zip,
+ 'myuser_town'=>$user->town,
+ 'myuser_country'=>$user->country,
+ 'myuser_country_code'=>$user->country_code,
+ 'myuser_state'=>$user->state,
+ 'myuser_state_code'=>$user->state_code,
+ 'myuser_fax'=>$user->office_fax,
'myuser_mobile'=>$user->user_mobile,
'myuser_email'=>$user->email,
'myuser_web'=>'' // url not exist in $user object
@@ -190,6 +197,28 @@ abstract class CommonDocGenerator
}
+ /**
+ * Define array with couple subtitution key => subtitution value
+ *
+ * @param Translate $outputlangs Language object for output
+ * @return array Array of substitution key->code
+ */
+ function get_substitutionarray_other($outputlangs)
+ {
+ global $conf;
+
+ $now=dol_now('gmt'); // gmt
+ $array_other = array(
+ 'current_date'=>dol_print_date($now,'day','tzuser'),
+ 'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
+ 'current_server_date'=>dol_print_date($now,'day','tzserver'),
+ 'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
+ );
+
+ return $array_other;
+ }
+
+
/**
* Define array with couple substitution key => substitution value
*
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 1143372bb98..4868fb81642 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -886,21 +886,23 @@ class DoliDBMysql
$sqlfields[$i] = $field_name." ";
$sqlfields[$i] .= $field_desc['type'];
if( preg_match("/^[^\s]/i",$field_desc['value']))
- $sqlfields[$i] .= "(".$field_desc['value'].")";
- else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
- $sqlfields[$i] .= " ".$field_desc['attribute'];
- else if( preg_match("/^[^\s]/i",$field_desc['default']))
+ $sqlfields[$i] .= "(".$field_desc['value'].")";
+ if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+ $sqlfields[$i] .= " ".$field_desc['attribute'];
+ if( preg_match("/^[^\s]/i",$field_desc['default']))
{
if(preg_match("/null/i",$field_desc['default']))
- $sqlfields[$i] .= " default ".$field_desc['default'];
+ $sqlfields[$i] .= " default ".$field_desc['default'];
+ elseif ($field_desc['default'] == 'CURRENT_TIMESTAMP')
+ $sqlfields[$i] .= " default ".$field_desc['default'];
else
- $sqlfields[$i] .= " default '".$field_desc['default']."'";
+ $sqlfields[$i] .= " default '".$field_desc['default']."'";
}
- else if( preg_match("/^[^\s]/i",$field_desc['null']))
- $sqlfields[$i] .= " ".$field_desc['null'];
+ if( preg_match("/^[^\s]/i",$field_desc['null']))
+ $sqlfields[$i] .= " ".$field_desc['null'];
- else if( preg_match("/^[^\s]/i",$field_desc['extra']))
- $sqlfields[$i] .= " ".$field_desc['extra'];
+ if( preg_match("/^[^\s]/i",$field_desc['extra']))
+ $sqlfields[$i] .= " ".$field_desc['extra'];
$i++;
}
if($primary_key != "")
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 18ffe81ecdd..6faf6e90a50 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -30,12 +30,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
*
* @param DoliDB $db Database handler
* @param string $atarget Target
- * @param int $type_user 0=Internal,1=External,2=All
+ * @param int $type_user 0=Menu for backoffice, 1=Menu for front office
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array &$menu Object Menu to return back list of menu entries
+ * @param int $noout Disable output (Initialise &$menu only).
* @return void
*/
-function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
+function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0)
{
global $user,$conf,$langs,$dolibarr_main_db_name;
@@ -45,11 +46,11 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
$id='mainmenu';
$listofmodulesforexternal=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
- //$tabMenu=array();
+ // Show personalized menus
$menuArbo = new Menubase($db,'auguria');
$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'auguria',$tabMenu);
- print_start_menu_array_auguria();
+ if (empty($noout)) print_start_menu_array_auguria();
$num = count($newTabMenu);
for($i = 0; $i < $num; $i++)
@@ -59,24 +60,23 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
$showmode=dol_auguria_showmenu($type_user,$newTabMenu[$i],$listofmodulesforexternal);
if ($showmode == 1)
{
- // Define url
- if (preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
+ $url = $shorturl = $newTabMenu[$i]['url'];
+ if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
{
- $url = $newTabMenu[$i]['url'];
- }
- else
- {
- $url=dol_buildpath($newTabMenu[$i]['url'],1);
+ $param='';
if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))
{
- if (! preg_match('/\?/',$url)) $url.='?';
- else $url.='&';
- $url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
+ if (! preg_match('/\?/',$url)) $param.='?';
+ else $param.='&';
+ $param.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
}
//$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
+ $url=dol_buildpath($url,1).$param;
+ $shorturl = $newTabMenu[$i]['url'].$param;
}
$url=preg_replace('/__LOGIN__/',$user->login,$url);
-
+ $shorturl=preg_replace('/__LOGIN__/',$user->login,$shorturl);
+
// Define the class (top menu selected or not)
if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
@@ -84,12 +84,13 @@ function print_auguria_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
}
else if ($showmode == 2) $classname='class="tmenu"';
- print_start_menu_entry_auguria($idsel,$classname,$showmode);
- print_text_menu_entry_auguria($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget));
- print_end_menu_entry_auguria($showmode);
+ if (empty($noout)) print_start_menu_entry_auguria($idsel,$classname,$showmode);
+ if (empty($noout)) print_text_menu_entry_auguria($newTabMenu[$i]['titre'], $showmode, $url, $id, $idsel, $classname, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget));
+ if (empty($noout)) print_end_menu_entry_auguria($showmode);
+ $menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target']?$newTabMenu[$i]['target']:$atarget), ($newTabMenu[$i]['mainmenu']?$newTabMenu[$i]['mainmenu']:$newTabMenu[$i]['rowid']), '');
}
- print_end_menu_array_auguria();
+ if (empty($noout)) print_end_menu_array_auguria();
print "\n";
}
@@ -127,7 +128,7 @@ function print_start_menu_entry_auguria($idsel,$classname,$showmode)
* Output menu entry
*
* @param string $text Text
- * @param int $showmode 1 = allowed or 2 = not allowed
+ * @param int $showmode 0 = hide, 1 = allowed or 2 = not allowed
* @param string $url Url
* @param string $id Id
* @param string $idsel Id sel
@@ -142,7 +143,7 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
if ($showmode == 1)
{
print '';
print '';
print '';
@@ -152,7 +153,7 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
}
if ($showmode == 2)
{
- print '
';
+ print '
';
print '';
print '';
print $text;
@@ -172,8 +173,8 @@ function print_end_menu_entry_auguria($showmode)
if ($showmode)
{
print '';
- print "\n";
}
+ print "\n";
}
/**
@@ -198,20 +199,22 @@ function print_end_menu_array_auguria()
* @param array $menu_array_after Table of menu entries to show after entries of menu handler
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array &$menu Object Menu to return back list of menu entries
+ * @param int $noout Disable output (Initialise &$menu only).
+ * @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
+ * @param string $forceleftmenu 'all'=Force leftmenu to '' (= all)
* @return void
*/
-function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu)
+function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='')
{
global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
- $overwritemenufor = array();
$newmenu = $menu;
- $mainmenu=$_SESSION["mainmenu"];
- $leftmenu=$_SESSION["leftmenu"];
+ $mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
+ $leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
// Show logo company
- if (! empty($conf->global->MAIN_SHOW_LOGO))
+ if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO))
{
$mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
@@ -245,23 +248,21 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
if (! is_array($menu_array)) return 0;
// Show menu
+ if (empty($noout))
+ {
$alt=0;
$num=count($menu_array);
for ($i = 0; $i < $num; $i++)
{
+ $showmenu=true;
+ if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) $showmenu=false;
+
$alt++;
- if (empty($menu_array[$i]['level']))
+ if (empty($menu_array[$i]['level']) && $showmenu)
{
if (($alt%2==0))
{
- if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION))
- {
- print '