3 files changed, 39 insertions, 0 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 4a4bc7038..fb752fae8 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -501,6 +501,9 @@ $conf['nbm_max_treatment_timeout_percent'] = 0.8;
 // nbm_treatment_timeout_default is used by default
 $conf['nbm_treatment_timeout_default'] = 20;
 
+// Send an email to the webmaster when a new user registers
+$conf['email_admin_on_new_user']=false;
+
 // +-----------------------------------------------------------------------+
 // | Set default admin layout                                              |
 // +-----------------------------------------------------------------------+
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index 22c91d1e6..0d2ea4a7e 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -52,6 +52,21 @@ function get_root_url()
 }
 
 /**
+ * returns the url of the current host (e.g. http://www.toto.com )
+ * TODO: if required by someone, treat https case
+ */
+function get_host_url()
+{
+  $url = "http://";
+  $url .= $_SERVER['HTTP_HOST'];
+  if ($_SERVER['SERVER_PORT']!=80)
+  {
+    $url .= ':'.$_SERVER['SERVER_PORT'];
+  }
+  return $url;
+}
+
+/**
  * adds one or more _GET style parameters to an url
  * example: add_url_params('/x', array('a'=>'b')) returns /x?a=b
  * add_url_params('/x?cat_id=10', array('a'=>'b')) returns /x?cat_id=10&a=b
diff --git a/register.php b/register.php
index cc27dc4dc..c7dc95ee9 100644
--- a/register.php
+++ b/register.php
@@ -48,6 +48,27 @@ if (isset($_POST['submit']))
   if (count($errors) == 0)
   {
     $user_id = get_userid($_POST['login']);
+    log_user( $user_id, false);
+
+    if ($conf['email_admin_on_new_user'])
+    {
+      include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+      $username = $_POST['login'];
+      $admin_url = get_host_url().cookie_path()
+        .'admin.php?page=user_list&username='.$username;
+
+      $content =
+        'User: '.$username."\n"
+        .'Mail: '.$_POST['mail_address']."\n"
+        .'IP: '.$_SERVER['REMOTE_ADDR']."\n"
+        .'Browser: '.$_SERVER['HTTP_USER_AGENT']."\n\n"
+        .l10n('admin').': '.$admin_url;
+
+      pwg_mail( get_webmaster_mail_address(), '',
+          'PWG '.l10n('register_title').' '.$username,
+          $content
+          );
+    }
     redirect(make_index_url());
   }
 }