Changeset 1142

Timestamp:

09/24/08 04:26:34 (2 months ago)

Author:

bermiferrer

Message:

Now mailers can be used as advertised on the docs.

Previously we needed to use set(), now you can just use mailer attributes.

Files:

• trunk/lib/AkActionMailer.php (modified) (3 diffs)
• trunk/lib/AkActionMailer/AkMailComposer.php (modified) (2 diffs)

trunk/lib/AkActionMailer.php

@@ -476 +476 @@
-            unset($attributes['template']);
-        }
-
-        if((!empty($attributes['attachment']) || !empty($attributes['attachments'])) &&
-        (empty($attributes['parts']) && empty($attributes['part']) && empty($attributes['body']))){
-            // we can render here the body if there are attachments
-        }
-
-        $this->Message->set($attributes);
+        
+        $this->_setter_has_been_called = true;
-    }
-
@@ -578 +574 @@
-            $this->Message =& $Message;
-        }
-
+
-        !empty($this->Message) or trigger_error(Ak::t('No mail object available for delivery!'), E_USER_ERROR);
-        if(!empty($this->perform_deliveries)){
@@ -596 +592 @@
-        'password'     =>  @$this->server_settings['password'],
-        'auth'     =>  (!empty($this->server_settings['user_name']) || @$this->server_settings['authentication']),
-
+//
-        );
-        $settings = array_merge($default_settings, $settings);

trunk/lib/AkActionMailer/AkMailComposer.php

@@ -136 +136 @@
-            trigger_error(Ak::t('Could not find the method %method on the model %model', array('%method'=>$method_name, '%model'=>$this->ActionMailer->getModelName())), E_USER_ERROR);
-        }
+        $this->_setAttributesIfRequired();
+    }
+    
+    function _setAttributesIfRequired()
+    {
+        if(empty($this->ActionMailer->_setter_has_been_called)){
+            $attributes = array();
+            foreach ((array)$this->ActionMailer as $k=>$v){
+                if(gettype($v) != 'object' && $k[0] != '_'){
+                    $attributes[$k] = $v;
+                }
+            }
+            $this->ActionMailer->set($attributes);
+        }
-    }
-
@@ -213 +227 @@
-
-    function &_getPartsWithRenderedTemplates()
-       
+
-        $templates = $this->_getAvailableTemplates();
-        $alternative_multiparts = array();