Merge branch 'develop' of git@github.com:LDAPAccountManager/lam.git into develop

This commit is contained in:
Roland Gruber 2017-08-15 10:29:48 +02:00
commit 026f33a3da
9 changed files with 31 additions and 11 deletions

View File

@ -108,9 +108,9 @@ ln -s /var/lib/%{lam_dir}/tmp $RPM_BUILD_ROOT/usr/share/%{lam_dir}/tmp
mv $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess $RPM_BUILD_ROOT/var/lib/%{lam_dir} mv $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess $RPM_BUILD_ROOT/var/lib/%{lam_dir}
ln -s /var/lib/%{lam_dir}/sess $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess ln -s /var/lib/%{lam_dir}/sess $RPM_BUILD_ROOT/usr/share/%{lam_dir}/sess
mkdir -p $RPM_BUILD_ROOT%{httpd_confdir} mkdir -p $RPM_BUILD_ROOT%{httpd_confdir}
cp $RPM_BUILD_DIR/lam.apache.conf $RPM_BUILD_ROOT%{httpd_confdir}/ cp $RPM_SOURCE_DIR/lam.apache.conf $RPM_BUILD_ROOT%{httpd_confdir}/
mkdir -p $RPM_BUILD_ROOT/etc/%{lam_dir} mkdir -p $RPM_BUILD_ROOT/etc/%{lam_dir}
cp $RPM_BUILD_DIR/lam.nginx.conf $RPM_BUILD_ROOT/etc/%{lam_dir}/ cp $RPM_SOURCE_DIR/lam.nginx.conf $RPM_BUILD_ROOT/etc/%{lam_dir}/
%clean %clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT

View File

@ -1,3 +1,9 @@
ldap-account-manager (6.0.1-1) unstable; urgency=medium
* new upstream release
-- Roland Gruber <post@rolandgruber.de> Wed, 19 Jul 2017 20:50:22 +0200
ldap-account-manager (6.0-1) unstable; urgency=medium ldap-account-manager (6.0-1) unstable; urgency=medium
* new upstream release * new upstream release

View File

@ -1,3 +1,8 @@
20.07.2017 6.0.1
- Fixed bugs:
-> Configuration file fills up with empty values
-> Tool visibility settings
26.06.2017 6.0 26.06.2017 6.0
- Support multiple configurations for same account type - Support multiple configurations for same account type
- PHP 7.1 compatibility - PHP 7.1 compatibility

View File

@ -1 +1 @@
6.0 6.0.1

View File

