adamjakab / SuiteCRM

custom/modules/Prospects/logic_hooks.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // Do not store anything in this file that is not part of the array or the hook version.  This file will	
 // be automatically rebuilt in the future. 
- $hook_version = 1; 
+    $hook_version = 1; 
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['before_save'] = Array(); 

custom/modules/Meetings/logic_hooks.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // Do not store anything in this file that is not part of the array or the hook version.  This file will	
 // be automatically rebuilt in the future. 
- $hook_version = 1; 
+    $hook_version = 1; 
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['after_save'] = Array(); 

custom/modules/Opportunities/logic_hooks.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // Do not store anything in this file that is not part of the array or the hook version.  This file will	
 // be automatically rebuilt in the future. 
- $hook_version = 1; 
+    $hook_version = 1; 
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['before_save'] = Array(); 

custom/modules/Project/logic_hooks.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // Do not store anything in this file that is not part of the array or the hook version.  This file will	
 // be automatically rebuilt in the future. 
- $hook_version = 1; 
+    $hook_version = 1; 
 $hook_array = Array(); 
 // position, file, function
 

custom/modules/Accounts/logic_hooks.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // Do not store anything in this file that is not part of the array or the hook version.  This file will	
 // be automatically rebuilt in the future. 
- $hook_version = 1; 
+    $hook_version = 1; 
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['after_ui_frame'] = Array(); 

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

custom/modules/Contacts/logic_hooks.php

Indentation +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 // Do not store anything in this file that is not part of the array or the hook version.  This file will	
 // be automatically rebuilt in the future. 
- $hook_version = 1; 
+    $hook_version = 1; 
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['before_save'] = Array(); 

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] : '';
 }
 
 

include/SugarFields/Parsers/QuickCreateMetaParser.php

Indentation +164 added lines, -164 removed lines

