[phpws-comm-commits] modules/mailto/class Mailto.php,1.1.1.1,1.2

[Tony M. <cl...@us...>]

Update of /cvsroot/phpwebsite-comm/modules/mailto/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21138/modules/mailto/class

Modified Files:
	Mailto.php 
Log Message:
Added a pre-set subject option, also the ability to lock down the subject.  
Did some convention clean-up.


Index: Mailto.php
===================================================================
RCS file: /cvsroot/phpwebsite-comm/modules/mailto/class/Mailto.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Mailto.php	26 Mar 2004 18:56:49 -0000	1.1.1.1
--- Mailto.php	29 Mar 2004 21:08:04 -0000	1.2
***************
*** 14,24 ****
    var $_reqlogin = NULL;
    var $_from = NULL;
-   var $_subject = NULL;
    var $_message = NULL;
    var $_referer = NULL;
  
    function PHPWS_Mailto($MT_ID = NULL) {
      $exclude[] = "_from";
-     $exclude[] = "_subject";
      $exclude[] = "_message";
      $exclude[] = "_referer";
--- 14,24 ----
    var $_reqlogin = NULL;
    var $_from = NULL;
    var $_message = NULL;
    var $_referer = NULL;
+   var $_subject = NULL;
+   var $_lock_subject = NULL;
  
    function PHPWS_Mailto($MT_ID = NULL) {
      $exclude[] = "_from";
      $exclude[] = "_message";
      $exclude[] = "_referer";
***************
*** 60,72 ****
        $tags["MT_LABEL"] = $this->getLabel();
        $tags["MT_ADDRESS"] = $this->getAddress();
!       if($this->getReqLogin() == 1) {
          $tags["MT_REQLOGIN"] = "Yes";
        } else {
!         $tags["MT_REQLOGIN"] = "Yes";
        }
        $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label");
        $tags["LABEL_ADDRESS"] = $_SESSION["translate"]->it("Address");
        $tags["LABEL_URL"] = $_SESSION["translate"]->it("URL");
        $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?");
  
        return PHPWS_Template::processTemplate($tags, "mailto", "view.tpl");
--- 60,80 ----
        $tags["MT_LABEL"] = $this->getLabel();
        $tags["MT_ADDRESS"] = $this->getAddress();
!       $tags["MT_SUBJECT"] = $this->getSubject();
!       if($this->_reqlogin == 1) {
          $tags["MT_REQLOGIN"] = "Yes";
        } else {
!         $tags["MT_REQLOGIN"] = "No";
        }
+       if($this->_lock_subject == 1) {
+         $tags["MT_LOCK_SUBJECT"] = "Yes";
+       } else {
+         $tags["MT_LOCK_SUBJECT"] = "No";
+       }
+       $tags["LABEL_SUBJECT"] =  $_SESSION["translate"]->it("Subject");
        $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label");
        $tags["LABEL_ADDRESS"] = $_SESSION["translate"]->it("Address");
        $tags["LABEL_URL"] = $_SESSION["translate"]->it("URL");
        $tags["LABEL_REQLOGIN"] = $_SESSION["translate"]->it("Require Login?");
+       $tags["LABEL_LOCK_SUBJECT"] = $_SESSION["translate"]->it("Lock Subject?");
  
        return PHPWS_Template::processTemplate($tags, "mailto", "view.tpl");
***************
*** 84,89 ****
--- 92,100 ----
        $form->add("MT_LABEL", "text", $this->getLabel());
        $form->add("MT_ADDRESS", "text", $this->getAddress());
+       $form->add("MT_SUBJECT", "text", $this->getSubject());
        $form->add("MT_REQLOGIN", "checkbox");
        $form->setMatch("MT_REQLOGIN", $this->_reqlogin);
+       $form->add("MT_LOCK_SUBJECT", "checkbox");
+       $form->setMatch("MT_LOCK_SUBJECT", $this->_lock_subject);
        $form->add("MT_SAVE", "submit", $_SESSION["translate"]->it("Save Mailto"));
        $form->add("module", "hidden", "mailto");
***************
*** 104,107 ****
--- 115,120 ----
        $tags["LABEL_LABEL"] = $_SESSION["translate"]->it("Label");
        $tags["ADDRESS_LABEL"] = $_SESSION["translate"]->it("Address");
+       $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject");
+       $tags["LOCK_SUBJECT_LABEL"] = $_SESSION["translate"]->it("Lock Subject?");
        $tags["REQLOGIN_LABEL"] = $_SESSION["translate"]->it("Require Login?");
  
***************
*** 126,129 ****
--- 139,146 ----
      }
  
+     if(isset($_REQUEST["MT_SUBJECT"])) {
+       $this->_subject = $_REQUEST["MT_SUBJECT"];
+     }
+ 
      if(isset($_REQUEST["MT_REQLOGIN"])) {
        $this->_reqlogin = 1;
***************
*** 132,135 ****
--- 149,158 ----
      }
  
+     if(isset($_REQUEST["MT_LOCK_SUBJECT"])) {
+       $this->_lock_subject = 1;
+     } else {
+       $this->_lock_subject = 0;
+     }
+ 
      $this->commit();
  
***************
*** 145,154 ****
  
      if($this->_reqlogin == 0) { 
!       $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);
!     $form->add("MT_SUBJECT", "text", $this->_subject);
      $form->setSize("MT_SUBJECT", 50);
      $form->add("MT_MESSAGE", "textarea", $this->_message);
--- 168,185 ----
  
      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);
