Changeset 3452

Timestamp:

Jun 24, 2009, 9:00:40 PM (15 years ago)

Author:

nikrou

Message:

Fix two problem with Feature 1026 :
use of $confuser_fieldsusername and $confuser_fieldsid instead of username and id
escape comment content before editing it.

Location:

trunk

Files:

• admin/comments.php (modified) (1 diff)
• comments.php (modified) (4 diffs)
• include/picture_comment.inc.php (modified) (1 diff)
• template/yoga/comment_list.tpl (modified) (1 diff)

trunk/admin/comments.php

@@ -135 +135 @@
 
 $query = '
-SELECT c.id, c.image_id, c.date, c.author, u.username, c.content, i.path, i.tn_ext
+SELECT c.id, c.image_id, c.date, c.author, '.
+$conf['user_fields']['username'].' AS username, c.content, i.path, i.tn_ext
   FROM '.COMMENTS_TABLE.' AS c
     INNER JOIN '.IMAGES_TABLE.' AS i
       ON i.id = c.image_id
     LEFT JOIN '.USERS_TABLE.' AS u
-      ON u.id = c.author_id
+      ON u.'.$conf['user_fields']['id'].' = c.author_id
   WHERE validated = \'false\'
   ORDER BY c.date DESC

trunk/comments.php

@@ -102 +102 @@
 {
   $page['where_clauses'][] = 
-    'u.username = \''.addslashes($_GET['author']).'\'
+    'u.'.$conf['user_fields']['username'].' = \''.addslashes($_GET['author']).'\'
      OR author = \''.addslashes($_GET['author']).'\'';    
 }
@@ -269 +269 @@
     ON ic.image_id = com.image_id
     LEFT JOIN '.USERS_TABLE.' As u
-    ON u.id = com.author_id
+    ON u.'.$conf['user_fields']['id'].' = com.author_id
   WHERE '.implode('
     AND ', $page['where_clauses']).'
@@ -301 +301 @@
      , com.author
      , com.author_id
-     , username
+     , '.$conf['user_fields']['username'].' AS username
      , com.date
      , com.content
@@ -309 +309 @@
     ON ic.image_id = com.image_id
     LEFT JOIN '.USERS_TABLE.' AS u
-    ON u.id = com.author_id
+    ON u.'.$conf['user_fields']['id'].' = com.author_id
   WHERE '.implode('
     AND ', $page['where_clauses']).'

trunk/include/picture_comment.inc.php

@@ -129 +129 @@
 
     $query = '
-SELECT com.id,author,author_id,username,date,image_id,content,validated
+SELECT com.id,author,author_id,'.$conf['user_fields']['username'].' AS username,
+  date,image_id,content,validated
   FROM '.COMMENTS_TABLE.' AS com
   LEFT JOIN '.USERS_TABLE.' AS u
-    ON u.id = author_id
+    ON u.'.$conf['user_fields']['id'].' = author_id
   WHERE image_id = '.$page['image_id'].
 $validated_clause.'

trunk/template/yoga/comment_list.tpl

@@ -43 +43 @@
         <fieldset>
           <legend>{'Edit a comment'|@translate}</legend>
-          <label>{'comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT}</textarea></label>
+          <label>{'comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|escape}</textarea></label>
           <input type="hidden" name="key" value="{$comment.KEY}">
           <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|default:$current.id}">