@ -1408,12 +1408,14 @@ abstract class baseModule {
if ($label !== null) { if ($label !== null) {
$labelTextOut = new htmlOutputText($label); $labelTextOut = new htmlOutputText($label);
$labelTextOut->alignment = htmlElement::ALIGN_TOP; $labelTextOut->alignment = htmlElement::ALIGN_TOP;
$labelTextOut->setMarkAsRequired($required);
$container->addElement($labelTextOut); $container->addElement($labelTextOut);
} }
$subContainer = new htmlTable(); $subContainer = new htmlTable();
$subContainer->alignment = htmlElement::ALIGN_TOP; $subContainer->alignment = htmlElement::ALIGN_TOP;
for ($i = 0; $i < sizeof($values); $i++) { for ($i = 0; $i < sizeof($values); $i++) {
$input = new htmlSelect($attrName . '_' . $i, $options, array($values[$i]), $fieldSize); $input = new htmlSelect($attrName . '_' . $i, $options, array($values[$i]), $fieldSize);
$input->setHasDescriptiveElements($hasDescriptiveOptions);
$subContainer->addElement($input); $subContainer->addElement($input);
if (!empty($htmlIDs)) { if (!empty($htmlIDs)) {
$htmlIDs[] = $attrName . '_' . $i; $htmlIDs[] = $attrName . '_' . $i;

View File

@ -4,7 +4,7 @@ namespace LAM\TOOLS\SERVER_INFO;
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2009 - 2016 Roland Gruber Copyright (C) 2009 - 2017 Roland Gruber
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -78,7 +78,7 @@ class toolServerInformation implements \LAMTool {
* @return boolean true if password change rights are needed * @return boolean true if password change rights are needed
*/ */
function getRequiresPasswordChangeRights() { function getRequiresPasswordChangeRights() {
return true; return false;
} }
/** /**

View File

@ -496,11 +496,12 @@ for ($r = 0; $r < (sizeof($tools) / 4); $r++) {
} }
$tool = $tools[($r * 4) + $c]; $tool = $tools[($r * 4) + $c];
$toolClass = get_class($tool); $toolClass = get_class($tool);
$toolName = substr($toolClass, strrpos($toolClass, '\\') + 1);
$selected = false; $selected = false;
if (isset($toolSettings['tool_hide_' . $toolClass]) && ($toolSettings['tool_hide_' . $toolClass] === 'true')) { if (isset($toolSettings['tool_hide_' . $toolName]) && ($toolSettings['tool_hide_' . $toolName] === 'true')) {
$selected = true; $selected = true;
} }
$toolSettingsContent->addElement(new htmlTableExtendedInputCheckbox('tool_hide_' . $toolClass, $selected, $tool->getName(), null, false)); $toolSettingsContent->addElement(new htmlTableExtendedInputCheckbox('tool_hide_' . $toolName, $selected, $tool->getName(), null, false));
$toolSettingsContent->addElement(new htmlSpacer('10px', null)); $toolSettingsContent->addElement(new htmlSpacer('10px', null));
} }
$toolSettingsContent->addNewLine(); $toolSettingsContent->addNewLine();
@ -761,7 +762,9 @@ function checkInput() {
$tools = getTools(); $tools = getTools();
$toolSettings = array(); $toolSettings = array();
for ($i = 0; $i < sizeof($tools); $i++) { for ($i = 0; $i < sizeof($tools); $i++) {
$toolConfigID = 'tool_hide_' . $tools[$i]; $toolClass = $tools[$i];
$toolName = substr($toolClass, strrpos($toolClass, '\\') + 1);
$toolConfigID = 'tool_hide_' . $toolName;
if ((isset($_POST[$toolConfigID])) && ($_POST[$toolConfigID] == 'on')) { if ((isset($_POST[$toolConfigID])) && ($_POST[$toolConfigID] == 'on')) {
$toolSettings[$toolConfigID] = 'true'; $toolSettings[$toolConfigID] = 'true';
} }

View File

@ -86,7 +86,8 @@ $toolSettings = $_SESSION['config']->getToolSettings();
// sort tools // sort tools
$toSort = array(); $toSort = array();
for ($i = 0; $i < sizeof($availableTools); $i++) { for ($i = 0; $i < sizeof($availableTools); $i++) {
$myTool = new $availableTools[$i](); $toolClass = $availableTools[$i];
$myTool = new $toolClass();
if ($myTool->getRequiresWriteAccess() && !checkIfWriteAccessIsAllowed()) { if ($myTool->getRequiresWriteAccess() && !checkIfWriteAccessIsAllowed()) {
continue; continue;
} }
@ -98,7 +99,8 @@ for ($i = 0; $i < sizeof($availableTools); $i++) {
continue; continue;
} }
// check if hidden by config // check if hidden by config
if (isset($toolSettings['tool_hide_' . get_class($myTool)]) && ($toolSettings['tool_hide_' . get_class($myTool)] == 'true')) { $toolName = substr($toolClass, strrpos($toolClass, '\\') + 1);
if (isset($toolSettings['tool_hide_' . $toolName]) && ($toolSettings['tool_hide_' . $toolName] == 'true')) {
continue; continue;
} }
$toSort[$availableTools[$i]] = $myTool->getPosition(); $toSort[$availableTools[$i]] = $myTool->getPosition();

View File

@ -77,7 +77,9 @@ for ($i = 0; $i < sizeof($tools); $i++) {
continue; continue;
} }
// check if hidden by config // check if hidden by config
if (isset($toolSettings['tool_hide_' . get_class($tools[$i])]) && ($toolSettings['tool_hide_' . get_class($tools[$i])] == 'true')) { $className = get_class($tools[$i]);
$toolName = substr($className, strrpos($className, '\\') + 1);
if (isset($toolSettings['tool_hide_' . $toolName]) && ($toolSettings['tool_hide_' . $toolName] == 'true')) {
continue; continue;
} }
// add tool // add tool