adamjakab / SuiteCRM

custom/modules/Prospects/logic_hooks.php

Spacing +2 added lines, -2 removed lines

@@ -5,9 +5,9 @@
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['before_save'] = Array(); 
-$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Prospects/ProspectsJjwg_MapsLogicHook.php','ProspectsJjwg_MapsLogicHook', 'updateGeocodeInfo');
+$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Prospects/ProspectsJjwg_MapsLogicHook.php', 'ProspectsJjwg_MapsLogicHook', 'updateGeocodeInfo');
 $hook_array['after_save'] = Array(); 
-$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Prospects/ProspectsJjwg_MapsLogicHook.php','ProspectsJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo');
+$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Prospects/ProspectsJjwg_MapsLogicHook.php', 'ProspectsJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo');
 
 
 

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

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['after_save'] = Array(); 
-$hook_array['after_save'][] = Array(77, 'updateMeetingGeocodeInfo', 'modules/Meetings/MeetingsJjwg_MapsLogicHook.php','MeetingsJjwg_MapsLogicHook', 'updateMeetingGeocodeInfo');
+$hook_array['after_save'][] = Array(77, 'updateMeetingGeocodeInfo', 'modules/Meetings/MeetingsJjwg_MapsLogicHook.php', 'MeetingsJjwg_MapsLogicHook', 'updateMeetingGeocodeInfo');
 
 
 

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/Opportunities/logic_hooks.php

Spacing +6 added lines, -6 removed lines

@@ -5,15 +5,15 @@
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['before_save'] = Array(); 
-$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php','OpportunitiesJjwg_MapsLogicHook', 'updateGeocodeInfo'); 
-$hook_array['before_save'][] = Array(1, 'Opportunities push feed', 'modules/Opportunities/SugarFeeds/OppFeed.php','OppFeed', 'pushFeed');
+$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php', 'OpportunitiesJjwg_MapsLogicHook', 'updateGeocodeInfo'); 
+$hook_array['before_save'][] = Array(1, 'Opportunities push feed', 'modules/Opportunities/SugarFeeds/OppFeed.php', 'OppFeed', 'pushFeed');
 $hook_array['after_save'] = Array(); 
