.
+
diff --git a/plugins/Ldap_Login/README.md b/sources/extra_files/app/plugins/Ldap_Login/README.md
similarity index 97%
rename from plugins/Ldap_Login/README.md
rename to sources/extra_files/app/plugins/Ldap_Login/README.md
index 1439b2d..1ae2970 100644
--- a/plugins/Ldap_Login/README.md
+++ b/sources/extra_files/app/plugins/Ldap_Login/README.md
@@ -1,20 +1,20 @@
-# Ldap_Login
-LDAP authentication plugin for piwigo with user-group support
-
-## Exmaple-Config for an M$-AD:
-
-#### LDAP-Serververbindung
-**LDAP-Server**: srv.emxample.com
-(x) **Secure connection** _(--> remember that the LDAPS-Server certificate must be imported on your piwigo server)_
-**LDAP-Port**: 636
-
-#### LDAP Attribute
-**Base DN wo LDAP-Benutzer gefunden werden sollen (zB.: ou=users,dc=example,dc=com):**: cn=Users,dc=example,dc=com
-**Attribute entsprechend des Benutzernamens**: sAMACcountName
-**DN of group for membership-check (memberOf)**: dn=piwigo_users,cn=Users,dc=example,dc=com
-
-#### LDAP-Verbindungsreferenzen
-**Bind DN im LDAP-Style (zB.: cn=admin,dc=example,dc=com).**: cn=binduser,cn=Users,dc=exmaple,dc=com
-**Bind passwort**: mysecret123
-
-_--> SAVE and enjoy :)_
+# Ldap_Login
+LDAP authentication plugin for piwigo with user-group support
+
+## Exmaple-Config for an M$-AD:
+
+#### LDAP-Serververbindung
+**LDAP-Server**: srv.emxample.com
+(x) **Secure connection** _(--> remember that the LDAPS-Server certificate must be imported on your piwigo server)_
+**LDAP-Port**: 636
+
+#### LDAP Attribute
+**Base DN wo LDAP-Benutzer gefunden werden sollen (zB.: ou=users,dc=example,dc=com):**: cn=Users,dc=example,dc=com
+**Attribute entsprechend des Benutzernamens**: sAMACcountName
+**DN of group for membership-check (memberOf)**: dn=piwigo_users,cn=Users,dc=example,dc=com
+
+#### LDAP-Verbindungsreferenzen
+**Bind DN im LDAP-Style (zB.: cn=admin,dc=example,dc=com).**: cn=binduser,cn=Users,dc=exmaple,dc=com
+**Bind passwort**: mysecret123
+
+_--> SAVE and enjoy :)_
diff --git a/plugins/Ldap_Login/TODO b/sources/extra_files/app/plugins/Ldap_Login/TODO
similarity index 98%
rename from plugins/Ldap_Login/TODO
rename to sources/extra_files/app/plugins/Ldap_Login/TODO
index 0bb46f7..0ed4ec8 100644
--- a/plugins/Ldap_Login/TODO
+++ b/sources/extra_files/app/plugins/Ldap_Login/TODO
@@ -1,30 +1,30 @@
-TODO :
-auto config (may use ajax): fill in the settings, then the page guess the next settings.
-Ex : after filled the host address, the page guess the base dn. The last to guess is the users OU.
- Users OU can come with a select field, as the ld_attr.
-
-correct init plugin
-if mail isn't furnished ?
-create common piwigo users upon successfull ldap connection when piwigo user doesn't exist => done !
- Groups : users may belong to ldap group to allow connection
- Groups : users belonging to «sudo» or «admin» ldap group become piwigo admin when created this way
- fetching attributes from ldap (mail…).
-
-config of the previous one (need tabs)
-config page to render better
-
-########
-
-à faire :
-initialisation du plugin correcte
-qu'est-ce qu'on fait si le mail est pas fourni ?
-configuration automatique (javascript/ajax probable): entrée des paramètres et la page recherche le paramètre suivant si possible.
-Ex : adresse du serveur -> la page trouve toute seule la racine ldap, reste plus que la OU des utilisateurs (qu'on peut selectionner via une liste déroulante).
- l'attribut d'identification peut être selectionné par une liste déroulante.
-
-creation d'un utilisateur piwigo suite à une authentification ldap quand l'utilisateur n'existe pas. => fait !
- question de groups : les utilisateurs membres du groupe ldap «sudo» ou autre pourraient automatiquement être admins piwigo
- question de groupe : les utilisateurs devraient appartenir à un groupe ldap pour se connecter…
- récuperer les attributs dans le ldap (mail…).
-
-page de config à peaufiner, option précédente à intégrer dans un onglet.
+TODO :
+auto config (may use ajax): fill in the settings, then the page guess the next settings.
+Ex : after filled the host address, the page guess the base dn. The last to guess is the users OU.
+ Users OU can come with a select field, as the ld_attr.
+
+correct init plugin
+if mail isn't furnished ?
+create common piwigo users upon successfull ldap connection when piwigo user doesn't exist => done !
+ Groups : users may belong to ldap group to allow connection
+ Groups : users belonging to «sudo» or «admin» ldap group become piwigo admin when created this way
+ fetching attributes from ldap (mail…).
+
+config of the previous one (need tabs)
+config page to render better
+
+########
+
+à faire :
+initialisation du plugin correcte
+qu'est-ce qu'on fait si le mail est pas fourni ?
+configuration automatique (javascript/ajax probable): entrée des paramètres et la page recherche le paramètre suivant si possible.
+Ex : adresse du serveur -> la page trouve toute seule la racine ldap, reste plus que la OU des utilisateurs (qu'on peut selectionner via une liste déroulante).
+ l'attribut d'identification peut être selectionné par une liste déroulante.
+
+creation d'un utilisateur piwigo suite à une authentification ldap quand l'utilisateur n'existe pas. => fait !
+ question de groups : les utilisateurs membres du groupe ldap «sudo» ou autre pourraient automatiquement être admins piwigo
+ question de groupe : les utilisateurs devraient appartenir à un groupe ldap pour se connecter…
+ récuperer les attributs dans le ldap (mail…).
+
+page de config à peaufiner, option précédente à intégrer dans un onglet.
diff --git a/plugins/Ldap_Login/admin.php b/sources/extra_files/app/plugins/Ldap_Login/admin.php
similarity index 100%
rename from plugins/Ldap_Login/admin.php
rename to sources/extra_files/app/plugins/Ldap_Login/admin.php
diff --git a/plugins/Ldap_Login/admin/configuration.php b/sources/extra_files/app/plugins/Ldap_Login/admin/configuration.php
similarity index 97%
rename from plugins/Ldap_Login/admin/configuration.php
rename to sources/extra_files/app/plugins/Ldap_Login/admin/configuration.php
index 5410454..d8cc188 100644
--- a/plugins/Ldap_Login/admin/configuration.php
+++ b/sources/extra_files/app/plugins/Ldap_Login/admin/configuration.php
@@ -1,74 +1,74 @@
-set_filenames( array('plugin_admin_content' => dirname(__FILE__).'/configuration.tpl') );
-$template->assign(
- array(
- 'PLUGIN_ACTION' => get_root_url().'admin.php?page=plugin-Ldap_Login-configuration',
- 'PLUGIN_CHECK' => get_root_url().'admin.php?page=plugin-Ldap_Login-configuration',
- ));
-
-$me = new Ldap();
-$me->load_config();
-//$me = get_plugin_data($plugin_id);
-
-// Save LDAP configuration when submitted
-if (isset($_POST['save'])){
- $me->config['host'] = $_POST['HOST'];
- $me->config['basedn'] = $_POST['BASEDN'];
- $me->config['port'] = $_POST['PORT'];
- $me->config['ld_attr'] = $_POST['LD_ATTR'];
- $me->config['ld_group'] = $_POST['LD_GROUP'];
- $me->config['ld_binddn'] = $_POST['LD_BINDDN'];
- $me->config['ld_bindpw'] = $_POST['LD_BINDPW'];
-
- if (isset($_POST['LD_USE_SSL'])){
- $me->config['ld_use_ssl'] = True;
- } else {
- $me->config['ld_use_ssl'] = False;
- }
-
- $me->save_config();
-}
-
-// Checki LDAP configuration
-$me->ldap_conn();
-if (isset($_POST['check_ldap'])){
- //$me->write_log("[function]> admin");
- //$check = $me->ldap_name($_POST['USERNAME']);
- $username = $me->ldap_search_dn($_POST['USERNAME']);
- //$me->write_log("[admin]> bind=".$username);
- $error=$me->check_ldap();
- if($error==1 && $username) {
- if ($me->ldap_bind_as($username,$_POST['PASSWORD'])){
- if($me->check_ldap_group_membership($username,$_POST['USERNAME'])){
- $template->assign('LD_CHECK_LDAP','Configuration LDAP OK : '.$username.'
');
- } else {
- $template->assign('LD_CHECK_LDAP','Credentials OK, Check GroupMembership for: '.$username.'
');
- }
- }
- else {
- $template->assign('LD_CHECK_LDAP',' Binding OK, but check credentials on server '.$me->config['uri'].' for user '.$username.'
');
- }
- } elseif($error==1 && !$username){
- $template->assign('LD_CHECK_LDAP','Error : Binding OK, but no valid DN found on server '.$me->config['uri'].' for user '.$_POST['USERNAME'].'
');
- } elseif($error && $username){
- $template->assign('LD_CHECK_LDAP','Error : Binding OK, but check credentials on '.$me->config['uri'].' for user '.$_POST['USERNAME'].'
');
- } else {
- $template->assign('LD_CHECK_LDAP','Error : '.$error.' for binding on server '.$me->config['uri'].' for user '.$_POST['USERNAME'].', check your binding!
');
- }
-}
-
-// And build up the form with the new values
-$template->assign('HOST', $me->config['host']);
-$template->assign('BASEDN', $me->config['basedn']); // racine !
-$template->assign('PORT', $me->config['port']);
-$template->assign('LD_ATTR', $me->config['ld_attr']);
-$template->assign('LD_GROUP', $me->config['ld_group']);
-$template->assign('LD_USE_SSL', $me->config['ld_use_ssl']);
-$template->assign('LD_BINDPW', $me->config['ld_bindpw']);
-$template->assign('LD_BINDDN', $me->config['ld_binddn']);
-
-$template->assign_var_from_handle( 'ADMIN_CONTENT', 'plugin_admin_content');
-?>
+set_filenames( array('plugin_admin_content' => dirname(__FILE__).'/configuration.tpl') );
+$template->assign(
+ array(
+ 'PLUGIN_ACTION' => get_root_url().'admin.php?page=plugin-Ldap_Login-configuration',
+ 'PLUGIN_CHECK' => get_root_url().'admin.php?page=plugin-Ldap_Login-configuration',
+ ));
+
+$me = new Ldap();
+$me->load_config();
+//$me = get_plugin_data($plugin_id);
+
+// Save LDAP configuration when submitted
+if (isset($_POST['save'])){
+ $me->config['host'] = $_POST['HOST'];
+ $me->config['basedn'] = $_POST['BASEDN'];
+ $me->config['port'] = $_POST['PORT'];
+ $me->config['ld_attr'] = $_POST['LD_ATTR'];
+ $me->config['ld_group'] = $_POST['LD_GROUP'];
+ $me->config['ld_binddn'] = $_POST['LD_BINDDN'];
+ $me->config['ld_bindpw'] = $_POST['LD_BINDPW'];
+
+ if (isset($_POST['LD_USE_SSL'])){
+ $me->config['ld_use_ssl'] = True;
+ } else {
+ $me->config['ld_use_ssl'] = False;
+ }
+
+ $me->save_config();
+}
+
+// Checki LDAP configuration
+$me->ldap_conn();
+if (isset($_POST['check_ldap'])){
+ //$me->write_log("[function]> admin");
+ //$check = $me->ldap_name($_POST['USERNAME']);
+ $username = $me->ldap_search_dn($_POST['USERNAME']);
+ //$me->write_log("[admin]> bind=".$username);
+ $error=$me->check_ldap();
+ if($error==1 && $username) {
+ if ($me->ldap_bind_as($username,$_POST['PASSWORD'])){
+ if($me->check_ldap_group_membership($username,$_POST['USERNAME'])){
+ $template->assign('LD_CHECK_LDAP','Configuration LDAP OK : '.$username.'
');
+ } else {
+ $template->assign('LD_CHECK_LDAP','Credentials OK, Check GroupMembership for: '.$username.'
');
+ }
+ }
+ else {
+ $template->assign('LD_CHECK_LDAP',' Binding OK, but check credentials on server '.$me->config['uri'].' for user '.$username.'
');
+ }
+ } elseif($error==1 && !$username){
+ $template->assign('LD_CHECK_LDAP','Error : Binding OK, but no valid DN found on server '.$me->config['uri'].' for user '.$_POST['USERNAME'].'
');
+ } elseif($error && $username){
+ $template->assign('LD_CHECK_LDAP','Error : Binding OK, but check credentials on '.$me->config['uri'].' for user '.$_POST['USERNAME'].'
');
+ } else {
+ $template->assign('LD_CHECK_LDAP','Error : '.$error.' for binding on server '.$me->config['uri'].' for user '.$_POST['USERNAME'].', check your binding!
');
+ }
+}
+
+// And build up the form with the new values
+$template->assign('HOST', $me->config['host']);
+$template->assign('BASEDN', $me->config['basedn']); // racine !
+$template->assign('PORT', $me->config['port']);
+$template->assign('LD_ATTR', $me->config['ld_attr']);
+$template->assign('LD_GROUP', $me->config['ld_group']);
+$template->assign('LD_USE_SSL', $me->config['ld_use_ssl']);
+$template->assign('LD_BINDPW', $me->config['ld_bindpw']);
+$template->assign('LD_BINDDN', $me->config['ld_binddn']);
+
+$template->assign_var_from_handle( 'ADMIN_CONTENT', 'plugin_admin_content');
+?>
diff --git a/plugins/Ldap_Login/admin/configuration.tpl b/sources/extra_files/app/plugins/Ldap_Login/admin/configuration.tpl
similarity index 96%
rename from plugins/Ldap_Login/admin/configuration.tpl
rename to sources/extra_files/app/plugins/Ldap_Login/admin/configuration.tpl
index 072613a..4196166 100644
--- a/plugins/Ldap_Login/admin/configuration.tpl
+++ b/sources/extra_files/app/plugins/Ldap_Login/admin/configuration.tpl
@@ -1,114 +1,114 @@
-{'Ldap_Login Plugin'|@translate}
-
-
-
-
{'All LDAP users can use their ldap password everywhere on piwigo if needed.'|@translate}
-
-
-
-
-
{'Ldap_Login Plugin'|@translate}
+
+
+
+
{'All LDAP users can use their ldap password everywhere on piwigo if needed.'|@translate}
+
+
+
+
+