Issue 0000684: History [Search] - Add a thumbnail display

  o Display choice can be selected
  o Display choice is saved on on cookie
  o Small improvement picture link (hoverbox on all the link, alt&title on classic mode)
  o New cookie functions and use


Enhance computing method of script_basename function.

http://forum.phpwebgallery.net/viewtopic.php?pid=58258#p58258

Merge BSF 1988:1989 into branch-1_7

git-svn-id: http://piwigo.org/svn/trunk@1992 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 28 insertions, 43 deletions

diff --git a/include/functions_rate.inc.php b/include/functions_rate.inc.php
index 3fe1a668e..a0486bd55 100644
--- a/include/functions_rate.inc.php
+++ b/include/functions_rate.inc.php
@@ -4,8 +4,7 @@
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -59,57 +58,43 @@ function rate_picture($image_id, $rate)
     }
     $anonymous_id = implode ('.', $ip_components);
 
-    if (isset($_COOKIE['pwg_anonymous_rater']))
-    {
-      if ($anonymous_id != $_COOKIE['pwg_anonymous_rater'])
-      { // client has changed his IP adress or he's trying to fool us
-        $query = '
+    $save_anonymous_id = pwg_get_cookie_var('anonymous_rater', $anonymous_id);
+
+    if ($anonymous_id != $save_anonymous_id)
+    { // client has changed his IP adress or he's trying to fool us
+      $query = '
 SELECT element_id
-  FROM '.RATE_TABLE.'
-  WHERE user_id = '.$user['id'].'
-    AND anonymous_id = \''.$anonymous_id.'\'
+FROM '.RATE_TABLE.'
+WHERE user_id = '.$user['id'].'
+  AND anonymous_id = \''.$anonymous_id.'\'
 ;';
-        $already_there = array_from_query($query, 'element_id');
+      $already_there = array_from_query($query, 'element_id');
 
-        if (count($already_there) > 0)
-        {
-          $query = '
+      if (count($already_there) > 0)
+      {
+        $query = '
 DELETE
-  FROM '.RATE_TABLE.'
-  WHERE user_id = '.$user['id'].'
-    AND anonymous_id = \''.$_COOKIE['pwg_anonymous_rater'].'\'
-    AND element_id NOT IN ('.implode(',', $already_there).')
+FROM '.RATE_TABLE.'
+WHERE user_id = '.$user['id'].'
+  AND anonymous_id = \''.$save_anonymous_id.'\'
+  AND element_id NOT IN ('.implode(',', $already_there).')
 ;';
-           pwg_query($query);
-         }
+         pwg_query($query);
+       }
 
-         $query = '
+       $query = '
 UPDATE
-  '.RATE_TABLE.'
-  SET anonymous_id = \'' .$anonymous_id.'\'
-  WHERE user_id = '.$user['id'].'
-    AND anonymous_id = \'' . $_COOKIE['pwg_anonymous_rater'].'\'
+'.RATE_TABLE.'
+SET anonymous_id = \'' .$anonymous_id.'\'
+WHERE user_id = '.$user['id'].'
+  AND anonymous_id = \'' . $save_anonymous_id.'\'
 ;';
-         pwg_query($query);
+       pwg_query($query);
+    } // end client changed ip
 
-         setcookie(
-            'pwg_anonymous_rater',
-            $anonymous_id,
-            strtotime('+10 years'),
-            cookie_path()
-           );
-      } // end client changed ip
-    } // end client has cookie
-    else
-    {
-      setcookie(
-          'pwg_anonymous_rater',
-          $anonymous_id,
-          strtotime('+10 years'),
-          cookie_path()
-          );
-    }
+  pwg_get_cookie_var('anonymous_rater', $anonymous_id);
   } // end anonymous user
+
   $query = '
 DELETE
   FROM '.RATE_TABLE.'