-$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php','OpportunitiesJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo'); 
-$hook_array['after_save'][] = Array(78, 'updateRelatedProjectGeocodeInfo', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php','OpportunitiesJjwg_MapsLogicHook', 'updateRelatedProjectGeocodeInfo'); 
+$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php', 'OpportunitiesJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo'); 
+$hook_array['after_save'][] = Array(78, 'updateRelatedProjectGeocodeInfo', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php', 'OpportunitiesJjwg_MapsLogicHook', 'updateRelatedProjectGeocodeInfo'); 
 $hook_array['after_relationship_add'] = Array(); 
-$hook_array['after_relationship_add'][] = Array(77, 'addRelationship', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php','OpportunitiesJjwg_MapsLogicHook', 'addRelationship'); 
+$hook_array['after_relationship_add'][] = Array(77, 'addRelationship', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php', 'OpportunitiesJjwg_MapsLogicHook', 'addRelationship'); 
 $hook_array['after_relationship_delete'] = Array(); 
-$hook_array['after_relationship_delete'][] = Array(77, 'deleteRelationship', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php','OpportunitiesJjwg_MapsLogicHook', 'deleteRelationship'); 
+$hook_array['after_relationship_delete'][] = Array(77, 'deleteRelationship', 'modules/Opportunities/OpportunitiesJjwg_MapsLogicHook.php', 'OpportunitiesJjwg_MapsLogicHook', 'deleteRelationship'); 
 
 
 

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

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 // position, file, function
 
 $hook_array['before_delete'] = Array();
-$hook_array['before_delete'][] = Array(1, 'Delete Project Tasks', 'modules/Project/delete_project_tasks.php','delete_project_tasks', 'delete_tasks');
+$hook_array['before_delete'][] = Array(1, 'Delete Project Tasks', 'modules/Project/delete_project_tasks.php', 'delete_project_tasks', 'delete_tasks');
 ?>
\ No newline at end of file

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/Accounts/logic_hooks.php

Spacing +7 added lines, -7 removed lines

@@ -6,16 +6,16 @@
 // position, file, function 
 $hook_array['after_ui_frame'] = Array(); 
 $hook_array['before_save'] = Array(); 
-$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'updateGeocodeInfo'); 
+$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'updateGeocodeInfo'); 
 $hook_array['after_save'] = Array(); 
-$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo'); 
-$hook_array['after_save'][] = Array(78, 'updateRelatedProjectGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'updateRelatedProjectGeocodeInfo'); 
-$hook_array['after_save'][] = Array(79, 'updateRelatedOpportunitiesGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'updateRelatedOpportunitiesGeocodeInfo'); 
-$hook_array['after_save'][] = Array(80, 'updateRelatedCasesGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'updateRelatedCasesGeocodeInfo'); 
+$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo'); 
+$hook_array['after_save'][] = Array(78, 'updateRelatedProjectGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'updateRelatedProjectGeocodeInfo'); 
+$hook_array['after_save'][] = Array(79, 'updateRelatedOpportunitiesGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'updateRelatedOpportunitiesGeocodeInfo'); 
+$hook_array['after_save'][] = Array(80, 'updateRelatedCasesGeocodeInfo', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'updateRelatedCasesGeocodeInfo'); 
 $hook_array['after_relationship_add'] = Array(); 
-$hook_array['after_relationship_add'][] = Array(77, 'addRelationship', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'addRelationship'); 
+$hook_array['after_relationship_add'][] = Array(77, 'addRelationship', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'addRelationship'); 
 $hook_array['after_relationship_delete'] = Array(); 
-$hook_array['after_relationship_delete'][] = Array(77, 'deleteRelationship', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php','AccountsJjwg_MapsLogicHook', 'deleteRelationship'); 
+$hook_array['after_relationship_delete'][] = Array(77, 'deleteRelationship', 'modules/Accounts/AccountsJjwg_MapsLogicHook.php', 'AccountsJjwg_MapsLogicHook', 'deleteRelationship'); 
 
 
 

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/unified_search_modules_display.php

Indentation +102 added lines, -102 removed lines

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

Spacing +35 added lines, -35 removed lines

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

custom/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(); 

Spacing +4 added lines, -4 removed lines

@@ -5,11 +5,11 @@
 $hook_array = Array(); 
 // position, file, function 
 $hook_array['before_save'] = Array(); 
-$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Contacts/ContactsJjwg_MapsLogicHook.php','ContactsJjwg_MapsLogicHook', 'updateGeocodeInfo');
-$hook_array['before_save'][] = Array(1, 'Contacts push feed', 'modules/Contacts/SugarFeeds/ContactFeed.php','ContactFeed', 'pushFeed');
+$hook_array['before_save'][] = Array(77, 'updateGeocodeInfo', 'modules/Contacts/ContactsJjwg_MapsLogicHook.php', 'ContactsJjwg_MapsLogicHook', 'updateGeocodeInfo');
+$hook_array['before_save'][] = Array(1, 'Contacts push feed', 'modules/Contacts/SugarFeeds/ContactFeed.php', 'ContactFeed', 'pushFeed');
 $hook_array['after_save'] = Array(); 
-$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Contacts/ContactsJjwg_MapsLogicHook.php','ContactsJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo');
-$hook_array['after_save'][] = Array(1, 'Update Portal', 'modules/Contacts/updatePortal.php','updatePortal', 'updateUser');
+$hook_array['after_save'][] = Array(77, 'updateRelatedMeetingsGeocodeInfo', 'modules/Contacts/ContactsJjwg_MapsLogicHook.php', 'ContactsJjwg_MapsLogicHook', 'updateRelatedMeetingsGeocodeInfo');
+$hook_array['after_save'][] = Array(1, 'Update Portal', 'modules/Contacts/updatePortal.php', 'updatePortal', 'updateUser');
 
 
 

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

Spacing +1 added lines, -1 removed lines

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

include/SugarFields/Parsers/MetaParser.php

Indentation +388 added lines, -388 removed lines

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

Spacing +100 added lines, -100 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,7 +66,7 @@ 
  * Parses for contents enclosed within <form>...</form> tags
  */
 function getFormContents($contents, $all = true) {
-   if($all) {
+   if ($all) {
       preg_match_all("'(<form[^>]*?>)(.*?)(</form[^>]*?>)'si", $contents, $matches);
       return $matches;
    }
@@ -86,7 +86,7 @@ 
 function getFormElements($contents) {
    preg_match_all("'(<[ ]*?)(textarea|input|select)([^>]*?)(>)'si", $contents, $matches, PREG_PATTERN_ORDER);
    $elems = array();
-   foreach($matches[3] as $match) {
+   foreach ($matches[3] as $match) {
    	  $elems[] = $match;
    }
    return $elems;
@@ -118,13 +118,13 @@ 
 
    $exp = "'".$name."[\s]*?=[\s]*?[\'\"]([^\'^\"]*?)[\'\"]'si";
    preg_match_all($exp, $contents, $matches, PREG_SET_ORDER);
-   if(empty($filter)) {
+   if (empty($filter)) {
    	  return !empty($matches[0][1]) ? $matches[0][1] : '';
    }
 
    $filtered = array();
-   foreach($matches as $tag) {
-   	  if(preg_match($filter, $tag[1])) {
+   foreach ($matches as $tag) {
+   	  if (preg_match($filter, $tag[1])) {
    	  	 $filtered[] = $tag;
    	  }
    }
@@ -141,13 +141,13 @@ 
  */
 function getTables($tableClass = null, $contents) {
    preg_match_all("'(<table[^>]*?>)(.*?)(</table[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
-   if($tableClass == null) {
+   if ($tableClass == null) {
    	  return $matches;
    }
 
    $tables = array();
-   foreach($matches as $key => $table) {
-   	  if(strpos($table[1], $tableClass) > 0) {
+   foreach ($matches as $key => $table) {
+   	  if (strpos($table[1], $tableClass) > 0) {
    	  	 $tables[] = $table;
    	  }
    }
@@ -170,27 +170,27 @@ 
    $x = strlen($contents);
    $mark = 0;
    $count = 0;
-   $stag1 = "<" . trim($type, " <>") . '>';
-   $stag2 = "<" . trim($type, " <>") . ' ';
+   $stag1 = "<".trim($type, " <>").'>';
+   $stag2 = "<".trim($type, " <>").' ';
    $etag = "</".$type.">";
    $sincrement = strlen($stag1);
    $eincrement = strlen($etag);
    $sarr = array();
    $values = array();
 
-   while($count < $x) {
+   while ($count < $x) {
    	     $stok = substr($contents, $count, $sincrement);
    	     $etok = substr($contents, $count, $eincrement);
-   	     if($stok == $stag1 || $stok == $stag2) {
+   	     if ($stok == $stag1 || $stok == $stag2) {
    	     	//Reset mark;
-   	        if(count($sarr) == 0) {
+   	        if (count($sarr) == 0) {
    	           $mark = $count;
    	        }
             $sarr[] = $count;
 
-   	     } else if($etok == $etag) {
+   	     } else if ($etok == $etag) {
    	        array_shift($sarr);
-   	        if(count($sarr) == 0) {
+   	        if (count($sarr) == 0) {
    	           $val = substr($contents, $mark, ($count - $mark) + $eincrement);
    	           $values[] = $val;
    	           $mark = $count;
@@ -231,7 +231,7 @@ 
 function stripFlavorTags($contents) {
    $flavor = isset($GLOBALS['sugar_flavor']) ? $GLOBALS['sugar_flavor'] : 'PRO';
    $isPro = ($flavor == 'ENT' || $flavor == 'PRO') ? true : false;
-   if($isPro) {
+   if ($isPro) {
    	 $contents = preg_replace('/<!-- BEGIN: open_source -->.*?<!-- END: open_source -->/', '', $contents);
    } else {
    	 $contents = preg_replace('/<!-- BEGIN: pro -->.*?<!-- END: pro -->/', '', $contents);
@@ -249,9 +249,9 @@ 
 function getMaxColumns($contents, $filter) {
    preg_match_all("'(<tr[^>]*?>)(.*?)(</tr[^>]*?>)'si", $contents, $matches, PREG_SET_ORDER);
    $max = 0;
-   foreach($matches as $tableRows) {
+   foreach ($matches as $tableRows) {
            $count = substr_count($tableRows[2], $filter);
-           if($count > $max) {
+           if ($count > $max) {
            	  $max = $count;
            }
    }
@@ -263,9 +263,9 @@ 
 
    $elements = array();
 
-   foreach($matches as $data) {
+   foreach ($matches as $data) {
    	   // We need 4 because the 1,2,3 indexes make up start,body,end
-	   if(count($data) == 4) {
+	   if (count($data) == 4) {
 	   	  $element = array();
 	   	  $element['start'] = $data[1];
 	   	  $element['body'] = $data[2];
@@ -306,12 +306,12 @@ 
 
 //Check if there are Javascript blocks of code to process
 preg_match_all("'(<script[^>]*?>)(.*?)(</script[^>]*?>)'si", $contents, $matches, PREG_PATTERN_ORDER);
-if(empty($matches)) {
+if (empty($matches)) {
    return $javascript;
 }
 
-foreach($matches[0] as $scriptBlock) {
-	    $javascript .= "\n" . $scriptBlock;
+foreach ($matches[0] as $scriptBlock) {
+	    $javascript .= "\n".$scriptBlock;
 } //foreach
 
 $javascript = substr($javascript, 1);
@@ -322,11 +322,11 @@ 
 
 //Find all blocks that may need to be replaced with Smarty syntax
 preg_match_all("'([\{])([a-zA-Z0-9_]*?)([\}])'si", $javascript, $matches, PREG_PATTERN_ORDER);
-if(!empty($matches)) {
+if (!empty($matches)) {
 	$replace = array();
 
-	foreach($matches[0] as $xTemplateCode) {
-		    if(!isset($replace[$xTemplateCode])) {
+	foreach ($matches[0] as $xTemplateCode) {
+		    if (!isset($replace[$xTemplateCode])) {
 		       $replace[$xTemplateCode] = str_replace("{", "{\$", $xTemplateCode);
 		    } //if
 	} //foreach
@@ -334,7 +334,7 @@ 
 	$javascript = str_replace(array_keys($replace), array_values($replace), $javascript);
 } //if
 
-if(!$addLiterals) {
+if (!$addLiterals) {
    return $javascript;
 }
 
@@ -348,12 +348,12 @@ 
 	$count = 0;
 	$inSmartyVariable = false;
 
-	while($count < $scriptLength) {
+	while ($count < $scriptLength) {
 
-	      if($inSmartyVariable) {
+	      if ($inSmartyVariable) {
 	      	 $start = $count;
 	      	 $numOfChars = 1;
-	      	 while(isset($javascript[$count]) && $javascript[$count] != '}') {
+	      	 while (isset($javascript[$count]) && $javascript[$count] != '}') {
 	      	 	   $count++;
 	      	 	   $numOfChars++;
 	      	 }
@@ -366,12 +366,12 @@ 
 			  $char = $javascript[$count];
 			  $nextChar = ($count + 1 >= $scriptLength) ? '' : $javascript[$count + 1];
 
-			  if($char == "{" && $nextChar == "$") {
+			  if ($char == "{" && $nextChar == "$") {
 			  	 $inSmartyVariable = true;
 			  	 $newJavascript .= $javascript[$count];
-			  } else if($char == "{") {
-			  	 $newJavascript .=  " {ldelim} ";
-			  } else if($char == "}") {
+			  } else if ($char == "{") {
+			  	 $newJavascript .= " {ldelim} ";
+			  } else if ($char == "}") {
 			  	 $newJavascript .= " {rdelim} ";
 			  } else {
 			     $newJavascript .= $javascript[$count];
@@ -397,32 +397,32 @@ 
  */
 function findAssignedVariableName($name, $filePath) {
 
-	if($this->mPHPFile == "INVALID") {
+	if ($this->mPHPFile == "INVALID") {
 	   return $name;
 	}
 
-	if(!isset($this->mPHPFile)) {
-	   if(preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
+	if (!isset($this->mPHPFile)) {
+	   if (preg_match('/(.*?)(DetailView).html$/', $filePath, $matches)) {
 	   	 $dir = $matches[1];
-	   } else if(preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
+	   } else if (preg_match('/(.*?)(EditView).html$/', $filePath, $matches)) {
 	   	 $dir = $matches[1];
 	   }
 
-	   if(!isset($dir) || !is_dir($dir)) {
+	   if (!isset($dir) || !is_dir($dir)) {
 	      $this->mPHPFile = "INVALID";
 	      return $name;
 	   }
 
        $filesInDir = $this->dirList($dir);
        $phpFile = $matches[2].'.*?[\.]php';
-       foreach($filesInDir as $file) {
-       	  if(preg_match("/$phpFile/", $file)) {
-       	  	 $this->mPHPFile = $matches[1] . $file;
+       foreach ($filesInDir as $file) {
+       	  if (preg_match("/$phpFile/", $file)) {
+       	  	 $this->mPHPFile = $matches[1].$file;
        	  	 break;
        	  }
        }
 
-       if(!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
+       if (!isset($this->mPHPFile) || !file_exists($this->mPHPFile)) {
        	  $this->mPHPFile = "INVALID";
        	  return $name;
        }
@@ -430,7 +430,7 @@ 
 
 	$phpContents = file_get_contents($this->mPHPFile);
 	$uname = strtoupper($name);
-	if(preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
+	if (preg_match("/xtpl->assign[\(][\"\']".$uname."[\"\'][\s]*?,[\s]*?[\$]focus->(.*?)[\)]/si", $phpContents, $matches)) {
 	   return $matches[1];
 	}
 	return $name;
@@ -444,7 +444,7 @@ 
  * @param $directory The directory to scan
  * @return $results The files in the directory that were found
  */
-function dirList ($directory) {
+function dirList($directory) {
 
     // create an array to hold directory list
     $results = array();
@@ -476,19 +476,19 @@ 
  */
 function getCustomField($elementNames) {
 
-   if(!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
+   if (!isset($elementNames) || (!is_string($elementNames) && !is_array($elementNames))) {
    	  return null;
    }
 
-   if(is_string($elementNames)) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
+   if (is_string($elementNames)) {
+   	  if (preg_match('/(.+_c)(_basic)?(\[\])?$/', $elementNames, $matches)) {
    	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
    	  }
    	  return null;
    }
 
-   foreach($elementNames as $name) {
-   	  if(preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
+   foreach ($elementNames as $name) {
+   	  if (preg_match('/(.+_c)(_basic)?(\[\])?$/', $name, $matches)) {
    	  	 return count($matches) == 1 ? $matches[0] : $matches[1];
    	  }
    }
@@ -497,7 +497,7 @@ 
 }
 
 function applyPreRules($moduleDir, $panels) {
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+   if (file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
 	  $class = $moduleDir."ParseRule";
 	  $parseRule = new $class();
@@ -512,7 +512,7 @@ 
 
 function applyPostRules($moduleDir, $panels) {
    //Run module specific rules
-   if(file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
+   if (file_exists("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php")) {
 	  require_once("include/SugarFields/Parsers/Rules/".$moduleDir."ParseRule.php");
 	  $class = $moduleDir."ParseRule";
 	  $parseRule = new $class();
@@ -523,9 +523,9 @@ 
    require_once("include/SugarFields/Parsers/Rules/ParseRules.php");
    $rules = ParseRules::getRules();
 
-   foreach($rules as $rule) {
-   	  if(!file_exists($rule['file'])) {
-   	  	 $GLOBALS['log']->error("Cannot run rule for " . $rule['file']);
+   foreach ($rules as $rule) {
+   	  if (!file_exists($rule['file'])) {
+   	  	 $GLOBALS['log']->error("Cannot run rule for ".$rule['file']);
    	  	 continue;
    	  } //if
    	  require_once($rule['file']);
@@ -537,11 +537,11 @@ 
    return $panels;
 }
 
-function createFileContents($moduleDir, $panels, $templateMeta=array(), $htmlFilePath) {
+function createFileContents($moduleDir, $panels, $templateMeta = array(), $htmlFilePath) {
 
 $header = "<?php\n\n";
 
-if(empty($templateMeta)) {
+if (empty($templateMeta)) {
 $header .= "\$viewdefs['$moduleDir']['$this->mView'] = array(
     'templateMeta' => array('maxColumns' => '2',
                             'widths' => array(
@@ -551,7 +551,7 @@ 
     ),";
 } else {
 $header .= "\$viewdefs['$moduleDir']['$this->mView'] = array(
-    'templateMeta' =>" . var_export($templateMeta, true) . ",";
+    'templateMeta' =>".var_export($templateMeta, true).",";
 }
 
 //Replace all the @sq (single quote tags that may have been inserted)
@@ -576,8 +576,8 @@ 
 
    $metadata = '';
    $body = var_export($panels, true);
-   $metadata = $header . $body . $footer;
-   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/',"",$metadata);
+   $metadata = $header.$body.$footer;
+   $metadata = preg_replace('/(\d+)[\s]=>[\s]?/', "", $metadata);
    return $metadata;
 
 }
@@ -596,10 +596,10 @@ 
    $masterpanels = $viewdefs[$moduleDir][$this->mView]['panels'];
    $hasMultiplePanels = $this->hasMultiplePanels($masterpanels);
 
-   if(!$hasMultiplePanels) {
+   if (!$hasMultiplePanels) {
    	    $keys = array_keys($viewdefs[$moduleDir][$this->mView]['panels']);
-        if(!empty($keys) && count($keys) == 1) {
-        	if(strtolower($keys[0]) == 'default') {
+        if (!empty($keys) && count($keys) == 1) {
+        	if (strtolower($keys[0]) == 'default') {
         	   $masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels'][$keys[0]]);
         	} else {
         	   $firstPanel = array_values($viewdefs[$moduleDir][$this->mView]['panels']);
@@ -609,18 +609,18 @@ 
         	$masterpanels = array('default'=>$viewdefs[$moduleDir][$this->mView]['panels']);
         }
    }
-   foreach($masterpanels as $name=>$masterpanel) {
-   	       if(isset($panels[$name])) {
+   foreach ($masterpanels as $name=>$masterpanel) {
+   	       if (isset($panels[$name])) {
 	   	       	  // Get all the names in the panel
 	   	       	  $existingElements = array();
 	   	       	  $existingLocation = array();
 
-	   	       	  foreach($panels[$name] as $rowKey=>$row) {
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && !empty($column['name'])) {
+	   	       	  foreach ($panels[$name] as $rowKey=>$row) {
+	   	       	  	 foreach ($row as $colKey=>$column) {
+	   	       	  	 	if (is_array($column) && !empty($column['name'])) {
 	   	       	  	 	   $existingElements[$column['name']] = $column['name'];
 	   	       	  	 	   $existingLocation[$column['name']] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
+	   	       	  	 	} else if (!is_array($column) && !empty($column)) {
 	   	       	  	 	   $existingElements[$column] = $column;
 	   	       	  	 	   $existingLocation[$column] = array("panel"=>$name, "row"=>$rowKey, "col"=>$colKey);
 	   	       	  	 	}
@@ -628,23 +628,23 @@ 
 	   	       	  } //foreach
 
 	   	       	  // Now check against the $masterCopy
-	   	       	  foreach($masterpanel as $rowKey=>$row) {
+	   	       	  foreach ($masterpanel as $rowKey=>$row) {
 
 	   	       	  	 $addRow = array();
 
-	   	       	  	 foreach($row as $colKey=>$column) {
-	   	       	  	 	if(is_array($column) && isset($column['name'])) {
+	   	       	  	 foreach ($row as $colKey=>$column) {
+	   	       	  	 	if (is_array($column) && isset($column['name'])) {
 	   	       	  	 	   $id = $column['name'];
-	   	       	  	 	} else if(!is_array($column) && !empty($column)) {
+	   	       	  	 	} else if (!is_array($column) && !empty($column)) {
 	   	       	  	 	   $id = $column;
 	   	       	  	 	} else {
 	   	       	  	 	   continue;
 	   	       	  	 	}
-	   	       	  	 	if(empty($existingElements[$id])) {
+	   	       	  	 	if (empty($existingElements[$id])) {
 	   	       	  	 	   //Only add if
 	   	       	  	 	   // 1) if it is a required field (as defined in metadata)
 	   	       	  	 	   // 2) or if it has a customLabel and customCode (a very deep customization)
-	   	       	  	 	   if((is_array($column) && !empty($column['displayParams']['required'])) ||
+	   	       	  	 	   if ((is_array($column) && !empty($column['displayParams']['required'])) ||
 	   	       	  	 	      (is_array($column) && !empty($column['customCode']) && !empty($column['customLabel']))) {
 	   	       	  	 	   	  $addRow[] = $column;
 	   	       	  	 	   }
@@ -655,7 +655,7 @@ 
 	   	       	  	 } //foreach
 
 	   	       	  	 // Add it to the $panels
-	   	       	  	 if(!empty($addRow)) {
+	   	       	  	 if (!empty($addRow)) {
 	   	       	  	 	$panels[$name][] = $addRow;
 	   	       	  	 }
 	   	       	  } //foreach
@@ -667,8 +667,8 @@ 
 
    // We're not done yet... go through the $panels Array now and try to remove duplicate
    // or empty panels
-   foreach($panels as $name=>$panel) {
-   	   if(count($panel) == 0 || !isset($masterpanels[$name])) {
+   foreach ($panels as $name=>$panel) {
+   	   if (count($panel) == 0 || !isset($masterpanels[$name])) {
    	   	  unset($panels[$name]);
    	   }
    } //foreach
@@ -688,7 +688,7 @@ 
    require($masterCopy);
    $masterTemplateMeta = $viewdefs[$moduleDir][$this->mView]['templateMeta'];
 
-   if(isset($masterTemplateMeta['javascript'])) {
+   if (isset($masterTemplateMeta['javascript'])) {
    	  //Insert the getJSPath code back into src value
    	  $masterTemplateMeta['javascript'] = preg_replace('/src\s*=\s*[\'\"].*?(modules\/|include\/)([^\.]*?\.js)([^\'\"]*?)[\'\"]/i', 'src="@sq . getJSPath(@sq${1}${2}@sq) . @sq"', $masterTemplateMeta['javascript']);
    }
@@ -697,7 +697,7 @@ 
 }
 
 function hasRequiredSpanLabel($html) {
-   if(empty($html)) {
+   if (empty($html)) {
    	  return false;
    }
 
@@ -706,20 +706,20 @@ 
 
 function hasMultiplePanels($panels) {
 
-   if(!isset($panels) || empty($panels) || !is_array($panels)) {
+   if (!isset($panels) || empty($panels) || !is_array($panels)) {
    	  return false;
    }
 
-   if(is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
+   if (is_array($panels) && (count($panels) == 0 || count($panels) == 1)) {
    	  return false;
    }
 
-   foreach($panels as $panel) {
-   	  if(!empty($panel) && !is_array($panel)) {
+   foreach ($panels as $panel) {
+   	  if (!empty($panel) && !is_array($panel)) {
    	  	 return false;
    	  } else {
-   	  	 foreach($panel as $row) {
-   	  	    if(!empty($row) && !is_array($row)) {
+   	  	 foreach ($panel as $row) {
+   	  	    if (!empty($row) && !is_array($row)) {
    	  	       return false;
    	  	    } //if
    	  	 } //foreach
@@ -729,16 +729,16 @@ 
    return true;
 }
 
-function getRelateFieldName($mixed='') {
-   if(!is_array($mixed)) {
+function getRelateFieldName($mixed = '') {
+   if (!is_array($mixed)) {
    	  return '';
-   } else if(count($mixed) == 2){
+   } else if (count($mixed) == 2) {
       $id = '';
    	  $name = '';
-   	  foreach($mixed as $el) {
-   	  	 if(preg_match('/_id$/', $el)) {
+   	  foreach ($mixed as $el) {
+   	  	 if (preg_match('/_id$/', $el)) {
    	  	    $id = $el;
-   	  	 } else if(preg_match('/_name$/', $el)) {
+   	  	 } else if (preg_match('/_name$/', $el)) {
    	  	    $name = $el;
    	  	 }
    	  }
@@ -759,7 +759,7 @@ 
  *
  */
 function fixTablesWithMissingTr($tableContents) {
-   if(preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+   if (preg_match('/(<table[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<table[^>]*?[\/]?>\s*?<td)/i', '<table><tr><td', $tableContents);
    }
    return $tableContents;
@@ -770,7 +770,7 @@ 
  * This is a very crude function to fix instances where files have an </tr> tag immediately followed by a <td> tag
  */
 function fixRowsWithMissingTr($tableContents) {
-   if(preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
+   if (preg_match('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<\/tr[^>]*?[\/]?>\s*?<td)/i', '</tr><tr><td', $tableContents);
    }
    return $tableContents;
@@ -781,7 +781,7 @@ 
  * This is a very crude function to fix instances where files have two consecutive <tr> tags
  */
 function fixDuplicateTrTags($tableContents) {
-   if(preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
+   if (preg_match('/(<tr[^>]*?[\/]?>\s*?<tr)/i', $tableContents, $matches)) {
    	  return preg_replace('/(<tr[^>]*?[\/]?>\s*?<tr)/i', '<tr', $tableContents);
    }
    return $tableContents;
@@ -792,14 +792,14 @@ 
  * Scans array of form elements to see if just one is a vardef element and, if so,
  * return that vardef name
  */
-function findSingleVardefElement($formElements=array(), $vardefs=array()) {
-   if(empty($formElements) || !is_array($formElements)) {
+function findSingleVardefElement($formElements = array(), $vardefs = array()) {
+   if (empty($formElements) || !is_array($formElements)) {
    	  return '';
    }
 
    $found = array();
-   foreach($formElements as $el) {
-   	   if(isset($vardefs[$el])) {
+   foreach ($formElements as $el) {
+   	   if (isset($vardefs[$el])) {
    	   	  $found[] = $el;
    	   }
    }

Braces +6 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -456,8 +458,9 @@ 
     while ($file = readdir($handler)) {
         // if $file isn't this directory or its parent,
         // add it to the results array
-        if ($file != '.' && $file != '..')
-            $results[] = $file;
+        if ($file != '.' && $file != '..') {
+                    $results[] = $file;
+        }
     }
 
     // tidy up: close the handler