adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000784: Mail notification disabled on register user

Browse Source 
Merge branch-1_7 2176:2177 into BSF

git-svn-id: http://piwigo.org/svn/trunk@2178 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2007-12-11 06:10:38 +00:00
parent 24553207a9
commit 89623393d4
4 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_user.inc.php
+40 -17
View File
@@ -66,7 +66,8 @@ where upper('.$conf['user_fields']['email'].') = upper(\''.$mail_address.'\')
}
}
function register_user($login, $password, $mail_address, $errors = array())
function register_user($login, $password, $mail_address,
$with_notification = true, $errors = array())
{
global $conf;
@@ -113,28 +114,29 @@ SELECT MAX('.$conf['user_fields']['id'].') + 1
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts(USERS_TABLE, array_keys($insert), array($insert));
// Assign by default groups
{
$query = '
// Assign by default groups
{
$query = '
SELECT id
FROM '.GROUPS_TABLE.'
WHERE is_default = \''.boolean_to_string(true).'\'
ORDER BY id ASC
;';
$result = pwg_query($query);
$result = pwg_query($query);
$inserts = array();
while ($row = mysql_fetch_array($result))
{
array_push
(
$inserts,
array
$inserts = array();
while ($row = mysql_fetch_array($result))
{
array_push
(
'user_id' => $next_id,
'group_id' => $row['id']
)
);
$inserts,
array
(
'user_id' => $next_id,
'group_id' => $row['id']
)
);
}
}
if (count($inserts) != 0)
@@ -142,10 +144,31 @@ SELECT id
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
mass_inserts(USER_GROUP_TABLE, array('user_id', 'group_id'), $inserts);
}
}
create_user_infos($next_id);
if ($with_notification and $conf['email_admin_on_new_user'])
{
include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
$username = $_POST['login'];
$admin_url = get_absolute_root_url()
.'admin.php?page=user_list&username='.$username;
$keyargs_content = array
(
get_l10n_args('User: %s', $username),
get_l10n_args('Email: %s', $_POST['mail_address']),
get_l10n_args('', ''),
get_l10n_args('Admin: %s', $admin_url)
);
pwg_mail_notification_admins
(
get_l10n_args('Registration of %s', $username),
$keyargs_content
);
}
trigger_action('register_user',
array(
'id'=>$next_id,