diff --git a/.hg_archival.txt b/.hg_archival.txt deleted file mode 100644 index 8255758..0000000 --- a/.hg_archival.txt +++ /dev/null @@ -1,4 +0,0 @@ -repo: 3f045a88dd7014290a9bf60cbd740c8548dba967 -node: 77b8809852f4a8599200c9a538f94319ca5a4ff4 -branch: default -tag: v.2.3.1 diff --git a/.hgignore b/.hgignore deleted file mode 100644 index 4f0682f..0000000 --- a/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -.project -.settings diff --git a/.hgtags b/.hgtags deleted file mode 100644 index a55e874..0000000 --- a/.hgtags +++ /dev/null @@ -1,14 +0,0 @@ -8401b998f40be1e93d05b5c4db61ba98932c3de3 v0.2 -c74b035788ebbcade6bfae22963632f4c5f49540 v0.3 -5ee6481afb63f32dcfeaf93a72c07c4bc2a1a993 v0.4 -5ee6481afb63f32dcfeaf93a72c07c4bc2a1a993 v0.4 -f9eb8e6e4b4f2bcb521554bc513cc94d9ccf6fbd v0.4 -df3dc7358b79abdd7075ba78b58fff1da7fa3fde to -df3dc7358b79abdd7075ba78b58fff1da7fa3fde 0.5 -df3dc7358b79abdd7075ba78b58fff1da7fa3fde to -0000000000000000000000000000000000000000 to -df3dc7358b79abdd7075ba78b58fff1da7fa3fde 0.5 -0000000000000000000000000000000000000000 0.5 -845b75d72ec18f3fbf2a74f1a1ec3cf54ca4a304 v0.7 -599b774a4b6ac81b44971ac1a319fc41c04e3589 v2.3 -1fedd27cb5d8c69a998c8278463c8e8abd1f371a v2.3.0 diff --git a/README.md b/README.md index dac088c..710eed8 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ user_sql ======== -Owncloud/Nextcloud SQL authentification +Owncloud/Nextcloud SQL authentication -This is plugin is heavily based on user_imap, user_pwauth, user_ldap and user_redmine! +This repository contains continuation of work done in [this repo](https://www.aboehler.at/hg/user_sql/). + +This plugin is heavily based on user_imap, user_pwauth, user_ldap and user_redmine! Enable it in your Admin -> Apps section and configure your server's details. Currently, it supports most of postfixadmin's encryption options, except dovecot and saslauthd. @@ -20,5 +22,6 @@ username separated by ';' to login as target user using supervisor's password Credits + * Andreas Boehler for releasing the first version of this application * Johan Hendriks provided his user_postfixadmin * Ed Wildgoose for fixing possible SQL injection vulnerability diff --git a/appinfo/info.xml b/appinfo/info.xml index d2b6911..fc26ac3 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,14 +1,16 @@ - user_sql - SQL user backend - Authenticate Users by SQL - Authenticate Users by SQL - 2.3.1 + user_sql_2 + SQL user backend 2 + Authenticate users by SQL queries. + Authenticate users by SQL queries. + 1.0.0 agpl - Andreas Boehler <dev (at) aboehler -(dot) at > + Andreas Boehler <dev (at) aboehler (dot) at > user_sql + https://github.com/mlojewski-me/user_sql/issues + https://github.com/mlojewski-me/user_sql + https://raw.githubusercontent.com/mlojewski-me/user_sql/2_v1.0.0/screenshot.png diff --git a/appinfo/update.php b/appinfo/update.php deleted file mode 100644 index c5ae8a2..0000000 --- a/appinfo/update.php +++ /dev/null @@ -1,73 +0,0 @@ - - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -$installedVersion = \OC::$server->getConfig()->getAppValue('user_sql', 'installed_version'); - -$params = array('sql_host' => 'sql_hostname', - 'sql_user' => 'sql_username', - 'sql_database' => 'sql_database', - 'sql_password' => 'sql_password', - 'sql_table' => 'sql_table', - 'sql_column_username' => 'col_username', - 'sql_column_password' => 'col_password', - 'sql_type' => 'sql_driver', - 'sql_column_active' => 'col_active', - 'sql_column_supervisor' => 'supervisor', - 'sql_supervisor' => 'set_supervisor', - 'strip_domain' => 'set_strip_domain', - 'default_domain' => 'set_default_domain', - 'crypt_type' => 'set_crypt_type', - 'sql_column_displayname' => 'col_displayname', - 'allow_password_change' => 'set_allow_pwchange', - 'sql_column_active_invert' => 'set_active_invert', - 'sql_column_email' => 'col_email', - 'mail_sync_mode' => 'set_mail_sync_mode' - ); - -$delParams = array('domain_settings', - 'map_array', - 'domain_array' - ); - -if(version_compare($installedVersion, '1.99', '<')) -{ - foreach($params as $oldPar => $newPar) - { - $val = \OC::$server->getConfig()->getAppValue('user_sql', $oldPar); - if(($oldPar === 'strip_domain') || ($oldPar === 'allow_password_change') || ($oldPar === 'sql_column_active_invert')) - { - if($val) - $val = 'true'; - else - $val = 'false'; - } - if($val) - \OC::$server->getConfig()->setAppValue('user_sql', $newPar.'_default', $val); - \OC::$server->getConfig()->deleteAppValue('user_sql', $oldPar); - } - - foreach($delParams as $param) - { - \OC::$server->getConfig()->deleteAppValue('user_sql', $param); - } -} diff --git a/css/settings.css b/css/settings.css index 8fd2c24..87f19b7 100644 --- a/css/settings.css +++ b/css/settings.css @@ -17,7 +17,8 @@ #sql-3 p label:first-child, #sql-4 p label:first-child, #sql-5 p label:first-child, -#sql-6 p label:first-child { +#sql-6 p label:first-child, +#sql-7 p label:first-child { display: inline-block; text-align: right; width: 300px; diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..fd2ed67 Binary files /dev/null and b/screenshot.png differ