svncommit

2005-10-20 53560c521e594d6047f58a25ccbc266c56bbcf05

added DB LIMIT abstraction

 program/include/rcube_db.inc

@@ -103,7 +103,7 @@

    // Query database (read operations)
    
    function query($query)
    function query($query, $offset=0, $numrows=0)
    {
        // Read or write ?
        if (strtolower(trim(substr($query,0,6)))=='select')
@@ -115,8 +115,13 @@

        if ($this->db_provider == 'sqlite')
            $query = $this->_sqlite_prepare_query($query);
            
        $result = $this->db_handle->query($query);
        
        if ($numrows || $offset)
            {
            $result = $this->db_handle->limitQuery($query,$offset,$numrows);
            }
        else    
            $result = $this->db_handle->query($query);
        
        if (DB::isError($result))
            raise_error(array('code' => 500,

 program/include/rcube_mdb2.inc

@@ -103,7 +103,7 @@

    // Query database (read operations)
    
    function query($query)
    function query($query, $offset=0, $numrows=0)
    {
        // Read or write ?
        if (strtolower(trim(substr($query,0,6)))=='select')
@@ -116,6 +116,9 @@
        if ($this->db_provider == 'sqlite')
            $query = $this->_sqlite_prepare_query($query);
            
        $this->db_handle->row_offset = $offset;
        $this->db_handle->row_limit = $numrows;
		
        $result = $this->db_handle->query($query);
        
        if (PEAR::isError($result))

 program/localization/es/labels.inc

@@ -63,6 +63,7 @@

$labels['preferhtml'] = 'Prefiero HTML';
$labels['htmlmessage'] = 'Mensaje HTML';
//$labels['prettydate'] = '';

$labels['addtoaddressbook'] = 'Añadir a contactos';


 program/steps/addressbook/delete.inc

@@ -65,12 +65,11 @@
    $sql_result = $DB->query(sprintf("SELECT * FROM %s
                                      WHERE  del!='1'
                                      AND    user_id=%d
                                      ORDER BY name
                                      LIMIT %d, %d",
                                      ORDER BY name",
                                     get_table_name('contacts'),
                                     $_SESSION['user_id'],
                                     $_SESSION['user_id']),
                                     $start_row,
                                     $count));
                                     $count);
                                     
    $commands .= rcmail_js_contacts_list($sql_result);


 program/steps/addressbook/func.inc

@@ -59,12 +59,11 @@
    $sql_result = $DB->query(sprintf("SELECT * FROM %s
                                      WHERE  del!='1'
                                      AND    user_id=%d
                                      ORDER BY name
                                      LIMIT %d, %d",
                                      ORDER BY name",
                                     get_table_name('contacts'),
                                     $_SESSION['user_id'],
                                     $_SESSION['user_id']),
                                     $start_row,
                                     $CONFIG['pagesize']));
                                     $CONFIG['pagesize']);
    }
  else
    $sql_result = NULL;

 program/steps/addressbook/list.inc

@@ -43,12 +43,11 @@
$sql_result = $DB->query(sprintf("SELECT * FROM %s
                                  WHERE  del!='1'
                                  AND    user_id=%d
                                  ORDER BY name
                                  LIMIT %d, %d",
                                  ORDER BY name",
                                 get_table_name('contacts'),
                                 $_SESSION['user_id'],
                                 $_SESSION['user_id']),
                                 $start_row,
                                 $CONFIG['pagesize']));
                                 $CONFIG['pagesize']);
                                 
$commands .= rcmail_js_contacts_list($sql_result);