From: Lo?c C. <lo...@us...> - 2001-11-26 20:22:19
|
Update of /cvsroot/phpmychat/phpMyChat-0.15/chat In directory usw-pr-cvs1:/tmp/cvs-serv12055/chat Modified Files: loader.php3 messages_low.php3 save.php3 users_popup.php3 users_popup_low.php3 Log Message: added m_id in the pmc_messages table to fix messages loss in the message frame Index: loader.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/loader.php3,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** loader.php3 2001/06/15 21:04:33 1.23 --- loader.php3 2001/11/26 20:22:15 1.24 *************** *** 160,170 **** $cutoffClause = ($isInitLoad) ! ? '' ! : 'm_time > ' . $lastMsgLoad . ' AND '; $limitClause = ($isInitLoad && (C_DB_TYPE == 'mysql' || C_DB_TYPE == 'pgsql')) ? ' LIMIT ' . $dbSessionVars['msgNumber'] : ''; ! $getMessagesQuery = 'SELECT username, latin1, m_time, address, color, msg_' . $dbSessionVars['msgKind'] . ' ' . 'FROM ' . C_MSG_TBL . ' ' . 'WHERE ' --- 160,170 ---- $cutoffClause = ($isInitLoad) ! ? 'm_id > 0 AND ' ! : 'm_id > ' . $lastMsgLoad . ' AND '; $limitClause = ($isInitLoad && (C_DB_TYPE == 'mysql' || C_DB_TYPE == 'pgsql')) ? ' LIMIT ' . $dbSessionVars['msgNumber'] : ''; ! $getMessagesQuery = 'SELECT m_id, username, latin1, m_time, address, color, msg_' . $dbSessionVars['msgKind'] . ' ' . 'FROM ' . C_MSG_TBL . ' ' . 'WHERE ' *************** *** 172,176 **** . "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND " . '(' ! . "(address != '' AND username = '$slashedNick') OR " . "((address = '' OR address = '$slashedNick')$ignoredSendersList)" . ') ' --- 172,176 ---- . "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND " . '(' ! . "(address > '' AND username = '$slashedNick') OR " . "((address = '' OR address = '$slashedNick')$ignoredSendersList)" . ') ' *************** *** 182,188 **** $grabedMessages = array(); $dbLink->query($getMessagesQuery); ! while (list($sender, $senderLatin1, $sentTime, $addressee, $msgColor, $message) = $dbLink->nextRecord()) { ! $grabedMessages[] = array( pmcHandleMagicQuotes($sender, '', 1, 'del'), $senderLatin1, $sentTime, --- 182,189 ---- $grabedMessages = array(); $dbLink->query($getMessagesQuery); ! while (list($msgId, $sender, $senderLatin1, $sentTime, $addressee, $msgColor, $message) = $dbLink->nextRecord()) { ! $grabedMessages[] = array( $msgId, ! pmcHandleMagicQuotes($sender, '', 1, 'del'), $senderLatin1, $sentTime, *************** *** 224,233 **** for ($k = 0; $k < $grabedMessagesCnt; $k++) { ! $sender = $grabedMessages[$k][0]; ! $senderLatin1 = $grabedMessages[$k][1]; ! $sentTime = $grabedMessages[$k][2]; ! $addressee = $grabedMessages[$k][3]; ! $msgColor = $grabedMessages[$k][4]; ! $message = $grabedMessages[$k][5]; // Skip the oldest message if the day seperator has been added --- 225,235 ---- for ($k = 0; $k < $grabedMessagesCnt; $k++) { ! $msgId = $grabedMessages[$k][0]; ! $sender = $grabedMessages[$k][1]; ! $senderLatin1 = $grabedMessages[$k][2]; ! $sentTime = $grabedMessages[$k][3]; ! $addressee = $grabedMessages[$k][4]; ! $msgColor = $grabedMessages[$k][5]; ! $message = $grabedMessages[$k][6]; // Skip the oldest message if the day seperator has been added *************** *** 293,299 **** $newMessages[] = $aMessage; ! if ($sentTime > $lastMsgLoad) { ! $lastMsgLoad = $sentTime; } } --- 295,301 ---- $newMessages[] = $aMessage; ! if ($msgId > $lastMsgLoad) { ! $lastMsgLoad = $msgId; } } Index: messages_low.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/messages_low.php3,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** messages_low.php3 2001/06/15 21:04:33 1.20 --- messages_low.php3 2001/11/26 20:22:15 1.21 *************** *** 127,137 **** $cutoffClause = (isset($firstMsgToLoad)) ! ? 'm_time > ' . $firstMsgToLoad . ' AND ' ! : ''; $limitClause = (C_DB_TYPE == 'mysql' || C_DB_TYPE == 'pgsql') ? ' LIMIT ' . $dbSessionVars['msgNumber'] : ''; ! $getMessagesQuery = 'SELECT username, latin1, m_time, address, color, msg_' . $dbSessionVars['msgKind'] . ' ' . 'FROM ' . C_MSG_TBL . ' ' . 'WHERE ' --- 127,137 ---- $cutoffClause = (isset($firstMsgToLoad)) ! ? 'm_id > ' . $firstMsgToLoad . ' AND ' ! : 'm_id > 0 AND '; $limitClause = (C_DB_TYPE == 'mysql' || C_DB_TYPE == 'pgsql') ? ' LIMIT ' . $dbSessionVars['msgNumber'] : ''; ! $getMessagesQuery = 'SELECT m_id, username, latin1, m_time, address, color, msg_' . $dbSessionVars['msgKind'] . ' ' . 'FROM ' . C_MSG_TBL . ' ' . 'WHERE ' *************** *** 139,143 **** . "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND " . '(' ! . "(address != '' AND username = '$slashedNick') OR " . "((address = '' OR address = '$slashedNick')$ignoredSendersList)" . ') ' --- 139,143 ---- . "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND " . '(' ! . "(address > '' AND username = '$slashedNick') OR " . "((address = '' OR address = '$slashedNick')$ignoredSendersList)" . ') ' *************** *** 150,156 **** $dbLink = new pmcDB; $dbLink->query($getMessagesQuery); ! while (list($sender, $senderLatin1, $sentTime, $addressee, $msgColor, $message) = $dbLink->nextRecord()) { ! $grabedMessages[] = array( pmcHandleMagicQuotes($sender, '', 1, 'del'), $senderLatin1, $sentTime, --- 150,157 ---- $dbLink = new pmcDB; $dbLink->query($getMessagesQuery); ! while (list($msgId, $sender, $senderLatin1, $sentTime, $addressee, $msgColor, $message) = $dbLink->nextRecord()) { ! $grabedMessages[] = array( $msgId, ! pmcHandleMagicQuotes($sender, '', 1, 'del'), $senderLatin1, $sentTime, *************** *** 189,198 **** for ($k = 0; $k < $grabedMessagesCnt; $k++) { ! $sender = $grabedMessages[$k][0]; ! $senderLatin1 = $grabedMessages[$k][1]; ! $sentTime = $grabedMessages[$k][2]; ! $addressee = $grabedMessages[$k][3]; ! $msgColor = $grabedMessages[$k][4]; ! $message = $grabedMessages[$k][5]; // Skip the oldest message if the day seperator has been added --- 190,200 ---- for ($k = 0; $k < $grabedMessagesCnt; $k++) { ! $msgId = $grabedMessages[$k][0]; ! $sender = $grabedMessages[$k][1]; ! $senderLatin1 = $grabedMessages[$k][2]; ! $sentTime = $grabedMessages[$k][3]; ! $addressee = $grabedMessages[$k][4]; ! $msgColor = $grabedMessages[$k][5]; ! $message = $grabedMessages[$k][6]; // Skip the oldest message if the day seperator has been added *************** *** 263,267 **** } // end of formatting new messages unset($grabedMessages); ! $firstMsgToLoad = $sentTime - 1; --- 265,269 ---- } // end of formatting new messages unset($grabedMessages); ! $firstMsgToLoad = $msgId - 1; Index: save.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/save.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** save.php3 2001/06/10 14:56:06 1.8 --- save.php3 2001/11/26 20:22:15 1.9 *************** *** 98,104 **** $getMessagesQuery = 'SELECT username, latin1, m_time, address, color, msg_original FROM ' . C_MSG_TBL . ' ' . 'WHERE ' . "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND " . '(' ! . "(address != '' AND username = '$slashedNick') OR " . "((address = '' OR address = '$slashedNick')$ignoredSendersList)" . ') ' --- 98,105 ---- $getMessagesQuery = 'SELECT username, latin1, m_time, address, color, msg_original FROM ' . C_MSG_TBL . ' ' . 'WHERE ' + . 'm_id > 0 AND ' . "room IN ('$slashedCurrentRoomName', '\\\*\\\') AND " . '(' ! . "(address > '' AND username = '$slashedNick') OR " . "((address = '' OR address = '$slashedNick')$ignoredSendersList)" . ') ' Index: users_popup.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup.php3,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** users_popup.php3 2001/06/10 14:56:06 1.19 --- users_popup.php3 2001/11/26 20:22:15 1.20 *************** *** 115,121 **** $beepQuery = 'SELECT msg.m_time FROM ' . C_ROOM_TBL . ' rm, ' . C_MSG_TBL . ' msg ' . ' WHERE ' . "msg.username = 'SYS enter' AND " ! . "(rm.room_name = msg.room AND $roomToCheck) AND " ! . "msg.m_time > $lastCheck " . 'LIMIT 1'; $dbLink->query($beepQuery); --- 115,121 ---- $beepQuery = 'SELECT msg.m_time FROM ' . C_ROOM_TBL . ' rm, ' . C_MSG_TBL . ' msg ' . ' WHERE ' + . "msg.m_time > $lastCheck AND " . "msg.username = 'SYS enter' AND " ! . "(msg.room = rm.room_name AND $roomToCheck) " . 'LIMIT 1'; $dbLink->query($beepQuery); Index: users_popup_low.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup_low.php3,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** users_popup_low.php3 2001/06/10 14:56:06 1.16 --- users_popup_low.php3 2001/11/26 20:22:15 1.17 *************** *** 116,122 **** $beepQuery = 'SELECT msg.m_time FROM ' . C_ROOM_TBL . ' rm, ' . C_MSG_TBL . ' msg ' . ' WHERE ' . "msg.username = 'SYS enter' AND " ! . "(rm.room_name = msg.room AND $roomToCheck) AND " ! . "msg.m_time > $lastCheck " . 'LIMIT 1'; $dbLink->query($beepQuery); --- 116,122 ---- $beepQuery = 'SELECT msg.m_time FROM ' . C_ROOM_TBL . ' rm, ' . C_MSG_TBL . ' msg ' . ' WHERE ' + . "msg.m_time > $lastCheck AND " . "msg.username = 'SYS enter' AND " ! . "(msg.room = rm.room_name AND $roomToCheck) " . 'LIMIT 1'; $dbLink->query($beepQuery); |