Coding Standard Cleanup

Ignore-this: 259cb5773c3144c6c706d87298dcf674

darcs-hash:20091020212338-7ad00-6bf1c5c403491f136a1c02af5ecd9f84d7227107.gz

1 files changed, 162 insertions, 163 deletions

diff --git a/inc/mail.php b/inc/mail.php
index 61d938cf8..3b0592b8b 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -27,7 +27,7 @@ if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
  *
  * @author Chris Smith <chris@jalakai.co.uk>
  * Check if a given mail address is valid
-*/
+ */
 if (!defined('RFC2822_ATEXT')) define('RFC2822_ATEXT',"0-9a-zA-Z!#$%&'*+/=?^_`{|}~-");
 if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,4}|museum|travel)');
 
@@ -54,59 +54,59 @@ if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['
  */
 function mail_send($to, $subject, $body, $from='', $cc='', $bcc='', $headers=null, $params=null){
 
-  $message = compact('to','subject','body','from','cc','bcc','headers','params');
-  return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
+    $message = compact('to','subject','body','from','cc','bcc','headers','params');
+    return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
 }
 
 function _mail_send_action($data) {
 
-  // retrieve parameters from event data, $to, $subject, $body, $from, $cc, $bcc, $headers, $params
-  $to = $data['to'];
-  $subject = $data['subject'];
-  $body = $data['body'];
-
-  // add robustness in case plugin removes any of these optional values
-  $from = isset($data['from']) ? $data['from'] : '';
-  $cc = isset($data['cc']) ? $data['cc'] : '';
-  $bcc = isset($data['bcc']) ? $data['bcc'] : '';
-  $headers = isset($data['headers']) ? $data['headers'] : null;
-  $params = isset($data['params']) ? $data['params'] : null;
-
-  // end additional code to support event ... original mail_send() code from here
-
-  if(defined('MAILHEADER_ASCIIONLY')){
-    $subject = utf8_deaccent($subject);
-    $subject = utf8_strip($subject);
-  }
-
-  if(!utf8_isASCII($subject)) {
-    $subject = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
-    // Spaces must be encoded according to rfc2047. Use the "_" shorthand
-    $subject = preg_replace('/ /', '_', $subject);
-  }
-
-  $header  = '';
-
-  // No named recipients for To: in Windows (see FS#652)
-  $usenames = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true;
-
-  $to = mail_encode_address($to,'',$usenames);
-  $header .= mail_encode_address($from,'From');
-  $header .= mail_encode_address($cc,'Cc');
-  $header .= mail_encode_address($bcc,'Bcc');
-  $header .= 'MIME-Version: 1.0'.MAILHEADER_EOL;
-  $header .= 'Content-Type: text/plain; charset=UTF-8'.MAILHEADER_EOL;
-  $header .= 'Content-Transfer-Encoding: quoted-printable'.MAILHEADER_EOL;
-  $header .= $headers;
-  $header  = trim($header);
-
-  $body = mail_quotedprintable_encode($body);
-
-  if($params == null){
-    return @mail($to,$subject,$body,$header);
-  }else{
-    return @mail($to,$subject,$body,$header,$params);
-  }
+    // retrieve parameters from event data, $to, $subject, $body, $from, $cc, $bcc, $headers, $params
+    $to = $data['to'];
+    $subject = $data['subject'];
+    $body = $data['body'];
+
+    // add robustness in case plugin removes any of these optional values
+    $from = isset($data['from']) ? $data['from'] : '';
+    $cc = isset($data['cc']) ? $data['cc'] : '';
+    $bcc = isset($data['bcc']) ? $data['bcc'] : '';
+    $headers = isset($data['headers']) ? $data['headers'] : null;
+    $params = isset($data['params']) ? $data['params'] : null;
+
+    // end additional code to support event ... original mail_send() code from here
+
+    if(defined('MAILHEADER_ASCIIONLY')){
+        $subject = utf8_deaccent($subject);
+        $subject = utf8_strip($subject);
+    }
+
+    if(!utf8_isASCII($subject)) {
+        $subject = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
+        // Spaces must be encoded according to rfc2047. Use the "_" shorthand
+        $subject = preg_replace('/ /', '_', $subject);
+    }
+
+    $header  = '';
+
+    // No named recipients for To: in Windows (see FS#652)
+    $usenames = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true;
+
+    $to = mail_encode_address($to,'',$usenames);
+    $header .= mail_encode_address($from,'From');
+    $header .= mail_encode_address($cc,'Cc');
+    $header .= mail_encode_address($bcc,'Bcc');
+    $header .= 'MIME-Version: 1.0'.MAILHEADER_EOL;
+    $header .= 'Content-Type: text/plain; charset=UTF-8'.MAILHEADER_EOL;
+    $header .= 'Content-Transfer-Encoding: quoted-printable'.MAILHEADER_EOL;
+    $header .= $headers;
+    $header  = trim($header);
+
+    $body = mail_quotedprintable_encode($body);
+
+    if($params == null){
+        return @mail($to,$subject,$body,$header);
+    }else{
+        return @mail($to,$subject,$body,$header,$params);
+    }
 }
 
 /**
@@ -124,66 +124,66 @@ function _mail_send_action($data) {
  * @param boolean $names  Allow named Recipients?
  */
 function mail_encode_address($string,$header='',$names=true){
-  $headers = '';
-  $parts = explode(',',$string);
-  foreach ($parts as $part){
-    $part = trim($part);
-
-    // parse address
-    if(preg_match('#(.*?)<(.*?)>#',$part,$matches)){
-      $text = trim($matches[1]);
-      $addr = $matches[2];
-    }else{
-      $addr = $part;
+    $headers = '';
+    $parts = explode(',',$string);
+    foreach ($parts as $part){
+        $part = trim($part);
+
+        // parse address
+        if(preg_match('#(.*?)<(.*?)>#',$part,$matches)){
+            $text = trim($matches[1]);
+            $addr = $matches[2];
+        }else{
+            $addr = $part;
+        }
+
+        // skip empty ones
+        if(empty($addr)){
+            continue;
+        }
+
+        // FIXME: is there a way to encode the localpart of a emailaddress?
+        if(!utf8_isASCII($addr)){
+            msg(htmlspecialchars("E-Mail address <$addr> is not ASCII"),-1);
+            continue;
+        }
+
+        if(!mail_isvalid($addr)){
+            msg(htmlspecialchars("E-Mail address <$addr> is not valid"),-1);
+            continue;
+        }
+
+        // text was given
+        if(!empty($text) && $names){
+            // add address quotes
+            $addr = "<$addr>";
+
+            if(defined('MAILHEADER_ASCIIONLY')){
+                $text = utf8_deaccent($text);
+                $text = utf8_strip($text);
+            }
+
+            if(!utf8_isASCII($text)){
+                $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
+            }
+        }else{
+            $text = '';
+        }
+
+        // add to header comma seperated
+        if($headers != ''){
+            $headers .= ',';
+            if($header) $headers .= MAILHEADER_EOL.' '; // avoid overlong mail headers
+        }
+        $headers .= $text.' '.$addr;
     }
 
-    // skip empty ones
-    if(empty($addr)){
-      continue;
-    }
+    if(empty($headers)) return null;
 
-    // FIXME: is there a way to encode the localpart of a emailaddress?
-    if(!utf8_isASCII($addr)){
-      msg(htmlspecialchars("E-Mail address <$addr> is not ASCII"),-1);
-      continue;
-    }
-
-    if(!mail_isvalid($addr)){
-      msg(htmlspecialchars("E-Mail address <$addr> is not valid"),-1);
-      continue;
-    }
-
-    // text was given
-    if(!empty($text) && $names){
-      // add address quotes
-      $addr = "<$addr>";
-
-      if(defined('MAILHEADER_ASCIIONLY')){
-        $text = utf8_deaccent($text);
-        $text = utf8_strip($text);
-      }
-
-      if(!utf8_isASCII($text)){
-        $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
-      }
-    }else{
-      $text = '';
-    }
+    //if headername was given add it and close correctly
+    if($header) $headers = $header.': '.$headers.MAILHEADER_EOL;
 
-    // add to header comma seperated
-    if($headers != ''){
-        $headers .= ',';
-        if($header) $headers .= MAILHEADER_EOL.' '; // avoid overlong mail headers
-    }
-    $headers .= $text.' '.$addr;
-  }
-
-  if(empty($headers)) return null;
-
-  //if headername was given add it and close correctly
-  if($header) $headers = $header.': '.$headers.MAILHEADER_EOL;
-
-  return $headers;
+    return $headers;
 }
 
 /**
@@ -204,64 +204,63 @@ function mail_isvalid($email){
  * @link   http://www.php.net/manual/en/function.imap-8bit.php#61216
  */
 function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) {
-  // split text into lines
-  $aLines= preg_split("/(?:\r\n|\r|\n)/", $sText);
-
-  for ($i=0;$i<count($aLines);$i++) {
-    $sLine =& $aLines[$i];
-    if (strlen($sLine)===0) continue; // do nothing, if empty
-
-    $sRegExp = '/[^\x09\x20\x21-\x3C\x3E-\x7E]/e';
-
-    // imap_8bit encodes x09 everywhere, not only at lineends,
-    // for EBCDIC safeness encode !"#$@[\]^`{|}~,
-    // for complete safeness encode every character :)
-    if ($bEmulate_imap_8bit)
-      $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/e';
-
-    $sReplmt = 'sprintf( "=%02X", ord ( "$0" ) ) ;';
-    $sLine = preg_replace( $sRegExp, $sReplmt, $sLine );
-
-    // encode x09,x20 at lineends
-    {
-      $iLength = strlen($sLine);
-      $iLastChar = ord($sLine{$iLength-1});
-
-      //              !!!!!!!!
-      // imap_8_bit does not encode x20 at the very end of a text,
-      // here is, where I don't agree with imap_8_bit,
-      // please correct me, if I'm wrong,
-      // or comment next line for RFC2045 conformance, if you like
-      if (!($bEmulate_imap_8bit && ($i==count($aLines)-1)))
-
-      if (($iLastChar==0x09)||($iLastChar==0x20)) {
-        $sLine{$iLength-1}='=';
-        $sLine .= ($iLastChar==0x09)?'09':'20';
-      }
-    }    // imap_8bit encodes x20 before chr(13), too
-    // although IMHO not requested by RFC2045, why not do it safer :)
-    // and why not encode any x20 around chr(10) or chr(13)
-    if ($bEmulate_imap_8bit) {
-      $sLine=str_replace(' =0D','=20=0D',$sLine);
-      //$sLine=str_replace(' =0A','=20=0A',$sLine);
-      //$sLine=str_replace('=0D ','=0D=20',$sLine);
-      //$sLine=str_replace('=0A ','=0A=20',$sLine);
+    // split text into lines
+    $aLines= preg_split("/(?:\r\n|\r|\n)/", $sText);
+    $cnt = count($aLines);
+
+    for ($i=0;$i<$cnt;$i++) {
+        $sLine =& $aLines[$i];
+        if (strlen($sLine)===0) continue; // do nothing, if empty
+
+        $sRegExp = '/[^\x09\x20\x21-\x3C\x3E-\x7E]/e';
+
+        // imap_8bit encodes x09 everywhere, not only at lineends,
+        // for EBCDIC safeness encode !"#$@[\]^`{|}~,
+        // for complete safeness encode every character :)
+        if ($bEmulate_imap_8bit)
+            $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/e';
+
+        $sReplmt = 'sprintf( "=%02X", ord ( "$0" ) ) ;';
+        $sLine = preg_replace( $sRegExp, $sReplmt, $sLine );
+
+        // encode x09,x20 at lineends
+        {
+            $iLength = strlen($sLine);
+            $iLastChar = ord($sLine{$iLength-1});
+
+            //              !!!!!!!!
+            // imap_8_bit does not encode x20 at the very end of a text,
+            // here is, where I don't agree with imap_8_bit,
+            // please correct me, if I'm wrong,
+            // or comment next line for RFC2045 conformance, if you like
+            if (!($bEmulate_imap_8bit && ($i==count($aLines)-1))){
+                if (($iLastChar==0x09)||($iLastChar==0x20)) {
+                    $sLine{$iLength-1}='=';
+                    $sLine .= ($iLastChar==0x09)?'09':'20';
+                }
+            }
+        }    // imap_8bit encodes x20 before chr(13), too
+        // although IMHO not requested by RFC2045, why not do it safer :)
+        // and why not encode any x20 around chr(10) or chr(13)
+        if ($bEmulate_imap_8bit) {
+            $sLine=str_replace(' =0D','=20=0D',$sLine);
+            //$sLine=str_replace(' =0A','=20=0A',$sLine);
+            //$sLine=str_replace('=0D ','=0D=20',$sLine);
+            //$sLine=str_replace('=0A ','=0A=20',$sLine);
+        }
+
+        // finally split into softlines no longer than $maxlen chars,
+        // for even more safeness one could encode x09,x20
+        // at the very first character of the line
+        // and after soft linebreaks, as well,
+        // but this wouldn't be caught by such an easy RegExp
+        if($maxlen){
+            preg_match_all( '/.{1,'.($maxlen - 2).'}([^=]{0,2})?/', $sLine, $aMatch );
+            $sLine = implode( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's
+        }
     }
 
-    // finally split into softlines no longer than $maxlen chars,
-    // for even more safeness one could encode x09,x20
-    // at the very first character of the line
-    // and after soft linebreaks, as well,
-    // but this wouldn't be caught by such an easy RegExp
-    if($maxlen){
-      preg_match_all( '/.{1,'.($maxlen - 2).'}([^=]{0,2})?/', $sLine, $aMatch );
-      $sLine = implode( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's
-    }
-  }
-
-  // join lines into text
-  return implode(MAILHEADER_EOL,$aLines);
+    // join lines into text
+    return implode(MAILHEADER_EOL,$aLines);
 }
 
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :