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

[<w4...@us...>]

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

Modified Files:
	misc.php 
Log Message:
recomend us link for anonymous users.

Index: misc.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/misc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** misc.php	2 Jan 2003 14:56:45 -0000	1.1
--- misc.php	5 Jan 2003 18:20:46 -0000	1.2
***************
*** 112,116 ****
  				$fmail = "";
  			} else {
! 				break;
  			}
  			printCheckForm();
--- 112,119 ----
  				$fmail = "";
  			} else {
! 				$yname = "";
! 				$ymail = "";
! 				$fname = "";
! 				$fmail = "";
  			}
  			printCheckForm();
***************
*** 122,126 ****
  				<input type='hidden' name='type' value='friend' />\n";
  			echo _YOURNAMEC."</td><td class='even'><input type='text' name='yname' value='$yname' id='yname' /></td></tr>
!    				<tr><td class='head'>"._YOUREMAILC."</td><td class='odd'>".$ymail."</td></tr>
     				<tr><td class='head'>"._FRIENDNAMEC."</td><td class='even'><input type='text' name='fname' value='$fname' id='fname' /></td></tr>
  				<tr><td class='head'>"._FRIENDEMAILC."</td><td class='odd'><input type='text' name='fmail' value='$fmail' id='fmail' /></td></tr>
--- 125,129 ----
  				<input type='hidden' name='type' value='friend' />\n";
  			echo _YOURNAMEC."</td><td class='even'><input type='text' name='yname' value='$yname' id='yname' /></td></tr>
!    				<tr><td class='head'>"._YOUREMAILC."</td><td class='odd'><input type='text' name='ymail' value='".$ymail."' id='ymail' /></td></tr>
     				<tr><td class='head'>"._FRIENDNAMEC."</td><td class='even'><input type='text' name='fname' value='$fname' id='fname' /></td></tr>
  				<tr><td class='head'>"._FRIENDEMAILC."</td><td class='odd'><input type='text' name='fmail' value='$fmail' id='fmail' /></td></tr>
***************
*** 132,138 ****
  				$ymail = $xoopsUser->getVar("email");
  			} else {
! 				break;
  			}
! 			if ( !isset($HTTP_POST_VARS['yname']) || trim($HTTP_POST_VARS['yname']) == "" || !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&amp;type=friend&amp;op=sendform",2,_NEEDINFO);
  				exit();
--- 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&amp;type=friend&amp;op=sendform",2,_NEEDINFO);
  				exit();
***************
*** 141,145 ****
  			$fname = trim($HTTP_POST_VARS['fname']);
  			$fmail = trim($HTTP_POST_VARS['fmail']);
! 			if (!checkEmail($fmail)) {
  				$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) or !checkEmail($ymail)) {
  				$errormessage = _INVALIDEMAIL1."<br />"._INVALIDEMAIL2."";
  				redirect_header(XOOPS_URL."/misc.php?action=showpopups&amp;type=friend&amp;op=sendform",2,$errormessage);
***************
*** 154,158 ****
  			$xoopsMailer->assign("FRIEND_NAME", $fname);
  			$xoopsMailer->setToEmails($fmail);
! 			$xoopsMailer->setFromEmail($xoopsUser->getVar("email"));
  			$xoopsMailer->setFromName($yname);
  			$xoopsMailer->setSubject(sprintf(_INTSITE,$xoopsConfig['sitename']));
--- 157,161 ----
  			$xoopsMailer->assign("FRIEND_NAME", $fname);
  			$xoopsMailer->setToEmails($fmail);
! 			$xoopsMailer->setFromEmail($ymail);
  			$xoopsMailer->setFromName($yname);
  			$xoopsMailer->setSubject(sprintf(_INTSITE,$xoopsConfig['sitename']));