WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for module caching

This commit is contained in:
Roland Gruber 2014-05-26 18:42:55 +00:00
parent 662bd53e91
commit d54c690a62
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/lib/baseModule.inc
View File

@ -87,7 +87,7 @@ abstract class baseModule {
public function __construct($scope) { public function __construct($scope) {
$this->scope = $scope; $this->scope = $scope;
// load configuration // load configuration
if ($this->can_manage()) { if ($this->can_manage() || ($scope == 'none')) {
if (isset($_SESSION['config'])) $this->moduleSettings = $_SESSION['config']->get_moduleSettings(); if (isset($_SESSION['config'])) $this->moduleSettings = $_SESSION['config']->get_moduleSettings();
if (isset($_SESSION['selfServiceProfile'])) $this->selfServiceSettings = $_SESSION['selfServiceProfile']; if (isset($_SESSION['selfServiceProfile'])) $this->selfServiceSettings = $_SESSION['selfServiceProfile'];
// initialize module // initialize module

4
lam/templates/config/moduleSettings.php
View File

@ -223,7 +223,7 @@ for ($i = 0; $i < sizeof($modules); $i++) {
$icon = '<img align="middle" src="' . $iconImage . '" alt="' . $iconImage . '"> '; $icon = '<img align="middle" src="' . $iconImage . '" alt="' . $iconImage . '"> ';
} }
echo "<legend>$icon" . getModuleAlias($modules[$i], "none") . "</legend>\n"; echo "<legend>$icon" . getModuleAlias($modules[$i], "none") . "</legend>\n";
$configTypes = parseHtml($modules[$i], $options[$modules[$i]], $old_options, false, $tabindex, 'user'); $configTypes = parseHtml($modules[$i], $options[$modules[$i]], $old_options, false, $tabindex, 'none');
$_SESSION['conf_types'] = array_merge($configTypes, $_SESSION['conf_types']); $_SESSION['conf_types'] = array_merge($configTypes, $_SESSION['conf_types']);
echo "</fieldset>\n"; echo "</fieldset>\n";
echo "<br>"; echo "<br>";
@ -242,7 +242,7 @@ $cancelButton = new htmlButton('cancelSettings', _('Cancel'));
$cancelButton->setIconClass('cancelButton'); $cancelButton->setIconClass('cancelButton');
$buttonContainer->addElement($cancelButton, true); $buttonContainer->addElement($cancelButton, true);
$buttonContainer->addElement(new htmlSpacer(null, '10px'), true); $buttonContainer->addElement(new htmlSpacer(null, '10px'), true);
parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user'); parseHtml(null, $buttonContainer, array(), false, $tabindex, 'none');
if ((sizeof($errorsToDisplay) == 0) && isset($_POST['scrollPositionTop']) && isset($_POST['scrollPositionLeft'])) { if ((sizeof($errorsToDisplay) == 0) && isset($_POST['scrollPositionTop']) && isset($_POST['scrollPositionLeft'])) {
// scroll to last position // scroll to last position