';
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 78439af1134..68e029dae4b 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -76,9 +76,9 @@ class Events // extends CommonObject
// List of all Audit/Security events supported by triggers
public $eventstolog=array(
- /*array('id'=>'USER_LOGIN', 'test'=>1),
+ array('id'=>'USER_LOGIN', 'test'=>1),
array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
- array('id'=>'USER_LOGOUT', 'test'=>1),*/
+ array('id'=>'USER_LOGOUT', 'test'=>1),
array('id'=>'USER_CREATE', 'test'=>1),
array('id'=>'USER_MODIFY', 'test'=>1),
array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 1b6efe56820..35b3e52d154 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -334,7 +334,7 @@ class FormProjets
$out='';
$hideunselectables = false;
- if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+ if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
if (empty($projectsListId))
{
@@ -346,11 +346,11 @@ class FormProjets
}
// Search all projects
- $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
+ $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
$sql.= ' s.nom as name';
$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
- $sql.= ', '.MAIN_DB_PREFIX.'projet_task as t';
+ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+ $sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
$sql.= " WHERE p.entity IN (".getEntity('project').")";
$sql.= " AND t.fk_projet = p.rowid";
if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
@@ -393,7 +393,7 @@ class FormProjets
}
else
{
- if ($discard_closed == 1 && $obj->fk_statut == 2)
+ if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
{
$i++;
continue;
@@ -411,12 +411,12 @@ class FormProjets
if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
$disabled=0;
- if ($obj->fk_statut == 0)
+ if ($obj->fk_statut == Project::STATUS_DRAFT)
{
$disabled=1;
$labeltoshow.=' - '.$langs->trans("Draft");
}
- else if ($obj->fk_statut == 2)
+ else if ($obj->fk_statut == Project::STATUS_CLOSED)
{
if ($discard_closed == 2) $disabled=1;
$labeltoshow.=' - '.$langs->trans("Closed");
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 7f4ab7c6d4a..86b27948389 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -589,7 +589,6 @@ class Menubase
$a = 0;
$b = 0;
- $oldrowid=0;
while ($a < $numa)
{
//$objm = $this->db->fetch_object($resql);
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 84d32725682..8b6ca6a5ca3 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -52,9 +52,44 @@ function project_prepare_head($object)
$head[$h][2] = 'contact';
$h++;
+ if (empty($conf->global->PROJECT_HIDE_TASKS))
+ {
+ // Then tab for sub level of projet, i mean tasks
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
+ $head[$h][1] = $langs->trans("Tasks");
+
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+ $taskstatic=new Task($db);
+ $nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+ if ($nbTasks > 0) $head[$h][1].= '
'.($nbTasks).'';
+ $head[$h][2] = 'tasks';
+ $h++;
+
+ $nbTimeSpent=0;
+ $sql = "SELECT t.rowid";
+ //$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+ //$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
+ $sql .= " WHERE t.fk_task = pt.rowid";
+ $sql .= " AND pt.fk_projet =".$object->id;
+ $resql = $db->query($sql);
+ if ($resql)
+ {
+ $obj = $db->fetch_object($resql);
+ if ($obj) $nbTimeSpent=1;
+ }
+ else dol_print_error($db);
+
+ $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+ $head[$h][1] = $langs->trans("TimeSpent");
+ if ($nbTimeSpent > 0) $head[$h][1].= '
...';
+ $head[$h][2] = 'timespent';
+ $h++;
+ }
+
if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
- || ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
- || ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+ || ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
+ || ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
{
$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
$head[$h][1] = $langs->trans("ProjectOverview");
@@ -92,41 +127,6 @@ function project_prepare_head($object)
$head[$h][2] = 'document';
$h++;
- if (empty($conf->global->PROJECT_HIDE_TASKS))
- {
- // Then tab for sub level of projet, i mean tasks
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
- $head[$h][1] = $langs->trans("Tasks");
-
- require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
- $taskstatic=new Task($db);
- $nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
- if ($nbTasks > 0) $head[$h][1].= '
'.($nbTasks).'';
- $head[$h][2] = 'tasks';
- $h++;
-
- $nbTimeSpent=0;
- $sql = "SELECT t.rowid";
- //$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
- //$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
- $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
- $sql .= " WHERE t.fk_task = pt.rowid";
- $sql .= " AND pt.fk_projet =".$object->id;
- $resql = $db->query($sql);
- if ($resql)
- {
- $obj = $db->fetch_object($resql);
- if ($obj) $nbTimeSpent=1;
- }
- else dol_print_error($db);
-
- $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
- $head[$h][1] = $langs->trans("TimeSpent");
- if ($nbTimeSpent > 0) $head[$h][1].= '
...';
- $head[$h][2] = 'timespent';
- $h++;
- }
-
// Manage discussion
if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
{
@@ -1205,7 +1205,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
{
continue;
}
-
+
// Break on a new project
if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
{
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2bf4671504f..ce2145d3986 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -468,6 +468,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
+ //var_dump($tabMenu);
+
$newmenu = $menu;
$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
@@ -523,7 +525,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
* We update newmenu with entries found into database
* --------------------------------------------------
*/
- if ($mainmenu)
+ if ($mainmenu) // If this is empty, loading hard coded menu and loading personalised menu will fail
{
/*
* Menu HOME
@@ -1628,6 +1630,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
}
+ //var_dump($tabMenu); //
+ //var_dump($newmenu->liste);
+
// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
//var_dump($menu_array_before);exit;
//var_dump($menu_array_after);exit;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 049956e82e2..4992fc6d11c 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -31,7 +31,7 @@ class MenuManager
* @var DoliDB Database handler.
*/
public $db;
-
+
var $type_user; // Put 0 for internal users, 1 for external users
var $atarget=""; // To store default target to use onto links
var $name="eldy";
@@ -109,6 +109,7 @@ class MenuManager
$menuArbo = new Menubase($this->db,'eldy');
$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
$this->tabMenu=$tabMenu;
+ //var_dump($tabMenu);
//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
}
@@ -116,7 +117,7 @@ class MenuManager
/**
* Show menu.
- * Module defined in sql tables are stored into this->tabMenu BEFORE this is called.
+ * Module defined in sql tables were stored into $this->tabMenu BEFORE this is called.
*
* @param string $mode 'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
* @param array $moredata An array with more data to output
@@ -126,6 +127,8 @@ class MenuManager
{
global $conf, $langs, $user;
+ //var_dump($this->tabMenu);
+
require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
if ($this->type_user == 1)
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 4d5d7e74280..b2100b806fb 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -70,7 +70,7 @@ class InterfaceLogevents extends DolibarrTriggers
$date = dol_now();
// Actions
- /*if ($action == 'USER_LOGIN')
+ if ($action == 'USER_LOGIN')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -97,7 +97,7 @@ class InterfaceLogevents extends DolibarrTriggers
// Initialisation donnees (date,duree,texte,desc)
$text="(UserLogoff,".$object->login.")";
$desc="(UserLogoff,".$object->login.")";
- }*/
+ }
if ($action == 'USER_CREATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 7cb69ee9a3f..b715ba853b7 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -623,11 +623,11 @@ if ($step == 2 && $datatoexport)
}
if (! empty($objexport->array_export_examplevalues[0][$code]))
{
- $htmltext.=$langs->trans("SourceExample").':
'.$objexport->array_export_examplevalues[0][$code].'';
+ $htmltext.='
'.$langs->trans("SourceExample").': '.$objexport->array_export_examplevalues[0][$code].'
';
}
if (! empty($objexport->array_export_TypeFields[0][$code]))
{
- $htmltext.=$langs->trans("Type").':
'.$objexport->array_export_TypeFields[0][$code].'';
+ $htmltext.='
'.$langs->trans("Type").': '.$objexport->array_export_TypeFields[0][$code].'
';
}
if (isset($array_selected[$code]) && $array_selected[$code])
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 611e84fe9c3..c7f92142381 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -21,8 +21,9 @@
* \ingroup externalsite
* \brief Page that build two frames: One for menu, the other for the target page to show
* Usage:
- * mydomain.com/externalsite/frames.php to show URL set into setup
- * mydomain.com/externalsite/frames.php?keyforcontent to show content defined into conf->global->$keyforcontent
+ * /externalsite/frames.php to show URL set into setup
+ * /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_CONTENT_abc to show html text defined into $conf->global->EXTERNAL_SITE_CONTENT_abc
+ * /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_URL_abc to show URL defined into $conf->global->EXTERNAL_SITE_URL_abc
*/
require '../main.inc.php';
@@ -56,19 +57,58 @@ if (! empty($keyforcontent))
print '
';
- if (! preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
+ if (! preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent)
+ && ! preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
{
$langs->load("errors");
- print $langs->trans("Variablekeyforcontentmustbenamed", 'EXTERNAL_SITE_CONTENT_');
+ print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_');
}
else if (empty($conf->global->$keyforcontent))
{
$langs->load("errors");
- print $langs->trans("ErrorNoContentDefinedIntoVar", $keyforcontent);
+ print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
}
else
{
- print $conf->global->$keyforcontent;
+ if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
+ {
+ print $conf->global->$keyforcontent;
+ }
+ elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
+ {
+ /*print "
+
+
+
Dolibarr frame for external web site
+
+
+
+
+
<![CDATA[
+ <body>
+ <br><div class=\"center\">
+ Sorry, your browser is too old or not correctly configured to view this area.<br>
+ Your browser must support frames.<br>
+ </div>
+ </body>
+ ]]>
+
+
+ ";*/
+ print '
';
+ }
}
print '
';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8d6e8e39b04..d580fa90809 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1844,6 +1844,7 @@ LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
WithDolTrackingID=Dolibarr Tracking ID found
WithoutDolTrackingID=Dolibarr Tracking ID not found
FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
##### Resource ####
ResourceSetup=Configuration du module Resource
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index a5555f85c82..cb183d12ce2 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -213,6 +213,8 @@ ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual prod
ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container
%s has the same name or alternative alias that the one your try to use
ErrorDuringChartLoad=Error when loading chart of account. If few accounts were not loaded, you can still enter them manually.
+ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
+ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
# Warnings
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
@@ -235,3 +237,4 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to
%s when using the mass actions on lists
WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectClosed=Project is closed. You must re-open it before.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index b2dd90608f7..c2421ac11e7 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -225,7 +225,7 @@ AllowToLinkFromOtherCompany=Allow to link project from other company
S
LatestProjects=Latest %s projects
LatestModifiedProjects=Latest %s modified projects
OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks (assign project/tasks the current user from the top select box to enter time on it)
+NoAssignedTasks=No assigned tasks found (assign project/tasks the current user from the top select box to enter time on it)
# Comments trans
AllowCommentOnTask=Allow user comments on tasks
AllowCommentOnProject=Allow user comments on projects
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 06f67a9b79f..0f2f8af452e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -500,6 +500,17 @@ if (! defined('NOLOGIN'))
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
$test=false;
+ // Call trigger for the "security events" log
+ $user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+ // Call of triggers
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++;
+ }
+ // End Call of triggers
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -568,6 +579,17 @@ if (! defined('NOLOGIN'))
// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+ // Call trigger for the "security events" log
+ $user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+ // Call of triggers
+ include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+ if ($result < 0) {
+ $error++;
+ }
+ // End Call of triggers
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -604,12 +626,25 @@ if (! defined('NOLOGIN'))
$langs->loadLangs(array('main', 'errors'));
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+ $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
}
if ($resultFetchUser < 0)
{
$_SESSION["dol_loginmesg"]=$user->error;
+
+ $user->trigger_mesg=$user->error;
}
+ // Call triggers for the "security events" log
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++;
+ }
+ // End call triggers
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -648,12 +683,25 @@ if (! defined('NOLOGIN'))
$langs->loadLangs(array('main', 'errors'));
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+
+ $user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
}
if ($resultFetchUser < 0)
{
$_SESSION["dol_loginmesg"]=$user->error;
+
+ $user->trigger_mesg=$user->error;
}
+ // Call triggers for the "security events" log
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++;
+ }
+ // End call triggers
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -741,6 +789,17 @@ if (! defined('NOLOGIN'))
$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
+ // Call triggers for the "security events" log
+ $user->trigger_mesg = $loginfo;
+ // Call triggers
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++;
+ }
+ // End call triggers
+
// Hooks on successfull login
$action='';
$hookmanager->initHooks(array('login'));
@@ -752,7 +811,7 @@ if (! defined('NOLOGIN'))
{
$db->rollback();
session_destroy();
- dol_print_error($db,'Error in some hooks afterLogin');
+ dol_print_error($db,'Error in some triggers USER_LOGIN or in some hooks afterLogin');
exit;
}
else
@@ -1015,7 +1074,7 @@ if (! function_exists("llxHeader"))
if (empty($conf->dol_hide_leftmenu))
{
- left_menu('', $help_url, '', '', 1, $title, 1);
+ left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
}
// main area
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 04605c33065..fb2399175c2 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -450,108 +450,118 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print load_fiche_titre($langs->trans("NewTask"), '', 'title_project');
- print '';
}
else if ($id > 0 || ! empty($ref))
{
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 82c722f2485..e6de0743d66 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -326,7 +326,7 @@ if ($id > 0 || ! empty($ref))
dol_fiche_end();
/*
- * Lignes de contacts
+ * Lines of contacts
*/
/*
// Contacts lines (modules that overwrite templates must declare this into descriptor)
@@ -340,16 +340,15 @@ if ($id > 0 || ! empty($ref))
/*
* Add a new contact line
- * Non affiche en mode modification de ligne
*/
print '';
if ($action != 'editline' && $user->rights->projet->creer)
{
print '';
- print '| '.$langs->trans("Source").' | ';
+ print ''.$langs->trans("Nature").' | ';
print ''.$langs->trans("ThirdParty").' | ';
- print ''.$langs->trans("TaskContact").' | ';
+ print ''.$langs->trans("Users").' | ';
print ''.$langs->trans("ContactType").' | ';
print ' | ';
print "
\n";
@@ -507,7 +506,7 @@ if ($id > 0 || ! empty($ref))
{
print ' ';
print '';
- print img_delete();
+ print img_picto($langs->trans('Unlink'), 'unlink');
print '';
}
print '';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 4afac8ac2cc..05fd488e948 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -907,8 +907,9 @@ div.fiche {
min-width: 150px;
}
.thumbstat150 {
- /* min-width: 170px; */
- width: 170px;
+ min-width: 170px;
+ max-wdith: 171px;
+ /* width: 170px; If I use with, there is trouble on size of flex boxes solved with min+max that is a little bit higer than min */
}
.thumbstat, .thumbstat150 {
browser->name == 'ie') { ?>
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 3f53a4c67dd..668ca6fa4db 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -41,13 +41,12 @@ if (!empty($_SESSION["dol_authmode"]) && ($_SESSION["dol_authmode"] == 'forceuse
global $conf, $langs, $user;
-// Appel des triggers
-// TODO @deprecated Remove this. Hook must be used, not this trigger.
-//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-//$interface=new Interfaces($db);
-//$result=$interface->run_triggers('USER_LOGOUT',$user,$user,$langs,$conf);
-//if ($result < 0) { $error++; }
-// Fin appel triggers
+// Call triggers for the "security events" log
+include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+$interface=new Interfaces($db);
+$result=$interface->run_triggers('USER_LOGOUT',$user,$user,$langs,$conf);
+if ($result < 0) { $error++; }
+// End call triggers
// Hooks on logout
$action='';