From 2657e46860a359adae6f3bf3bbf8d7fcaf626f31 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Nov 2012 16:31:57 +0100
Subject: authmysql fixes

* use proper plugin config
* code/PHP5 cleanup
---
 lib/plugins/authmysql/conf/default.php | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lib/plugins/authmysql/conf/default.php

(limited to 'lib/plugins/authmysql/conf')

diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
new file mode 100644
index 000000000..ea2cdad72
--- /dev/null
+++ b/lib/plugins/authmysql/conf/default.php
@@ -0,0 +1,3 @@
+<?php
+
+$conf['charset'] = 'utf8';
\ No newline at end of file
-- 
cgit v1.2.3


From 9a391616efdc0db6a96841c0a7666f3eff558dad Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 2 Feb 2013 18:13:27 +0100
Subject: added config metadata for authmysql plugin

---
 lib/plugins/authmysql/conf/metadata.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 lib/plugins/authmysql/conf/metadata.php

(limited to 'lib/plugins/authmysql/conf')

diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php
new file mode 100644
index 000000000..f63bbe481
--- /dev/null
+++ b/lib/plugins/authmysql/conf/metadata.php
@@ -0,0 +1,33 @@
+<?php
+
+$meta['server']           = array('string');
+$meta['user']             = array('string');
+$meta['password']         = array('password');
+$meta['database']         = array('string');
+$meta['debug']            = array('multichoice','_choices' => array(0,1,2));
+$meta['forwardClearPass'] = array('onoff');
+$meta['TablesToLock']     = array('array');
+$meta['checkPass']        = array('');
+$meta['getUserInfo']      = array('');
+$meta['getGroups']        = array('');
+$meta['getUsers']         = array('');
+$meta['FilterLogin']      = array('string');
+$meta['FilterName']       = array('string');
+$meta['FilterEmail']      = array('string');
+$meta['FilterGroup']      = array('string');
+$meta['SortOrder']        = array('string');
+$meta['addUser']          = array('');
+$meta['addGroup']         = array('');
+$meta['addUserGroup']     = array('');
+$meta['delGroup']         = array('');
+$meta['getUserID']        = array('');
+$meta['delUser']          = array('');
+$meta['delUserRefs']      = array('');
+$meta['updateUser']       = array('string');
+$meta['UpdateLogin']      = array('string');
+$meta['UpdatePass']       = array('string');
+$meta['UpdateEmail']      = array('string');
+$meta['UpdateName']       = array('string');
+$meta['UpdateTarget']     = array('string');
+$meta['delUserGroup']     = array('');
+$meta['getGroupID']       = array('');
\ No newline at end of file
-- 
cgit v1.2.3


From 45970804e69e3d087fe19ad9cefaff0ef44be795 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Sat, 16 Feb 2013 22:53:38 +0100
Subject: Complete metadata and defaults of auth plugin configs

---
 lib/plugins/authmysql/conf/default.php  | 33 ++++++++++++++++++++++++++++++++-
 lib/plugins/authmysql/conf/metadata.php |  1 +
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/authmysql/conf')

diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
index ea2cdad72..4add3f57c 100644
--- a/lib/plugins/authmysql/conf/default.php
+++ b/lib/plugins/authmysql/conf/default.php
@@ -1,3 +1,34 @@
 <?php
 
-$conf['charset'] = 'utf8';
\ No newline at end of file
+$conf['charset']          = 'utf8';
+$conf['server']           = '';
+$conf['user']             ='';
+$conf['password']         = '';
+$conf['database']         = '';
+$conf['debug']            = 0;
+$conf['forwardClearPass'] = 0;
+$conf['TablesToLock']     = '';
+$conf['checkPass']        = '';
+$conf['getUserInfo']      = '';
+$conf['getGroups']        = '';
+$conf['getUsers']         = '';
+$conf['FilterLogin']      = '';
+$conf['FilterName']       = '';
+$conf['FilterEmail']      = '';
+$conf['FilterGroup']      = '';
+$conf['SortOrder']        = '';
+$conf['addUser']          = '';
+$conf['addGroup']         = '';
+$conf['addUserGroup']     = '';
+$conf['delGroup']         = '';
+$conf['getUserID']        = '';
+$conf['delUser']          = '';
+$conf['delUserRefs']      = '';
+$conf['updateUser']       = '';
+$conf['UpdateLogin']      = '';
+$conf['UpdatePass']       = '';
+$conf['UpdateEmail']      = '';
+$conf['UpdateName']       = '';
+$conf['UpdateTarget']     = '';
+$conf['delUserGroup']     = '';
+$conf['getGroupID']       = '';
\ No newline at end of file
diff --git a/lib/plugins/authmysql/conf/metadata.php b/lib/plugins/authmysql/conf/metadata.php
index f63bbe481..05d150fdf 100644
--- a/lib/plugins/authmysql/conf/metadata.php
+++ b/lib/plugins/authmysql/conf/metadata.php
@@ -4,6 +4,7 @@ $meta['server']           = array('string');
 $meta['user']             = array('string');
 $meta['password']         = array('password');
 $meta['database']         = array('string');
+$meta['charset']          = array('string');
 $meta['debug']            = array('multichoice','_choices' => array(0,1,2));
 $meta['forwardClearPass'] = array('onoff');
 $meta['TablesToLock']     = array('array');
-- 
cgit v1.2.3


From 5ebd6fd9156e1bc9b63132f3ec5989856e5a45a1 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Sat, 16 Feb 2013 23:55:52 +0100
Subject: litte fixes

---
 lib/plugins/authmysql/conf/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authmysql/conf')

diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
index 4add3f57c..647f3d96c 100644
--- a/lib/plugins/authmysql/conf/default.php
+++ b/lib/plugins/authmysql/conf/default.php
@@ -2,7 +2,7 @@
 
 $conf['charset']          = 'utf8';
 $conf['server']           = '';
-$conf['user']             ='';
+$conf['user']             = '';
 $conf['password']         = '';
 $conf['database']         = '';
 $conf['debug']            = 0;
-- 
cgit v1.2.3


From 6b519690e45cefe83fbef5691e372c6078c3fb9b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 27 May 2013 16:26:40 +0100
Subject: fixed broken default config options (FS#2789)

---
 lib/plugins/authmysql/conf/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/authmysql/conf')

diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
index 647f3d96c..427bea273 100644
--- a/lib/plugins/authmysql/conf/default.php
+++ b/lib/plugins/authmysql/conf/default.php
@@ -7,7 +7,7 @@ $conf['password']         = '';
 $conf['database']         = '';
 $conf['debug']            = 0;
 $conf['forwardClearPass'] = 0;
-$conf['TablesToLock']     = '';
+$conf['TablesToLock']     = array();
 $conf['checkPass']        = '';
 $conf['getUserInfo']      = '';
 $conf['getGroups']        = '';
-- 
cgit v1.2.3