@@ -52,7 +52,7 @@ 
 class QuickCreateMetaParser extends MetaParser {
 
 function QuickCreateMetaParser() {
-   $this->mView = 'QuickCreate';
+    $this->mView = 'QuickCreate';
 }
 
 /**
@@ -67,199 +67,199 @@ 
  **/
 function parse($filePath, $vardefs = array(), $moduleDir = '', $merge=false, $masterCopy=null) {
 
-   global $app_strings;
-   $contents = file_get_contents($filePath);
+    global $app_strings;
+    $contents = file_get_contents($filePath);
    
-   // The contents are not well formed so we add this section to make it easier to parse
-   $contents = $this->trimHTML($contents) . '</td></tr></table>';
-   $moduleName = '';
+    // The contents are not well formed so we add this section to make it easier to parse
+    $contents = $this->trimHTML($contents) . '</td></tr></table>';
+    $moduleName = '';
    
-   $forms = $this->getElementsByType("form", $contents);
-   $tables = $this->getElementsByType("table", $forms[0] . "</td></tr></table>");
-   $mainrow = $this->getElementsByType("tr", $tables[1]);
-   $rows = substr($mainrow[0], strpos($mainrow[0], "</tr>"));
-   $tablerows = $this->getElementsByType("tr", $rows);
+    $forms = $this->getElementsByType("form", $contents);
+    $tables = $this->getElementsByType("table", $forms[0] . "</td></tr></table>");
+    $mainrow = $this->getElementsByType("tr", $tables[1]);
+    $rows = substr($mainrow[0], strpos($mainrow[0], "</tr>"));
+    $tablerows = $this->getElementsByType("tr", $rows);
 
-   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) {
+        foreach($tablecolumns as $tcols) {
 	   	  	 	  
-	   	  $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
-	   	  $sugarAttrValue = $this->getTagAttribute("sugar", $tcols, "'slot[0-9]+b$'");
+                $sugarAttrLabel = $this->getTagAttribute("sugar", $tcols, "'^slot[^b]+$'");
+                $sugarAttrValue = $this->getTagAttribute("sugar", $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;
+            // 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++;
+            $slot++;
           
-          if($sugarAttrValue) {
+            if($sugarAttrValue) {
 	   	     	 
-	   	  	 $spanValue = strtolower($this->getElementValue("span", $tcols));
-             if(empty($spanValue)) {
+                    $spanValue = strtolower($this->getElementValue("span", $tcols));
+                if(empty($spanValue)) {
                 $spanValue = strtolower($this->getElementValue("slot", $tcols));	
-             }
-             if(empty($spanValue)) {
+                }
+                if(empty($spanValue)) {
                 $spanValue = strtolower($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 = '';
-             $readOnly = false;
-             $fields = null;
-             $customCode = null;
+                    $name = '';
+                $readOnly = false;
+                $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[\.]).*?/s", $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.'.$pair[1].'.value', $customCode);
-		   	  	 	   }
-		           } //foreach
-		       } else {
-		       	   //If it is only a label, skip
-		       	   if(preg_match("/^(mod[\.]|app[\.]).*?/s", $matches[0][1])) {
-		       	   	  continue;
-		       	   } else if(preg_match("/^[\$].*?/s", $matches[0][1])) {
-		       	   	  $name = '{' . strtoupper($matches[0][1]) . '}';  
-		       	   } else {         
-		   	  	   	  $name = $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[\.]).*?/s", $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.'.$pair[1].'.value', $customCode);
+                                }
+                    } //foreach
+                } else {
+                        //If it is only a label, skip
+                        if(preg_match("/^(mod[\.]|app[\.]).*?/s", $matches[0][1])) {
+                            continue;
+                        } else if(preg_match("/^[\$].*?/s", $matches[0][1])) {
+                            $name = '{' . strtoupper($matches[0][1]) . '}';  
+                        } else {         
+                                $name = $matches[0][1];
+                        }   
+                    }
 		   	  	   
-		   	   $readOnly = true;  
-	   	  	 } else if(is_array($formElementNames)) {
+                    $readOnly = true;  
+                    } else if(is_array($formElementNames)) {
                   
-	   	  	      if(count($formElementNames) == 1) {
-	   	  	      	 if(!empty($vardefs[$formElementNames[0]])) {
-	   	  	            $name = $formElementNames[0];
-	   	  	      	 } 
-	   	  	      } else {
-	   	  	      	 $fields = array();
-	   	  	      	 foreach($formElementNames as $elementName) {
-	   	  	      	 	// What we are doing here is saying that we will add all your fields assuming
-	   	  	      	 	// there are none that are of type relate or link.  However, if we find such a type
-	   	  	      	 	// we'll take the first one found and assume that is the field you want (the SugarFields
-	   	  	      	 	// library will handle rendering the popup and select and clear buttons for you).
-	   	  	      	 	if(isset($vardefs[$elementName])) {
-	   	  	      	 	   $type = $vardefs[$elementName]['type'];
-	   	  	      	 	   if($type != 'relate' && $type != 'link') {
-	   	  	      	 	      $fields[] = $elementName;
-	   	  	      	 	      $name = $elementName;
-	   	  	      	 	   } else {
-	   	  	      	          unset($fields);
-	   	  	      	 	      $name = $elementName;
-	   	  	      	 	      break;	
-	   	  	      	 	   }
-	   	  	      	 	}
-	   	  	      	 }
-	   	  	      } //if-else
-	   	  	 }
+                        if(count($formElementNames) == 1) {
+                            if(!empty($vardefs[$formElementNames[0]])) {
+                                $name = $formElementNames[0];
+                            } 
+                        } else {
+                            $fields = array();
+                            foreach($formElementNames as $elementName) {
+                                // What we are doing here is saying that we will add all your fields assuming
+                                // there are none that are of type relate or link.  However, if we find such a type
+                                // we'll take the first one found and assume that is the field you want (the SugarFields
+                                // library will handle rendering the popup and select and clear buttons for you).
+                                if(isset($vardefs[$elementName])) {
+                                    $type = $vardefs[$elementName]['type'];
+                                    if($type != 'relate' && $type != 'link') {
+                                        $fields[] = $elementName;
+                                        $name = $elementName;
+                                    } else {
+                                        unset($fields);
+                                        $name = $elementName;
+                                        break;	
+                                    }
+                                }
+                            }
+                        } //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;	
-	   	  	    }
-	   	  	    $col[] = $field;
-	   	  	 } else if($readOnly) {
-	   	  	 	$field = array();
-	   	  	 	$field['name'] = $name;
-	   	  	 	$field['type'] = 'readonly';
-	   	  	 	if(isset($customCode)) {
-	   	  	 	   $field['customCode'] = $customCode;
-	   	  	 	} //if
-	   	  	 	$col[] = $field;
-	   	  	 } else {
+                        if(!empty($displayParams['rows']) && !empty($displayParams['cols'])) {
+                            $field = array();
+                            $field['name'] = $name;
+                    $field['displayParams'] = $displayParams;
+                        } else {
+                            $field = $name;	
+                        }
+                        $col[] = $field;
+                    } else if($readOnly) {
+                        $field = array();
+                        $field['name'] = $name;
+                        $field['type'] = 'readonly';
+                        if(isset($customCode)) {
+                            $field['customCode'] = $customCode;
+                        } //if
+                        $col[] = $field;
+                    } else {
 
-	   	  	 	if(isset($fields) || isset($customCode)) {
-	   	  	 	   $field = array();
-	   	  	 	   $field['name'] = $name;
-	   	  	 	   if(isset($fields)) {
-	   	  	 	   	  $field['fields'] = $fields;
-	   	  	 	   }
-	   	  	 	   if(isset($customCode)) {
-	   	  	 	   	  $field['customCode'] = $customCode;
-	   	  	 	   }
+                        if(isset($fields) || isset($customCode)) {
+                            $field = array();
+                            $field['name'] = $name;
+                            if(isset($fields)) {
+                                $field['fields'] = $fields;
+                            }
+                            if(isset($customCode)) {
+                                $field['customCode'] = $customCode;
+                            }
   	 	   
-	   	  	 	   $col[] = $field;
-	   	  	 	} else {
-	   	  	 	   $emptyCount = $name == '' ? $emptyCount + 1 : $emptyCount;
-	   	  	 	   $col[] = $name;
-	   	  	 	}	
-	   	  	 } //if-else if-else block
-	   	  } //if($sugarAttrValue)
-	   } //foreach
+                            $col[] = $field;
+                        } else {
+                            $emptyCount = $name == '' ? $emptyCount + 1 : $emptyCount;
+                            $col[] = $name;
+                        }	
+                    } //if-else if-else block
+                } //if($sugarAttrValue)
+        } //foreach
 	   
