adamjakab / SuiteCRM

custom/modules/unified_search_modules_display.php

Indentation +102 added lines, -102 removed lines

@@ -1,140 +1,140 @@
 <?php
 // created: 2014-01-29 09:59:23
 $unified_search_modules_display = array (
-  'AOP_Case_Events' => 
-  array (
+    'AOP_Case_Events' => 
+    array (
     'visible' => false,
-  ),
-  'AOP_Case_Updates' => 
-  array (
+    ),
+    'AOP_Case_Updates' => 
+    array (
     'visible' => false,
-  ),
-  'AOR_Reports' => 
-  array (
+    ),
+    'AOR_Reports' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Contracts' => 
-  array (
+    ),
+    'AOS_Contracts' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Invoices' => 
-  array (
+    ),
+    'AOS_Invoices' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_PDF_Templates' => 
-  array (
+    ),
+    'AOS_PDF_Templates' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Product_Categories' => 
-  array (
+    ),
+    'AOS_Product_Categories' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Products' => 
-  array (
+    ),
+    'AOS_Products' => 
+    array (
     'visible' => false,
-  ),
-  'AOS_Quotes' => 
-  array (
+    ),
+    'AOS_Quotes' => 
+    array (
     'visible' => false,
-  ),
-  'AOW_Processed' => 
-  array (
+    ),
+    'AOW_Processed' => 
+    array (
     'visible' => false,
-  ),
-  'AOW_WorkFlow' => 
-  array (
+    ),
+    'AOW_WorkFlow' => 
+    array (
     'visible' => false,
-  ),
-  'Accounts' => 
-  array (
+    ),
+    'Accounts' => 
+    array (
     'visible' => true,
-  ),
-  'Bugs' => 
-  array (
+    ),
+    'Bugs' => 
+    array (
     'visible' => false,
-  ),
-  'Calls' => 
-  array (
+    ),
+    'Calls' => 
+    array (
     'visible' => true,
-  ),
-  'Calls_Reschedule' => 
-  array (
+    ),
+    'Calls_Reschedule' => 
+    array (
     'visible' => false,
-  ),
-  'Campaigns' => 
-  array (
+    ),
+    'Campaigns' => 
+    array (
     'visible' => false,
-  ),
-  'Cases' => 
-  array (
+    ),
+    'Cases' => 
+    array (
     'visible' => true,
-  ),
-  'Contacts' => 
-  array (
+    ),
+    'Contacts' => 
+    array (
     'visible' => true,
-  ),
-  'Documents' => 
-  array (
+    ),
+    'Documents' => 
+    array (
     'visible' => true,
-  ),
-  'FP_Event_Locations' => 
-  array (
+    ),
+    'FP_Event_Locations' => 
+    array (
     'visible' => false,
-  ),
-  'FP_events' => 
-  array (
+    ),
+    'FP_events' => 
+    array (
     'visible' => false,
-  ),
-  'Leads' => 
-  array (
+    ),
+    'Leads' => 
+    array (
     'visible' => true,
-  ),
-  'Meetings' => 
-  array (
+    ),
+    'Meetings' => 
+    array (
     'visible' => true,
-  ),
-  'Notes' => 
-  array (
+    ),
+    'Notes' => 
+    array (
     'visible' => true,
-  ),
-  'Opportunities' => 
-  array (
+    ),
+    'Opportunities' => 
+    array (
     'visible' => true,
-  ),
-  'Project' => 
-  array (
+    ),
+    'Project' => 
+    array (
     'visible' => false,
-  ),
-  'ProjectTask' => 
-  array (
+    ),
+    'ProjectTask' => 
+    array (
     'visible' => false,
-  ),
-  'ProspectLists' => 
-  array (
+    ),
+    'ProspectLists' => 
+    array (
     'visible' => false,
-  ),
-  'Prospects' => 
-  array (
+    ),
+    'Prospects' => 
+    array (
     'visible' => false,
-  ),
-  'Tasks' => 
-  array (
+    ),
+    'Tasks' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Address_Cache' => 
-  array (
+    ),
+    'jjwg_Address_Cache' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Areas' => 
-  array (
+    ),
+    'jjwg_Areas' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Maps' => 
-  array (
+    ),
+    'jjwg_Maps' => 
+    array (
     'visible' => false,
-  ),
-  'jjwg_Markers' => 
-  array (
+    ),
+    'jjwg_Markers' => 
+    array (
     'visible' => false,
-  ),
+    ),
 );
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -1,140 +1,140 @@
 <?php
 // created: 2014-01-29 09:59:23
