From: Lo?c C. <lo...@us...> - 2001-04-11 21:04:49
|
Update of /cvsroot/phpmychat/phpMyChat - 0.14/chat In directory usw-pr-cvs1:/tmp/cvs-serv13796 Modified Files: usersL.php3 usersH.php3 Log Message: Updates the gender information feature ***** Bogus filespec: - ***** Bogus filespec: 0.14/chat Index: usersL.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/usersL.php3,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** usersL.php3 2001/03/23 18:44:46 1.3 --- usersL.php3 2001/04/11 21:04:46 1.4 *************** *** 65,82 **** //** Display users list for the current room ** ! $DbLink->query("SELECT username, latin1, status FROM ".C_USR_TBL." WHERE room='$R' ORDER BY username"); echo("<B>".htmlspecialchars(stripslashes($R))."</B><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (".$DbLink->num_rows().")</SPAN><BR>\n"); ! while(list($User, $Latin1, $status) = $DbLink->next_record()) { // Put an icon when there is a profile for the user if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { - $ImgNum++; $Cmd2Send = ($User == stripslashes($U) ? "'PROFILE',''" : "'WHOIS','".special_char2($User,$Latin1)."'"); ! echo("<A HREF=\"#\" onClick=\"window.parent.runCmd($Cmd2Send); return false;\" CLASS=\"user\" onmouseover=\"document.images['whoisImg$ImgNum'].src = window.parent.imgWhoisOn.src\" onmouseout=\"document.images['whoisImg$ImgNum'].src = window.parent.imgWhoisOff.src\"><IMG NAME=\"whoisImg$ImgNum\" SRC=\"images/whoisOff.gif\" WIDTH=5 HEIGHT=9 BORDER=0 ALT=\"".L_PROFILE."\"></A> "); } else { ! echo("- "); }; if($User != $U) --- 65,115 ---- //** Display users list for the current room ** ! if (C_DB_TYPE == 'mysql') ! { ! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender ' ! . 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username ' ! . 'WHERE usr.room = \'' . $R . '\' ' ! . 'ORDER BY usr.username'; ! } ! else if (C_DB_TYPE == 'pgsql') ! { ! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender ' ! . 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg ' ! . 'WHERE usr.room = \'' . $R . '\' ' ! . 'UNION ' ! . 'SELECT usr.username, usr.latin1, usr.status, NULL ' ! . 'FROM ' . C_USR_TBL . ' usr ' ! . 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $R . '\' ' ! . 'ORDER BY usr.username'; ! } ! else ! { ! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL ' ! . 'FROM ' . C_USR_TBL . ' usr ' ! . 'WHERE usr.room = \'' . $R . '\' ' ! . 'ORDER BY usr.username'; ! } ! ! $DbLink->query($currentRoomQuery); echo("<B>".htmlspecialchars(stripslashes($R))."</B><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (".$DbLink->num_rows().")</SPAN><BR>\n"); ! while(list($User, $Latin1, $status, $gender) = $DbLink->next_record()) { // Put an icon when there is a profile for the user + if($gender == 0) + $gender = 'undefined'; + elseif($gender == 1) + $gender = 'boy'; + elseif($gender == 2) + $gender = 'girl'; + else + $gender = 'none'; if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { $Cmd2Send = ($User == stripslashes($U) ? "'PROFILE',''" : "'WHOIS','".special_char2($User,$Latin1)."'"); ! echo('<a href="#" onClick="window.parent.runCmd('.$Cmd2Send.'); return false;" class="user"><img src="images/gender_'.$gender.'.gif" width="14" height="14" border="0" alt="'.L_PROFILE.'"></a> '); } else { ! echo('<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '"> '); }; if($User != $U) *************** *** 103,122 **** while(list($Other) = $DbLink->next_record()) { ! $OthersUsers->query("SELECT username, latin1, status FROM ".C_USR_TBL." WHERE room = '".addslashes($Other)."' ORDER BY username"); if($OthersUsers->num_rows() > 0) { $notEmptyRooms[$Other] = 1; echo("<A HREF=\"$From?Ver=L&L=$L&U=".urlencode(stripslashes($U))."$AddPwd2Link&R1=".urlencode($Other)."&T=1&D=$D&N=$N&E=".urlencode(stripslashes($R))."&EN=$T\" TARGET=\"_parent\">".htmlspecialchars($Other)."</A><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (".$OthersUsers->num_rows().")</SPAN><BR>\n"); ! while(list($OtherUser,$Latin1,$status) = $OthersUsers->next_record()) { // Put an icon when there is a profile for the user if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { ! $ImgNum++; ! echo("<A HREF=\"#\" onClick=\"window.parent.runCmd('WHOIS','".special_char2($OtherUser,$Latin1)."'); return false;\" CLASS=\"user\" onmouseover=\"document.images['whoisImg$ImgNum'].src = window.parent.imgWhoisOn.src\" onmouseout=\"document.images['whoisImg$ImgNum'].src = window.parent.imgWhoisOff.src\"><IMG NAME=\"whoisImg$ImgNum\" SRC=\"images/whoisOff.gif\" WIDTH=5 HEIGHT=9 BORDER=0 ALT=\"".L_PROFILE."\"></A> "); } else { ! echo("- "); }; echo("<A HREF=\"javascript:window.parent.userClick('".special_char2($OtherUser,$Latin1)."',false);\" CLASS=\"user\">".special_char($OtherUser,$Latin1,$status)."</A><BR>\n"); --- 136,188 ---- while(list($Other) = $DbLink->next_record()) { ! if (C_DB_TYPE == 'mysql') ! { ! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender ' ! . 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username ' ! . 'WHERE usr.room = \'' . addslashes($Other) . '\' ' ! . 'ORDER BY usr.username'; ! } ! else if (C_DB_TYPE == 'pgsql') ! { ! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender ' ! . 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg ' ! . 'WHERE usr.room = \'' . addslashes($Other) . '\' ' ! . 'UNION ' ! . 'SELECT usr.username, usr.latin1, usr.status, 0 ' ! . 'FROM ' . C_USR_TBL . ' usr ' ! . 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . addslashes($Other) . '\' ' ! . 'ORDER BY usr.username'; ! } ! else ! { ! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, 0 ' ! . 'FROM ' . C_USR_TBL . ' usr ' ! . 'WHERE usr.room = \'' . addslashes($Other) . '\' ' ! . 'ORDER BY usr.username'; ! } ! ! $OthersUsers->query($otherRoomsQuery); if($OthersUsers->num_rows() > 0) { $notEmptyRooms[$Other] = 1; echo("<A HREF=\"$From?Ver=L&L=$L&U=".urlencode(stripslashes($U))."$AddPwd2Link&R1=".urlencode($Other)."&T=1&D=$D&N=$N&E=".urlencode(stripslashes($R))."&EN=$T\" TARGET=\"_parent\">".htmlspecialchars($Other)."</A><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (".$OthersUsers->num_rows().")</SPAN><BR>\n"); ! while(list($OtherUser, $Latin1, $status, $gender) = $OthersUsers->next_record()) { // Put an icon when there is a profile for the user + if($gender == 0) + $gender = 'undefined'; + elseif($gender == 1) + $gender = 'boy'; + elseif($gender == 2) + $gender = 'girl'; + else + $gender = 'none'; if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { ! echo('<a href="#" onClick="window.parent.runCmd(\'WHOIS\',\''.special_char2($OtherUser,$Latin1).'\'); return false;" class="user"><img src="images/gender_'.$gender.'.gif" width="14" height="14" border="0" alt="'.L_PROFILE.'"></a> '); } else { ! echo('<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '"> '); }; echo("<A HREF=\"javascript:window.parent.userClick('".special_char2($OtherUser,$Latin1)."',false);\" CLASS=\"user\">".special_char($OtherUser,$Latin1,$status)."</A><BR>\n"); *************** *** 139,143 **** if (strcasecmp($tmpRoom, stripslashes($R)) != 0 && (!isset($notEmptyRooms) || !isset($notEmptyRooms[$tmpRoom]))) { ! echo("<A HREF=\"$From?Ver=L&L=$L&U=".urlencode(stripslashes($U))."$AddPwd2Link&R0=".urlencode($tmpRoom)."&T=1&D=$D&N=$N&E=".urlencode(stripslashes($R))."&EN=$T\" TARGET=\"_parent\">".htmlspecialchars($Other)."</A><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (0)</SPAN><BR>\n"); }; }; --- 205,209 ---- if (strcasecmp($tmpRoom, stripslashes($R)) != 0 && (!isset($notEmptyRooms) || !isset($notEmptyRooms[$tmpRoom]))) { ! echo("<A HREF=\"$From?Ver=L&L=$L&U=".urlencode(stripslashes($U))."$AddPwd2Link&R0=".urlencode($tmpRoom)."&T=1&D=$D&N=$N&E=".urlencode(stripslashes($R))."&EN=$T\" TARGET=\"_parent\">".htmlspecialchars($tmpRoom)."</A><SPAN CLASS=\"small\"><BDO dir=\"${textDirection}\"></BDO> (0)</SPAN><BR>\n"); }; }; Index: usersH.php3 =================================================================== RCS file: /cvsroot/phpmychat/phpMyChat - 0.14/chat/usersH.php3,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** usersH.php3 2001/03/29 19:05:29 1.9 --- usersH.php3 2001/04/11 21:04:46 1.10 *************** *** 85,90 **** } - $ImgNum = "0"; - $DbLink = new DB; --- 85,88 ---- *************** *** 132,142 **** if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { - $ImgNum++; $Cmd2Send = ($User == stripslashes($U) ? "'PROFILE',''" : "'WHOIS','".special_char2($User,$Latin1)."'"); ! echo('<a href="#" onClick="window.parent.runCmd('.$Cmd2Send.'); return false;" class="user"><img name="whoisImg'.$ImgNum.'" src="images/gender_'.$gender.'.gif" width="14" height="14" border="0" alt="'.L_PROFILE.'"></a> '); } else { ! echo('<img name="whoisImg'.$ImgNum.'" src="images/gender_none.gif" width="14" height="14" border="0" alt="Pas de profil"> '); } if($User != stripslashes($U)) --- 130,139 ---- if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { $Cmd2Send = ($User == stripslashes($U) ? "'PROFILE',''" : "'WHOIS','".special_char2($User,$Latin1)."'"); ! echo('<a href="#" onClick="window.parent.runCmd('.$Cmd2Send.'); return false;" class="user"><img src="images/gender_'.$gender.'.gif" width="14" height="14" border="0" alt="'.L_PROFILE.'"></a> '); } else { ! echo('<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '"> '); } if($User != stripslashes($U)) *************** *** 215,224 **** if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { ! $ImgNum++; ! echo('<a href="#" onClick="window.parent.runCmd(\'WHOIS\',\''.special_char2($OtherUser,$Latin1).'\'); return false;" class="user"><img name="whoisImg'.$ImgNum.'" src="images/gender_'.$gender.'.gif" width="14" height="14" border="0" alt="'.L_PROFILE.'"></a> '); } else { ! echo('<img name="whoisImg'.$ImgNum.'" src="images/gender_none.gif" width="14" height="14" border="0" alt="Pas de profil"> '); } echo("<A HREF=\"javascript:window.parent.userClick('".special_char2($OtherUser,$Latin1)."',false);\" CLASS=\"user\">".special_char($OtherUser,$Latin1,$status)."</A><BR>\n"); --- 212,220 ---- if ($status != "u" && $status != "k" && $status != "d" && $status != "b") { ! echo('<a href="#" onClick="window.parent.runCmd(\'WHOIS\',\''.special_char2($OtherUser,$Latin1).'\'); return false;" class="user"><img src="images/gender_'.$gender.'.gif" width="14" height="14" border="0" alt="'.L_PROFILE.'"></a> '); } else { ! echo('<img src="images/gender_none.gif" width="14" height="14" border="0" alt="' . L_NO_PROFILE . '"> '); } echo("<A HREF=\"javascript:window.parent.userClick('".special_char2($OtherUser,$Latin1)."',false);\" CLASS=\"user\">".special_char($OtherUser,$Latin1,$status)."</A><BR>\n"); |