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

fixed problems of module cache

This commit is contained in:
Roland Gruber 2014-01-17 18:13:15 +00:00
parent a7d3773493
commit 848b444382
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lam/lib/modules.inc
View File

@ -492,7 +492,7 @@ function buildUploadAccounts($scope, $data, $ids, $selectedModules) {
$partialAccounts = array(); $partialAccounts = array();
for ($i = 0; $i < sizeof($data); $i++) $partialAccounts[$i]['objectClass'] = array(); for ($i = 0; $i < sizeof($data); $i++) $partialAccounts[$i]['objectClass'] = array();
for ($i = 0; $i < sizeof($ordered); $i++) { for ($i = 0; $i < sizeof($ordered); $i++) {
$module = moduleCache::getModule($ordered[$i], $scope); $module = new $ordered[$i]($scope);
$errors = $module->build_uploadAccounts($data, $ids, $partialAccounts, $selectedModules); $errors = $module->build_uploadAccounts($data, $ids, $partialAccounts, $selectedModules);
if (sizeof($errors) > 0) { if (sizeof($errors) > 0) {
array_unshift($errors, array("INFO", _("Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."), "")); array_unshift($errors, array("INFO", _("Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."), ""));
@ -1542,7 +1542,7 @@ class accountContainer {
foreach ($modules as $module) { foreach ($modules as $module) {
if (!isset($this->module[$module])) { if (!isset($this->module[$module])) {
$this->module[$module] = moduleCache::getModule($module, $this->type); $this->module[$module] = new $module($this->type);
$this->module[$module]->init($this->base); $this->module[$module]->init($this->base);
} }
$this->module[$module]->load_attributes($attr); $this->module[$module]->load_attributes($attr);
@ -1643,7 +1643,7 @@ class accountContainer {
$this->lastLoadedProfile = 'default'; $this->lastLoadedProfile = 'default';
$modules = $_SESSION['config']->get_AccountModules($this->type); $modules = $_SESSION['config']->get_AccountModules($this->type);
foreach ($modules as $module) { foreach ($modules as $module) {
$this->module[$module] = moduleCache::getModule($module, $this->type); $this->module[$module] = new $module($this->type);
$this->module[$module]->init($this->base); $this->module[$module]->init($this->base);
} }
// sort module buttons // sort module buttons