[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kabc/plugins/ldapkio
From:       Szombathelyi György <gyurco () freemail ! hu>
Date:       2006-09-22 20:16:46
Message-ID: 1158956206.264278.4868.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587447 by gyurco:

Ldap functions -> KLDAP


 M  +7 -6      resourceldapkio.cpp  
 M  +31 -31    resourceldapkioconfig.cpp  
 M  +3 -3      resourceldapkioconfig.h  


--- trunk/KDE/kdepimlibs/kabc/plugins/ldapkio/resourceldapkio.cpp #587446:587447
@@ -36,7 +36,8 @@
 #include <kio/netaccess.h>
 
 #include "kldap/ldif.h"
-#include "kabc/ldapurl.h"
+#include "kldap/ldif.h"
+#include "kldap/ldapurl.h"
 
 #include "resourceldapkio.h"
 #include "resourceldapkioconfig.h"
@@ -55,7 +56,7 @@
     bool mSASL;
     QString mMech;
     QString mRealm, mBindDN;
-    LDAPUrl mLDAPUrl;
+    KLDAP::LdapUrl mLDAPUrl;
     int mVer, mSizeLimit, mTimeLimit, mRDNPrefix;
     int mError;
     int mCachePolicy;
@@ -152,7 +153,7 @@
 
 QString ResourceLDAPKIO::findUid( const QString &uid )
 {
-  LDAPUrl url( d->mLDAPUrl );
+  KLDAP::LdapUrl url( d->mLDAPUrl );
   KIO::UDSEntry entry;
 
   mErrorMsg = d->mResultDn = "";
@@ -388,7 +389,7 @@
     d->mLDAPUrl.setAttributes( attr );
   }
 
-  d->mLDAPUrl.setScope( d->mSubTree ? LDAPUrl::Sub : LDAPUrl::One );
+  d->mLDAPUrl.setScope( d->mSubTree ? KLDAP::LdapUrl::Sub : KLDAP::LdapUrl::One );
   if ( !mFilter.isEmpty() && mFilter != "(objectClass=*)" )
     d->mLDAPUrl.setFilter( mFilter );
   d->mLDAPUrl.setExtension( "x-dir", "base" );
@@ -804,10 +805,10 @@
   }
   if ( !dn.isEmpty() ) {
     kDebug(7125) << "ResourceLDAPKIO: found uid: " << dn << endl;
-    LDAPUrl url( d->mLDAPUrl );
+    KLDAP::LdapUrl url( d->mLDAPUrl );
     url.setPath( '/' + dn );
     url.setExtension( "x-dir", "base" );
-    url.setScope( LDAPUrl::Base );
+    url.setScope( KLDAP::LdapUrl::Base );
     if ( KIO::NetAccess::del( url, NULL ) ) mAddrMap.remove( addr.uid() );
   } else {
     //maybe it's not saved yet
--- trunk/KDE/kdepimlibs/kabc/plugins/ldapkio/resourceldapkioconfig.cpp #587446:587447
@@ -45,20 +45,20 @@
     : KRES::ConfigWidget( parent )
 {
   QBoxLayout *mainLayout = new QVBoxLayout( this );
-  cfg = new LdapConfigWidget(
-        LdapConfigWidget::W_USER |
-        LdapConfigWidget::W_PASS |
-        LdapConfigWidget::W_BINDDN |
-        LdapConfigWidget::W_REALM |
-        LdapConfigWidget::W_HOST |
-        LdapConfigWidget::W_PORT |
-        LdapConfigWidget::W_VER |
-        LdapConfigWidget::W_DN |
-        LdapConfigWidget::W_FILTER |
-        LdapConfigWidget::W_SECBOX |
-        LdapConfigWidget::W_AUTHBOX |
-        LdapConfigWidget::W_TIMELIMIT |
-        LdapConfigWidget::W_SIZELIMIT,
+  cfg = new KLDAP::LdapConfigWidget(
+        KLDAP::LdapConfigWidget::W_USER |
+        KLDAP::LdapConfigWidget::W_PASS |
+        KLDAP::LdapConfigWidget::W_BINDDN |
+        KLDAP::LdapConfigWidget::W_REALM |
+        KLDAP::LdapConfigWidget::W_HOST |
+        KLDAP::LdapConfigWidget::W_PORT |
+        KLDAP::LdapConfigWidget::W_VER |
+        KLDAP::LdapConfigWidget::W_DN |
+        KLDAP::LdapConfigWidget::W_FILTER |
+        KLDAP::LdapConfigWidget::W_SECBOX |
+        KLDAP::LdapConfigWidget::W_AUTHBOX |
+        KLDAP::LdapConfigWidget::W_TIMELIMIT |
+        KLDAP::LdapConfigWidget::W_SIZELIMIT,
         this );
 
   mSubTree = new QCheckBox( i18n( "Sub-tree query" ), this );
@@ -87,21 +87,21 @@
   cfg->setUser( resource->user() );
   cfg->setPassword( resource->password() );
   cfg->setRealm( resource->realm() );
-  cfg->setBindDN( resource->bindDN() );
+  cfg->setBindDn( resource->bindDN() );
   cfg->setHost( resource->host() );
-  cfg->setPort(  resource->port() );
-  cfg->setVer(  resource->ver() );
+  cfg->setPort( resource->port() );
+  cfg->setVersion( resource->ver() );
   cfg->setTimeLimit( resource->timeLimit() );
   cfg->setSizeLimit( resource->sizeLimit() );
   cfg->setDn( resource->dn() );
   cfg->setFilter( resource->filter() );
   cfg->setMech( resource->mech() );
-  if ( resource->isTLS() ) cfg->setSecTLS();
-  else if ( resource->isSSL() ) cfg->setSecSSL();
-  else cfg->setSecNO();
-  if ( resource->isAnonymous() ) cfg->setAuthAnon();
-  else if ( resource->isSASL() ) cfg->setAuthSASL();
-  else cfg->setAuthSimple();
+  if ( resource->isTLS() ) cfg->setSecurity( KLDAP::LdapConfigWidget::TLS );
+  else if ( resource->isSSL() ) cfg->setSecurity( KLDAP::LdapConfigWidget::SSL );
+  else cfg->setSecurity( KLDAP::LdapConfigWidget::None );
+  if ( resource->isAnonymous() ) cfg->setAuth( KLDAP::LdapConfigWidget::Anonymous );
+  else if ( resource->isSASL() ) cfg->setAuth( KLDAP::LdapConfigWidget::SASL );
+  else cfg->setAuth( KLDAP::LdapConfigWidget::Simple );
 
   mSubTree->setChecked( resource->isSubTree() );
   mAttributes = resource->attributes();
@@ -123,19 +123,19 @@
   resource->setUser( cfg->user() );
   resource->setPassword( cfg->password() );
   resource->setRealm( cfg->realm() );
-  resource->setBindDN( cfg->bindDN() );
+  resource->setBindDN( cfg->bindDn() );
   resource->setHost( cfg->host() );
   resource->setPort( cfg->port() );
-  resource->setVer( cfg->ver() );
+  resource->setVer( cfg->version() );
   resource->setTimeLimit( cfg->timeLimit() );
   resource->setSizeLimit( cfg->sizeLimit() );
   resource->setDn( cfg->dn() );
   resource->setFilter( cfg->filter() );
-  resource->setIsAnonymous( cfg->isAuthAnon() );
-  resource->setIsSASL( cfg->isAuthSASL() );
+  resource->setIsAnonymous( cfg->auth() == KLDAP::LdapConfigWidget::Anonymous );
+  resource->setIsSASL(  cfg->auth() == KLDAP::LdapConfigWidget::SASL );
   resource->setMech( cfg->mech() );
-  resource->setIsTLS( cfg->isSecTLS() );
-  resource->setIsSSL( cfg->isSecSSL() );
+  resource->setIsTLS( cfg->security() == KLDAP::LdapConfigWidget::TLS );
+  resource->setIsSSL( cfg->security() == KLDAP::LdapConfigWidget::SSL );
   resource->setIsSubTree( mSubTree->isChecked() );
   resource->setAttributes( mAttributes );
   resource->setRDNPrefix( mRDNPrefix );
@@ -155,11 +155,11 @@
 
 void ResourceLDAPKIOConfig::editCache()
 {
-  LDAPUrl src;
+  KLDAP::LdapUrl src;
   QStringList attr;
 
   src = cfg->url();
-  src.setScope( mSubTree->isChecked() ? LDAPUrl::Sub : LDAPUrl::One );
+  src.setScope( mSubTree->isChecked() ? KLDAP::LdapUrl::Sub : KLDAP::LdapUrl::One );
   if (!mAttributes.empty()) {
     QMap<QString,QString>::Iterator it;
     QStringList attr;
--- trunk/KDE/kdepimlibs/kabc/plugins/ldapkio/resourceldapkioconfig.h #587446:587447
@@ -30,8 +30,8 @@
 #include <kdialog.h>
 
 #include "kresources/configwidget.h"
-#include "kabc/ldapconfigwidget.h"
-#include "kabc/ldif.h"
+#include "kldap/ldapconfigwidget.h"
+#include "kldap/ldif.h"
 
 class QCheckBox;
 class QPushButton;
@@ -59,7 +59,7 @@
     void editCache();
   private:
     QPushButton *mEditButton, *mCacheButton;
-    LdapConfigWidget *cfg;
+    KLDAP::LdapConfigWidget *cfg;
     QCheckBox *mSubTree;
     QMap<QString, QString> mAttributes;
     int mRDNPrefix, mCachePolicy;
[prev in list] [next in list] [prev in thread] [next in thread]