caffeina-core / core

classes/Email/Smtp.php

Spacing +18 added lines, -18 removed lines

@@ -25,36 +25,36 @@ 
     $password;
 
   public function onInit($options) {
-    $options        = (object)$options;
-    $this->host     = isset($options->host)     ? $options->host     : 'localhost';
+    $options        = (object) $options;
+    $this->host     = isset($options->host) ? $options->host : 'localhost';
     $this->username = isset($options->username) ? $options->username : false;
-    $this->secure   = isset($options->secure)   ? $options->secure   : ($this->username ? true : false);
-    $this->port     = isset($options->port)     ? $options->port     : ($this->secure ? 465 : 25);
+    $this->secure   = isset($options->secure) ? $options->secure : ($this->username ? true : false);
+    $this->port     = isset($options->port) ? $options->port : ($this->secure ? 465 : 25);
     $this->password = isset($options->password) ? $options->password : false;
   }
 
-  protected function connect(){
+  protected function connect() {
     if ($this->socket) $this->close();
-    $url = ($this->secure ? 'tls' : 'tcp') ."://{$this->host}";
-    $this->socket = fsockopen( $url, $this->port, $errno, $errstr, 30 );
-    if ( ! $this->socket ) throw new \Exception("Unable to connect to $url on port {$this->port}.");
+    $url = ($this->secure ? 'tls' : 'tcp')."://{$this->host}";
+    $this->socket = fsockopen($url, $this->port, $errno, $errstr, 30);
+    if (!$this->socket) throw new \Exception("Unable to connect to $url on port {$this->port}.");
     $this->lastMessage = '';
     $this->lastCode = 0;
   }
 
-  public function close(){
+  public function close() {
     $this->socket && @fclose($this->socket);
   }
 
-  protected function write($data, $nl = 1){
-    $payload = $data . str_repeat("\r\n",$nl);
+  protected function write($data, $nl = 1) {
+    $payload = $data.str_repeat("\r\n", $nl);
     fwrite($this->socket, $payload);
   }
 
-  protected function expectCode($code){
+  protected function expectCode($code) {
 
     $this->lastMessage = '';
-    while (substr($this->lastMessage, 3, 1) != ' '){
+    while (substr($this->lastMessage, 3, 1) != ' ') {
       $this->lastMessage = fgets($this->socket, 256);
     }
 
@@ -62,18 +62,18 @@ 
     return $code == $this->lastCode;
   }
 
-  protected function cleanAddr($email){
-    return preg_replace('((.*?)<([\w.@-]+)>(.*?))','$2',$email);
+  protected function cleanAddr($email) {
+    return preg_replace('((.*?)<([\w.@-]+)>(.*?))', '$2', $email);
   }
 
-  protected function SMTPmail($from,$to,$body){
+  protected function SMTPmail($from, $to, $body) {
     $this->connect();
     $this->expectCode(220);
 
     $this->write("EHLO {$this->host}");
     $this->expectCode(250);
 
-    if ($this->username){
+    if ($this->username) {
       $this->write("AUTH LOGIN");
       $this->expectCode(334);
       $this->write(base64_encode($this->username));
@@ -106,7 +106,7 @@ 
     return $success;
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     $results = [];
     foreach ($envelope->to() as $to) {
       $results[$to] = $this->SMTPmail($envelope->from(), $to, $envelope->build());

Braces +15 added lines, -11 removed lines

@@ -33,28 +33,32 @@ 
     $this->password = isset($options->password) ? $options->password : false;
   }
 
-  protected function connect(){
-    if ($this->socket) $this->close();
+  protected function connect() {
+    if ($this->socket) {
+      $this->close();
+    }
     $url = ($this->secure ? 'tls' : 'tcp') ."://{$this->host}";
     $this->socket = fsockopen( $url, $this->port, $errno, $errstr, 30 );
-    if ( ! $this->socket ) throw new \Exception("Unable to connect to $url on port {$this->port}.");
+    if ( ! $this->socket ) {
+      throw new \Exception("Unable to connect to $url on port {$this->port}.");
+    }
     $this->lastMessage = '';
     $this->lastCode = 0;
   }
 
-  public function close(){
+  public function close() {
     $this->socket && @fclose($this->socket);
   }
 
-  protected function write($data, $nl = 1){
+  protected function write($data, $nl = 1) {
     $payload = $data . str_repeat("\r\n",$nl);
     fwrite($this->socket, $payload);
   }
 
-  protected function expectCode($code){
+  protected function expectCode($code) {
 
     $this->lastMessage = '';
-    while (substr($this->lastMessage, 3, 1) != ' '){
+    while (substr($this->lastMessage, 3, 1) != ' ') {
       $this->lastMessage = fgets($this->socket, 256);
     }
 
@@ -62,18 +66,18 @@ 
     return $code == $this->lastCode;
   }
 
-  protected function cleanAddr($email){
+  protected function cleanAddr($email) {
     return preg_replace('((.*?)<([\w.@-]+)>(.*?))','$2',$email);
   }
 
-  protected function SMTPmail($from,$to,$body){
+  protected function SMTPmail($from,$to,$body) {
     $this->connect();
     $this->expectCode(220);
 
     $this->write("EHLO {$this->host}");
     $this->expectCode(250);
 
-    if ($this->username){
+    if ($this->username) {
       $this->write("AUTH LOGIN");
       $this->expectCode(334);
       $this->write(base64_encode($this->username));
@@ -106,7 +110,7 @@ 
     return $success;
   }
 
-  public function onSend(Envelope $envelope){
+  public function onSend(Envelope $envelope) {
     $results = [];
     foreach ($envelope->to() as $to) {
       $results[$to] = $this->SMTPmail($envelope->from(), $to, $envelope->build());

classes/Email/Native.php

Spacing +5 added lines, -5 removed lines

@@ -14,14 +14,14 @@
 
 class Native implements Driver {
   
-  public function onInit($options){}
+  public function onInit($options) {}
 
-  public function onSend(Envelope $envelope){
-    $results 		= [];
-    $recipients 	= $envelope->to();
+  public function onSend(Envelope $envelope) {
+    $results = [];
+    $recipients = $envelope->to();
     $envelope->to(false);
     foreach ($recipients as $to) {
-      $results[$to] = mail($to,$envelope->subject(),$envelope->body(),$envelope->head());
+      $results[$to] = mail($to, $envelope->subject(), $envelope->body(), $envelope->head());
     }
     return $results;
   }