Changeset 566 for branches/1.1dev

Timestamp:

Oct 28, 2016 12:03:20 AM (8 years ago)

Author:

anonymous

Message:

Added ->error_reporting option. Updated Email->replace() to return replaced string.

Location:

branches/1.1dev

Files:

• config/defaults.inc.php (modified) (6 diffs)
• lib/Email.inc.php (modified) (7 diffs)

branches/1.1dev/config/defaults.inc.php

@@ -5 +5 @@
 
 /*
- * This file contains global configration variables that apply to the underlying 
+ * This file contains global configration variables that apply to the underlying
  * codebase framework. These values can be overwritten in a site-specific config
  * file to customize values for a specific site.
@@ -22 +22 @@
 
 // The level of error reporting. Don't set this to 0 to suppress messages, use display_errors to control display.
-error_reporting(E_ALL ^ E_NOTICE);
+setDefault($CFG->error_reporting, E_ALL & ~E_NOTICE & ~E_STRICT);
+error_reporting($CFG->error_reporting);
 
 // Location to store log files.
@@ -82 +83 @@
 setDefault($CFG->login_timeout, 21600);
 
-// The maximum amount of time a user is allowed to be idle before 
+// The maximum amount of time a user is allowed to be idle before
 // their session expires. They will be forced to login again if they expire.
 // This applies to admins and users. In seconds.
@@ -91 +92 @@
  * ACCOUNT ABUSE SETTINGS
  *****************************************************************************/
- 
+
 // The period of time to compare login abuse attempts. If a threshold of
 // logins is reached in this amount of time the account is blocked.
@@ -101 +102 @@
 $CFG->login_abuse_warnings = 3;
 
-// The maximum number of IP addresses a user can login with over the 
+// The maximum number of IP addresses a user can login with over the
 // timeout period before their account is blocked.
 $CFG->login_abuse_max_ips = 5;
 
-// The IP address subnet size threshold. Uses a CIDR notation 
+// The IP address subnet size threshold. Uses a CIDR notation
 // network mask. Any integar between 0 and 32 is permitted. Setting this
 // to '24' permits any address in a class C network (255.255.255.0)
@@ -140 +141 @@
 }
 
-// The maximum byte size that the session cache will hold. 
+// The maximum byte size that the session cache will hold.
 // Used in SessionCache.inc.php
 define('SESSION_CACHE_SIZE_BYTES', 204800); // 200 Kilobytes.

branches/1.1dev/lib/Email.inc.php

@@ -8 +8 @@
  * @author  Quinn Comendant <quinn@strangecode.com>
  * @version 1.0 - backported to codebase v1.1dev
- * 
- 
+ *
+
 // Example.
 $email = new Email(array(
@@ -30 +30 @@
 }
 
- * 
+ *
  */
 class Email {
@@ -41 +41 @@
         'headers' => null,
         'regex' => null,
-        
+
         // A single carriage return (\n) should terminate lines for locally injected mail.
         // A carriage return + line-feed (\r\n) should be used if sending mail directly with SMTP.
         'crlf' => "\n",
-        
+
         // RFC 2822 says line length MUST be no more than 998 characters, and SHOULD be no more than 78 characters, excluding the CRLF.
         // http://mailformat.dan.info/body/linelength.html
@@ -187 +187 @@
     function replace($replacements)
     {
-    
+
         // Ensure template exists.
         if (!isset($this->_template)) {
@@ -209 +209 @@
         // Search and replace all values at once.
         $this->_template_replaced = str_replace($search, $replace, $this->_template);
+
+        return $this->_template_replaced;
     }
 
@@ -255 +257 @@
         $final_body = isset($this->_template_replaced) ? $this->_template_replaced : $this->_template;
         if (false !== $this->getParam('wrap')) {
-            $final_body = wordwrap($final_body, $this->getParam('line_length'), $this->getParam('crlf'));            
+            $final_body = wordwrap($final_body, $this->getParam('line_length'), $this->getParam('crlf'));
         }
 
@@ -287 +289 @@
             $envelope_sender_header = sprintf('-f %s', $envelope_sender_address);
         } else {
-            $envelope_sender_header = '';            
+            $envelope_sender_header = '';
         }