holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix package install was generating md5 hased passwords for header

Browse Source
This commit is contained in:
Ralf Becker 2019-07-06 11:42:19 +02:00
parent 705c5b9f56
commit 4ced6407c6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/inc/class.setup_cmd_header.inc.php
View File

@ -1,13 +1,12 @@
<?php <?php
/** /**
* eGgroupWare setup - create or update the header.inc.php * EGgroupware setup - create or update the header.inc.php
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package setup * @package setup
* @copyright (c) 2007-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-19 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/ */
use EGroupware\Api; use EGroupware\Api;
@ -366,6 +365,6 @@ class setup_cmd_header extends setup_cmd
{ {
$var =& $var[$name]; $var =& $var[$name];
} }
if (true) $var = strpos($name,'passw') !== false ? md5($value) : $value; if (true) $var = $value;
} }
} }

6
setup/inc/class.setup_header.inc.php
View File

@ -8,7 +8,6 @@
* @author Miles Lott <milos@groupwhere.org> * @author Miles Lott <milos@groupwhere.org>
* @author Tony Puglisi (Angles) * @author Tony Puglisi (Angles)
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/ */
use EGroupware\Api; use EGroupware\Api;
@ -212,7 +211,10 @@ class setup_header
$var = Array(); $var = Array();
foreach($egw_info['server'] as $name => $value) foreach($egw_info['server'] as $name => $value)
{ {
if ($name == 'header_admin_password' && $value && !self::is_hashed($value)) $value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash); if ($name == 'header_admin_password' && $value && !self::is_hashed($value))
{
$value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
}
if ($name == 'versions') if ($name == 'versions')
{ {
$name = 'mcrypt_version'; $name = 'mcrypt_version';