- Timestamp:
- 09/21/10 16:03:37 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/jabberit_messenger/inc/class.bologmessage.inc.php
r3102 r3272 67 67 $field_1 = "message_from"; 68 68 $field_2 = "message_to"; 69 70 $user = explode( '@', $pUser ); 71 $user = rawurlencode( $user[ 0 ] ) . '@' . $user[ 1 ]; 69 72 70 $query = "SELECT ".$field_1.", ".$field_2.", COUNT(*) AS total_messages, MIN(message_timestamp) AS first_message, MAX(message_timestamp) AS last_message FROM message WHERE ".$field_1." = '".$ pUser."' AND message_timestamp BETWEEN '".$pDtFirst."' AND '".$pDtLast."' GROUP BY ".$field_2." LIMIT ".$pLim1.",".$pLim2.";";71 73 $query = "SELECT ".$field_1.", ".$field_2.", COUNT(*) AS total_messages, MIN(message_timestamp) AS first_message, MAX(message_timestamp) AS last_message FROM message WHERE ".$field_1." = '".$user."' AND message_timestamp BETWEEN '".$pDtFirst."' AND '".$pDtLast."' GROUP BY ".$field_2." LIMIT ".$pLim1.",".$pLim2.";"; 74 72 75 if($this->db->query($query)) 73 76 { … … 81 84 public function getMessageUserComplete( $pUser1, $pUser2, $pDtFirst, $pDtLast, $pLim1, $pLim2 ) 82 85 { 83 $query = "SELECT message_from, message_to, message_body, message_timestamp FROM message WHERE message_from = '".$pUser1."' AND message_to = '".$pUser2."' AND message_timestamp BETWEEN '".$pDtFirst."' AND '".$pDtLast."' ORDER BY message_timestamp DESC LIMIT ".$pLim1.",".$pLim2.";"; 86 $user1 = explode( '@', $pUser1 ); 87 $user1 = rawurlencode( $user1[ 0 ] ) . '@' . $user1[ 1 ]; 88 89 $user2 = explode( '@', $pUser2 ); 90 $user2 = rawurlencode( $user2[ 0 ] ) . '@' . $user2[ 1 ]; 91 92 $query = "SELECT message_from, message_to, message_body, message_timestamp FROM message WHERE message_from = '".$user1."' AND message_to = '".$user2."' AND message_timestamp BETWEEN '".$pDtFirst."' AND '".$pDtLast."' ORDER BY message_timestamp DESC LIMIT ".$pLim1.",".$pLim2.";"; 84 93 85 94 if($this->db->query($query))
Note: See TracChangeset
for help on using the changeset viewer.