Changeset 2237

Timestamp:

Mar 1, 2008, 4:29:29 PM (16 years ago)

Author:

patdenice

Message:

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.

Location:

trunk

Files:

• include/functions_user.inc.php (modified) (2 diffs)
• profile.php (modified) (2 diffs)

trunk/include/functions_user.inc.php

@@ -94 +94 @@
   }
 
+  $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)
@@ -1228 +1237 @@
   else
   {
-    if (script_basename() == 'admin' and is_adviser())
+    if (defined('IN_ADMIN') and is_adviser())
     {
       return 'adviser.mode@'.$_SERVER['SERVER_NAME'];

trunk/profile.php

@@ -42 +42 @@
   $userdata = $user;
 
+  trigger_action('loc_begin_profile');
+
   save_profile_from_post($userdata, $errors);
 
@@ -67 +69 @@
   }
   $template->set_filename('profile', 'profile.tpl');
+  trigger_action('loc_end_profile');
   $template->parse('profile');
   include(PHPWG_ROOT_PATH.'include/page_tail.php');