merge 3145-3146 from trunk

Last (I hope) paranoic optims ...
- move get_uysername and get_groupname from public to admin/functions.inc.php
- optim in index.php
- tags.tpl does not need smarty modifier included
- move func get_comment_post_key from functions_comment to functions (avoid extra inclusion every time on picture page)

git-svn-id: http://piwigo.org/svn/branches/2.0@3147 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 21 deletions

diff --git a/include/functions_comment.inc.php b/include/functions_comment.inc.php
index 9dca86146..c8dd6f3e0 100644
--- a/include/functions_comment.inc.php
+++ b/include/functions_comment.inc.php
@@ -21,26 +21,6 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-/**
- * returns a "secret key" that is to be sent back when a user enters a comment
- */
-function get_comment_post_key($image_id)
-{
-  global $conf;
-
-  $time = time();
-
-  return sprintf(
-    '%s:%s',
-    $time,
-    hash_hmac(
-      'md5',
-      $time.':'.$image_id,
-      $conf['secret_key']
-      )
-    );
-}
-
 //returns string action to perform on a new comment: validate, moderate, reject
 function user_comment_check($action, $comment)
 {
@@ -189,7 +169,7 @@ INSERT INTO '.COMMENTS_TABLE.'
     if
       (
         ($comment_action=='validate' and $conf['email_admin_on_comment'])
-        or 
+        or
         ($comment_action!='validate' and $conf['email_admin_on_comment_validation'])
       )
     {