adamjakab / SuiteCRM

custom/modules/unified_search_modules_display.php

Indentation +102 added lines, -102 removed lines

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

include/SugarFields/Parsers/MetaParser.php

Indentation +388 added lines, -388 removed lines

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

Doc Comments +23 added lines, -7 removed lines

@@ -96,7 +96,7 @@ 
 /**
  * getFormElementsNames
  * Parses for the name values of input, select, textarea types from string content
- * @param $contents The String contents to parse
+ * @param string $contents The String contents to parse
  * @return $matches Array of name/value pairs
  */
 function getFormElementsNames($contents) {
@@ -108,7 +108,7 @@ 
 /**
  * getTagAttribute
  * Returns the name/value of a tag attribute where name is set to $name
- * @param $name The name of the attribute
+ * @param string $name The name of the attribute
  * @param $contents The contents to parse
  * @param $filter Option regular expression to filter value
  * @return Array of name/value for matching attribute
@@ -163,7 +163,7 @@ 
  * and method call getElementsByType("<td>", $contents) returns
  * "<td>Text <table><tr><td>a</td></tr></table></td>"
  *
- * @param $type The type of element to parse out and return
+ * @param string $type The type of element to parse out and return
  * @return a tag element format Array
  */
 function getElementsByType($type, $contents) {
@@ -208,6 +208,7 @@ 
 /**
  * getElementValue
  *
+ * @param string $type
  */
 function getElementValue($type, $contents, $filter = "(.*?)") {
    $exp = "'<".$type."[^>]*?>".$filter."</".$type."[^>]*?>'si";
@@ -244,7 +245,7 @@ 
  * Returns the highest number of <td>...</td> blocks within a <tr>...</tr> block.
  * @param $contents The table contents to parse
  * @param $filter Optional filter to parse for an attribute within the td block.
- * @return The maximum column count
+ * @return integer maximum column count
  */
 function getMaxColumns($contents, $filter) {
    preg_match_all("'(<tr[^>]*?>)(.*?)(</tr[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
@@ -281,6 +282,9 @@ 
  * trimHTML
  * This function removes the \r (return), \n (newline) and \t (tab) markup from string
  */
+/**
+ * @param string $contents
+ */
 function trimHTML($contents) {
    $contents = str_replace(array("\r"), array(""), $contents);
    $contents = str_replace(array("\n"), array(""), $contents);
@@ -342,6 +346,9 @@ 
 
 }
 
+/**
+ * @param string $javascript
+ */
 static function parseDelimiters($javascript) {
 	$newJavascript = '';
 	$scriptLength = strlen($javascript);
@@ -441,7 +448,7 @@ 
  * dirList
  * Utility method to list all the files in a given directory.
  *
- * @param $directory The directory to scan
+ * @param string $directory The directory to scan
  * @return $results The files in the directory that were found
  */
 function dirList ($directory) {
@@ -496,6 +503,9 @@ 
    return null;
 }
 
+/**
+ * @param string $moduleDir
+ */
 function applyPreRules($moduleDir, $panels) {
    if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
@@ -506,6 +516,9 @@ 
    return $panels;
 }
 
+/**
+ * @param string $moduleDir
+ */
 function applyRules($moduleDir, $panels) {
    return $this->applyPostRules($moduleDir, $panels);
 }
@@ -537,6 +550,9 @@ 
    return $panels;
 }
 
+/**
+ * @param string $moduleDir
+ */
 function createFileContents($moduleDir, $panels, $templateMeta=array(), $htmlFilePath) {
 
 $header = "<?php\n\n";
@@ -587,7 +603,7 @@ 
  * mergePanels
  * This function merges the $panels Array against the $masterCopy's meta data definition
  * @param $panels meta data Array to merge
- * @param $moduleDir Directory name of the module
+ * @param string $moduleDir Directory name of the module
  * @param $masterCopy file path to the meta data master copy
  * @return Array of merged $panel definition
  */
@@ -680,7 +696,7 @@ 
  * mergeTemplateMeta
  * This function merges the $templateMeta Array against the $masterCopy's meta data definition
  * @param $templateMeta meta data Array to merge
- * @param $moduleDir Directory name of the module
+ * @param string $moduleDir Directory name of the module
  * @param $masterCopy file path to the meta data master copy
  * @return Array of merged $templateMeta definition
  */

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

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);

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'));
+        }
     }
 }

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'));
     }
 }
 ?>

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

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

include/SugarOauth.php

Indentation +39 added lines, -39 removed lines

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

include/phpmailer/language/phpmailer.lang-ar.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
 $PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
-                                          'فشل في الارسال لكل من : ';
+                                            'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
 $PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';