Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-06 16:36:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Wrong config behavior while saving "LDAP enabled" attribute. Thanks to @finalbeta for the feedback

Browse Source
This commit is contained in:
nuxsmin
2017-04-25 11:06:01 +02:00
parent 738db5e892
commit 620a78da5f
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inc/SP/Controller/ConfigActionController.class.php
View File

@@ -318,8 +318,6 @@ class ConfigActionController implements ItemControllerInterface
*/
protected function wikiAction()
{
$Config = Session::getConfig();
// Wiki
$wikiEnabled = Request::analyze('wiki_enabled', false, false, true);
$wikiSearchUrl = Request::analyze('wiki_searchurl');
@@ -368,7 +366,7 @@ class ConfigActionController implements ItemControllerInterface
$this->ConfigData->setDokuwikiNamespace($dokuWikiNamespace);
$this->LogMessage->addDescription(__('DokuWiki habiltada', false));
} elseif ($Config->isDokuwikiEnabled()) {
} elseif ($this->ConfigData->isDokuwikiEnabled()) {
$this->ConfigData->setDokuwikiEnabled(false);
$this->LogMessage->addDescription(__('DokuWiki deshabilitada', false));
@@ -386,8 +384,6 @@ class ConfigActionController implements ItemControllerInterface
*/
protected function ldapAction()
{
$Config = Session::getConfig();
// LDAP
$ldapEnabled = Request::analyze('ldap_enabled', false, false, true);
$ldapADSEnabled = Request::analyze('ldap_ads', false, false, true);
@@ -418,7 +414,7 @@ class ConfigActionController implements ItemControllerInterface
$this->LogMessage->addDescription(__('LDAP habiltado', false));
} elseif ($this->ConfigData->isLdapEnabled()) {
$Config->setLdapEnabled(false);
$this->ConfigData->setLdapEnabled(false);
$this->LogMessage->addDescription(__('LDAP deshabilitado', false));
}

4
inc/SP/Util/Util.class.php
View File

@@ -407,8 +407,8 @@ class Util
*/
public static function getVersion($retBuild = false, $normalized = false)
{
$build = 17042101;
$version = [2, 1, 7];
$build = 17042501;
$version = [2, 1, 8];
if ($normalized === true) {
return [implode('', $version), $build];