|
|
|---|
| 0 |
-- ucs/management/univention-directory-manager/uniconf/modrelogin.py |
0 |
++ ucs/management/univention-directory-manager/uniconf/modrelogin.py |
|
Lines 283-297
class modrelogin(unimodule.unimodule):
|
Link Here
|
|---|
|
|---|
| 283 |
self.save.put("authfail","1") |
283 |
self.save.put("authfail","1") |
| 284 |
return |
284 |
return |
| 285 |
|
285 |
|
| 286 |
self.save.put("relogin_username",self.usernamein.xvars.get("usertext","")) |
286 |
pre_session_login = self.req and self.req.meta and self.req.meta.get('Pre_session_username') and self.req.meta.get('Pre_session_password') |
| 287 |
self.save.put("relogin_password",self.passwdin.xvars.get("usertext","")) |
287 |
if pre_session_login: |
|
|
288 |
self.save.put("relogin_username",self.req.meta.get('Pre_session_username')) |
| 289 |
self.save.put("relogin_password",self.req.meta.get('Pre_session_password')) |
| 290 |
else: |
| 291 |
self.save.put("relogin_username",self.usernamein.xvars.get("usertext","")) |
| 292 |
self.save.put("relogin_password",self.passwdin.xvars.get("usertext","")) |
| 288 |
mu=0 |
293 |
mu=0 |
| 289 |
|
|
|
| 290 |
|
294 |
|
| 291 |
if self.cabut.pressed(): |
295 |
if self.cabut.pressed(): |
| 292 |
self.save.put("logout",1) |
296 |
self.save.put("logout",1) |
| 293 |
|
297 |
|
| 294 |
if self.okbut.pressed() or mu and self.input: |
298 |
if self.okbut.pressed() or mu and self.input or pre_session_login: |
| 295 |
self.save.put("user",self.save.get("relogin_username")) |
299 |
self.save.put("user",self.save.get("relogin_username")) |
| 296 |
self.save.put("pass",self.save.get("relogin_password")) |
300 |
self.save.put("pass",self.save.get("relogin_password")) |
| 297 |
|
301 |
|
|
Lines 304-309
class modrelogin(unimodule.unimodule):
|
Link Here
|
|---|
|
|---|
| 304 |
else: |
308 |
else: |
| 305 |
domain=position.getBase() |
309 |
domain=position.getBase() |
| 306 |
|
310 |
|
|
|
311 |
if not domain: |
| 312 |
domain=position.getBase() |
| 313 |
|
| 307 |
position.setLoginDomain(domain) |
314 |
position.setLoginDomain(domain) |
| 308 |
position.setDn(domain) |
315 |
position.setDn(domain) |
| 309 |
self.save.put('ldap_position', position) |
316 |
self.save.put('ldap_position', position) |
|
Lines 311-316
class modrelogin(unimodule.unimodule):
|
Link Here
|
|---|
|
|---|
| 311 |
language = None |
318 |
language = None |
| 312 |
if hasattr(self, 'chooselang'): |
319 |
if hasattr(self, 'chooselang'): |
| 313 |
language = self.chooselang.getselected() |
320 |
language = self.chooselang.getselected() |
|
|
321 |
if self.req.meta.get('Pre_session_language'): |
| 322 |
language = self.req.meta.get('Pre_session_language') |
| 314 |
|
323 |
|
| 315 |
if language: |
324 |
if language: |
| 316 |
if language == 'de': |
325 |
if language == 'de': |
| 317 |
-- ucs/management/univention-management-console/modules/frontend/modconsole.py |
326 |
++ ucs/management/univention-management-console/modules/frontend/modconsole.py |
|
Lines 536-551
class modconsole(unimodule.unimodule):
|
Link Here
|
|---|
|
|---|
| 536 |
self.save.put('about','1') |
536 |
self.save.put('about','1') |
| 537 |
return |
537 |
return |
| 538 |
|
538 |
|
|
|
539 |
pre_session_login = self.req and self.req.meta and self.req.meta.get('Pre_session_username') and self.req.meta.get('Pre_session_password') |
| 540 |
univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'Function: UMC: pre_session_login = %s' % pre_session_login ) |
| 541 |
|
| 539 |
if self.save.get('consolemode') == 'login': |
542 |
if self.save.get('consolemode') == 'login': |
| 540 |
self.save.put("relogin_username",self.usernamein.xvars.get("usertext","")) |
543 |
if pre_session_login: |
| 541 |
self.save.put("relogin_password",self.passwdin.xvars.get("usertext","")) |
544 |
self.save.put("relogin_username",self.req.meta.get('Pre_session_username')) |
|
|
545 |
self.save.put("relogin_password",self.req.meta.get('Pre_session_password')) |
| 546 |
else: |
| 547 |
self.save.put("relogin_username",self.usernamein.xvars.get("usertext","")) |
| 548 |
self.save.put("relogin_password",self.passwdin.xvars.get("usertext","")) |
| 542 |
|
549 |
|
| 543 |
if self.cabut.pressed(): |
550 |
if self.cabut.pressed(): |
| 544 |
self.save.put( 'auth_ok', False ) # just to be sure |
551 |
self.save.put( 'auth_ok', False ) # just to be sure |
| 545 |
|
552 |
|
| 546 |
if self.okbut.pressed(): |
553 |
if self.okbut.pressed() or pre_session_login: |
| 547 |
authUsername = self.usernamein.xvars.get("usertext","") |
554 |
authUsername = self.save.gut("relogin_username",'') |
| 548 |
authPassword = self.passwdin.xvars.get("usertext","") |
555 |
authPassword = self.save.gut("relogin_password",'') |
| 549 |
|
556 |
|
| 550 |
#if not authUsername or not authPassword: |
557 |
#if not authUsername or not authPassword: |
| 551 |
# return |
558 |
# return |
|
Lines 577-582
class modconsole(unimodule.unimodule):
|
Link Here
|
|---|
|
|---|
| 577 |
language = None |
584 |
language = None |
| 578 |
if hasattr(self, 'chooselang'): |
585 |
if hasattr(self, 'chooselang'): |
| 579 |
language = self.chooselang.getselected() |
586 |
language = self.chooselang.getselected() |
|
|
587 |
if self.req.meta.get('Pre_session_language'): |
| 588 |
language = self.req.meta.get('Pre_session_language') |
| 589 |
|
| 580 |
|
590 |
|
| 581 |
if language: |
591 |
if language: |
| 582 |
if language == 'de': |
592 |
if language == 'de': |
| 583 |
-- ucs/management/univention-webui/webui/index.php |
593 |
++ ucs/management/univention-webui/webui/index.php |
|
Lines 129-134
if(!isset($logout)) {
|
Link Here
|
|---|
|
|---|
| 129 |
fwrite($pipe, "Unsupportedbrowser: 1\n"); |
129 |
fwrite($pipe, "Unsupportedbrowser: 1\n"); |
| 130 |
$container->set_body_class("login"); |
130 |
$container->set_body_class("login"); |
| 131 |
} |
131 |
} |
|
|
132 |
if (isset($_POST['Pre_session_username']) && isset($_POST['Pre_session_password'])) { |
| 133 |
if($config->layout_type && $config->layout_type=='menuless') { |
| 134 |
$container->set_body_class("component-menuless"); |
| 135 |
} else { |
| 136 |
$container->set_body_class("component"); |
| 137 |
} |
| 138 |
|
| 139 |
fwrite($pipe, "Pre_session_username: ".$_POST['Pre_session_username']."\n"); |
| 140 |
fwrite($pipe, "Pre_session_password: ".$_POST['Pre_session_password']."\n"); |
| 141 |
if (isset($_POST['Pre_session_language'])) { |
| 142 |
fwrite($pipe, "Pre_session_language: ".$_POST['Pre_session_language']."\n"); |
| 143 |
} |
| 144 |
} |
| 132 |
fwrite($pipe, "SessionId: ".$config->session_id."\n"); |
145 |
fwrite($pipe, "SessionId: ".$config->session_id."\n"); |
| 133 |
fwrite($pipe, "Number: -1\n\n\0"); |
146 |
fwrite($pipe, "Number: -1\n\n\0"); |
| 134 |
|
147 |
|