diff --git a/Changelog.md b/Changelog.md
index f21f276cd8d1b3fd48f1ae5979ed81d6b986314c..8642db3a4d99be61fab866be81edbf7bde169d30 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -643,7 +643,7 @@
#### fusiondirectory
- fd#5098 Exception should be reorganized
- fd#5267 Incompatibility between recovery password and user-reminder
-- fd#5280 rewrote the pasword recovery with new RDN
+- fd#5280 rewrote the password recovery with new RDN
#### fusiondirectory-plugins
- fd-plugins#5070 FAI packageSelect class should use simpleSelectManagement
@@ -1031,21 +1031,21 @@
### Changed
-#### fusiondirectory-plugins
-- fd-plugins#4657 community organization membership type
-
-### Removed
-
-#### fusiondirectory
-- fd#4621 Use of mcrypt should be removed
-- fd#4652 The weird _copy fallback should be removed
-
-#### fusiondirectory-plugins
-- fd-plugins#4654 DHCP seems to use inexistant method getCn
-
-### Fixed
-
-#### fusiondirectory
+#### fusiondirectory-plugins
+- fd-plugins#4657 community organization membership type
+
+### Removed
+
+#### fusiondirectory
+- fd#4621 Use of mcrypt should be removed
+- fd#4652 The weird _copy fallback should be removed
+
+#### fusiondirectory-plugins
+- fd-plugins#4654 DHCP seems to use inexistant method getCn
+
+### Fixed
+
+#### fusiondirectory
- fd#4633 change requirement to php 5.4 for centos
- fd#4634 DNS PTR migration does not work
- fd#4638 UI issue, entry disappear in 'Base' dropdown
diff --git a/include/password-methods/class_password-methods.inc b/include/password-methods/class_passwordMethod.inc
similarity index 93%
rename from include/password-methods/class_password-methods.inc
rename to include/password-methods/class_passwordMethod.inc
index 95e261f420e1dd83a49b79fc80a1ef1e0389455b..28421f0f51d5ca831770a4433648d4f920b1a0e9 100644
--- a/include/password-methods/class_password-methods.inc
+++ b/include/password-methods/class_passwordMethod.inc
@@ -1,8 +1,9 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2017 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,8 +21,8 @@
*/
/*
- * \file class_pasword-methods.inc
- * Source code for class password-methods
+ * \file class_passwordMethod.inc
+ * Source code for class passwordMethod
*/
/*!
@@ -226,39 +227,41 @@ abstract class passwordMethod
$ret = FALSE;
$i = 0;
- /* Only */
- if (!session::is_set("passwordMethod::get_available_methods")) {
+ if (!session::is_set('passwordMethod::get_available_methods')) {
foreach (array_keys($class_mapping) as $class) {
- if (preg_match('/passwordMethod/i', $class) && !preg_match("/^passwordMethod$/i", $class)) {
- $test = new $class("");
+ if (preg_match('/^passwordMethod.+/i', $class)) {
+ $test = new $class('');
if ($test->is_available()) {
$plugs = $test->get_hash_name();
if (!is_array($plugs)) {
$plugs = [$plugs];
}
- foreach ($plugs as $plugname) {
- $cfg = $test->is_configurable();
+ $cfg = $test->is_configurable();
+ $desc = $test->get_description();
+ foreach ($plugs as $plugname) {
$ret['name'][$i] = $plugname;
$ret['class'][$i] = $class;
$ret['is_configurable'][$i] = $cfg;
$ret['object'][$i] = $test;
- $ret['desc'][$i] = $test->get_description();
+ $ret['desc'][$i] = $desc;
+
$ret[$i]['name'] = $plugname;
$ret[$i]['class'] = $class;
$ret[$i]['object'] = $test;
$ret[$i]['is_configurable'] = $cfg;
- $ret[$i]['desc'] = $test->get_description();
+ $ret[$i]['desc'] = $desc;
+
$ret[$plugname] = $class;
$i++;
}
}
}
}
- session::set("passwordMethod::get_available_methods", $ret);
+ session::set('passwordMethod::get_available_methods', $ret);
}
- return session::get("passwordMethod::get_available_methods");
+ return session::get('passwordMethod::get_available_methods');
}
/*!
diff --git a/include/password-methods/class_password-methods-clear.inc b/include/password-methods/class_passwordMethodClear.inc
similarity index 93%
rename from include/password-methods/class_password-methods-clear.inc
rename to include/password-methods/class_passwordMethodClear.inc
index 833629e74fd723b0903fe4dc2f0e2dcbc40d8d1f..94b5cb36cb94b904f54b72bce4aae5e383bebda6 100644
--- a/include/password-methods/class_password-methods-clear.inc
+++ b/include/password-methods/class_passwordMethodClear.inc
@@ -1,9 +1,9 @@
<?php
-
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,12 +21,12 @@
*/
/*!
- * \file class_password-methods-clear.inc
+ * \file class_passwordMethodClear.inc
* Source code for class passwordMethodClear
*/
/*!
- * \brief This class contains all the functions for clear password methods
+ * \brief This class contains all the functions for clear password method
* \see passwordMethod
*/
class passwordMethodClear extends passwordMethod
@@ -60,6 +60,6 @@ class passwordMethodClear extends passwordMethod
*/
static function get_hash_name ()
{
- return "clear";
+ return 'clear';
}
}
diff --git a/include/password-methods/class_password-methods-crypt.inc b/include/password-methods/class_passwordMethodCrypt.inc
similarity index 98%
rename from include/password-methods/class_password-methods-crypt.inc
rename to include/password-methods/class_passwordMethodCrypt.inc
index 0a45644bc94d24367d7be42b091212456afea6e4..bda6bc9a77d498780d23184cbefc1b425469e808 100644
--- a/include/password-methods/class_password-methods-crypt.inc
+++ b/include/password-methods/class_passwordMethodCrypt.inc
@@ -1,9 +1,9 @@
<?php
-
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
*/
/*!
- * \file class_password-methods-crypt.inc
+ * \file class_passwordMethodCrypt.inc
* Source code for class passwordMethodCrypt
*/
diff --git a/include/password-methods/class_password-methods-empty.inc b/include/password-methods/class_passwordMethodEmpty.inc
similarity index 93%
rename from include/password-methods/class_password-methods-empty.inc
rename to include/password-methods/class_passwordMethodEmpty.inc
index 3db1cbd4983160e1f91307619057c11f2ec12df0..e88a6adfcf5d6f01f075d63c70fe5964f31d867a 100644
--- a/include/password-methods/class_password-methods-empty.inc
+++ b/include/password-methods/class_passwordMethodEmpty.inc
@@ -1,8 +1,9 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2018 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,7 +21,7 @@
*/
/*!
- * \file class_password-methods-empty.inc
+ * \file class_passwordMethodEmpty.inc
* Source code for class passwordMethodEmpty
*/
@@ -37,7 +38,7 @@ class passwordMethodEmpty extends passwordMethod
const LOCKVALUE = '{CRYPT}!';
/*!
- * \brief passwordMethodClear Constructor
+ * \brief passwordMethodEmpty Constructor
*/
function __construct ()
{
diff --git a/include/password-methods/class_password-methods-md5.inc b/include/password-methods/class_passwordMethodMd5.inc
similarity index 95%
rename from include/password-methods/class_password-methods-md5.inc
rename to include/password-methods/class_passwordMethodMd5.inc
index 10342e240f0ee13d25b437b117cc3ed95952cd86..0b9a534f018c1453dd38f0d3f72827b54ef0020b 100644
--- a/include/password-methods/class_password-methods-md5.inc
+++ b/include/password-methods/class_passwordMethodMd5.inc
@@ -1,9 +1,9 @@
<?php
-
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,12 +21,12 @@
*/
/*!
- * \file class_password-methods-md5.inc
+ * \file class_passwordMethodMd5.inc
* Source code for class passwordMethodMd5
*/
/*!
- * \brief This class contains all the functions for md5 password methods
+ * \brief This class contains all the functions for md5 password method
* \see passwordMethod
*/
class passwordMethodMd5 extends passwordMethod
diff --git a/include/password-methods/class_password-methods-sasl.inc b/include/password-methods/class_passwordMethodSasl.inc
similarity index 93%
rename from include/password-methods/class_password-methods-sasl.inc
rename to include/password-methods/class_passwordMethodSasl.inc
index da84a7b5cd3c56df011799c07f5102c73cd34041..5311992bba19262106a2cb7efa27015df7e0bf6e 100644
--- a/include/password-methods/class_password-methods-sasl.inc
+++ b/include/password-methods/class_passwordMethodSasl.inc
@@ -1,7 +1,8 @@
<?php
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
- Copyright (C) 2011-2017 FusionDirectory
+
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,15 +20,15 @@
*/
/*!
- * \file class_password-methods-sasl.inc
- * Source code for class passwordMethodsasl
+ * \file class_passwordMethodSasl.inc
+ * Source code for class passwordMethodSasl
*/
/*!
- * \brief This class contains all the functions for sasl password methods
+ * \brief This class contains all the functions for sasl password method
* \see passwordMethod
*/
-class passwordMethodsasl extends passwordMethod
+class passwordMethodSasl extends passwordMethod
{
// uid, or exop specified field value
var $uid = '';
@@ -35,7 +36,7 @@ class passwordMethodsasl extends passwordMethod
var $exop = '';
/*!
- * \brief passwordMethodsasl Constructor
+ * \brief passwordMethodSasl Constructor
*
* \param string $dn The DN
* \param object $userTab The user main tab object
diff --git a/include/password-methods/class_password-methods-sha.inc b/include/password-methods/class_passwordMethodSha.inc
similarity index 89%
rename from include/password-methods/class_password-methods-sha.inc
rename to include/password-methods/class_passwordMethodSha.inc
index 35080de8ec32d51eee27b7bf9a0e3842a81b02e3..0bd2b7ce52bd04a957fd6b087d12f63731e195c0 100644
--- a/include/password-methods/class_password-methods-sha.inc
+++ b/include/password-methods/class_passwordMethodSha.inc
@@ -1,9 +1,9 @@
<?php
-
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,18 +21,18 @@
*/
/*
- * \file class_pasword-methods-sha.inc
- * Source code for class passwordMethodsha
+ * \file class_passwordMethodSha.inc
+ * Source code for class passwordMethodSha
*/
/*!
- * \brief This class contains all the functions for sha password methods
+ * \brief This class contains all the functions for sha password method
* \see passwordMethod
*/
-class passwordMethodsha extends passwordMethod
+class passwordMethodSha extends passwordMethod
{
/*!
- * \brief passwordMethodsha Constructor
+ * \brief passwordMethodSha Constructor
*/
function __construct ()
{
diff --git a/include/password-methods/class_password-methods-smd5.inc b/include/password-methods/class_passwordMethodSmd5.inc
similarity index 89%
rename from include/password-methods/class_password-methods-smd5.inc
rename to include/password-methods/class_passwordMethodSmd5.inc
index acb26ac30b8b62d8dbc108fcb689e0185c35cba0..b44b3ea142382abaa2672129fd380485cd4ab8cc 100644
--- a/include/password-methods/class_password-methods-smd5.inc
+++ b/include/password-methods/class_passwordMethodSmd5.inc
@@ -1,9 +1,9 @@
<?php
-
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,18 +21,18 @@
*/
/*!
- * \file class_password-methods-smd5.inc
- * Source code for class passwordMethodsmd5
+ * \file class_passwordMethodSmd5.inc
+ * Source code for class passwordMethodSmd5
*/
/*!
- * \brief This class contains all the functions for sdm5 password methods
+ * \brief This class contains all the functions for sdm5 password method
* \see passwordMethod
*/
-class passwordMethodsmd5 extends passwordMethod
+class passwordMethodSmd5 extends passwordMethod
{
/*!
- * \brief passwordMethodsmd5 Constructor
+ * \brief passwordMethodSmd5 Constructor
*/
function __construct ()
{
diff --git a/include/password-methods/class_password-methods-ssha.inc b/include/password-methods/class_passwordMethodSsha.inc
similarity index 92%
rename from include/password-methods/class_password-methods-ssha.inc
rename to include/password-methods/class_passwordMethodSsha.inc
index 5c9e16d80d6bdb4b799d2c86a3d5b68e13ec2438..f93b8028c236b31121284ed6d6ca7941044a3d6e 100644
--- a/include/password-methods/class_password-methods-ssha.inc
+++ b/include/password-methods/class_passwordMethodSsha.inc
@@ -1,9 +1,9 @@
<?php
-
/*
This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+
Copyright (C) 2003-2010 Cajus Pollmeier
- Copyright (C) 2011-2016 FusionDirectory
+ Copyright (C) 2011-2019 FusionDirectory
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -21,18 +21,18 @@
*/
/*!
- * \file class_password-methods-ssha.inc
- * Source code for class passwordMethodssha
+ * \file class_passwordMethodSsha.inc
+ * Source code for class passwordMethodSsha
*/
/*!
- * \brief This class contains all the functions for ssha password methods
+ * \brief This class contains all the functions for ssha password method
* \see passwordMethod
*/
-class passwordMethodssha extends passwordMethod
+class passwordMethodSsha extends passwordMethod
{
/*!
- * \brief passwordMethodssha Constructor
+ * \brief passwordMethodSsha Constructor
*/
function __construct ()
{