extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 18:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

dynamically autoloading sub-object of egw-object, moved __wakeup methods to concerned classes and other "modernsations" ;-)

Browse Source
This commit is contained in:
Ralf Becker 2008-03-21 20:50:13 +00:00
parent 30ede51997
commit ac04409df7
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -134,11 +134,7 @@ class accounts_ldap
$this->ds = $this->ldap->ldapConnect($this->frontend->config['ldap_host'], $this->ds = $this->ldap->ldapConnect($this->frontend->config['ldap_host'],
$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']); $this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
if(!@is_object($GLOBALS['egw']->translation)) $this->translation = $GLOBALS['egw']->translation;
{
$GLOBALS['egw']->translation =& new translation();
}
$this->translation =& $GLOBALS['egw']->translation;
$this->user_context = $this->frontend->config['ldap_context']; $this->user_context = $this->frontend->config['ldap_context'];
$this->account_filter = $this->frontend->config['ldap_search_filter']; $this->account_filter = $this->frontend->config['ldap_search_filter'];

12
phpgwapi/inc/class.ldap.inc.php
View File

@ -14,8 +14,6 @@
/* $Id$ */ /* $Id$ */
include_once(EGW_INCLUDE_ROOT.'/phpgwapi/inc/class.ldapserverinfo.inc.php');
/*! /*!
@class contacts @class contacts
@abstract Contact List System @abstract Contact List System
@ -89,7 +87,7 @@
if(!function_exists('ldap_connect')) if(!function_exists('ldap_connect'))
{ {
/* log does not exist in setup(, yet) */ /* log does not exist in setup(, yet) */
if(is_object($GLOBALS['egw']->log)) if(isset($GLOBALS['egw']->log))
{ {
$GLOBALS['egw']->log->message('F-Abort, LDAP support unavailable'); $GLOBALS['egw']->log->message('F-Abort, LDAP support unavailable');
$GLOBALS['egw']->log->commit(); $GLOBALS['egw']->log->commit();
@ -117,7 +115,7 @@
if(!$this->ds = ldap_connect($host)) if(!$this->ds = ldap_connect($host))
{ {
/* log does not exist in setup(, yet) */ /* log does not exist in setup(, yet) */
if(is_object($GLOBALS['egw']->log)) if(isset($GLOBALS['egw']->log))
{ {
$GLOBALS['egw']->log->message('F-Abort, Failed connecting to LDAP server'); $GLOBALS['egw']->log->message('F-Abort, Failed connecting to LDAP server');
$GLOBALS['egw']->log->commit(); $GLOBALS['egw']->log->commit();
@ -209,7 +207,7 @@
} }
if(!@ldap_bind($this->ds, $dn, $passwd)) { if(!@ldap_bind($this->ds, $dn, $passwd)) {
if(is_object($GLOBALS['egw']->log)) { if(isset($GLOBALS['egw']->log)) {
$GLOBALS['egw']->log->message('F-Abort, Failed binding to LDAP server'); $GLOBALS['egw']->log->message('F-Abort, Failed binding to LDAP server');
$GLOBALS['egw']->log->commit(); $GLOBALS['egw']->log->commit();
} }
@ -237,7 +235,7 @@
*/ */
function restoreSessionData() function restoreSessionData()
{ {
if (is_object($GLOBALS['egw']->session)) // no availible in setup if (isset($GLOBALS['egw']->session)) // no availible in setup
{ {
$this->ldapServerInfo = $GLOBALS['egw']->session->appsession('ldapServerInfo'); $this->ldapServerInfo = $GLOBALS['egw']->session->appsession('ldapServerInfo');
} }
@ -247,7 +245,7 @@
*/ */
function saveSessionData() function saveSessionData()
{ {
if (is_object($GLOBALS['egw']->session)) // no availible in setup if (isset($GLOBALS['egw']->session)) // no availible in setup
{ {
$GLOBALS['egw']->session->appsession('ldapServerInfo','',$this->ldapServerInfo); $GLOBALS['egw']->session->appsession('ldapServerInfo','',$this->ldapServerInfo);
} }

2
phpgwapi/inc/class.sessions.inc.php
View File

@ -182,8 +182,6 @@
$this->egw_domains = $domain_names; $this->egw_domains = $domain_names;
/* Create the crypto object */
$GLOBALS['egw']->crypto =& CreateObject('phpgwapi.crypto');
if ($GLOBALS['egw_info']['server']['usecookies']) if ($GLOBALS['egw_info']['server']['usecookies'])
{ {
$this->egw_set_cookiedomain(); $this->egw_set_cookiedomain();