summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers
diff options
context:
space:
mode:
authorSimon2011-04-25 13:48:57 +0200
committerSimon2011-04-25 13:48:57 +0200
commit44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65 (patch)
tree3365419d99b00b434bc7e421b6043b0fc93f4e82 /application/modules/user/controllers
parentFehlermeldungen in GroupsGroupsMapper korrigiert (diff)
parentupload data fix (diff)
downloadpbs2-44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65.tar.gz
pbs2-44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65.tar.xz
pbs2-44706d9b06bd2ea3dfbdeb7a9dedce6c62993e65.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers')
-rw-r--r--application/modules/user/controllers/ConfigController.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index 6acb697..eca5d54 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -360,7 +360,9 @@ class user_ConfigController extends Zend_Controller_Action
if(!Pbs_Acl::checkRight('ce'))
$this->_redirect('/user/config/showconfig/type/'.$this->type.'/configID/'.$configID.'/modifyresult/forbidden');
}
-
+
+ $bootosuser->setID($bootosuserID);
+ $bootosuser->setConfigID($configID);
$bootosuser->setHomepath(str_replace("%login-name%", $bootosuser->getLogin(), $bootosuser->getHomepath()));
if($bootosuser->getPassword() != '%password%')
$bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$'.randomString(8).'$'));