From: <ok...@us...> - 2003-01-07 18:18:40
|
Update of /cvsroot/xoops/xoops2 In directory sc8-pr-cvs1:/tmp/cvs-serv31828 Modified Files: misc.php Log Message: changed lang file constants Index: misc.php =================================================================== RCS file: /cvsroot/xoops/xoops2/misc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** misc.php 5 Jan 2003 18:55:33 -0000 1.3 --- misc.php 7 Jan 2003 18:18:30 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- include "mainfile.php"; + include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/misc.php'; $action = isset($HTTP_GET_VARS['action']) ? trim($HTTP_GET_VARS['action']) : ''; $action = isset($HTTP_POST_VARS['action']) ? trim($HTTP_POST_VARS['action']) : $action; *************** *** 51,59 **** <table width="100%" class="outer"> <tr> ! <th colspan="3">'._SMILIES.'</th> </tr> <tr class="head"> ! <td>'._CODE.'</td> ! <td>'._EMOTION.'</td> <td>'._IMAGE.'</td> </tr>'; --- 52,60 ---- <table width="100%" class="outer"> <tr> ! <th colspan="3">'._MSC_SMILIES.'</th> </tr> <tr class="head"> ! <td>'._MSC_CODE.'</td> ! <td>'._MSC_EMOTION.'</td> <td>'._IMAGE.'</td> </tr>'; *************** *** 67,71 **** echo "Could not retrieve data from the database."; } ! echo '</table>'._CLICKASMILIE; break; case "avatars": --- 68,72 ---- echo "Could not retrieve data from the database."; } ! echo '</table>'._MSC_CLICKASMILIE; break; case "avatars": *************** *** 85,89 **** </script> </head><body> ! <h4><?php echo _AVAVATARS;?></h4> <form name='avatars'> <table width='100%'><tr> --- 86,90 ---- </script> </head><body> ! <h4><?php echo _MSC_AVAVATARS;?></h4> <form name='avatars'> <table width='100%'><tr> *************** *** 119,131 **** printCheckForm(); echo '</head><body> ! <form action="'.XOOPS_URL.'/misc.php" method="post" onsubmit="return checkForm();"><table width="100%" class="outer" cellspacing="1"><tr><th colspan="2">'._RECOMMENDSITE.'</th></tr>'; echo "<tr><td class='head'> <input type='hidden' name='op' value='sendsite' /> <input type='hidden' name='action' value='showpopups' /> <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> <tr><td class='head'> </td><td class='even'><input type='submit' value='"._SEND."' /> <input value='"._CLOSE."' type='button' onclick='javascript:window.close();' /></td></tr> </table></form>\n"; --- 120,132 ---- printCheckForm(); echo '</head><body> ! <form action="'.XOOPS_URL.'/misc.php" method="post" onsubmit="return checkForm();"><table width="100%" class="outer" cellspacing="1"><tr><th colspan="2">'._MSC_RECOMMENDSITE.'</th></tr>'; echo "<tr><td class='head'> <input type='hidden' name='op' value='sendsite' /> <input type='hidden' name='action' value='showpopups' /> <input type='hidden' name='type' value='friend' />\n"; ! echo _MSC_YOURNAMEC."</td><td class='even'><input type='text' name='yname' value='$yname' id='yname' /></td></tr> ! <tr><td class='head'>"._MSC_YOUREMAILC."</td><td class='odd'><input type='text' name='ymail' value='".$ymail."' id='ymail' /></td></tr> ! <tr><td class='head'>"._MSC_FRIENDNAMEC."</td><td class='even'><input type='text' name='fname' value='$fname' id='fname' /></td></tr> ! <tr><td class='head'>"._MSC_FRIENDEMAILC."</td><td class='odd'><input type='text' name='fmail' value='$fmail' id='fmail' /></td></tr> <tr><td class='head'> </td><td class='even'><input type='submit' value='"._SEND."' /> <input value='"._CLOSE."' type='button' onclick='javascript:window.close();' /></td></tr> </table></form>\n"; *************** *** 138,142 **** } 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(); } --- 139,143 ---- } 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,_MSC_NEEDINFO); exit(); } *************** *** 145,149 **** $fmail = trim($HTTP_POST_VARS['fmail']); if (!checkEmail($fmail) || !checkEmail($ymail)) { ! $errormessage = _INVALIDEMAIL1."<br />"._INVALIDEMAIL2.""; redirect_header(XOOPS_URL."/misc.php?action=showpopups&type=friend&op=sendform",2,$errormessage); exit(); --- 146,150 ---- $fmail = trim($HTTP_POST_VARS['fmail']); if (!checkEmail($fmail) || !checkEmail($ymail)) { ! $errormessage = _MSC_INVALIDEMAIL1."<br />"._MSC_INVALIDEMAIL2.""; redirect_header(XOOPS_URL."/misc.php?action=showpopups&type=friend&op=sendform",2,$errormessage); exit(); *************** *** 159,168 **** $xoopsMailer->setFromEmail($ymail); $xoopsMailer->setFromName($yname); ! $xoopsMailer->setSubject(sprintf(_INTSITE,$xoopsConfig['sitename'])); //OpenTable(); if ( !$xoopsMailer->send() ) { echo $xoopsMailer->getErrors(); } else { ! echo "<div><h4>"._REFERENCESENT."</h4></div>"; } //CloseTable(); --- 160,169 ---- $xoopsMailer->setFromEmail($ymail); $xoopsMailer->setFromName($yname); ! $xoopsMailer->setSubject(sprintf(_MSC_INTSITE,$xoopsConfig['sitename'])); //OpenTable(); if ( !$xoopsMailer->send() ) { echo $xoopsMailer->getErrors(); } else { ! echo "<div><h4>"._MSC_REFERENCESENT."</h4></div>"; } //CloseTable(); *************** *** 241,253 **** { if ( xoopsGetElementById("yname").value == "" ){ ! alert( "<?php echo _ENTERYNAME;?>" ); xoopsGetElementById("yname").focus(); return false; } else if ( xoopsGetElementById("fname").value == "" ){ ! alert( "<?php echo _ENTERFNAME;?>" ); xoopsGetElementById("fname").focus(); return false; } else if ( xoopsGetElementById("fmail").value ==""){ ! alert( "<?php echo _ENTERFMAIL;?>" ); xoopsGetElementById("fmail").focus(); return false; --- 242,254 ---- { if ( xoopsGetElementById("yname").value == "" ){ ! alert( "<?php echo _MSC_ENTERYNAME;?>" ); xoopsGetElementById("yname").focus(); return false; } else if ( xoopsGetElementById("fname").value == "" ){ ! alert( "<?php echo _MSC_ENTERFNAME;?>" ); xoopsGetElementById("fname").focus(); return false; } else if ( xoopsGetElementById("fmail").value ==""){ ! alert( "<?php echo _MSC_ENTERFMAIL;?>" ); xoopsGetElementById("fmail").focus(); return false; |