1.5.4

stdonato · May 25, 2020 · 877a205 · 877a205
1 parent 1318de0
commit 877a205
Show file tree

Hide file tree

Showing 3 changed files with 246 additions and 100 deletions.
diff --git a/setup.php b/setup.php
@@ -1,37 +1,37 @@
 <?php
 
-/*
- *
-  This file is part of the Modifications plugin.
-
- Order plugin is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- Stevenes Donato; either version 2 of the License, or
- (at your option) any later version.
-
- Order plugin 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GLPI; along with itilcategorygroups. If not, see <http://www.gnu.org/licenses/>.
- --------------------------------------------------------------------------
- @package   modifications
- @author    Stevenes Donato
- @copyright Copyright (c) 2020 Stevenes Donato
- @license   GPLv3
-            http://www.gnu.org/licenses/gpl.txt
- @link      https://github.com/stdonato/glpi-modifications
- @link      http://www.glpi-project.org/
- @since     2018
- --------------------------------------------------------------------------
- */
-
-/**
- * @name plugin_mod_install
- * @access public
- * @return boolean
+/*
+ *
+  This file is part of the Modifications plugin.
+
+ Order plugin is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ Stevenes Donato; either version 2 of the License, or
+ (at your option) any later version.
+
+ Order plugin 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GLPI; along with itilcategorygroups. If not, see <http://www.gnu.org/licenses/>.
+ --------------------------------------------------------------------------
+ @package   modifications
+ @author    Stevenes Donato
+ @copyright Copyright (c) 2020 Stevenes Donato
+ @license   GPLv3
+            http://www.gnu.org/licenses/gpl.txt
+ @link      https://github.com/stdonato/glpi-modifications
+ @link      http://www.glpi-project.org/
+ @since     2018
+ --------------------------------------------------------------------------
+ */
+
+/**
+ * @name plugin_mod_install
+ * @access public
+ * @return boolean
  */
 
 
@@ -65,7 +65,7 @@ function plugin_version_mod(){
 	global $DB, $LANG;
 
 	return array('name'			   => __('GLPI Modifications'),
-					'version' 			=> '1.5.3',
+					'version' 			=> '1.5.4',
 					'author'			   => '<a href="mailto:stevenesdonato@gmail.com"> Stevenes Donato </b> </a>',
 					'license'		 	=> 'GPLv2+',
 					'homepage'			=> 'https://github.com/stdonato/glpi-modifications',
@@ -88,4 +88,6 @@ function plugin_mod_check_config($verbose=false){
 	}
 	return true;
 }
+
+
 ?>
diff --git a/src/inc/auth.class.php b/src/inc/auth.class.php
@@ -664,8 +664,7 @@ function login($login_name, $login_password, $noauto = false, $remember_me = fal
                   $ds = AuthLdap::connectToServer($ldap_method["host"],
                                                   $ldap_method["port"],
                                                   $ldap_method["rootdn"],
-                                                  Toolbox::decrypt($ldap_method["rootdn_passwd"],
-                                                                   GLPIKEY),
+                                                  Toolbox::decrypt($ldap_method["rootdn_passwd"]),
                                                   $ldap_method["use_tls"],
                                                   $ldap_method["deref_option"]);