adamjakab / SuiteCRM

include/SugarPHPMailer.php

Indentation +237 added lines, -237 removed lines

@@ -48,116 +48,116 @@ 
  */
 class SugarPHPMailer extends PHPMailer
 {
-	var $oe; // OutboundEmail
-	var $protocol = "tcp://";
-	var $preppedForOutbound = false;
-	var $disclosureEnabled;
-	var $disclosureText;
-	var $isHostEmpty = false;
-	var $opensslOpened = true;
-
-	/**
-	 * Sole constructor
-	 */
-	function SugarPHPMailer() {
-		global $locale;
-		global $current_user;
-		global $sugar_config;
-
-		$admin = new Administration();
-		$admin->retrieveSettings();
-
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
-			$this->disclosureEnabled = true;
-			$this->disclosureText = $admin->settings['disclosure_text'];
-		}
-
-		$this->oe = new OutboundEmail();
-		$this->oe->getUserMailerSettings($current_user);
-
-		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+    var $oe; // OutboundEmail
+    var $protocol = "tcp://";
+    var $preppedForOutbound = false;
+    var $disclosureEnabled;
+    var $disclosureText;
+    var $isHostEmpty = false;
+    var $opensslOpened = true;
+
+    /**
+     * Sole constructor
+     */
+    function SugarPHPMailer() {
+        global $locale;
+        global $current_user;
+        global $sugar_config;
+
+        $admin = new Administration();
+        $admin->retrieveSettings();
+
+        if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+            $this->disclosureEnabled = true;
+            $this->disclosureText = $admin->settings['disclosure_text'];
+        }
+
+        $this->oe = new OutboundEmail();
+        $this->oe->getUserMailerSettings($current_user);
+
+        $this->SetLanguage('en', 'include/phpmailer/language/');
+        $this->PluginDir	= 'include/phpmailer/';
+        $this->Mailer	 	= 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
+        $this->Encoding		= 'quoted-printable';
         $this->IsHTML(false);  // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
         $this->WordWrap		= 996;
-		// cn: gmail fix
-		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
+        // cn: gmail fix
+        $this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
 
-	}
+    }
 
 
-	/**
-	 * Prefills outbound details
-	 */
-	function setMailer() {
-		global $current_user;
+    /**
+     * Prefills outbound details
+     */
+    function setMailer() {
+        global $current_user;
 
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getUserMailerSettings($current_user);
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getUserMailerSettings($current_user);
 
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
-            	$this->SMTPSecure = 'ssl';
+                $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-			$this->Mailer = "sendmail";
-	}
-
-	/**
-	 * Prefills mailer for system
-	 */
-	function setMailerForSystem() {
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getSystemMailerSettings();
-
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
-
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
+
+    /**
+     * Prefills mailer for system
+     */
+    function setMailerForSystem() {
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getSystemMailerSettings();
+
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
                 $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-		  $this->Mailer = "sendmail";
-	}
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
 
     /**
      * Attaches all fs, string, and binary attachments to the message.
@@ -216,38 +216,38 @@ 
         return join("", $mime);
     }*/
 
-	/**
-	 * handles Charset translation for all visual parts of the email.
-	 * @param string charset Default = ''
-	 */
-	function prepForOutbound() {
-		global $locale;
-
-		if($this->preppedForOutbound == false) {
-			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
-			//$this->preppedForOutbound = true; // flag so we don't redo this
-			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
-
-			// handle disclosure
-			if($this->disclosureEnabled) {
-				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
-				$this->AltBody .= "\r\r{$this->disclosureText}";
-			}
+    /**
+     * handles Charset translation for all visual parts of the email.
+     * @param string charset Default = ''
+     */
+    function prepForOutbound() {
+        global $locale;
+
+        if($this->preppedForOutbound == false) {
+            //bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
+            //$this->preppedForOutbound = true; // flag so we don't redo this
+            $OBCharset = $locale->getPrecedentPreference('default_email_charset');
+
+            // handle disclosure
+            if($this->disclosureEnabled) {
+                $this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
+                $this->AltBody .= "\r\r{$this->disclosureText}";
+            }
 
-			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            // body text
+            $this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+            $this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
             $subjectUTF8		= from_html(trim($this->Subject));
             $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
             $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
-			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+            // HTML email RFC compliance
+            if($this->ContentType == "text/html") {
+                if(strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+                    $head=<<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -256,15 +256,15 @@ 
 </head>
 <body>
 eoq;
-					$this->Body = $head.$this->Body."</body></html>";
-				}
-			}
+                    $this->Body = $head.$this->Body."</body></html>";
+                }
+            }
 
-			// Headers /////////////////////////////////
-			// the below is done in PHPMailer::CreateHeader();
-			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
-			/*
+            // Headers /////////////////////////////////
+            // the below is done in PHPMailer::CreateHeader();
+            //$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
+            $this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+            /*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
 			}
@@ -282,129 +282,129 @@ 
 			}
 			*/
 
-		}
-	}
-
-	/**
-	 * Replace images with locations specified by regex with cid: images
-	 * and attach needed files
-	 * @param string $regex Regular expression
-	 * @param string $local_prefix Prefix where local files are stored
-	 * @param bool $object Use attachment object
-	 */
-	public function replaceImageByRegex($regex, $local_prefix, $object = false)
-	{
-		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
-		$i = 0;
+        }
+    }
+
+    /**
+     * Replace images with locations specified by regex with cid: images
+     * and attach needed files
+     * @param string $regex Regular expression
+     * @param string $local_prefix Prefix where local files are stored
+     * @param bool $object Use attachment object
+     */
+    public function replaceImageByRegex($regex, $local_prefix, $object = false)
+    {
+        preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
+        $i = 0;
         foreach($matches[2] as $match) {
-			$filename = urldecode($match);
-			$cid = $filename;
-			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
-			            case 'documents':
-			                $beanname = 'DocumentRevisions';
-			                break;
-			            case 'notes':
-			                $beanname = 'Notes';
-			                break;
-			        }
-			    }
-			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
-			        $bean = SugarModule::get($beanname)->loadBean();
-    			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
-        			    $mime_type = $bean->file_mime_type;
-        			    $filename = $bean->filename;
-    			    }
-			    }
-			} else {
-			    $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-			}
-		    if (!$this->embeddedAttachmentExists($cid)) {
-		    	$this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
-		    }
-		    $i++;
+            $filename = urldecode($match);
+            $cid = $filename;
+            $file_location = $local_prefix.$filename;
+            if(!file_exists($file_location)) continue;
+            if($object) {
+                if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+                    switch(strtolower($typematch[1])) {
+                        case 'documents':
+                            $beanname = 'DocumentRevisions';
+                            break;
+                        case 'notes':
+                            $beanname = 'Notes';
+                            break;
+                    }
+                }
+                $mime_type = "application/octet-stream";
+                if(isset($beanname)) {
+                    $bean = SugarModule::get($beanname)->loadBean();
+                    $bean->retrieve($filename);
+                    if(!empty($bean->id)) {
+                        $mime_type = $bean->file_mime_type;
+                        $filename = $bean->filename;
+                    }
+                }
+            } else {
+                $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+            }
+            if (!$this->embeddedAttachmentExists($cid)) {
+                $this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
+            }
+            $i++;
         }
