Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands In directory usw-pr-cvs1:/tmp/cvs-serv11557/chat/lib/commands Modified Files: announce.cmd.php3 away.cmd.php3 banish.cmd.php3 clear.cmd.php3 help.cmd.php3 history.cmd.php3 ignore.cmd.php3 img.cmd.php3 invite.cmd.php3 join.cmd.php3 kick.cmd.php3 me.cmd.php3 notify.cmd.php3 order.cmd.php3 priv_msg.cmd.php3 profile.cmd.php3 promote.cmd.php3 refresh.cmd.php3 save.cmd.php3 show.cmd.php3 timestamp.cmd.php3 whois.cmd.php3 Log Message: PEAR codding standards (capitalized constants) Index: announce.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/announce.cmd.php3,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** announce.cmd.php3 2001/12/04 20:01:33 1.11 --- announce.cmd.php3 2001/12/10 22:53:40 1.12 *************** *** 62,67 **** $dbLink->query($msgQuery); ! $isCommand = true; ! $doRefreshMessages = true; ?> --- 62,67 ---- $dbLink->query($msgQuery); ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; ?> Index: away.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/away.cmd.php3,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** away.cmd.php3 2001/06/10 14:57:48 1.1 --- away.cmd.php3 2001/12/10 22:53:40 1.2 *************** *** 40,44 **** */ $dbSessionVars['away'] = 1 - $dbSessionVars['away']; ! $isCommand = true; // The user wants a message to be send --- 40,44 ---- */ $dbSessionVars['away'] = 1 - $dbSessionVars['away']; ! $isCommand = TRUE; // The user wants a message to be send *************** *** 46,50 **** { $cmd[2] = trim($cmd[2]); ! $doRefreshMessages = true; // Format original message and set enhanced one (with graphical smilies) --- 46,50 ---- { $cmd[2] = trim($cmd[2]); ! $doRefreshMessages = TRUE; // Format original message and set enhanced one (with graphical smilies) Index: banish.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/banish.cmd.php3,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** banish.cmd.php3 2001/12/05 19:33:00 1.14 --- banish.cmd.php3 2001/12/10 22:53:40 1.15 *************** *** 151,156 **** } ! $isCommand = true; ! $doRefreshMessages = true; } // end of 'banishment allowed' } // end of 'target user is chatting' --- 151,156 ---- } ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; } // end of 'banishment allowed' } // end of 'target user is chatting' Index: clear.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/clear.cmd.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** clear.cmd.php3 2001/04/21 09:43:59 1.4 --- clear.cmd.php3 2001/12/10 22:53:40 1.5 *************** *** 29,35 **** */ $dbSessionVars['msgNumber'] = 5; ! $isCommand = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; ?> --- 29,35 ---- */ $dbSessionVars['msgNumber'] = 5; ! $isCommand = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; ?> Index: help.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/help.cmd.php3,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** help.cmd.php3 2001/04/30 22:44:57 1.5 --- help.cmd.php3 2001/12/10 22:53:40 1.6 *************** *** 47,52 **** } ! $isCommand = true; ! $isPopup = true; ?> --- 47,52 ---- } ! $isCommand = TRUE; ! $isPopup = TRUE; ?> Index: history.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/history.cmd.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** history.cmd.php3 2001/04/19 21:05:04 1.3 --- history.cmd.php3 2001/12/10 22:53:40 1.4 *************** *** 28,33 **** * Just modify some variables */ ! $isCommand = true; ! $displayMessage = true; ?> --- 28,33 ---- * Just modify some variables */ ! $isCommand = TRUE; ! $displayMessage = TRUE; ?> Index: ignore.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/ignore.cmd.php3,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** ignore.cmd.php3 2001/06/10 14:57:48 1.9 --- ignore.cmd.php3 2001/12/10 22:53:40 1.10 *************** *** 51,56 **** if ($cmd[3] == '') { ! $isCommand = true; ! $isPopup = true; $ignoredUrl = 'ignore_popup.' . C_EXTENSION . '?' . dbSessionSID(); --- 51,56 ---- if ($cmd[3] == '') { ! $isCommand = TRUE; ! $isPopup = TRUE; $ignoredUrl = 'ignore_popup.' . C_EXTENSION . '?' . dbSessionSID(); *************** *** 106,111 **** ? $toAdd[$i] : ',' . $toAdd[$i]; ! $isCommand = true; ! $doRefreshMessages = true; } } --- 106,111 ---- ? $toAdd[$i] : ',' . $toAdd[$i]; ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; } } *************** *** 129,136 **** if ($cmd[3] == '') { ! $isCommand = true; if (dbSessionIsRegistered('ignoredSenders')) { ! $doRefreshMessages = true; dbSessionUnregister('ignoredSenders'); } --- 129,136 ---- if ($cmd[3] == '') { ! $isCommand = TRUE; if (dbSessionIsRegistered('ignoredSenders')) { ! $doRefreshMessages = TRUE; dbSessionUnregister('ignoredSenders'); } *************** *** 139,143 **** else { ! $isCommand = true; if (dbSessionIsRegistered('ignoredSenders') && $dbSessionVars['ignoredSenders'] != '') { --- 139,143 ---- else { ! $isCommand = TRUE; if (dbSessionIsRegistered('ignoredSenders') && $dbSessionVars['ignoredSenders'] != '') { *************** *** 157,161 **** { $ignoredUsers[$pos] = ''; ! $updateList = true; } } --- 157,161 ---- { $ignoredUsers[$pos] = ''; ! $updateList = TRUE; } } *************** *** 167,171 **** $ignList = ereg_replace('^,|,$', '', str_replace(',,', ',', $ignList)); $dbSessionVars['ignoredSenders'] = $ignList; ! $doRefreshMessages = true; } unset($ignoredUsers); --- 167,171 ---- $ignList = ereg_replace('^,|,$', '', str_replace(',,', ',', $ignList)); $dbSessionVars['ignoredSenders'] = $ignList; ! $doRefreshMessages = TRUE; } unset($ignoredUsers); Index: img.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/img.cmd.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** img.cmd.php3 2001/04/19 21:05:04 1.3 --- img.cmd.php3 2001/12/10 22:53:40 1.4 *************** *** 33,39 **** // cookie expires in one year setcookie('cookieMsgKind', $dbSessionVars['msgKind'], time() + 60*60*24*365); ! $isCommand = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; ?> --- 33,39 ---- // cookie expires in one year setcookie('cookieMsgKind', $dbSessionVars['msgKind'], time() + 60*60*24*365); ! $isCommand = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; ?> Index: invite.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/invite.cmd.php3,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** invite.cmd.php3 2001/06/30 20:42:31 1.14 --- invite.cmd.php3 2001/12/10 22:53:40 1.15 *************** *** 97,102 **** $success = sprintf(L_INVITE_DONE, str_replace(',', ', ', $cmd[2])); ! $isCommand = true; ! $doRefreshMessages = true; } --- 97,102 ---- $success = sprintf(L_INVITE_DONE, str_replace(',', ', ', $cmd[2])); ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; } Index: join.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/join.cmd.php3,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** join.cmd.php3 2001/12/04 20:01:34 1.14 --- join.cmd.php3 2001/12/10 22:53:40 1.15 *************** *** 78,82 **** } // Check for swear words if necessary ! else if (C_NO_SWEAR == 1 && checkWords($targetRoom, true)) { $error = L_ERR_ROM_2; --- 78,82 ---- } // Check for swear words if necessary ! else if (C_NO_SWEAR == 1 && checkWords($targetRoom, TRUE)) { $error = L_ERR_ROM_2; *************** *** 112,117 **** if (empty($error)) { ! $found = false; ! $isCreateRoom = false; // 1. Get the case sensitive name of the target room --- 112,117 ---- if (empty($error)) { ! $found = FALSE; ! $isCreateRoom = FALSE; // 1. Get the case sensitive name of the target room *************** *** 123,127 **** $targetRoom = $toCheck[$pos]; $slashedTargetRoomName = pmcSlashSingleQuotes($targetRoom); ! $found = true; } unset($toCheck); --- 123,127 ---- $targetRoom = $toCheck[$pos]; $slashedTargetRoomName = pmcSlashSingleQuotes($targetRoom); ! $found = TRUE; } unset($toCheck); *************** *** 131,135 **** $targetRoom = pmcHandleMagicQuotes($trueTargetName, '', 1, 'del'); $slashedTargetRoomName = pmcSlashSingleQuotes($targetRoom); ! $found = true; } --- 131,135 ---- $targetRoom = pmcHandleMagicQuotes($trueTargetName, '', 1, 'del'); $slashedTargetRoomName = pmcSlashSingleQuotes($targetRoom); ! $found = TRUE; } *************** *** 141,150 **** { $error = L_ERR_USR_13; ! $found = false; } else { ! $found = true; ! $isCreateRoom = true; } } --- 141,150 ---- { $error = L_ERR_USR_13; ! $found = FALSE; } else { ! $found = TRUE; ! $isCreateRoom = TRUE; } } *************** *** 187,191 **** if (empty($error)) { ! $isCommand = true; $currentTime = time(); $nickForNotifications = pmcSlashSingleQuotes(pmcSpecialChars($slashedNick, $latin1), 2); --- 187,191 ---- if (empty($error)) { ! $isCommand = TRUE; $currentTime = time(); $nickForNotifications = pmcSlashSingleQuotes(pmcSpecialChars($slashedNick, $latin1), 2); *************** *** 248,254 **** $dbSessionVars['currentRoom'] = $targetRoom; $dbSessionVars['status'] = $status; ! $dbSessionVars['noKickTest'] = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; } // end of 'do the work' --- 248,254 ---- $dbSessionVars['currentRoom'] = $targetRoom; $dbSessionVars['status'] = $status; ! $dbSessionVars['noKickTest'] = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; } // end of 'do the work' Index: kick.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/kick.cmd.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** kick.cmd.php3 2001/12/05 19:33:00 1.8 --- kick.cmd.php3 2001/12/10 22:53:40 1.9 *************** *** 90,95 **** } ! $isCommand = true; ! $doRefreshMessages = true; } } --- 90,95 ---- } ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; } } Index: me.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/me.cmd.php3,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** me.cmd.php3 2001/06/10 14:57:48 1.10 --- me.cmd.php3 2001/12/10 22:53:40 1.11 *************** *** 69,74 **** unset($strictMessage); ! $isCommand = true; ! $doRefreshMessages = true; ?> --- 69,74 ---- unset($strictMessage); ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; ?> Index: notify.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/notify.cmd.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** notify.cmd.php3 2001/06/10 14:57:48 1.4 --- notify.cmd.php3 2001/12/10 22:53:40 1.5 *************** *** 39,45 **** } ! $isCommand = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; ?> --- 39,45 ---- } ! $isCommand = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; ?> Index: order.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/order.cmd.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** order.cmd.php3 2001/04/21 09:43:59 1.4 --- order.cmd.php3 2001/12/10 22:53:40 1.5 *************** *** 31,37 **** // cookie expires in one year setcookie('cookieMsgOrder', $dbSessionVars['msgOrder'], time() + 60*60*24*365); ! $isCommand = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; ?> --- 31,37 ---- // cookie expires in one year setcookie('cookieMsgOrder', $dbSessionVars['msgOrder'], time() + 60*60*24*365); ! $isCommand = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; ?> Index: priv_msg.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/priv_msg.cmd.php3,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** priv_msg.cmd.php3 2001/06/10 14:57:48 1.7 --- priv_msg.cmd.php3 2001/12/10 22:53:40 1.8 *************** *** 80,85 **** $dbLink->query($msgQuery); ! $isCommand = true; ! $doRefreshMessages = true; } --- 80,85 ---- $dbLink->query($msgQuery); ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; } Index: profile.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/profile.cmd.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** profile.cmd.php3 2001/04/30 22:44:57 1.4 --- profile.cmd.php3 2001/12/10 22:53:40 1.5 *************** *** 28,33 **** * Modidify some variables */ ! $isCommand = true; ! $isPopup = true; $dbSessionVars['conservative'] = 1; $profileUrl = 'profile_edit.' . C_EXTENSION --- 28,33 ---- * Modidify some variables */ ! $isCommand = TRUE; ! $isPopup = TRUE; $dbSessionVars['conservative'] = 1; $profileUrl = 'profile_edit.' . C_EXTENSION Index: promote.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/promote.cmd.php3,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** promote.cmd.php3 2001/12/05 19:33:44 1.9 --- promote.cmd.php3 2001/12/10 22:53:40 1.10 *************** *** 62,66 **** { $targetLatin1 = ($targetCharset == 'iso-8859-1') ? 1 : 0; ! $isCommand = true; // Promote the user if his current right level + 1 is lower than the // one of the grantor --- 62,66 ---- { $targetLatin1 = ($targetCharset == 'iso-8859-1') ? 1 : 0; ! $isCommand = TRUE; // Promote the user if his current right level + 1 is lower than the // one of the grantor *************** *** 74,78 **** else { ! $doRefreshMessages = true; $targetForNotifications = pmcSlashSingleQuotes(pmcSpecialChars($slashedTarget, $targetLatin1), 2); $promoteTime = time(); --- 74,78 ---- else { ! $doRefreshMessages = TRUE; $targetForNotifications = pmcSlashSingleQuotes(pmcSpecialChars($slashedTarget, $targetLatin1), 2); $promoteTime = time(); Index: refresh.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/refresh.cmd.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** refresh.cmd.php3 2001/06/10 14:57:48 1.4 --- refresh.cmd.php3 2001/12/10 22:53:40 1.5 *************** *** 42,47 **** } ! $isCommand = true; ! $doRefreshMessages = true; ?> --- 42,47 ---- } ! $isCommand = TRUE; ! $doRefreshMessages = TRUE; ?> Index: save.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/save.cmd.php3,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** save.cmd.php3 2001/11/29 22:00:56 1.8 --- save.cmd.php3 2001/12/10 22:53:40 1.9 *************** *** 73,78 **** if ($isMessages) { ! $isCommand = true; ! $isPopup = true; if (C_SAVE != "*" && ($cmd[2] = '*' || $cmd[2] > C_SAVE || $cmd[2] == '')) --- 73,78 ---- if ($isMessages) { ! $isCommand = TRUE; ! $isPopup = TRUE; if (C_SAVE != "*" && ($cmd[2] = '*' || $cmd[2] > C_SAVE || $cmd[2] == '')) Index: show.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/show.cmd.php3,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** show.cmd.php3 2001/06/10 14:57:48 1.4 --- show.cmd.php3 2001/12/10 22:53:40 1.5 *************** *** 37,43 **** } $dbSessionVars['msgNumber'] = ($cmd[3] != '') ? max(abs($cmd[3]), 5) : 5; ! $isCommand = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; ?> --- 37,43 ---- } $dbSessionVars['msgNumber'] = ($cmd[3] != '') ? max(abs($cmd[3]), 5) : 5; ! $isCommand = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; ?> Index: timestamp.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/timestamp.cmd.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** timestamp.cmd.php3 2001/04/19 21:05:04 1.3 --- timestamp.cmd.php3 2001/12/10 22:53:40 1.4 *************** *** 31,37 **** // cookie expires in one year setcookie('cookieShowTimestamp', $dbSessionVars['showTimestamp'], time() + 60*60*24*365); ! $isCommand = true; $enforceFirstLoad = 1; ! $doRefreshMessages = true; --- 31,37 ---- // cookie expires in one year setcookie('cookieShowTimestamp', $dbSessionVars['showTimestamp'], time() + 60*60*24*365); ! $isCommand = TRUE; $enforceFirstLoad = 1; ! $doRefreshMessages = TRUE; Index: whois.cmd.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/commands/whois.cmd.php3,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** whois.cmd.php3 2001/12/04 20:01:34 1.11 --- whois.cmd.php3 2001/12/10 22:53:40 1.12 *************** *** 48,52 **** else { ! $isCommand = true; $slashedTarget = pmcSlashSingleQuotes($cmd[1]); --- 48,52 ---- else { ! $isCommand = TRUE; $slashedTarget = pmcSlashSingleQuotes($cmd[1]); *************** *** 94,98 **** else { ! $isPopup = true; $nickForUrl = urlencode($cmd[1]); $winName = 'whois_popup_' . md5($cmd[1]); --- 94,98 ---- else { ! $isPopup = TRUE; $nickForUrl = urlencode($cmd[1]); $winName = 'whois_popup_' . md5($cmd[1]); |