aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-06-01 19:52:44 +0000
committerrvelices <rv-github@modusoptimus.com>2010-06-01 19:52:44 +0000
commit2a99a22130e448409e05aa58d314ce2b1ecfb7eb (patch)
tree9c31e3a7bbdb5d3fdd32fbcc696b6d9b6f797578 /include
parentd7b71e2167dc0a9d551af08b6fc53c03b431cee3 (diff)
- do not remove slashes before calling insert_user_comment (homogeneity with update_user_comment and general use of slashes in piwigo)
- when using a modifier on a non array variable use @| instead of | (generated code is simpler and faster) git-svn-id: http://piwigo.org/svn/trunk@6437 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/functions_comment.inc.php17
-rw-r--r--include/picture_comment.inc.php6
-rw-r--r--include/ws_functions.inc.php6
3 files changed, 7 insertions, 22 deletions
diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php
index 454895832..9b7736219 100644
--- a/include/functions_comment.inc.php
+++ b/include/functions_comment.inc.php
@@ -158,7 +158,7 @@ INSERT INTO '.COMMENTS_TABLE.'
VALUES (
"'.$comm['author'].'",
'.$comm['author_id'].',
- "'.pwg_db_real_escape_string($comm['content']).'",
+ "'.$comm['content'].'",
NOW(),
"'.($comment_action=='validate' ? 'true':'false').'",
'.($comment_action=='validate' ? 'NOW()':'NULL').',
@@ -257,21 +257,6 @@ function update_user_comment($comment, $post_key)
$comment_action='reject';
}
-/* ? this is a MySql Error - author_id is not defined
- if ($comment_action!='reject' and $conf['anti-flood_time']>0 )
- { // anti-flood system
- $reference_date = time() - $conf['anti-flood_time'];
- $query = '
-SELECT id FROM '.COMMENTS_TABLE.'
- WHERE date > FROM_UNIXTIME('.$reference_date.')
- AND author_id = '.$comm['author_id'];
- if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
- {
- //?? array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
- $comment_action='reject';
- }
- }
-*/
// perform more spam check
$comment_action =
trigger_event('user_comment_check',
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index ac0cd9356..cc4970a34 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -46,8 +46,8 @@ if ( $page['show_comments'] and isset( $_POST['content'] ) )
}
$comm = array(
- 'author' => trim( stripslashes(@$_POST['author']) ),
- 'content' => trim( stripslashes($_POST['content']) ),
+ 'author' => trim( @$_POST['author'] ),
+ 'content' => trim( $_POST['content'] ),
'image_id' => $page['image_id'],
);
@@ -237,7 +237,7 @@ SELECT
$content = '';
if ('reject'===@$comment_action)
{
- $content = htmlspecialchars($comm['content']);
+ $content = htmlspecialchars( stripslashes($comm['content']) );
}
$template->assign('comment_add',
array(
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 32967fb5d..eee2c3f14 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -548,8 +548,8 @@ SELECT DISTINCT image_id
}
$comm = array(
- 'author' => trim( stripslashes($params['author']) ),
- 'content' => trim( stripslashes($params['content']) ),
+ 'author' => trim( $params['author'] ),
+ 'content' => trim( $params['content'] ),
'image_id' => $params['image_id'],
);
@@ -1356,7 +1356,7 @@ function ws_session_getStatus($params, &$service)
global $user;
$res = array();
$res['username'] = is_a_guest() ? 'guest' : stripslashes($user['username']);
- foreach ( array('status', 'template', 'theme', 'language') as $k )
+ foreach ( array('status', 'theme', 'language') as $k )
{
$res[$k] = $user[$k];
}