-		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
-		// remove bad img line from outbound email
-		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
-	}
+        //replace references to cache with cid tag
+        $this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+        // remove bad img line from outbound email
+        $this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
+    }
 	
-	/**
-	 * @param notes	array of note beans
-	 */
-	function handleAttachments($notes) {
-		global $sugar_config;
+    /**
+     * @param notes	array of note beans
+     */
+    function handleAttachments($notes) {
+        global $sugar_config;
 
-		// cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
-		$this->ClearAttachments();
+        // cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
+        $this->ClearAttachments();
 
-		//replace references to cache/images with cid tag
+        //replace references to cache/images with cid tag
         $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
 
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
-
-		//Replace any embeded images using the secure entryPoint for src url.
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
-
-		if (empty($notes)) {
-				return;
-		}
-		//Handle regular attachments.
-		foreach($notes as $note) {
-				$mime_type = 'text/plain';
-				$file_location = '';
-				$filename = '';
-
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
-						$file_location = $note->file->temp_file_location;
-						$filename = $note->file->original_file_name;
-						$mime_type = $note->file->mime_type;
-					} else {
-						$file_location = "upload://{$note->id}";
-						$filename = $note->id.$note->filename;
-						$mime_type = $note->file_mime_type;
-					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
-					$filename = $note->id.$note->filename;
-					$file_location = "upload://$filename";
-					$mime_type = $note->file_mime_type;
-				}
-
-				$filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
-				if (!$note->embed_flag) {
-					$this->AddAttachment($file_location, $filename, 'base64', $mime_type);
-				} // else
-			}
-	}
-
-	/**
-	 * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
-	 *
-	 */
-	function SetError($msg) {
-		$GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
-		parent::SetError($msg);
-	}
-
-	function SmtpConnect($options = array()) {
-		$connection = parent::SmtpConnect();
-		if (!$connection) {
-			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
-			} else {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
-			} // else
-		}
-		return $connection;
-	} // fn
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
+
+        //Replace any embeded images using the secure entryPoint for src url.
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
+
+        if (empty($notes)) {
+                return;
+        }
+        //Handle regular attachments.
+        foreach($notes as $note) {
+                $mime_type = 'text/plain';
+                $file_location = '';
+                $filename = '';
+
+                if($note->object_name == 'Note') {
+                    if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+                        $file_location = $note->file->temp_file_location;
+                        $filename = $note->file->original_file_name;
+                        $mime_type = $note->file->mime_type;
+                    } else {
+                        $file_location = "upload://{$note->id}";
+                        $filename = $note->id.$note->filename;
+                        $mime_type = $note->file_mime_type;
+                    }
+                } elseif($note->object_name == 'DocumentRevision') { // from Documents
+                    $filename = $note->id.$note->filename;
+                    $file_location = "upload://$filename";
+                    $mime_type = $note->file_mime_type;
+                }
+
+                $filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
+                if (!$note->embed_flag) {
+                    $this->AddAttachment($file_location, $filename, 'base64', $mime_type);
+                } // else
+            }
+    }
+
+    /**
+     * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
+     *
+     */
+    function SetError($msg) {
+        $GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
+        parent::SetError($msg);
+    }
+
+    function SmtpConnect($options = array()) {
+        $connection = parent::SmtpConnect();
+        if (!$connection) {
+            global $app_strings;
+            if(isset($this->oe) && $this->oe->type == "system") {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
+            } else {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
+            } // else
+        }
+        return $connection;
+    } // fn
 
     /*
      * overloads PHPMailer::PreSend() to allow for empty messages to go out.

Spacing +37 added lines, -37 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -67,7 +67,7 @@ 
 		$admin = new Administration();
 		$admin->retrieveSettings();
 
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+		if (isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
 			$this->disclosureEnabled = true;
 			$this->disclosureText = $admin->settings['disclosure_text'];
 		}
@@ -76,14 +76,14 @@ 
 		$this->oe->getUserMailerSettings($current_user);
 
 		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+		$this->PluginDir = 'include/phpmailer/';
+		$this->Mailer = 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
-        $this->IsHTML(false);  // default to plain-text email
+		$this->Encoding = 'quoted-printable';
+        $this->IsHTML(false); // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
-        $this->WordWrap		= 996;
+        $this->WordWrap = 996;
 		// cn: gmail fix
 		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
 
@@ -103,7 +103,7 @@ 
 		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
 		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
+		if ($oe->mail_sendtype == "SMTP")
 		{
     		//Set mail send type information
     		$this->Mailer = "smtp";
@@ -116,7 +116,7 @@ 
             	$this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
+    		if ($oe->mail_smtpauth_req) {
     			$this->SMTPAuth = TRUE;
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
@@ -137,7 +137,7 @@ 
 		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
 		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
+		if ($oe->mail_sendtype == "SMTP")
 		{
     		//Set mail send type information
     		$this->Mailer = "smtp";
@@ -149,7 +149,7 @@ 
             if ($oe->mail_smtpssl == 2) {
             	$this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
+    		if ($oe->mail_smtpauth_req) {
     			$this->SMTPAuth = TRUE;
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
@@ -223,31 +223,31 @@ 
 	function prepForOutbound() {
 		global $locale;
 
-		if($this->preppedForOutbound == false) {
+		if ($this->preppedForOutbound == false) {
 			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
 			//$this->preppedForOutbound = true; // flag so we don't redo this
 			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
 
 			// handle disclosure
-			if($this->disclosureEnabled) {
+			if ($this->disclosureEnabled) {
 				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
 				$this->AltBody .= "\r\r{$this->disclosureText}";
 			}
 
 			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
-            $subjectUTF8		= from_html(trim($this->Subject));
-            $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
-            $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
+			$this->Body = from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+			$this->AltBody = from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            $subjectUTF8 = from_html(trim($this->Subject));
+            $subject = $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
+            $this->Subject = $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
 			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+			if ($this->ContentType == "text/html") {
+				if (strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+					$head = <<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -263,7 +263,7 @@ 
 			// Headers /////////////////////////////////
 			// the below is done in PHPMailer::CreateHeader();
 			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+			$this->FromName = $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
 			/*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
@@ -296,14 +296,14 @@ 
 	{
 		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
 		$i = 0;
-        foreach($matches[2] as $match) {
+        foreach ($matches[2] as $match) {
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
+			if (!file_exists($file_location)) continue;
+			if ($object) {
+			    if (preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+			        switch (strtolower($typematch[1])) {
 			            case 'documents':
 			                $beanname = 'DocumentRevisions';
 			                break;
@@ -313,10 +313,10 @@ 
 			        }
 			    }
 			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
+			    if (isset($beanname)) {
 			        $bean = SugarModule::get($beanname)->loadBean();
     			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
+    			    if (!empty($bean->id)) {
         			    $mime_type = $bean->file_mime_type;
         			    $filename = $bean->filename;
     			    }
@@ -330,7 +330,7 @@ 
 		    $i++;
         }
 		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+		$this->Body = preg_replace("|\"$regex|i", '"cid:', $this->Body);
 		// remove bad img line from outbound email
 		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
 	}
@@ -345,7 +345,7 @@ 
 		$this->ClearAttachments();
 
 		//replace references to cache/images with cid tag
-        $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
+        $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';', '="cid:', $this->Body);
 
 		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
 
@@ -356,13 +356,13 @@ 
 				return;
 		}
 		//Handle regular attachments.
-		foreach($notes as $note) {
+		foreach ($notes as $note) {
 				$mime_type = 'text/plain';
 				$file_location = '';
 				$filename = '';
 
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+				if ($note->object_name == 'Note') {
+					if (!empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
 						$file_location = $note->file->temp_file_location;
 						$filename = $note->file->original_file_name;
 						$mime_type = $note->file->mime_type;
@@ -371,7 +371,7 @@ 
 						$filename = $note->id.$note->filename;
 						$mime_type = $note->file_mime_type;
 					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
+				} elseif ($note->object_name == 'DocumentRevision') { // from Documents
 					$filename = $note->id.$note->filename;
 					$file_location = "upload://$filename";
 					$mime_type = $note->file_mime_type;
@@ -397,7 +397,7 @@ 
 		$connection = parent::SmtpConnect();
 		if (!$connection) {
 			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
+			if (isset($this->oe) && $this->oe->type == "system") {
 				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
 			} else {
 				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
@@ -411,7 +411,7 @@ 
      */
     public function PreSend() {
         //check to see if message body is empty
-        if(empty($this->Body)){
+        if (empty($this->Body)) {
             //PHPMailer will throw an error if the body is empty, so insert a blank space if body is empty
             $this->Body = " ";
         }

Braces +10 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -121,9 +123,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+					$this->Mailer = "sendmail";
 		}
-		else
-			$this->Mailer = "sendmail";
 	}
 
 	/**
@@ -154,9 +156,9 @@ 
     			$this->Username = $oe->mail_smtpuser;
     			$this->Password = $oe->mail_smtppass;
     		}
+		} else {
+				  $this->Mailer = "sendmail";
 		}
-		else
-		  $this->Mailer = "sendmail";
 	}
 
     /**
@@ -300,7 +302,9 @@ 
 			$filename = urldecode($match);
 			$cid = $filename;
 			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
+			if(!file_exists($file_location)) {
+			    continue;
+			}
 			if($object) {
 			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
 			        switch(strtolower($typematch[1])) {

include/MySugar/retrieve_dash_page.php

Spacing +34 added lines, -34 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +42,7 @@ 
 require_once('include/MySugar/MySugar.php');
 
 // build dashlet cache file if not found
-if(!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
+if (!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
     require_once('include/Dashlets/DashletCacheBuilder.php');
 
     $dc = new DashletCacheBuilder();
@@ -60,7 +60,7 @@ 
 
 $hasUserPreferences = (!isset($pages) || empty($pages) || !isset($dashlets) || empty($dashlets)) ? false : true;
 
-if(!$hasUserPreferences){
+if (!$hasUserPreferences) {
     $dashlets = array();
 
     //list of preferences to move over and to where
@@ -85,7 +85,7 @@ 
     $old_columns = $current_user->getPreference('columns', 'home');
     $old_dashlets = $current_user->getPreference('dashlets', 'home');
 
-    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)){
+    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)) {
         $columns = $old_columns;
         $dashlets = $old_dashlets;
 
@@ -95,7 +95,7 @@ 
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
     }
-    else{
+    else {
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array('className' => 'iFrameDashlet',
             'module' => 'Home',
@@ -106,7 +106,7 @@ 
                 'height' => 315,
             ));
 
-        $dashlets[create_guid()] = array ('className' => 'SugarFeedDashlet',
+        $dashlets[create_guid()] = array('className' => 'SugarFeedDashlet',
             'module' => 'SugarFeed',
             'forceColumn' => 1,
             'fileLocation' => $dashletsFiles['SugarFeedDashlet']['file'],
@@ -121,15 +121,15 @@ 
                 'height' => 315,
             ));
 
-        foreach($defaultDashlets as $dashletName=>$module){
+        foreach ($defaultDashlets as $dashletName=>$module) {
             // clint - fixes bug #20398
             // only display dashlets that are from visibile modules and that the user has permission to list
             $myDashlet = new MySugar($module);
             $displayDashlet = $myDashlet->checkDashletDisplay();
-            if (isset($dashletsFiles[$dashletName]) && $displayDashlet){
+            if (isset($dashletsFiles[$dashletName]) && $displayDashlet) {
                 $options = array();
-                $prefsforthisdashlet = array_keys($prefstomove,$dashletName);
-                foreach ( $prefsforthisdashlet as $pref ) {
+                $prefsforthisdashlet = array_keys($prefstomove, $dashletName);
+                foreach ($prefsforthisdashlet as $pref) {
                     $options[$pref] = $current_user->getPreference($pref);
                 }
                 $dashlets[create_guid()] = array('className' => $dashletName,
@@ -149,8 +149,8 @@ 
         $columns[1]['width'] = '40%';
         $columns[1]['dashlets'] = array();
 
-        foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
+        foreach ($dashlets as $guid=>$dashlet) {
+            if ($dashlet['forceColumn'] == 0) array_push($columns[0]['dashlets'], $guid);
             else array_push($columns[1]['dashlets'], $guid);
             $count++;
         }
@@ -165,29 +165,29 @@ 
 // handles upgrading from versions that had the 'Dashboard' module; move those items over to the Home page
 $pagesDashboard = $current_user->getPreference('pages', 'Dashboard');
 $dashletsDashboard = $current_user->getPreference('dashlets', 'Dashboard');
-if ( !empty($pagesDashboard) ) {
+if (!empty($pagesDashboard)) {
     // move dashlets from the dashboard to be at the end of the home screen dashlets
-    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn ) {
-        foreach ($dashboardColumn['dashlets'] as $dashletItem ) {
+    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn) {
+        foreach ($dashboardColumn['dashlets'] as $dashletItem) {
             $pages[0]['columns'][$dashboardColumnKey]['dashlets'][] = $dashletItem;
         }
     }
-    $pages = array_merge($pages,$pagesDashboard);
+    $pages = array_merge($pages, $pagesDashboard);
     $current_user->setPreference('pages', $pages, 0, 'Home');
 }
-if ( !empty($dashletsDashboard) ) {
-    $dashlets = array_merge($dashlets,$dashletsDashboard);
+if (!empty($dashletsDashboard)) {
+    $dashlets = array_merge($dashlets, $dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if (!empty($pagesDashboard) || !empty($dashletsDashboard))
     $current_user->resetPreferences('Dashboard');
 
-if (empty($pages)){
+if (empty($pages)) {
     $pages = array();
     $pageIndex = 0;
     $pages[0]['columns'] = $columns;
     $pages[0]['numColumns'] = '2';
-    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME';	// "My Sugar"
+    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME'; // "My Sugar"
     $pageIndex++;
     $current_user->setPreference('pages', $pages, 0, 'Home');
     $activePage = 0;
@@ -206,32 +206,32 @@ 
 $dashletIds = array(); // collect ids to pass to javascript
 $display = array();
 
-foreach($pages[$activePage]['columns'] as $colNum => $column) {
-    if ($colNum == $numCols){
+foreach ($pages[$activePage]['columns'] as $colNum => $column) {
+    if ($colNum == $numCols) {
         break;
     }
     $display[$colNum]['width'] = $column['width'];
     $display[$colNum]['dashlets'] = array();
-    foreach($column['dashlets'] as $num => $id) {
+    foreach ($column['dashlets'] as $num => $id) {
         // clint - fixes bug #20398
         // only display dashlets that are from visibile modules and that the user has permission to list
-        if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
+        if (!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
+            if (!empty($dashletsFiles[$dashlets[$id]['className']]['module']))
                 $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
+            elseif (!empty($dashlets[$id]['module']))
                 $module = $dashlets[$id]['module'];
 
             $myDashlet = new MySugar($module);
 
-            if($myDashlet->checkDashletDisplay()) {
+            if ($myDashlet->checkDashletDisplay()) {
                 require_once($dashlets[$id]['fileLocation']);
                 $dashlet = new $dashlets[$id]['className']($id, (isset($dashlets[$id]['options']) ? $dashlets[$id]['options'] : array()));
                 // Need to add support to dynamically display/hide dashlets
                 // If it has a method 'shouldDisplay' we will call it to see if we should display it or not
-                if (method_exists($dashlet,'shouldDisplay')) {
+                if (method_exists($dashlet, 'shouldDisplay')) {
                     if (!$dashlet->shouldDisplay()) {
                         // This dashlet doesn't want us to show it, skip it.
                         continue;
@@ -242,7 +242,7 @@ 
 
                 $dashlets = $current_user->getPreference('dashlets', 'Home'); // Using hardcoded 'Home' because DynamicAction.php $_REQUEST['module'] value is always Home
                 $lvsParams = array();
-                if(!empty($dashlets[$id]['sort_options'])){
+                if (!empty($dashlets[$id]['sort_options'])) {
                     $lvsParams = $dashlets[$id]['sort_options'];
                 }
 
@@ -251,10 +251,10 @@ 
                     $display[$colNum]['dashlets'][$id]['display'] = $dashlet->display();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
-                    if($dashlet->hasScript) {
+                    if ($dashlet->hasScript) {
                         $display[$colNum]['dashlets'][$id]['script'] = $dashlet->displayScript();
                     }
-                } catch (Exception $ex) {
+                }catch (Exception $ex) {
                     $display[$colNum]['dashlets'][$id]['display'] = $ex->getMessage();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
@@ -267,7 +267,7 @@ 
 $_SESSION['current_tab'] = $activePage;
 
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if (!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
 
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);
@@ -277,7 +277,7 @@ 
 
 $sugar_smarty->assign('maxCount', empty($sugar_config['max_dashlets_homepage']) ? 15 : $sugar_config['max_dashlets_homepage']);
 $sugar_smarty->assign('dashletCount', $count);
-$sugar_smarty->assign('dashletIds', '["' . implode('","', $dashletIds) . '"]');
+$sugar_smarty->assign('dashletIds', '["'.implode('","', $dashletIds).'"]');
 $sugar_smarty->assign('columns', $display);
 
 global $theme;

Braces +20 added lines, -11 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,8 +96,7 @@ 
         $old_dashlets = array();
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
-    }
-    else{
+    } else{
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array('className' => 'iFrameDashlet',
             'module' => 'Home',
@@ -150,8 +151,11 @@ 
         $columns[1]['dashlets'] = array();
 
         foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
-            else array_push($columns[1]['dashlets'], $guid);
+            if( $dashlet['forceColumn'] == 0 ) {
+                array_push($columns[0]['dashlets'], $guid);
+            } else {
+                array_push($columns[1]['dashlets'], $guid);
+            }
             $count++;
         }
     }
@@ -179,8 +183,9 @@ 
     $dashlets = array_merge($dashlets,$dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if ( !empty($pagesDashboard) || !empty($dashletsDashboard) ) {
     $current_user->resetPreferences('Dashboard');
+}
 
 if (empty($pages)){
     $pages = array();
@@ -217,12 +222,14 @@ 
         // only display dashlets that are from visibile modules and that the user has permission to list
         if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
-                $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) ) {
+                            $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            }
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
-                $module = $dashlets[$id]['module'];
+            elseif ( !empty($dashlets[$id]['module']) ) {
+                            $module = $dashlets[$id]['module'];
+            }
 
             $myDashlet = new MySugar($module);
 
@@ -267,7 +274,9 @@ 
 $_SESSION['current_tab'] = $activePage;
 
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+    $sugar_smarty->assign('lock_homepage', true);
+}
 
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);

include/Smarty/plugins/function.sugar_number_format.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 function smarty_function_sugar_number_format($params, &$smarty) {
     global $locale;
     
-	if(!isset($params['var']) || $params['var'] === '') {  
+    if(!isset($params['var']) || $params['var'] === '') {  
         return '';
     } 
 

Spacing +2 added lines, -2 removed lines

@@ -37,11 +37,11 @@
 function smarty_function_sugar_number_format($params, &$smarty) {
     global $locale;
     
-	if(!isset($params['var']) || $params['var'] === '') {  
+	if (!isset($params['var']) || $params['var'] === '') {  
         return '';
     } 
 
-    if ( !isset($params['precision']) ) {
+    if (!isset($params['precision'])) {
         $params['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits');
     }
 

include/Smarty/plugins/modifier.wordwrap.php

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
  * @param boolean
  * @return string
  */
