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

5 files changed, 32 insertions, 102 deletions

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 1675dbce8..83c9980de 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -493,7 +493,6 @@ function get_languages($target_charset = null)
   }
   closedir($dir);
   @asort($languages);
-  @reset($languages);
 
   return $languages;
 }
@@ -1373,17 +1372,6 @@ function load_language($filename, $dirname = '',
       $source_file = $f;
       break;
     }
-
-    if ($target_charset=='utf-8')
-    { // we accept conversion from ISO-8859-1 to UTF-8
-      $f = $dir.'.iso-8859-1/'.$filename;
-      if (file_exists($f))
-      {
-        $source_charset = 'iso-8859-1';
-        $source_file = $f;
-        break;
-      }
-    }
   }
 
   if ( !empty($source_file) )
@@ -1483,4 +1471,26 @@ function secure_directory($dir)
     @file_put_contents($file, 'Not allowed!');
   }
 }
+
+/**
+ * returns a "secret key" that is to be sent back when a user enters a comment
+ *
+ * @param int image_id
+ */
+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']
+      )
+    );
+}
 ?>
\ No newline at end of file
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'])
       )
     {
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 1b85ba44f..d7ef88992 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -673,34 +673,6 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
 }
 
 /**
- * returns the username corresponding to the given user identifier if exists
- *
- * @param int user_id
- * @return mixed
- */
-function get_username($user_id)
-{
-  global $conf;
-
-  $query = '
-SELECT '.$conf['user_fields']['username'].'
-  FROM '.USERS_TABLE.'
-  WHERE '.$conf['user_fields']['id'].' = '.intval($user_id).'
-;';
-  $result = pwg_query($query);
-  if (mysql_num_rows($result) > 0)
-  {
-    list($username) = mysql_fetch_row($result);
-  }
-  else
-  {
-    return false;
-  }
-
-  return $username;
-}
-
-/**
  * returns user identifier thanks to his name, false if not found
  *
  * @param string username
@@ -934,34 +906,6 @@ function create_user_infos($arg_id, $override_values = null)
 }
 
 /**
- * returns the groupname corresponding to the given group identifier if
- * exists
- *
- * @param int group_id
- * @return mixed
- */
-function get_groupname($group_id)
-{
-  $query = '
-SELECT name
-  FROM '.GROUPS_TABLE.'
-  WHERE id = '.intval($group_id).'
-;';
-  $result = pwg_query($query);
-  if (mysql_num_rows($result) > 0)
-  {
-    list($groupname) = mysql_fetch_row($result);
-  }
-  else
-  {
-    return false;
-  }
-
-  return $groupname;
-}
-
-
-/**
  * returns the auto login key or false on error
  * @param int user_id
  * @param time_t time
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index eb2cd710b..73b245b6b 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -88,11 +88,11 @@ elseif ( isset($_POST['content']) )
 
 if ($page['show_comments'])
 {
-  // number of comment for this picture
-  $query = 'SELECT COUNT(*) AS nb_comments';
-  $query.= ' FROM '.COMMENTS_TABLE.' WHERE image_id = '.$page['image_id'];
-  $query.= " AND validated = 'true'";
-  $query.= ';';
+  // number of comments for this picture
+  $query = '
+SELECT COUNT(*) AS nb_comments
+  FROM '.COMMENTS_TABLE.'
+  WHERE image_id='.$page['image_id']." AND validated = 'true'";
   $row = mysql_fetch_array( pwg_query( $query ) );
 
   // navigation bar creation
@@ -160,7 +160,6 @@ SELECT id,author,date,image_id,content
   if (!is_a_guest()
       or (is_a_guest() and $conf['comments_forall']))
   {
-    include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
     $key = get_comment_post_key($page['image_id']);
     $content = '';
     if ('reject'===@$comment_action)
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index fd87ef02e..a85fa2e4b 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -522,8 +522,6 @@ SELECT DISTINCT image_id
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid image_id");
   }
 
-  include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
-
   $comm = array(
     'author' => trim( stripslashes($params['author']) ),
     'content' => trim( stripslashes($params['content']) ),
@@ -702,7 +700,6 @@ SELECT id, date, author, content
       )
       )
   {
-    include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
     $comment_post_data['author'] = $user['username'];
     $comment_post_data['key'] = get_comment_post_key($params['image_id']);
   }
@@ -1041,15 +1038,15 @@ SELECT
     {
       // last chance to make the directory writable
       @chmod($high_dir, 0777);
-      
+
       if (!is_writable($high_dir))
       {
         return new PwgError(500, 'high directory has no write access');
       }
     }
-    
+
     secure_directory($high_dir);
-    
+
     // high resolution path, same name as web size file
     $high_path = sprintf(
       '%s/%s.%s',
@@ -1617,7 +1614,7 @@ SELECT
         {
           $current_rank_of[$cat_id] = 0;
         }
-        
+
         if ('auto' == $rank_on_category[$cat_id])
         {
           $rank_on_category[$cat_id] = $current_rank_of[$cat_id] + 1;