R55299 - in /trunk: egroupware/api/src/ egroupware/api/src/Accounts/ egroupware/api/src/Contacts/ phpgwapi/inc/

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55299

URL: http://svn.stylite.de/viewvc/egroupware?rev=55299&view=rev
Log:
fixes and first successful tests with Ldap backend

Modified:
trunk/egroupware/api/src/Accounts/Ads.php
trunk/egroupware/api/src/Accounts/Ldap.php
trunk/egroupware/api/src/Accounts/Univention.php
trunk/egroupware/api/src/Contacts/Ldap.php
trunk/egroupware/api/src/Ldap.php
trunk/phpgwapi/inc/class.common.inc.php
trunk/phpgwapi/inc/class.egw.inc.php

Modified: trunk/egroupware/api/src/Accounts/Ads.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Accounts/Ads.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/egroupware/api/src/Accounts/Ads.php (original)
+++ trunk/egroupware/api/src/Accounts/Ads.php Tue Mar 8 09:13:26 2016
@@ -54,7 +54,7 @@
/**
* Reference to our frontend
*

• • @var accounts

• • @var Api\Accounts
    */
    protected $frontend;

@@ -116,10 +116,10 @@
/**
* Constructor
*

• • @param accounts $frontend reference to the frontend class, to be able to call it’s methods if needed

• • @param Api\Accounts $frontend reference to the frontend class, to be able to call it’s methods if needed
  • @throws adLDAPException
    */

• function __construct(accounts $frontend)

• function __construct(Api\Accounts $frontend)
  {
  $this->frontend = $frontend;

Modified: trunk/egroupware/api/src/Accounts/Ldap.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Accounts/Ldap.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/egroupware/api/src/Accounts/Ldap.php (original)
+++ trunk/egroupware/api/src/Accounts/Ldap.php Tue Mar 8 09:13:26 2016
@@ -124,14 +124,14 @@
/**
* Reference to our frontend
*

• • @var accounts

• • @var Api\Accounts
    */
    private $frontend;

/**
 * Instance of the ldap class
 *

• • @var ldap

• • @var Api\Ldap
    */
    private $ldap;

@@ -148,17 +148,18 @@
/**
* Constructor
*

• • @param accounts $frontend reference to the frontend class, to be able to call it’s methods if needed
• */
• function __construct(accounts $frontend)

• • @param Api\Accounts $frontend reference to the frontend class, to be able to call it’s methods if needed

• */

• function __construct(Api\Accounts $frontend)
  {
  $this->frontend = $frontend;

  // enable the caching in the session, done by the accounts class extending this class.
  $this->use_session_cache = true;
  

•   $this->ds = Api\Ldap::factory(true, $this->frontend->config['ldap_host'],
  

•   $this->ldap = Api\Ldap::factory(false, $this->frontend->config['ldap_host'],
    	$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
  

•   $this->ds = $this->ldap->ds;
  
    $this->user_context  = $this->frontend->config['ldap_context'];
    $this->account_filter = $this->frontend->config['ldap_search_filter'];
  

Modified: trunk/egroupware/api/src/Accounts/Univention.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Accounts/Univention.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/egroupware/api/src/Accounts/Univention.php (original)
+++ trunk/egroupware/api/src/Accounts/Univention.php Tue Mar 8 09:13:26 2016
@@ -12,6 +12,8 @@
*/

namespace EGroupware\Api\Accounts;
+
+use EGroupware\Api;

// explicitly reference classes still in phpgwapi
use emailadmin_account;

Modified: trunk/egroupware/api/src/Contacts/Ldap.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Contacts/Ldap.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/egroupware/api/src/Contacts/Ldap.php (original)
+++ trunk/egroupware/api/src/Contacts/Ldap.php Tue Mar 8 09:13:26 2016
@@ -20,7 +20,7 @@

• LDAP Backend for contacts, compatible with vars and parameters of eTemplate’s so_sql.
• Maybe one day this becomes a generalized ldap storage object

• • All values used to construct filters need to run through ldap::quote(),

• • All values used to construct filters need to run through Api\Ldap::quote(),
  • to be save against LDAP query injection!!!
    */
    class Ldap
    @@ -375,7 +375,7 @@
    */
    protected function id_filter($id)
    {

•   return '(|(entryUUID='.ldap::quote($id).')(uid='.ldap::quote($id).'))';
  

•   return '(|(entryUUID='.Api\Ldap::quote($id).')(uid='.Api\Ldap::quote($id).'))';
  

  }

  /**

Modified: trunk/egroupware/api/src/Ldap.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Ldap.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/egroupware/api/src/Ldap.php (original)
+++ trunk/egroupware/api/src/Ldap.php Tue Mar 8 09:13:26 2016
@@ -294,7 +294,7 @@
{
if (isset($GLOBALS[‘egw’]->session)) // no availible in setup
{

•   	Cache::getSession(__CLASS__, 'ldapServerInfo', $this->ldapserverinfo);
  

•   	Cache::setSession(__CLASS__, 'ldapServerInfo', $this->ldapserverinfo);
    }
  

  }
  }

Modified: trunk/phpgwapi/inc/class.common.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.common.inc.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/phpgwapi/inc/class.common.inc.php (original)
+++ trunk/phpgwapi/inc/class.common.inc.php Tue Mar 8 09:13:26 2016
@@ -755,7 +755,7 @@
*
* @deprecated use Api\Image::invalidate()
*/

• public static function delete_map()

• public static function delete_image_map()
  {
  return Api\Image::invalidate();
  }

Modified: trunk/phpgwapi/inc/class.egw.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw.inc.php?rev=55299&r1=55298&r2=55299&view=diff

— trunk/phpgwapi/inc/class.egw.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw.inc.php Tue Mar 8 09:13:26 2016
@@ -667,8 +667,8 @@
‘datetime’ => ‘egw_datetime’,
‘framework’ => true, // special handling in __get()
‘template’ => ‘Template’,

•   'session' => 'egw_session',	// otherwise $GLOBALS['egw']->session->appsession() fails
    // classes moved to new api dir
  

•   'session' => 'EGroupware\\Api\\Session',
    'ldap' => true,
    'auth' => 'EGroupware\\Api\\Auth',
  

  );

---

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://makebettercode.com/inteldaal-eval

---

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs