From fbf77b4493f1b77c99751d8a86365c712ae3fb1b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 18 Nov 2005 10:35:15 -0500
Subject: [PATCH] Added Japanese localization

---
 program/steps/addressbook/func.inc |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 309c2a3..4cc79ba 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -6,7 +6,7 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
  |   Provide addressbook functionality and GUI objects                   |
@@ -41,12 +41,11 @@
   //$image_tag = '<img src="%s%s" alt="%s" border="0" />';
   
   // count contacts for this user
-  $sql_result = $DB->query(sprintf("SELECT COUNT(contact_id) AS rows
-                                    FROM   %s
-                                    WHERE  del!='1'
-                                    AND    user_id=%d",
-                                   get_table_name('contacts'),
-                                   $_SESSION['user_id']));
+  $sql_result = $DB->query("SELECT COUNT(contact_id) AS rows
+                            FROM ".get_table_name('contacts')."
+                            WHERE  del<>'1'
+                            AND    user_id=?",
+                            $_SESSION['user_id']);
 
   $sql_arr = $DB->fetch_assoc($sql_result);
   $rowcount = $sql_arr['rows'];
@@ -56,15 +55,13 @@
     $start_row = ($CONTACTS_LIST['page']-1) * $CONFIG['pagesize'];
 
     // get contacts from DB
-    $sql_result = $DB->query(sprintf("SELECT * FROM %s
-                                      WHERE  del!='1'
-                                      AND    user_id=%d
-                                      ORDER BY name
-                                      LIMIT %d, %d",
-                                     get_table_name('contacts'),
-                                     $_SESSION['user_id'],
-                                     $start_row,
-                                     $CONFIG['pagesize']));
+    $sql_result = $DB->limitquery("SELECT * FROM ".get_table_name('contacts')."
+                                   WHERE  del<>'1'
+                                   AND    user_id= ?
+                                   ORDER BY name",
+                                   $start_row,
+                                   $CONFIG['pagesize'],
+                                   $_SESSION['user_id']);
     }
   else
     $sql_result = NULL;
@@ -175,11 +172,10 @@
   // get nr of contacts
   if ($max===NULL)
     {
-    $sql_result = $DB->query(sprintf("SELECT 1 FROM %s
-                                      WHERE  del!='1'
-                                      AND    user_id=%d",
-                                     get_table_name('contacts'),
-                                     $_SESSION['user_id']));
+    $sql_result = $DB->query("SELECT 1 FROM ".get_table_name('contacts')."
+                              WHERE  del<>'1'
+                              AND    user_id=?",
+                              $_SESSION['user_id']);
 
     $max = $DB->num_rows($sql_result);
     }

--
Gitblit v1.9.1