-$unified_search_modules_display = array (
+$unified_search_modules_display = array(
   'AOP_Case_Events' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOP_Case_Updates' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOR_Reports' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOS_Contracts' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOS_Invoices' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOS_PDF_Templates' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOS_Product_Categories' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOS_Products' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOS_Quotes' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOW_Processed' => 
-  array (
+  array(
     'visible' => false,
   ),
   'AOW_WorkFlow' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Accounts' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Bugs' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Calls' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Calls_Reschedule' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Campaigns' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Cases' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Contacts' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Documents' => 
-  array (
+  array(
     'visible' => true,
   ),
   'FP_Event_Locations' => 
-  array (
+  array(
     'visible' => false,
   ),
   'FP_events' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Leads' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Meetings' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Notes' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Opportunities' => 
-  array (
+  array(
     'visible' => true,
   ),
   'Project' => 
-  array (
+  array(
     'visible' => false,
   ),
   'ProjectTask' => 
-  array (
+  array(
     'visible' => false,
   ),
   'ProspectLists' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Prospects' => 
-  array (
+  array(
     'visible' => false,
   ),
   'Tasks' => 
-  array (
+  array(
     'visible' => false,
   ),
   'jjwg_Address_Cache' => 
-  array (
+  array(
     'visible' => false,
   ),
   'jjwg_Areas' => 
-  array (
+  array(
     'visible' => false,
   ),
   'jjwg_Maps' => 
-  array (
+  array(
     'visible' => false,
   ),
   'jjwg_Markers' => 
-  array (
+  array(
     'visible' => false,
   ),
 );
\ No newline at end of file

custom/Extension/application/Ext/LogicHooks/AOW_WorkFlow_Hook.php

Spacing +1 added lines, -1 removed lines

@@ -28,4 +28,4 @@
 if (!isset($hook_array['after_save']) || !is_array($hook_array['after_save'])) {
     $hook_array['after_save'] = array();
 }
-$hook_array['after_save'][] = Array(99, 'AOW_Workflow', 'modules/AOW_WorkFlow/AOW_WorkFlow.php','AOW_WorkFlow', 'run_bean_flows');
\ No newline at end of file
+$hook_array['after_save'][] = Array(99, 'AOW_Workflow', 'modules/AOW_WorkFlow/AOW_WorkFlow.php', 'AOW_WorkFlow', 'run_bean_flows');
\ No newline at end of file

include/SugarFields/Parsers/MetaParser.php

Indentation +388 added lines, -388 removed lines

@@ -58,7 +58,7 @@ 
 }
 
 function parse() {
-   return "NOT AVAILABLE";
+    return "NOT AVAILABLE";
 }
 
 /**
@@ -66,14 +66,14 @@ 
  * Parses for contents enclosed within <form>...</form> tags
  */
 function getFormContents($contents, $all = true) {
-   if($all) {
-      preg_match_all("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
-      return $matches;
-   }
+    if($all) {
+        preg_match_all("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
+        return $matches;
+    }
 
-   preg_match("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
-   return $this->convertToTagElement($matches);
-   //return $matches;
+    preg_match("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
+    return $this->convertToTagElement($matches);
+    //return $matches;
 }
 
 
@@ -84,12 +84,12 @@ 
  * @return $matches Array of matches of PREG_SET_ORDER
  */
 function getFormElements($contents) {
-   preg_match_all("'(<[ ]*?)(textarea|input|select)([^>]*?)(>)'si", $contents, $matches, PREG_PATTERN_ORDER);
-   $elems = array();
-   foreach($matches[3] as $match) {
-   	  $elems[] = $match;
-   }
-   return $elems;
+    preg_match_all("'(<[ ]*?)(textarea|input|select)([^>]*?)(>)'si", $contents, $matches, PREG_PATTERN_ORDER);
+    $elems = array();
+    foreach($matches[3] as $match) {
+            $elems[] = $match;
+    }
+    return $elems;
 }
 
 
@@ -100,8 +100,8 @@ 
  * @return $matches Array of name/value pairs
  */
 function getFormElementsNames($contents) {
-   preg_match_all("'(<[ ]*?)(textarea|input|select)[^>]*?name=[\'\"]([^\'\"]*?)(\[\])?(_basic)?[\'\"]([^>]*?>)'si", $contents, $matches, PREG_PATTERN_ORDER);
-   return !empty($matches[3]) ? $matches[3] : null;
+    preg_match_all("'(<[ ]*?)(textarea|input|select)[^>]*?name=[\'\"]([^\'\"]*?)(\[\])?(_basic)?[\'\"]([^>]*?>)'si", $contents, $matches, PREG_PATTERN_ORDER);
+    return !empty($matches[3]) ? $matches[3] : null;
 }
 
 
@@ -114,21 +114,21 @@ 
  * @return Array of name/value for matching attribute
  */
 function getTagAttribute($name, $contents, $filter = '') {
-   //$exp = "'".$name."[ ]*?=[ ]*?[\'\"]([a-zA-Z0-9\_\[\]]*)[\'\"]'si";
+    //$exp = "'".$name."[ ]*?=[ ]*?[\'\"]([a-zA-Z0-9\_\[\]]*)[\'\"]'si";
 
-   $exp = "'".$name."[\s]*?=[\s]*?[\'\"]([^\'^\"]*?)[\'\"]'si";
-   preg_match_all($exp, $contents, $matches, PREG_SET_ORDER);
-   if(empty($filter)) {
-   	  return !empty($matches[0][1]) ? $matches[0][1] : '';
-   }
+    $exp = "'".$name."[\s]*?=[\s]*?[\'\"]([^\'^\"]*?)[\'\"]'si";
+    preg_match_all($exp, $contents, $matches, PREG_SET_ORDER);
+    if(empty($filter)) {
+            return !empty($matches[0][1]) ? $matches[0][1] : '';
+    }
 
-   $filtered = array();
-   foreach($matches as $tag) {
-   	  if(preg_match($filter, $tag[1])) {
-   	  	 $filtered[] = $tag;
-   	  }
-   }
-   return $filtered;
+    $filtered = array();
+    foreach($matches as $tag) {
+            if(preg_match($filter, $tag[1])) {
+                $filtered[] = $tag;
+            }
+    }
+    return $filtered;
 }
 
 /**
@@ -140,18 +140,18 @@ 
  * @return Array of table elements found
  */
 function getTables($tableClass = null, $contents) {
-   preg_match_all("'(<table[^>]*?>)(.*?)(</table[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
-   if($tableClass == null) {
-   	  return $matches;
-   }
+    preg_match_all("'(<table[^>]*?>)(.*?)(</table[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
+    if($tableClass == null) {
+            return $matches;
+    }
 
-   $tables = array();
-   foreach($matches as $key => $table) {
-   	  if(strpos($table[1], $tableClass) > 0) {
-   	  	 $tables[] = $table;
-   	  }
-   }
-   return $this->convertToTagElement($tables);
+    $tables = array();
+    foreach($matches as $key => $table) {
+            if(strpos($table[1], $tableClass) > 0) {
+                $tables[] = $table;
+            }
+    }
+    return $this->convertToTagElement($tables);
 }
 
 /**
@@ -167,40 +167,40 @@ 
  * @return a tag element format Array
  */
 function getElementsByType($type, $contents) {
-   $x = strlen($contents);
-   $mark = 0;
-   $count = 0;
-   $stag1 = "<" . trim($type, " <>") . '>';
-   $stag2 = "<" . trim($type, " <>") . ' ';
-   $etag = "</".$type.">";
-   $sincrement = strlen($stag1);
-   $eincrement = strlen($etag);
-   $sarr = array();
-   $values = array();
-
-   while($count < $x) {
-   	     $stok = substr($contents, $count, $sincrement);
-   	     $etok = substr($contents, $count, $eincrement);
-   	     if($stok == $stag1 || $stok == $stag2) {
-   	     	//Reset mark;
-   	        if(count($sarr) == 0) {
-   	           $mark = $count;
-   	        }
+    $x = strlen($contents);
+    $mark = 0;
+    $count = 0;
+    $stag1 = "<" . trim($type, " <>") . '>';
+    $stag2 = "<" . trim($type, " <>") . ' ';
+    $etag = "</".$type.">";
+    $sincrement = strlen($stag1);
+    $eincrement = strlen($etag);
+    $sarr = array();
+    $values = array();
+
+    while($count < $x) {
+            $stok = substr($contents, $count, $sincrement);
+            $etok = substr($contents, $count, $eincrement);
+            if($stok == $stag1 || $stok == $stag2) {
+                //Reset mark;
+                if(count($sarr) == 0) {
+                    $mark = $count;
+                }
             $sarr[] = $count;
 
-   	     } else if($etok == $etag) {
-   	        array_shift($sarr);
-   	        if(count($sarr) == 0) {
-   	           $val = substr($contents, $mark, ($count - $mark) + $eincrement);
-   	           $values[] = $val;
-   	           $mark = $count;
-   	        }
-   	     }
-   	     $count++;
-   }
+            } else if($etok == $etag) {
+                array_shift($sarr);
+                if(count($sarr) == 0) {
+                    $val = substr($contents, $mark, ($count - $mark) + $eincrement);
+                    $values[] = $val;
+                    $mark = $count;
+                }
+            }
+            $count++;
+    }
 
-   $count = 0;
-   return $values;
+    $count = 0;
+    return $values;
 }
 
 
@@ -210,14 +210,14 @@ 
  *
  */
 function getElementValue($type, $contents, $filter = "(.*?)") {
-   $exp = "'<".$type."[^>]*?>".$filter."</".$type."[^>]*?>'si";
-   preg_match($exp, $contents, $matches);
-   return isset($matches[1]) ? $matches[1] : '';
+    $exp = "'<".$type."[^>]*?>".$filter."</".$type."[^>]*?>'si";
+    preg_match($exp, $contents, $matches);
+    return isset($matches[1]) ? $matches[1] : '';
 }
 
 
 function stripComments($contents) {
-   return preg_replace("'(<!--.*?-->)'si", "", $contents);
+    return preg_replace("'(<!--.*?-->)'si", "", $contents);
 }
 
 /**
@@ -229,14 +229,14 @@ 
  * @param $result The file contents with non-matching flavor tags and their nested comments removed
  */
 function stripFlavorTags($contents) {
-   $flavor = isset($GLOBALS['sugar_flavor']) ? $GLOBALS['sugar_flavor'] : 'PRO';
-   $isPro = ($flavor == 'ENT' || $flavor == 'PRO') ? true : false;
-   if($isPro) {
-   	 $contents = preg_replace('/<!-- BEGIN: open_source -->.*?<!-- END: open_source -->/', '', $contents);
-   } else {
-   	 $contents = preg_replace('/<!-- BEGIN: pro -->.*?<!-- END: pro -->/', '', $contents);
-   }
-   return $contents;
+    $flavor = isset($GLOBALS['sugar_flavor']) ? $GLOBALS['sugar_flavor'] : 'PRO';
+    $isPro = ($flavor == 'ENT' || $flavor == 'PRO') ? true : false;
+    if($isPro) {
+        $contents = preg_replace('/<!-- BEGIN: open_source -->.*?<!-- END: open_source -->/', '', $contents);
+    } else {
+        $contents = preg_replace('/<!-- BEGIN: pro -->.*?<!-- END: pro -->/', '', $contents);
+    }
+    return $contents;
 }
 
 /**
@@ -247,34 +247,34 @@ 
  * @return The maximum column count
  */
 function getMaxColumns($contents, $filter) {
-   preg_match_all("'(<tr[^>]*?>)(.*?)(</tr[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
-   $max = 0;
-   foreach($matches as $tableRows) {
-           $count = substr_count($tableRows[2], $filter);
-           if($count > $max) {
-           	  $max = $count;
-           }
-   }
+    preg_match_all("'(<tr[^>]*?>)(.*?)(</tr[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
+    $max = 0;
+    foreach($matches as $tableRows) {
+            $count = substr_count($tableRows[2], $filter);
+            if($count > $max) {
+                    $max = $count;
+            }
+    }
 
-   return $max;
+    return $max;
 }
 
 function convertToTagElement($matches) {
 
-   $elements = array();
+    $elements = array();
 
-   foreach($matches as $data) {
-   	   // We need 4 because the 1,2,3 indexes make up start,body,end
-	   if(count($data) == 4) {
-	   	  $element = array();
-	   	  $element['start'] = $data[1];
-	   	  $element['body'] = $data[2];
-	   	  $element['end'] = $data[3];
-	   	  $elements[] = $element;
-	   }
-   }
+    foreach($matches as $data) {
+            // We need 4 because the 1,2,3 indexes make up start,body,end
+        if(count($data) == 4) {
+                $element = array();
+                $element['start'] = $data[1];
+                $element['body'] = $data[2];
+                $element['end'] = $data[3];
+                $elements[] = $element;
+        }
+    }
 
-   return empty($elements) ? $matches : $elements;
+    return empty($elements) ? $matches : $elements;
 }
 
 /*
@@ -282,10 +282,10 @@ 
  * This function removes the \r (return), \n (newline) and \t (tab) markup from string
  */
 function trimHTML($contents) {
-   $contents = str_replace(array("\r"), array(""), $contents);
-   $contents = str_replace(array("\n"), array(""), $contents);
-   $contents = str_replace(array("\t"), array(""), $contents);
-   return $contents;
+    $contents = str_replace(array("\r"), array(""), $contents);
+    $contents = str_replace(array("\n"), array(""), $contents);
+    $contents = str_replace(array("\t"), array(""), $contents);
+    return $contents;
 }
 
 
@@ -307,11 +307,11 @@ 
 //Check if there are Javascript blocks of code to process
 preg_match_all("'(<script[^>]*?>)(.*?)(</script[^>]*?>)'si", $contents, $matches, PREG_PATTERN_ORDER);
 if(empty($matches)) {
-   return $javascript;
+    return $javascript;
 }
 
 foreach($matches[0] as $scriptBlock) {
-	    $javascript .= "\n" . $scriptBlock;
+        $javascript .= "\n" . $scriptBlock;
 } //foreach
 
 $javascript = substr($javascript, 1);
@@ -323,19 +323,19 @@ 
 //Find all blocks that may need to be replaced with Smarty syntax
 preg_match_all("'([\{])([a-zA-Z0-9_]*?)([\}])'si", $javascript, $matches, PREG_PATTERN_ORDER);
 if(!empty($matches)) {
-	$replace = array();
+    $replace = array();
 
-	foreach($matches[0] as $xTemplateCode) {
-		    if(!isset($replace[$xTemplateCode])) {
-		       $replace[$xTemplateCode] = str_replace("{", "{\$", $xTemplateCode);
-		    } //if
-	} //foreach
+    foreach($matches[0] as $xTemplateCode) {
+            if(!isset($replace[$xTemplateCode])) {
+                $replace[$xTemplateCode] = str_replace("{", "{\$", $xTemplateCode);
+            } //if
+    } //foreach
 
-	$javascript = str_replace(array_keys($replace), array_values($replace), $javascript);
+    $javascript = str_replace(array_keys($replace), array_values($replace), $javascript);
 } //if
 
 if(!$addLiterals) {
-   return $javascript;
+    return $javascript;
 }
 
 return $this->parseDelimiters($javascript);
@@ -343,44 +343,44 @@ 
 }
 
 static function parseDelimiters($javascript) {
-	$newJavascript = '';
-	$scriptLength = strlen($javascript);
-	$count = 0;
-	$inSmartyVariable = false;
-
-	while($count < $scriptLength) {
-
-	      if($inSmartyVariable) {
-	      	 $start = $count;
-	      	 $numOfChars = 1;
-	      	 while(isset($javascript[$count]) && $javascript[$count] != '}') {
-	      	 	   $count++;
-	      	 	   $numOfChars++;
-	      	 }
-
-	      	 $newJavascript .= substr($javascript, $start, $numOfChars);
-	      	 $inSmartyVariable = false;
-
-	      } else {
-
-			  $char = $javascript[$count];
-			  $nextChar = ($count + 1 >= $scriptLength) ? '' : $javascript[$count + 1];
-
-			  if($char == "{" && $nextChar == "$") {
-			  	 $inSmartyVariable = true;
-			  	 $newJavascript .= $javascript[$count];
-			  } else if($char == "{") {
-			  	 $newJavascript .=  " {ldelim} ";
-			  } else if($char == "}") {
-			  	 $newJavascript .= " {rdelim} ";
-			  } else {
-			     $newJavascript .= $javascript[$count];
-			  }
-	      }
-		  $count++;
-	} //while
-
-	return $newJavascript;
+    $newJavascript = '';
+    $scriptLength = strlen($javascript);
+    $count = 0;
+    $inSmartyVariable = false;
+
+    while($count < $scriptLength) {
+
+            if($inSmartyVariable) {
+                $start = $count;
+                $numOfChars = 1;
+                while(isset($javascript[$count]) && $javascript[$count] != '}') {
+                        $count++;
+                        $numOfChars++;
+                }
+
+                $newJavascript .= substr($javascript, $start, $numOfChars);
+                $inSmartyVariable = false;
+
+            } else {
+
+                $char = $javascript[$count];
+                $nextChar = ($count + 1 >= $scriptLength) ? '' : $javascript[$count + 1];
+
+                if($char == "{" && $nextChar == "$") {
+                    $inSmartyVariable = true;
+                    $newJavascript .= $javascript[$count];
+                } else if($char == "{") {
+                    $newJavascript .=  " {ldelim} ";
+                } else if($char == "}") {
+                    $newJavascript .= " {rdelim} ";
+                } else {
+                    $newJavascript .= $javascript[$count];
+                }
+            }
+            $count++;
+    } //while
+
+    return $newJavascript;
 }
 
 /**
@@ -397,43 +397,43 @@ 
  */
 function findAssignedVariableName($name, $filePath) {
 
-	if($this->mPHPFile == "INVALID") {
-	   return $name;
-	}
-
-	if(!isset($this->mPHPFile)) {
-	   if(preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
-	   	 $dir = $matches[1];
-	   } else if(preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
-	   	 $dir = $matches[1];
-	   }
-
-	   if(!isset($dir) || !is_dir($dir)) {
-	      $this->mPHPFile = "INVALID";
-	      return $name;
-	   }
-
-       $filesInDir = $this->dirList($dir);
-       $phpFile = $matches[2].'.*?[\.]php';
-       foreach($filesInDir as $file) {
-       	  if(preg_match("/$phpFile/", $file)) {
-       	  	 $this->mPHPFile = $matches[1] . $file;
-       	  	 break;
-       	  }
-       }
-
-       if(!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
-       	  $this->mPHPFile = "INVALID";
-       	  return $name;
-       }
-	}
-
-	$phpContents = file_get_contents($this->mPHPFile);
-	$uname = strtoupper($name);
-	if(preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
-	   return $matches[1];
-	}
-	return $name;
+    if($this->mPHPFile == "INVALID") {
+        return $name;
+    }
+
+    if(!isset($this->mPHPFile)) {
+        if(preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
+            $dir = $matches[1];
+        } else if(preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
+            $dir = $matches[1];
+        }
+
+        if(!isset($dir) || !is_dir($dir)) {
+            $this->mPHPFile = "INVALID";
+            return $name;
+        }
+
+        $filesInDir = $this->dirList($dir);
+        $phpFile = $matches[2].'.*?[\.]php';
+        foreach($filesInDir as $file) {
+                if(preg_match("/$phpFile/", $file)) {
+                    $this->mPHPFile = $matches[1] . $file;
+                    break;
+                }
+        }
+
+        if(!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
+                $this->mPHPFile = "INVALID";
+                return $name;
+        }
+    }
+
+    $phpContents = file_get_contents($this->mPHPFile);
+    $uname = strtoupper($name);
+    if(preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
+        return $matches[1];
+    }
+    return $name;
 }
 
 
@@ -476,65 +476,65 @@ 
  */
 function getCustomField($elementNames) {
 
-   if(!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
-   	  return null;
-   }
+    if(!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
+            return null;
+    }
 
-   if(is_string($elementNames)) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
-   	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
-   	  }
-   	  return null;
-   }
+    if(is_string($elementNames)) {
+            if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
+                return count($matches) == 1 ? $matches[0] : $matches[1];
+            }
+            return null;
+    }
 
-   foreach($elementNames as $name) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
-   	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
-   	  }
-   }
+    foreach($elementNames as $name) {
+            if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
+                return count($matches) == 1 ? $matches[0] : $matches[1];
+            }
+    }
 
-   return null;
+    return null;
 }
 
 function applyPreRules($moduleDir, $panels) {
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
-	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
-	  $class = $moduleDir."ParseRule";
-	  $parseRule = new $class();
-	  $panels = $parseRule->preParse($panels, $this->mView);
-   }
-   return $panels;
+    if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+        require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
+        $class = $moduleDir."ParseRule";
+        $parseRule = new $class();
+        $panels = $parseRule->preParse($panels, $this->mView);
+    }
+    return $panels;
 }
 
 function applyRules($moduleDir, $panels) {
-   return $this->applyPostRules($moduleDir, $panels);
+    return $this->applyPostRules($moduleDir, $panels);
 }
 
 function applyPostRules($moduleDir, $panels) {
-   //Run module specific rules
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
-	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
-	  $class = $moduleDir."ParseRule";
-	  $parseRule = new $class();
-	  $panels = $parseRule->parsePanels($panels, $this->mView);
-   }
+    //Run module specific rules
+    if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+        require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
+        $class = $moduleDir."ParseRule";
+        $parseRule = new $class();
+        $panels = $parseRule->parsePanels($panels, $this->mView);
+    }
 
-   //Now run defined rules
-   require_once("include/SugarFields/Parsers/Rules/ParseRules.php");
-   $rules = ParseRules::getRules();
+    //Now run defined rules
+    require_once("include/SugarFields/Parsers/Rules/ParseRules.php");
+    $rules = ParseRules::getRules();
 
-   foreach($rules as $rule) {
-   	  if(!file_exists($rule['file'])) {
-   	  	 $GLOBALS['log']->error("Cannot run rule for " . $rule['file']);
-   	  	 continue;
-   	  } //if
-   	  require_once($rule['file']);
-   	  $runRule = new $rule['class'];
-   	  $panels = $runRule->parsePanels($panels, $this->mView);
+    foreach($rules as $rule) {
+            if(!file_exists($rule['file'])) {
+                $GLOBALS['log']->error("Cannot run rule for " . $rule['file']);
+                continue;
+            } //if
+            require_once($rule['file']);
+            $runRule = new $rule['class'];
+            $panels = $runRule->parsePanels($panels, $this->mView);
 
-   } //foreach
+    } //foreach
 
-   return $panels;
+    return $panels;
 }
 
 function createFileContents($moduleDir, $panels, $templateMeta=array(), $htmlFilePath) {
@@ -574,11 +574,11 @@ 
 );
 ?>";
 
-   $metadata = '';
-   $body = var_export($panels, true);
-   $metadata = $header . $body . $footer;
-   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/',"",$metadata);
-   return $metadata;
+    $metadata = '';
+    $body = var_export($panels, true);
+    $metadata = $header . $body . $footer;
+    $metadata = preg_replace('/(\d+)[\s]=>[\s]?/',"",$metadata);
+    return $metadata;
 
 }
 
@@ -592,88 +592,88 @@ 
  * @return Array of merged $panel definition
  */
 function mergePanels($panels, $vardefs, $moduleDir, $masterCopy) {
-   require($masterCopy);
-   $masterpanels = $viewdefs[$moduleDir][$this->mView]['panels'];
-   $hasMultiplePanels = $this->hasMultiplePanels($masterpanels);
+    require($masterCopy);
+    $masterpanels = $viewdefs[$moduleDir][$this->mView]['panels'];
+    $hasMultiplePanels = $this->hasMultiplePanels($masterpanels);
 
-   if(!$hasMultiplePanels) {
-   	    $keys = array_keys($viewdefs[$moduleDir][$this->mView]['panels']);
+    if(!$hasMultiplePanels) {
+            $keys = array_keys($viewdefs[$moduleDir][$this->mView]['panels']);
         if(!empty($keys) && count($keys) == 1) {
-        	if(strtolower($keys[0]) == 'default') {
-        	   $masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels'][$keys[0]]);
-        	} else {
-        	   $firstPanel = array_values($viewdefs[$moduleDir][$this->mView]['panels']);
-	           $masterpanels = array('default'=> $firstPanel[0]);
-        	}
+            if(strtolower($keys[0]) == 'default') {
+                $masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels'][$keys[0]]);
+            } else {
+                $firstPanel = array_values($viewdefs[$moduleDir][$this->mView]['panels']);
+                $masterpanels = array('default'=> $firstPanel[0]);
+            }
         } else {
-        	$masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels']);
+            $masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels']);
         }
-   }
-   foreach($masterpanels as $name=>$masterpanel) {
-   	       if(isset($panels[$name])) {
-	   	       	  // Get all the names in the panel
-	   	       	  $existingElements = array();
-	   	       	  $existingLocation = array();
-
-	   	       	  foreach($panels[$name] as $rowKey=>$row) {
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && !empty($column['name'])) {
-	   	       	  	 	   $existingElements[$column['name']] = $column['name'];
-	   	       	  	 	   $existingLocation[$column['name']] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
-	   	       	  	 	   $existingElements[$column] = $column;
-	   	       	  	 	   $existingLocation[$column] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
-	   	       	  	 	}
-	   	       	  	 } //foreach
-	   	       	  } //foreach
-
-	   	       	  // Now check against the $masterCopy
-	   	       	  foreach($masterpanel as $rowKey=>$row) {
-
-	   	       	  	 $addRow = array();
-
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && isset($column['name'])) {
-	   	       	  	 	   $id = $column['name'];
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
-	   	       	  	 	   $id = $column;
-	   	       	  	 	} else {
-	   	       	  	 	   continue;
-	   	       	  	 	}
-	   	       	  	 	if(empty($existingElements[$id])) {
-	   	       	  	 	   //Only add if
-	   	       	  	 	   // 1) if it is a required field (as defined in metadata)
-	   	       	  	 	   // 2) or if it has a customLabel and customCode (a very deep customization)
-	   	       	  	 	   if((is_array($column) && !empty($column['displayParams']['required'])) ||
-	   	       	  	 	      (is_array($column) && !empty($column['customCode']) && !empty($column['customLabel']))) {
-	   	       	  	 	   	  $addRow[] = $column;
-	   	       	  	 	   }
-	   	       	  	 	} else {
-	   	       	  	 	   //Use definition from master copy instead
-	   	       	  	 	   $panels[$existingLocation[$id]['panel']][$existingLocation[$id]['row']][$existingLocation[$id]['col']] = $column;
-	   	       	  	 	}
-	   	       	  	 } //foreach
-
-	   	       	  	 // Add it to the $panels
-	   	       	  	 if(!empty($addRow)) {
-	   	       	  	 	$panels[$name][] = $addRow;
-	   	       	  	 }
-	   	       	  } //foreach
-
-   	       } else {
-	   	       	  $panels[$name] = $masterpanel;
-   	       }
-   } //foreach
-
-   // We're not done yet... go through the $panels Array now and try to remove duplicate
-   // or empty panels
-   foreach($panels as $name=>$panel) {
-   	   if(count($panel) == 0 || !isset($masterpanels[$name])) {
-   	   	  unset($panels[$name]);
-   	   }
-   } //foreach
-
-   return $panels;
+    }
+    foreach($masterpanels as $name=>$masterpanel) {
+                if(isset($panels[$name])) {
+                        // Get all the names in the panel
+                        $existingElements = array();
+                        $existingLocation = array();
+
+                        foreach($panels[$name] as $rowKey=>$row) {
+                                foreach($row as $colKey=>$column) {
+                                    if(is_array($column) && !empty($column['name'])) {
+                                    $existingElements[$column['name']] = $column['name'];
+                                    $existingLocation[$column['name']] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
+                                    } else if(!is_array($column) && !empty($column)) {
+                                    $existingElements[$column] = $column;
+                                    $existingLocation[$column] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
+                                    }
+                                } //foreach
+                        } //foreach
+
+                        // Now check against the $masterCopy
+                        foreach($masterpanel as $rowKey=>$row) {
+
+                                $addRow = array();
+
+                                foreach($row as $colKey=>$column) {
+                                    if(is_array($column) && isset($column['name'])) {
+                                    $id = $column['name'];
+                                    } else if(!is_array($column) && !empty($column)) {
+                                    $id = $column;
+                                    } else {
+                                    continue;
+                                    }
+                                    if(empty($existingElements[$id])) {
+                                    //Only add if
+                                    // 1) if it is a required field (as defined in metadata)
+                                    // 2) or if it has a customLabel and customCode (a very deep customization)
+                                    if((is_array($column) && !empty($column['displayParams']['required'])) ||
+                                       (is_array($column) && !empty($column['customCode']) && !empty($column['customLabel']))) {
+                                            $addRow[] = $column;
+                                    }
+                                    } else {
+                                    //Use definition from master copy instead
+                                    $panels[$existingLocation[$id]['panel']][$existingLocation[$id]['row']][$existingLocation[$id]['col']] = $column;
+                                    }
+                                } //foreach
+
+                                // Add it to the $panels
+                                if(!empty($addRow)) {
+                                    $panels[$name][] = $addRow;
+                                }
+                        } //foreach
+
+                } else {
+                        $panels[$name] = $masterpanel;
+                }
+    } //foreach
+
+    // We're not done yet... go through the $panels Array now and try to remove duplicate
+    // or empty panels
+    foreach($panels as $name=>$panel) {
+            if(count($panel) == 0 || !isset($masterpanels[$name])) {
+                unset($panels[$name]);
+            }
+    } //foreach
+
+    return $panels;
 }
 
 /**
@@ -685,70 +685,70 @@ 
  * @return Array of merged $templateMeta definition
  */
 function mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy) {
-   require($masterCopy);
-   $masterTemplateMeta = $viewdefs[$moduleDir][$this->mView]['templateMeta'];
+    require($masterCopy);
+    $masterTemplateMeta = $viewdefs[$moduleDir][$this->mView]['templateMeta'];
 
-   if(isset($masterTemplateMeta['javascript'])) {
-   	  //Insert the getJSPath code back into src value
-   	  $masterTemplateMeta['javascript'] = preg_replace('/src\s*=\s*[\'\"].*?(modules\/|include\/)([^\.]*?\.js)([^\'\"]*?)[\'\"]/i', 'src="@sq . getJSPath(@sq${1}${2}@sq) . @sq"', $masterTemplateMeta['javascript']);
-   }
+    if(isset($masterTemplateMeta['javascript'])) {
+            //Insert the getJSPath code back into src value
+            $masterTemplateMeta['javascript'] = preg_replace('/src\s*=\s*[\'\"].*?(modules\/|include\/)([^\.]*?\.js)([^\'\"]*?)[\'\"]/i', 'src="@sq . getJSPath(@sq${1}${2}@sq) . @sq"', $masterTemplateMeta['javascript']);
+    }
 
-   return $masterTemplateMeta;
+    return $masterTemplateMeta;
 }
 
 function hasRequiredSpanLabel($html) {
-   if(empty($html)) {
-   	  return false;
-   }
+    if(empty($html)) {
+            return false;
+    }
 
-   return preg_match('/\<(div|span) class=(\")?required(\")?\s?>\*<\/(div|span)>/si', $html);
+    return preg_match('/\<(div|span) class=(\")?required(\")?\s?>\*<\/(div|span)>/si', $html);
 }
 
 function hasMultiplePanels($panels) {
 
-   if(!isset($panels) || empty($panels) || !is_array($panels)) {
-   	  return false;
-   }
+    if(!isset($panels) || empty($panels) || !is_array($panels)) {
+            return false;
+    }
 
-   if(is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
-   	  return false;
-   }
+    if(is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
+            return false;
+    }
 
-   foreach($panels as $panel) {
-   	  if(!empty($panel) && !is_array($panel)) {
-   	  	 return false;
-   	  } else {
-   	  	 foreach($panel as $row) {
-   	  	    if(!empty($row) && !is_array($row)) {
-   	  	       return false;
-   	  	    } //if
-   	  	 } //foreach
-   	  } //if-else
-   } //foreach
+    foreach($panels as $panel) {
+            if(!empty($panel) && !is_array($panel)) {
+                return false;
+            } else {
+                foreach($panel as $row) {
+                    if(!empty($row) && !is_array($row)) {
+                    return false;
+                    } //if
+                } //foreach
+            } //if-else
+    } //foreach
 
-   return true;
+    return true;
 }
 
 function getRelateFieldName($mixed='') {
-   if(!is_array($mixed)) {
-   	  return '';
-   } else if(count($mixed) == 2){
-      $id = '';
-   	  $name = '';
-   	  foreach($mixed as $el) {
-   	  	 if(preg_match('/_id$/', $el)) {
-   	  	    $id = $el;
-   	  	 } else if(preg_match('/_name$/', $el)) {
-   	  	    $name = $el;
-   	  	 }
-   	  }
-   	  return (!empty($id) && !empty($name)) ? $name : '';
-   }
-   return '';
+    if(!is_array($mixed)) {
+            return '';
+    } else if(count($mixed) == 2){
+        $id = '';
+            $name = '';
+            foreach($mixed as $el) {
+                if(preg_match('/_id$/', $el)) {
+                    $id = $el;
+                } else if(preg_match('/_name$/', $el)) {
+                    $name = $el;
+                }
+            }
+            return (!empty($id) && !empty($name)) ? $name : '';
+    }
+    return '';
 }
 
 function getCustomPanels() {
-   return $this->mCustomPanels;
+    return $this->mCustomPanels;
 }
 
 /**
@@ -759,10 +759,10 @@ 
  *
  */
 function fixTablesWithMissingTr($tableContents) {
-   if(preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
-   	  return preg_replace('/(<table[^>]*?[\/]?>\s*?<td)/i', '<table><tr><td', $tableContents);
-   }
-   return $tableContents;
+    if(preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+            return preg_replace('/(<table[^>]*?[\/]?>\s*?<td)/i', '<table><tr><td', $tableContents);
+    }
+    return $tableContents;
 }
 
 /**
@@ -770,10 +770,10 @@ 
  * This is a very crude function to fix instances where files have an </tr> tag immediately followed by a <td> tag
  */
 function fixRowsWithMissingTr($tableContents) {
-   if(preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
-   	  return preg_replace('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', '</tr><tr><td', $tableContents);
-   }
-   return $tableContents;
+    if(preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+            return preg_replace('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', '</tr><tr><td', $tableContents);
+    }
+    return $tableContents;
 }
 
 /**
@@ -781,10 +781,10 @@ 
  * This is a very crude function to fix instances where files have two consecutive <tr> tags
  */
 function fixDuplicateTrTags($tableContents) {
-   if(preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
-   	  return preg_replace('/(<tr[^>]*?[\/]?>\s*?<tr)/i', '<tr', $tableContents);
-   }
-   return $tableContents;
+    if(preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
+            return preg_replace('/(<tr[^>]*?[\/]?>\s*?<tr)/i', '<tr', $tableContents);
+    }
+    return $tableContents;
 }
 
 /**
@@ -793,18 +793,18 @@ 
  * return that vardef name
  */
 function findSingleVardefElement($formElements=array(), $vardefs=array()) {
-   if(empty($formElements) || !is_array($formElements)) {
-   	  return '';
-   }
-
-   $found = array();
-   foreach($formElements as $el) {
-   	   if(isset($vardefs[$el])) {
-   	   	  $found[] = $el;
-   	   }
-   }
-
-   return count($found) == 1 ? $found[0] : '';
+    if(empty($formElements) || !is_array($formElements)) {
+            return '';
+    }
+
+    $found = array();
+    foreach($formElements as $el) {
+            if(isset($vardefs[$el])) {
+                $found[] = $el;
+            }
+    }
+
+    return count($found) == 1 ? $found[0] : '';
 }
 
 

Spacing +102 added lines, -102 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.
@@ -60,9 +60,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 MetaParser(){
+    function MetaParser() {
         $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 {
@@ -81,7 +81,7 @@ 
  * Parses for contents enclosed within <form>...</form> tags
  */
 function getFormContents($contents, $all = true) {
-   if($all) {
+   if ($all) {
       preg_match_all("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
       return $matches;
    }
@@ -101,7 +101,7 @@ 
 function getFormElements($contents) {
    preg_match_all("'(<[ ]*?)(textarea|input|select)([^>]*?)(>)'si", $contents, $matches, PREG_PATTERN_ORDER);
    $elems = array();
-   foreach($matches[3] as $match) {
+   foreach ($matches[3] as $match) {
    	  $elems[] = $match;
    }
    return $elems;
@@ -133,13 +133,13 @@ 
 
    $exp = "'".$name."[\s]*?=[\s]*?[\'\"]([^\'^\"]*?)[\'\"]'si";
    preg_match_all($exp, $contents, $matches, PREG_SET_ORDER);
-   if(empty($filter)) {
+   if (empty($filter)) {
    	  return !empty($matches[0][1]) ? $matches[0][1] : '';
    }
 
    $filtered = array();
-   foreach($matches as $tag) {
-   	  if(preg_match($filter, $tag[1])) {
+   foreach ($matches as $tag) {
+   	  if (preg_match($filter, $tag[1])) {
    	  	 $filtered[] = $tag;
    	  }
    }
@@ -156,13 +156,13 @@ 
  */
 function getTables($tableClass = null, $contents) {
    preg_match_all("'(<table[^>]*?>)(.*?)(</table[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
-   if($tableClass == null) {
+   if ($tableClass == null) {
    	  return $matches;
    }
 
    $tables = array();
-   foreach($matches as $key => $table) {
-   	  if(strpos($table[1], $tableClass) > 0) {
+   foreach ($matches as $key => $table) {
+   	  if (strpos($table[1], $tableClass) > 0) {
    	  	 $tables[] = $table;
    	  }
    }
@@ -185,27 +185,27 @@ 
    $x = strlen($contents);
    $mark = 0;
    $count = 0;
-   $stag1 = "<" . trim($type, " <>") . '>';
-   $stag2 = "<" . trim($type, " <>") . ' ';
+   $stag1 = "<".trim($type, " <>").'>';
+   $stag2 = "<".trim($type, " <>").' ';
    $etag = "</".$type.">";
    $sincrement = strlen($stag1);
    $eincrement = strlen($etag);
    $sarr = array();
    $values = array();
 
-   while($count < $x) {
+   while ($count < $x) {
    	     $stok = substr($contents, $count, $sincrement);
    	     $etok = substr($contents, $count, $eincrement);
-   	     if($stok == $stag1 || $stok == $stag2) {
+   	     if ($stok == $stag1 || $stok == $stag2) {
    	     	//Reset mark;
-   	        if(count($sarr) == 0) {
+   	        if (count($sarr) == 0) {
    	           $mark = $count;
    	        }
             $sarr[] = $count;
 
-   	     } else if($etok == $etag) {
+   	     } else if ($etok == $etag) {
    	        array_shift($sarr);
-   	        if(count($sarr) == 0) {
+   	        if (count($sarr) == 0) {
    	           $val = substr($contents, $mark, ($count - $mark) + $eincrement);
    	           $values[] = $val;
    	           $mark = $count;
@@ -246,7 +246,7 @@ 
 function stripFlavorTags($contents) {
    $flavor = isset($GLOBALS['sugar_flavor']) ? $GLOBALS['sugar_flavor'] : 'PRO';
    $isPro = ($flavor == 'ENT' || $flavor == 'PRO') ? true : false;
-   if($isPro) {
+   if ($isPro) {
    	 $contents = preg_replace('/<!-- BEGIN: open_source -->.*?<!-- END: open_source -->/', '', $contents);
    } else {
    	 $contents = preg_replace('/<!-- BEGIN: pro -->.*?<!-- END: pro -->/', '', $contents);
@@ -264,9 +264,9 @@ 
 function getMaxColumns($contents, $filter) {
    preg_match_all("'(<tr[^>]*?>)(.*?)(</tr[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
    $max = 0;
-   foreach($matches as $tableRows) {
+   foreach ($matches as $tableRows) {
            $count = substr_count($tableRows[2], $filter);
-           if($count > $max) {
+           if ($count > $max) {
            	  $max = $count;
            }
    }
@@ -278,9 +278,9 @@ 
 
    $elements = array();
 
-   foreach($matches as $data) {
+   foreach ($matches as $data) {
    	   // We need 4 because the 1,2,3 indexes make up start,body,end
-	   if(count($data) == 4) {
+	   if (count($data) == 4) {
 	   	  $element = array();
 	   	  $element['start'] = $data[1];
 	   	  $element['body'] = $data[2];
@@ -321,12 +321,12 @@ 
 
 //Check if there are Javascript blocks of code to process
 preg_match_all("'(<script[^>]*?>)(.*?)(</script[^>]*?>)'si", $contents, $matches, PREG_PATTERN_ORDER);
-if(empty($matches)) {
+if (empty($matches)) {
    return $javascript;
 }
 
-foreach($matches[0] as $scriptBlock) {
-	    $javascript .= "\n" . $scriptBlock;
+foreach ($matches[0] as $scriptBlock) {
+	    $javascript .= "\n".$scriptBlock;
 } //foreach
 
 $javascript = substr($javascript, 1);
@@ -337,11 +337,11 @@ 
 
 //Find all blocks that may need to be replaced with Smarty syntax
 preg_match_all("'([\{])([a-zA-Z0-9_]*?)([\}])'si", $javascript, $matches, PREG_PATTERN_ORDER);
-if(!empty($matches)) {
+if (!empty($matches)) {
 	$replace = array();
 
-	foreach($matches[0] as $xTemplateCode) {
-		    if(!isset($replace[$xTemplateCode])) {
+	foreach ($matches[0] as $xTemplateCode) {
+		    if (!isset($replace[$xTemplateCode])) {
 		       $replace[$xTemplateCode] = str_replace("{", "{\$", $xTemplateCode);
 		    } //if
 	} //foreach
@@ -349,7 +349,7 @@ 
 	$javascript = str_replace(array_keys($replace), array_values($replace), $javascript);
 } //if
 
-if(!$addLiterals) {
+if (!$addLiterals) {
    return $javascript;
 }
 
@@ -363,12 +363,12 @@ 
 	$count = 0;
 	$inSmartyVariable = false;
 
-	while($count < $scriptLength) {
+	while ($count < $scriptLength) {
 
-	      if($inSmartyVariable) {
+	      if ($inSmartyVariable) {
 	      	 $start = $count;
 	      	 $numOfChars = 1;
-	      	 while(isset($javascript[$count]) && $javascript[$count] != '}') {
+	      	 while (isset($javascript[$count]) && $javascript[$count] != '}') {
 	      	 	   $count++;
 	      	 	   $numOfChars++;
 	      	 }
@@ -381,12 +381,12 @@ 
 			  $char = $javascript[$count];
 			  $nextChar = ($count + 1 >= $scriptLength) ? '' : $javascript[$count + 1];
 
-			  if($char == "{" && $nextChar == "$") {
+			  if ($char == "{" && $nextChar == "$") {
 			  	 $inSmartyVariable = true;
 			  	 $newJavascript .= $javascript[$count];
-			  } else if($char == "{") {
-			  	 $newJavascript .=  " {ldelim} ";
-			  } else if($char == "}") {
+			  } else if ($char == "{") {
+			  	 $newJavascript .= " {ldelim} ";
+			  } else if ($char == "}") {
 			  	 $newJavascript .= " {rdelim} ";
 			  } else {
 			     $newJavascript .= $javascript[$count];
@@ -412,32 +412,32 @@ 
  */
 function findAssignedVariableName($name, $filePath) {
 
-	if($this->mPHPFile == "INVALID") {
+	if ($this->mPHPFile == "INVALID") {
 	   return $name;
 	}
 
-	if(!isset($this->mPHPFile)) {
-	   if(preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
+	if (!isset($this->mPHPFile)) {
+	   if (preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
 	   	 $dir = $matches[1];
-	   } else if(preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
+	   } else if (preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
 	   	 $dir = $matches[1];
 	   }
 
-	   if(!isset($dir) || !is_dir($dir)) {
+	   if (!isset($dir) || !is_dir($dir)) {
 	      $this->mPHPFile = "INVALID";
 	      return $name;
 	   }
 
        $filesInDir = $this->dirList($dir);
        $phpFile = $matches[2].'.*?[\.]php';
-       foreach($filesInDir as $file) {
-       	  if(preg_match("/$phpFile/", $file)) {
-       	  	 $this->mPHPFile = $matches[1] . $file;
+       foreach ($filesInDir as $file) {
+       	  if (preg_match("/$phpFile/", $file)) {
+       	  	 $this->mPHPFile = $matches[1].$file;
        	  	 break;
        	  }
        }
 
-       if(!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
+       if (!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
        	  $this->mPHPFile = "INVALID";
        	  return $name;
        }
@@ -445,7 +445,7 @@ 
 
 	$phpContents = file_get_contents($this->mPHPFile);
 	$uname = strtoupper($name);
-	if(preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
+	if (preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
 	   return $matches[1];
 	}
 	return $name;
@@ -459,7 +459,7 @@ 
  * @param $directory The directory to scan
  * @return $results The files in the directory that were found
  */
-function dirList ($directory) {
+function dirList($directory) {
 
     // create an array to hold directory list
     $results = array();
@@ -491,19 +491,19 @@ 
  */
 function getCustomField($elementNames) {
 
-   if(!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
+   if (!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
    	  return null;
    }
 
-   if(is_string($elementNames)) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
+   if (is_string($elementNames)) {
+   	  if (preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
    	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
    	  }
    	  return null;
    }
 
-   foreach($elementNames as $name) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
+   foreach ($elementNames as $name) {
+   	  if (preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
    	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
    	  }
    }
@@ -512,7 +512,7 @@ 
 }
 
 function applyPreRules($moduleDir, $panels) {
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+   if (file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
 	  $class = $moduleDir."ParseRule";
 	  $parseRule = new $class();
@@ -527,7 +527,7 @@ 
 
 function applyPostRules($moduleDir, $panels) {
    //Run module specific rules
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+   if (file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
 	  $class = $moduleDir."ParseRule";
 	  $parseRule = new $class();
@@ -538,9 +538,9 @@ 
    require_once("include/SugarFields/Parsers/Rules/ParseRules.php");
    $rules = ParseRules::getRules();
 
-   foreach($rules as $rule) {
-   	  if(!file_exists($rule['file'])) {
-   	  	 $GLOBALS['log']->error("Cannot run rule for " . $rule['file']);
+   foreach ($rules as $rule) {
+   	  if (!file_exists($rule['file'])) {
+   	  	 $GLOBALS['log']->error("Cannot run rule for ".$rule['file']);
    	  	 continue;
    	  } //if
    	  require_once($rule['file']);
@@ -552,11 +552,11 @@ 
    return $panels;
 }
 
-function createFileContents($moduleDir, $panels, $templateMeta=array(), $htmlFilePath) {
+function createFileContents($moduleDir, $panels, $templateMeta = array(), $htmlFilePath) {
 
 $header = "<?php\n\n";
 
-if(empty($templateMeta)) {
+if (empty($templateMeta)) {
 $header .= "\$viewdefs['$moduleDir']['$this->mView'] = array(
     'templateMeta' => array('maxColumns' => '2',
                             'widths' => array(
@@ -566,7 +566,7 @@ 
     ),";
 } else {
 $header .= "\$viewdefs['$moduleDir']['$this->mView'] = array(
-    'templateMeta' =>" . var_export($templateMeta, true) . ",";
+    'templateMeta' =>".var_export($templateMeta, true).",";
 }
 
 //Replace all the @sq (single quote tags that may have been inserted)
@@ -591,8 +591,8 @@ 
 
    $metadata = '';
    $body = var_export($panels, true);
-   $metadata = $header . $body . $footer;
-   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/',"",$metadata);
+   $metadata = $header.$body.$footer;
+   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/', "", $metadata);
    return $metadata;
 
 }
@@ -611,10 +611,10 @@ 
    $masterpanels = $viewdefs[$moduleDir][$this->mView]['panels'];
    $hasMultiplePanels = $this->hasMultiplePanels($masterpanels);
 
-   if(!$hasMultiplePanels) {
+   if (!$hasMultiplePanels) {
    	    $keys = array_keys($viewdefs[$moduleDir][$this->mView]['panels']);
-        if(!empty($keys) && count($keys) == 1) {
-        	if(strtolower($keys[0]) == 'default') {
+        if (!empty($keys) && count($keys) == 1) {
+        	if (strtolower($keys[0]) == 'default') {
         	   $masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels'][$keys[0]]);
         	} else {
         	   $firstPanel = array_values($viewdefs[$moduleDir][$this->mView]['panels']);
@@ -624,18 +624,18 @@ 
         	$masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels']);
         }
    }
-   foreach($masterpanels as $name=>$masterpanel) {
-   	       if(isset($panels[$name])) {
+   foreach ($masterpanels as $name=>$masterpanel) {
+   	       if (isset($panels[$name])) {
 	   	       	  // Get all the names in the panel
 	   	       	  $existingElements = array();
 	   	       	  $existingLocation = array();
 
-	   	       	  foreach($panels[$name] as $rowKey=>$row) {
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && !empty($column['name'])) {
+	   	       	  foreach ($panels[$name] as $rowKey=>$row) {
+	   	       	  	 foreach ($row as $colKey=>$column) {
+	   	       	  	 	if (is_array($column) && !empty($column['name'])) {
 	   	       	  	 	   $existingElements[$column['name']] = $column['name'];
 	   	       	  	 	   $existingLocation[$column['name']] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
+	   	       	  	 	} else if (!is_array($column) && !empty($column)) {
 	   	       	  	 	   $existingElements[$column] = $column;
 	   	       	  	 	   $existingLocation[$column] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
 	   	       	  	 	}
@@ -643,23 +643,23 @@ 
 	   	       	  } //foreach
 
 	   	       	  // Now check against the $masterCopy
-	   	       	  foreach($masterpanel as $rowKey=>$row) {
+	   	       	  foreach ($masterpanel as $rowKey=>$row) {
 
 	   	       	  	 $addRow = array();
 
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && isset($column['name'])) {
+	   	       	  	 foreach ($row as $colKey=>$column) {
+	   	       	  	 	if (is_array($column) && isset($column['name'])) {
 	   	       	  	 	   $id = $column['name'];
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
+	   	       	  	 	} else if (!is_array($column) && !empty($column)) {
 	   	       	  	 	   $id = $column;
 	   	       	  	 	} else {
 	   	       	  	 	   continue;
 	   	       	  	 	}
-	   	       	  	 	if(empty($existingElements[$id])) {
+	   	       	  	 	if (empty($existingElements[$id])) {
 	   	       	  	 	   //Only add if
 	   	       	  	 	   // 1) if it is a required field (as defined in metadata)
 	   	       	  	 	   // 2) or if it has a customLabel and customCode (a very deep customization)
-	   	       	  	 	   if((is_array($column) && !empty($column['displayParams']['required'])) ||
+	   	       	  	 	   if ((is_array($column) && !empty($column['displayParams']['required'])) ||
 	   	       	  	 	      (is_array($column) && !empty($column['customCode']) && !empty($column['customLabel']))) {
 	   	       	  	 	   	  $addRow[] = $column;
 	   	       	  	 	   }
@@ -670,7 +670,7 @@ 
 	   	       	  	 } //foreach
 
 	   	       	  	 // Add it to the $panels
-	   	       	  	 if(!empty($addRow)) {
+	   	       	  	 if (!empty($addRow)) {
 	   	       	  	 	$panels[$name][] = $addRow;
 	   	       	  	 }
 	   	       	  } //foreach
@@ -682,8 +682,8 @@ 
 
    // We're not done yet... go through the $panels Array now and try to remove duplicate
    // or empty panels
-   foreach($panels as $name=>$panel) {
-   	   if(count($panel) == 0 || !isset($masterpanels[$name])) {
+   foreach ($panels as $name=>$panel) {
+   	   if (count($panel) == 0 || !isset($masterpanels[$name])) {
    	   	  unset($panels[$name]);
    	   }
    } //foreach
@@ -703,7 +703,7 @@ 
    require($masterCopy);
    $masterTemplateMeta = $viewdefs[$moduleDir][$this->mView]['templateMeta'];
 
-   if(isset($masterTemplateMeta['javascript'])) {
+   if (isset($masterTemplateMeta['javascript'])) {
    	  //Insert the getJSPath code back into src value
    	  $masterTemplateMeta['javascript'] = preg_replace('/src\s*=\s*[\'\"].*?(modules\/|include\/)([^\.]*?\.js)([^\'\"]*?)[\'\"]/i', 'src="@sq . getJSPath(@sq${1}${2}@sq) . @sq"', $masterTemplateMeta['javascript']);
    }
@@ -712,7 +712,7 @@ 
 }
 
 function hasRequiredSpanLabel($html) {
-   if(empty($html)) {
+   if (empty($html)) {
    	  return false;
    }
 
@@ -721,20 +721,20 @@ 
 
 function hasMultiplePanels($panels) {
 
-   if(!isset($panels) || empty($panels) || !is_array($panels)) {
+   if (!isset($panels) || empty($panels) || !is_array($panels)) {
    	  return false;
    }
 
-   if(is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
+   if (is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
    	  return false;
    }
 
-   foreach($panels as $panel) {
-   	  if(!empty($panel) && !is_array($panel)) {
+   foreach ($panels as $panel) {
+   	  if (!empty($panel) && !is_array($panel)) {
    	  	 return false;
    	  } else {
-   	  	 foreach($panel as $row) {
-   	  	    if(!empty($row) && !is_array($row)) {
+   	  	 foreach ($panel as $row) {
+   	  	    if (!empty($row) && !is_array($row)) {
    	  	       return false;
    	  	    } //if
    	  	 } //foreach
@@ -744,16 +744,16 @@ 
    return true;
 }
 
-function getRelateFieldName($mixed='') {
-   if(!is_array($mixed)) {
+function getRelateFieldName($mixed = '') {
+   if (!is_array($mixed)) {
    	  return '';
-   } else if(count($mixed) == 2){
+   } else if (count($mixed) == 2) {
       $id = '';
    	  $name = '';
-   	  foreach($mixed as $el) {
-   	  	 if(preg_match('/_id$/', $el)) {
+   	  foreach ($mixed as $el) {
+   	  	 if (preg_match('/_id$/', $el)) {
    	  	    $id = $el;
-   	  	 } else if(preg_match('/_name$/', $el)) {
+   	  	 } else if (preg_match('/_name$/', $el)) {
    	  	    $name = $el;
    	  	 }
    	  }
@@ -774,7 +774,7 @@ 
  *
  */
 function fixTablesWithMissingTr($tableContents) {
-   if(preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+   if (preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<table[^>]*?[\/]?>\s*?<td)/i', '<table><tr><td', $tableContents);
    }
    return $tableContents;
@@ -785,7 +785,7 @@ 
  * This is a very crude function to fix instances where files have an </tr> tag immediately followed by a <td> tag
  */
 function fixRowsWithMissingTr($tableContents) {
-   if(preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+   if (preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', '</tr><tr><td', $tableContents);
    }
    return $tableContents;
@@ -796,7 +796,7 @@ 
  * This is a very crude function to fix instances where files have two consecutive <tr> tags
  */
 function fixDuplicateTrTags($tableContents) {
-   if(preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
+   if (preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<tr[^>]*?[\/]?>\s*?<tr)/i', '<tr', $tableContents);
    }
    return $tableContents;
@@ -807,14 +807,14 @@ 
  * Scans array of form elements to see if just one is a vardef element and, if so,
  * return that vardef name
  */
-function findSingleVardefElement($formElements=array(), $vardefs=array()) {
-   if(empty($formElements) || !is_array($formElements)) {
+function findSingleVardefElement($formElements = array(), $vardefs = array()) {
+   if (empty($formElements) || !is_array($formElements)) {
    	  return '';
    }
 
    $found = array();
-   foreach($formElements as $el) {
-   	   if(isset($vardefs[$el])) {
+   foreach ($formElements as $el) {
+   	   if (isset($vardefs[$el])) {
    	   	  $found[] = $el;
    	   }
    }

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');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -64,8 +66,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();
@@ -471,8 +472,9 @@ 
     while ($file = readdir($handler)) {
         // if $file isn't this directory or its parent,
         // add it to the results array
-        if ($file != '.' && $file != '..')
-            $results[] = $file;
+        if ($file != '.' && $file != '..') {
+                    $results[] = $file;
+        }
     }
 
     // tidy up: close the handler

include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php

Indentation +37 added lines, -37 removed lines

@@ -44,19 +44,19 @@ 
     function getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
         // Create Smarty variables for the Calendar picker widget
         if(!isset($displayParams['showMinutesDropdown'])) {
-           $displayParams['showMinutesDropdown'] = false;
+            $displayParams['showMinutesDropdown'] = false;
         }
 
         if(!isset($displayParams['showHoursDropdown'])) {
-           $displayParams['showHoursDropdown'] = false;
+            $displayParams['showHoursDropdown'] = false;
         }
 
         if(!isset($displayParams['showNoneCheckbox'])) {
-           $displayParams['showNoneCheckbox'] = false;
+            $displayParams['showNoneCheckbox'] = false;
         }
 
         if(!isset($displayParams['showFormats'])) {
-           $displayParams['showFormats'] = false;
+            $displayParams['showFormats'] = false;
         }
 
         global $timedate;
@@ -75,44 +75,44 @@ 
 	
     function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
 
-    	 if($this->isRangeSearchView($vardef)) {
-           $displayParams['showMinutesDropdown'] = false;
-           $displayParams['showHoursDropdown'] = false;
-           $displayParams['showNoneCheckbox'] = false;
-           $displayParams['showFormats'] = false;
-	       global $timedate, $current_language;
-	       $displayParams['dateFormat'] = $timedate->get_cal_date_format();
-	       $displayParams['timeFormat'] = $timedate->get_user_time_format();
-
-           $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
-           $id = isset($displayParams['idName']) ? $displayParams['idName'] : $vardef['name'];
-           $this->ss->assign('original_id', "{$id}");
-           $this->ss->assign('id_range', "range_{$id}");
-           $this->ss->assign('id_range_start', "start_range_{$id}");
-           $this->ss->assign('id_range_end', "end_range_{$id}");
-           $this->ss->assign('id_range_choice', "{$id}_range_choice");
-           if(file_exists('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl'))
-           {
-              return $this->fetch('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
-           }
-           return $this->fetch('include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
+            if($this->isRangeSearchView($vardef)) {
+            $displayParams['showMinutesDropdown'] = false;
+            $displayParams['showHoursDropdown'] = false;
+            $displayParams['showNoneCheckbox'] = false;
+            $displayParams['showFormats'] = false;
+            global $timedate, $current_language;
+            $displayParams['dateFormat'] = $timedate->get_cal_date_format();
+            $displayParams['timeFormat'] = $timedate->get_user_time_format();
+
+            $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+            $id = isset($displayParams['idName']) ? $displayParams['idName'] : $vardef['name'];
+            $this->ss->assign('original_id', "{$id}");
+            $this->ss->assign('id_range', "range_{$id}");
+            $this->ss->assign('id_range_start', "start_range_{$id}");
+            $this->ss->assign('id_range_end', "end_range_{$id}");
+            $this->ss->assign('id_range_choice', "{$id}_range_choice");
+            if(file_exists('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl'))
+            {
+                return $this->fetch('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
+            }
+            return $this->fetch('include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
         }
 
-    	// Create Smarty variables for the Calendar picker widget
+        // Create Smarty variables for the Calendar picker widget
         if(!isset($displayParams['showMinutesDropdown'])) {
-           $displayParams['showMinutesDropdown'] = false;
+            $displayParams['showMinutesDropdown'] = false;
         }
 
         if(!isset($displayParams['showHoursDropdown'])) {
-           $displayParams['showHoursDropdown'] = false;
+            $displayParams['showHoursDropdown'] = false;
         }
 
         if(!isset($displayParams['showNoneCheckbox'])) {
-           $displayParams['showNoneCheckbox'] = false;
+            $displayParams['showNoneCheckbox'] = false;
         }
 
         if(!isset($displayParams['showFormats'])) {
-           $displayParams['showFormats'] = false;
+            $displayParams['showFormats'] = false;
         }
 
         global $timedate;
@@ -124,7 +124,7 @@ 
     }
 
 
-	public function getEmailTemplateValue($inputField, $vardef, $context = null, $tabindex = 0){
+    public function getEmailTemplateValue($inputField, $vardef, $context = null, $tabindex = 0){
         // This does not return a smarty section, instead it returns a direct value
         if(isset($context['notify_user'])) {
             $user = $context['notify_user'];
@@ -143,14 +143,14 @@ 
 
         if(strpos($params[$prefix.$field], ' ') > 0) {
             if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATETIME_FORMAT)) {
-	            $bean->$field = $params[$prefix.$field];
+                $bean->$field = $params[$prefix.$field];
             } else {
                 $bean->$field = $timedate->to_db($params[$prefix.$field]);
             }
         } else {
-        	$GLOBALS['log']->error('Field ' . $prefix.$field . ' expecting datetime format, but got value: ' . $params[$prefix.$field]);
-	        //Default to assume date format value
-        	if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATE_FORMAT)) {
+            $GLOBALS['log']->error('Field ' . $prefix.$field . ' expecting datetime format, but got value: ' . $params[$prefix.$field]);
+            //Default to assume date format value
+            if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATE_FORMAT)) {
                 $bean->$field = $params[$prefix.$field];
             } else {
                 $bean->$field = $timedate->to_db_date($params[$prefix.$field]);
@@ -175,10 +175,10 @@ 
         if ( !$timedate->check_matching_format($value, $format) ) {
             $parts = $timedate->split_date_time($value);
             if(empty($parts[0])) {
-               $datepart = $timedate->getNow()->format($settings->dateformat);
+                $datepart = $timedate->getNow()->format($settings->dateformat);
             }
             else {
-               $datepart = $parts[0];
+                $datepart = $parts[0];
             }
             if(empty($parts[1])) {
                 $timepart = $timedate->fromTimestamp(0)->format($settings->timeformat);

Spacing +22 added lines, -22 removed lines

@@ -43,19 +43,19 @@ 
 
     function getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
         // Create Smarty variables for the Calendar picker widget
-        if(!isset($displayParams['showMinutesDropdown'])) {
+        if (!isset($displayParams['showMinutesDropdown'])) {
            $displayParams['showMinutesDropdown'] = false;
         }
 
-        if(!isset($displayParams['showHoursDropdown'])) {
+        if (!isset($displayParams['showHoursDropdown'])) {
            $displayParams['showHoursDropdown'] = false;
         }
 
-        if(!isset($displayParams['showNoneCheckbox'])) {
+        if (!isset($displayParams['showNoneCheckbox'])) {
            $displayParams['showNoneCheckbox'] = false;
         }
 
-        if(!isset($displayParams['showFormats'])) {
+        if (!isset($displayParams['showFormats'])) {
            $displayParams['showFormats'] = false;
         }
 
@@ -75,7 +75,7 @@ 
 	
     function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
 
-    	 if($this->isRangeSearchView($vardef)) {
+    	 if ($this->isRangeSearchView($vardef)) {
            $displayParams['showMinutesDropdown'] = false;
            $displayParams['showHoursDropdown'] = false;
            $displayParams['showNoneCheckbox'] = false;
@@ -91,7 +91,7 @@ 
            $this->ss->assign('id_range_start', "start_range_{$id}");
            $this->ss->assign('id_range_end', "end_range_{$id}");
            $this->ss->assign('id_range_choice', "{$id}_range_choice");
-           if(file_exists('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl'))
+           if (file_exists('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl'))
            {
               return $this->fetch('custom/include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl');
            }
@@ -99,19 +99,19 @@ 
         }
 
     	// Create Smarty variables for the Calendar picker widget
-        if(!isset($displayParams['showMinutesDropdown'])) {
+        if (!isset($displayParams['showMinutesDropdown'])) {
            $displayParams['showMinutesDropdown'] = false;
         }
 
-        if(!isset($displayParams['showHoursDropdown'])) {
+        if (!isset($displayParams['showHoursDropdown'])) {
            $displayParams['showHoursDropdown'] = false;
         }
 
-        if(!isset($displayParams['showNoneCheckbox'])) {
+        if (!isset($displayParams['showNoneCheckbox'])) {
            $displayParams['showNoneCheckbox'] = false;
         }
 
-        if(!isset($displayParams['showFormats'])) {
+        if (!isset($displayParams['showFormats'])) {
            $displayParams['showFormats'] = false;
         }
 
@@ -124,9 +124,9 @@ 
     }
 
 
-	public function getEmailTemplateValue($inputField, $vardef, $context = null, $tabindex = 0){
+	public function getEmailTemplateValue($inputField, $vardef, $context = null, $tabindex = 0) {
         // This does not return a smarty section, instead it returns a direct value
-        if(isset($context['notify_user'])) {
+        if (isset($context['notify_user'])) {
             $user = $context['notify_user'];
         } else {
             $user = $GLOBALS['current_user'];
@@ -136,19 +136,19 @@ 
     
     public function save(&$bean, $params, $field, $properties, $prefix = '') {
         global $timedate;
-        if ( !isset($params[$prefix.$field]) ) {
+        if (!isset($params[$prefix.$field])) {
             //$bean->$field = '';
             return;
         }
 
-        if(strpos($params[$prefix.$field], ' ') > 0) {
+        if (strpos($params[$prefix.$field], ' ') > 0) {
             if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATETIME_FORMAT)) {
 	            $bean->$field = $params[$prefix.$field];
             } else {
                 $bean->$field = $timedate->to_db($params[$prefix.$field]);
             }
         } else {
-        	$GLOBALS['log']->error('Field ' . $prefix.$field . ' expecting datetime format, but got value: ' . $params[$prefix.$field]);
+        	$GLOBALS['log']->error('Field '.$prefix.$field.' expecting datetime format, but got value: '.$params[$prefix.$field]);
 	        //Default to assume date format value
         	if ($timedate->check_matching_format($params[$prefix.$field], TimeDate::DB_DATE_FORMAT)) {
                 $bean->$field = $params[$prefix.$field];
@@ -172,39 +172,39 @@ 
 
         $format = $timedate->merge_date_time($settings->dateformat, $settings->timeformat);
 
-        if ( !$timedate->check_matching_format($value, $format) ) {
+        if (!$timedate->check_matching_format($value, $format)) {
             $parts = $timedate->split_date_time($value);
-            if(empty($parts[0])) {
+            if (empty($parts[0])) {
                $datepart = $timedate->getNow()->format($settings->dateformat);
             }
             else {
                $datepart = $parts[0];
             }
-            if(empty($parts[1])) {
+            if (empty($parts[1])) {
                 $timepart = $timedate->fromTimestamp(0)->format($settings->timeformat);
             } else {
                 $timepart = $parts[1];
                 // see if we can get by stripping the seconds
-                if(strpos($settings->timeformat, 's') === false) {
+                if (strpos($settings->timeformat, 's') === false) {
                     $sep = $timedate->timeSeparatorFormat($settings->timeformat);
                     // We are assuming here seconds are the last component, which
                     // is kind of reasonable - no sane time format puts seconds first
                     $timeparts = explode($sep, $timepart);
-                    if(!empty($timeparts[2])) {
+                    if (!empty($timeparts[2])) {
                         $timepart = join($sep, array($timeparts[0], $timeparts[1]));
                     }
                 }
             }
 
             $value = $timedate->merge_date_time($datepart, $timepart);
-            if ( !$timedate->check_matching_format($value, $format) ) {
+            if (!$timedate->check_matching_format($value, $format)) {
                 return false;
             }
         }
 
         try {
             $date = SugarDateTime::createFromFormat($format, $value, new DateTimeZone($settings->timezone));
-        } catch(Exception $e) {
+        }catch (Exception $e) {
             return false;
         }
         return $date->asDb();

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
             }
             if(isset($parameters[$condition_item['condition_order']])) {
                 $parameters[] = $condition_item;
-            }
-            else {
+            } else {
                 $parameters[$condition_item['condition_order']] = $condition_item;
             }
         }

include/SugarFields/Fields/Assigned_user_name/SugarFieldAssigned_user_name.php

Indentation +9 added lines, -9 removed lines

@@ -41,14 +41,14 @@
 
 class SugarFieldAssigned_user_name extends SugarFieldBase {
 
-	function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-    	$vardef['options'] = get_user_array(false);
-		if(!empty($vardef['function']['returns']) && $vardef['function']['returns']== 'html'){
-    	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
-           return $this->fetch($this->findTemplate('EditViewFunction'));
-    	}else{
-    	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
-           return $this->fetch($this->findTemplate('SearchView'));
-    	}
+    function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
+        $vardef['options'] = get_user_array(false);
+        if(!empty($vardef['function']['returns']) && $vardef['function']['returns']== 'html'){
+            $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+            return $this->fetch($this->findTemplate('EditViewFunction'));
+        }else{
+            $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+            return $this->fetch($this->findTemplate('SearchView'));
+        }
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 
 	function getSearchViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
     	$vardef['options'] = get_user_array(false);
-		if(!empty($vardef['function']['returns']) && $vardef['function']['returns']== 'html'){
+		if (!empty($vardef['function']['returns']) && $vardef['function']['returns'] == 'html') {
     	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
            return $this->fetch($this->findTemplate('EditViewFunction'));
-    	}else{
+    	} else {
     	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
            return $this->fetch($this->findTemplate('SearchView'));
     	}

Braces +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		if(!empty($vardef['function']['returns']) && $vardef['function']['returns']== 'html'){
     	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
            return $this->fetch($this->findTemplate('EditViewFunction'));
-    	}else{
+    	} else{
     	   $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
            return $this->fetch($this->findTemplate('SearchView'));
     	}

include/SugarFields/Fields/Text/SugarFieldText.php

Indentation +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
 require_once 'include/clean.php';
 class SugarFieldText extends SugarFieldBase {
 
-	function getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
+    function getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
         if(!isset($displayParams['nl2br'])){
             $displayParams['nl2br'] = true;
         }
@@ -51,7 +51,7 @@ 
         if(!isset($displayParams['url2html'])) {
             $displayParams['url2html'] = true;
         }
-		return parent::getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
+        return parent::getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
     }
     function getClassicEditView($field_id='description', $value='', $prefix='', $rich_text=false, $maxlength='', $tabindex=1, $cols=80, $rows=4) {
 
@@ -68,19 +68,19 @@ 
 
 
         $this->ss->assign('displayParams', $displayParams);
-		if(isset($GLOBALS['current_user'])) {
-			$height = $GLOBALS['current_user']->getPreference('text_editor_height');
-			$width = $GLOBALS['current_user']->getPreference('text_editor_width');
-			$height = isset($height) ? $height : '300px';
-	        $width = isset($width) ? $width : '95%';
-			$this->ss->assign('RICH_TEXT_EDITOR_HEIGHT', $height);
-			$this->ss->assign('RICH_TEXT_EDITOR_WIDTH', $width);
-		} else {
-			$this->ss->assign('RICH_TEXT_EDITOR_HEIGHT', '100px');
-			$this->ss->assign('RICH_TEXT_EDITOR_WIDTH', '95%');
-		}
+        if(isset($GLOBALS['current_user'])) {
+            $height = $GLOBALS['current_user']->getPreference('text_editor_height');
+            $width = $GLOBALS['current_user']->getPreference('text_editor_width');
+            $height = isset($height) ? $height : '300px';
+            $width = isset($width) ? $width : '95%';
+            $this->ss->assign('RICH_TEXT_EDITOR_HEIGHT', $height);
+            $this->ss->assign('RICH_TEXT_EDITOR_WIDTH', $width);
+        } else {
+            $this->ss->assign('RICH_TEXT_EDITOR_HEIGHT', '100px');
+            $this->ss->assign('RICH_TEXT_EDITOR_WIDTH', '95%');
+        }
 
-		return $this->ss->fetch($this->findTemplate('ClassicEditView'));
+        return $this->ss->fetch($this->findTemplate('ClassicEditView'));
     }
 }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -42,18 +42,18 @@ 
 class SugarFieldText extends SugarFieldBase {
 
 	function getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex) {
-        if(!isset($displayParams['nl2br'])){
+        if (!isset($displayParams['nl2br'])) {
             $displayParams['nl2br'] = true;
         }
-        if(!isset($displayParams['htmlescape'])) {
+        if (!isset($displayParams['htmlescape'])) {
             $displayParams['htmlescape'] = true;
         }
-        if(!isset($displayParams['url2html'])) {
+        if (!isset($displayParams['url2html'])) {
             $displayParams['url2html'] = true;
         }
 		return parent::getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
     }
-    function getClassicEditView($field_id='description', $value='', $prefix='', $rich_text=false, $maxlength='', $tabindex=1, $cols=80, $rows=4) {
+    function getClassicEditView($field_id = 'description', $value = '', $prefix = '', $rich_text = false, $maxlength = '', $tabindex = 1, $cols = 80, $rows = 4) {
 
         $this->ss->assign('prefix', $prefix);
         $this->ss->assign('field_id', $field_id);
@@ -68,7 +68,7 @@ 
 
 
         $this->ss->assign('displayParams', $displayParams);
-		if(isset($GLOBALS['current_user'])) {
+		if (isset($GLOBALS['current_user'])) {
 			$height = $GLOBALS['current_user']->getPreference('text_editor_height');
 			$width = $GLOBALS['current_user']->getPreference('text_editor_width');
 			$height = isset($height) ? $height : '300px';

include/SugarFields/Fields/CronSchedule/SugarFieldCronSchedule.php

Spacing +18 added lines, -18 removed lines

@@ -3,48 +3,48 @@
 
 class SugarFieldCronSchedule extends SugarFieldBase {
 
-    private function getDays(){
+    private function getDays() {
         $days = array();
         $date = new DateTime("1986-05-01");
         $period = new DateInterval('P1D');
-        for($x = 1; $x <= 31; $x++){
-            $days[$x] = $date->format('jS');;
+        for ($x = 1; $x <= 31; $x++) {
+            $days[$x] = $date->format('jS'); ;
             $date->add($period);
         }
         return $days;
     }
-    private function getWeekDays(){
+    private function getWeekDays() {
         $days = array();
         $date = new DateTime("1986-05-04");
         $period = new DateInterval('P1D');
-        for($x = 0; $x < 7; $x++){
+        for ($x = 0; $x < 7; $x++) {
             $days[$x] = $date->format('D');
             $date->add($period);
         }
         return $days;
     }
 
-    function getHumanReadable($schedule){
+    function getHumanReadable($schedule) {
 
     }
 
     function setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass = true) {
-        global $app_list_strings,$app_strings;
+        global $app_list_strings, $app_strings;
         parent::setup($parentFieldArray, $vardef, $displayParams, $tabindex, $twopass);
-        $this->ss->assign('APP',$app_strings);
-        $this->ss->assign('types',get_select_options_with_id($app_list_strings['aor_scheduled_report_schedule_types'],''));
+        $this->ss->assign('APP', $app_strings);
+        $this->ss->assign('types', get_select_options_with_id($app_list_strings['aor_scheduled_report_schedule_types'], ''));
         $weekdays = $this->getWeekDays();
-        $this->ss->assign('weekday_vals',json_encode($weekdays));
-        $this->ss->assign('weekdays',get_select_options($weekdays,''));
+        $this->ss->assign('weekday_vals', json_encode($weekdays));
+        $this->ss->assign('weekdays', get_select_options($weekdays, ''));
         $days = $this->getDays();
-        $this->ss->assign('days',get_select_options($days,''));
-        function padNumbers($x){
-            return str_pad($x,2,'0',STR_PAD_LEFT);
+        $this->ss->assign('days', get_select_options($days, ''));
+        function padNumbers($x) {
+            return str_pad($x, 2, '0', STR_PAD_LEFT);
         }
-        $minutes = array_map('padNumbers',range(0,59));
-        $hours = array_map('padNumbers',range(0,23));
-        $this->ss->assign('minutes',get_select_options($minutes,''));
-        $this->ss->assign('hours',get_select_options($hours,''));
+        $minutes = array_map('padNumbers', range(0, 59));
+        $hours = array_map('padNumbers', range(0, 23));
+        $this->ss->assign('minutes', get_select_options($minutes, ''));
+        $this->ss->assign('hours', get_select_options($hours, ''));
     }
 
 

include/SugarEmailAddress/SugarEmailAddress.php

Indentation +61 added lines, -61 removed lines

@@ -56,7 +56,7 @@ 
     var $object_name = 'EmailAddress';
 
     //bug 40068, According to rules in page 6 of http://www.apps.ietf.org/rfc/rfc3696.html#sec-3,
-	//allowed special characters ! # $ % & ' * + - / = ?  ^ _ ` . { | } ~ in local part
+    //allowed special characters ! # $ % & ' * + - / = ?  ^ _ ` . { | } ~ in local part
     var $regex = "/^(?:['\.\-\+&#!\$\*=\?\^_`\{\}~\/\w]+)@(?:(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|\w+(?:[\.-]*\w+)*(?:\.[\w-]{2,})+)\$/";
     var $disable_custom_fields = true;
     var $db;
@@ -391,8 +391,8 @@ 
             // determine which array to process
             foreach($_REQUEST as $k => $v) {
                 if(strpos($k, 'emailAddress') !== false) {
-                   $fromRequest = true;
-                   break;
+                    $fromRequest = true;
+                    break;
                 }
             $widget_id = $_REQUEST[$module .'_email_widget_id'];
     }
@@ -409,30 +409,30 @@ 
 
                 $eId = $module . $widget_id;
                 if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
+                    $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                    $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
                 if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
+                    $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                    $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
                 if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
+                    $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                    $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
                 if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
+                    $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
                 } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                    $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -446,9 +446,9 @@ 
 
                 if($fromRequest && empty($replyTo)) {
                     if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
+                        $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
                     } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                        $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
                     }
                 }
                 if($fromRequest && empty($new_addrs)) {
@@ -472,7 +472,7 @@ 
                         if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
                             if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
-                              $new_addrs[$k] = $v;
+                                $new_addrs[$k] = $v;
                         }
                     }
                 }
@@ -484,18 +484,18 @@ 
                     $optOutValues = array();
                     $invalidValues = array();
                     foreach($new_addrs as $k=>$email) {
-                       preg_match('/emailAddress([0-9])+$/', $k, $matches);
-                       $count = $matches[1];
-                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
-                       if(!empty($result)) {
-                          $row=$this->db->fetchByAssoc($result);
-                          if(!empty($row['opt_out'])) {
-                             $optOutValues[$k] = "emailAddress$count";
-                          }
-                          if(!empty($row['invalid_email'])) {
-                             $invalidValues[$k] = "emailAddress$count";
-                          }
-                       }
+                        preg_match('/emailAddress([0-9])+$/', $k, $matches);
+                        $count = $matches[1];
+                        $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
+                        if(!empty($result)) {
+                            $row=$this->db->fetchByAssoc($result);
+                            if(!empty($row['opt_out'])) {
+                                $optOutValues[$k] = "emailAddress$count";
+                            }
+                            if(!empty($row['invalid_email'])) {
+                                $invalidValues[$k] = "emailAddress$count";
+                            }
+                        }
                     }
                 }
                 // Re-populate the addresses class variable if we have new address(es).
@@ -522,7 +522,7 @@ 
 
         //If no widgets, set addresses array to empty
         if($post_from_email_address_widget && !$hasEmailValue) {
-           $this->addresses = array();
+            $this->addresses = array();
         }
     }
 
@@ -861,14 +861,14 @@ 
             $count = 0;
             $key = $module . $widget_id . 'emailAddress'.$count;
             while(isset($_REQUEST[$key])) {
-                   $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
-                                             'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
-                                             'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
-                                             'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
-                                             'reply_to_address'=>false
+                    $email = $_REQUEST[$key];
+                    $prefillDataArr[] =  array('email_address'=>$email,
+                                                'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
+                                                'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
+                                                'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
+                                                'reply_to_address'=>false
                                         );
-                   $key = $module . $widget_id . 'emailAddress' . ++$count;
+                    $key = $module . $widget_id . 'emailAddress' . ++$count;
             } //while
         }
 
@@ -985,7 +985,7 @@ 
         $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+            $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
         }
 
         while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
@@ -994,31 +994,31 @@ 
         }
 
         if($count == 0) {
-           return "";
+            return "";
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
-              $optOut[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+                $optOut[] = $v;
+            }
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
-              $invalid[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
+                $invalid[] = $v;
+            }
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
-              $replyTo[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
+                $replyTo[] = $v;
+            }
         }
 
         if(isset($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
-              $delete[] = $v;
-           }
+            foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
+                $delete[] = $v;
+            }
         }
 
         while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
@@ -1052,13 +1052,13 @@ 
         $get .= '&emailAddressWidget='.$_POST['emailAddressWidget'];
 
         while(isset($_REQUEST[$mod . $widget_id . 'emailAddress' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
-              $count++;
+                $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
+                $count++;
         } //while
 
         while(isset($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
-              $count++;
+                $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
+                $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
@@ -1067,14 +1067,14 @@ 
             $count = 0;
             $optionIdentifier = $mod.$widget_id.$option;
             if(isset($_REQUEST[$optionIdentifier])) {
-               if(is_array($_REQUEST[$optionIdentifier])) {
-                   foreach($_REQUEST[$optionIdentifier] as $optOut) {
-                      $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
-                      $count++;
-                   } //foreach
-               } else {
-                   $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
-               }
+                if(is_array($_REQUEST[$optionIdentifier])) {
+                    foreach($_REQUEST[$optionIdentifier] as $optOut) {
+                        $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
+                        $count++;
+                    } //foreach
+                } else {
+                    $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
+                }
             } //if
         } //foreach
         return $get;
@@ -1082,7 +1082,7 @@ 
     }
 
     function setView($view) {
-       $this->view = $view;
+        $this->view = $view;
     }
 
 /**

Braces +40 added lines, -28 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.
@@ -85,8 +87,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();
@@ -147,8 +148,9 @@ 
         $alternate_found = false;
         $alternate2_found = false;
         foreach($this->addresses as $k=>$address) {
-            if ($primary_found && $alternate_found)
-                break;
+            if ($primary_found && $alternate_found) {
+                            break;
+            }
             if ($address['primary_address'] == 1 && !$primary_found) {
                 $primary_index = $k;
                 $primary_found = true;
@@ -286,8 +288,9 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
-            return 0;
+        if(empty($emailCaps)) {
+                    return 0;
+        }
 
         $q = "SELECT *
                 FROM email_addr_bean_rel eabl JOIN email_addresses ea
@@ -303,7 +306,9 @@ 
 
         // do it this way to make the count accurate in oracle
         $i = 0;
-        while ($this->db->fetchByAssoc($r)) ++$i;
+        while ($this->db->fetchByAssoc($r)) {
+            ++$i;
+        }
 
         return $i;
     }
@@ -486,8 +491,9 @@ 
                     foreach($_REQUEST as $k => $v) {
                         if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
-                            if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
-                              $new_addrs[$k] = $v;
+                            if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true") {
+                                                          $new_addrs[$k] = $v;
+                            }
                         }
                     }
                 }
@@ -690,8 +696,7 @@ 
         if ($id) {
             $r = $this->db->query("SELECT * FROM email_addresses WHERE id='".$this->db->quote($id)."'");
             $current_email = $this->db->fetchByAssoc($r);
-        }
-        else {
+        } else {
             $current_email = null;
         }
 
@@ -731,8 +736,7 @@ 
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
-        }
-        else {
+        } else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
             if(!empty($address)){
@@ -798,8 +802,7 @@ 
             // otherwise
             $q .= "
                 ORDER BY ear.reply_to_address DESC";
-        }
-        else
+        } else
         {
             // retrieve reply-to address only
             $q .= "
@@ -850,8 +853,9 @@ 
      */
     function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
-            $this->smarty = new Sugar_Smarty();
+        if ( !($this->smarty instanceOf Sugar_Smarty ) ) {
+                    $this->smarty = new Sugar_Smarty();
+        }
 
         global $app_strings, $dictionary, $beanList;
 
@@ -869,8 +873,9 @@ 
         if(!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
-            if (empty($prefillDataArr) && $module == "Contacts")
-                $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
+            if (empty($prefillDataArr) && $module == "Contacts") {
+                            $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
+            }
         } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
             $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
             $count = 0;
@@ -895,8 +900,9 @@ 
 
         $required = false;
         $vardefs = $dictionary[$beanList[$passedModule]]['fields'];
-        if (!empty($vardefs['email1']) && isset($vardefs['email1']['required']) && $vardefs['email1']['required'])
-            $required = true;
+        if (!empty($vardefs['email1']) && isset($vardefs['email1']['required']) && $vardefs['email1']['required']) {
+                    $required = true;
+        }
         $this->smarty->assign('required', $required);
 
         $this->smarty->assign('module', $saveModule);
@@ -950,13 +956,16 @@ 
      */
     function getEmailAddressWidgetDetailView($focus, $tpl='')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
-            $this->smarty = new Sugar_Smarty();
+        if ( !($this->smarty instanceOf Sugar_Smarty ) ) {
+                    $this->smarty = new Sugar_Smarty();
+        }
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if(empty($focus->id)) {
+            return '';
+        }
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
         foreach($prefillData as $addressItem) {
@@ -985,8 +994,9 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
-            $this->smarty = new Sugar_Smarty();
+        if ( !($this->smarty instanceOf Sugar_Smarty ) ) {
+                    $this->smarty = new Sugar_Smarty();
+        }
 
         $count = 0;
         $emails = array();
@@ -1146,7 +1156,9 @@ 
 
         if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
-            if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
+            if ($view == 'ConvertLead' && $module == "Contacts") {
+                $module = "Leads";
+            }
 
             return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
         }

Spacing +173 added lines, -173 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.
@@ -81,9 +81,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 SugarEmailAddress(){
+    public function SugarEmailAddress() {
         $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 {
@@ -99,16 +99,16 @@ 
      * @param string $module
      */
     function handleLegacySave($bean, $prefix = "") {
-        if(!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
+        if (!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
             if (empty($this->addresses) || !isset($_REQUEST['massupdate'])) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == "1") ? true : false;
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == "1") ? true : false;
 
                 $isPrimary = true;
-                for($i = 1; $i <= 10; $i++){
+                for ($i = 1; $i <= 10; $i++) {
                     $email = 'email'.$i;
-                    if(isset($bean->$email) && !empty($bean->$email)){
+                    if (isset($bean->$email) && !empty($bean->$email)) {
                         $opt_out_field = $email.'_opt_out';
                         $invalid_field = $email.'_invalid';
                         $field_optOut = (isset($bean->$opt_out_field)) ? $bean->$opt_out_field : $optOut;
@@ -119,8 +119,8 @@ 
                 }
             }
         }
-        $this->populateAddresses($bean->id, $bean->module_dir, array(),'');
-        if(isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
+        $this->populateAddresses($bean->id, $bean->module_dir, array(), '');
+        if (isset($_REQUEST) && isset($_REQUEST['useEmailWidget'])) {
             $this->populateLegacyFields($bean);
         }
     }
@@ -142,11 +142,11 @@ 
         return;
     }
 
-    function populateLegacyFields(&$bean){
+    function populateLegacyFields(&$bean) {
         $primary_found = false;
         $alternate_found = false;
         $alternate2_found = false;
-        foreach($this->addresses as $k=>$address) {
+        foreach ($this->addresses as $k=>$address) {
             if ($primary_found && $alternate_found)
                 break;
             if ($address['primary_address'] == 1 && !$primary_found) {
@@ -155,7 +155,7 @@ 
             } elseif (!$alternate_found) {
                 $alternate_index = $k;
                 $alternate_found = true;
-            } elseif (!$alternate2_found){
+            } elseif (!$alternate2_found) {
                 $alternate2_index = $k;
                 $alternate2_found = true;
             }
@@ -192,27 +192,27 @@ 
         $args = func_get_args();
         return call_user_func_array(array($this, '_save'), $args);
     }
-    private function _save($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='', $in_workflow=false) {
-        if(empty($this->addresses) || $in_workflow){
-            $this->populateAddresses($id, $module, $new_addrs,$primary);
+    private function _save($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '', $in_workflow = false) {
+        if (empty($this->addresses) || $in_workflow) {
+            $this->populateAddresses($id, $module, $new_addrs, $primary);
         }
 
         //find all email addresses..
-        $current_links=array();
+        $current_links = array();
         // Need to correct this to handle the Employee/User split
         $module = $this->getCorrectedModule($module);
-        $q2="select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
+        $q2 = "select *  from email_addr_bean_rel eabr WHERE eabr.bean_id = '".$this->db->quote($id)."' AND eabr.bean_module = '".$this->db->quote($module)."' and eabr.deleted=0";
         $r2 = $this->db->query($q2);
-        while(($row2=$this->db->fetchByAssoc($r2)) != null ) {
-            $current_links[$row2['email_address_id']]=$row2;
+        while (($row2 = $this->db->fetchByAssoc($r2)) != null) {
+            $current_links[$row2['email_address_id']] = $row2;
         }
 
         $isConversion = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? true : false;
 
         if (!empty($this->addresses)) {
             // insert new relationships and create email address record, if they don't exist
-            foreach($this->addresses as $address) {
-                if(!empty($address['email_address'])) {
+            foreach ($this->addresses as $address) {
+                if (!empty($address['email_address'])) {
                     $guid = create_guid();
                     $emailId = isset($address['email_address_id'])
                         && isset($current_links[$address['email_address_id']])
@@ -220,14 +220,14 @@ 
                     $emailId = $this->AddUpdateEmailAddress($address['email_address'],
                                                             $address['invalid_email'],
                                                             $address['opt_out'],
-                                                            $emailId);// this will save the email address if not found
+                                                            $emailId); // this will save the email address if not found
 
                     //verify linkage and flags.
-                    $upd_eabr="";
+                    $upd_eabr = "";
                     if (isset($current_links[$emailId])) {
                         if (!$isConversion) { // do not update anything if this is for lead conversion
-                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address'] ) {
-                            $upd_eabr="UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
+                        if ($address['primary_address'] != $current_links[$emailId]['primary_address'] or $address['reply_to_address'] != $current_links[$emailId]['reply_to_address']) {
+                            $upd_eabr = "UPDATE email_addr_bean_rel SET primary_address='".$this->db->quote($address['primary_address'])."', reply_to_address='".$this->db->quote($address['reply_to_address'])."' WHERE id='".$this->db->quote($current_links[$emailId]['id'])."'";
                         }
 
                         unset($current_links[$emailId]);
@@ -258,13 +258,13 @@ 
         // for lead conversion, do not delete email addresses
         if (!empty($current_links) && !$isConversion) {
 
-            $delete="";
+            $delete = "";
             foreach ($current_links as $eabr) {
 
-                $delete.=empty($delete) ? "'".$this->db->quote($eabr['id']) . "' " : ",'" . $this->db->quote($eabr['id']) . "'";
+                $delete .= empty($delete) ? "'".$this->db->quote($eabr['id'])."' " : ",'".$this->db->quote($eabr['id'])."'";
             }
 
-            $eabr_unlink="update email_addr_bean_rel set deleted=1 where id in ({$delete})";
+            $eabr_unlink = "update email_addr_bean_rel set deleted=1 where id in ({$delete})";
             $this->db->query($eabr_unlink);
         }
         $this->stateBeforeWorkflow = null;
@@ -286,7 +286,7 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
+        if (empty($emailCaps))
             return 0;
 
         $q = "SELECT *
@@ -324,10 +324,10 @@ 
         $r = $this->db->query($q, true);
 
         $retArr = array();
-        while($a = $this->db->fetchByAssoc($r)) {
+        while ($a = $this->db->fetchByAssoc($r)) {
             $retArr[] = $a['bean_id'];
         }
-        if(count($retArr) > 0) {
+        if (count($retArr) > 0) {
             return $retArr;
         } else {
             return false;
@@ -347,7 +347,7 @@ 
 
         $email = trim($email);
 
-        if(empty($email)) {
+        if (empty($email)) {
             return array();
         }
 
@@ -356,12 +356,12 @@ 
                 WHERE ea.email_address_caps = $emailCaps and eabl.deleted=0 ";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r)) {
-            if(isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
+        while ($a = $this->db->fetchByAssoc($r)) {
+            if (isset($beanList[$a['bean_module']]) && !empty($beanList[$a['bean_module']])) {
                 $className = $beanList[$a['bean_module']];
 
-                if(isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
-                    if(!class_exists($className)) {
+                if (isset($beanFiles[$className]) && !empty($beanFiles[$className])) {
+                    if (!class_exists($className)) {
                         require_once($beanFiles[$className]);
                     }
 
@@ -389,7 +389,7 @@ 
      * @param string $replyTo GUID of reply-to address
      * @param string $invalid GUID of invalid address
      */
-    function populateAddresses($id, $module, $new_addrs=array(), $primary='', $replyTo='', $invalid='', $optOut='') {
+    function populateAddresses($id, $module, $new_addrs = array(), $primary = '', $replyTo = '', $invalid = '', $optOut = '') {
         $module = $this->getCorrectedModule($module);
         //One last check for the ConvertLead action in which case we need to change $module to 'Leads'
         $module = (isset($_REQUEST) && isset($_REQUEST['action']) && $_REQUEST['action'] == 'ConvertLead') ? 'Leads' : $module;
@@ -400,54 +400,54 @@ 
         $hasEmailValue = false;
         $email_ids = array();
 
-        if (isset($_REQUEST) && isset($_REQUEST[$module .'_email_widget_id'])) {
+        if (isset($_REQUEST) && isset($_REQUEST[$module.'_email_widget_id'])) {
 
             $fromRequest = false;
             // determine which array to process
-            foreach($_REQUEST as $k => $v) {
-                if(strpos($k, 'emailAddress') !== false) {
+            foreach ($_REQUEST as $k => $v) {
+                if (strpos($k, 'emailAddress') !== false) {
                    $fromRequest = true;
                    break;
                 }
-            $widget_id = $_REQUEST[$module .'_email_widget_id'];
+            $widget_id = $_REQUEST[$module.'_email_widget_id'];
     }
 
             //Iterate over the widgets for this module, in case there are multiple email widgets for this module
-            while(isset($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount]))
+            while (isset($_REQUEST[$module.$widget_id."emailAddress".$widgetCount]))
             {
-                if (empty($_REQUEST[$module . $widget_id . "emailAddress" . $widgetCount])) {
+                if (empty($_REQUEST[$module.$widget_id."emailAddress".$widgetCount])) {
                     $widgetCount++;
                     continue;
                 }
 
                 $hasEmailValue = true;
 
-                $eId = $module . $widget_id;
-                if(isset($_REQUEST[$eId . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$eId . 'emailAddressPrimaryFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressPrimaryFlag'])) {
-                   $primaryValue = $_REQUEST[$module . 'emailAddressPrimaryFlag'];
+                $eId = $module.$widget_id;
+                if (isset($_REQUEST[$eId.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$eId.'emailAddressPrimaryFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressPrimaryFlag'])) {
+                   $primaryValue = $_REQUEST[$module.'emailAddressPrimaryFlag'];
                 }
 
                 $optOutValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$eId .'emailAddressOptOutFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressOptOutFlag'])) {
-                   $optOutValues = $_REQUEST[$module . 'emailAddressOptOutFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$eId.'emailAddressOptOutFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressOptOutFlag'])) {
+                   $optOutValues = $_REQUEST[$module.'emailAddressOptOutFlag'];
                 }
 
                 $invalidValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$eId .'emailAddressInvalidFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressInvalidFlag'])) {
-                   $invalidValues = $_REQUEST[$module . 'emailAddressInvalidFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$eId.'emailAddressInvalidFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressInvalidFlag'])) {
+                   $invalidValues = $_REQUEST[$module.'emailAddressInvalidFlag'];
                 }
 
                 $deleteValues = array();
-                if(isset($_REQUEST[$eId .'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$eId .'emailAddressDeleteFlag'];
-                } else if(isset($_REQUEST[$module . 'emailAddressDeleteFlag'])) {
-                   $deleteValues = $_REQUEST[$module . 'emailAddressDeleteFlag'];
+                if (isset($_REQUEST[$eId.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$eId.'emailAddressDeleteFlag'];
+                } else if (isset($_REQUEST[$module.'emailAddressDeleteFlag'])) {
+                   $deleteValues = $_REQUEST[$module.'emailAddressDeleteFlag'];
                 }
 
                 // prep from form save
@@ -455,36 +455,36 @@ 
                 $replyToField = '';
                 $invalidField = '';
                 $optOutField = '';
-                if($fromRequest && empty($primary) && isset($primaryValue)) {
+                if ($fromRequest && empty($primary) && isset($primaryValue)) {
                     $primaryField = $primaryValue;
                 }
 
-                if($fromRequest && empty($replyTo)) {
-                    if(isset($_REQUEST[$eId .'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$eId .'emailAddressReplyToFlag'];
-                    } else if(isset($_REQUEST[$module . 'emailAddressReplyToFlag'])) {
-                       $replyToField = $_REQUEST[$module . 'emailAddressReplyToFlag'];
+                if ($fromRequest && empty($replyTo)) {
+                    if (isset($_REQUEST[$eId.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$eId.'emailAddressReplyToFlag'];
+                    } else if (isset($_REQUEST[$module.'emailAddressReplyToFlag'])) {
+                       $replyToField = $_REQUEST[$module.'emailAddressReplyToFlag'];
                     }
                 }
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddress[0-9]+$/i', $k) && !empty($v)) {
                             $new_addrs[$k] = $v;
                         }
                     }
                 }
-                if($fromRequest && empty($email_ids)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($email_ids)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressId[0-9]+$/i', $k) && !empty($v)) {
                             $key = str_replace('emailAddressId', 'emailAddress', $k);
                             $email_ids[$key] = $v;
                         }
                     }
                 }
 
-                if($fromRequest && empty($new_addrs)) {
-                    foreach($_REQUEST as $k => $v) {
-                        if(preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
+                if ($fromRequest && empty($new_addrs)) {
+                    foreach ($_REQUEST as $k => $v) {
+                        if (preg_match('/'.$eId.'emailAddressVerifiedValue[0-9]+$/i', $k) && !empty($v)) {
                             $validateFlag = str_replace("Value", "Flag", $k);
                             if (isset($_REQUEST[$validateFlag]) && $_REQUEST[$validateFlag] == "true")
                               $new_addrs[$k] = $v;
@@ -493,21 +493,21 @@ 
                 }
 
                 //empty the addresses array if the post happened from email address widget.
-                if($post_from_email_address_widget) {
-                    $this->addresses=array();  //this gets populated during retrieve of the contact bean.
+                if ($post_from_email_address_widget) {
+                    $this->addresses = array(); //this gets populated during retrieve of the contact bean.
                 } else {
                     $optOutValues = array();
                     $invalidValues = array();
-                    foreach($new_addrs as $k=>$email) {
+                    foreach ($new_addrs as $k=>$email) {
                        preg_match('/emailAddress([0-9])+$/', $k, $matches);
                        $count = $matches[1];
-                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '" . $this->db->quote(strtoupper($email)) . "'");
-                       if(!empty($result)) {
-                          $row=$this->db->fetchByAssoc($result);
-                          if(!empty($row['opt_out'])) {
+                       $result = $this->db->query("SELECT opt_out, invalid_email from email_addresses where email_address_caps = '".$this->db->quote(strtoupper($email))."'");
+                       if (!empty($result)) {
+                          $row = $this->db->fetchByAssoc($result);
+                          if (!empty($row['opt_out'])) {
                              $optOutValues[$k] = "emailAddress$count";
                           }
-                          if(!empty($row['invalid_email'])) {
+                          if (!empty($row['invalid_email'])) {
                              $invalidValues[$k] = "emailAddress$count";
                           }
                        }
@@ -515,11 +515,11 @@ 
                 }
                 // Re-populate the addresses class variable if we have new address(es).
                 if (!empty($new_addrs)) {
-                    foreach($new_addrs as $k => $reqVar) {
+                    foreach ($new_addrs as $k => $reqVar) {
                         //$key = preg_match("/^$eId/s", $k) ? substr($k, strlen($eId)) : $k;
                         $reqVar = trim($reqVar);
-                        if(strpos($k, 'emailAddress') !== false) {
-                            if(!empty($reqVar) && !in_array($k, $deleteValues)) {
+                        if (strpos($k, 'emailAddress') !== false) {
+                            if (!empty($reqVar) && !in_array($k, $deleteValues)) {
                                 $email_id   = (array_key_exists($k, $email_ids)) ? $email_ids[$k] : null;
                                 $primary    = ($k == $primaryValue) ? true : false;
                                 $replyTo    = ($k == $replyToField) ? true : false;
@@ -536,7 +536,7 @@ 
         }
 
         //If no widgets, set addresses array to empty
-        if($post_from_email_address_widget && !$hasEmailValue) {
+        if ($post_from_email_address_widget && !$hasEmailValue) {
            $this->addresses = array();
         }
     }
@@ -547,9 +547,9 @@ 
      * @param bool $primary Default false
      * @param bool $replyTo Default false
      */
-    function addAddress($addr, $primary=false, $replyTo=false, $invalid=false, $optOut=false, $email_id = null) {
+    function addAddress($addr, $primary = false, $replyTo = false, $invalid = false, $optOut = false, $email_id = null) {
         $addr = html_entity_decode($addr, ENT_QUOTES);
-        if(preg_match($this->regex, $addr)) {
+        if (preg_match($this->regex, $addr)) {
             $primaryFlag = ($primary) ? '1' : '0';
             $replyToFlag = ($replyTo) ? '1' : '0';
             $invalidFlag = ($invalid) ? '1' : '0';
@@ -585,17 +585,17 @@ 
      * Updates invalid_email and opt_out flags for each address
      */
     function updateFlags() {
-        if(!empty($this->addresses)) {
-            foreach($this->addresses as $addressMeta) {
-                if(isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
+        if (!empty($this->addresses)) {
+            foreach ($this->addresses as $addressMeta) {
+                if (isset($addressMeta['email_address']) && !empty($addressMeta['email_address'])) {
                     $address = $this->db->quote($this->_cleanAddress($addressMeta['email_address']));
 
                     $q = "SELECT * FROM email_addresses WHERE email_address = '{$address}'";
                     $r = $this->db->query($q);
                     $a = $this->db->fetchByAssoc($r);
 
-                    if(!empty($a)) {
-                        if(isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
+                    if (!empty($a)) {
+                        if (isset($a['invalid_email']) && isset($addressMeta['invalid_email']) && isset($addressMeta['opt_out']) && $a['invalid_email'] != $addressMeta['invalid_email'] || $a['opt_out'] != $addressMeta['opt_out']) {
                             $qUpdate = "UPDATE email_addresses SET invalid_email = ".intval($addressMeta['invalid_email']).", opt_out = ".intval($addressMeta['opt_out']).", date_modified = '".TimeDate::getInstance()->nowDb()."' WHERE id = '".$this->db->quote($a['id'])."'";
                             $rUpdate = $this->db->query($qUpdate);
                         }
@@ -608,7 +608,7 @@ 
     public function splitEmailAddress($addr)
     {
         $email = $this->_cleanAddress($addr);
-        if(!preg_match($this->regex, $email)) {
+        if (!preg_match($this->regex, $email)) {
             $email = ''; // remove bad email addr
         }
         $name = trim(str_replace(array($email, '<', '>', '"', "'"), '', $addr));
@@ -624,8 +624,8 @@ 
     function _cleanAddress($addr) {
         $addr = trim(from_html($addr));
 
-        if(strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
-            $address = trim(substr($addr, strrpos($addr, "<") +1, strrpos($addr, ">") - strrpos($addr, "<") -1));
+        if (strpos($addr, "<") !== false && strpos($addr, ">") !== false) {
+            $address = trim(substr($addr, strrpos($addr, "<") + 1, strrpos($addr, ">") - strrpos($addr, "<") - 1));
         } else {
             $address = trim($addr);
         }
@@ -646,11 +646,11 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(!empty($a) && !empty($a['id'])) {
+        if (!empty($a) && !empty($a['id'])) {
             return $a['id'];
         } else {
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted)
@@ -672,7 +672,7 @@ 
      *        to propagate to the new SugarEmailAddress - see bug 39188
      * @return String GUID of Email Address or '' if cleaned address was empty.
      */
-    public function AddUpdateEmailAddress($addr,$invalid=0,$opt_out=0,$id=null)
+    public function AddUpdateEmailAddress($addr, $invalid = 0, $opt_out = 0, $id = null)
     {
         // sanity checks to avoid SQL injection.
         $invalid = intval($invalid);
@@ -722,12 +722,12 @@ 
             if ($duplicate_email['invalid_email'] != $new_invalid ||
                 $duplicate_email['opt_out'] != $new_opt_out ||
                 (trim($duplicate_email['email_address']) != $address)) {
-                $upd_q = 'UPDATE ' . $this->table_name . ' ' .
-                    'SET email_address=\'' . $address . '\', ' .
-                    'invalid_email=' . $new_invalid . ', ' .
-                    'opt_out=' . $new_opt_out . ', ' .
-                    'date_modified=' . $this->db->now() . ' ' .
-                    'WHERE id=\'' . $this->db->quote($duplicate_email['id']) . '\'';
+                $upd_q = 'UPDATE '.$this->table_name.' '.
+                    'SET email_address=\''.$address.'\', '.
+                    'invalid_email='.$new_invalid.', '.
+                    'opt_out='.$new_opt_out.', '.
+                    'date_modified='.$this->db->now().' '.
+                    'WHERE id=\''.$this->db->quote($duplicate_email['id']).'\'';
                 $upd_r = $this->db->query($upd_q);
             }
             return $duplicate_email['id'];
@@ -735,7 +735,7 @@ 
         else {
             // no case-insensitive address match - it's new, or undeleted.
             $guid = '';
-            if(!empty($address)){
+            if (!empty($address)) {
                 $guid = create_guid();
                 $now = TimeDate::getInstance()->nowDb();
                 $qa = "INSERT INTO email_addresses (id, email_address, email_address_caps, date_created, date_modified, deleted, invalid_email, opt_out)
@@ -751,12 +751,12 @@ 
      * @param object $focus Object in focus
      * @return string email
      */
-    function getPrimaryAddress($focus,$parent_id=null,$parent_type=null) {
+    function getPrimaryAddress($focus, $parent_id = null, $parent_type = null) {
 
-        $parent_type=empty($parent_type) ? $focus->module_dir : $parent_type;
+        $parent_type = empty($parent_type) ? $focus->module_dir : $parent_type;
         // Bug63174: Email address is not shown in the list view for employees
         $parent_type = $this->getCorrectedModule($parent_type);
-        $parent_id=empty($parent_id) ? $focus->id : $parent_id;
+        $parent_id = empty($parent_id) ? $focus->id : $parent_id;
 
         $q = "SELECT ea.email_address FROM email_addresses ea
                 LEFT JOIN email_addr_bean_rel ear ON ea.id = ear.email_address_id
@@ -768,7 +768,7 @@ 
         $r = $this->db->limitQuery($q, 0, 1);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -809,7 +809,7 @@ 
         $r = $this->db->query($q);
         $a = $this->db->fetchByAssoc($r);
 
-        if(isset($a['email_address'])) {
+        if (isset($a['email_address'])) {
             return $a['email_address'];
         }
         return '';
@@ -834,7 +834,7 @@ 
                 ORDER BY ear.reply_to_address, ear.primary_address DESC";
         $r = $this->db->query($q);
 
-        while($a = $this->db->fetchByAssoc($r, FALSE)) {
+        while ($a = $this->db->fetchByAssoc($r, FALSE)) {
             $return[] = $a;
         }
 
@@ -848,9 +848,9 @@ 
      * @param bool asMetadata Default false
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetEditView($id, $module, $asMetadata=false, $tpl='',$tabindex='0')
+    function getEmailAddressWidgetEditView($id, $module, $asMetadata = false, $tpl = '', $tabindex = '0')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings, $dictionary, $beanList;
@@ -861,33 +861,33 @@ 
         $passedModule = $module;
         $module = $this->getCorrectedModule($module);
         $saveModule = $module;
-        if(isset($_POST['is_converted']) && $_POST['is_converted']==true){
-            $id=$_POST['return_id'];
-            $module=$_POST['return_module'];
+        if (isset($_POST['is_converted']) && $_POST['is_converted'] == true) {
+            $id = $_POST['return_id'];
+            $module = $_POST['return_module'];
         }
         $prefillDataArr = array();
-        if(!empty($id)) {
+        if (!empty($id)) {
             $prefillDataArr = $this->getAddressesByGUID($id, $module);
             //When coming from convert leads, sometimes module is Contacts while the id is for a lead.
             if (empty($prefillDataArr) && $module == "Contacts")
                 $prefillDataArr = $this->getAddressesByGUID($id, "Leads");
-        } else if(isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])){
-            $widget_id = isset($_REQUEST[$module . '_email_widget_id']) ? $_REQUEST[$module . '_email_widget_id'] : '0';
+        } else if (isset($_REQUEST['full_form']) && !empty($_REQUEST['emailAddressWidget'])) {
+            $widget_id = isset($_REQUEST[$module.'_email_widget_id']) ? $_REQUEST[$module.'_email_widget_id'] : '0';
             $count = 0;
-            $key = $module . $widget_id . 'emailAddress'.$count;
-            while(isset($_REQUEST[$key])) {
+            $key = $module.$widget_id.'emailAddress'.$count;
+            while (isset($_REQUEST[$key])) {
                    $email = $_REQUEST[$key];
-                   $prefillDataArr[] =  array('email_address'=>$email,
+                   $prefillDataArr[] = array('email_address'=>$email,
                                              'primary_address'=>isset($_REQUEST['emailAddressPrimaryFlag']) && $_REQUEST['emailAddressPrimaryFlag'] == $key,
                                              'invalid_email'=>isset($_REQUEST['emailAddressInvalidFlag']) && in_array($key, $_REQUEST['emailAddressInvalidFlag']),
                                              'opt_out'=>isset($_REQUEST['emailAddressOptOutFlag']) && in_array($key, $_REQUEST['emailAddressOptOutFlag']),
                                              'reply_to_address'=>false
                                         );
-                   $key = $module . $widget_id . 'emailAddress' . ++$count;
+                   $key = $module.$widget_id.'emailAddress'.++$count;
             } //while
         }
 
-        if(!empty($prefillDataArr)) {
+        if (!empty($prefillDataArr)) {
             $json = new JSON(JSON_LOOSE_TYPE);
             $prefillData = $json->encode($prefillDataArr);
             $prefill = !empty($prefillDataArr) ? 'true' : 'false';
@@ -910,23 +910,23 @@ 
         $form = $this->view;
 
         //determine if this should be a quickcreate form, or a quick create form under subpanels
-        if ($this->view == "QuickCreate"){
+        if ($this->view == "QuickCreate") {
             // Fixed #1120 - fixed email validation for: Accounts -> Contacts subpanel -> Select -> Create Contact -> Save.
             // If email is required it should highlight this field and show an error message.
             // It didnt because the the form was named form_DCSubpanelQuickCreate_Contacts instead of expected form_SubpanelQuickCreate_Contacts
-            if($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
-                $form = 'form_'.$this->view .'_'.$module;
+            if ($this->object_name = 'EmailAddress' && $saveModule == 'Contacts') {
+                $form = 'form_'.$this->view.'_'.$module;
             } else {
-                $form = 'form_DC'.$this->view .'_'.$module;
+                $form = 'form_DC'.$this->view.'_'.$module;
             }
-            if(isset($_REQUEST['action']) && $_REQUEST['action']=='SubpanelCreates' ||  $_REQUEST['action']=='SubpanelEdits'){
-                $form = 'form_Subpanel'.$this->view .'_'.$module;
+            if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'SubpanelCreates' || $_REQUEST['action'] == 'SubpanelEdits') {
+                $form = 'form_Subpanel'.$this->view.'_'.$module;
             }
         }
 
         $this->smarty->assign('emailView', $form);
 
-        if($module == 'Users') {
+        if ($module == 'Users') {
             $this->smarty->assign('useReplyTo', true);
         } else {
             $this->smarty->assign('useOptOut', true);
@@ -937,7 +937,7 @@ 
         $newEmail = $this->smarty->fetch($template);
 
 
-        if($asMetadata) {
+        if ($asMetadata) {
             // used by Email 2.0
             $ret = array();
             $ret['prefillData'] = $prefillDataArr;
@@ -955,18 +955,18 @@ 
      * @param object $focus Bean in focus
      * @return string HTML/JS for widget
      */
-    function getEmailAddressWidgetDetailView($focus, $tpl='')
+    function getEmailAddressWidgetDetailView($focus, $tpl = '')
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         global $app_strings;
         global $current_user;
         $assign = array();
-        if(empty($focus->id))return '';
+        if (empty($focus->id))return '';
         $prefillData = $this->getAddressesByGUID($focus->id, $focus->module_dir);
 
-        foreach($prefillData as $addressItem) {
+        foreach ($prefillData as $addressItem) {
             $key = ($addressItem['primary_address'] == 1) ? 'primary' : "";
             $key = ($addressItem['reply_to_address'] == 1) ? 'reply_to' : $key;
             $key = ($addressItem['opt_out'] == 1) ? 'opt_out' : $key;
@@ -992,7 +992,7 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         $count = 0;
@@ -1002,49 +1002,49 @@ 
         $invalid = array();
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $this->smarty->assign('email_widget_id',$widget_id);
-        $this->smarty->assign('emailAddressWidget',$_POST['emailAddressWidget']);
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $this->smarty->assign('email_widget_id', $widget_id);
+        $this->smarty->assign('emailAddressWidget', $_POST['emailAddressWidget']);
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'])) {
-           $primary = $_POST[$mod . $widget_id . 'emailAddressPrimaryFlag'];
+        if (isset($_POST[$mod.$widget_id.'emailAddressPrimaryFlag'])) {
+           $primary = $_POST[$mod.$widget_id.'emailAddressPrimaryFlag'];
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddress" . $count])) {
-            $emails[] = $_POST[$mod . $widget_id . 'emailAddress' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddress".$count])) {
+            $emails[] = $_POST[$mod.$widget_id.'emailAddress'.$count];
             $count++;
         }
 
-        if($count == 0) {
+        if ($count == 0) {
            return "";
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressOptOutFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressOptOutFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressOptOutFlag'] as $v) {
               $optOut[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressInvalidFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressInvalidFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressInvalidFlag'] as $v) {
               $invalid[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressReplyToFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressReplyToFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressReplyToFlag'] as $v) {
               $replyTo[] = $v;
            }
         }
 
-        if(isset($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'])) {
-           foreach($_POST[$mod . $widget_id . 'emailAddressDeleteFlag'] as $v) {
+        if (isset($_POST[$mod.$widget_id.'emailAddressDeleteFlag'])) {
+           foreach ($_POST[$mod.$widget_id.'emailAddressDeleteFlag'] as $v) {
               $delete[] = $v;
            }
         }
 
-        while(isset($_POST[$mod . $widget_id . "emailAddressVerifiedValue" . $count])) {
-            $verified[] = $_POST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count];
+        while (isset($_POST[$mod.$widget_id."emailAddressVerifiedValue".$count])) {
+            $verified[] = $_POST[$mod.$widget_id.'emailAddressVerifiedValue'.$count];
             $count++;
         }
 
@@ -1069,33 +1069,33 @@ 
         $count = 0;
         $mod = isset($focus) ? $focus->module_dir : "";
 
-        $widget_id = $_POST[$mod .'_email_widget_id'];
-        $get .= '&' . $mod . '_email_widget_id='. $widget_id;
+        $widget_id = $_POST[$mod.'_email_widget_id'];
+        $get .= '&'.$mod.'_email_widget_id='.$widget_id;
         $get .= '&emailAddressWidget='.$_POST['emailAddressWidget'];
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddress' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddress" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddress' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddress'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddress".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddress'.$count]);
               $count++;
         } //while
 
-        while(isset($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count])) {
-              $get .= "&" . $mod . $widget_id . "emailAddressVerifiedValue" . $count . "=" . urlencode($_REQUEST[$mod . $widget_id . 'emailAddressVerifiedValue' . $count]);
+        while (isset($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count])) {
+              $get .= "&".$mod.$widget_id."emailAddressVerifiedValue".$count."=".urlencode($_REQUEST[$mod.$widget_id.'emailAddressVerifiedValue'.$count]);
               $count++;
         } //while
 
         $options = array('emailAddressPrimaryFlag', 'emailAddressOptOutFlag', 'emailAddressInvalidFlag', 'emailAddressDeleteFlag', 'emailAddressReplyToFlag');
 
-        foreach($options as $option) {
+        foreach ($options as $option) {
             $count = 0;
             $optionIdentifier = $mod.$widget_id.$option;
-            if(isset($_REQUEST[$optionIdentifier])) {
-               if(is_array($_REQUEST[$optionIdentifier])) {
-                   foreach($_REQUEST[$optionIdentifier] as $optOut) {
-                      $get .= "&" . $optionIdentifier . "[" . $count . "]=" . $optOut;
+            if (isset($_REQUEST[$optionIdentifier])) {
+               if (is_array($_REQUEST[$optionIdentifier])) {
+                   foreach ($_REQUEST[$optionIdentifier] as $optOut) {
+                      $get .= "&".$optionIdentifier."[".$count."]=".$optOut;
                       $count++;
                    } //foreach
                } else {
-                   $get .= "&" . $optionIdentifier . "=" . $_REQUEST[$optionIdentifier];
+                   $get .= "&".$optionIdentifier."=".$_REQUEST[$optionIdentifier];
                }
             } //if
         } //foreach
@@ -1113,7 +1113,7 @@ 
  * @return string The value for the bean_module column in the email_addr_bean_rel table
  */
     function getCorrectedModule(&$module) {
-        return ($module == "Employees")? "Users" : $module;
+        return ($module == "Employees") ? "Users" : $module;
     }
 
     public function stash($parentBeanId, $moduleName)
@@ -1123,7 +1123,7 @@ 
         $ids = array();
         while ($row = $this->db->fetchByAssoc($result, false))
         {
-            $ids[] =$this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
+            $ids[] = $this->db->quote($row['email_address_id']); // avoid 2nd order SQL Injection
         }
         if (!empty($ids))
         {
@@ -1147,15 +1147,15 @@ 
  * @param string $view DetailView or EditView
  * @return string
  */
-function getEmailAddressWidget($focus, $field, $value, $view, $tabindex='0') {
+function getEmailAddressWidget($focus, $field, $value, $view, $tabindex = '0') {
     $sea = new SugarEmailAddress();
     $sea->setView($view);
 
-        if($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
+        if ($view == 'EditView' || $view == 'QuickCreate' || $view == 'ConvertLead') {
             $module = $focus->module_dir;
             if ($view == 'ConvertLead' && $module == "Contacts")  $module = "Leads";
 
-            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false,'',$tabindex);
+            return $sea->getEmailAddressWidgetEditView($focus->id, $module, false, '', $tabindex);
         }
 
     return $sea->getEmailAddressWidgetDetailView($focus);

include/SugarOauth.php

Indentation +39 added lines, -39 removed lines

@@ -145,34 +145,34 @@ 
          * @return array
          */
         public function getAccessToken($url,
-                                       Zend_Oauth_Token_Request $token = null,
-                                       $httpMethod = null,
-                                       Zend_Oauth_Http_AccessToken $request = null)
+                                        Zend_Oauth_Token_Request $token = null,
+                                        $httpMethod = null,
+                                        Zend_Oauth_Http_AccessToken $request = null)
         {
             $this->setAccessTokenUrl($url);
             $this->_last = $token = parent::getAccessToken($_REQUEST, $this->makeRequestToken());
             return array('oauth_token' => $token->getToken(), 'oauth_token_secret' => $token->getTokenSecret());
         }
 
-       /**
-        * Fetch URL with OAuth
-        * @param string $url
-        * @param string $params Query params
-        * @param string $method HTTP method
-        * @param array $headers HTTP headers
-        * @return string
-        */
+        /**
+         * Fetch URL with OAuth
+         * @param string $url
+         * @param string $params Query params
+         * @param string $method HTTP method
+         * @param array $headers HTTP headers
+         * @return string
+         */
         
         public function fetch($url, $params = null, $method = 'GET', $headers = null)
         {
             $acc = $this->makeAccessToken();
             if ( strpos($url,'?') ) {
-               list($clean_url, $query) = explode('?', $url);
-               if($query) {
-                   $url = $clean_url;
-                   parse_str($query, $query_params);
-                   $params = array_merge($params?$params:array(), $query_params);
-               }
+                list($clean_url, $query) = explode('?', $url);
+                if($query) {
+                    $url = $clean_url;
+                    parse_str($query, $query_params);
+                    $params = array_merge($params?$params:array(), $query_params);
+                }
             }
             $client = $acc->getHttpClient($this->_oauth_config, $url);
             
@@ -212,33 +212,33 @@ 
             $this->_last = $resp = $client->request();
             $this->_lastReq = $client->getLastRequest();
             return $resp->getBody();
-       }
+        }
 
-       /**
-        * Get HTTP client
-        * @return Zend_Oauth_Client
-        */
-       public function getClient()
-       {
+        /**
+         * Get HTTP client
+         * @return Zend_Oauth_Client
+         */
+        public function getClient()
+        {
             $acc = $this->makeAccessToken();
             return $acc->getHttpClient($this->_oauth_config);
-       }
+        }
 
-       /**
-        * Get last response
-        * @return string
-        */
-       public function getLastResponse()
-       {
+        /**
+         * Get last response
+         * @return string
+         */
+        public function getLastResponse()
+        {
             return $this->_last;
-       }
+        }
 
-       /**
-        * Get last request
-        * @return string
-        */
-       public function getLastRequest()
-       {
+        /**
+         * Get last request
+         * @return string
+         */
+        public function getLastRequest()
+        {
             return $this->_lastReq;
-       }
+        }
     }

Spacing +14 added lines, -14 removed lines

@@ -55,13 +55,13 @@ 
          * @param string $consumer_secret
          * @param array $params OAuth options
          */
-        public function __construct($consumer_key , $consumer_secret, $params = null)
+        public function __construct($consumer_key, $consumer_secret, $params = null)
         {
             $this->_oauth_config = array(
                 'consumerKey' => $consumer_key,
                 'consumerSecret' => $consumer_secret,
             );
-            if(!empty($params)) {
+            if (!empty($params)) {
                 $this->_oauth_config = array_merge($this->_oauth_config, $params);
             }
             parent::__construct($this->_oauth_config);
@@ -120,20 +120,20 @@ 
          */
         public function getRequestTokenByUrl($url, $callback = null, $params = array())
         {
-            if(!empty($callback)) {
+            if (!empty($callback)) {
                 $this->setCallbackUrl($callback);
             }
             list($clean_url, $query) = explode('?', $url);
-            if($query) {
+            if ($query) {
                 $url = $clean_url;
                 parse_str($query, $query_params);
                 $params = array_merge($params, $query_params);
             }
             $this->setRequestTokenUrl($url);
-            try{
+            try {
                 $this->_last = $token = parent::getRequestToken($params);
                 return array('oauth_token' => $token->getToken(), 'oauth_token_secret' => $token->getTokenSecret());
-            }catch(Zend_Oauth_Exception $e){
+            }catch (Zend_Oauth_Exception $e) {
                 return array('oauth_token' => '', 'oauth_token_secret' => '');
             }
         }
@@ -166,12 +166,12 @@ 
         public function fetch($url, $params = null, $method = 'GET', $headers = null)
         {
             $acc = $this->makeAccessToken();
-            if ( strpos($url,'?') ) {
+            if (strpos($url, '?')) {
                list($clean_url, $query) = explode('?', $url);
-               if($query) {
+               if ($query) {
                    $url = $clean_url;
                    parse_str($query, $query_params);
-                   $params = array_merge($params?$params:array(), $query_params);
+                   $params = array_merge($params ? $params : array(), $query_params);
                }
             }
             $client = $acc->getHttpClient($this->_oauth_config, $url);
@@ -180,7 +180,7 @@ 
             $proxy_config = SugarModule::get('Administration')->loadBean();
             $proxy_config->retrieveSettings('proxy');
             
-            if( !empty($proxy_config) && 
+            if (!empty($proxy_config) && 
                 !empty($proxy_config->settings['proxy_on']) &&
                 $proxy_config->settings['proxy_on'] == 1) {
                 
@@ -188,7 +188,7 @@ 
                 $proxy_settings['proxy_host'] = $proxy_config->settings['proxy_host'];
                 $proxy_settings['proxy_port'] = $proxy_config->settings['proxy_port'];
     
-                if(!empty($proxy_config->settings['proxy_auth'])){
+                if (!empty($proxy_config->settings['proxy_auth'])) {
                     $proxy_settings['proxy_user'] = $proxy_config->settings['proxy_username'];
                     $proxy_settings['proxy_pass'] = $proxy_config->settings['proxy_password'];
                 }
@@ -199,11 +199,11 @@ 
             }
             
             $client->setMethod($method);
-            if(!empty($headers)) {
+            if (!empty($headers)) {
                 $client->setHeaders($headers);
             }
-            if(!empty($params)) {
-                if($method == 'GET') {
+            if (!empty($params)) {
+                if ($method == 'GET') {
                     $client->setParameterGet($params);
                 } else {
                     $client->setParameterPost($params);

Braces +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
             try{
                 $this->_last = $token = parent::getRequestToken($params);
                 return array('oauth_token' => $token->getToken(), 'oauth_token_secret' => $token->getTokenSecret());
-            }catch(Zend_Oauth_Exception $e){
+            } catch(Zend_Oauth_Exception $e){
                 return array('oauth_token' => '', 'oauth_token_secret' => '');
             }
         }