adamjakab / SuiteCRM

include/SugarFields/Parsers/EditViewMetaParser.php

Indentation +232 added lines, -232 removed lines

@@ -52,7 +52,7 @@ 
 class EditViewMetaParser extends MetaParser {
 
 function EditViewMetaParser() {
-   $this->mView = 'EditView';
+    $this->mView = 'EditView';
 }
 
 /**
@@ -67,277 +67,277 @@ 
  **/
 function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
 
-   global $app_strings;
-   $contents = file_get_contents($filePath);
-   $contents = $this->trimHTML($contents);
-   $contents = $this->stripFlavorTags($contents);
-   $moduleName = '';
+    global $app_strings;
+    $contents = file_get_contents($filePath);
+    $contents = $this->trimHTML($contents);
+    $contents = $this->stripFlavorTags($contents);
+    $moduleName = '';
    
-   $contents = $this->fixDuplicateTrTags($contents);
-   $contents = $this->fixRowsWithMissingTr($contents);   
+    $contents = $this->fixDuplicateTrTags($contents);
+    $contents = $this->fixRowsWithMissingTr($contents);   
    
-   $tables = $this->getElementsByType("table", $contents);
-   $formElements = $this->getFormElements($tables[0]);
-   $hiddenInputs = array();
-   foreach($formElements as $elem) {
-   	      $type = $this->getTagAttribute("type", $elem);
-   	      if(preg_match('/hidden/si',$type)) {
-   	         $name = $this->getTagAttribute("name", $elem);
-   	         $value = $this->getTagAttribute("value", $elem);
-   	         $hiddenInputs[$name] = $value;
-   	      }
-   }
+    $tables = $this->getElementsByType("table", $contents);
+    $formElements = $this->getFormElements($tables[0]);
+    $hiddenInputs = array();
+    foreach($formElements as $elem) {
+                $type = $this->getTagAttribute("type", $elem);
+                if(preg_match('/hidden/si',$type)) {
+                $name = $this->getTagAttribute("name", $elem);
+                $value = $this->getTagAttribute("value", $elem);
+                $hiddenInputs[$name] = $value;
+                }
+    }
 
-   // Get the second table in the page and onward
-   $tables = array_slice($tables, 1);
-   $panels = array();
-   $tableCount = 0;
-   $addedElements = array();
-   $maxTableCountNum = 0;
-   $tableCount = 0;
-   foreach($tables as $table) {
-   	      $table = $this->fixTablesWithMissingTr($table);
-   	      $toptr = $this->getElementsByType("tr", $table);
-          foreach($toptr as $tr) {
-          	      $tabledata = $this->getElementsByType("table", $tr);
-          	      $data = array();
-          	      $panelKey = $tableCount == 0 ? "default" : '';
-          	      foreach($tabledata as $t) {
-          	      	      $vals = array_values($this->getElementsByType("tr", $t));
-          	      	      if(preg_match_all('/<h4[^>]*?>.*?(\{MOD\.|\{APP\.)(LBL_[^\}]*?)[\}].*?<\/h4>/s', $vals[0], $matches, PREG_SET_ORDER)) {
-          	      	      	array_shift($vals);
-          	      	      	$panelKey = count($matches[0]) == 3 ? strtolower($matches[0][2]) : $panelKey;
-          	      	      }
+    // Get the second table in the page and onward
+    $tables = array_slice($tables, 1);
+    $panels = array();
+    $tableCount = 0;
+    $addedElements = array();
+    $maxTableCountNum = 0;
+    $tableCount = 0;
+    foreach($tables as $table) {
+                $table = $this->fixTablesWithMissingTr($table);
+                $toptr = $this->getElementsByType("tr", $table);
+            foreach($toptr as $tr) {
+                    $tabledata = $this->getElementsByType("table", $tr);
+                    $data = array();
+                    $panelKey = $tableCount == 0 ? "default" : '';
+                    foreach($tabledata as $t) {
+                                $vals = array_values($this->getElementsByType("tr", $t));
+                                if(preg_match_all('/<h4[^>]*?>.*?(\{MOD\.|\{APP\.)(LBL_[^\}]*?)[\}].*?<\/h4>/s', $vals[0], $matches, PREG_SET_ORDER)) {
+                                    array_shift($vals);
+                                    $panelKey = count($matches[0]) == 3 ? strtolower($matches[0][2]) : $panelKey;
+                                }
           	      	      
-          	      	      //If $panelKey is empty use the maxTableCountNum value
-          	      	      if(empty($panelKey)) {
-          	      	      	$panels[$maxTableCountNum++] = $vals;
-          	      	      } else {
-          	      	        $panels[$panelKey] = $vals; 
-          	      	      }
-   	              } //foreach    
-                  $tableCount++;
-          } //foreach;
-   } //foreach
+                                //If $panelKey is empty use the maxTableCountNum value
+                                if(empty($panelKey)) {
+                                    $panels[$maxTableCountNum++] = $vals;
+                                } else {
+                                $panels[$panelKey] = $vals; 
+                                }
+                        } //foreach    
+                    $tableCount++;
+            } //foreach;
+    } //foreach
    
-   foreach($panels as $id=>$tablerows) {
+    foreach($panels as $id=>$tablerows) {
    	
-       $metarow = array();
+        $metarow = array();
        	       
-	   foreach($tablerows as $trow) {
+        foreach($tablerows as $trow) {
 	   	
-	   	   $emptyCount = 0;
-	   	   $tablecolumns = $this->getElementsByType("td", $trow);
-	       $col = array();
-	       $slot = 0;
+                $emptyCount = 0;
+                $tablecolumns = $this->getElementsByType("td", $trow);
+            $col = array();
+            $slot = 0;
 	       
-		   foreach($tablecolumns as $tcols) {
-		   	  $hasRequiredLabel = false;
+            foreach($tablecolumns as $tcols) {
+                    $hasRequiredLabel = false;
 		   	  
-		   	  //Get the sugar attribute value in the span elements of each table row
-		   	  $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
+                    //Get the sugar attribute value in the span elements of each table row
+                    $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
 		   	  
-		   	  //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
-		   	  if(empty($sugarAttrLabel)) {
-		   	     $sugarAttrLabel = $this->getTagAttribute("id", $tcols, "'^slot[^b]+$'");	
-		   	  }
+                    //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
+                    if(empty($sugarAttrLabel)) {
+                    $sugarAttrLabel = $this->getTagAttribute("id", $tcols, "'^slot[^b]+$'");	
+                    }
 		   	  
-		   	  //Check if this field is required
-		   	  if(!empty($sugarAttrLabel)) {
-		   	  	 $hasRequiredLabel = $this->hasRequiredSpanLabel($tcols);
-		   	  }
+                    //Check if this field is required
+                    if(!empty($sugarAttrLabel)) {
+                        $hasRequiredLabel = $this->hasRequiredSpanLabel($tcols);
+                    }
 		   	  
-		   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
+                    $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
               
-		   	  //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
-              if(empty($sugarAttrValue)) {
-              	 $sugarAttrValue = $this->getTagAttribute("id", $tcols, "'slot[0-9]+b$'");
-              }
+                    //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
+                if(empty($sugarAttrValue)) {
+                    $sugarAttrValue = $this->getTagAttribute("id", $tcols, "'slot[0-9]+b$'");
+                }
               
-              // If there wasn't any slot numbering/lettering then just default to expect label->vallue pairs
-	          $sugarAttrLabel = count($sugarAttrLabel) != 0 ? $sugarAttrLabel : ($slot % 2 == 0) ? true : false;
-	          $sugarAttrValue = count($sugarAttrValue) != 0 ? $sugarAttrValue : ($slot % 2 == 1) ? true : false;
-	          $slot++;
+                // If there wasn't any slot numbering/lettering then just default to expect label->vallue pairs
+                $sugarAttrLabel = count($sugarAttrLabel) != 0 ? $sugarAttrLabel : ($slot % 2 == 0) ? true : false;
+                $sugarAttrValue = count($sugarAttrValue) != 0 ? $sugarAttrValue : ($slot % 2 == 1) ? true : false;
+                $slot++;
 	          
-              if($sugarAttrValue) {
+                if($sugarAttrValue) {
 		   	     	 
-				   	  	 $spanValue = $this->getElementValue("span", $tcols);
+                                $spanValue = $this->getElementValue("span", $tcols);
 		                 
-				   	  	 if(empty($spanValue)) {
-		                    $spanValue = $this->getElementValue("slot", $tcols);	
-		                 }
+                                if(empty($spanValue)) {
+                            $spanValue = $this->getElementValue("slot", $tcols);	
+                            }
 		                 
-		                 if(empty($spanValue)) {
-		                    $spanValue = $this->getElementValue("td", $tcols);
-		                 }
+                            if(empty($spanValue)) {
+                            $spanValue = $this->getElementValue("td", $tcols);
+                            }
 		                 
-		                 //Get all the editable form elements' names
-				   	  	 $formElementNames = $this->getFormElementsNames($spanValue);		   	  	 
-				   	  	 $customField = $this->getCustomField($formElementNames);
+                            //Get all the editable form elements' names
+                                $formElementNames = $this->getFormElementsNames($spanValue);		   	  	 
+                                $customField = $this->getCustomField($formElementNames);
 				   	  	 
-				   	  	 $name = '';
-		                 $fields = null;
-		                 $customCode = null;
+                                $name = '';
+                            $fields = null;
+                            $customCode = null;
 
-		                 if(!empty($customField)) {           
-		                   // If it's a custom field we just set the name
-		                   $name = $customField;
+                            if(!empty($customField)) {           
+                            // If it's a custom field we just set the name
+                            $name = $customField;
 		                         
-		                 } else if(empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
-				   	  	   // We are here if the $spanValue did not contain a form element for editing.
-				   	  	   // We will assume that it is read only (since there were no edit form elements)
+                            } else if(empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
+                                // We are here if the $spanValue did not contain a form element for editing.
+                                // We will assume that it is read only (since there were no edit form elements)
 				   	  	   
 		
-					           // If there is more than one matching {} value then try to find the right one to key off
-					           // based on vardefs.php file.  Also, use the entire spanValue as customCode
-					           	if(count($matches) > 1) {
-							       $name = $matches[0][1];  
-							       $customCode = $spanValue;
-							       foreach($matches as $pair) {
-						   	  	 	   if(preg_match("/^(mod[\.]|app[\.]).*?/i", $pair[1])) {
-						   	  	 	       $customCode = str_replace($pair[1], '$'.strtoupper($pair[1]), $customCode);      
-						   	  	 	   } else {
-						   	  	 	       if(!empty($vardefs[$pair[1]])) {
-						   	  	 	       	  $name = $pair[1];
-						   	  	 	          $customCode = str_replace($pair[1], '$fields.'.strtolower($pair[1]).'.value', $customCode);
-						   	  	 	       } else {
-						   	  	 	       	  $phpName = $this->findAssignedVariableName($pair[1], $filePath);
-						   	  	 	       	  $customCode = str_replace($pair[1], '$fields.'.strtolower($phpName).'.value', $customCode);
-						   	  	 	       } //if-else
-						   	  	 	   }
-						           } //foreach
-						       } else {
-						       	   //If it is only a label, skip
-						       	   if(preg_match("/^(mod[\.]|app[\.]).*?/i", $matches[0][1])) {
-						       	   	  continue;
-						       	   }
-						   	  	   $name = strtolower($matches[0][1]);    
-						   	   }
+                                // If there is more than one matching {} value then try to find the right one to key off
+                                // based on vardefs.php file.  Also, use the entire spanValue as customCode
+                                    if(count($matches) > 1) {
+                                    $name = $matches[0][1];  
+                                    $customCode = $spanValue;
+                                    foreach($matches as $pair) {
+                                                if(preg_match("/^(mod[\.]|app[\.]).*?/i", $pair[1])) {
+                                                    $customCode = str_replace($pair[1], '$'.strtoupper($pair[1]), $customCode);      
+                                                } else {
+                                                    if(!empty($vardefs[$pair[1]])) {
+                                                        $name = $pair[1];
+                                                    $customCode = str_replace($pair[1], '$fields.'.strtolower($pair[1]).'.value', $customCode);
+                                                    } else {
+                                                        $phpName = $this->findAssignedVariableName($pair[1], $filePath);
+                                                        $customCode = str_replace($pair[1], '$fields.'.strtolower($phpName).'.value', $customCode);
+                                                    } //if-else
+                                                }
+                                    } //foreach
+                                } else {
+                                        //If it is only a label, skip
+                                        if(preg_match("/^(mod[\.]|app[\.]).*?/i", $matches[0][1])) {
+                                            continue;
+                                        }
+                                        $name = strtolower($matches[0][1]);    
+                                    }
  
-				   	  	 } else if(is_array($formElementNames)) {
+                                } else if(is_array($formElementNames)) {
 		                      
-				   	  	      if(count($formElementNames) == 1) {
+                                    if(count($formElementNames) == 1) {
 		
-				   	  	      	 if(!empty($vardefs[$formElementNames[0]])) {
-				   	  	            $name = $formElementNames[0];
-				   	  	      	 } else {
-				   	  	      	 	// Try to use the EdtiView.php file to find author's intent
-				   	  	      	 	$name = $this->findAssignedVariableName($formElementNames[0], $filePath);
+                                        if(!empty($vardefs[$formElementNames[0]])) {
+                                            $name = $formElementNames[0];
+                                        } else {
+                                            // Try to use the EdtiView.php file to find author's intent
+                                            $name = $this->findAssignedVariableName($formElementNames[0], $filePath);
 		
-				   	  	      	 	//If it's still empty, just use the entire block as customCode
-				   	  	      	 	if(empty($vardefs[$name])) {
-				   	  	      	 	   //Replace any { characters just in case   
-				   	  	      	 	   $customCode = str_replace('{', '{$', $spanValue);
-				   	  	      	 	}
-				   	  	      	 } //if-else
-				   	  	      } else {
-				   	  	      	 //If it is an Array of form elements, it is likely the _id and _name relate field combo
-		                         $relateName = $this->getRelateFieldName($formElementNames);
-		                         if(!empty($relateName)) {
-		                            $name = $relateName;
-		                         } else {
-		                         	 //One last attempt to scan $formElementNames for one vardef field only
-		                         	 $name = $this->findSingleVardefElement($formElementNames, $vardefs);
-		                         	 if(empty($name)) {
-					   	  	      	 	 $fields = array();
-			                         	 $name = $formElementNames[0];
-						   	  	      	 foreach($formElementNames as $elementName) {
-						   	  	      	 	if(isset($vardefs[$elementName])) {
-						   	  	      	 	   $fields[] = $elementName;
-						   	  	      	 	} else {
-						   	  	      	 	   $fields[] = $this->findAssignedVariableName($elementName, $filePath);
-						   	  	      	 	} //if-else
-					   	  	      	 	} //foreach
-		                         	} //if
-		                         } //if-else
-				   	  	      } //if-else
-				   	  	 }
+                                            //If it's still empty, just use the entire block as customCode
+                                            if(empty($vardefs[$name])) {
+                                                //Replace any { characters just in case   
+                                                $customCode = str_replace('{', '{$', $spanValue);
+                                            }
+                                        } //if-else
+                                    } else {
+                                        //If it is an Array of form elements, it is likely the _id and _name relate field combo
+                                    $relateName = $this->getRelateFieldName($formElementNames);
+                                    if(!empty($relateName)) {
+                                    $name = $relateName;
+                                    } else {
+                                        //One last attempt to scan $formElementNames for one vardef field only
+                                        $name = $this->findSingleVardefElement($formElementNames, $vardefs);
+                                        if(empty($name)) {
+                                                    $fields = array();
+                                            $name = $formElementNames[0];
+                                                foreach($formElementNames as $elementName) {
+                                                    if(isset($vardefs[$elementName])) {
+                                                        $fields[] = $elementName;
+                                                    } else {
+                                                        $fields[] = $this->findAssignedVariableName($elementName, $filePath);
+                                                    } //if-else
+                                                } //foreach
+                                        } //if
+                                    } //if-else
+                                    } //if-else
+                                }
 				   	  	 
-				   	  	 // Build the entry
-				   	  	 if(preg_match("/<textarea/si", $spanValue)) {
-				   	  	 	//special case for textarea form elements (add the displayParams)
-				   	  	 	$displayParams = array();
-				   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
-				   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
+                                // Build the entry
+                                if(preg_match("/<textarea/si", $spanValue)) {
+                                    //special case for textarea form elements (add the displayParams)
+                                    $displayParams = array();
+                                    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
+                                    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 		
-				   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
-					   	  	    $field = array();
-					   	  	    $field['name'] = $name;
-								$field['displayParams'] = $displayParams;
-				   	  	    } else {
-				   	  	        $field = $name;	
-				   	  	    }
-				   	  	 } else {
+                                    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+                                        $field = array();
+                                        $field['name'] = $name;
+                                $field['displayParams'] = $displayParams;
+                                    } else {
+                                        $field = $name;	
+                                    }
+                                } else {
 		
-				   	  	 	if(isset($fields) || isset($customCode)) {
-				   	  	 	   $field = array();
-				   	  	 	   $field['name'] = $name;
-				   	  	 	   if(isset($fields)) {
-				   	  	 	   	  $field['fields'] = $fields;
-				   	  	 	   }
-				   	  	 	   if(isset($customCode)) {
-				   	  	 	   	  $field['customCode'] = $customCode;
-				   	  	 	   	  $field['description'] = 'This field was auto generated';
-				   	  	 	   }
-				   	  	 	} else {
-				   	  	 	   $emptyCount = $name == '' ? $emptyCount + 1 : $emptyCount;
-				   	  	 	   $field = $name;
-				   	  	 	}	
-				   	  	 } //if-else if-else block
+                                    if(isset($fields) || isset($customCode)) {
+                                        $field = array();
+                                        $field['name'] = $name;
+                                        if(isset($fields)) {
+                                            $field['fields'] = $fields;
+                                        }
+                                        if(isset($customCode)) {
+                                            $field['customCode'] = $customCode;
+                                            $field['description'] = 'This field was auto generated';
+                                        }
+                                    } else {
+                                        $emptyCount = $name == '' ? $emptyCount + 1 : $emptyCount;
+                                        $field = $name;
+                                    }	
+                                } //if-else if-else block
 				   	  	 
-				   	  	 $addedField = is_array($field) ? $field['name'] : $field;
-				   	  	 if(empty($addedField) || empty($addedElements[$addedField])) {
-				   	  	 	//Add the meta-data definition for required fields
-				   	  	 	if($hasRequiredLabel) {
-				   	  	 	   if(is_array($field)) {	
-				   	  	 	   	  if(isset($field['displayParams']) && is_array($field['displayParams'])) {
-				   	  	 	   	  	 $field['displayParams']['required']=true;
-				   	  	 	   	  } else {
-				   	  	 	   	     $field['displayParams'] = array('required'=>true);
-				   	  	 	   	  }
-				   	  	 	   } else {
-				   	  	 	   	  $field = array('name'=>strtolower($field), 'displayParams'=>array('required'=>true));
-				   	  	 	   }
-				   	  	 	}
-				   	  	  	$col[] = is_array($field) ? $field : strtolower($field);
-				   	  	  	$addedElements[$addedField] = $addedField;
-				   	  	 }
-		   	  } //if($sugarAttValue)
-		   } //foreach
+                                $addedField = is_array($field) ? $field['name'] : $field;
+                                if(empty($addedField) || empty($addedElements[$addedField])) {
+                                    //Add the meta-data definition for required fields
+                                    if($hasRequiredLabel) {
+                                        if(is_array($field)) {	
+                                            if(isset($field['displayParams']) && is_array($field['displayParams'])) {
+                                                $field['displayParams']['required']=true;
+                                            } else {
+                                                $field['displayParams'] = array('required'=>true);
+                                            }
+                                        } else {
+                                            $field = array('name'=>strtolower($field), 'displayParams'=>array('required'=>true));
+                                        }
+                                    }
+                                    $col[] = is_array($field) ? $field : strtolower($field);
+                                    $addedElements[$addedField] = $addedField;
+                                }
+                    } //if($sugarAttValue)
+            } //foreach
 		   
-		   // One last final check.  If $emptyCount does not equal Array $col count, don't add 
-		   if($emptyCount != count($col)) {
+            // One last final check.  If $emptyCount does not equal Array $col count, don't add 
+            if($emptyCount != count($col)) {
 
-			   	  if($hasRequiredLabel) {
-			   	  	 if(is_array($col)) {
-			   	  	    if(isset($col['displayParams'])) {
-			   	  	       $col['displayParams']['required']=true;
-			   	  	    } else {
-			   	  	       $col['displayParams']=array('required'=>true);
-			   	  	    }
-			   	  	 } else {
-			   	  	    $col = array('name'=>strtolower($col), 'displayParams'=>array('required'=>true));	
-			   	  	 }
-			   	  }
+                        if($hasRequiredLabel) {
+                            if(is_array($col)) {
+                                if(isset($col['displayParams'])) {
+                                $col['displayParams']['required']=true;
+                                } else {
+                                $col['displayParams']=array('required'=>true);
+                                }
+                            } else {
+                                $col = array('name'=>strtolower($col), 'displayParams'=>array('required'=>true));	
+                            }
+                        }
 
-	   	      $metarow[] = $col;
-		   } //if
-	   } //foreach
+                    $metarow[] = $col;
+            } //if
+        } //foreach
 	  
-	   $panels[$id] = $metarow;
+        $panels[$id] = $metarow;
 	  
-   } //foreach
+    } //foreach
 
