From: Lo?c C. <lo...@us...> - 2001-12-05 19:25:18
|
Update of /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs In directory usw-pr-cvs1:/tmp/cvs-serv30964/chat/lib/index_libs Modified Files: start_page.lib.js msg_validation.lib.js Log Message: Fixed a js bug with NS3 Index: start_page.lib.js =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/start_page.lib.js,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** start_page.lib.js 2001/11/29 23:01:50 1.14 --- start_page.lib.js 2001/12/05 19:25:15 1.15 *************** *** 227,235 **** var pswdField = document.forms['startingForm'].elements['pmcPassword']; var roomToCreate = document.forms['startingForm'].elements['createRoomName']; ! var reNick = /\\|,| /; ! var reRoom = /\\|,/; // Brief nick validation ! if (nickField.value.replace(/ /g, '') == '') // nick is empty { nickField.value = ''; --- 227,236 ---- var pswdField = document.forms['startingForm'].elements['pmcPassword']; var roomToCreate = document.forms['startingForm'].elements['createRoomName']; ! var reEmpty = new RegExp(' ', 'g'); ! var reNick = new RegExp('\\|,| '); ! var reRoom = new RegExp('\\|,'); // Brief nick validation ! if (nickField.value.replace(reEmpty, '') == '') // nick is empty { nickField.value = ''; *************** *** 247,252 **** // Brief password validation if (doCheckPswd ! && pswdField.value.replace(/ /g, '') == '') // registration is required ! { // but password is empty pswdField.value = ''; pswdField.focus(); --- 248,253 ---- // Brief password validation if (doCheckPswd ! && pswdField.value.replace(reEmpty, '') == '') // registration is required ! { // but password is empty pswdField.value = ''; pswdField.focus(); *************** *** 257,261 **** // Ensure there is a password if the user wants to create room if (typeof(roomToCreate) != 'undefined' && roomToCreate.value != '' ! && pswdField.value.replace(/ /g, '') == '') { pswdField.focus(); --- 258,262 ---- // Ensure there is a password if the user wants to create room if (typeof(roomToCreate) != 'undefined' && roomToCreate.value != '' ! && pswdField.value.replace(reEmpty, '') == '') { pswdField.focus(); *************** *** 267,271 **** if (typeof(roomToCreate) != 'undefined' && roomToCreate != '') { ! if (roomToCreate.value.replace(/ /g, '') == '') // only space chars { roomToCreate.value = ''; --- 268,272 ---- if (typeof(roomToCreate) != 'undefined' && roomToCreate != '') { ! if (roomToCreate.value.replace(reEmpty, '') == '') // only space chars { roomToCreate.value = ''; Index: msg_validation.lib.js =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/lib/index_libs/msg_validation.lib.js,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** msg_validation.lib.js 2001/06/10 14:57:48 1.4 --- msg_validation.lib.js 2001/12/05 19:25:15 1.5 *************** *** 27,53 **** var validCmds = new Array; ! validCmds[0] = /^\/!$/; ! validCmds[1] = /^\/announce (.+)$/i; ! validCmds[2] = /^\/away( (.+))?$/i; ! validCmds[3] = /^\/ban (\* )?(.{1,30})$/i; ! validCmds[4] = (jsIsVersion4) ? /^\/clear$/i : ''; ! validCmds[5] = /^\/(help|\?)$/i; ! validCmds[6] = /^\/ignore( -)?( (.+))?$/i; ! validCmds[7] = /^\/img$/i; ! validCmds[8] = /^\/invite( (.+))+$/i; ! validCmds[9] = /^\/join ((0|1) )?#(.{1,30})$/i; ! validCmds[10] = /^\/kick (.{1,30})$/i; ! validCmds[11] = /^\/me (.+)$/i; ! validCmds[12] = /^\/(msg|to) ([^ ]{1,30}) (.+)$/i; ! validCmds[13] = /^\/notify$/i; ! validCmds[14] = (jsIsVersion4) ? '' : /^\/order$/i; ! validCmds[15] = /^\/profile$/i; ! validCmds[16] = /^\/promote (.{1,30})$/i; ! validCmds[17] = /^\/(quit|exit|bye)( (.+))?$/i; ! validCmds[18] = /^\/refresh( ([0-9]*))?$/i; ! validCmds[19] = /^\/save( ([0-9]*))?$/i; ! validCmds[20] = /^\/(show|last)( ([0-9]+))?$/i; ! validCmds[21] = /^\/timestamp$/i; ! validCmds[22] = /^\/whois (.{1,30})$/i; --- 27,53 ---- var validCmds = new Array; ! validCmds[0] = new RegExp('^\/!$'); ! validCmds[1] = new RegExp('^\/announce (.+)$', 'i'); ! validCmds[2] = new RegExp('^\/away( (.+))?$', 'i'); ! validCmds[3] = new RegExp('^\/ban (\\* )?(.{1,30})$', 'i'); ! validCmds[4] = (jsIsVersion4) ? new RegExp('^\/clear$', 'i') : ''; ! validCmds[5] = new RegExp('^\/(help|\\?)$', 'i'); ! validCmds[6] = new RegExp('^\/ignore( -)?( (.+))?$', 'i'); ! validCmds[7] = new RegExp('^\/img$', 'i'); ! validCmds[8] = new RegExp('^\/invite( (.+))+$', 'i'); ! validCmds[9] = new RegExp('^\/join ((0|1) )?#(.{1,30})$', 'i'); ! validCmds[10] = new RegExp('^\/kick (.{1,30})$', 'i'); ! validCmds[11] = new RegExp('^\/me (.+)$', 'i'); ! validCmds[12] = new RegExp('^\/(msg|to) ([^ ]{1,30}) (.+)$', 'i'); ! validCmds[13] = new RegExp('^\/notify$', 'i'); ! validCmds[14] = (jsIsVersion4) ? '' : new RegExp('^\/order$', 'i'); ! validCmds[15] = new RegExp('^\/profile$', 'i'); ! validCmds[16] = new RegExp('^\/promote (.{1,30})$', 'i'); ! validCmds[17] = new RegExp('^\/(quit|exit|bye)( (.+))?$', 'i'); ! validCmds[18] = new RegExp('^\/refresh( ([0-9]*))?$', 'i'); ! validCmds[19] = new RegExp('^\/save( ([0-9]*))?$', 'i'); ! validCmds[20] = new RegExp('^\/(show|last)( ([0-9]+))?$', 'i'); ! validCmds[21] = new RegExp('^\/timestamp$', 'i'); ! validCmds[22] = new RegExp('^\/whois (.{1,30})$', 'i'); *************** *** 92,100 **** var isCmd = (msgBox.value.substring(0,1) == '/'); // RegExp for some perticular command ! var reHist = /^\/!$/; ! var reHelp = /^\/(\?|help)$/i; // Ensure the message box isn't empty ! if (msgBox.value.replace(/ /g, '') == '') { return false; --- 92,101 ---- var isCmd = (msgBox.value.substring(0,1) == '/'); // RegExp for some perticular command ! var reEmpty = new RegExp(' ', 'g'); ! var reHist = new RegExp('^\/!$'); ! var reHelp = new RegExp('^\/(\\?|help)$', 'i'); // Ensure the message box isn't empty ! if (msgBox.value.replace(reEmpty, '') == '') { return false; |