diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4a385fdc6cb20..ce157beff0da3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -638,16 +638,6 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
$_SESSION["dol_loginmesg"]=$user->error;
}
- // TODO @deprecated Remove this. Hook must be used, not this trigger.
- // Call 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 triggers
-
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -735,17 +725,6 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"];
- // TODO @deprecated Remove this. Hook must be used, not this trigger.
- $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'));
@@ -1753,9 +1732,8 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
$bugbaseurl.= '?title=';
$bugbaseurl.= urlencode("Bug: ");
$bugbaseurl.= '&body=';
- // TODO use .github/ISSUE_TEMPLATE.md to generate?
- $bugbaseurl .= urlencode("# Bug\n");
- $bugbaseurl .= urlencode("\n");
+ $bugbaseurl.= urlencode("# Bug\n");
+ $bugbaseurl.= urlencode("\n");
$bugbaseurl.= urlencode("## Environment\n");
$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 52c4c9780c7c2..56ff709da8a78 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -80,7 +80,7 @@
{
if (preg_match('/^http(s)?:/',$value))
{
- // TODO: Make this a warning rather than an error since the correct value can be derived in most cases
+ // Show error message
$correct_value = str_replace($dolibarr_main_url_root, '', $value);
print 'Error:
'."\n";
print 'Wrong $dolibarr_main_url_root_alt value in conf.php file.
'."\n";