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

Qual: Clean code: Removed code of external modules

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-01 23:22:10 +01:00
parent 4c95c486f6
commit 2bffe2a174
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -433,7 +433,7 @@ class Adherent extends CommonObject
{ {
$nbrowsaffected+=$this->db->affected_rows($resql); $nbrowsaffected+=$this->db->affected_rows($resql);
// Actions on extra fields (by external module or standard code) // Actions on extra fields (by external module)
include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'); include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($this->db); $hookmanager=new HookManager($this->db);
$hookmanager->callHooks(array('memberdao')); $hookmanager->callHooks(array('memberdao'));

38
htdocs/main.inc.php
View File

@ -516,7 +516,7 @@ if (! defined('NOLOGIN'))
} }
// Is it a new session that has started ? // Is it a new session that has started ?
// If we are here this means authentication was successfull. // If we are here, this means authentication was successfull.
if (! isset($_SESSION["dol_login"])) if (! isset($_SESSION["dol_login"]))
{ {
$error=0; $error=0;
@ -576,34 +576,14 @@ if (! defined('NOLOGIN'))
$entityCookie->_setCookie($entityCookieName, $entity, $ttl); $entityCookie->_setCookie($entityCookieName, $entity, $ttl);
} }
// Module webcalendar // Hooks on successfull login
if (! empty($conf->webcalendar->enabled) && $user->webcal_login != "") $action='';
{ include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$domain=''; $hookmanager=new HookManager($db);
$hookmanager->callHooks(array('login'));
// Creation of a cookie to save login $parameters=array('dol_authmode'=>$dol_authmode);
$cookiename='webcalendar_login'; $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action); // Note that $action and $object may have been modified by some hooks
if (! isset($_COOKIE[$cookiename])) if ($reshook < 0) $error++;
{
setcookie($cookiename, $user->webcal_login, 0, "/", $domain, 0);
}
// Creation of a cookie to save session
$cookiename='webcalendar_session';
if (! isset($_COOKIE[$cookiename]))
{
setcookie($cookiename, 'TODO', 0, "/", $domain, 0);
}
}
// Module Phenix
if (! empty($conf->phenix->enabled) && $user->phenix_login != "" && $conf->phenix->cookie)
{
// Creation du cookie permettant la connexion automatique, valide jusqu'a la fermeture du browser
if (!isset($_COOKIE[$conf->phenix->cookie]))
{
setcookie($conf->phenix->cookie, $user->phenix_login.":".$user->phenix_pass_crypted.":1", 0, "/", "", 0);
}
}
} }