-function smarty_modifier_wordwrap($string,$length=80,$break="\n",$cut=false)
+function smarty_modifier_wordwrap($string, $length = 80, $break = "\n", $cut = false)
 {
-    return wordwrap($string,$length,$break,$cut);
+    return wordwrap($string, $length, $break, $cut);
 }
 
 ?>

include/Smarty/plugins/function.html_options.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
  */
 function smarty_function_html_options($params, &$smarty)
 {
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
     
     $name = null;
     $values = null;
@@ -39,8 +39,8 @@ 
     
     $extra = '';
     
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
                 $$_key = (string)$_val;
                 break;
@@ -59,7 +59,7 @@ 
                 break;
                 
             default:
-                if(!is_array($_val)) {
+                if (!is_array($_val)) {
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
                     $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -87,8 +87,8 @@ 
 
     }
 
-    if(!empty($name)) {
-        $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
+    if (!empty($name)) {
+        $_html_result = '<select name="'.$name.'"'.$extra.'>'."\n".$_html_result.'</select>'."\n";
     }
 
     return $_html_result;
@@ -96,12 +96,12 @@ 
 }
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
-    if(!is_array($value)) {
-        $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
-            smarty_function_escape_special_chars($key) . '"';
+    if (!is_array($value)) {
+        $_html_result = '<option label="'.smarty_function_escape_special_chars($value).'" value="'.
+            smarty_function_escape_special_chars($key).'"';
         if (in_array((string)$key, $selected))
             $_html_result .= ' selected="selected"';
-        $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
+        $_html_result .= '>'.smarty_function_escape_special_chars($value).'</option>'."\n";
     } else {
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
     }
@@ -109,7 +109,7 @@ 
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+    $optgroup_html = '<optgroup label="'.smarty_function_escape_special_chars($key).'">'."\n";
     foreach ($values as $key => $value) {
         $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
     }

Braces +10 added lines, -6 removed lines

@@ -68,15 +68,18 @@ 
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+            return '';
+    }
+    /* raise error here? */
 
     $_html_result = '';
 
     if (isset($options)) {
         
-        foreach ($options as $_key=>$_val)
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        foreach ($options as $_key=>$_val) {
+                    $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
+        }
 
     } else {
         
@@ -99,8 +102,9 @@ 
     if(!is_array($value)) {
         $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
             smarty_function_escape_special_chars($key) . '"';
-        if (in_array((string)$key, $selected))
-            $_html_result .= ' selected="selected"';
+        if (in_array((string)$key, $selected)) {
+                    $_html_result .= ' selected="selected"';
+        }
         $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
     } else {
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
+     * Smarty plugin
+     * @package Smarty
+     * @subpackage plugins
+     */
 
 
 /**

include/Smarty/plugins/block.nocache.php

Indentation +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 //implements Smarty 3 style {nocache}{/nocache} block to prevent caching of a section of a template.
 //remove this upon upgrade to Smarty 3
 function smarty_block_nocache($param, $content, &$smarty) {
-   return $content;
+    return $content;
 } 
 ?>
\ No newline at end of file

include/Smarty/plugins/function.html_radios.php

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
  */
 function smarty_function_html_radios($params, &$smarty)
 {
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
    
     $name = 'radio';
     $values = null;
@@ -52,8 +52,8 @@ 
     $output = null;
     $extra = '';
 
-    foreach($params as $_key => $_val) {
-        switch($_key) {
+    foreach ($params as $_key => $_val) {
+        switch ($_key) {
             case 'name':
             case 'separator':
                 $$_key = (string)$_val;
@@ -61,8 +61,8 @@ 
 
             case 'checked':
             case 'selected':
-                if(is_array($_val)) {
-                    $smarty->trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+                if (is_array($_val)) {
+                    $smarty->trigger_error('html_radios: the "'.$_key.'" attribute cannot be an array', E_USER_WARNING);
                 } else {
                     $selected = (string)$_val;
                 }
@@ -91,7 +91,7 @@ 
                 break;
 
             default:
-                if(!is_array($_val)) {
+                if (!is_array($_val)) {
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
                 } else {
                     $smarty->trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -119,10 +119,10 @@ 
 
     }
 
-    if(!empty($params['assign'])) {
+    if (!empty($params['assign'])) {
         $smarty->assign($params['assign'], $_html_result);
     } else {
-        return implode("\n",$_html_result);
+        return implode("\n", $_html_result);
     }
 
 }
@@ -130,25 +130,25 @@ 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
     $_output = '';
     if ($labels) {
-      if($label_ids) {
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-          $_output .= '<label for="' . $_id . '">';
+      if ($label_ids) {
+          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name.'_'.$value));
+          $_output .= '<label for="'.$_id.'">';
       } else {
           $_output .= '<label>';           
       }
    }
    $_output .= '<input type="radio" name="'
-        . smarty_function_escape_special_chars($name) . '" value="'
-        . smarty_function_escape_special_chars($value) . '"';
+        . smarty_function_escape_special_chars($name).'" value="'
+        . smarty_function_escape_special_chars($value).'"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+   if ($labels && $label_ids) $_output .= ' id="'.$_id.'"';
 
-    if ((string)$value==$selected) {
+    if ((string)$value == $selected) {
         $_output .= ' checked="checked"';
     }
-    $_output .= $extra . ' />' . $output;
+    $_output .= $extra.' />'.$output;
     if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
+    $_output .= $separator;
 
     return $_output;
 }

Braces +13 added lines, -6 removed lines

@@ -100,15 +100,18 @@ 
         }
     }
 
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
+    if (!isset($options) && !isset($values)) {
+            return '';
+    }
+    /* raise error here? */
 
     $_html_result = array();
 
     if (isset($options)) {
 
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        foreach ($options as $_key=>$_val) {
+                    $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
+        }
 
     } else {
 
@@ -141,13 +144,17 @@ 
         . smarty_function_escape_special_chars($name) . '" value="'
         . smarty_function_escape_special_chars($value) . '"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+   if ($labels && $label_ids) {
+       $_output .= ' id="' . $_id . '"';
+   }
 
     if ((string)$value==$selected) {
         $_output .= ' checked="checked"';
     }
     $_output .= $extra . ' />' . $output;
-    if ($labels) $_output .= '</label>';
+    if ($labels) {
+        $_output .= '</label>';
+    }
     $_output .=  $separator;
 
     return $_output;

Indentation +9 added lines, -9 removed lines

@@ -130,18 +130,18 @@
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
     $_output = '';
     if ($labels) {
-      if($label_ids) {
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-          $_output .= '<label for="' . $_id . '">';
-      } else {
-          $_output .= '<label>';           
-      }
-   }
-   $_output .= '<input type="radio" name="'
+        if($label_ids) {
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';           
+        }
+    }
+    $_output .= '<input type="radio" name="'
         . smarty_function_escape_special_chars($name) . '" value="'
         . smarty_function_escape_special_chars($value) . '"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
 
     if ((string)$value==$selected) {
         $_output .= ' checked="checked"';

include/Smarty/plugins/function.sugar_getimage.php

Indentation +19 added lines, -19 removed lines

@@ -53,28 +53,28 @@
 
 function smarty_function_sugar_getimage($params, &$smarty) {
 
-	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+    // error checking for required parameters
+    if(!isset($params['name'])) 
+        $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
 
-	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
-		$params['attr'] = $params['other_attributes'];
+    // temp hack to deprecate the use of other_attributes
+    if(isset($params['other_attributes']))
+        $params['attr'] = $params['other_attributes'];
 
-	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['width']))
-		$params['width'] = null;
-	if(!isset($params['height']))
-		$params['height'] = null;
-	if(!isset($params['alt'])) 
-		$params['alt'] = '';
+    // set defaults
+    if(!isset($params['attr']))
+        $params['attr'] = '';
+    if(!isset($params['width']))
+        $params['width'] = null;
+    if(!isset($params['height']))
+        $params['height'] = null;
+    if(!isset($params['alt'])) 
+        $params['alt'] = '';
 
-	// deprecated ?
-	if(!isset($params['ext']))
-		$params['ext'] = null;
+    // deprecated ?
+    if(!isset($params['ext']))
+        $params['ext'] = null;
 
-	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
+    return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
 }
 ?>

Spacing +8 added lines, -8 removed lines

@@ -54,25 +54,25 @@
 function smarty_function_sugar_getimage($params, &$smarty) {
 
 	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	if (!isset($params['name'])) 
+		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'].'name');
 
 	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
+	if (isset($params['other_attributes']))
 		$params['attr'] = $params['other_attributes'];
 
 	// set defaults
-	if(!isset($params['attr']))
+	if (!isset($params['attr']))
 		$params['attr'] = '';
-	if(!isset($params['width']))
+	if (!isset($params['width']))
 		$params['width'] = null;
-	if(!isset($params['height']))
+	if (!isset($params['height']))
 		$params['height'] = null;
-	if(!isset($params['alt'])) 
+	if (!isset($params['alt'])) 
 		$params['alt'] = '';
 
 	// deprecated ?
-	if(!isset($params['ext']))
+	if (!isset($params['ext']))
 		$params['ext'] = null;
 
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	

Braces +21 added lines, -14 removed lines

@@ -54,26 +54,33 @@
 function smarty_function_sugar_getimage($params, &$smarty) {
 
 	// error checking for required parameters
-	if(!isset($params['name'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	if(!isset($params['name'])) {
+			$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
+	}
 
 	// temp hack to deprecate the use of other_attributes
-	if(isset($params['other_attributes']))
-		$params['attr'] = $params['other_attributes'];
+	if(isset($params['other_attributes'])) {
+			$params['attr'] = $params['other_attributes'];
+	}
 
 	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['width']))
-		$params['width'] = null;
-	if(!isset($params['height']))
-		$params['height'] = null;
-	if(!isset($params['alt'])) 
-		$params['alt'] = '';
+	if(!isset($params['attr'])) {
+			$params['attr'] = '';
+	}
+	if(!isset($params['width'])) {
+			$params['width'] = null;
+	}
+	if(!isset($params['height'])) {
+			$params['height'] = null;
+	}
+	if(!isset($params['alt'])) {
+			$params['alt'] = '';
+	}
 
 	// deprecated ?
-	if(!isset($params['ext']))
-		$params['ext'] = null;
+	if(!isset($params['ext'])) {
+			$params['ext'] = null;
+	}
 
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
 }

include/Smarty/plugins/function.config_load.php

Indentation +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
+     * Smarty plugin
+     * @package Smarty
+     * @subpackage plugins
+     */
 
 /**
  * Smarty {config_load} function plugin
@@ -56,8 +56,8 @@ 
         }
 
         $_params = array('resource_name' => $_file,
-                         'resource_base_path' => $smarty->config_dir,
-                         'get_source' => false);
+                            'resource_base_path' => $smarty->config_dir,
+                            'get_source' => false);
         $smarty->_parse_resource_name($_params);
         $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
         if (isset($_section))
@@ -69,8 +69,8 @@ 
             $_compile = true;
         } elseif ($smarty->compile_check) {
             $_params = array('resource_name' => $_file,
-                             'resource_base_path' => $smarty->config_dir,
-                             'get_source' => false);
+                                'resource_base_path' => $smarty->config_dir,
+                                'get_source' => false);
             $_compile = $smarty->_fetch_resource_info($_params) &&
                 $_params['resource_timestamp'] > filemtime($_compile_file);
         } else {
@@ -89,8 +89,8 @@ 
             }
 
             $_params = array('resource_name' => $_file,
-                             'resource_base_path' => $smarty->config_dir,
-                             $_params['get_source'] = true);
+                                'resource_base_path' => $smarty->config_dir,
+                                $_params['get_source'] = true);
             if (!$smarty->_fetch_resource_info($_params)) {
                 return;
             }

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 {
         if ($smarty->debugging) {
             $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR.'core.get_microtime.php');
             $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
         }
 
@@ -59,13 +59,13 @@ 
                          'resource_base_path' => $smarty->config_dir,
                          'get_source' => false);
         $smarty->_parse_resource_name($_params);
-        $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
+        $_file_path = $_params['resource_type'].':'.$_params['resource_name'];
         if (isset($_section))
             $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
         else
             $_compile_file = $smarty->_get_compile_path($_file_path);
 
-        if($smarty->force_compile || !file_exists($_compile_file)) {
+        if ($smarty->force_compile || !file_exists($_compile_file)) {
             $_compile = true;
         } elseif ($smarty->compile_check) {
             $_params = array('resource_name' => $_file,
@@ -77,10 +77,10 @@ 
             $_compile = false;
         }
 
-        if($_compile) {
+        if ($_compile) {
             // compile config file
-            if(!is_object($smarty->_conf_obj)) {
-                require_once SMARTY_DIR . $smarty->config_class . '.class.php';
+            if (!is_object($smarty->_conf_obj)) {
+                require_once SMARTY_DIR.$smarty->config_class.'.class.php';
                 $smarty->_conf_obj = new $smarty->config_class();
                 $smarty->_conf_obj->overwrite = $smarty->config_overwrite;
                 $smarty->_conf_obj->booleanize = $smarty->config_booleanize;
@@ -97,13 +97,13 @@ 
             $smarty->_conf_obj->set_file_contents($_file, $_params['source_content']);
             $_config_vars = array_merge($smarty->_conf_obj->get($_file),
                     $smarty->_conf_obj->get($_file, $_section));
-            if(function_exists('var_export')) {
-                $_output = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; ?>';
+            if (function_exists('var_export')) {
+                $_output = '<?php $_config_vars = '.var_export($_config_vars, true).'; ?>';
             } else {
-                $_output = '<?php $_config_vars = unserialize(\'' . strtr(serialize($_config_vars),array('\''=>'\\\'', '\\'=>'\\\\')) . '\'); ?>';
+                $_output = '<?php $_config_vars = unserialize(\''.strtr(serialize($_config_vars), array('\''=>'\\\'', '\\'=>'\\\\')).'\'); ?>';
             }
             $_params = (array('compile_path' => $_compile_file, 'compiled_content' => $_output, 'resource_timestamp' => $_params['resource_timestamp']));
-            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
+            require_once(SMARTY_CORE_DIR.'core.write_compiled_resource.php');
             smarty_core_write_compiled_resource($_params, $smarty);
         } else {
             include($_compile_file);
@@ -128,7 +128,7 @@ 
 
         if ($smarty->debugging) {
             $_params = array();
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
+            require_once(SMARTY_CORE_DIR.'core.get_microtime.php');
             $smarty->_smarty_debug_info[] = array('type'      => 'config',
                                                 'filename'  => $_file.' ['.$_section.'] '.$_scope,
                                                 'depth'     => $smarty->_inclusion_depth,

Braces +5 added lines, -4 removed lines

@@ -60,10 +60,11 @@
                          'get_source' => false);
         $smarty->_parse_resource_name($_params);
         $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
-        if (isset($_section))
-            $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
-        else
-            $_compile_file = $smarty->_get_compile_path($_file_path);
+        if (isset($_section)) {
+                    $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
+        } else {
+                    $_compile_file = $smarty->_get_compile_path($_file_path);
+        }
 
         if($smarty->force_compile || !file_exists($_compile_file)) {
             $_compile = true;