diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/configuration.php | 4 | ||||
| -rw-r--r-- | admin/include/functions_notification_by_mail.inc.php | 10 | ||||
| -rw-r--r-- | admin/notification_by_mail.php | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/admin/configuration.php b/admin/configuration.php index 83a44004e..0f088cc3e 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -114,10 +114,6 @@ if (isset($_POST['submit']) and !is_adviser()) { case 'main' : { - if ( !url_is_remote($_POST['gallery_url']) ) - { - array_push($page['errors'], l10n('The gallery URL is not valid.')); - } foreach( $main_checkboxes as $checkbox) { $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true'; 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 diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index eb36beb00..602c67394 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -381,7 +381,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l array ( 'GOTO_GALLERY_TITLE' => $conf['gallery_title'], - 'GOTO_GALLERY_URL' => $conf['gallery_url'], + 'GOTO_GALLERY_URL' => get_gallery_home_url(), 'SEND_AS_NAME' => $env_nbm['send_as_name'], ) ); |