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

since number of accepted args not required for add_event_handler, simplify calls

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@28714 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2014-06-18 19:51:42 +00:00
parent f894f1208c
commit 3c13387dfd
7 changed files with 59 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_comment.inc.php
+15 -16
View File
@@ -24,10 +24,9 @@
/**
* @package functions\comment
*/
add_event_handler('user_comment_check', 'user_comment_check',
EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
add_event_handler('user_comment_check', 'user_comment_check');
/**
* Does basic check on comment and returns action to perform.
@@ -143,7 +142,7 @@ SELECT COUNT(*) AS user_exists
$comment_action='reject';
$_POST['cr'][] = 'key'; // rvelices: I use this outside to see how spam robots work
}
// website
if (!empty($comm['website_url']))
{
@@ -158,7 +157,7 @@ SELECT COUNT(*) AS user_exists
$comment_action='reject';
}
}
// email
if (empty($comm['email']))
{
@@ -177,7 +176,7 @@ SELECT COUNT(*) AS user_exists
$infos[] = l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)');
$comment_action='reject';
}
// anonymous id = ip address
$ip_components = explode('.', $comm['ip']);
if (count($ip_components) > 3)
@@ -283,23 +282,23 @@ function delete_user_comment($comment_id)
{
$user_where_clause = ' AND author_id = \''.$GLOBALS['user']['id'].'\'';
}
if (is_array($comment_id))
$where_clause = 'id IN('.implode(',', $comment_id).')';
else
$where_clause = 'id = '.$comment_id;
$query = '
DELETE FROM '.COMMENTS_TABLE.'
WHERE '.$where_clause.
$user_where_clause.'
;';
if ( pwg_db_changes(pwg_query($query)) )
{
invalidate_user_cache_nb_comments();
email_admin('delete',
email_admin('delete',
array('author' => $GLOBALS['user']['username'],
'comment_id' => $comment_id
));
@@ -383,9 +382,9 @@ UPDATE '.COMMENTS_TABLE.'
$user_where_clause.'
;';
$result = pwg_query($query);
// mail admin and ask to validate the comment
if ($result and $conf['email_admin_on_comment_validation'] and 'moderate' == $comment_action)
if ($result and $conf['email_admin_on_comment_validation'] and 'moderate' == $comment_action)
{
include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
@@ -411,7 +410,7 @@ $user_where_clause.'
'content' => stripslashes($comment['content'])) );
}
}
return $comment_action;
}
@@ -482,7 +481,7 @@ SELECT
return false;
}
}
list($author_id) = pwg_db_fetch_row($result);
return $author_id;
@@ -499,7 +498,7 @@ function validate_user_comment($comment_id)
$where_clause = 'id IN('.implode(',', $comment_id).')';
else
$where_clause = 'id = '.$comment_id;
$query = '
UPDATE '.COMMENTS_TABLE.'
SET validated = \'true\'
@@ -507,7 +506,7 @@ UPDATE '.COMMENTS_TABLE.'
WHERE '.$where_clause.'
;';
pwg_query($query);
invalidate_user_cache_nb_comments();
trigger_notify('user_comment_validation', $comment_id);
}