From: Lo?c C. <lo...@us...> - 2001-04-10 10:46:35
|
Update of /cvsroot/phpmychat/phpMyChat-0.15/chat In directory usw-pr-cvs1:/tmp/cvs-serv25054/chat Modified Files: whois_popup.php3 users_popup_low.php3 users_popup.php3 users_low.php3 users.php3 messages_low.php3 loader.php3 input.php3 handle_input.php3 exit.php3 Log Message: Fix a bug in 'dbSessionInitIt()' calls and remove some trailing whitespaces Index: whois_popup.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/whois_popup.php3,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** whois_popup.php3 2001/04/08 18:24:04 1.2 --- whois_popup.php3 2001/04/10 10:46:31 1.3 *************** *** 54,59 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 54,59 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); Index: users_popup_low.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup_low.php3,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** users_popup_low.php3 2001/04/08 18:24:04 1.2 --- users_popup_low.php3 2001/04/10 10:46:31 1.3 *************** *** 53,58 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 53,58 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! '' ); dbSessionstart(); *************** *** 61,64 **** --- 61,77 ---- * Defines the language to be used */ + if (!dbSessionIsRegistered('lang')) + { + if (empty($lang) + || !file_exists('./localization/' . $lang . '/localized.chat.' . C_EXTENSION)) + { + $dbSessionVars['lang'] = ''; + include('./localization/languages.lib.' . C_EXTENSION); + } + else + { + $dbSessionVars['lang'] = $lang; + } + } require('./localization/' . $dbSessionVars['lang'] . '/localized.chat.' . C_EXTENSION); $textDirection = (L_CHARSET == 'windows-1256') ? 'rtl' : 'ltr'; *************** *** 120,123 **** --- 133,137 ---- $commonUrl = 'users_popup_low.' . C_EXTENSION . '?' . dbSessionSID('GET') + . $pmcQueryArgSeparator . 'lang=' . $dbSessionVars['lang'] . $pmcQueryArgSeparator . 'lastCheck=' . $lastCheck . $pmcQueryArgSeparator . 'isBeep='; Index: users_popup.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_popup.php3,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** users_popup.php3 2001/04/08 18:24:04 1.2 --- users_popup.php3 2001/04/10 10:46:31 1.3 *************** *** 52,57 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 52,57 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! '' ); dbSessionstart(); *************** *** 60,63 **** --- 60,76 ---- * Defines the language to be used */ + if (!dbSessionIsRegistered('lang')) + { + if (empty($lang) + || !file_exists('./localization/' . $lang . '/localized.chat.' . C_EXTENSION)) + { + $dbSessionVars['lang'] = ''; + include('./localization/languages.lib.' . C_EXTENSION); + } + else + { + $dbSessionVars['lang'] = $lang; + } + } require('./localization/' . $dbSessionVars['lang'] . '/localized.chat.' . C_EXTENSION); $textDirection = (L_CHARSET == 'windows-1256') ? 'rtl' : 'ltr'; *************** *** 119,122 **** --- 132,136 ---- $commonUrl = 'users_popup.' . C_EXTENSION . '?' . dbSessionSID('GET') + . $pmcQueryArgSeparator . 'lang=' . $dbSessionVars['lang'] . $pmcQueryArgSeparator . 'lastCheck=' . $lastCheck . $pmcQueryArgSeparator . 'isBeep='; *************** *** 216,220 **** $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">'; $usersList[] = "\t" . '<a href="#" onclick="pmcExpandRoom(\'' . $id . '\'); return false">' ! . '<img name="imEx" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '\" /></a>' . ' ' . '<b>' . htmlspecialchars($roomName) . '</b>' --- 230,234 ---- $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">'; $usersList[] = "\t" . '<a href="#" onclick="pmcExpandRoom(\'' . $id . '\'); return false">' ! . '<img name="imEx" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>' . ' ' . '<b>' . htmlspecialchars($roomName) . '</b>' Index: users_low.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_low.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** users_low.php3 2001/04/08 18:24:04 1.3 --- users_low.php3 2001/04/10 10:46:31 1.4 *************** *** 50,55 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 50,55 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); *************** *** 153,157 **** $usersCnt++; $username = pmcHandleMagicQuotes($username, '', 1, 'del'); ! // Define the icon to put for this user if ($gender == 0) --- 153,157 ---- $usersCnt++; $username = pmcHandleMagicQuotes($username, '', 1, 'del'); ! // Define the icon to put for this user if ($gender == 0) *************** *** 177,181 **** $tmpStr = '<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '" /> '; } ! // Define the format to be used for the username according to the status if ($username != $dbSessionVars['nick']) --- 177,181 ---- $tmpStr = '<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '" /> '; } ! // Define the format to be used for the username according to the status if ($username != $dbSessionVars['nick']) *************** *** 318,322 **** $usersList[] = "\t" . $tmpStr; } ! $usersList[] = '</p>'; $usersList[] = ''; --- 318,322 ---- $usersList[] = "\t" . $tmpStr; } ! $usersList[] = '</p>'; $usersList[] = ''; Index: users.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users.php3,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** users.php3 2001/04/08 18:24:04 1.7 --- users.php3 2001/04/10 10:46:31 1.8 *************** *** 49,54 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 49,54 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); *************** *** 152,156 **** $usersCnt++; $username = pmcHandleMagicQuotes($username, '', 1, 'del'); ! // Define the icon to put for this user if ($gender == 0) --- 152,156 ---- $usersCnt++; $username = pmcHandleMagicQuotes($username, '', 1, 'del'); ! // Define the icon to put for this user if ($gender == 0) *************** *** 176,180 **** $tmpStr = '<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '" /> '; } ! // Define the format to be used for the username according to the status if ($username != $dbSessionVars['nick']) --- 176,180 ---- $tmpStr = '<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '" /> '; } ! // Define the format to be used for the username according to the status if ($username != $dbSessionVars['nick']) *************** *** 291,295 **** $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">'; $usersList[] = "\t" . '<a href="#" onclick="window.parent.pmcExpandRoom(\'' . $id . '\'); return false">' ! . '<img name="imEx" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '\" /></a>' . ' ' . '<a href="' . str_replace('%NEWROOM%', urlencode($roomName), $joinUrl) . '" target="_parent">' . htmlspecialchars($roomName) . '</a>' --- 291,295 ---- $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">'; $usersList[] = "\t" . '<a href="#" onclick="window.parent.pmcExpandRoom(\'' . $id . '\'); return false">' ! . '<img name="imEx" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>' . ' ' . '<a href="' . str_replace('%NEWROOM%', urlencode($roomName), $joinUrl) . '" target="_parent">' . htmlspecialchars($roomName) . '</a>' *************** *** 326,330 **** $usersList[] = "\t" . $tmpStr; } ! $usersList[] = '</div>'; $usersList[] = ''; --- 326,330 ---- $usersList[] = "\t" . $tmpStr; } ! $usersList[] = '</div>'; $usersList[] = ''; Index: messages_low.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/messages_low.php3,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** messages_low.php3 2001/04/08 18:24:04 1.2 --- messages_low.php3 2001/04/10 10:46:31 1.3 *************** *** 52,57 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 52,57 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); *************** *** 151,155 **** while (list($name, $value) = each($grabedMessages[$k])) $$name = $value; ! // Skip the oldest message if the day seperator has been added if (isset($daySeparator) && $k == $grabedMessagesCnt - 1) --- 151,155 ---- while (list($name, $value) = each($grabedMessages[$k])) $$name = $value; ! // Skip the oldest message if the day seperator has been added if (isset($daySeparator) && $k == $grabedMessagesCnt - 1) *************** *** 202,206 **** } $aMessage .= '</p>'; ! $newMessages[] = $aMessage; } --- 202,206 ---- } $aMessage .= '</p>'; ! $newMessages[] = $aMessage; } Index: loader.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/loader.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** loader.php3 2001/04/08 18:24:04 1.3 --- loader.php3 2001/04/10 10:46:31 1.4 *************** *** 56,61 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 56,61 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); *************** *** 197,201 **** while (list($name, $value) = each($grabedMessages[$k])) $$name = $value; ! // Skip the oldest message if the day seperator has been added if (isset($daySeparator) && $isInitLoad && $k == $grabedMessagesCnt - 1) --- 197,201 ---- while (list($name, $value) = each($grabedMessages[$k])) $$name = $value; ! // Skip the oldest message if the day seperator has been added if (isset($daySeparator) && $isInitLoad && $k == $grabedMessagesCnt - 1) *************** *** 246,250 **** } $aMessage .= '<\/p>'; ! $newMessages[] = $aMessage; if ($sentTime > $lastMsgLoad) --- 246,250 ---- } $aMessage .= '<\/p>'; ! $newMessages[] = $aMessage; if ($sentTime > $lastMsgLoad) Index: input.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/input.php3,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** input.php3 2001/04/10 09:38:14 1.6 --- input.php3 2001/04/10 10:46:31 1.7 *************** *** 61,66 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 61,66 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); Index: handle_input.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/handle_input.php3,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** handle_input.php3 2001/04/10 09:38:14 1.5 --- handle_input.php3 2001/04/10 10:46:31 1.6 *************** *** 61,66 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 61,66 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); Index: exit.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/exit.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** exit.php3 2001/04/04 17:29:54 1.4 --- exit.php3 2001/04/10 10:46:31 1.5 *************** *** 52,57 **** C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_REG_DEL, ! C_SESS_DEL * 60 ); dbSessionstart(); --- 52,57 ---- C_DB_USER, C_DB_PASS, C_SESS_TBL, ! C_SESS_DEL * 60, ! C_CHAT_URL ); dbSessionstart(); |