!     if($this->_lock_subject == 0) {
!       $form->add("MT_SUBJECT", "text", $this->_subject);
!     } else {
!       $form->add("MT_SUBJECT", "hidden", $this->_subject);
!     }
      $form->setSize("MT_SUBJECT", 50);
      $form->add("MT_MESSAGE", "textarea", $this->_message);
***************
*** 164,167 ****
--- 195,202 ----
      $tags = $form->getTemplate();
  
+     if($this->_lock_subject == 1) {
+       $tags["MT_SUBJECT"] = $this->_subject;
+     }
+ 
      if($this->_reqlogin <> 0) {
        $tags["MT_FROM"] = $_SESSION['OBJ_user']->username." &lt;".$_SESSION['OBJ_user']->email."&gt";
***************
*** 171,178 ****
      $tags["MT_TO"] = $this->getLabel();
  
!     $tags["TO_LABEL"] = $_SESSION["translate"]->it("To");
!     $tags["FROM_LABEL"] = $_SESSION["translate"]->it("From");
!     $tags["SUBJECT_LABEL"] = $_SESSION["translate"]->it("Subject");
!     $tags["MESSAGE_LABEL"] = $_SESSION["translate"]->it("Message");
  
      return PHPWS_Template::processTemplate($tags, "mailto", "mail.tpl");
--- 206,213 ----
      $tags["MT_TO"] = $this->getLabel();
  
!     $tags["LABEL_TO"] = $_SESSION["translate"]->it("To");
!     $tags["LABEL_FROM"] = $_SESSION["translate"]->it("From");
!     $tags["LABEL_SUBJECT"] = $_SESSION["translate"]->it("Subject");
!     $tags["LABEL_MESSAGE"] = $_SESSION["translate"]->it("Message");
  
      return PHPWS_Template::processTemplate($tags, "mailto", "mail.tpl");
***************
*** 346,349 ****
--- 381,392 ----
    }// END FUNC getFrom
  
+   function getSubject() {
+     if(isset($this->_subject) && strlen($this->_subject) > 0) {
+       return PHPWS_Text::parseOutput($this->_subject);
+     } else {
+       return NULL;
+     }
+   }// END FUNC getFrom
+ 
    function getReqlogin() {
      if(isset($this->_reqlogin)) {
***************
*** 354,357 ****
--- 397,408 ----
    }// END FUNC getFrom
  
+   function getLock_subject() {
+     if(isset($this->_lock_subject)) {
+       return 1;
+     } else {
+       return 0;
+     }
+   }// END FUNC getFrom
+ 
    function action() {
      $content = NULL;