Merge branch 'master' into stable

2 files changed, 68 insertions, 0 deletions

diff --git a/lib/plugins/authmysql/conf/default.php b/lib/plugins/authmysql/conf/default.php
new file mode 100644
index 000000000..647f3d96c
--- /dev/null
+++ b/lib/plugins/authmysql/conf/default.php
@@ -0,0 +1,34 @@
+<?php
+
+$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
new file mode 100644
index 000000000..05d150fdf
--- /dev/null
+++ b/lib/plugins/authmysql/conf/metadata.php
@@ -0,0 +1,34 @@
+<?php
+
+$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');
+$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