Changeset 12585
- Timestamp:
- 09/28/07 20:44:13 (1 year ago)
- Files:
-
- trunk/midcom/midcom.core/midcom/application.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/locale/default.de.txt (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/locale/default.en.txt (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/locale/default.fi.txt (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/locale/default.pl.txt (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/locale/default.sv.txt (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/auth.php (modified) (9 diffs)
- trunk/midcom/midcom.core/midcom/services/auth/backend.php (modified) (2 diffs)
- trunk/midcom/midcom.core/midcom/services/auth/frontend.php (modified) (1 diff)
- trunk/midcom/midcom.core/midcom/services/auth/sessionmgr.php (modified) (1 diff)
- trunk/midcom/midcom.helper.datamanager/datatype_account.php (modified) (2 diffs)
- trunk/templates/OpenPsa2/midcom_services_auth_login_page.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.core/midcom/application.php
r12367 r12585 76 76 * 77 77 * The scripts executed need to do their own permission checks, they will work with 78 * the creden cials of the current MidCOM instance unconditionally.78 * the credentials of the current MidCOM instance unconditionally. 79 79 * 80 80 * Example: http://$host/midcom-exec-midcom/upgrade_metadata.php trunk/midcom/midcom.core/midcom/locale/default.de.txt
r11233 r12585 284 284 ---STRINGEND 285 285 286 ---STRING login message - please enter creden cials286 ---STRING login message - please enter credentials 287 287 Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein. 288 288 ---STRINGEND trunk/midcom/midcom.core/midcom/locale/default.en.txt
r11716 r12585 308 308 ---STRINGEND 309 309 310 ---STRING login message - please enter creden cials310 ---STRING login message - please enter credentials 311 311 Please enter your username and password. 312 312 ---STRINGEND trunk/midcom/midcom.core/midcom/locale/default.fi.txt
r5684 r12585 308 308 ---STRINGEND 309 309 310 ---STRING login message - please enter creden cials310 ---STRING login message - please enter credentials 311 311 SyötÀ kÀyttÀjÀtunnus ja salasana 312 312 ---STRINGEND trunk/midcom/midcom.core/midcom/locale/default.pl.txt
r11716 r12585 310 310 ---STRINGEND 311 311 312 ---STRING login message - please enter creden cials312 ---STRING login message - please enter credentials 313 313 Podaj uÅŒytkownika i hasÅo. 314 314 ---STRINGEND trunk/midcom/midcom.core/midcom/locale/default.sv.txt
r5044 r12585 235 235 ---STRINGEND 236 236 237 ---STRING login message - please enter creden cials237 ---STRING login message - please enter credentials 238 238 Skriv in anvÀndarnamn och lösenord. 239 239 ---STRINGEND trunk/midcom/midcom.core/midcom/services/auth.php
r12537 r12585 457 457 458 458 /** 459 * Flag, which is set to true if the system encountered any new login creden cials459 * Flag, which is set to true if the system encountered any new login credentials 460 460 * during startup. If this is true, but no user is authenticated, login did fail. 461 461 * … … 464 464 * @var public 465 465 */ 466 var $auth_creden cials_found = false;466 var $auth_credentials_found = false; 467 467 468 468 /** … … 505 505 506 506 /** 507 * Internal startup helper, checks if the current authentication fronted has new creden cials507 * Internal startup helper, checks if the current authentication fronted has new credentials 508 508 * ready. If yes, it processes the login accordingly. 509 509 * 510 * @return bool Returns true, if an new login session was created, false if no creden cials were found.510 * @return bool Returns true, if an new login session was created, false if no credentials were found. 511 511 * @access private 512 512 */ … … 515 515 debug_push_class(__CLASS__, __FUNCTION__); 516 516 517 $creden cials = $this->_auth_frontend->read_authentication_data();518 519 if (! $creden cials)517 $credentials = $this->_auth_frontend->read_authentication_data(); 518 519 if (! $credentials) 520 520 { 521 521 return false; 522 522 } 523 523 524 $this->auth_creden cials_found = true;524 $this->auth_credentials_found = true; 525 525 526 526 // Try to start up a new session, this will authenticate as well. 527 if (! $this->_auth_backend->create_login_session($creden cials['username'], $credencials['password']))527 if (! $this->_auth_backend->create_login_session($credentials['username'], $credentials['password'])) 528 528 { 529 529 debug_add('The login information passed to the system was invalid.', MIDCOM_LOG_ERROR); 530 debug_add("Username was {$creden cials['username']}");530 debug_add("Username was {$credentials['username']}"); 531 531 // No password logging for security reasons. 532 532 debug_pop(); … … 591 591 { 592 592 debug_push_class(__CLASS__, __FUNCTION__); 593 debug_add('Failed to re-authenticate a previous login session, not changing creden cials.');593 debug_add('Failed to re-authenticate a previous login session, not changing credentials.'); 594 594 debug_pop(); 595 595 return; … … 1109 1109 * You have to call midcom_services_auth::drop_sudo() as soon as you no longer 1110 1110 * need the elevated privileges, which will reset the authentication data to the 1111 * initial creden cials.1111 * initial credentials. 1112 1112 * 1113 1113 * @param string $domain The domain to request sudo for. This is a component name. … … 1986 1986 $login_warning = $_MIDCOM->i18n->get_string('login message - insufficient privileges', 'midcom'); 1987 1987 } 1988 else if ($this->auth_creden cials_found)1988 else if ($this->auth_credentials_found) 1989 1989 { 1990 1990 $login_warning = $_MIDCOM->i18n->get_string('login message - user or password wrong', 'midcom'); … … 2132 2132 // Determine login warning so that wrong user/pass is shown. 2133 2133 $login_warning = ''; 2134 if ( $this->auth_creden cials_found2134 if ( $this->auth_credentials_found 2135 2135 && is_null($this->user)) 2136 2136 { … … 2191 2191 if ($login_warning == '') 2192 2192 { 2193 echo "<div id=\"ok\">" . $_MIDCOM->i18n->get_string('login message - please enter creden cials', 'midcom') . "</div>\n";2193 echo "<div id=\"ok\">" . $_MIDCOM->i18n->get_string('login message - please enter credentials', 'midcom') . "</div>\n"; 2194 2194 } 2195 2195 else trunk/midcom/midcom.core/midcom/services/auth/backend.php
r3766 r12585 11 11 * Authentication backend, responsible for validating user/password pairs and 12 12 * mapping them to a given user as well as the "sessioning" part, e.g. the transition 13 * of the authentication creden cials over several requests.13 * of the authentication credentials over several requests. 14 14 * 15 15 * All functions except authenticate() must be implemented, see their individual … … 79 79 80 80 /** 81 * This function stores a login session using the given creden cials through the81 * This function stores a login session using the given credentials through the 82 82 * session service. It assumes that no login has concluded earlier. The login 83 83 * session management system is used for authentication. If the login session trunk/midcom/midcom.core/midcom/services/auth/frontend.php
r3766 r12585 10 10 /** 11 11 * Authentication frontend, responsible for rendering the login screen, reading 12 * the creden cials and displaying access denied information.12 * the credentials and displaying access denied information. 13 13 * 14 14 * All functions must be implemented, see their individual documentation about trunk/midcom/midcom.core/midcom/services/auth/sessionmgr.php
r12370 r12585 59 59 /** 60 60 * Creates a login session using the given arguments. Returns a session identifier. 61 * The call will validate the passed creden cials and thus authenticate for the given61 * The call will validate the passed credentials and thus authenticate for the given 62 62 * user at the same time, so there is no need to call authenticate_session() after 63 63 * creating it. A failed password check will of course not create a login session. trunk/midcom/midcom.helper.datamanager/datatype_account.php
r1080 r12585 38 38 if ($this->_storage->__table__ != "person") 39 39 { 40 $this->_datamanager->append_error("CRITICAL: Storage object is not a MidgardPerson, cannot work with MidgardPerson creden cials here.");40 $this->_datamanager->append_error("CRITICAL: Storage object is not a MidgardPerson, cannot work with MidgardPerson credentials here."); 41 41 debug_add("Trying to use MidgardPerson storage location with a non-person, this is critical.", MIDCOM_LOG_CRIT); 42 42 debug_print_r("Storage object is: ", $this->_storage); … … 88 88 if ($this->_storage->__table__ != "person") 89 89 { 90 $this->_datamanager->append_error("CRITICAL: Storage object is not a MidgardPerson, cannot work with MidgardPerson creden cials here.");90 $this->_datamanager->append_error("CRITICAL: Storage object is not a MidgardPerson, cannot work with MidgardPerson credentials here."); 91 91 debug_add("Trying to use MidgardPerson storage location with a non-person, this is critical.", MIDCOM_LOG_CRIT); 92 92 debug_print_r("Storage object is: ", $this->_storage); trunk/templates/OpenPsa2/midcom_services_auth_login_page.php
r12103 r12585 48 48 49 49 <p class='login_message'><?php 50 echo $_MIDCOM->i18n->get_string('login message - please enter creden cials',50 echo $_MIDCOM->i18n->get_string('login message - please enter credentials', 51 51 'midcom');?></p> 52 52
