From 1b90ca176434d9e57b8be750216eb637b4685b47 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 28 May 2010 19:55:03 +0000 Subject: - merged the linkroot integration with the existing gallery_url (unique $conf['gallery_url'] used for RSS, mail homepage root in the browse path) - added an option $conf['debug_mail'] - if set all outgoing mails are saved into local_data_dir git-svn-id: http://piwigo.org/svn/branches/2.1@6410 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions_notification_by_mail.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'admin/include') diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index 4dccabb69..31175b55c 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -93,7 +93,7 @@ function quote_check_key_list($check_key_list = array()) } /* - * Execute all main queries to get list of user + * Execute all main queries to get list of user * * Type are the type of list 'subscribe', 'send' * @@ -110,7 +110,7 @@ function get_user_notifications($action, $check_key_list = array(), $enabled_fil $quoted_check_key_list = quote_check_key_list($check_key_list); if (count($quoted_check_key_list) != 0 ) { - $query_and_check_key = ' and + $query_and_check_key = ' and check_key in ('.implode(",", $quoted_check_key_list).') '; } else @@ -131,7 +131,7 @@ from '.USERS_TABLE.' as U where N.user_id = U.'.$conf['user_fields']['id']; - + if ($action == 'send') { // No mail empty and all users enabled @@ -418,7 +418,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su ( $section_action_by => true, 'GOTO_GALLERY_TITLE' => $conf['gallery_title'], - 'GOTO_GALLERY_URL' => $conf['gallery_url'], + 'GOTO_GALLERY_URL' => get_gallery_home_url(), ) ); @@ -523,4 +523,4 @@ function subscribe_notification_by_mail($is_admin_request, $check_key_list = arr return do_subscribe_unsubscribe_notification_by_mail($is_admin_request, true, $check_key_list); } -?> +?> \ No newline at end of file -- cgit v1.2.3