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

fixes #1902 ability to set a specific group to notify user registrations

Browse Source
This commit is contained in:
plegall
2023-04-22 17:21:20 +02:00
parent 87926235ca
commit 4b33001c15
10 changed files with 170 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_mail.inc.php
+23 -4
View File
@@ -351,7 +351,7 @@ function switch_lang_back()
* @param boolean $send_technical_details - send user IP and browser
* @return boolean
*/
function pwg_mail_notification_admins($subject, $content, $send_technical_details=true)
function pwg_mail_notification_admins($subject, $content, $send_technical_details=true, $group_id=null)
{
if (empty($subject) or empty($content))
{
@@ -397,7 +397,10 @@ function pwg_mail_notification_admins($subject, $content, $send_technical_detail
array(
'filename' => 'notification_admin',
'assign' => $tpl_vars,
)
),
true, // exclude_current_user
false, // only_webmasters
$group_id
);
}
@@ -411,7 +414,7 @@ function pwg_mail_notification_admins($subject, $content, $send_technical_detail
* @param array $tpl - as in pwg_mail()
* @return boolean
*/
function pwg_mail_admins($args=array(), $tpl=array(), $exclude_current_user=true, $only_webmasters=false)
function pwg_mail_admins($args=array(), $tpl=array(), $exclude_current_user=true, $only_webmasters=false, $group_id=null)
{
if (empty($args['content']) and empty($tpl))
{
@@ -430,14 +433,30 @@ function pwg_mail_admins($args=array(), $tpl=array(), $exclude_current_user=true
// get admins (except ourself)
$query = '
SELECT
i.user_id,
u.'.$conf['user_fields']['username'].' AS name,
u.'.$conf['user_fields']['email'].' AS email
FROM '.USERS_TABLE.' AS u
JOIN '.USER_INFOS_TABLE.' AS i
ON i.user_id = u.'.$conf['user_fields']['id'].'
ON i.user_id = u.'.$conf['user_fields']['id'];
if (!is_null($group_id))
{
$query.= '
JOIN '.USER_GROUP_TABLE.' AS ug
ON ug.user_id = i.user_id';
}
$query.= '
WHERE i.status in (\''.implode("','", $user_statuses).'\')
AND u.'.$conf['user_fields']['email'].' IS NOT NULL';
if (!is_null($group_id))
{
$query.= '
AND group_id = '.intval($group_id);
}
if ($exclude_current_user)
{
$query.= '