From 350afe2d27b5dd25ed51021fc9ceba9d65aa8b74 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 9 Jan 2014 21:45:52 +0100
Subject: [PATCH] Fix code according to blizzz' notes

---
 appinfo/app.php      | 2 +-
 appinfo/database.xml | 6 +++---
 lib/base.php         | 6 ++++--
 lib/ftp.php          | 2 +-
 lib/imap.php         | 2 +-
 lib/smb.php          | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/appinfo/app.php b/appinfo/app.php
index de6bb40..63387ed 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -1,5 +1,5 @@
 <?php
-OC::$CLASSPATH['OC_User_External_Base']='user_external/lib/base.php';
+OC::$CLASSPATH['OCA\user_external\Base']='user_external/lib/base.php';
 OC::$CLASSPATH['OC_User_IMAP']='user_external/lib/imap.php';
 OC::$CLASSPATH['OC_User_SMB']='user_external/lib/smb.php';
 OC::$CLASSPATH['OC_User_FTP']='user_external/lib/ftp.php';
diff --git a/appinfo/database.xml b/appinfo/database.xml
index 0c97b82..9c4059c 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -17,15 +17,15 @@
     <name>backend</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
+    <notnull>false</notnull>
+    <length>128</length>
    </field>
 
    <field>
     <name>uid</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
+    <notnull>false</notnull>
     <length>64</length>
    </field>
 
diff --git a/lib/base.php b/lib/base.php
index a8eb15b..f7a463a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -1,10 +1,12 @@
 <?php
+namespace OCA\user_external;
 /**
- * Copyright (c) 2013 Christian Weiske <cweiske@cweiske.de>
+ * Copyright (c) 2014 Christian Weiske <cweiske@cweiske.de>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
  */
+use \OC_DB;
 
 /**
  * Base class for external auth implementations that stores users
@@ -12,7 +14,7 @@
  * This is required for making many of the user-related owncloud functions
  * work, including sharing files with them.
  */
-abstract class OC_User_External_Base extends OC_User_Backend{
+abstract class Base extends \OC_User_Backend{
 	protected $backend = '';
 
 	public function __construct($backend) {
diff --git a/lib/ftp.php b/lib/ftp.php
index 35d9aa4..545d1e2 100644
--- a/lib/ftp.php
+++ b/lib/ftp.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class OC_User_FTP extends OC_User_External_Base{
+class OC_User_FTP extends \OCA\user_external\Base{
 	private $host;
 	private $secure;
 	private $protocol;
diff --git a/lib/imap.php b/lib/imap.php
index 6a6fe23..5168d3d 100644
--- a/lib/imap.php
+++ b/lib/imap.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class OC_User_IMAP extends OC_User_External_Base {
+class OC_User_IMAP extends \OCA\user_external\Base {
 	private $mailbox;
 
 	public function __construct($mailbox) {
diff --git a/lib/smb.php b/lib/smb.php
index d2bd5af..3f26177 100644
--- a/lib/smb.php
+++ b/lib/smb.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class OC_User_SMB extends OC_User_Backend{
+class OC_User_SMB extends \OCA\user_external\Base{
 	private $host;
 
 	const smbclient='smbclient';