From 745b1466fc76d5ded589e2469328086002430c1c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 22 Feb 2006 16:58:00 -0500
Subject: [PATCH] Updated localizations

---
 program/include/cache.inc |   74 +++++++++++++++++--------------------
 1 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/program/include/cache.inc b/program/include/cache.inc
index b1e6b93..06e0681 100644
--- a/program/include/cache.inc
+++ b/program/include/cache.inc
@@ -25,13 +25,12 @@
   global $DB, $CACHE_KEYS;
   
   // query db
-  $sql_result = $DB->query(sprintf("SELECT cache_id, data
-                                    FROM   %s
-                                    WHERE  user_id=%d
-                                    AND    cache_key='%s'",
-                                   get_table_name('cache'),
-                                   $_SESSION['user_id'],
-                                   $key));
+  $sql_result = $DB->query("SELECT cache_id, data
+                            FROM ".get_table_name('cache')."
+                            WHERE  user_id=?
+                            AND    cache_key=?",
+                            $_SESSION['user_id'],
+                            $key);
 
   // get cached data
   if ($sql_arr = $DB->fetch_assoc($sql_result))
@@ -44,8 +43,8 @@
 
   return $data;
   }
-  
-  
+
+
 function rcube_write_cache($key, $data, $session_cache=FALSE)
   {
   global $DB, $CACHE_KEYS, $sess_id;
@@ -53,13 +52,12 @@
   // check if we already have a cache entry for this key
   if (!isset($CACHE_KEYS[$key]))
     {
-    $sql_result = $DB->query(sprintf("SELECT cache_id
-                                      FROM   %s
-                                      WHERE  user_id=%d
-                                      AND    cache_key='%s'",
-                                     get_table_name('cache'),
-                                     $_SESSION['user_id'],
-                                     $key));
+    $sql_result = $DB->query("SELECT cache_id
+                              FROM ".get_table_name('cache')."
+                              WHERE  user_id=?
+                              AND    cache_key=?",
+                              $_SESSION['user_id'],
+                              $key);
                                      
     if ($sql_arr = $DB->fetch_assoc($sql_result))
       $CACHE_KEYS[$key] = $sql_arr['cache_id'];
@@ -70,42 +68,38 @@
   // update existing cache record
   if ($CACHE_KEYS[$key])
     {
-    $DB->query(sprintf("UPDATE %s
-                        SET    created=NOW(),
-                               data='%s'
-                        WHERE  user_id=%d
-                        AND    cache_key='%s'",
-                       get_table_name('cache'),
-                       addslashes($data),
-                       $_SESSION['user_id'],
-                       $key));
+    $DB->query("UPDATE ".get_table_name('cache')."
+                SET    created=now(),
+                       data=?
+                WHERE  user_id=?
+                AND    cache_key=?",
+                $data,
+                $_SESSION['user_id'],
+                $key);
     }
   // add new cache record
   else
     {
-    $DB->query(sprintf("INSERT INTO %s
-                        (created, user_id, session_id, cache_key, data)
-                        VALUES (NOW(), %d, %s, '%s', '%s')",
-                       get_table_name('cache'),
-                       $_SESSION['user_id'],
-                       $session_cache ? "'$sess_id'" : 'NULL',
-                       $key,
-                       addslashes($data)));
+    $DB->query("INSERT INTO ".get_table_name('cache')."
+                (created, user_id, session_id, cache_key, data)
+                VALUES (now(), ?, ?, ?, ?)",
+                $_SESSION['user_id'],
+                $session_cache ? $sess_id : 'NULL',
+                $key,
+                $data);
     }
   }
-
 
 
 function rcube_clear_cache($key)
   {
   global $DB;
 
-  $DB->query(sprintf("DELETE FROM %s
-                      WHERE  user_id=%d
-                      AND    cache_key='%s'",
-                     get_table_name('cache'),
-                     $_SESSION['user_id'],
-                     $key));
+  $DB->query("DELETE FROM ".get_table_name('cache')."
+              WHERE  user_id=?
+              AND    cache_key=?",
+              $_SESSION['user_id'],
+              $key);
   }
 
 

--
Gitblit v1.9.1