From: Tony M. <cl...@us...> - 2004-04-13 00:46:59
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29074/mailto/class Modified Files: Mailto.php Log Message: Removed search capability. Added Help Added Prefix to be prepended onto the subject of the mail Added Real Name field (optional) Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Mailto.php 4 Apr 2004 04:23:17 -0000 1.5 --- Mailto.php 13 Apr 2004 00:33:04 -0000 1.6 *************** *** 14,24 **** --- 14,27 ---- var $_reqlogin = NULL; var $_from = NULL; + var $_name = NULL; var $_message = NULL; var $_referer = NULL; var $_subject = NULL; var $_lock_subject = NULL; + var $_prefix = NULL; function PHPWS_Mailto($MT_ID = NULL) { $exclude[] = "_from"; + $exclude[] = "_name"; $exclude[] = "_message"; $exclude[] = "_referer"; *************** *** 71,74 **** --- 74,79 ---- $tags["MT_LOCK_SUBJECT"] = "No"; } + $tags["MT_PREFIX"] = $this->getPrefix(); + $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); *************** *** 78,81 **** --- 83,87 ---- $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?"); $tags["LABEL_LOCK_SUBJECT"] = $_SESSION["translate"]->it("Lock Subject?"); + $tags["LABEL_PREFIX"] = $_SESSION["translate"]->it("Prefix"); return PHPWS_Template::processTemplate($tags, "mailto", "view.tpl"); *************** *** 94,97 **** --- 100,104 ---- $form->add("MT_ADDRESS", "text", $this->getAddress()); $form->add("MT_SUBJECT", "text", $this->getSubject()); + $form->add("MT_PREFIX", "text", $this->getPrefix()); $form->add("MT_REQLOGIN", "checkbox"); $form->setMatch("MT_REQLOGIN", $this->_reqlogin); *************** *** 120,123 **** --- 127,132 ---- $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject"); $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); + $tags["PREFIX_LABEL"] = $_SESSION["translate"]->it("Prefix"); + $tags["PREFIX_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "prefix"); $tags["LOCK_SUBJECT_LABEL"] = $_SESSION["translate"]->it("Lock Subject?"); $tags["LOCK_SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "lock_subject"); *************** *** 149,152 **** --- 158,165 ---- } + if(isset($_REQUEST["MT_PREFIX"])) { + $this->_prefix = $_REQUEST["MT_PREFIX"]; + } + if(isset($_REQUEST["MT_REQLOGIN"])) { $this->_reqlogin = 1; *************** *** 194,197 **** --- 207,212 ---- } $form->setSize("MT_SUBJECT", 50); + $form->add("MT_NAME", "text", $this->_name); + $form->setSize("MT_NAME", 30); $form->add("MT_MESSAGE", "textarea", $this->_message); $form->setRows("MT_MESSAGE", 15); *************** *** 202,205 **** --- 217,221 ---- $form->add("MT_ADDRESS", "hidden", $this->getAddress()); $form->add("MT_LABEL", "hidden", $this->getLabel()); + $form->add("MT_PREFIX", "hidden", $this->getPrefix()); $form->add("MT_REFERER", "hidden" ,$this->_referer); *************** *** 218,223 **** $tags["LABEL_TO"] = $_SESSION["translate"]->it("To"); ! $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From"); $tags["FROM_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "from"); $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); --- 234,241 ---- $tags["LABEL_TO"] = $_SESSION["translate"]->it("To"); ! $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From E-mail Address"); $tags["FROM_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "from"); + $tags["LABEL_NAME"] = $_SESSION["translate"]->it("From Name"); + $tags["NAME_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "name"); $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject"); $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); *************** *** 276,284 **** } ! $addedheaders = "From: ".$_REQUEST["MT_FROM"]."\r\n"; ! $addedheaders .= "X-Mail-Addr: ".$_SERVER["REMOTE_ADDR"]."\r\n";; ! $addedheaders .= "X-Mail-DateTime: ".date("r"); ! mail($_REQUEST["MT_LABEL"]." <".$_REQUEST["MT_ADDRESS"]."> ", stripslashes($_REQUEST["MT_SUBJECT"]), stripslashes($_REQUEST["MT_MESSAGE"]), $addedheaders); $_SESSION["mailto_time"] = time(); --- 294,310 ---- } ! if(isset($_REQUEST["MT_NAME"])) { ! $addedHeaders = "From: " . $_REQUEST["MT_NAME"] . " <" . $_REQUEST["MT_FROM"].">\r\n"; ! } else { ! $addedHeaders = "From: ".$_REQUEST["MT_FROM"]."\r\n"; ! } ! $addedHeaders .= "X-Mail-Addr: ".$_SERVER["REMOTE_ADDR"]."\r\n";; ! $addedHeaders .= "X-Mail-DateTime: ".date("r"); ! $toString = $_REQUEST["MT_LABEL"]." <".$_REQUEST["MT_ADDRESS"].">"; ! $subjectString = stripslashes($_REQUEST["MT_PREFIX"] . " " . $_REQUEST["MT_SUBJECT"]); ! $messageString = stripslashes($_REQUEST["MT_MESSAGE"]); ! ! mail($toString, $subjectString, $messageString, $addedHeaders); $_SESSION["mailto_time"] = time(); *************** *** 401,404 **** --- 427,438 ---- }// END FUNC getFrom + function getPrefix() { + if(isset($this->_prefix) && strlen($this->_prefix) > 0) { + return $this->_prefix; + } else { + return NULL; + } + }// END FUNC getPrefix + function getReqlogin() { if(isset($this->_reqlogin)) { |