-   $this->mCustomPanels = $panels; 
-   $panels = $this->applyPreRules($moduleDir, $panels);
+    $this->mCustomPanels = $panels; 
+    $panels = $this->applyPreRules($moduleDir, $panels);
    
-   $templateMeta = array();
-   if($merge && !empty($masterCopy) && file_exists($masterCopy)) {
-      $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
-      $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
-   }
-   $panels = $this->applyRules($moduleDir, $panels);
-   return $this->createFileContents($moduleDir, $panels, $templateMeta, $filePath);
+    $templateMeta = array();
+    if($merge && !empty($masterCopy) && file_exists($masterCopy)) {
+        $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
+        $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
+    }
+    $panels = $this->applyRules($moduleDir, $panels);
+    return $this->createFileContents($moduleDir, $panels, $templateMeta, $filePath);
 }
 
 

Spacing +50 added lines, -50 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.
@@ -65,7 +65,7 @@ 
  * @param $masterCopy The file path of the mater copy of the metadata file to merge against
  * @return String format of metadata contents
  **/
-function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
+function parse($filePath, $vardefs = array(), $moduleDir = '', $merge = false, $masterCopy = null) {
 
    global $app_strings;
    $contents = file_get_contents($filePath);
@@ -79,9 +79,9 @@ 
    $tables = $this->getElementsByType("table", $contents);
    $formElements = $this->getFormElements($tables[0]);
    $hiddenInputs = array();
-   foreach($formElements as $elem) {
+   foreach ($formElements as $elem) {
    	      $type = $this->getTagAttribute("type", $elem);
-   	      if(preg_match('/hidden/si',$type)) {
+   	      if (preg_match('/hidden/si', $type)) {
    	         $name = $this->getTagAttribute("name", $elem);
    	         $value = $this->getTagAttribute("value", $elem);
    	         $hiddenInputs[$name] = $value;
@@ -95,22 +95,22 @@ 
    $addedElements = array();
    $maxTableCountNum = 0;
    $tableCount = 0;
-   foreach($tables as $table) {
+   foreach ($tables as $table) {
    	      $table = $this->fixTablesWithMissingTr($table);
    	      $toptr = $this->getElementsByType("tr", $table);
-          foreach($toptr as $tr) {
+          foreach ($toptr as $tr) {
           	      $tabledata = $this->getElementsByType("table", $tr);
           	      $data = array();
           	      $panelKey = $tableCount == 0 ? "default" : '';
-          	      foreach($tabledata as $t) {
+          	      foreach ($tabledata as $t) {
           	      	      $vals = array_values($this->getElementsByType("tr", $t));
-          	      	      if(preg_match_all('/<h4[^>]*?>.*?(\{MOD\.|\{APP\.)(LBL_[^\}]*?)[\}].*?<\/h4>/s', $vals[0], $matches, PREG_SET_ORDER)) {
+          	      	      if (preg_match_all('/<h4[^>]*?>.*?(\{MOD\.|\{APP\.)(LBL_[^\}]*?)[\}].*?<\/h4>/s', $vals[0], $matches, PREG_SET_ORDER)) {
           	      	      	array_shift($vals);
           	      	      	$panelKey = count($matches[0]) == 3 ? strtolower($matches[0][2]) : $panelKey;
           	      	      }
           	      	      
           	      	      //If $panelKey is empty use the maxTableCountNum value
-          	      	      if(empty($panelKey)) {
+          	      	      if (empty($panelKey)) {
           	      	      	$panels[$maxTableCountNum++] = $vals;
           	      	      } else {
           	      	        $panels[$panelKey] = $vals; 
@@ -120,37 +120,37 @@ 
           } //foreach;
    } //foreach
    
-   foreach($panels as $id=>$tablerows) {
+   foreach ($panels as $id=>$tablerows) {
    	
        $metarow = array();
        	       
-	   foreach($tablerows as $trow) {
+	   foreach ($tablerows as $trow) {
 	   	
 	   	   $emptyCount = 0;
 	   	   $tablecolumns = $this->getElementsByType("td", $trow);
 	       $col = array();
 	       $slot = 0;
 	       
-		   foreach($tablecolumns as $tcols) {
+		   foreach ($tablecolumns as $tcols) {
 		   	  $hasRequiredLabel = false;
 		   	  
 		   	  //Get the sugar attribute value in the span elements of each table row
 		   	  $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
 		   	  
 		   	  //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
-		   	  if(empty($sugarAttrLabel)) {
+		   	  if (empty($sugarAttrLabel)) {
 		   	     $sugarAttrLabel = $this->getTagAttribute("id", $tcols, "'^slot[^b]+$'");	
 		   	  }
 		   	  
 		   	  //Check if this field is required
-		   	  if(!empty($sugarAttrLabel)) {
+		   	  if (!empty($sugarAttrLabel)) {
 		   	  	 $hasRequiredLabel = $this->hasRequiredSpanLabel($tcols);
 		   	  }
 		   	  
 		   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
               
 		   	  //If there was no sugar attribute, try id (some versions of EditView.html used this instead)
-              if(empty($sugarAttrValue)) {
+              if (empty($sugarAttrValue)) {
               	 $sugarAttrValue = $this->getTagAttribute("id", $tcols, "'slot[0-9]+b$'");
               }
               
@@ -159,15 +159,15 @@ 
 	          $sugarAttrValue = count($sugarAttrValue) != 0 ? $sugarAttrValue : ($slot % 2 == 1) ? true : false;
 	          $slot++;
 	          
-              if($sugarAttrValue) {
+              if ($sugarAttrValue) {
 		   	     	 
 				   	  	 $spanValue = $this->getElementValue("span", $tcols);
 		                 
-				   	  	 if(empty($spanValue)) {
+				   	  	 if (empty($spanValue)) {
 		                    $spanValue = $this->getElementValue("slot", $tcols);	
 		                 }
 		                 
-		                 if(empty($spanValue)) {
+		                 if (empty($spanValue)) {
 		                    $spanValue = $this->getElementValue("td", $tcols);
 		                 }
 		                 
@@ -179,25 +179,25 @@ 
 		                 $fields = null;
 		                 $customCode = null;
 
-		                 if(!empty($customField)) {           
+		                 if (!empty($customField)) {           
 		                   // If it's a custom field we just set the name
 		                   $name = $customField;
 		                         
-		                 } else if(empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
+		                 } else if (empty($formElementNames) && preg_match_all('/[\{]([^\}]*?)[\}]/s', $spanValue, $matches, PREG_SET_ORDER)) {
 				   	  	   // We are here if the $spanValue did not contain a form element for editing.
 				   	  	   // We will assume that it is read only (since there were no edit form elements)
 				   	  	   
 		
 					           // If there is more than one matching {} value then try to find the right one to key off
 					           // based on vardefs.php file.  Also, use the entire spanValue as customCode
-					           	if(count($matches) > 1) {
+					           	if (count($matches) > 1) {
 							       $name = $matches[0][1];  
 							       $customCode = $spanValue;
-							       foreach($matches as $pair) {
-						   	  	 	   if(preg_match("/^(mod[\.]|app[\.]).*?/i", $pair[1])) {
+							       foreach ($matches as $pair) {
+						   	  	 	   if (preg_match("/^(mod[\.]|app[\.]).*?/i", $pair[1])) {
 						   	  	 	       $customCode = str_replace($pair[1], '$'.strtoupper($pair[1]), $customCode);      
 						   	  	 	   } else {
-						   	  	 	       if(!empty($vardefs[$pair[1]])) {
+						   	  	 	       if (!empty($vardefs[$pair[1]])) {
 						   	  	 	       	  $name = $pair[1];
 						   	  	 	          $customCode = str_replace($pair[1], '$fields.'.strtolower($pair[1]).'.value', $customCode);
 						   	  	 	       } else {
@@ -208,24 +208,24 @@ 
 						           } //foreach
 						       } else {
 						       	   //If it is only a label, skip
-						       	   if(preg_match("/^(mod[\.]|app[\.]).*?/i", $matches[0][1])) {
+						       	   if (preg_match("/^(mod[\.]|app[\.]).*?/i", $matches[0][1])) {
 						       	   	  continue;
 						       	   }
 						   	  	   $name = strtolower($matches[0][1]);    
 						   	   }
  
-				   	  	 } else if(is_array($formElementNames)) {
+				   	  	 } else if (is_array($formElementNames)) {
 		                      
-				   	  	      if(count($formElementNames) == 1) {
+				   	  	      if (count($formElementNames) == 1) {
 		
-				   	  	      	 if(!empty($vardefs[$formElementNames[0]])) {
+				   	  	      	 if (!empty($vardefs[$formElementNames[0]])) {
 				   	  	            $name = $formElementNames[0];
 				   	  	      	 } else {
 				   	  	      	 	// Try to use the EdtiView.php file to find author's intent
 				   	  	      	 	$name = $this->findAssignedVariableName($formElementNames[0], $filePath);
 		
 				   	  	      	 	//If it's still empty, just use the entire block as customCode
-				   	  	      	 	if(empty($vardefs[$name])) {
+				   	  	      	 	if (empty($vardefs[$name])) {
 				   	  	      	 	   //Replace any { characters just in case   
 				   	  	      	 	   $customCode = str_replace('{', '{$', $spanValue);
 				   	  	      	 	}
@@ -233,16 +233,16 @@ 
 				   	  	      } else {
 				   	  	      	 //If it is an Array of form elements, it is likely the _id and _name relate field combo
 		                         $relateName = $this->getRelateFieldName($formElementNames);
-		                         if(!empty($relateName)) {
+		                         if (!empty($relateName)) {
 		                            $name = $relateName;
 		                         } else {
 		                         	 //One last attempt to scan $formElementNames for one vardef field only
 		                         	 $name = $this->findSingleVardefElement($formElementNames, $vardefs);
-		                         	 if(empty($name)) {
+		                         	 if (empty($name)) {
 					   	  	      	 	 $fields = array();
 			                         	 $name = $formElementNames[0];
-						   	  	      	 foreach($formElementNames as $elementName) {
-						   	  	      	 	if(isset($vardefs[$elementName])) {
+						   	  	      	 foreach ($formElementNames as $elementName) {
+						   	  	      	 	if (isset($vardefs[$elementName])) {
 						   	  	      	 	   $fields[] = $elementName;
 						   	  	      	 	} else {
 						   	  	      	 	   $fields[] = $this->findAssignedVariableName($elementName, $filePath);
@@ -254,13 +254,13 @@ 
 				   	  	 }
 				   	  	 
 				   	  	 // Build the entry
-				   	  	 if(preg_match("/<textarea/si", $spanValue)) {
+				   	  	 if (preg_match("/<textarea/si", $spanValue)) {
 				   	  	 	//special case for textarea form elements (add the displayParams)
 				   	  	 	$displayParams = array();
 				   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
 				   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 		
-				   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+				   	  	    if (!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
 					   	  	    $field = array();
 					   	  	    $field['name'] = $name;
 								$field['displayParams'] = $displayParams;
@@ -269,13 +269,13 @@ 
 				   	  	    }
 				   	  	 } else {
 		
-				   	  	 	if(isset($fields) || isset($customCode)) {
+				   	  	 	if (isset($fields) || isset($customCode)) {
 				   	  	 	   $field = array();
 				   	  	 	   $field['name'] = $name;
-				   	  	 	   if(isset($fields)) {
+				   	  	 	   if (isset($fields)) {
 				   	  	 	   	  $field['fields'] = $fields;
 				   	  	 	   }
-				   	  	 	   if(isset($customCode)) {
+				   	  	 	   if (isset($customCode)) {
 				   	  	 	   	  $field['customCode'] = $customCode;
 				   	  	 	   	  $field['description'] = 'This field was auto generated';
 				   	  	 	   }
@@ -286,12 +286,12 @@ 
 				   	  	 } //if-else if-else block
 				   	  	 
 				   	  	 $addedField = is_array($field) ? $field['name'] : $field;
-				   	  	 if(empty($addedField) || empty($addedElements[$addedField])) {
+				   	  	 if (empty($addedField) || empty($addedElements[$addedField])) {
 				   	  	 	//Add the meta-data definition for required fields
-				   	  	 	if($hasRequiredLabel) {
-				   	  	 	   if(is_array($field)) {	
-				   	  	 	   	  if(isset($field['displayParams']) && is_array($field['displayParams'])) {
-				   	  	 	   	  	 $field['displayParams']['required']=true;
+				   	  	 	if ($hasRequiredLabel) {
+				   	  	 	   if (is_array($field)) {	
+				   	  	 	   	  if (isset($field['displayParams']) && is_array($field['displayParams'])) {
+				   	  	 	   	  	 $field['displayParams']['required'] = true;
 				   	  	 	   	  } else {
 				   	  	 	   	     $field['displayParams'] = array('required'=>true);
 				   	  	 	   	  }
@@ -306,14 +306,14 @@ 
 		   } //foreach
 		   
 		   // One last final check.  If $emptyCount does not equal Array $col count, don't add 
-		   if($emptyCount != count($col)) {
+		   if ($emptyCount != count($col)) {
 
-			   	  if($hasRequiredLabel) {
-			   	  	 if(is_array($col)) {
-			   	  	    if(isset($col['displayParams'])) {
-			   	  	       $col['displayParams']['required']=true;
+			   	  if ($hasRequiredLabel) {
+			   	  	 if (is_array($col)) {
+			   	  	    if (isset($col['displayParams'])) {
+			   	  	       $col['displayParams']['required'] = true;
 			   	  	    } else {
-			   	  	       $col['displayParams']=array('required'=>true);
+			   	  	       $col['displayParams'] = array('required'=>true);
 			   	  	    }
 			   	  	 } else {
 			   	  	    $col = array('name'=>strtolower($col), 'displayParams'=>array('required'=>true));	
@@ -332,7 +332,7 @@ 
    $panels = $this->applyPreRules($moduleDir, $panels);
    
    $templateMeta = array();
-   if($merge && !empty($masterCopy) && file_exists($masterCopy)) {
+   if ($merge && !empty($masterCopy) && file_exists($masterCopy)) {
       $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
       $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
    }

Braces +3 added lines, -1 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.

include/SugarFields/Parsers/DetailViewMetaParser.php

Indentation +67 added lines, -67 removed lines

@@ -59,7 +59,7 @@ 
 class DetailViewMetaParser extends MetaParser {
 
 function DetailViewMetaParser() {
-   $this->mView = 'DetailView';
+    $this->mView = 'DetailView';
 }
 
 
@@ -85,9 +85,9 @@ 
 
 // Notes DetailView.html file is messed up
 if($moduleDir == 'Notes') {
-   $contents = str_replace('{PAGINATION}<tr><td>', '{PAGINATION}', $contents); 
-   $contents = str_replace('</td></tr></table><script>', '</table><script>', $contents);
-   $contents = str_replace("<tr><div id='portal_flag_row' name='portal_flag_row' style='display:none'>", "<div id='portal_flag_row' name='portal_flag_row' style='display:none'>", $contents); 
+    $contents = str_replace('{PAGINATION}<tr><td>', '{PAGINATION}', $contents); 
+    $contents = str_replace('</td></tr></table><script>', '</table><script>', $contents);
+    $contents = str_replace("<tr><div id='portal_flag_row' name='portal_flag_row' style='display:none'>", "<div id='portal_flag_row' name='portal_flag_row' style='display:none'>", $contents); 
 }
 
 $contents = $this->fixDuplicateTrTags($contents);
@@ -104,75 +104,75 @@ 
 $metarow = array();
 foreach($tables as $table) {   
    
-   $table = $this->fixTablesWithMissingTr($table);
-   $tablerows = $this->getElementsByType("tr", $table);
+    $table = $this->fixTablesWithMissingTr($table);
+    $tablerows = $this->getElementsByType("tr", $table);
 
-   foreach($tablerows as $trow) {
+    foreach($tablerows as $trow) {
 
-       $metacolumns = array();  
-   	   $columns = $this->getElementsByType("td", $trow);
-       $columns = array_reverse($columns, true);
-	   foreach($columns as $tcols) {
+        $metacolumns = array();  
+            $columns = $this->getElementsByType("td", $trow);
+        $columns = array_reverse($columns, true);
+        foreach($columns as $tcols) {
 
-	   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
-	   	  if(empty($sugarAttrValue)) {
-	   	  	 continue;
-	   	  }	   	
+                $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
+                if(empty($sugarAttrValue)) {
+                    continue;
+                }	   	
 	   	
-          $def = '';
-	   	  $field = $this->getElementValue("span", $tcols);
-	   	  //If it's a space, simply add a blank string	   	  
-	   	  if($field == '&nbsp;') {
-	   	  	 $metacolumns[] = "";
-	   	  } else if(!empty($field)) {
+            $def = '';
+                $field = $this->getElementValue("span", $tcols);
+                //If it's a space, simply add a blank string	   	  
+                if($field == '&nbsp;') {
+                    $metacolumns[] = "";
+                } else if(!empty($field)) {
 	   	  	
-          	 preg_match_all('/[\{]([^\}].*?)[\}]/s', $field, $matches, PREG_SET_ORDER);
-          	 if(!empty($matches)) { 	
-          	 	if(count($matches) > 1) {
+                preg_match_all('/[\{]([^\}].*?)[\}]/s', $field, $matches, PREG_SET_ORDER);
+                if(!empty($matches)) { 	
+                    if(count($matches) > 1) {
           	 		  
-	          	 	  $def = array();
-
-	          	 	  $def['name'] = preg_match('/_c$/i', $matches[0][1]) ? $matches[0][1] : strtolower($matches[0][1]);
-                      foreach($matches as $m) {
-                      	 if(isset($vardefs[strtolower($m[1])])) {
-                      	 	$def['name'] = strtolower($m[1]);
-                      	 }
-                      }
-
-	          	 	  $field = preg_replace('/<\{tag\.[a-z_]*?\}/i', '<a', $field);
-	          	 	  $field = preg_replace('/<\/\{tag\.[a-z_]*?\}>/i', '</a>', $field);
-
-	          	 	  foreach($matches as $tag[1]) {
-		   	  	 	    if(preg_match("/^(mod[\.]|app[\.]).*?/i", $tag[1][1])) {
-		   	  	 	       $field = str_replace($tag[1][1], '$'.$tag[1][1], $field);      
-		   	  	 	    } else {
-		   	  	 	       $theField = preg_match('/_c$/i', $tag[1][1]) ? $tag[1][1] : strtolower($tag[1][1]);
-		   	  	 	       if(!empty($vardefs[$theField])) {
-		   	  	 	          $field = str_replace($tag[1][1], '$fields.'. $theField.'.value', $field);
-		   	  	 	       } else {
-		   	  	 	       	  $phpName = $this->findAssignedVariableName($tag[1][1], $filePath);
-		   	  	 	       	  $field = str_replace($tag[1][1], '$fields.'. $theField.'.value', $field);
-		   	  	 	       } //if-else
-		   	  	 	    }
-		   	  	 	  }
-
-		   	  	 	  $def['customCode'] = $field;
-		   	  	 	  $def['description'] = 'This field was auto generated';
-          	 	} else {
-	          	 	  $def = strtolower($matches[0][1]);
-          	 	}
-          	 } //if
-             $metacolumns[] = $def;
-          } //if
-	   } //foreach($tablecolumns as $tcols)
-
-   	   $metarow[] = array_reverse($metacolumns);
-   } //foreach($tablerows as $trow) 
+                            $def = array();
+
+                            $def['name'] = preg_match('/_c$/i', $matches[0][1]) ? $matches[0][1] : strtolower($matches[0][1]);
+                        foreach($matches as $m) {
+                            if(isset($vardefs[strtolower($m[1])])) {
+                                $def['name'] = strtolower($m[1]);
+                            }
+                        }
+
+                            $field = preg_replace('/<\{tag\.[a-z_]*?\}/i', '<a', $field);
+                            $field = preg_replace('/<\/\{tag\.[a-z_]*?\}>/i', '</a>', $field);
+
+                            foreach($matches as $tag[1]) {
+                                if(preg_match("/^(mod[\.]|app[\.]).*?/i", $tag[1][1])) {
+                                    $field = str_replace($tag[1][1], '$'.$tag[1][1], $field);      
+                                } else {
+                                    $theField = preg_match('/_c$/i', $tag[1][1]) ? $tag[1][1] : strtolower($tag[1][1]);
+                                    if(!empty($vardefs[$theField])) {
+                                    $field = str_replace($tag[1][1], '$fields.'. $theField.'.value', $field);
+                                    } else {
+                                        $phpName = $this->findAssignedVariableName($tag[1][1], $filePath);
+                                        $field = str_replace($tag[1][1], '$fields.'. $theField.'.value', $field);
+                                    } //if-else
+                                }
+                            }
+
+                            $def['customCode'] = $field;
+                            $def['description'] = 'This field was auto generated';
+                    } else {
+                            $def = strtolower($matches[0][1]);
+                    }
+                } //if
+                $metacolumns[] = $def;
+            } //if
+        } //foreach($tablecolumns as $tcols)
+
+            $metarow[] = array_reverse($metacolumns);
+    } //foreach($tablerows as $trow) 
    
    
-   $id = $tableCount == 0 ? 'default' : $tableCount;
-   $tableCount++;
-   $panels[$id] = $metarow;
+    $id = $tableCount == 0 ? 'default' : $tableCount;
+    $tableCount++;
+    $panels[$id] = $metarow;
    
 } //foreach($tables as $table)
 
@@ -181,8 +181,8 @@ 
 
 $templateMeta = array();
 if($merge && !empty($masterCopy) && file_exists($masterCopy)) {
-   $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
-   $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
+    $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
+    $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
 }
 
 $panels = $this->applyRules($moduleDir, $panels);

Spacing +19 added lines, -19 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.
@@ -73,7 +73,7 @@ 
  * @param $masterCopy The file path of the mater copy of the metadata file to merge against
  * @return String format of metadata contents
  **/
-function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
+function parse($filePath, $vardefs = array(), $moduleDir = '', $merge = false, $masterCopy = null) {
    
 // Grab file contents
 $contents = file_get_contents($filePath);
@@ -84,7 +84,7 @@ 
 
 
 // Notes DetailView.html file is messed up
-if($moduleDir == 'Notes') {
+if ($moduleDir == 'Notes') {
    $contents = str_replace('{PAGINATION}<tr><td>', '{PAGINATION}', $contents); 
    $contents = str_replace('</td></tr></table><script>', '</table><script>', $contents);
    $contents = str_replace("<tr><div id='portal_flag_row' name='portal_flag_row' style='display:none'>", "<div id='portal_flag_row' name='portal_flag_row' style='display:none'>", $contents); 
@@ -102,39 +102,39 @@ 
 $panels = array();
 $tableCount = 0;
 $metarow = array();
-foreach($tables as $table) {   
+foreach ($tables as $table) {   
    
    $table = $this->fixTablesWithMissingTr($table);
    $tablerows = $this->getElementsByType("tr", $table);
 
-   foreach($tablerows as $trow) {
+   foreach ($tablerows as $trow) {
 
        $metacolumns = array();  
    	   $columns = $this->getElementsByType("td", $trow);
        $columns = array_reverse($columns, true);
-	   foreach($columns as $tcols) {
+	   foreach ($columns as $tcols) {
 
 	   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
-	   	  if(empty($sugarAttrValue)) {
+	   	  if (empty($sugarAttrValue)) {
 	   	  	 continue;
 	   	  }	   	
 	   	
           $def = '';
 	   	  $field = $this->getElementValue("span", $tcols);
 	   	  //If it's a space, simply add a blank string	   	  
-	   	  if($field == '&nbsp;') {
+	   	  if ($field == '&nbsp;') {
 	   	  	 $metacolumns[] = "";
-	   	  } else if(!empty($field)) {
+	   	  } else if (!empty($field)) {
 	   	  	
           	 preg_match_all('/[\{]([^\}].*?)[\}]/s', $field, $matches, PREG_SET_ORDER);
-          	 if(!empty($matches)) { 	
-          	 	if(count($matches) > 1) {
+          	 if (!empty($matches)) { 	
+          	 	if (count($matches) > 1) {
           	 		  
 	          	 	  $def = array();
 
 	          	 	  $def['name'] = preg_match('/_c$/i', $matches[0][1]) ? $matches[0][1] : strtolower($matches[0][1]);
-                      foreach($matches as $m) {
-                      	 if(isset($vardefs[strtolower($m[1])])) {
+                      foreach ($matches as $m) {
+                      	 if (isset($vardefs[strtolower($m[1])])) {
                       	 	$def['name'] = strtolower($m[1]);
                       	 }
                       }
@@ -142,16 +142,16 @@ 
 	          	 	  $field = preg_replace('/<\{tag\.[a-z_]*?\}/i', '<a', $field);
 	          	 	  $field = preg_replace('/<\/\{tag\.[a-z_]*?\}>/i', '</a>', $field);
 
-	          	 	  foreach($matches as $tag[1]) {
-		   	  	 	    if(preg_match("/^(mod[\.]|app[\.]).*?/i", $tag[1][1])) {
+	          	 	  foreach ($matches as $tag[1]) {
+		   	  	 	    if (preg_match("/^(mod[\.]|app[\.]).*?/i", $tag[1][1])) {
 		   	  	 	       $field = str_replace($tag[1][1], '$'.$tag[1][1], $field);      
 		   	  	 	    } else {
 		   	  	 	       $theField = preg_match('/_c$/i', $tag[1][1]) ? $tag[1][1] : strtolower($tag[1][1]);
-		   	  	 	       if(!empty($vardefs[$theField])) {
-		   	  	 	          $field = str_replace($tag[1][1], '$fields.'. $theField.'.value', $field);
+		   	  	 	       if (!empty($vardefs[$theField])) {
+		   	  	 	          $field = str_replace($tag[1][1], '$fields.'.$theField.'.value', $field);
 		   	  	 	       } else {
 		   	  	 	       	  $phpName = $this->findAssignedVariableName($tag[1][1], $filePath);
-		   	  	 	       	  $field = str_replace($tag[1][1], '$fields.'. $theField.'.value', $field);
+		   	  	 	       	  $field = str_replace($tag[1][1], '$fields.'.$theField.'.value', $field);
 		   	  	 	       } //if-else
 		   	  	 	    }
 		   	  	 	  }
@@ -180,7 +180,7 @@ 
 $panels = $this->applyPreRules($moduleDir, $panels);
 
 $templateMeta = array();
-if($merge && !empty($masterCopy) && file_exists($masterCopy)) {
+if ($merge && !empty($masterCopy) && file_exists($masterCopy)) {
    $panels = $this->mergePanels($panels, $vardefs, $moduleDir, $masterCopy);
    $templateMeta = $this->mergeTemplateMeta($templateMeta, $moduleDir, $masterCopy);
 }

Braces +3 added lines, -1 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.

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 /**
  * parse
  * 
- * @param $filePath The file path of the HTML file to parse
+ * @param string $filePath The file path of the HTML file to parse
  * @param $vardefs The module's vardefs
  * @param $moduleDir The module's directory
  * @param $merge boolean value indicating whether or not to merge the parsed contents

include/SugarFields/Parsers/SearchFormMetaParser.php

Indentation +145 added lines, -145 removed lines

@@ -42,7 +42,7 @@ 
 class SearchFormMetaParser extends MetaParser {
 
 function SearchFormMetaParser() {
-	$this->mView = 'Search';
+    $this->mView = 'Search';
 }
 
 /**
@@ -52,28 +52,28 @@ 
  **/
 function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
 
-   $contents = file_get_contents($filePath);
-   $contents = $this->trimHTML($contents);
+    $contents = file_get_contents($filePath);
+    $contents = $this->trimHTML($contents);
    
-   // Get the second table in the page and onward
-   $tables = $this->getElementsByType("table", $contents);
-   //basic search table
-   $basicSection = $this->processSection("basic", $tables[0], $filePath, $vardefs);
-   $advancedSection = $this->processSection("advanced", $tables[1], $filePath, $vardefs);
-   if(file_exists($masterCopy)) {
-	   require($masterCopy);
-	   $layouts = $searchdefs[$moduleDir]['layout'];
+    // Get the second table in the page and onward
+    $tables = $this->getElementsByType("table", $contents);
+    //basic search table
+    $basicSection = $this->processSection("basic", $tables[0], $filePath, $vardefs);
+    $advancedSection = $this->processSection("advanced", $tables[1], $filePath, $vardefs);
+    if(file_exists($masterCopy)) {
+        require($masterCopy);
+        $layouts = $searchdefs[$moduleDir]['layout'];
 	
-	   if(isset($layouts['basic_search'])) {
-		  $basicSection = $this->mergeSection($basicSection, $layouts['basic_search']);
-	      $basicSection = $this->applyRules($moduleDir, $basicSection);
-	   }
+        if(isset($layouts['basic_search'])) {
+            $basicSection = $this->mergeSection($basicSection, $layouts['basic_search']);
+            $basicSection = $this->applyRules($moduleDir, $basicSection);
+        }
 	
-	   if(isset($layouts['advanced_search'])) {
-		  $advancedSection = $this->mergeSection($advancedSection, $layouts['advanced_search']);
-	      $advancedSection = $this->applyRules($moduleDir, $advancedSection);
-	   }
-   } //if
+        if(isset($layouts['advanced_search'])) {
+            $advancedSection = $this->mergeSection($advancedSection, $layouts['advanced_search']);
+            $advancedSection = $this->applyRules($moduleDir, $advancedSection);
+        }
+    } //if
 
 $header = "<?php\n\n";
 $header .= "\$searchdefs['$moduleDir'] = array(
@@ -95,177 +95,177 @@ 
 
 function mergeSection($section, $masterSection) {
 
-  // Get all the names in the panel
-  $existingElements = array();
-  $existingLocation = array();
+    // Get all the names in the panel
+    $existingElements = array();
+    $existingLocation = array();
   
-  foreach($section as $rowKey=>$row) {
-  	   if(is_array($row) && !empty($row['name'])) {
-  	 	   $existingElements[$row['name']] = $row['name'];
-  	 	   $existingLocation[$row['name']] = array("row"=>$rowKey);	
-  	   } else if(!is_array($row) && !empty($row)) {
-	 	   $existingElements[$row] = $row;
-	 	   $existingLocation[$row] = array("row"=>$rowKey);
-  	   }
-  } //foreach
+    foreach($section as $rowKey=>$row) {
+            if(is_array($row) && !empty($row['name'])) {
+                $existingElements[$row['name']] = $row['name'];
+                $existingLocation[$row['name']] = array("row"=>$rowKey);	
+            } else if(!is_array($row) && !empty($row)) {
+            $existingElements[$row] = $row;
+            $existingLocation[$row] = array("row"=>$rowKey);
+            }
+    } //foreach
   
-  // Now check against the $masterCopy
-  foreach($masterSection as $row) {
+    // Now check against the $masterCopy
+    foreach($masterSection as $row) {
   	
-  	 $addEntry = '';
-  	 $id = is_array($row) ? $row['name'] : $row;
+        $addEntry = '';
+        $id = is_array($row) ? $row['name'] : $row;
 
-     /*
+        /*
   	 if(!isset($existingElements[$id])) {
   	 	//$addEntry = $row;
   	 }
   	 */
   	 
-  	 if(isset($existingElements[$id])) {
-  	 	//Use master copy instead
-  	 	$section[$existingLocation[$id]['row']] = $row;
-  	 }
+        if(isset($existingElements[$id])) {
+            //Use master copy instead
+            $section[$existingLocation[$id]['row']] = $row;
+        }
      
-  	 // Add it to the $panels 
-  	 /*
+        // Add it to the $panels 
+        /*
   	 if(!empty($addEntry)) {
   	 	$section[] = $addEntry;
   	 }
   	 */
-  } //foreach
+    } //foreach
 
-  return $section;
+    return $section;
 }
 
 function processSection($section, $table, $filePath, $vardefs=array()) {
    
-   $toptr = $this->getElementsByType("tr", $table);
+    $toptr = $this->getElementsByType("tr", $table);
    
-   if(!is_array($toptr) || empty($toptr)) {
-   	  $GLOBALS['log']->error("Could not process top row (<tr>) for $section section");
-   	  $GLOBALS['log']->error($table);
-   	  return array(); 
-   }
+    if(!is_array($toptr) || empty($toptr)) {
+            $GLOBALS['log']->error("Could not process top row (<tr>) for $section section");
+            $GLOBALS['log']->error($table);
+            return array(); 
+    }
    
-   $tabledata = $this->getElementsByType("table", $toptr[0]);
+    $tabledata = $this->getElementsByType("table", $toptr[0]);
    
-   if(empty($tabledata)) {
-   	  $GLOBALS['log']->error("Error: HTML format for SearchForm.html not as expected, results may not be accurate");
-   	  $GLOBALS['log']->error($toptr[0]);
-   	  $tabledata[0] = "<table>{$table}</table>";
-   }
+    if(empty($tabledata)) {
+            $GLOBALS['log']->error("Error: HTML format for SearchForm.html not as expected, results may not be accurate");
+            $GLOBALS['log']->error($toptr[0]);
+            $tabledata[0] = "<table>{$table}</table>";
+    }
 
-   if(is_array($tabledata) && !empty($tabledata[0])) {
-      $rows = $this->getElementsByType("tr", $tabledata[0]);
-   } else {
-   	  $rows = $toptr[0];
-   }
+    if(is_array($tabledata) && !empty($tabledata[0])) {
+        $rows = $this->getElementsByType("tr", $tabledata[0]);
+    } else {
+            $rows = $toptr[0];
+    }
 
-   if(!is_array($rows)) {
-   	  return array();
-   }
+    if(!is_array($rows)) {
+            return array();
+    }
    
-   $metarow = array();
-   foreach($rows as $trow) {
-   	   $tablecolumns = $this->getElementsByType("td", $trow);
+    $metarow = array();
+    foreach($rows as $trow) {
+            $tablecolumns = $this->getElementsByType("td", $trow);
           
-       $emptyCount = 0;   
-       $metacolumn = array();
-       $col = null;
+        $emptyCount = 0;   
+        $metacolumn = array();
+        $col = null;
 
-	   foreach($tablecolumns as $tcols) {
+        foreach($tablecolumns as $tcols) {
 
-	   	  	 $spanValue = strtolower($this->getElementValue("span", $tcols));
-             $spanValue2 = strtolower($this->getElementValue("slot", $tcols));	
-             $spanValue = !empty($spanValue2) ? $spanValue2 : $spanValue;
-             $spanValue3 = strtolower($this->getElementValue("td", $tcols));
-             $spanValue = !empty($spanValue3) ? $spanValue3 : $spanValue; 
+                    $spanValue = strtolower($this->getElementValue("span", $tcols));
+                $spanValue2 = strtolower($this->getElementValue("slot", $tcols));	
+                $spanValue = !empty($spanValue2) ? $spanValue2 : $spanValue;
+                $spanValue3 = strtolower($this->getElementValue("td", $tcols));
+                $spanValue = !empty($spanValue3) ? $spanValue3 : $spanValue; 
              
-             //Get all the editable form elements' names
-	   	  	 $formElementNames = $this->getFormElementsNames($spanValue);  	  	 
-	   	  	 $customField = $this->getCustomField($formElementNames);
+                //Get all the editable form elements' names
+                    $formElementNames = $this->getFormElementsNames($spanValue);  	  	 
+                    $customField = $this->getCustomField($formElementNames);
 	   	  	 
-	   	  	 $name = '';
-             $fields = null;
-             $customCode = null;
+                    $name = '';
+                $fields = null;
+                $customCode = null;
                         
-             if(!empty($customField)) {           
-               // If it's a custom field we just set the name
-               $name = $customField;
-	   	  	 } else if(is_array($formElementNames) && count($formElementNames) == 1 
-	   	  	           && (isset($vardefs[$formElementNames[0]]) || $formElementNames[0] == 'current_user_only')) {
-	   	  	   $name = $formElementNames[0];
-	   	  	 } 
+                if(!empty($customField)) {           
+                // If it's a custom field we just set the name
+                $name = $customField;
+                    } else if(is_array($formElementNames) && count($formElementNames) == 1 
+                            && (isset($vardefs[$formElementNames[0]]) || $formElementNames[0] == 'current_user_only')) {
+                    $name = $formElementNames[0];
+                    } 
 
-	   	  	 //Skip and continue if $name is empty
-	   	  	 if(empty($name)) {
-	   	  	    continue;	
-	   	  	 }
+                    //Skip and continue if $name is empty
+                    if(empty($name)) {
+                        continue;	
+                    }
 	   	  	 
-	   	  	 // Build the entry
-	   	  	 if(preg_match("/<textarea/si", $spanValue)) {
-	   	  	 	//special case for textarea form elements (add the displayParams)
-	   	  	 	$displayParams = array();
-	   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
-	   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
+                    // Build the entry
+                    if(preg_match("/<textarea/si", $spanValue)) {
+                        //special case for textarea form elements (add the displayParams)
+                        $displayParams = array();
+                        $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
+                        $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 
-	   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
-		   	  	    $field = array();
-		   	  	    $field['name'] = $name;
-					$field['displayParams'] = $displayParams;
-	   	  	    } else {
-	   	  	        $field = $name;	
-	   	  	    }
+                        if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+                            $field = array();
+                            $field['name'] = $name;
+                    $field['displayParams'] = $displayParams;
+                        } else {
+                            $field = $name;	
+                        }
 	   	  	    
-	   	  	    $col = $field;
+                        $col = $field;
 	   	  	   
-	   	  	 } else {
+                    } else {
 
-	   	  	 	if(isset($fields)) {
-	   	  	 	   $field = array();
-	   	  	 	   $field['name'] = $name;
-	   	  	 	   if(isset($fields)) {
-	   	  	 	   	  $field['fields'] = $fields;
-	   	  	 	   }
+                        if(isset($fields)) {
+                            $field = array();
+                            $field['name'] = $name;
+                            if(isset($fields)) {
+                                $field['fields'] = $fields;
+                            }
 	   	  	 	   
-	   	  	 	   if(!empty($customCode)) {
-	   	  	 	   	  $field['customCode'] = $customCode;
-	   	  	 	   }
+                            if(!empty($customCode)) {
+                                $field['customCode'] = $customCode;
+                            }
   	 	   
-	   	  	 	   $col = $field;
-	   	  	 	} else {
-	   	  	 	   $emptyCount = $name == '' ? $emptyCount + 1 : $emptyCount;
-	   	  	 	   $col = $name;
-	   	  	 	}	
-	   	  	 } //if-else if-else block
-             $metarow[] = $col;
-	   } //foreach
+                            $col = $field;
+                        } else {
+                            $emptyCount = $name == '' ? $emptyCount + 1 : $emptyCount;
+                            $col = $name;
+                        }	
+                    } //if-else if-else block
+                $metarow[] = $col;
+        } //foreach
 
-	   // One last final check.  If $emptyCount does not equal Array $col count, don't add 
-	   if($emptyCount != count($col)) {
-   	      //$metarow[] = $col;
-	   } //if
+        // One last final check.  If $emptyCount does not equal Array $col count, don't add 
+        if($emptyCount != count($col)) {
+                //$metarow[] = $col;
+        } //if
 
-   } //foreach  
+    } //foreach  
 	
-   return $metarow;
+    return $metarow;
 }
 
 function applyRules($moduleDir, $section=array()) {
-   require_once('include/SugarFields/Parsers/Rules/BaseRule.php');
-   $baseRule = new BaseRule();
-   if(!is_array($section)) {
-   	  $GLOBALS['log']->error("Error: SearchFormMetaParser->applyRules expects Array");
-   	  return $section;
-   }
+    require_once('include/SugarFields/Parsers/Rules/BaseRule.php');
+    $baseRule = new BaseRule();
+    if(!is_array($section)) {
+            $GLOBALS['log']->error("Error: SearchFormMetaParser->applyRules expects Array");
+            return $section;
+    }
    
-   foreach($section as $key=>$row) {
-   	  //Override email1 fields
-   	  if($baseRule->matches($row, '/^email1$/si')) {
-   	  	 $section[$key] = array('name' => 'email', 'label' =>'LBL_ANY_EMAIL', 'type' => 'name');
-   	  }
-   }
-   return $section;
+    foreach($section as $key=>$row) {
+            //Override email1 fields
+            if($baseRule->matches($row, '/^email1$/si')) {
+                $section[$key] = array('name' => 'email', 'label' =>'LBL_ANY_EMAIL', 'type' => 'name');
+            }
+    }
+    return $section;
 }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -50,7 +50,7 @@ 
  * @param $mixed 
  * @return $obj A MetaDataBean instance
  **/
-function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
+function parse($filePath, $vardefs = array(), $moduleDir = '', $merge = false, $masterCopy = null) {
 
    $contents = file_get_contents($filePath);
    $contents = $this->trimHTML($contents);
@@ -60,16 +60,16 @@ 
    //basic search table
    $basicSection = $this->processSection("basic", $tables[0], $filePath, $vardefs);
    $advancedSection = $this->processSection("advanced", $tables[1], $filePath, $vardefs);
-   if(file_exists($masterCopy)) {
+   if (file_exists($masterCopy)) {
 	   require($masterCopy);
 	   $layouts = $searchdefs[$moduleDir]['layout'];
 	
-	   if(isset($layouts['basic_search'])) {
+	   if (isset($layouts['basic_search'])) {
 		  $basicSection = $this->mergeSection($basicSection, $layouts['basic_search']);
 	      $basicSection = $this->applyRules($moduleDir, $basicSection);
 	   }
 	
-	   if(isset($layouts['advanced_search'])) {
+	   if (isset($layouts['advanced_search'])) {
 		  $advancedSection = $this->mergeSection($advancedSection, $layouts['advanced_search']);
 	      $advancedSection = $this->applyRules($moduleDir, $advancedSection);
 	   }
@@ -80,15 +80,15 @@ 
     'templateMeta' => array('maxColumns' => '3', 'widths' => array('label' => '10', 'field' => '30')),
     'layout' => array(  					
 \n\t'basic_search' =>";   
-$header .= "\t" . var_export($basicSection, true);
+$header .= "\t".var_export($basicSection, true);
 $header .= "\n\t,'advanced_search' =>";
-$header .= "\t" . var_export($advancedSection, true);
+$header .= "\t".var_export($advancedSection, true);
 $header .= "
      ),\n
 );
 ?>";
 
-$header = preg_replace('/(\d+)[\s]=>[\s]?/',"",$header);
+$header = preg_replace('/(\d+)[\s]=>[\s]?/', "", $header);
 return $header;
 
 }
@@ -99,18 +99,18 @@ 
   $existingElements = array();
   $existingLocation = array();
   
-  foreach($section as $rowKey=>$row) {
-  	   if(is_array($row) && !empty($row['name'])) {
+  foreach ($section as $rowKey=>$row) {
+  	   if (is_array($row) && !empty($row['name'])) {
   	 	   $existingElements[$row['name']] = $row['name'];
   	 	   $existingLocation[$row['name']] = array("row"=>$rowKey);	
-  	   } else if(!is_array($row) && !empty($row)) {
+  	   } else if (!is_array($row) && !empty($row)) {
 	 	   $existingElements[$row] = $row;
 	 	   $existingLocation[$row] = array("row"=>$rowKey);
   	   }
   } //foreach
   
   // Now check against the $masterCopy
-  foreach($masterSection as $row) {
+  foreach ($masterSection as $row) {
   	
   	 $addEntry = '';
   	 $id = is_array($row) ? $row['name'] : $row;
@@ -121,7 +121,7 @@ 
   	 }
   	 */
   	 
-  	 if(isset($existingElements[$id])) {
+  	 if (isset($existingElements[$id])) {
   	 	//Use master copy instead
   	 	$section[$existingLocation[$id]['row']] = $row;
   	 }
@@ -137,11 +137,11 @@ 
   return $section;
 }
 
-function processSection($section, $table, $filePath, $vardefs=array()) {
+function processSection($section, $table, $filePath, $vardefs = array()) {
    
    $toptr = $this->getElementsByType("tr", $table);
    
-   if(!is_array($toptr) || empty($toptr)) {
+   if (!is_array($toptr) || empty($toptr)) {
    	  $GLOBALS['log']->error("Could not process top row (<tr>) for $section section");
    	  $GLOBALS['log']->error($table);
    	  return array(); 
@@ -149,31 +149,31 @@ 
    
    $tabledata = $this->getElementsByType("table", $toptr[0]);
    
-   if(empty($tabledata)) {
+   if (empty($tabledata)) {
    	  $GLOBALS['log']->error("Error: HTML format for SearchForm.html not as expected, results may not be accurate");
    	  $GLOBALS['log']->error($toptr[0]);
    	  $tabledata[0] = "<table>{$table}</table>";
    }
 
-   if(is_array($tabledata) && !empty($tabledata[0])) {
+   if (is_array($tabledata) && !empty($tabledata[0])) {
       $rows = $this->getElementsByType("tr", $tabledata[0]);
    } else {
    	  $rows = $toptr[0];
    }
 
-   if(!is_array($rows)) {
+   if (!is_array($rows)) {
    	  return array();
    }
    
    $metarow = array();
-   foreach($rows as $trow) {
+   foreach ($rows as $trow) {
    	   $tablecolumns = $this->getElementsByType("td", $trow);
           
        $emptyCount = 0;   
        $metacolumn = array();
        $col = null;
 
-	   foreach($tablecolumns as $tcols) {
+	   foreach ($tablecolumns as $tcols) {
 
 	   	  	 $spanValue = strtolower($this->getElementValue("span", $tcols));
              $spanValue2 = strtolower($this->getElementValue("slot", $tcols));	
@@ -189,27 +189,27 @@ 
              $fields = null;
              $customCode = null;
                         
-             if(!empty($customField)) {           
+             if (!empty($customField)) {           
                // If it's a custom field we just set the name
                $name = $customField;
-	   	  	 } else if(is_array($formElementNames) && count($formElementNames) == 1 
+	   	  	 } else if (is_array($formElementNames) && count($formElementNames) == 1 
 	   	  	           && (isset($vardefs[$formElementNames[0]]) || $formElementNames[0] == 'current_user_only')) {
 	   	  	   $name = $formElementNames[0];
 	   	  	 } 
 
 	   	  	 //Skip and continue if $name is empty
-	   	  	 if(empty($name)) {
+	   	  	 if (empty($name)) {
 	   	  	    continue;	
 	   	  	 }
 	   	  	 
 	   	  	 // Build the entry
-	   	  	 if(preg_match("/<textarea/si", $spanValue)) {
+	   	  	 if (preg_match("/<textarea/si", $spanValue)) {
 	   	  	 	//special case for textarea form elements (add the displayParams)
 	   	  	 	$displayParams = array();
 	   	  	    $displayParams['rows'] = $this->getTagAttribute("rows", $spanValue);
 	   	  	    $displayParams['cols'] = $this->getTagAttribute("cols", $spanValue);
 
-	   	  	    if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+	   	  	    if (!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
 		   	  	    $field = array();
 		   	  	    $field['name'] = $name;
 					$field['displayParams'] = $displayParams;
@@ -221,14 +221,14 @@ 
 	   	  	   
 	   	  	 } else {
 
-	   	  	 	if(isset($fields)) {
+	   	  	 	if (isset($fields)) {
 	   	  	 	   $field = array();
 	   	  	 	   $field['name'] = $name;
-	   	  	 	   if(isset($fields)) {
+	   	  	 	   if (isset($fields)) {
 	   	  	 	   	  $field['fields'] = $fields;
 	   	  	 	   }
 	   	  	 	   
-	   	  	 	   if(!empty($customCode)) {
+	   	  	 	   if (!empty($customCode)) {
 	   	  	 	   	  $field['customCode'] = $customCode;
 	   	  	 	   }
   	 	   
@@ -242,7 +242,7 @@ 
 	   } //foreach
 
 	   // One last final check.  If $emptyCount does not equal Array $col count, don't add 
-	   if($emptyCount != count($col)) {
+	   if ($emptyCount != count($col)) {
    	      //$metarow[] = $col;
 	   } //if
 
@@ -251,17 +251,17 @@ 
    return $metarow;
 }
 
-function applyRules($moduleDir, $section=array()) {
+function applyRules($moduleDir, $section = array()) {
    require_once('include/SugarFields/Parsers/Rules/BaseRule.php');
    $baseRule = new BaseRule();
-   if(!is_array($section)) {
+   if (!is_array($section)) {
    	  $GLOBALS['log']->error("Error: SearchFormMetaParser->applyRules expects Array");
    	  return $section;
    }
    
-   foreach($section as $key=>$row) {
+   foreach ($section as $key=>$row) {
    	  //Override email1 fields
-   	  if($baseRule->matches($row, '/^email1$/si')) {
+   	  if ($baseRule->matches($row, '/^email1$/si')) {
    	  	 $section[$key] = array('name' => 'email', 'label' =>'LBL_ANY_EMAIL', 'type' => 'name');
    	  }
    }

Doc Comments +6 added lines

@@ -137,6 +137,9 @@ 
   return $section;
 }
 
+/**
+ * @param string $section
+ */
 function processSection($section, $table, $filePath, $vardefs=array()) {
    
    $toptr = $this->getElementsByType("tr", $table);
@@ -251,6 +254,9 @@ 
    return $metarow;
 }
 
+/**
+ * @param string $moduleDir
+ */
 function applyRules($moduleDir, $section=array()) {
    require_once('include/SugarFields/Parsers/Rules/BaseRule.php');
    $baseRule = new BaseRule();

include/SugarFields/SugarFieldHandler.php

Indentation +41 added lines, -41 removed lines

@@ -49,24 +49,24 @@ 
 
     static function fixupFieldType($field) {
             switch($field) {
-               case 'double':
+                case 'double':
                case 'decimal':
                     $field = 'float';
                     break;
-               case 'uint':
+                case 'uint':
                case 'ulong':
                case 'long':
                case 'short':
                case 'tinyint':
                     $field = 'int';
                     break;
-               case 'date':
+                case 'date':
                     $field = 'datetime';
                     break;
-               case 'url':
-               		$field = 'link';
-               		break;
-               case 'varchar':
+                case 'url':
+                       $field = 'link';
+                        break;
+                case 'varchar':
                     $field = 'base';
                     break;
             }
@@ -86,34 +86,34 @@ 
         $field = ucfirst($field);
 
         if(!isset($sugarFieldObjects[$field])) {
-        	//check custom directory
-        	if(file_exists('custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-        		$file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+            //check custom directory
+            if(file_exists('custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
+                $file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
-			//else check the fields directory
-			}else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-           		$file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+            //else check the fields directory
+            }else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
+                    $file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
-        	}else{
+            }else{
                 // No direct class, check the directories to see if they are defined
-        		if( $returnNullIfBase &&
+                if( $returnNullIfBase &&
                     !is_dir('custom/include/SugarFields/Fields/'.$field) &&
                     !is_dir('include/SugarFields/Fields/'.$field) ) {
                     return null;
                 }
-        		$file = 'include/SugarFields/Fields/Base/SugarFieldBase.php';
+                $file = 'include/SugarFields/Fields/Base/SugarFieldBase.php';
                 $type = 'Base';
-        	}
-			require_once($file);
+            }
+            require_once($file);
 
-			$class = 'SugarField' . $type;
-			//could be a custom class check it
-			$customClass = 'Custom' . $class;
-        	if(class_exists($customClass)){
-        		$sugarFieldObjects[$field] = new $customClass($field);
-        	}else{
-        		$sugarFieldObjects[$field] = new $class($field);
-        	}
+            $class = 'SugarField' . $type;
+            //could be a custom class check it
+            $customClass = 'Custom' . $class;
+            if(class_exists($customClass)){
+                $sugarFieldObjects[$field] = new $customClass($field);
+            }else{
+                $sugarFieldObjects[$field] = new $class($field);
+            }
         }
         return $sugarFieldObjects[$field];
     }
@@ -134,22 +134,22 @@ 
         $string = '';
         $displayTypeFunc = 'get' . $displayType . 'Smarty'; // getDetailViewSmarty, getEditViewSmarty, etc...
 
-		// This will handle custom type fields.
-		// The incoming $vardef Array may have custom_type set.
-		// If so, set $vardef['type'] to the $vardef['custom_type'] value
-		if(isset($vardef['custom_type'])) {
-		   $vardef['type'] = $vardef['custom_type'];
-		}
-		if(empty($vardef['type'])) {
-			$vardef['type'] = 'varchar';
-		}
+        // This will handle custom type fields.
+        // The incoming $vardef Array may have custom_type set.
+        // If so, set $vardef['type'] to the $vardef['custom_type'] value
+        if(isset($vardef['custom_type'])) {
+            $vardef['type'] = $vardef['custom_type'];
+        }
+        if(empty($vardef['type'])) {
+            $vardef['type'] = 'varchar';
+        }
 
-		$field = self::getSugarField($vardef['type']);
-		if ( !empty($vardef['function']) ) {
-			$string = $field->displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex);
-		} else {
-			$string = $field->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);
-		}
+        $field = self::getSugarField($vardef['type']);
+        if ( !empty($vardef['function']) ) {
+            $string = $field->displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex);
+        } else {
+            $string = $field->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);
+        }
 
         return $string;
     }

Spacing +18 added lines, -18 removed lines

@@ -48,7 +48,7 @@ 
     }
 
     static function fixupFieldType($field) {
-            switch($field) {
+            switch ($field) {
                case 'double':
                case 'decimal':
                     $field = 'float';
@@ -79,26 +79,26 @@ 
      *
      * @param field string field type
      */
-    static function getSugarField($field, $returnNullIfBase=false) {
+    static function getSugarField($field, $returnNullIfBase = false) {
         static $sugarFieldObjects = array();
 
         $field = self::fixupFieldType($field);
         $field = ucfirst($field);
 
-        if(!isset($sugarFieldObjects[$field])) {
+        if (!isset($sugarFieldObjects[$field])) {
         	//check custom directory
-        	if(file_exists('custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-        		$file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+        	if (file_exists('custom/include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php')) {
+        		$file = 'custom/include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php';
                 $type = $field;
 			//else check the fields directory
-			}else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
-           		$file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
+			} else if (file_exists('include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php')) {
+           		$file = 'include/SugarFields/Fields/'.$field.'/SugarField'.$field.'.php';
                 $type = $field;
-        	}else{
+        	} else {
                 // No direct class, check the directories to see if they are defined
-        		if( $returnNullIfBase &&
+        		if ($returnNullIfBase &&
                     !is_dir('custom/include/SugarFields/Fields/'.$field) &&
-                    !is_dir('include/SugarFields/Fields/'.$field) ) {
+                    !is_dir('include/SugarFields/Fields/'.$field)) {
                     return null;
                 }
         		$file = 'include/SugarFields/Fields/Base/SugarFieldBase.php';
@@ -106,12 +106,12 @@ 
         	}
 			require_once($file);
 
-			$class = 'SugarField' . $type;
+			$class = 'SugarField'.$type;
 			//could be a custom class check it
-			$customClass = 'Custom' . $class;
-        	if(class_exists($customClass)){
+			$customClass = 'Custom'.$class;
+        	if (class_exists($customClass)) {
         		$sugarFieldObjects[$field] = new $customClass($field);
-        	}else{
+        	} else {
         		$sugarFieldObjects[$field] = new $class($field);
         	}
         }
@@ -132,20 +132,20 @@ 
      */
     static function displaySmarty($parentFieldArray, $vardef, $displayType, $displayParams = array(), $tabindex = 1) {
         $string = '';
-        $displayTypeFunc = 'get' . $displayType . 'Smarty'; // getDetailViewSmarty, getEditViewSmarty, etc...
+        $displayTypeFunc = 'get'.$displayType.'Smarty'; // getDetailViewSmarty, getEditViewSmarty, etc...
 
 		// This will handle custom type fields.
 		// The incoming $vardef Array may have custom_type set.
 		// If so, set $vardef['type'] to the $vardef['custom_type'] value
-		if(isset($vardef['custom_type'])) {
+		if (isset($vardef['custom_type'])) {
 		   $vardef['type'] = $vardef['custom_type'];
 		}
-		if(empty($vardef['type'])) {
+		if (empty($vardef['type'])) {
 			$vardef['type'] = 'varchar';
 		}
 
 		$field = self::getSugarField($vardef['type']);
-		if ( !empty($vardef['function']) ) {
+		if (!empty($vardef['function'])) {
 			$string = $field->displayFromFunc($displayType, $parentFieldArray, $vardef, $displayParams, $tabindex);
 		} else {
 			$string = $field->$displayTypeFunc($parentFieldArray, $vardef, $displayParams, $tabindex);

Braces +3 added lines, -3 removed lines

@@ -91,10 +91,10 @@ 
         		$file = 'custom/include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
 			//else check the fields directory
-			}else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
+			} else if(file_exists('include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php')){
            		$file = 'include/SugarFields/Fields/' . $field . '/SugarField' . $field. '.php';
                 $type = $field;
-        	}else{
+        	} else{
                 // No direct class, check the directories to see if they are defined
         		if( $returnNullIfBase &&
                     !is_dir('custom/include/SugarFields/Fields/'.$field) &&
@@ -111,7 +111,7 @@ 
 			$customClass = 'Custom' . $class;
         	if(class_exists($customClass)){
         		$sugarFieldObjects[$field] = new $customClass($field);
-        	}else{
+        	} else{
         		$sugarFieldObjects[$field] = new $class($field);
         	}
         }

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
     function SugarFieldHandler() {
     }
 
+    /**
+     * @param string $field
+     */
     static function fixupFieldType($field) {
             switch($field) {
                case 'double':

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;
     }
 
 /**

Spacing +169 added lines, -169 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.
@@ -84,16 +84,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;
@@ -104,8 +104,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);
         }
     }
@@ -127,11 +127,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) {
@@ -140,7 +140,7 @@ 
             } elseif (!$alternate_found) {
                 $alternate_index = $k;
                 $alternate_found = true;
-            } elseif (!$alternate2_found){
+            } elseif (!$alternate2_found) {
                 $alternate2_index = $k;
                 $alternate2_found = true;
             }
@@ -177,27 +177,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']])
@@ -205,14 +205,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]);
@@ -243,13 +243,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;
@@ -271,7 +271,7 @@ 
         )
     {
         $emailCaps = strtoupper(trim($email));
-        if(empty($emailCaps))
+        if (empty($emailCaps))
             return 0;
 
         $q = "SELECT *
@@ -309,10 +309,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;
@@ -332,7 +332,7 @@ 
 
         $email = trim($email);
 
-        if(empty($email)) {
+        if (empty($email)) {
             return array();
         }
 
@@ -341,12 +341,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]);
                     }
 
@@ -374,7 +374,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;
@@ -385,54 +385,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
@@ -440,36 +440,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;
@@ -478,21 +478,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";
                           }
                        }
@@ -500,11 +500,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;
@@ -521,7 +521,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();
         }
     }
@@ -532,9 +532,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';
@@ -570,17 +570,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);
                         }
@@ -593,7 +593,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));
@@ -609,8 +609,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);
         }
@@ -631,11 +631,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)
@@ -657,7 +657,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);
@@ -707,12 +707,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'];
@@ -720,7 +720,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)
@@ -736,12 +736,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
@@ -753,7 +753,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 '';
@@ -794,7 +794,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 '';
@@ -819,7 +819,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;
         }
 
@@ -833,9 +833,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;
@@ -846,33 +846,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';
@@ -895,16 +895,16 @@ 
         $form = $this->view;
 
         //determine if this should be a quickcreate form, or a quick create form under subpanels
-        if ($this->view == "QuickCreate"){
-            $form = 'form_DC'.$this->view .'_'.$module;
-            if(isset($_REQUEST['action']) && $_REQUEST['action']=='SubpanelCreates' ||  $_REQUEST['action']=='SubpanelEdits'){
-                $form = 'form_Subpanel'.$this->view .'_'.$module;
+        if ($this->view == "QuickCreate") {
+            $form = 'form_DC'.$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);
@@ -915,7 +915,7 @@ 
         $newEmail = $this->smarty->fetch($template);
 
 
-        if($asMetadata) {
+        if ($asMetadata) {
             // used by Email 2.0
             $ret = array();
             $ret['prefillData'] = $prefillDataArr;
@@ -933,18 +933,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;
@@ -970,7 +970,7 @@ 
      */
     function getEmailAddressWidgetDuplicatesView($focus)
     {
-        if ( !($this->smarty instanceOf Sugar_Smarty ) )
+        if (!($this->smarty instanceOf Sugar_Smarty))
             $this->smarty = new Sugar_Smarty();
 
         $count = 0;
@@ -980,49 +980,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++;
         }
 
@@ -1047,33 +1047,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
@@ -1091,7 +1091,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)
@@ -1101,7 +1101,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))
         {
@@ -1125,15 +1125,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);

Braces +39 added lines, -26 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.
@@ -132,8 +134,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;
@@ -271,8 +274,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
@@ -288,7 +292,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;
     }
@@ -471,8 +477,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;
+                            }
                         }
                     }
                 }
@@ -675,8 +682,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;
         }
 
@@ -716,8 +722,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)){
@@ -783,8 +788,7 @@ 
             // otherwise
             $q .= "
                 ORDER BY ear.reply_to_address DESC";
-        }
-        else
+        } else
         {
             // retrieve reply-to address only
             $q .= "
@@ -835,8 +839,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;
 
@@ -854,8 +859,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;
@@ -880,8 +886,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);
@@ -935,13 +942,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) {
@@ -970,8 +980,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();
@@ -1131,7 +1142,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);
         }

Doc Comments +10 added lines, -16 removed lines

@@ -80,8 +80,6 @@ 
 
     /**
      * Legacy email address handling.  This is to allow support for SOAP or customizations
-     * @param string $id
-     * @param string $module
      */
     function handleLegacySave($bean, $prefix = "") {
         if(!isset($_REQUEST) || !isset($_REQUEST['useEmailWidget'])) {
@@ -166,12 +164,6 @@ 
 
     /**
      * Saves email addresses for a parent bean
-     * @param string $id Parent bean ID
-     * @param string $module Parent bean's module
-     * @param array $addresses Override of $_REQUEST vars, used to handle non-standard bean saves
-     * @param string $primary GUID of primary address
-     * @param string $replyTo GUID of reply-to address
-     * @param string $invalid GUID of invalid address
      */
     public function save($check_notify = FALSE) {
         $args = func_get_args();
@@ -369,7 +361,6 @@ 
      * Saves email addresses for a parent bean
      * @param string $id Parent bean ID
      * @param string $module Parent bean's module
-     * @param array $addresses Override of $_REQUEST vars, used to handle non-standard bean saves
      * @param string $primary GUID of primary address
      * @param string $replyTo GUID of reply-to address
      * @param string $invalid GUID of invalid address
@@ -620,7 +611,7 @@ 
 
     /**
      * preps a passed email address for email address storage
-     * @param array $addr Address in focus, must be RFC compliant
+     * @param string $addr Address in focus, must be RFC compliant
      * @return string $id email_addresses ID
      */
     function getEmailGUID($addr) {
@@ -733,7 +724,8 @@ 
  
     /**
      * Returns Primary or newest email address
-     * @param object $focus Object in focus
+     * @param boolean $focus Object in focus
+     * @param string $parent_type
      * @return string email
      */
     function getPrimaryAddress($focus,$parent_id=null,$parent_type=null) {
@@ -804,7 +796,7 @@ 
      * Returns all email addresses by parent's GUID
      * @param string $id Parent's GUID
      * @param string $module Parent's module
-     * @return array
+     * @return string
      */
     function getAddressesByGUID($id, $module) {
         $return = array();
@@ -828,7 +820,6 @@ 
 
     /**
      * Returns the HTML/JS for the EmailAddress widget
-     * @param string $parent_id ID of parent bean, generally $focus
      * @param string $module $focus' module
      * @param bool asMetadata Default false
      * @return string HTML/JS for widget
@@ -965,7 +956,7 @@ 
 
     /**
      * getEmailAddressWidgetDuplicatesView($focus)
-     * @param object $focus Bean in focus
+     * @param Lead $focus Bean in focus
      * @return string HTML that contains hidden input values based off of HTML request
      */
     function getEmailAddressWidgetDuplicatesView($focus)
@@ -1041,6 +1032,7 @@ 
     /**
      * getFormBaseURL
      *
+     * @param SugarBean $focus
      */
     function getFormBaseURL($focus) {
         $get = "";
@@ -1081,13 +1073,15 @@ 
 
     }
 
+    /**
+     * @param string $view
+     */
     function setView($view) {
        $this->view = $view;
     }
 
 /**
  * This function is here so the Employees/Users division can be handled cleanly in one place
- * @param object $focus SugarBean
  * @return string The value for the bean_module column in the email_addr_bean_rel table
  */
     function getCorrectedModule(&$module) {
@@ -1119,7 +1113,7 @@ 
 
 /**
  * Convenience function for MVC (Mystique)
- * @param object $focus SugarBean
+ * @param SugarBean $focus SugarBean
  * @param string $field unused
  * @param string $value unused
  * @param string $view DetailView or EditView