-	   // One last final check.  If $emptyCount does not equal Array $col count, don't add 
-	   if($emptyCount != count($col)) {
-   	      $metarow[] = $col;
-	   } //if
-   } //foreach
+        // One last final check.  If $emptyCount does not equal Array $col count, don't add 
+        if($emptyCount != count($col)) {
+                $metarow[] = $col;
+        } //if
+    } //foreach
    
-   $templateMeta = array();
-   $templateMeta['form']['buttons'] = 'button';
+    $templateMeta = array();
+    $templateMeta['form']['buttons'] = 'button';
 
-   preg_match_all("/(<input[^>]*?)>/si", $tables[0], $matches);
-   $buttons = array();
-   foreach($matches[0] as $button) {
-   		$buttons[] = array('customCode'=>$button);	   
-   }
-   $templateMeta['form']['buttons'] = $buttons;
+    preg_match_all("/(<input[^>]*?)>/si", $tables[0], $matches);
+    $buttons = array();
+    foreach($matches[0] as $button) {
+            $buttons[] = array('customCode'=>$button);	   
+    }
+    $templateMeta['form']['buttons'] = $buttons;
    
-   $formElements = $this->getFormElements($contents);
-   $hiddenInputs = array();
-   foreach($formElements as $elem) {
-   	      $type = $this->getTagAttribute("type", $elem);
-   	      if(preg_match('/hidden/si',$type, $matches)) {
-   	         $name = $this->getTagAttribute("name", $elem);
-   	         $value = $this->getTagAttribute("value", $elem);
-   	         $index = stripos($value, '$REQUEST');
-   	         $value =  !empty($index) ? '$smarty.request.' . substr($value, 10) : $value;
-   	         $hiddenInputs[] = '<input id="' . $name . '" name="' . $name . '" value="' . $value . '">';
-   	      } 
-   } //foreach
+    $formElements = $this->getFormElements($contents);
+    $hiddenInputs = array();
+    foreach($formElements as $elem) {
+                $type = $this->getTagAttribute("type", $elem);
+                if(preg_match('/hidden/si',$type, $matches)) {
+                $name = $this->getTagAttribute("name", $elem);
+                $value = $this->getTagAttribute("value", $elem);
+                $index = stripos($value, '$REQUEST');
+                $value =  !empty($index) ? '$smarty.request.' . substr($value, 10) : $value;
+                $hiddenInputs[] = '<input id="' . $name . '" name="' . $name . '" value="' . $value . '">';
+                } 
+    } //foreach
    
-   $templateMeta['form']['hidden'] = $hiddenInputs;
-   $templateMeta['widths'] = array(array('label' => '10', 'field' => '30'),  array('label' => '10', 'field' => '30'));
-   $templateMeta['maxColumns'] = 2;
+    $templateMeta['form']['hidden'] = $hiddenInputs;
+    $templateMeta['widths'] = array(array('label' => '10', 'field' => '30'),  array('label' => '10', 'field' => '30'));
+    $templateMeta['maxColumns'] = 2;
    
-   $panels = array();
-   $panels['default'] = $metarow;
-   $panels = $this->appplyRules($moduleDir, $panels);
-   return $this->createFileContents($moduleDir, $panels, $templateMeta, $filePath);
+    $panels = array();
+    $panels['default'] = $metarow;
+    $panels = $this->appplyRules($moduleDir, $panels);
+    return $this->createFileContents($moduleDir, $panels, $templateMeta, $filePath);
    
 
 }