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

Fix all TODO in main and master files

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-02 16:47:58 +02:00
parent 887a40cf1d
commit edd55fc756
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/main.inc.php
View File

@ -638,16 +638,6 @@ if (! defined('NOLOGIN'))
$_SESSION["dol_loginmesg"]=$user->error; $_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 // Hooks on failed login
$action=''; $action='';
$hookmanager->initHooks(array('login')); $hookmanager->initHooks(array('login'));
@ -735,17 +725,6 @@ if (! defined('NOLOGIN'))
$loginfo = 'TZ='.$_SESSION["dol_tz"].';TZString='.$_SESSION["dol_tz_string"].';Screen='.$_SESSION["dol_screenwidth"].'x'.$_SESSION["dol_screenheight"]; $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 // Hooks on successfull login
$action=''; $action='';
$hookmanager->initHooks(array('login')); $hookmanager->initHooks(array('login'));
@ -1753,9 +1732,8 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
$bugbaseurl.= '?title='; $bugbaseurl.= '?title=';
$bugbaseurl.= urlencode("Bug: "); $bugbaseurl.= urlencode("Bug: ");
$bugbaseurl.= '&body='; $bugbaseurl.= '&body=';
// TODO use .github/ISSUE_TEMPLATE.md to generate? $bugbaseurl.= urlencode("# Bug\n");
$bugbaseurl .= urlencode("# Bug\n"); $bugbaseurl.= urlencode("\n");
$bugbaseurl .= urlencode("\n");
$bugbaseurl.= urlencode("## Environment\n"); $bugbaseurl.= urlencode("## Environment\n");
$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n"); $bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n"); $bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");

2
htdocs/master.inc.php
View File

@ -80,7 +80,7 @@ if (! empty($dolibarr_main_document_root_alt))
{ {
if (preg_match('/^http(s)?:/',$value)) 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); $correct_value = str_replace($dolibarr_main_url_root, '', $value);
print '<b>Error:</b><br>'."\n"; print '<b>Error:</b><br>'."\n";
print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n"; print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";