Changeset 2100

Timestamp:

Sep 20, 2007, 6:33:10 AM (17 years ago)

Author:

rvelices

Message:

merge -r 2099 from branch-1_7 to trunk + fix typo (replace get_cookie_var with set_cookie_var)

• fix very rare sql error (duplicate key) for rating

File:

• trunk/include/functions_rate.inc.php (modified) (6 diffs)

trunk/include/functions_rate.inc.php

@@ -50 +50 @@
   }
 
+  $ip_components = explode('.', $_SERVER["REMOTE_ADDR"]);
+  if (count($ip_components) > 3)
+  {
+    array_pop($ip_components);
+  }
+  $anonymous_id = implode ('.', $ip_components);
+
   if ($user_anonymous)
   {
-    $ip_components = explode('.', $_SERVER["REMOTE_ADDR"]);
-    if (count($ip_components) > 3)
-    {
-      array_pop($ip_components);
-    }
-    $anonymous_id = implode ('.', $ip_components);
-
     $save_anonymous_id = pwg_get_cookie_var('anonymous_rater', $anonymous_id);
 
@@ -65 +65 @@
       $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');
@@ -75 +75 @@
         $query = '
 DELETE
-FROM '.RATE_TABLE.'
-WHERE user_id = '.$user['id'].'
-  AND anonymous_id = \''.$save_anonymous_id.'\'
-  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 IN ('.implode(',', $already_there).')
 ;';
          pwg_query($query);
@@ -84 +84 @@
 
        $query = '
-UPDATE
-'.RATE_TABLE.'
-SET anonymous_id = \'' .$anonymous_id.'\'
-WHERE user_id = '.$user['id'].'
-  AND anonymous_id = \'' . $save_anonymous_id.'\'
+UPDATE '.RATE_TABLE.'
+  SET anonymous_id = \'' .$anonymous_id.'\'
+  WHERE user_id = '.$user['id'].'
+    AND anonymous_id = \'' . $save_anonymous_id.'\'
 ;';
        pwg_query($query);
     } // end client changed ip
 
-  pwg_get_cookie_var('anonymous_rater', $anonymous_id);
+    pwg_set_cookie_var('anonymous_rater', $anonymous_id);
   } // end anonymous user
 
@@ -100 +99 @@
   FROM '.RATE_TABLE.'
   WHERE element_id = '.$image_id.'
-  AND user_id = '.$user['id'].'
+    AND user_id = '.$user['id'].'
 ';
-  if (isset($anonymous_id))
+  if (isset($user_anonymous))
   {
     $query.= ' AND anonymous_id = \''.$anonymous_id.'\'';
@@ -114 +113 @@
   ('
     .$user['id'].','
-    .(isset($anonymous_id) ? '\''.$anonymous_id.'\'' : "''").','
+    .'\''.$anonymous_id.'\','
     .$image_id.','
     .$rate