archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from revision 2236.

Browse source 
801: add trigger in register_user function.
805: add 2 triggers in profile.php.
769: correct get_email_address_as_display_text function.

git-svn-id: http://piwigo.org/svn/trunk@2237 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2008-03-01 15:29:29 +00:00
parent 2ef8c58d31
commit 7bff25884c
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/functions_user.inc.php
View file

@ -93,6 +93,15 @@ function register_user($login, $password, $mail_address,
array_push($errors, $mail_error); array_push($errors, $mail_error);
} }
$errors = trigger_event('register_user_check',
$errors,
array(
'login'=>$login,
'password'=>$password,
'email'=>$mail_address,
)
);
// if no error until here, registration of the user // if no error until here, registration of the user
if (count($errors) == 0) if (count($errors) == 0)
{ {
@ -1227,7 +1236,7 @@ function get_email_address_as_display_text($email_address)
} }
else else
{ {
if (script_basename() == 'admin' and is_adviser()) if (defined('IN_ADMIN') and is_adviser())
{ {
return 'adviser.mode@'.$_SERVER['SERVER_NAME']; return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
} }

3
profile.php
View file

@ -41,6 +41,8 @@ if (!defined('PHPWG_ROOT_PATH'))
$userdata = $user; $userdata = $user;
trigger_action('loc_begin_profile');
save_profile_from_post($userdata, $errors); save_profile_from_post($userdata, $errors);
$title= l10n('customize_page_title'); $title= l10n('customize_page_title');
@ -66,6 +68,7 @@ if (!defined('PHPWG_ROOT_PATH'))
} }
} }
$template->set_filename('profile', 'profile.tpl'); $template->set_filename('profile', 'profile.tpl');
trigger_action('loc_end_profile');
$template->parse('profile'); $template->parse('profile');
include(PHPWG_ROOT_PATH.'include/page_tail.php'); include(PHPWG_ROOT_PATH.'include/page_tail.php');
} }