equal
deleted
inserted
replaced
267 $session->logout(); |
267 $session->logout(); |
268 if ( $email_changed ) |
268 if ( $email_changed ) |
269 { |
269 { |
270 if ( getConfig('account_activation') == 'user' ) |
270 if ( getConfig('account_activation') == 'user' ) |
271 { |
271 { |
272 redirect(makeUrl(getConfig('main_page')), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_user'), 20); |
272 redirect(makeUrl(get_main_page()), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_user'), 20); |
273 } |
273 } |
274 else if ( getConfig('account_activation') == 'admin' ) |
274 else if ( getConfig('account_activation') == 'admin' ) |
275 { |
275 { |
276 redirect(makeUrl(getConfig('main_page')), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_admin'), 20); |
276 redirect(makeUrl(get_main_page()), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_admin'), 20); |
277 } |
277 } |
278 } |
278 } |
279 $session->login_without_crypto($session->username, $newpass); |
279 $session->login_without_crypto($session->username, $newpass); |
280 redirect(makeUrlNS('Special', 'Preferences'), $lang->get('usercp_emailpassword_msg_pass_success'), $lang->get('usercp_emailpassword_msg_password_changed'), 5); |
280 redirect(makeUrlNS('Special', 'Preferences'), $lang->get('usercp_emailpassword_msg_pass_success'), $lang->get('usercp_emailpassword_msg_password_changed'), 5); |
281 } |
281 } |
296 $session->logout(); |
296 $session->logout(); |
297 if ( $email_changed ) |
297 if ( $email_changed ) |
298 { |
298 { |
299 if ( getConfig('account_activation') == 'user' ) |
299 if ( getConfig('account_activation') == 'user' ) |
300 { |
300 { |
301 redirect(makeUrl(getConfig('main_page')), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_user'), 20); |
301 redirect(makeUrl(get_main_page()), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_user'), 20); |
302 } |
302 } |
303 else if ( getConfig('account_activation') == 'admin' ) |
303 else if ( getConfig('account_activation') == 'admin' ) |
304 { |
304 { |
305 redirect(makeUrl(getConfig('main_page')), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_admin'), 20); |
305 redirect(makeUrl(get_main_page()), $lang->get('usercp_emailpassword_msg_profile_success'), $lang->get('usercp_emailpassword_msg_need_activ_admin'), 20); |
306 } |
306 } |
307 } |
307 } |
308 else |
308 else |
309 { |
309 { |
310 $session->login_without_crypto($session->username, $newpass); |
310 $session->login_without_crypto($session->username, $newpass); |