Merge from revision 2236.

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

2 files changed, 13 insertions, 1 deletions

diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index e78ffb01a..02cb2c873 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -93,6 +93,15 @@ function register_user($login, $password, $mail_address,
     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 (count($errors) == 0)
   {
@@ -1227,7 +1236,7 @@ function get_email_address_as_display_text($email_address)
   }
   else
   {
-    if (script_basename() == 'admin' and is_adviser())
+    if (defined('IN_ADMIN') and is_adviser())
     {
       return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
     }
diff --git a/profile.php b/profile.php
index 448fc2c5e..c7c112928 100644
--- a/profile.php
+++ b/profile.php
@@ -41,6 +41,8 @@ if (!defined('PHPWG_ROOT_PATH'))
 
   $userdata = $user;
 
+  trigger_action('loc_begin_profile');
+
   save_profile_from_post($userdata, $errors);
 
   $title= l10n('customize_page_title');
@@ -66,6 +68,7 @@ if (!defined('PHPWG_ROOT_PATH'))
     }
   }
   $template->set_filename('profile', 'profile.tpl');
+  trigger_action('loc_end_profile');
   $template->parse('profile');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');
 }