Menu
▾
▴
[phpws-comm-commits] modules/mailto/class Mailto.php,1.3,1.4 MailtoManager.php,1.1.1.1,1.2
|
From: Tony M. <cl...@us...> - 2004-04-04 00:36:53
|
Update of /cvsroot/phpwebsite-comm/modules/mailto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11662/mailto/class Modified Files: Mailto.php MailtoManager.php Log Message: Registered with the help facility. Removed the search facility. Index: MailtoManager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/MailtoManager.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** MailtoManager.php 26 Mar 2004 18:56:49 -0000 1.1.1.1 --- MailtoManager.php 4 Apr 2004 00:24:30 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- $tags["LIST_MAILTOS"] = "<a href=\"index.php?module=mailto&MT_MAN_OP=main\">$listMailtos</a>"; + $tags["ACTION_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "action"); if(isset($_SESSION["PHPWS_Mailto_Message"])) { Index: Mailto.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mailto.php 2 Apr 2004 02:28:57 -0000 1.3 --- Mailto.php 4 Apr 2004 00:24:30 -0000 1.4 *************** *** 46,50 **** if($_SESSION['OBJ_user']->allow_access("mailto", "view")) { $form = new EZForm("mailto_view"); ! $form->add("MT_URL", "text", "<a href=\"index.php?module=mailto&PHPWS_MAN_ITEMS[]=".$this->getID()."&MT_MAN_OP=mail\">Link text</a>"); $form->setSize("MT_URL", 80); $form->add("module", "hidden", "mailto"); --- 46,50 ---- if($_SESSION['OBJ_user']->allow_access("mailto", "view")) { $form = new EZForm("mailto_view"); ! $form->add("MT_URL", "text", "<a href=\"index.php?module=mailto&PHPWS_MAN_ITEMS[]=".$this->getID()."&MT_MAN_OP=mail\">Link text</a>"); $form->setSize("MT_URL", 80); $form->add("module", "hidden", "mailto"); *************** *** 75,78 **** --- 75,79 ---- $tags["LABEL_ADDRESS"] = $_SESSION["translate"]->it("Address"); $tags["LABEL_URL"] = $_SESSION["translate"]->it("URL"); + $tags["URL_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "url"); $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?"); $tags["LABEL_LOCK_SUBJECT"] = $_SESSION["translate"]->it("Lock Subject?"); *************** *** 114,121 **** --- 115,127 ---- $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label"); + $tags["LABEL_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "label"); $tags["ADDRESS_LABEL"] = $_SESSION["translate"]->it("Address"); + $tags["ADDRESS_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "address"); $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject"); + $tags["SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "subject"); $tags["LOCK_SUBJECT_LABEL"] = $_SESSION["translate"]->it("Lock Subject?"); + $tags["LOCK_SUBJECT_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "lock_subject"); $tags["REQLOGIN_LABEL"] = $_SESSION["translate"]->it("Require Login?"); + $tags["REQLOGIN_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "reqlogin"); return PHPWS_Template::processTemplate($tags, "mailto", "edit.tpl"); *************** *** 169,180 **** if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! //$form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! //$form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->email); } $form->setSize("MT_FROM", 30); --- 175,184 ---- if($this->_reqlogin == 0) { if(isset($_SESSION['OBJ_user']->username)) { ! $form->add("MT_FROM", "text", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } else { $form->add("MT_FROM", "text", $this->_from); } } else { ! $form->add("MT_FROM", "hidden", $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"); } $form->setSize("MT_FROM", 30); *************** *** 202,207 **** if($this->_reqlogin <> 0) { ! //$tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->email; } --- 206,210 ---- if($this->_reqlogin <> 0) { ! $tags["MT_FROM"] = $_SESSION['OBJ_user']->username." <".$_SESSION['OBJ_user']->email.">"; } *************** *** 211,216 **** --- 214,222 ---- $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"); $tags["LABEL_MESSAGE"] = $_SESSION["translate"]->it("Message"); + $tags["MESSAGE_HELP"] = $_SESSION["OBJ_help"]->show_link("mailto", "message"); return PHPWS_Template::processTemplate($tags, "mailto", "mail.tpl"); *************** *** 317,322 **** if(is_string($address)) { if(strlen($address) > 0) { ! //$this->_address = PHPWS_Text::parseOutput($address); ! $this->_address; return TRUE; } else { --- 323,327 ---- if(is_string($address)) { if(strlen($address) > 0) { ! $this->_address = PHPWS_Text::parseOutput($address); return TRUE; } else { *************** *** 352,357 **** function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! // return PHPWS_Text::parseOutput($this->_address); ! return $this->_address; } else { return NULL; --- 357,361 ---- function getAddress() { if(isset($this->_address) && strlen($this->_address) > 0) { ! return PHPWS_Text::parseOutput($this->_address); } else { return NULL; *************** *** 360,375 **** function setFrom($from) { ! if (PHPWS_Text::isValidInput($from, "email")){ ! if ( $from == $_SESSION["from"] && getmxrr(substr(strstr($from, '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $_SESSION["from"] = $from; ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly. If you are sure this is a valid e-mail address, press [Mail it!], otherwise, correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be of the form <em>you...@do...</em>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } --- 364,381 ---- function setFrom($from) { ! if (strstr("<", $from) && !strstr(">", $from)) $from .= ">"; ! if (!(list($name, $email) = split("<", $from, 2))) $email = $from; ! $email = str_replace(">", "", $email); ! if (eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@([0-9a-z][0-9a-z-]*[0-9a-z]\.)+[a-z]{2}[mtgvu]?$", $email, $check)) { ! if ( getmxrr(substr(strstr($check[0], '@'), 1), $validate_email_temp) ) { $this->_from = $from; return true; } else { ! $message = $_SESSION["translate"]->it("E-mail address does not appear to be set up properly"); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); // echo 'MX record not found for email: '.$email; } } else { ! $message = $_SESSION["translate"]->it("E-mail address is badly formed. It must be either of the form <i>Your Name <yo...@na...></i> or <i>yo...@na...</i>. Please correct it and try again."); return new PHPWS_Error("mailto", "PHPWS_Mailto::mailit", $message); } *************** *** 378,383 **** function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! //return PHPWS_Text::parseOutput($this->_from); ! return $this->_from; } else { return NULL; --- 384,388 ---- function getFrom() { if(isset($this->_from) && strlen($this->_from) > 0) { ! return PHPWS_Text::parseOutput($this->_from); } else { return NULL; |
