Changeset 6073 in subversion for trunk/roundcubemail/program/include/rcube_imap_cache.php
- Timestamp:
- Apr 13, 2012 4:52:02 AM (14 months ago)
- Location:
- trunk/roundcubemail
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
program/include/rcube_imap_cache.php (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/roundcubemail
- Property svn:mergeinfo changed
/branches/devel-framework/roundcubemail merged: 5807,5821-5822,5825-5830,5834-5836,5854-5855,5866,5880-5885
- Property svn:mergeinfo changed
-
trunk/roundcubemail/program/include/rcube_imap_cache.php
r6020 r6073 96 96 $this->db = $db; 97 97 $this->imap = $imap; 98 $this->userid = (int)$userid;98 $this->userid = $userid; 99 99 $this->skip_deleted = $skip_deleted; 100 100 } … … 291 291 * @param array $msgs Message UIDs 292 292 * 293 * @return array The list of messages (rcube_m ail_header) indexed by UID293 * @return array The list of messages (rcube_message_header) indexed by UID 294 294 */ 295 295 function get_messages($mailbox, $msgs = array()) … … 302 302 $sql_result = $this->db->query( 303 303 "SELECT uid, data, flags" 304 ." FROM ". get_table_name('cache_messages')304 ." FROM ".$this->db->table_name('cache_messages') 305 305 ." WHERE user_id = ?" 306 306 ." AND mailbox = ?" … … 349 349 * @param bool $no_cache Enables internal cache usage 350 350 * 351 * @return rcube_m ail_header Message data351 * @return rcube_message_header Message data 352 352 */ 353 353 function get_message($mailbox, $uid, $update = true, $cache = true) … … 363 363 $sql_result = $this->db->query( 364 364 "SELECT flags, data" 365 ." FROM ". get_table_name('cache_messages')365 ." FROM ".$this->db->table_name('cache_messages') 366 366 ." WHERE user_id = ?" 367 367 ." AND mailbox = ?" … … 405 405 * Saves the message in cache. 406 406 * 407 * @param string $mailbox Folder name408 * @param rcube_m ail_header $message Message data409 * @param bool $force Skips message in-cache existance check407 * @param string $mailbox Folder name 408 * @param rcube_message_header $message Message data 409 * @param bool $force Skips message in-cache existance check 410 410 */ 411 411 function add_message($mailbox, $message, $force = false) … … 431 431 if (!$force) { 432 432 $res = $this->db->query( 433 "UPDATE ". get_table_name('cache_messages')433 "UPDATE ".$this->db->table_name('cache_messages') 434 434 ." SET flags = ?, data = ?, changed = ".$this->db->now() 435 435 ." WHERE user_id = ?" … … 445 445 // insert new record 446 446 $this->db->query( 447 "INSERT INTO ". get_table_name('cache_messages')447 "INSERT INTO ".$this->db->table_name('cache_messages') 448 448 ." (user_id, mailbox, uid, flags, changed, data)" 449 449 ." VALUES (?, ?, ?, ?, ".$this->db->now().", ?)", … … 480 480 481 481 $this->db->query( 482 "UPDATE ". get_table_name('cache_messages')482 "UPDATE ".$this->db->table_name('cache_messages') 483 483 ." SET changed = ".$this->db->now() 484 484 .", flags = flags ".($enabled ? "+ $idx" : "- $idx") … … 501 501 if (!strlen($mailbox)) { 502 502 $this->db->query( 503 "DELETE FROM ". get_table_name('cache_messages')503 "DELETE FROM ".$this->db->table_name('cache_messages') 504 504 ." WHERE user_id = ?", 505 505 $this->userid); … … 514 514 515 515 $this->db->query( 516 "DELETE FROM ". get_table_name('cache_messages')516 "DELETE FROM ".$this->db->table_name('cache_messages') 517 517 ." WHERE user_id = ?" 518 ." AND mailbox = ".$this->db->quote($mailbox)518 ." AND mailbox = ?" 519 519 .($uids !== null ? " AND uid IN (".$this->db->array2list((array)$uids, 'integer').")" : ""), 520 $this->userid );520 $this->userid, $mailbox); 521 521 } 522 522 … … 537 537 if ($remove) { 538 538 $this->db->query( 539 "DELETE FROM ".get_table_name('cache_index') 540 ." WHERE user_id = ".intval($this->userid) 541 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "") 539 "DELETE FROM ".$this->db->table_name('cache_index') 540 ." WHERE user_id = ?" 541 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""), 542 $this->userid 542 543 ); 543 544 } 544 545 else { 545 546 $this->db->query( 546 "UPDATE ". get_table_name('cache_index')547 "UPDATE ".$this->db->table_name('cache_index') 547 548 ." SET valid = 0" 548 ." WHERE user_id = ".intval($this->userid) 549 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "") 549 ." WHERE user_id = ?" 550 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""), 551 $this->userid 550 552 ); 551 553 } … … 570 572 { 571 573 $this->db->query( 572 "DELETE FROM ".get_table_name('cache_thread') 573 ." WHERE user_id = ".intval($this->userid) 574 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "") 574 "DELETE FROM ".$this->db->table_name('cache_thread') 575 ." WHERE user_id = ?" 576 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""), 577 $this->userid 575 578 ); 576 579 … … 629 632 $sql_result = $this->db->query( 630 633 "SELECT data, valid" 631 ." FROM ". get_table_name('cache_index')634 ." FROM ".$this->db->table_name('cache_index') 632 635 ." WHERE user_id = ?" 633 636 ." AND mailbox = ?", … … 666 669 $sql_result = $this->db->query( 667 670 "SELECT data" 668 ." FROM ". get_table_name('cache_thread')671 ." FROM ".$this->db->table_name('cache_thread') 669 672 ." WHERE user_id = ?" 670 673 ." AND mailbox = ?", … … 710 713 if ($exists) { 711 714 $sql_result = $this->db->query( 712 "UPDATE ". get_table_name('cache_index')715 "UPDATE ".$this->db->table_name('cache_index') 713 716 ." SET data = ?, valid = 1, changed = ".$this->db->now() 714 717 ." WHERE user_id = ?" … … 718 721 else { 719 722 $sql_result = $this->db->query( 720 "INSERT INTO ". get_table_name('cache_index')723 "INSERT INTO ".$this->db->table_name('cache_index') 721 724 ." (user_id, mailbox, data, valid, changed)" 722 725 ." VALUES (?, ?, ?, 1, ".$this->db->now().")", … … 741 744 if ($exists) { 742 745 $sql_result = $this->db->query( 743 "UPDATE ". get_table_name('cache_thread')746 "UPDATE ".$this->db->table_name('cache_thread') 744 747 ." SET data = ?, changed = ".$this->db->now() 745 748 ." WHERE user_id = ?" … … 749 752 else { 750 753 $sql_result = $this->db->query( 751 "INSERT INTO ". get_table_name('cache_thread')754 "INSERT INTO ".$this->db->table_name('cache_thread') 752 755 ." (user_id, mailbox, data, changed)" 753 756 ." VALUES (?, ?, ?, ".$this->db->now().")", … … 957 960 $sql_result = $this->db->query( 958 961 "SELECT uid" 959 ." FROM ". get_table_name('cache_messages')962 ." FROM ".$this->db->table_name('cache_messages') 960 963 ." WHERE user_id = ?" 961 964 ." AND mailbox = ?", … … 1004 1007 1005 1008 $this->db->query( 1006 "UPDATE ". get_table_name('cache_messages')1009 "UPDATE ".$this->db->table_name('cache_messages') 1007 1010 ." SET flags = ?, changed = ".$this->db->now() 1008 1011 ." WHERE user_id = ?" … … 1059 1062 * @param array $sql_arr Message row data 1060 1063 * 1061 * @return rcube_m ail_header Message object1064 * @return rcube_message_header Message object 1062 1065 */ 1063 1066 private function build_message($sql_arr)
Note: See TracChangeset
for help on using the changeset viewer.
