adamjakab / SuiteCRM

XTemplate/xtpl.php

Spacing +116 added lines, -116 removed lines

@@ -124,45 +124,45 @@ 
 
 /***[ variables ]***********************************************************/
 
-var $filecontents="";								/* raw contents of template file */
-var $blocks=array();								/* unparsed blocks */
-var $parsed_blocks=array();					/* parsed blocks */
-var $block_parse_order=array();			/* block parsing order for recursive parsing (sometimes reverse:) */
-var $sub_blocks=array();						/* store sub-block names for fast resetting */
-var $VARS=array();									/* variables array */
+var $filecontents = ""; /* raw contents of template file */
+var $blocks = array(); /* unparsed blocks */
+var $parsed_blocks = array(); /* parsed blocks */
+var $block_parse_order = array(); /* block parsing order for recursive parsing (sometimes reverse:) */
+var $sub_blocks = array(); /* store sub-block names for fast resetting */
+var $VARS = array(); /* variables array */
 var $alternate_include_directory = "";
 
-var $file_delim="/\{FILE\s*\"([^\"]+)\"\s*\}/m";  /* regexp for file includes */
-var $block_start_delim="<!-- ";			/* block start delimiter */
-var $block_end_delim="-->";					/* block end delimiter */
-var $block_start_word="BEGIN:";			/* block start word */
-var $block_end_word="END:";					/* block end word */
+var $file_delim = "/\{FILE\s*\"([^\"]+)\"\s*\}/m"; /* regexp for file includes */
+var $block_start_delim = "<!-- "; /* block start delimiter */
+var $block_end_delim = "-->"; /* block end delimiter */
+var $block_start_word = "BEGIN:"; /* block start word */
+var $block_end_word = "END:"; /* block end word */
 
 /* this makes the delimiters look like: <!-- BEGIN: block_name --> if you use my syntax. */
 
-var $NULL_STRING=array(""=>"");				/* null string for unassigned vars */
-var $NULL_BLOCK=array(""=>"");	/* null string for unassigned blocks */
-var $mainblock="";
-var $ERROR="";
-var $AUTORESET=1;										/* auto-reset sub blocks */
+var $NULL_STRING = array(""=>""); /* null string for unassigned vars */
+var $NULL_BLOCK = array(""=>""); /* null string for unassigned blocks */
+var $mainblock = "";
+var $ERROR = "";
+var $AUTORESET = 1; /* auto-reset sub blocks */
 
 /***[ constructor ]*********************************************************/
 
