mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-10 18:53:01 +02:00
Add notification when a picture is loaded.
Change little translations. Improve mail sent. git-svn-id: http://piwigo.org/svn/trunk@1901 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -194,20 +194,20 @@ INSERT INTO '.COMMENTS_TABLE.'
|
||||
{
|
||||
include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
|
||||
|
||||
$del_url = get_absolute_root_url().'comments.php?delete='.$comm['id'];
|
||||
$del_url =
|
||||
get_absolute_root_url().'comments.php?delete='.$comm['id'];
|
||||
|
||||
$content =
|
||||
'Author: '.$comm['author']."\n"
|
||||
'Author: '.$comm['author']."\n"
|
||||
.'Comment: '.$comm['content']."\n"
|
||||
.'IP: '.$comm['ip']."\n"
|
||||
.'Browser: '.$comm['agent']."\n\n"
|
||||
.get_block_mail_admin_info()
|
||||
.'Delete: '.$del_url."\n";
|
||||
|
||||
if ($comment_action!='validate')
|
||||
{
|
||||
$content .=
|
||||
'Validate: '.get_absolute_root_url()
|
||||
.'comments.php?validate='.$comm['id'];
|
||||
'Validate: '
|
||||
.get_absolute_root_url().'comments.php?validate='.$comm['id'];
|
||||
}
|
||||
|
||||
pwg_mail
|
||||
|
||||
@@ -196,6 +196,19 @@ order by
|
||||
return $result;
|
||||
}
|
||||
|
||||
/* Return a standard block useful for admin mail */
|
||||
function get_block_mail_admin_info()
|
||||
{
|
||||
global $user;
|
||||
|
||||
return
|
||||
"\n"
|
||||
.'Connected user: '.$user['username']."\n"
|
||||
.'IP: '.$_SERVER['REMOTE_ADDR']."\n"
|
||||
.'Browser: '.$_SERVER['HTTP_USER_AGENT']."\n"
|
||||
."\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* sends an email, using PhpWebGallery specific informations
|
||||
*
|
||||
@@ -373,7 +386,12 @@ function pwg_mail($to, $args = array())
|
||||
// Content
|
||||
if (($args['content_format'] == 'text/plain') and ($args['email_format'] == 'text/html'))
|
||||
{
|
||||
$content.= '<p>'.nl2br(htmlentities($args['content'])).'</p>';
|
||||
$content.= '<p>'.
|
||||
nl2br(
|
||||
preg_replace("/(http:\/\/)([^\s,]*)/i",
|
||||
"<a href='$1$2'>$1$2</a>",
|
||||
htmlentities($args['content']))).
|
||||
'</p>';
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user