[Xoops-cvs2] xoops2 misc.php,1.2,1.3

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2
In directory sc8-pr-cvs1:/tmp/cvs-serv27085

Modified Files:
	misc.php 
Log Message:


Index: misc.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/misc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** misc.php	5 Jan 2003 18:20:46 -0000	1.2
--- misc.php	5 Jan 2003 18:55:33 -0000	1.3
***************
*** 135,141 ****
  				$ymail = $xoopsUser->getVar("email");
  			} else {
! 				$ymail = trim($HTTP_POST_VARS['ymail']); 
  			}
! 			if ( !isset($HTTP_POST_VARS['yname']) || trim($HTTP_POST_VARS['yname']) == "" || !isset($ymail) || !isset($HTTP_POST_VARS['fname']) || trim($HTTP_POST_VARS['fname']) == ""  || !isset($HTTP_POST_VARS['fmail']) || trim($HTTP_POST_VARS['fmail']) == '' ) {
  			    redirect_header(XOOPS_URL."/misc.php?action=showpopups&type=friend&op=sendform",2,_NEEDINFO);
  				exit();
--- 135,141 ----
  				$ymail = $xoopsUser->getVar("email");
  			} else {
! 				$ymail = isset($HTTP_POST_VARS['ymail']) ? trim($HTTP_POST_VARS['ymail']) : ''; 
  			}
! 			if ( !isset($HTTP_POST_VARS['yname']) || trim($HTTP_POST_VARS['yname']) == "" || $ymail == '' || !isset($HTTP_POST_VARS['fname']) || trim($HTTP_POST_VARS['fname']) == ""  || !isset($HTTP_POST_VARS['fmail']) || trim($HTTP_POST_VARS['fmail']) == '' ) {
  			    redirect_header(XOOPS_URL."/misc.php?action=showpopups&type=friend&op=sendform",2,_NEEDINFO);
  				exit();
***************
*** 144,148 ****
  			$fname = trim($HTTP_POST_VARS['fname']);
  			$fmail = trim($HTTP_POST_VARS['fmail']);
! 			if (!checkEmail($fmail) or !checkEmail($ymail)) {
  				$errormessage = _INVALIDEMAIL1."<br />"._INVALIDEMAIL2."";
  				redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,$errormessage);
--- 144,148 ----
  			$fname = trim($HTTP_POST_VARS['fname']);
  			$fmail = trim($HTTP_POST_VARS['fmail']);
! 			if (!checkEmail($fmail) || !checkEmail($ymail)) {
  				$errormessage = _INVALIDEMAIL1."<br />"._INVALIDEMAIL2."";
  				redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,$errormessage);