R55282 - in /trunk: egroupware/api/src/ egroupware/api/src/Accounts/ egroupware/api/src/Auth/ egroupware/api/src/Contacts/ e

[ralfbecker_sf]

Author: ralfbecker
New Revision: 55282

URL: http://svn.stylite.de/viewvc/egroupware?rev=55282&view=rev
Log:
move auth classes to Api\Auth, only Sql is currently tested!

Added:
trunk/egroupware/api/src/Auth/
trunk/egroupware/api/src/Auth.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth.inc.php
trunk/egroupware/api/src/Auth/Ads.php
- copied, changed from r55280, trunk/phpgwapi/inc/class.auth_ads.inc.php
trunk/egroupware/api/src/Auth/Backend.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth.inc.php
trunk/egroupware/api/src/Auth/Cas.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_cas.inc.php
trunk/egroupware/api/src/Auth/Fallback.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_fallback.inc.php
trunk/egroupware/api/src/Auth/Fallbackmail2sql.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_fallbackmail2sql.inc.php
trunk/egroupware/api/src/Auth/Http.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_http.inc.php
trunk/egroupware/api/src/Auth/Ldap.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_ldap.inc.php
trunk/egroupware/api/src/Auth/Mail.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_mail.inc.php
trunk/egroupware/api/src/Auth/Nis.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_nis.inc.php
trunk/egroupware/api/src/Auth/Pam.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_pam.inc.php
trunk/egroupware/api/src/Auth/Sql.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_sql.inc.php
trunk/egroupware/api/src/Auth/Sqlssl.php
- copied, changed from r55263, trunk/phpgwapi/inc/class.auth_sqlssl.inc.php
Removed:
trunk/phpgwapi/inc/class.auth_ads.inc.php
trunk/phpgwapi/inc/class.auth_cas.inc.php
trunk/phpgwapi/inc/class.auth_fallback.inc.php
trunk/phpgwapi/inc/class.auth_fallbackmail2sql.inc.php
trunk/phpgwapi/inc/class.auth_http.inc.php
trunk/phpgwapi/inc/class.auth_ldap.inc.php
trunk/phpgwapi/inc/class.auth_mail.inc.php
trunk/phpgwapi/inc/class.auth_nis.inc.php
trunk/phpgwapi/inc/class.auth_pam.inc.php
trunk/phpgwapi/inc/class.auth_sql.inc.php
trunk/phpgwapi/inc/class.auth_sqlssl.inc.php
Modified:
trunk/egroupware/api/src/Accounts/Ldap.php
trunk/egroupware/api/src/Contacts/Ldap.php
trunk/egroupware/api/src/Csrf.php
trunk/egroupware/api/src/Ldap.php
trunk/egroupware/api/src/Session.php
trunk/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
trunk/phpgwapi/inc/class.auth.inc.php
trunk/phpgwapi/inc/class.common.inc.php
trunk/phpgwapi/inc/class.egw.inc.php
trunk/setup/inc/class.setup_cmd_ldap.inc.php

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

— trunk/egroupware/api/src/Accounts/Ldap.php (original)
+++ trunk/egroupware/api/src/Accounts/Ldap.php Sun Mar 6 21:47:10 2016
@@ -158,8 +158,7 @@
// enable the caching in the session, done by the accounts class extending this class.
$this->use_session_cache = true;

•   $this->ldap = new Api\Ldap(true);
  

•   $this->ds = $this->ldap->ldapConnect($this->frontend->config['ldap_host'],
  

•   $this->ds = Api\Ldap::factory(true, $this->frontend->config['ldap_host'],
    	$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
  
    $this->user_context  = $this->frontend->config['ldap_context'];
  

@@ -1207,7 +1206,7 @@
*/
function __wakeup()
{

•   $this->ds = $this->ldap->ldapConnect($this->frontend->config['ldap_host'],
  

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

  }
  }

Copied: trunk/egroupware/api/src/Auth.php (from r55263, trunk/phpgwapi/inc/class.auth.inc.php)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Auth.php?p2=trunk/egroupware/api/src/Auth.php&p1=trunk/phpgwapi/inc/class.auth.inc.php&r1=55263&r2=55282&rev=55282&view=diff

— trunk/phpgwapi/inc/class.auth.inc.php (original)
+++ trunk/egroupware/api/src/Auth.php Sun Mar 6 21:47:10 2016
@@ -1,6 +1,6 @@

<?php /** - * eGroupWare API - Authentication baseclass + * EGroupware API - Authentication * * @link http://www.egroupware.org * @author Ralf Becker @@ -8,9 +8,14 @@