Changeset 468 for trunk/lib/Email.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/Email.inc.php (modified) (11 diffs)

trunk/lib/Email.inc.php

@@ -56 +56 @@
 
     // Default parameters, to be overwritten by setParam() and read with getParam()
-    var $_params = array(
+    private $_params = array(
         'to' => null,
         'from' => null,
@@ -74 +74 @@
 
     // String that contains the email body.
-    var $_template;
+    private $_template;
 
     // String that contains the email body after replacements.
-    var $_template_replaced;
+    private $_template_replaced;
 
     /**
@@ -87 +87 @@
      * @since   28 Nov 2005 12:59:41
      */
-    function Email($params=null)
+    public function __construct($params=null)
     {
         // The regex used in validEmail(). Set here instead of in the default _params above so we can use the concatenation . dot.
@@ -118 +118 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
         $app =& App::getInstance();
@@ -145 +145 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -165 +165 @@
      * @since   28 Nov 2005 12:56:23
      */
-    function setTemplate($template)
+    public function setTemplate($template)
     {
         $app =& App::getInstance();
@@ -189 +189 @@
      * @since   28 Nov 2005 12:56:23
      */
-    function setString($string)
+    public function setString($string)
     {
         $app =& App::getInstance();
@@ -213 +213 @@
      * @since   28 Nov 2005 13:08:51
      */
-    function replace($replacements)
+    public function replace($replacements)
     {
         $app =& App::getInstance();
@@ -250 +250 @@
      * @since   28 Nov 2005 12:56:09
      */
-    function send($to=null, $from=null, $subject=null, $headers=null)
+    public function send($to=null, $from=null, $subject=null, $headers=null)
     {
         $app =& App::getInstance();
@@ -364 +364 @@
      * @since   30 Nov 2005 22:00:50
      */
-    function validEmail($email)
+    public function validEmail($email)
     {
         $app =& App::getInstance();
@@ -388 +388 @@
 }
 
-?>