-function __construct ($file, $alt_include = "", $mainblock="main") {
+function __construct($file, $alt_include = "", $mainblock = "main") {
 	$this->alternate_include_directory = $alt_include;
-	$this->mainblock=$mainblock;
-	$this->filecontents=$this->r_getfile($file);	/* read in template file */
+	$this->mainblock = $mainblock;
+	$this->filecontents = $this->r_getfile($file); /* read in template file */
 	//if(substr_count($file, 'backup') == 1)_ppd($this->filecontents);
-	$this->blocks=$this->maketree($this->filecontents,$mainblock);	/* preprocess some stuff */
+	$this->blocks = $this->maketree($this->filecontents, $mainblock); /* preprocess some stuff */
 	//$this->scan_globals();
 }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function XTemplate($file, $alt_include = "", $mainblock="main"){
+    function XTemplate($file, $alt_include = "", $mainblock = "main") {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -183,21 +183,21 @@ 
 	assign a variable
 */
 
-function assign ($name,$val="") {
+function assign($name, $val = "") {
 	if (is_array($name)) {
 		foreach ($name as $k => $v) {
 			$this->VARS[$k] = $v;
 		}
 	} else {
-		$this->VARS[$name]=$val;
+		$this->VARS[$name] = $val;
 	}
 }
 
-function append ($varname, $name,$val="") {
-	if(!isset($this->VARS[$varname])){
+function append($varname, $name, $val = "") {
+	if (!isset($this->VARS[$varname])) {
 		$this->VARS[$varname] = array();
 	}
-   if(is_array($this->VARS[$varname])){
+   if (is_array($this->VARS[$varname])) {
        $this->VARS[$varname][$name] = $val;
     }
 }
@@ -207,50 +207,50 @@ 
 	parse a block
 */
 
-function parse ($bname) {
+function parse($bname) {
 	global $sugar_version, $sugar_config;
 
 	$this->assign('SUGAR_VERSION', $GLOBALS['js_version_key']);
 	$this->assign('JS_CUSTOM_VERSION', $sugar_config['js_custom_version']);
     $this->assign('VERSION_MARK', getVersionedPath(''));
 
-	if(empty($this->blocks[$bname]))
+	if (empty($this->blocks[$bname]))
 		return;
 
-	$copy=$this->blocks[$bname];
+	$copy = $this->blocks[$bname];
 	if (!isset($this->blocks[$bname]))
-		$this->set_error ("parse: blockname [$bname] does not exist");
-	preg_match_all("/\{([A-Za-z0-9\._]+?)}/",$this->blocks[$bname],$var_array);
-	$var_array=$var_array[1];
+		$this->set_error("parse: blockname [$bname] does not exist");
+	preg_match_all("/\{([A-Za-z0-9\._]+?)}/", $this->blocks[$bname], $var_array);
+	$var_array = $var_array[1];
 	foreach ($var_array as $k => $v) {
-		$sub=explode(".",$v);
-		if ($sub[0]=="_BLOCK_") {
+		$sub = explode(".", $v);
+		if ($sub[0] == "_BLOCK_") {
 			unset($sub[0]);
-			$bname2=implode(".",$sub);
+			$bname2 = implode(".", $sub);
 
-			if(isset($this->parsed_blocks[$bname2]))
+			if (isset($this->parsed_blocks[$bname2]))
 			{
-				$var=$this->parsed_blocks[$bname2];
+				$var = $this->parsed_blocks[$bname2];
 			}
 			else
 			{
 				$var = null;
 			}
 
-			$nul=(!isset($this->NULL_BLOCK[$bname2])) ? $this->NULL_BLOCK[""] : $this->NULL_BLOCK[$bname2];
-			$var=(empty($var))?$nul:trim($var);
+			$nul = (!isset($this->NULL_BLOCK[$bname2])) ? $this->NULL_BLOCK[""] : $this->NULL_BLOCK[$bname2];
+			$var = (empty($var)) ? $nul : trim($var);
 			// Commented out due to regular expression issue with '$' in replacement string.
 			//$copy=preg_replace("/\{".$v."\}/","$var",$copy);
 			// This should be faster and work better for '$'
-			$copy=str_replace("{".$v."}",$var,$copy);
+			$copy = str_replace("{".$v."}", $var, $copy);
 		} else {
-			$var=$this->VARS;
+			$var = $this->VARS;
 
 			foreach ($sub as $k1 => $v1)
 			{
-				if(is_array($var) && isset($var[$v1]))
+				if (is_array($var) && isset($var[$v1]))
 				{
-					$var=$var[$v1];
+					$var = $var[$v1];
 				}
 				else
 				{
@@ -258,27 +258,27 @@ 
 				}
 			}
 
-			$nul=(!isset($this->NULL_STRING[$v])) ? ($this->NULL_STRING[""]) : ($this->NULL_STRING[$v]);
-			$var=(!isset($var))?$nul:$var;
+			$nul = (!isset($this->NULL_STRING[$v])) ? ($this->NULL_STRING[""]) : ($this->NULL_STRING[$v]);
+			$var = (!isset($var)) ? $nul : $var;
 			// Commented out due to regular expression issue with '$' in replacement string.
 			//$copy=preg_replace("/\{$v\}/","$var",$copy);
 			// This should be faster and work better for '$'
 
 			// this was periodically returning an array to string conversion error....
-			if(!is_array($var))
+			if (!is_array($var))
 			{
-				$copy=str_replace("{".$v."}",$var,$copy);
+				$copy = str_replace("{".$v."}", $var, $copy);
 			}
 		}
 	}
 
-	if(isset($this->parsed_blocks[$bname]))
+	if (isset($this->parsed_blocks[$bname]))
 	{
-		$this->parsed_blocks[$bname].=$copy;
+		$this->parsed_blocks[$bname] .= $copy;
 	}
 	else
 	{
-		$this->parsed_blocks[$bname]=$copy;
+		$this->parsed_blocks[$bname] = $copy;
 	}
 
 	// reset sub-blocks
@@ -293,7 +293,7 @@ 
 /*
 	returns true if a block exists otherwise returns false.
 */
-function exists($bname){
+function exists($bname) {
 	return (!empty($this->parsed_blocks[$bname])) || (!empty($this->blocks[$bname]));
 }
 
@@ -302,9 +302,9 @@ 
 /*
 	returns true if a block exists otherwise returns false.
 */
-function var_exists($bname,$vname){
-	if(!empty($this->blocks[$bname])){
-		return substr_count($this->blocks[$bname], '{'. $vname . '}') >0;
+function var_exists($bname, $vname) {
+	if (!empty($this->blocks[$bname])) {
+		return substr_count($this->blocks[$bname], '{'.$vname.'}') > 0;
 	}
 	return false;
 }
@@ -318,9 +318,9 @@ 
 function rparse($bname) {
 	if (!empty($this->sub_blocks[$bname])) {
 		reset($this->sub_blocks[$bname]);
-		while (list($k,$v)=each($this->sub_blocks[$bname]))
+		while (list($k, $v) = each($this->sub_blocks[$bname]))
 			if (!empty($v))
-				$this->rparse($v,$indent."\t");
+				$this->rparse($v, $indent."\t");
 	}
 	$this->parse($bname);
 }
@@ -330,8 +330,8 @@ 
 	inserts a loop ( call assign & parse )
 */
 
-function insert_loop($bname,$var,$value="") {
-	$this->assign($var,$value);
+function insert_loop($bname, $var, $value = "") {
+	$this->assign($var, $value);
 	$this->parse($bname);
 }
 
@@ -342,9 +342,9 @@ 
 
 function text($bname) {
 
-    if(!empty($this->parsed_blocks)){
-	   return $this->parsed_blocks[isset($bname) ? $bname :$this->mainblock];
-    }else{
+    if (!empty($this->parsed_blocks)) {
+	   return $this->parsed_blocks[isset($bname) ? $bname : $this->mainblock];
+    } else {
         return '';
     }
 }
@@ -354,13 +354,13 @@ 
 	prints the parsed text
 */
 
-function out ($bname) {
+function out($bname) {
 	global $focus;
 
-	if(isset($focus)){
+	if (isset($focus)) {
 		global $action;
 
-		if($focus && is_subclass_of($focus, 'SugarBean') && !$focus->ACLAccess($action)){
+		if ($focus && is_subclass_of($focus, 'SugarBean') && !$focus->ACLAccess($action)) {
 
 			ACLController::displayNoAccess(true);
 
@@ -376,8 +376,8 @@ 
 	resets the parsed text
 */
 
-function reset ($bname) {
-	$this->parsed_blocks[$bname]="";
+function reset($bname) {
+	$this->parsed_blocks[$bname] = "";
 }
 
 /***[ parsed ]**************************************************************/
@@ -385,7 +385,7 @@ 
 	returns true if block was parsed, false if not
 */
 
-function parsed ($bname) {
+function parsed($bname) {
 	return (!empty($this->parsed_blocks[$bname]));
 }
 
@@ -394,8 +394,8 @@ 
 	sets the string to replace in case the var was not assigned
 */
 
-function SetNullString($str,$varname="") {
-	$this->NULL_STRING[$varname]=$str;
+function SetNullString($str, $varname = "") {
+	$this->NULL_STRING[$varname] = $str;
 }
 
 /***[ SetNullBlock ]********************************************************/
@@ -403,8 +403,8 @@ 
 	sets the string to replace in case the block was not parsed
 */
 
-function SetNullBlock($str,$bname="") {
-	$this->NULL_BLOCK[$bname]=$str;
+function SetNullBlock($str, $bname = "") {
+	$this->NULL_BLOCK[$bname] = $str;
 }
 
 /***[ set_autoreset ]*******************************************************/
@@ -415,7 +415,7 @@ 
 */
 
 function set_autoreset() {
-	$this->AUTORESET=1;
+	$this->AUTORESET = 1;
 }
 
 /***[ clear_autoreset ]*****************************************************/
@@ -426,7 +426,7 @@ 
 */
 
 function clear_autoreset() {
-	$this->AUTORESET=0;
+	$this->AUTORESET = 0;
 }
 
 /***[ scan_globals ]********************************************************/
@@ -436,9 +436,9 @@ 
 
 function scan_globals() {
 	reset($GLOBALS);
-	while (list($k,$v)=each($GLOBALS))
-		$GLOB[$k]=$v;
-	$this->assign("PHP",$GLOB);	/* access global variables as {PHP.HTTP_HOST} in your template! */
+	while (list($k, $v) = each($GLOBALS))
+		$GLOB[$k] = $v;
+	$this->assign("PHP", $GLOB); /* access global variables as {PHP.HTTP_HOST} in your template! */
 }
 
 /******
@@ -461,59 +461,59 @@ 
 */
 
 
-function maketree($con,$block) {
-	$con2=explode($this->block_start_delim,$con);
-	$level=0;
-	$block_names=array();
-	$blocks=array();
+function maketree($con, $block) {
+	$con2 = explode($this->block_start_delim, $con);
+	$level = 0;
+	$block_names = array();
+	$blocks = array();
 	reset($con2);
-	while(list($k,$v)=each($con2)) {
-		$patt="($this->block_start_word|$this->block_end_word)\s*(\w+)\s*$this->block_end_delim(.*)";
-		if (preg_match_all("/$patt/ims",$v,$res, PREG_SET_ORDER)) {
+	while (list($k, $v) = each($con2)) {
+		$patt = "($this->block_start_word|$this->block_end_word)\s*(\w+)\s*$this->block_end_delim(.*)";
+		if (preg_match_all("/$patt/ims", $v, $res, PREG_SET_ORDER)) {
 			// $res[0][1] = BEGIN or END
 			// $res[0][2] = block name
 			// $res[0][3] = kinda content
-			if ($res[0][1]==$this->block_start_word) {
-				$parent_name=implode(".",$block_names);
-				$block_names[++$level]=$res[0][2];							/* add one level - array("main","table","row")*/
-				$cur_block_name=implode(".",$block_names);	/* make block name (main.table.row) */
-				$this->block_parse_order[]=$cur_block_name;	/* build block parsing order (reverse) */
+			if ($res[0][1] == $this->block_start_word) {
+				$parent_name = implode(".", $block_names);
+				$block_names[++$level] = $res[0][2]; /* add one level - array("main","table","row")*/
+				$cur_block_name = implode(".", $block_names); /* make block name (main.table.row) */
+				$this->block_parse_order[] = $cur_block_name; /* build block parsing order (reverse) */
 
-				if(array_key_exists($cur_block_name, $blocks))
+				if (array_key_exists($cur_block_name, $blocks))
 				{
-					$blocks[$cur_block_name].=$res[0][3];				/* add contents */
+					$blocks[$cur_block_name] .= $res[0][3]; /* add contents */
 				}
 				else
 				{
-					$blocks[$cur_block_name]=$res[0][3];				/* add contents */
+					$blocks[$cur_block_name] = $res[0][3]; /* add contents */
 				}
 
 				/* add {_BLOCK_.blockname} string to parent block */
-				if(array_key_exists($parent_name, $blocks))
+				if (array_key_exists($parent_name, $blocks))
 				{
-					$blocks[$parent_name].="{_BLOCK_.$cur_block_name}";
+					$blocks[$parent_name] .= "{_BLOCK_.$cur_block_name}";
 				}
 				else
 				{
-					$blocks[$parent_name]="{_BLOCK_.$cur_block_name}";
+					$blocks[$parent_name] = "{_BLOCK_.$cur_block_name}";
 				}
 
-				$this->sub_blocks[$parent_name][]=$cur_block_name;		/* store sub block names for autoresetting and recursive parsing */
-				$this->sub_blocks[$cur_block_name][]="";		/* store sub block names for autoresetting */
-			} else if ($res[0][1]==$this->block_end_word) {
+				$this->sub_blocks[$parent_name][] = $cur_block_name; /* store sub block names for autoresetting and recursive parsing */
+				$this->sub_blocks[$cur_block_name][] = ""; /* store sub block names for autoresetting */
+			} else if ($res[0][1] == $this->block_end_word) {
 				unset($block_names[$level--]);
-				$parent_name=implode(".",$block_names);
-				$blocks[$parent_name].=$res[0][3];	/* add rest of block to parent block */
+				$parent_name = implode(".", $block_names);
+				$blocks[$parent_name] .= $res[0][3]; /* add rest of block to parent block */
   			}
 		} else { /* no block delimiters found */
-			$index = implode(".",$block_names);
-			if(array_key_exists($index, $blocks))
+			$index = implode(".", $block_names);
+			if (array_key_exists($index, $blocks))
 			{
-				$blocks[].=$this->block_start_delim.$v;
+				$blocks[] .= $this->block_start_delim.$v;
 			}
 			else
 			{
-				$blocks[]=$this->block_start_delim.$v;
+				$blocks[] = $this->block_start_delim.$v;
 			}
 		}
 	}
@@ -527,13 +527,13 @@ 
 	sets and gets error
 */
 
-function get_error()	{
-	return ($this->ERROR=="")?0:$this->ERROR;
+function get_error() {
+	return ($this->ERROR == "") ? 0 : $this->ERROR;
 }
 
 
-function set_error($str)	{
-	$this->ERROR=$str;
+function set_error($str) {
+	$this->ERROR = $str;
 }
 
 /***[ getfile ]*************************************************************/
@@ -552,13 +552,13 @@ 
 	if (!is_file($file))
 		$file = $this->alternate_include_directory.$file;
 
-	if(is_file($file))
+	if (is_file($file))
 	{
-		$file_text=file_get_contents($file);
+		$file_text = file_get_contents($file);
 
 	} else {
 		$this->set_error("[$file] does not exist");
-		$file_text="<b>__XTemplate fatal error: file [$file] does not exist__</b>";
+		$file_text = "<b>__XTemplate fatal error: file [$file] does not exist__</b>";
 	}
 
 	return $file_text;
@@ -571,10 +571,10 @@ 
 
 
 function r_getfile($file) {
-	$text=$this->getfile($file);
-	while (preg_match($this->file_delim,$text,$res)) {
-		$text2=$this->getfile($res[1]);
-		$text=str_replace($res[0], $text2, $text);
+	$text = $this->getfile($file);
+	while (preg_match($this->file_delim, $text, $res)) {
+		$text2 = $this->getfile($res[1]);
+		$text = str_replace($res[0], $text2, $text);
 	}
 	return $text;
 }

Braces +26 added lines, -27 removed lines

@@ -164,8 +164,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($file, $alt_include, $mainblock);
@@ -214,12 +213,14 @@ 
 	$this->assign('JS_CUSTOM_VERSION', $sugar_config['js_custom_version']);
     $this->assign('VERSION_MARK', getVersionedPath(''));
 
-	if(empty($this->blocks[$bname]))
-		return;
+	if(empty($this->blocks[$bname])) {
+			return;
+	}
 
 	$copy=$this->blocks[$bname];
-	if (!isset($this->blocks[$bname]))
-		$this->set_error ("parse: blockname [$bname] does not exist");
+	if (!isset($this->blocks[$bname])) {
+			$this->set_error ("parse: blockname [$bname] does not exist");
+	}
 	preg_match_all("/\{([A-Za-z0-9\._]+?)}/",$this->blocks[$bname],$var_array);
 	$var_array=$var_array[1];
 	foreach ($var_array as $k => $v) {
@@ -231,8 +232,7 @@ 
 			if(isset($this->parsed_blocks[$bname2]))
 			{
 				$var=$this->parsed_blocks[$bname2];
-			}
-			else
+			} else
 			{
 				$var = null;
 			}
@@ -251,8 +251,7 @@ 
 				if(is_array($var) && isset($var[$v1]))
 				{
 					$var=$var[$v1];
-				}
-				else
+				} else
 				{
 					$var = null;
 				}
@@ -275,8 +274,7 @@ 
 	if(isset($this->parsed_blocks[$bname]))
 	{
 		$this->parsed_blocks[$bname].=$copy;
-	}
-	else
+	} else
 	{
 		$this->parsed_blocks[$bname]=$copy;
 	}
@@ -284,8 +282,9 @@ 
 	// reset sub-blocks
 	if ($this->AUTORESET && (!empty($this->sub_blocks[$bname]))) {
 		reset($this->sub_blocks[$bname]);
-		foreach ($this->sub_blocks[$bname] as $v)
-			$this->reset($v);
+		foreach ($this->sub_blocks[$bname] as $v) {
+					$this->reset($v);
+		}
 	}
 }
 
@@ -318,9 +317,10 @@ 
 function rparse($bname) {
 	if (!empty($this->sub_blocks[$bname])) {
 		reset($this->sub_blocks[$bname]);
-		while (list($k,$v)=each($this->sub_blocks[$bname]))
-			if (!empty($v))
+		while (list($k,$v)=each($this->sub_blocks[$bname])) {
+					if (!empty($v))
 				$this->rparse($v,$indent."\t");
+		}
 	}
 	$this->parse($bname);
 }
@@ -344,7 +344,7 @@ 
 
     if(!empty($this->parsed_blocks)){
 	   return $this->parsed_blocks[isset($bname) ? $bname :$this->mainblock];
-    }else{
+    } else{
         return '';
     }
 }
@@ -436,8 +436,9 @@ 
 
 function scan_globals() {
 	reset($GLOBALS);
-	while (list($k,$v)=each($GLOBALS))
-		$GLOB[$k]=$v;
+	while (list($k,$v)=each($GLOBALS)) {
+			$GLOB[$k]=$v;
+	}
 	$this->assign("PHP",$GLOB);	/* access global variables as {PHP.HTTP_HOST} in your template! */
 }
 
@@ -482,8 +483,7 @@ 
 				if(array_key_exists($cur_block_name, $blocks))
 				{
 					$blocks[$cur_block_name].=$res[0][3];				/* add contents */
-				}
-				else
+				} else
 				{
 					$blocks[$cur_block_name]=$res[0][3];				/* add contents */
 				}
@@ -492,8 +492,7 @@ 
 				if(array_key_exists($parent_name, $blocks))
 				{
 					$blocks[$parent_name].="{_BLOCK_.$cur_block_name}";
-				}
-				else
+				} else
 				{
 					$blocks[$parent_name]="{_BLOCK_.$cur_block_name}";
 				}
@@ -510,8 +509,7 @@ 
 			if(array_key_exists($index, $blocks))
 			{
 				$blocks[].=$this->block_start_delim.$v;
-			}
-			else
+			} else
 			{
 				$blocks[]=$this->block_start_delim.$v;
 			}
@@ -549,8 +547,9 @@ 
 
 	// Pick which folder we should include from
 	// Prefer the local directory, then try the theme directory.
-	if (!is_file($file))
-		$file = $this->alternate_include_directory.$file;
+	if (!is_file($file)) {
+			$file = $this->alternate_include_directory.$file;
+	}
 
 	if(is_file($file))
 	{

modules/jjwg_Address_Cache/jjwg_Address_Cache_sugar.php

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function jjwg_Address_Cache_sugar(){
+    function jjwg_Address_Cache_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/jjwg_Address_Cache/jjwg_Address_Cache.php

Spacing +7 added lines, -7 removed lines

@@ -17,19 +17,19 @@ 
     /**
      * Constructor
      */
-    function __construct($init=true) {
+    function __construct($init = true) {
 
         parent::__construct();
         // Admin Config Setting
-        if($init) $this->configuration();
+        if ($init) $this->configuration();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function jjwg_Address_Cache($init=true){
+    function jjwg_Address_Cache($init = true) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -65,9 +65,9 @@ 
 
         if (!empty($this->settings['address_cache_get_enabled']) && !empty($address)) {
 
-            $query = "SELECT " . $this->table_name . ".* FROM " . $this->table_name . " WHERE " .
-                    $this->table_name . ".deleted = 0 AND " .
-                    $this->table_name . ".name='" . $this->db->quote($address) . "'";
+            $query = "SELECT ".$this->table_name.".* FROM ".$this->table_name." WHERE ".
+                    $this->table_name.".deleted = 0 AND ".
+                    $this->table_name.".name='".$this->db->quote($address)."'";
             //var_dump($query);
             $cache_result = $this->db->limitQuery($query, 0, 1);
 

Braces +6 added lines, -4 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry) {
     die('Not A Valid Entry Point');
+}
 
 require_once('modules/jjwg_Maps/jjwg_Maps.php');
 require_once('modules/jjwg_Address_Cache/jjwg_Address_Cache_sugar.php');
@@ -21,7 +22,9 @@ 
 
         parent::__construct();
         // Admin Config Setting
-        if($init) $this->configuration();
+        if($init) {
+            $this->configuration();
+        }
     }
 
     /**
@@ -31,8 +34,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($init);

modules/jjwg_Address_Cache/Dashlets/jjwg_Address_CacheDashlet/jjwg_Address_CacheDashlet.php

Spacing +3 added lines, -3 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');
 
 require_once('include/Dashlets/DashletGeneric.php');
 require_once('modules/jjwg_Address_Cache/jjwg_Address_Cache.php');
@@ -24,9 +24,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function jjwg_Address_CacheDashlet($id, $def = null){
+    function jjwg_Address_CacheDashlet($id, $def = null) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +7 added lines, -5 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');
+}
 
 require_once('include/Dashlets/DashletGeneric.php');
 require_once('modules/jjwg_Address_Cache/jjwg_Address_Cache.php');
@@ -12,8 +14,9 @@ 
 
         parent::__construct($id, $def);
 
-        if (empty($def['title']))
-            $this->title = translate('LBL_HOMEPAGE_TITLE', 'jjwg_Address_Cache');
+        if (empty($def['title'])) {
+                    $this->title = translate('LBL_HOMEPAGE_TITLE', 'jjwg_Address_Cache');
+        }
 
         $this->searchFields = $dashletData['jjwg_Address_CacheDashlet']['searchFields'];
         $this->columns = $dashletData['jjwg_Address_CacheDashlet']['columns'];
@@ -28,8 +31,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($id, $def);

modules/EmailMan/EmailMan.php

Spacing +201 added lines, -201 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.
@@ -40,7 +40,7 @@ 
 
 
 
-class EmailMan extends SugarBean{
+class EmailMan extends SugarBean {
 	var $id;
 	var $deleted;
 	var $date_created;
@@ -64,10 +64,10 @@ 
 	var $send_attempts;
 	var $related_id;
 	var $related_type;
-	var $test=false;
+	var $test = false;
 	var $notes_array = array();
-    var $verified_email_marketing_ids =  array();
-	function toString(){
+    var $verified_email_marketing_ids = array();
+	function toString() {
 		return "EmailMan:\nid = $this->id ,user_id= $this->user_id module = $this->module , related_id = $this->related_id , related_type = $this->related_type ,list_id = $this->list_id, send_date_time= $this->send_date_time\n";
 	}
 
@@ -82,9 +82,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function EmailMan(){
+    public function EmailMan() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -96,7 +96,7 @@ 
 
 	var $new_schema = true;
 
-    function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false) {
+    function create_new_list_query($order_by, $where, $filter = array(), $params = array(), $show_deleted = 0, $join_type = '', $return_array = false, $parentbean = null, $singleSelect = false, $ifListForExport = false) {
 		$query = array('select' => '', 'from' => '', 'where' => '', 'order_by' => '');
 
 
@@ -124,32 +124,32 @@ 
 
                 $where_auto = " $this->table_name.deleted=0";
 
-        if($where != "")
+        if ($where != "")
 			$query['where'] = "WHERE $where AND ".$where_auto;
 		else
 			$query['where'] = "WHERE ".$where_auto;
 
-    	if(isset($params['group_by'])) {
+    	if (isset($params['group_by'])) {
             $query['group_by'] .= " GROUP BY {$params['group_by']}";
 		}
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $query['order_by'] = ' ORDER BY ' . $order_by;
+            $query['order_by'] = ' ORDER BY '.$order_by;
         }
 
 		if ($return_array) {
 			return $query;
 		}
 
-		return  $query['select'] . $query['from'] . $query['where']. $query['order_by'];
+		return  $query['select'].$query['from'].$query['where'].$query['order_by'];
 
     } // if
 
-    function create_queue_items_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false) {
+    function create_queue_items_query($order_by, $where, $filter = array(), $params = array(), $show_deleted = 0, $join_type = '', $return_array = false, $parentbean = null, $singleSelect = false) {
 
 		if ($return_array) {
-			return parent::create_new_list_query($order_by, $where,$filter,$params, $show_deleted,$join_type, $return_array,$parentbean, $singleSelect);
+			return parent::create_new_list_query($order_by, $where, $filter, $params, $show_deleted, $join_type, $return_array, $parentbean, $singleSelect);
 		}
 
 		$query = "SELECT $this->table_name.* ,
@@ -175,7 +175,7 @@ 
 					LEFT JOIN email_marketing ON email_marketing.id = $this->table_name.marketing_id ";
 
 		 //B.F. #37943
-		if( isset($params['group_by']) )
+		if (isset($params['group_by']))
 		{
 			$group_by = str_replace("emailman", "em", $params['group_by']);
 		    $query .= "INNER JOIN (select min(id) as id from emailman  em GROUP BY $group_by  ) secondary
@@ -184,21 +184,21 @@ 
 
                 $where_auto = " $this->table_name.deleted=0";
 
-        if($where != "")
+        if ($where != "")
 			$query .= "WHERE $where AND ".$where_auto;
 		else
 			$query .= "WHERE ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $query .= ' ORDER BY ' . $order_by;
+            $query .= ' ORDER BY '.$order_by;
         }
 
 		return $query;
 
     }
 
-	function create_list_query($order_by, $where, $show_deleted = 0){
+	function create_list_query($order_by, $where, $show_deleted = 0) {
 
 		$query = "SELECT $this->table_name.* ,
 					campaigns.name as campaign_name,
@@ -223,14 +223,14 @@ 
 
                 $where_auto = " $this->table_name.deleted=0";
 
-        if($where != "")
+        if ($where != "")
 			$query .= "where $where AND ".$where_auto;
 		else
 			$query .= "where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $query .= ' ORDER BY ' . $order_by;
+            $query .= ' ORDER BY '.$order_by;
         }
 
 		return $query;
@@ -245,29 +245,29 @@ 
         $related_id = $temp_array['RELATED_ID'];
         $is_person = SugarModule::get($related_type)->moduleImplements('Person');
 
-        if($is_person)
+        if ($is_person)
         {
-            $query = "SELECT first_name, last_name FROM ". strtolower($related_type) ." WHERE id ='". $related_id ."'";
+            $query = "SELECT first_name, last_name FROM ".strtolower($related_type)." WHERE id ='".$related_id."'";
         } else {
-            $query = "SELECT name FROM ". strtolower($related_type) ." WHERE id ='". $related_id ."'";
+            $query = "SELECT name FROM ".strtolower($related_type)." WHERE id ='".$related_id."'";
         }
 
-        $result=$this->db->query($query);
-        $row=$this->db->fetchByAssoc($result);
+        $result = $this->db->query($query);
+        $row = $this->db->fetchByAssoc($result);
 
-        if($row)
+        if ($row)
         {
         	$temp_array['RECIPIENT_NAME'] = $is_person ? $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '') : $row['name'];
         }
 
         //also store the recipient_email address
-        $query = "SELECT addr.email_address FROM email_addresses addr,email_addr_bean_rel eb WHERE eb.deleted=0 AND addr.id=eb.email_address_id AND bean_id ='". $related_id ."' AND primary_address = '1'";
+        $query = "SELECT addr.email_address FROM email_addresses addr,email_addr_bean_rel eb WHERE eb.deleted=0 AND addr.id=eb.email_address_id AND bean_id ='".$related_id."' AND primary_address = '1'";
 
-        $result=$this->db->query($query);
-        $row=$this->db->fetchByAssoc($result);
+        $result = $this->db->query($query);
+        $row = $this->db->fetchByAssoc($result);
         if ($row)
         {
-            $temp_array['RECIPIENT_EMAIL']=$row['email_address'];
+            $temp_array['RECIPIENT_EMAIL'] = $row['email_address'];
         }
 
         $this->email1 = $temp_array['RECIPIENT_EMAIL'];
@@ -277,38 +277,38 @@ 
     }
 
 
-	function set_as_sent($email_address, $delete= true,$email_id=null, $email_type=null,$activity_type=null){
+	function set_as_sent($email_address, $delete = true, $email_id = null, $email_type = null, $activity_type = null) {
 
 		global $timedate;
 
 		$this->send_attempts++;
 		$this->id = (int)$this->id;
-		if($delete || $this->send_attempts > 5){
+		if ($delete || $this->send_attempts > 5) {
 
 			//create new campaign log record.
 
 			$campaign_log = new CampaignLog();
-			$campaign_log->campaign_id=$this->campaign_id;
-			$campaign_log->target_tracker_key=$this->target_tracker_key;
-			$campaign_log->target_id= $this->related_id;
-			$campaign_log->target_type=$this->related_type;
-            $campaign_log->marketing_id=$this->marketing_id;
+			$campaign_log->campaign_id = $this->campaign_id;
+			$campaign_log->target_tracker_key = $this->target_tracker_key;
+			$campaign_log->target_id = $this->related_id;
+			$campaign_log->target_type = $this->related_type;
+            $campaign_log->marketing_id = $this->marketing_id;
 			//if test suppress duplicate email address checking.
 			if (!$this->test) {
-				$campaign_log->more_information=$email_address;
+				$campaign_log->more_information = $email_address;
 			}
-			$campaign_log->activity_type=$activity_type;
-			$campaign_log->activity_date=$timedate->now();
-			$campaign_log->list_id=$this->list_id;
-			$campaign_log->related_id= $email_id;
-			$campaign_log->related_type=$email_type;
+			$campaign_log->activity_type = $activity_type;
+			$campaign_log->activity_date = $timedate->now();
+			$campaign_log->list_id = $this->list_id;
+			$campaign_log->related_id = $email_id;
+			$campaign_log->related_type = $email_type;
             $campaign_log->save();
 
 			$query = "DELETE FROM emailman WHERE id = $this->id";
 			$this->db->query($query);
-		}else{
+		} else {
 			//try to send the email again a day later.
-			$query = 'UPDATE ' . $this->table_name . " SET in_queue='1', send_attempts='$this->send_attempts', in_queue_date=". $this->db->now() ." WHERE id = $this->id";
+			$query = 'UPDATE '.$this->table_name." SET in_queue='1', send_attempts='$this->send_attempts', in_queue_date=".$this->db->now()." WHERE id = $this->id";
 			$this->db->query($query);
 		}
 	}
@@ -330,10 +330,10 @@ 
      * @param string from_address_name The from address eg markeing <marketing@sugar.net>
      * @return
      */
-    function create_ref_email($marketing_id,$subject,$body_text,$body_html,$campagin_name,$from_address,$sender_id,$notes,$macro_nv,$newmessage,$from_address_name) {
+    function create_ref_email($marketing_id, $subject, $body_text, $body_html, $campagin_name, $from_address, $sender_id, $notes, $macro_nv, $newmessage, $from_address_name) {
 
        global $mod_Strings, $timedate;
-       $upd_ref_email=false;
+       $upd_ref_email = false;
        if ($newmessage or empty($this->ref_email->id)) {
            $this->ref_email = new Email();
            $this->ref_email->retrieve($marketing_id, true, false);
@@ -341,25 +341,25 @@ 
            //the reference email should be updated when user swithces from test mode to regular mode,and, for every run in test mode, and is user
            //switches back to test mode.
            //this is to account for changes to email template.
-           $upd_ref_email=(!empty($this->ref_email->id) and $this->ref_email->parent_type=='test' and $this->ref_email->parent_id=='test');
+           $upd_ref_email = (!empty($this->ref_email->id) and $this->ref_email->parent_type == 'test' and $this->ref_email->parent_id == 'test');
           //following condition is for switching back to test mode.
-           if (!$upd_ref_email) $upd_ref_email=($this->test and !empty($this->ref_email->id) and empty($this->ref_email->parent_type) and empty($this->ref_email->parent_id));
+           if (!$upd_ref_email) $upd_ref_email = ($this->test and !empty($this->ref_email->id) and empty($this->ref_email->parent_type) and empty($this->ref_email->parent_id));
            if (empty($this->ref_email->id) or $upd_ref_email) {
                 //create email record.
-                $this->ref_email->id=$marketing_id;
+                $this->ref_email->id = $marketing_id;
                 $this->ref_email->date_sent = '';
 
-                if ($upd_ref_email==false) {
-                    $this->ref_email->new_with_id=true;
+                if ($upd_ref_email == false) {
+                    $this->ref_email->new_with_id = true;
                 }
 
-                $this->ref_email->to_addrs= '';
+                $this->ref_email->to_addrs = '';
                 $this->ref_email->to_addrs_ids = '';
                 $this->ref_email->to_addrs_names = '';
-                $this->ref_email->to_addrs_emails ='';
-                $this->ref_email->type= 'campaign';
+                $this->ref_email->to_addrs_emails = '';
+                $this->ref_email->type = 'campaign';
                 $this->ref_email->deleted = '0';
-                $this->ref_email->name = $campagin_name.': '.$subject ;
+                $this->ref_email->name = $campagin_name.': '.$subject;
                 $this->ref_email->description_html = $body_html;
                 $this->ref_email->description = $body_text;
                 $this->ref_email->from_addr = $from_address;
@@ -367,20 +367,20 @@ 
                 $this->ref_email->assigned_user_id = $sender_id;
                 if ($this->test) {
                     $this->ref_email->parent_type = 'test';
-                    $this->ref_email->parent_id =  'test';
+                    $this->ref_email->parent_id = 'test';
                 } else {
                     $this->ref_email->parent_type = '';
-                    $this->ref_email->parent_id =  '';
+                    $this->ref_email->parent_id = '';
                 }
                 $this->ref_email->date_start = $timedate->nowDate();
                 $this->ref_email->time_start = $timedate->asUserTime($timedate->getNow(true));
 
-                $this->ref_email->status='sent';
+                $this->ref_email->status = 'sent';
                 $retId = $this->ref_email->save();
 
-                foreach($notes as $note) {
-                    if($note->object_name == 'Note') {
-                        if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+                foreach ($notes as $note) {
+                    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;
@@ -389,7 +389,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;
@@ -399,9 +399,9 @@ 
                     $noteAudit->parent_id = $retId;
                     $noteAudit->parent_type = $this->ref_email->module_dir;
                     $noteAudit->description = "[".$note->filename."] ".$mod_strings['LBL_ATTACHMENT_AUDIT'];
-                    $noteAudit->filename=$filename;
-                    $noteAudit->file_mime_type=$mime_type;
-                    $noteAudit_id=$noteAudit->save();
+                    $noteAudit->filename = $filename;
+                    $noteAudit->file_mime_type = $mime_type;
+                    $noteAudit_id = $noteAudit->save();
 
                     UploadFile::duplicate_file($note->id, $noteAudit_id, $filename);
                 }
@@ -415,28 +415,28 @@ 
             $this->ref_email->load_relationship('accounts');
        }
 
-       if (!empty($this->related_id ) && !empty($this->related_type)) {
+       if (!empty($this->related_id) && !empty($this->related_type)) {
 
             //save relationships.
-            switch ($this->related_type)  {
+            switch ($this->related_type) {
                 case 'Users':
-                    $rel_name="users";
+                    $rel_name = "users";
                     break;
 
                 case 'Prospects':
-                    $rel_name="prospects";
+                    $rel_name = "prospects";
                     break;
 
                 case 'Contacts':
-                    $rel_name="contacts";
+                    $rel_name = "contacts";
                     break;
 
                 case 'Leads':
-                    $rel_name="leads";
+                    $rel_name = "leads";
                     break;
 
                 case 'Accounts':
-                    $rel_name="accounts";
+                    $rel_name = "accounts";
                     break;
             }
 
@@ -444,7 +444,7 @@ 
             $campaignData = serialize($macro_nv);
 
             //required for one email per campaign per marketing message.
-            $this->ref_email->$rel_name->add($this->related_id,array('campaign_data'=>$this->db->quote($campaignData)));
+            $this->ref_email->$rel_name->add($this->related_id, array('campaign_data'=>$this->db->quote($campaignData)));
        }
        return $this->ref_email->id;
     }
@@ -452,20 +452,20 @@ 
    /**
     * The function creates a copy of email send to each target.
     */
-    function create_indiv_email($module,$mail) {
+    function create_indiv_email($module, $mail) {
 
         global $locale, $timedate;
         $email = new Email();
-        $email->to_addrs= $module->name . '&lt;'.$module->email1.'&gt;';
-        $email->to_addrs_ids = $module->id .';';
-        $email->to_addrs_names = $module->name . ';';
-        $email->to_addrs_emails = $module->email1 . ';';
-        $email->type= 'archived';
+        $email->to_addrs = $module->name.'&lt;'.$module->email1.'&gt;';
+        $email->to_addrs_ids = $module->id.';';
+        $email->to_addrs_names = $module->name.';';
+        $email->to_addrs_emails = $module->email1.';';
+        $email->type = 'archived';
         $email->deleted = '0';
-        $email->name = $this->current_campaign->name.': '.$mail->Subject ;
+        $email->name = $this->current_campaign->name.': '.$mail->Subject;
         if ($mail->ContentType == "text/plain") {
             $email->description = $mail->Body;
-            $email->description_html =null;
+            $email->description_html = null;
         } else {
             $email->description_html = $mail->Body;
             $email->description = $mail->AltBody;
@@ -473,15 +473,15 @@ 
         $email->from_addr = $mail->From;
         $email->assigned_user_id = $this->user_id;
         $email->parent_type = $this->related_type;
-        $email->parent_id = $this->related_id ;
+        $email->parent_id = $this->related_id;
 
         $email->date_start = $timedate->nowDbDate();
         $email->time_start = $timedate->asDbTime($timedate->getNow());
-        $email->status='sent';
+        $email->status = 'sent';
         $retId = $email->save();
 
-        foreach($this->notes_array as $note) {
-            if(!class_exists('Note')) {
+        foreach ($this->notes_array as $note) {
+            if (!class_exists('Note')) {
 
             }
             // create "audit" email without duping off the file to save on disk space
@@ -492,28 +492,28 @@ 
             $noteAudit->save();
         }
 
-        if (!empty($this->related_id ) && !empty($this->related_type)) {
+        if (!empty($this->related_id) && !empty($this->related_type)) {
 
                 //save relationships.
-                switch ($this->related_type)  {
+                switch ($this->related_type) {
                     case 'Users':
-                        $rel_name="users";
+                        $rel_name = "users";
                         break;
 
                     case 'Prospects':
-                        $rel_name="prospects";
+                        $rel_name = "prospects";
                         break;
 
                     case 'Contacts':
-                        $rel_name="contacts";
+                        $rel_name = "contacts";
                         break;
 
                     case 'Leads':
-                        $rel_name="leads";
+                        $rel_name = "leads";
                         break;
 
                     case 'Accounts':
-                        $rel_name="accounts";
+                        $rel_name = "accounts";
                         break;
                 }
 
@@ -536,69 +536,69 @@ 
 
             }
             $email_marketing = new EmailMarketing();
-            $ret=$email_marketing->retrieve($marketing_id);
+            $ret = $email_marketing->retrieve($marketing_id);
             if (empty($ret)) {
-                $GLOBALS['log']->fatal('Error retrieving marketing message for the email campaign. marketing_id = ' .$marketing_id);
+                $GLOBALS['log']->fatal('Error retrieving marketing message for the email campaign. marketing_id = '.$marketing_id);
                 return false;
             }
 
             //verify the email template.
             if (empty($email_marketing->template_id)) {
-                $GLOBALS['log']->fatal('Error retrieving template for the email campaign. marketing_id = ' .$marketing_id);
+                $GLOBALS['log']->fatal('Error retrieving template for the email campaign. marketing_id = '.$marketing_id);
                 return false;
             }
 
             if (!class_exists('EmailTemplate')) {
 
             }
-            $emailtemplate= new EmailTemplate();
+            $emailtemplate = new EmailTemplate();
 
-            $ret=$emailtemplate->retrieve($email_marketing->template_id);
+            $ret = $emailtemplate->retrieve($email_marketing->template_id);
             if (empty($ret)) {
-                $GLOBALS['log']->fatal('Error retrieving template for the email campaign. template_id = ' .$email_marketing->template_id);
+                $GLOBALS['log']->fatal('Error retrieving template for the email campaign. template_id = '.$email_marketing->template_id);
                 return false;
             }
 
             if (empty($emailtemplate->subject) and empty($emailtemplate->body) and empty($emailtemplate->body_html)) {
-                $GLOBALS['log']->fatal('Email template is empty. email_template_id=' .$email_marketing->template_id);
+                $GLOBALS['log']->fatal('Email template is empty. email_template_id='.$email_marketing->template_id);
 				return false;
             }
 
         }
-        $this->verified_email_marketing_ids[$marketing_id]=1;
+        $this->verified_email_marketing_ids[$marketing_id] = 1;
 
         return true;
     }
-	function sendEmail($mail,$save_emails=1,$testmode=false){
-	    $this->test=$testmode;
+	function sendEmail($mail, $save_emails = 1, $testmode = false) {
+	    $this->test = $testmode;
 
 		global $beanList, $beanFiles, $sugar_config;
 		global $mod_strings;
         global $locale;
         $OBCharset = $locale->getPrecedentPreference('default_email_charset');
-		$mod_strings = return_module_language( $sugar_config['default_language'], 'EmailMan');
+		$mod_strings = return_module_language($sugar_config['default_language'], 'EmailMan');
 
 		//get tracking entities locations.
 		if (!isset($this->tracking_url)) {
 			if (!class_exists('Administration')) {
 
 			}
-			$admin=new Administration();
+			$admin = new Administration();
 			$admin->retrieveSettings('massemailer'); //retrieve all admin settings.
-		    if (isset($admin->settings['massemailer_tracking_entities_location_type']) and $admin->settings['massemailer_tracking_entities_location_type']=='2'  and isset($admin->settings['massemailer_tracking_entities_location']) ) {
-				$this->tracking_url=$admin->settings['massemailer_tracking_entities_location'];
+		    if (isset($admin->settings['massemailer_tracking_entities_location_type']) and $admin->settings['massemailer_tracking_entities_location_type'] == '2' and isset($admin->settings['massemailer_tracking_entities_location'])) {
+				$this->tracking_url = $admin->settings['massemailer_tracking_entities_location'];
 		    } else {
-				$this->tracking_url=$sugar_config['site_url'];
+				$this->tracking_url = $sugar_config['site_url'];
 		    }
 		}
 
         //make sure tracking url ends with '/' character
         $strLen = strlen($this->tracking_url);
-        if($this->tracking_url{$strLen-1} !='/'){
-            $this->tracking_url .='/';
+        if ($this->tracking_url{$strLen - 1} != '/') {
+            $this->tracking_url .= '/';
         }
 
-		if(!isset($beanList[$this->related_type])){
+		if (!isset($beanList[$this->related_type])) {
 			return false;
 		}
 		$class = $beanList[$this->related_type];
@@ -621,15 +621,15 @@ 
         if (!$this->is_primary_email_address($module)) {
             //no primary email address designated, do not send out email, create campaign log
             //of type send error to denote that this user was not emailed
-            $this->set_as_sent($module->email1, true,null,null,'send error');
+            $this->set_as_sent($module->email1, true, null, null, 'send error');
             //create fatal logging for easy review of cause.
-            $GLOBALS['log']->fatal('Email Address provided is not Primary Address for email with id ' . $module->email1 . "' Emailman id=$this->id");
+            $GLOBALS['log']->fatal('Email Address provided is not Primary Address for email with id '.$module->email1."' Emailman id=$this->id");
             return true;
         }
 
 		if (!$this->valid_email_address($module->email1)) {
-			$this->set_as_sent($module->email1, true,null,null,'invalid email');
-			$GLOBALS['log']->fatal('Encountered invalid email address' . $module->email1 . " Emailman id=$this->id");
+			$this->set_as_sent($module->email1, true, null, null, 'invalid email');
+			$GLOBALS['log']->fatal('Encountered invalid email address'.$module->email1." Emailman id=$this->id");
 			return true;
 		}
 
@@ -640,33 +640,33 @@ 
             && (!isset($module->invalid_email)
                     || ($module->invalid_email !== 'on'
                         && $module->invalid_email !== 1
-                        && $module->invalid_email !== '1'))){
-            $lower_email_address=strtolower($module->email1);
+                        && $module->invalid_email !== '1'))) {
+            $lower_email_address = strtolower($module->email1);
 			//test against indivdual address.
 			if (isset($this->restricted_addresses) and isset($this->restricted_addresses[$lower_email_address])) {
-				$this->set_as_sent($lower_email_address, true,null,null,'blocked');
+				$this->set_as_sent($lower_email_address, true, null, null, 'blocked');
 				return true;
 			}
 			//test against restricted domains
-			$at_pos=strrpos($lower_email_address,'@');
+			$at_pos = strrpos($lower_email_address, '@');
 			if ($at_pos !== false) {
 				foreach ($this->restricted_domains as $domain=>$value) {
-					$pos=strrpos($lower_email_address,$domain);
+					$pos = strrpos($lower_email_address, $domain);
 					if ($pos !== false && $pos > $at_pos) {
 						//found
-						$this->set_as_sent($lower_email_address, true,null,null,'blocked');
+						$this->set_as_sent($lower_email_address, true, null, null, 'blocked');
 						return true;
 					}
 				}
 			}
 
 			//test for duplicate email address by marketing id.
-            $dup_query="select id from campaign_log where more_information='".$this->db->quote($module->email1)."' and marketing_id='".$this->marketing_id."'";
-			$dup=$this->db->query($dup_query);
-			$dup_row=$this->db->fetchByAssoc($dup);
+            $dup_query = "select id from campaign_log where more_information='".$this->db->quote($module->email1)."' and marketing_id='".$this->marketing_id."'";
+			$dup = $this->db->query($dup_query);
+			$dup_row = $this->db->fetchByAssoc($dup);
 			if (!empty($dup_row)) {
 				//we have seen this email address before
-				$this->set_as_sent($module->email1,true,null,null,'blocked');
+				$this->set_as_sent($module->email1, true, null, null, 'blocked');
 				return true;
 			}
 
@@ -677,7 +677,7 @@ 
 
 				}
 
-				$this->current_emailmarketing=new EmailMarketing();
+				$this->current_emailmarketing = new EmailMarketing();
 
 			}
 			if (empty($this->current_emailmarketing->id) or $this->current_emailmarketing->id !== $this->marketing_id) {
@@ -690,24 +690,24 @@ 
 				if (!class_exists('EmailTemplate')) {
 
 				}
-				$this->current_emailtemplate= new EmailTemplate();
+				$this->current_emailtemplate = new EmailTemplate();
 
 				$this->current_emailtemplate->retrieve($this->current_emailmarketing->template_id);
 
 				//escape email template contents.
-				$this->current_emailtemplate->subject=from_html($this->current_emailtemplate->subject);
-				$this->current_emailtemplate->body_html=from_html($this->current_emailtemplate->body_html);
-				$this->current_emailtemplate->body=from_html($this->current_emailtemplate->body);
+				$this->current_emailtemplate->subject = from_html($this->current_emailtemplate->subject);
+				$this->current_emailtemplate->body_html = from_html($this->current_emailtemplate->body_html);
+				$this->current_emailtemplate->body = from_html($this->current_emailtemplate->body);
 
 				$q = "SELECT * FROM notes WHERE parent_id = '".$this->current_emailtemplate->id."' AND deleted = 0";
 				$r = $this->db->query($q);
 
 				// cn: bug 4684 - initialize the notes array, else old data is still around for the next round
 				$this->notes_array = array();
-                if (!class_exists('Note')){
+                if (!class_exists('Note')) {
                 	require_once('modules/Notes/Note.php');
 				}
-				while($a = $this->db->fetchByAssoc($r)) {
+				while ($a = $this->db->fetchByAssoc($r)) {
 					$noteTemplate = new Note();
 					$noteTemplate->retrieve($a['id']);
 					$this->notes_array[] = $noteTemplate;
@@ -715,16 +715,16 @@ 
 			}
 
 			// fetch mailbox details..
-			if(empty($this->current_mailbox)) {
+			if (empty($this->current_mailbox)) {
 				if (!class_exists('InboundEmail')) {
 
 				}
-				$this->current_mailbox= new InboundEmail();
+				$this->current_mailbox = new InboundEmail();
 			}
 			if (empty($this->current_mailbox->id) or $this->current_mailbox->id !== $this->current_emailmarketing->inbound_email_id) {
 				$this->current_mailbox->retrieve($this->current_emailmarketing->inbound_email_id);
 				//extract the email address.
-				$this->mailbox_from_addr=$this->current_mailbox->get_stored_options('from_addr','nobody@example.com',null);
+				$this->mailbox_from_addr = $this->current_mailbox->get_stored_options('from_addr', 'nobody@example.com', null);
 			}
 
 			// fetch campaign details..
@@ -732,53 +732,53 @@ 
 				if (!class_exists('Campaign')) {
 
 				}
-				$this->current_campaign= new Campaign();
+				$this->current_campaign = new Campaign();
 			}
 			if (empty($this->current_campaign->id) or $this->current_campaign->id !== $this->current_emailmarketing->campaign_id) {
 				$this->current_campaign->retrieve($this->current_emailmarketing->campaign_id);
 
 				//load defined tracked_urls
 				$this->current_campaign->load_relationship('tracked_urls');
-				$query_array=$this->current_campaign->tracked_urls->getQuery(true);
-				$query_array['select']="SELECT tracker_name, tracker_key, id, is_optout ";
-				$result=$this->current_campaign->db->query(implode(' ',$query_array));
-
-				$this->has_optout_links=false;
-				$this->tracker_urls=array();
-				while (($row=$this->current_campaign->db->fetchByAssoc($result)) != null) {
-					$this->tracker_urls['{'.$row['tracker_name'].'}']=$row;
+				$query_array = $this->current_campaign->tracked_urls->getQuery(true);
+				$query_array['select'] = "SELECT tracker_name, tracker_key, id, is_optout ";
+				$result = $this->current_campaign->db->query(implode(' ', $query_array));
+
+				$this->has_optout_links = false;
+				$this->tracker_urls = array();
+				while (($row = $this->current_campaign->db->fetchByAssoc($result)) != null) {
+					$this->tracker_urls['{'.$row['tracker_name'].'}'] = $row;
 					//has the user defined opt-out links for the campaign.
-					if ($row['is_optout']==1) {
-						$this->has_optout_links=true;
+					if ($row['is_optout'] == 1) {
+						$this->has_optout_links = true;
 					}
 				}
 			}
 
 			$mail->ClearAllRecipients();
 			$mail->ClearReplyTos();
-			$mail->Sender	= $this->mailbox_from_addr;
+			$mail->Sender = $this->mailbox_from_addr;
 			$mail->From     = $this->mailbox_from_addr;
 			$mail->FromName = $locale->translateCharsetMIME(trim($this->current_emailmarketing->from_name), 'UTF-8', $OBCharset);
 			$mail->ClearCustomHeaders();
             $mail->AddCustomHeader('X-CampTrackID:'.$this->target_tracker_key);
             //CL - Bug 25256 Check if we have a reply_to_name/reply_to_addr value from the email marketing table.  If so use email marketing entry; otherwise current mailbox (inbound email) entry
-			$replyToName = empty($this->current_emailmarketing->reply_to_name) ? $this->current_mailbox->get_stored_options('reply_to_name',$mail->FromName,null) : $this->current_emailmarketing->reply_to_name;
-			$replyToAddr = empty($this->current_emailmarketing->reply_to_addr) ? $this->current_mailbox->get_stored_options('reply_to_addr',$mail->From,null) : $this->current_emailmarketing->reply_to_addr;
+			$replyToName = empty($this->current_emailmarketing->reply_to_name) ? $this->current_mailbox->get_stored_options('reply_to_name', $mail->FromName, null) : $this->current_emailmarketing->reply_to_name;
+			$replyToAddr = empty($this->current_emailmarketing->reply_to_addr) ? $this->current_mailbox->get_stored_options('reply_to_addr', $mail->From, null) : $this->current_emailmarketing->reply_to_addr;
 
             if (!empty($replyToAddr)) {
-                $mail->AddReplyTo($replyToAddr,$locale->translateCharsetMIME(trim($replyToName), 'UTF-8', $OBCharset));
+                $mail->AddReplyTo($replyToAddr, $locale->translateCharsetMIME(trim($replyToName), 'UTF-8', $OBCharset));
             }
 
 			//parse and replace bean variables.
-            $macro_nv=array();
+            $macro_nv = array();
             $focus_name = 'Contacts';
-            if($module->module_dir == 'Accounts')
+            if ($module->module_dir == 'Accounts')
             {
                 $focus_name = 'Accounts';
             }
 
 
-			$template_data=  $this->current_emailtemplate->parse_email_template(array('subject'=>$this->current_emailtemplate->subject,
+			$template_data = $this->current_emailtemplate->parse_email_template(array('subject'=>$this->current_emailtemplate->subject,
 																					  'body_html'=>$this->current_emailtemplate->body_html,
 																					  'body'=>$this->current_emailtemplate->body,
 																					  )
@@ -786,65 +786,65 @@ 
                                                                                       ,$macro_nv);
 
             //add email address to this list.
-            $macro_nv['sugar_to_email_address']=$module->email1;
-            $macro_nv['email_template_id']=$this->current_emailmarketing->template_id;
+            $macro_nv['sugar_to_email_address'] = $module->email1;
+            $macro_nv['email_template_id'] = $this->current_emailmarketing->template_id;
 
             //parse and replace urls.
 			//this is new style of adding tracked urls to a campaign.
-			$tracker_url_template= $this->tracking_url . 'index.php?entryPoint=campaign_trackerv2&track=%s'.'&identifier='.$this->target_tracker_key;
-			$removeme_url_template=$this->tracking_url . 'index.php?entryPoint=removeme&identifier='.$this->target_tracker_key;
-			$template_data=  $this->current_emailtemplate->parse_tracker_urls($template_data,$tracker_url_template,$this->tracker_urls,$removeme_url_template);
-			$mail->AddAddress($module->email1,$locale->translateCharsetMIME(trim($module->name), 'UTF-8', $OBCharset) );
+			$tracker_url_template = $this->tracking_url.'index.php?entryPoint=campaign_trackerv2&track=%s'.'&identifier='.$this->target_tracker_key;
+			$removeme_url_template = $this->tracking_url.'index.php?entryPoint=removeme&identifier='.$this->target_tracker_key;
+			$template_data = $this->current_emailtemplate->parse_tracker_urls($template_data, $tracker_url_template, $this->tracker_urls, $removeme_url_template);
+			$mail->AddAddress($module->email1, $locale->translateCharsetMIME(trim($module->name), 'UTF-8', $OBCharset));
 
             //refetch strings in case they have been changed by creation of email templates or other beans.
-            $mod_strings = return_module_language( $sugar_config['default_language'], 'EmailMan');
+            $mod_strings = return_module_language($sugar_config['default_language'], 'EmailMan');
 
-            if($this->test){
-                $mail->Subject =  $mod_strings['LBL_PREPEND_TEST'] . $template_data['subject'];
-            }else{
-                $mail->Subject =  $template_data['subject'];
+            if ($this->test) {
+                $mail->Subject = $mod_strings['LBL_PREPEND_TEST'].$template_data['subject'];
+            } else {
+                $mail->Subject = $template_data['subject'];
             }
 
             //check if this template is meant to be used as "text only"
             $text_only = false;
-            if(isset($this->current_emailtemplate->text_only) && $this->current_emailtemplate->text_only){$text_only =true;}
+            if (isset($this->current_emailtemplate->text_only) && $this->current_emailtemplate->text_only) {$text_only = true; }
             //if this template is textonly, then just send text body.  Do not add tracker, opt out,
             //or perform other processing as it will not show up in text only email
-            if($text_only){
+            if ($text_only) {
                 $this->description_html = '';
                 $mail->IsHTML(false);
                 $mail->Body = $template_data['body'];
 
-            }else{
+            } else {
                 $mail->Body = wordwrap($template_data['body_html'], 900);
                 //BEGIN:this code will trigger for only campaigns pending before upgrade to 4.2.0.
                 //will be removed for the next release.
-                if(!isset($btracker)) $btracker=false;
+                if (!isset($btracker)) $btracker = false;
                 if ($btracker) {
-                    $mail->Body .= "<br /><br /><a href='". $tracker_url ."'>" . $tracker_text . "</a><br /><br />";
+                    $mail->Body .= "<br /><br /><a href='".$tracker_url."'>".$tracker_text."</a><br /><br />";
                 } else {
                     if (!empty($tracker_url)) {
-                        $mail->Body = str_replace('TRACKER_URL_START', "<a href='" . $tracker_url ."'>", $mail->Body);
+                        $mail->Body = str_replace('TRACKER_URL_START', "<a href='".$tracker_url."'>", $mail->Body);
                         $mail->Body = str_replace('TRACKER_URL_END', "</a>", $mail->Body);
-                        $mail->AltBody = str_replace('TRACKER_URL_START', "<a href='" . $tracker_url ."'>", $mail->AltBody);
+                        $mail->AltBody = str_replace('TRACKER_URL_START', "<a href='".$tracker_url."'>", $mail->AltBody);
                         $mail->AltBody = str_replace('TRACKER_URL_END', "</a>", $mail->AltBody);
                     }
                 }
                 //END
 
                 //do not add the default remove me link if the campaign has a trackerurl of the opotout link
-                if ($this->has_optout_links==false) {
-                    $mail->Body .= "<br /><span style='font-size:0.8em'>{$mod_strings['TXT_REMOVE_ME']} <a href='". $this->tracking_url . "index.php?entryPoint=removeme&identifier={$this->target_tracker_key}'>{$mod_strings['TXT_REMOVE_ME_CLICK']}</a></span>";
+                if ($this->has_optout_links == false) {
+                    $mail->Body .= "<br /><span style='font-size:0.8em'>{$mod_strings['TXT_REMOVE_ME']} <a href='".$this->tracking_url."index.php?entryPoint=removeme&identifier={$this->target_tracker_key}'>{$mod_strings['TXT_REMOVE_ME_CLICK']}</a></span>";
                 }
                 // cn: bug 11979 - adding single quote to comform with HTML email RFC
                 $mail->Body .= "<br /><img alt='' height='1' width='1' src='{$this->tracking_url}index.php?entryPoint=image&identifier={$this->target_tracker_key}' />";
 
                 $mail->AltBody = $template_data['body'];
                 if ($btracker) {
-                    $mail->AltBody .="\n". $tracker_url;
+                    $mail->AltBody .= "\n".$tracker_url;
                 }
-                if ($this->has_optout_links==false) {
-                    $mail->AltBody .="\n\n\n{$mod_strings['TXT_REMOVE_ME_ALT']} ". $this->tracking_url . "index.php?entryPoint=removeme&identifier=$this->target_tracker_key";
+                if ($this->has_optout_links == false) {
+                    $mail->AltBody .= "\n\n\n{$mod_strings['TXT_REMOVE_ME_ALT']} ".$this->tracking_url."index.php?entryPoint=removeme&identifier=$this->target_tracker_key";
                 }
 
             }
@@ -857,16 +857,16 @@ 
 	    	$success = $mail->Send();
 	    	//Do not save the encoded subject.
             $mail->Subject = $tmp_Subject;
-			if($success ){
-                $email_id=null;
-                if ($save_emails==1) {
-                    $email_id=$this->create_indiv_email($module,$mail);
+			if ($success) {
+                $email_id = null;
+                if ($save_emails == 1) {
+                    $email_id = $this->create_indiv_email($module, $mail);
                 } else {
                     //find/create reference email record. all campaign targets reveiving this message will be linked with this message.
                     $decodedFromName = mb_decode_mimeheader($this->current_emailmarketing->from_name);
-                    $fromAddressName= "{$decodedFromName} <{$this->mailbox_from_addr}>";
+                    $fromAddressName = "{$decodedFromName} <{$this->mailbox_from_addr}>";
 
-                    $email_id=$this->create_ref_email($this->marketing_id,
+                    $email_id = $this->create_ref_email($this->marketing_id,
                                             $this->current_emailtemplate->subject,
                                             $this->current_emailtemplate->body,
                                             $this->current_emailtemplate->body_html,
@@ -886,30 +886,30 @@ 
 				$this->set_as_sent($module->email1, true, $email_id, 'Emails', 'targeted');
 			} else {
 
-				if(!empty($layout_def['parent_id'])) {
+				if (!empty($layout_def['parent_id'])) {
 	                if (isset($layout_def['fields'][strtoupper($layout_def['parent_id'])])) {
-	                    $parent.="&parent_id=".$layout_def['fields'][strtoupper($layout_def['parent_id'])];
+	                    $parent .= "&parent_id=".$layout_def['fields'][strtoupper($layout_def['parent_id'])];
 	                }
 	            }
-	            if(!empty($layout_def['parent_module'])) {
+	            if (!empty($layout_def['parent_module'])) {
 	                if (isset($layout_def['fields'][strtoupper($layout_def['parent_module'])])) {
-	                    $parent.="&parent_module=".$layout_def['fields'][strtoupper($layout_def['parent_module'])];
+	                    $parent .= "&parent_module=".$layout_def['fields'][strtoupper($layout_def['parent_module'])];
 	                }
 	            }
 				//log send error. save for next attempt after 24hrs. no campaign log entry will be created.
-				$this->set_as_sent($module->email1,false,null,null,'send error');
+				$this->set_as_sent($module->email1, false, null, null, 'send error');
 			}
-		}else{
+		} else {
             $success = false;
-            $this->target_tracker_key=create_guid();
+            $this->target_tracker_key = create_guid();
 
 			if (isset($module->email_opt_out) && ($module->email_opt_out === 'on' || $module->email_opt_out == '1' || $module->email_opt_out == 1)) {
-				$this->set_as_sent($module->email1,true,null,null,'removed');
+				$this->set_as_sent($module->email1, true, null, null, 'removed');
 			} else {
 				if (isset($module->invalid_email) && ($module->invalid_email == 1 || $module->invalid_email == '1')) {
-					$this->set_as_sent($module->email1,true,null,null,'invalid email');
+					$this->set_as_sent($module->email1, true, null, null, 'invalid email');
 				} else {
-					$this->set_as_sent($module->email1,true, null,null,'send error');
+					$this->set_as_sent($module->email1, true, null, null, 'send error');
 				}
 			}
 		}
@@ -924,15 +924,15 @@ 
 	 */
 	function valid_email_address($email_address) {
 
-		$email_address=trim($email_address);
+		$email_address = trim($email_address);
 		if (empty($email_address)) {
 			return false;
 		}
 
-		$pattern='/[A-Z0-9\._%-]+@[A-Z0-9\.-]+\.[A-Za-z]{2,}$/i';
-		$ret=preg_match($pattern, $email_address);
+		$pattern = '/[A-Z0-9\._%-]+@[A-Z0-9\.-]+\.[A-Za-z]{2,}$/i';
+		$ret = preg_match($pattern, $email_address);
 		echo $ret;
-		if ($ret===false or $ret==0) {
+		if ($ret === false or $ret == 0) {
 			return false;
 		}
 		return true;
@@ -944,8 +944,8 @@ 
      * If no primary email address is found, then false is returned
      *
      */
-    function is_primary_email_address($bean){
-        $email_address=trim($bean->email1);
+    function is_primary_email_address($bean) {
+        $email_address = trim($bean->email1);
 
         if (empty($email_address)) {
             return false;
@@ -953,7 +953,7 @@ 
         //query for this email address rel and see if this is primary address
         $primary_qry = "select email_address_id from email_addr_bean_rel where bean_id = '".$bean->id."' and email_addr_bean_rel.primary_address=1 and deleted=0";
         $res = $bean->db->query($primary_qry);
-        $prim_row=$this->db->fetchByAssoc($res);
+        $prim_row = $this->db->fetchByAssoc($res);
         //return true if this is primary
         if (!empty($prim_row)) {
             return true;
@@ -974,14 +974,14 @@ 
 
         $where_auto = "( emailman.deleted IS NULL OR emailman.deleted=0 )";
 
-        if($where != "")
+        if ($where != "")
             $query .= "where ($where) AND ".$where_auto;
         else
             $query .= "where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $query .= ' ORDER BY ' . $order_by;
+            $query .= ' ORDER BY '.$order_by;
         }
 
         return $query;

Braces +34 added lines, -25 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.
@@ -86,8 +88,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -124,10 +125,11 @@ 
 
                 $where_auto = " $this->table_name.deleted=0";
 
-        if($where != "")
-			$query['where'] = "WHERE $where AND ".$where_auto;
-		else
-			$query['where'] = "WHERE ".$where_auto;
+        if($where != "") {
+        			$query['where'] = "WHERE $where AND ".$where_auto;
+        } else {
+					$query['where'] = "WHERE ".$where_auto;
+		}
 
     	if(isset($params['group_by'])) {
             $query['group_by'] .= " GROUP BY {$params['group_by']}";
@@ -184,10 +186,11 @@ 
 
                 $where_auto = " $this->table_name.deleted=0";
 
-        if($where != "")
-			$query .= "WHERE $where AND ".$where_auto;
-		else
-			$query .= "WHERE ".$where_auto;
+        if($where != "") {
+        			$query .= "WHERE $where AND ".$where_auto;
+        } else {
+					$query .= "WHERE ".$where_auto;
+		}
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
@@ -223,10 +226,11 @@ 
 
                 $where_auto = " $this->table_name.deleted=0";
 
-        if($where != "")
-			$query .= "where $where AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto;
+        if($where != "") {
+        			$query .= "where $where AND ".$where_auto;
+        } else {
+					$query .= "where ".$where_auto;
+		}
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
@@ -306,7 +310,7 @@ 
 
 			$query = "DELETE FROM emailman WHERE id = $this->id";
 			$this->db->query($query);
-		}else{
+		} else{
 			//try to send the email again a day later.
 			$query = 'UPDATE ' . $this->table_name . " SET in_queue='1', send_attempts='$this->send_attempts', in_queue_date=". $this->db->now() ." WHERE id = $this->id";
 			$this->db->query($query);
@@ -343,7 +347,9 @@ 
            //this is to account for changes to email template.
            $upd_ref_email=(!empty($this->ref_email->id) and $this->ref_email->parent_type=='test' and $this->ref_email->parent_id=='test');
           //following condition is for switching back to test mode.
-           if (!$upd_ref_email) $upd_ref_email=($this->test and !empty($this->ref_email->id) and empty($this->ref_email->parent_type) and empty($this->ref_email->parent_id));
+           if (!$upd_ref_email) {
+               $upd_ref_email=($this->test and !empty($this->ref_email->id) and empty($this->ref_email->parent_type) and empty($this->ref_email->parent_id));
+           }
            if (empty($this->ref_email->id) or $upd_ref_email) {
                 //create email record.
                 $this->ref_email->id=$marketing_id;
@@ -801,7 +807,7 @@ 
 
             if($this->test){
                 $mail->Subject =  $mod_strings['LBL_PREPEND_TEST'] . $template_data['subject'];
-            }else{
+            } else{
                 $mail->Subject =  $template_data['subject'];
             }
 
@@ -815,11 +821,13 @@ 
                 $mail->IsHTML(false);
                 $mail->Body = $template_data['body'];
 
-            }else{
+            } else{
                 $mail->Body = wordwrap($template_data['body_html'], 900);
                 //BEGIN:this code will trigger for only campaigns pending before upgrade to 4.2.0.
                 //will be removed for the next release.
-                if(!isset($btracker)) $btracker=false;
+                if(!isset($btracker)) {
+                    $btracker=false;
+                }
                 if ($btracker) {
                     $mail->Body .= "<br /><br /><a href='". $tracker_url ."'>" . $tracker_text . "</a><br /><br />";
                 } else {
@@ -899,7 +907,7 @@ 
 				//log send error. save for next attempt after 24hrs. no campaign log entry will be created.
 				$this->set_as_sent($module->email1,false,null,null,'send error');
 			}
-		}else{
+		} else{
             $success = false;
             $this->target_tracker_key=create_guid();
 
@@ -974,10 +982,11 @@ 
 
         $where_auto = "( emailman.deleted IS NULL OR emailman.deleted=0 )";
 
-        if($where != "")
-            $query .= "where ($where) AND ".$where_auto;
-        else
-            $query .= "where ".$where_auto;
+        if($where != "") {
+                    $query .= "where ($where) AND ".$where_auto;
+        } else {
+                    $query .= "where ".$where_auto;
+        }
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {

modules/FP_events/FP_events.php

Spacing +5 added lines, -5 removed lines

@@ -43,16 +43,16 @@ 
 require_once('modules/FP_events/FP_events_sugar.php');
 class FP_events extends FP_events_sugar {
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function FP_events(){
+    function FP_events() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -63,11 +63,11 @@ 
 
 
 	//assign email templates to drop_down in module
-	function email_templates(){
+	function email_templates() {
 
 		global $app_list_strings;
 
-		$app_list_strings['email_templet_list'] = get_bean_select_array(true, 'EmailTemplate','name');
+		$app_list_strings['email_templet_list'] = get_bean_select_array(true, 'EmailTemplate', 'name');
 
 
 	}

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/FP_events/FP_events_sugar.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
 	var $object_name = 'FP_events';
 	var $table_name = 'fp_events';
 	var $importable = true;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -73,16 +73,16 @@ 
 		var $currency_id;
 		var $invite_templates;
 
-    function __construct(){
+    function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function FP_events_sugar(){
+    function FP_events_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -92,8 +92,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/FP_events/views/view.detail.php

Spacing +5 added lines, -5 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 require_once('include/MVC/View/views/view.detail.php');
 
 class FP_eventsViewDetail extends ViewDetail {
 	var $currSymbol;
-	function __construct(){
+	function __construct() {
  		parent::__construct();
  	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function FP_eventsViewDetail(){
+    function FP_eventsViewDetail() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -24,7 +24,7 @@ 
     }
 
 
-	function display(){
+	function display() {
 		$this->bean->email_templates();
 		parent::display();
 	}

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/FP_events/views/view.edit.php

Spacing +5 added lines, -5 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 require_once('include/MVC/View/views/view.edit.php');
 
 class FP_eventsViewEdit extends ViewEdit {
-	function __construct(){
+	function __construct() {
  		parent::__construct();
  	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function FP_eventsViewEdit(){
+    function FP_eventsViewEdit() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -23,7 +23,7 @@ 
     }
 
 
-	function display(){
+	function display() {
 		$this->bean->email_templates();
 		parent::display();
 	}

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();