aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2014-07-20 21:32:56 +0000
committerrvelices <rv-github@modusoptimus.com>2014-07-20 21:32:56 +0000
commit4047d8cc8b59df387c39e44f811a893b505603d4 (patch)
tree2461d3907c6f31e29d23d4e1101a6d5fe0647e8a /admin
parentf35908237c3d5f4302b0e0504649b048aa3be70b (diff)
bug 3100 display IP address of comment author on admin page and also save the entire ip address in the database, not only the first three ip components
git-svn-id: http://piwigo.org/svn/trunk@29060 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/comments.php4
-rw-r--r--admin/themes/default/template/comments.tpl2
2 files changed, 4 insertions, 2 deletions
diff --git a/admin/comments.php b/admin/comments.php
index 7a5ec4642..2666cc27b 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -167,7 +167,8 @@ SELECT
c.content,
i.path,
i.representative_ext,
- validated
+ validated,
+ c.anonymous_id
FROM '.COMMENTS_TABLE.' AS c
INNER JOIN '.IMAGES_TABLE.' AS i
ON i.id = c.image_id
@@ -204,6 +205,7 @@ while ($row = pwg_db_fetch_assoc($result))
'DATE' => format_date($row['date'], array('day_name','day','month','year','time')),
'CONTENT' => trigger_change('render_comment_content',$row['content']),
'IS_PENDING' => ('false' == $row['validated']),
+ 'IP' => $row['anonymous_id'],
)
);
diff --git a/admin/themes/default/template/comments.tpl b/admin/themes/default/template/comments.tpl
index 3b3a40422..6e0c351c2 100644
--- a/admin/themes/default/template/comments.tpl
+++ b/admin/themes/default/template/comments.tpl
@@ -65,7 +65,7 @@ jQuery(document).ready(function(){
<td>
<div class="comment">
<a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}"></a>
- <p class="commentHeader">{if $comment.IS_PENDING}<span class="pendingFlag">{'Waiting'|@translate}</span> - {/if}<strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p>
+ <p class="commentHeader">{if $comment.IS_PENDING}<span class="pendingFlag">{'Waiting'|@translate}</span> - {/if}{if !empty($comment.IP)}{$comment.IP} - {/if}<strong>{$comment.AUTHOR}</strong> - <em>{$comment.DATE}</em></p>
<blockquote>{$comment.CONTENT}</blockquote>
</div>
</td>