adamjakab / SuiteCRM

modules/TemplateSectionLine/metadata/searchdefs.php

Indentation +46 added lines, -46 removed lines

@@ -2,118 +2,118 @@
 $module_name = 'TemplateSectionLine';
 $searchdefs [$module_name] = 
 array (
-  'layout' => 
-  array (
+    'layout' => 
+    array (
     'basic_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'grp' => 
-      array (
+        ),
+        'grp' => 
+        array (
         'type' => 'varchar',
         'label' => 'LBL_GRP',
         'width' => '10%',
         'default' => true,
         'name' => 'grp',
-      ),
-      'description' => 
-      array (
+        ),
+        'description' => 
+        array (
         'type' => 'text',
         'label' => 'LBL_DESCRIPTION',
         'sortable' => false,
         'width' => '10%',
         'default' => true,
         'name' => 'description',
-      ),
-      'current_user_only' => 
-      array (
+        ),
+        'current_user_only' => 
+        array (
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
-      ),
-      'assigned_user_id' => 
-      array (
+        ),
+        'assigned_user_id' => 
+        array (
         'name' => 'assigned_user_id',
         'label' => 'LBL_ASSIGNED_TO',
         'type' => 'enum',
         'function' => 
         array (
-          'name' => 'get_user_array',
-          'params' => 
-          array (
+            'name' => 'get_user_array',
+            'params' => 
+            array (
             0 => false,
-          ),
+            ),
         ),
         'width' => '10%',
         'default' => true,
-      ),
+        ),
     ),
     'advanced_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'grp' => 
-      array (
+        ),
+        'grp' => 
+        array (
         'type' => 'varchar',
         'label' => 'LBL_GRP',
         'width' => '10%',
         'default' => true,
         'name' => 'grp',
-      ),
-      'description' => 
-      array (
+        ),
+        'description' => 
+        array (
         'type' => 'text',
         'label' => 'LBL_DESCRIPTION',
         'sortable' => false,
         'width' => '10%',
         'default' => true,
         'name' => 'description',
-      ),
-      'current_user_only' => 
-      array (
+        ),
+        'current_user_only' => 
+        array (
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
         'name' => 'current_user_only',
-      ),
-      'assigned_user_id' => 
-      array (
+        ),
+        'assigned_user_id' => 
+        array (
         'name' => 'assigned_user_id',
         'label' => 'LBL_ASSIGNED_TO',
         'type' => 'enum',
         'function' => 
         array (
-          'name' => 'get_user_array',
-          'params' => 
-          array (
+            'name' => 'get_user_array',
+            'params' => 
+            array (
             0 => false,
-          ),
+            ),
         ),
         'default' => true,
         'width' => '10%',
-      ),
+        ),
     ),
-  ),
-  'templateMeta' => 
-  array (
+    ),
+    'templateMeta' => 
+    array (
     'maxColumns' => '3',
     'maxColumnsBasic' => '4',
     'widths' => 
     array (
-      'label' => '10',
-      'field' => '30',
+        'label' => '10',
+        'field' => '30',
+    ),
     ),
-  ),
 );
 ?>

Spacing +20 added lines, -20 removed lines

@@ -1,19 +1,19 @@ 
 <?php
 $module_name = 'TemplateSectionLine';
 $searchdefs [$module_name] = 
-array (
+array(
   'layout' => 
-  array (
+  array(
     'basic_search' => 
-    array (
+    array(
       'name' => 
-      array (
+      array(
         'name' => 'name',
         'default' => true,
         'width' => '10%',
       ),
       'grp' => 
-      array (
+      array(
         'type' => 'varchar',
         'label' => 'LBL_GRP',
         'width' => '10%',
@@ -21,7 +21,7 @@ 
         'name' => 'grp',
       ),
       'description' => 
-      array (
+      array(
         'type' => 'text',
         'label' => 'LBL_DESCRIPTION',
         'sortable' => false,
@@ -30,7 +30,7 @@ 
         'name' => 'description',
       ),
       'current_user_only' => 
-      array (
+      array(
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
@@ -38,15 +38,15 @@ 
         'width' => '10%',
       ),
       'assigned_user_id' => 
-      array (
+      array(
         'name' => 'assigned_user_id',
         'label' => 'LBL_ASSIGNED_TO',
         'type' => 'enum',
         'function' => 
-        array (
+        array(
           'name' => 'get_user_array',
           'params' => 
-          array (
+          array(
             0 => false,
           ),
         ),
@@ -55,15 +55,15 @@ 
       ),
     ),
     'advanced_search' => 
-    array (
+    array(
       'name' => 
-      array (
+      array(
         'name' => 'name',
         'default' => true,
         'width' => '10%',
       ),
       'grp' => 
-      array (
+      array(
         'type' => 'varchar',
         'label' => 'LBL_GRP',
         'width' => '10%',
@@ -71,7 +71,7 @@ 
         'name' => 'grp',
       ),
       'description' => 
-      array (
+      array(
         'type' => 'text',
         'label' => 'LBL_DESCRIPTION',
         'sortable' => false,
@@ -80,7 +80,7 @@ 
         'name' => 'description',
       ),
       'current_user_only' => 
-      array (
+      array(
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
@@ -88,15 +88,15 @@ 
         'name' => 'current_user_only',
       ),
       'assigned_user_id' => 
-      array (
+      array(
         'name' => 'assigned_user_id',
         'label' => 'LBL_ASSIGNED_TO',
         'type' => 'enum',
         'function' => 
-        array (
+        array(
           'name' => 'get_user_array',
           'params' => 
-          array (
+          array(
             0 => false,
           ),
         ),
@@ -106,11 +106,11 @@ 
     ),
   ),
   'templateMeta' => 
-  array (
+  array(
     'maxColumns' => '3',
     'maxColumnsBasic' => '4',
     'widths' => 
-    array (
+    array(
       'label' => '10',
       'field' => '30',
     ),

modules/TemplateSectionLine/metadata/subpanels/default.php

Indentation +33 added lines, -33 removed lines

@@ -1,58 +1,58 @@
 <?php
 $module_name='TemplateSectionLine';
 $subpanel_layout = array (
-  'top_buttons' => 
-  array (
+    'top_buttons' => 
+    array (
     0 => 
     array (
-      'widget_class' => 'SubPanelTopCreateButton',
+        'widget_class' => 'SubPanelTopCreateButton',
     ),
     1 => 
     array (
-      'widget_class' => 'SubPanelTopSelectButton',
-      'popup_module' => 'TemplateSectionLine',
+        'widget_class' => 'SubPanelTopSelectButton',
+        'popup_module' => 'TemplateSectionLine',
+    ),
     ),
-  ),
-  'where' => '',
-  'list_fields' => 
-  array (
+    'where' => '',
+    'list_fields' => 
+    array (
     'grp' => 
     array (
-      'type' => 'varchar',
-      'vname' => 'LBL_GRP',
-      'width' => '10%',
-      'default' => true,
+        'type' => 'varchar',
+        'vname' => 'LBL_GRP',
+        'width' => '10%',
+        'default' => true,
     ),
     'name' => 
     array (
-      'vname' => 'LBL_NAME',
-      'widget_class' => 'SubPanelDetailViewLink',
-      'width' => '45%',
-      'default' => true,
+        'vname' => 'LBL_NAME',
+        'widget_class' => 'SubPanelDetailViewLink',
+        'width' => '45%',
+        'default' => true,
     ),
     'description' => 
     array (
-      'type' => 'text',
-      'vname' => 'LBL_DESCRIPTION',
-      'sortable' => false,
-      'width' => '10%',
-      'default' => true,
+        'type' => 'text',
+        'vname' => 'LBL_DESCRIPTION',
+        'sortable' => false,
+        'width' => '10%',
+        'default' => true,
     ),
     'edit_button' => 
     array (
-      'vname' => 'LBL_EDIT_BUTTON',
-      'widget_class' => 'SubPanelEditButton',
-      'module' => 'TemplateSectionLine',
-      'width' => '4%',
-      'default' => true,
+        'vname' => 'LBL_EDIT_BUTTON',
+        'widget_class' => 'SubPanelEditButton',
+        'module' => 'TemplateSectionLine',
+        'width' => '4%',
+        'default' => true,
     ),
     'remove_button' => 
     array (
-      'vname' => 'LBL_REMOVE',
-      'widget_class' => 'SubPanelRemoveButton',
-      'module' => 'TemplateSectionLine',
-      'width' => '5%',
-      'default' => true,
+        'vname' => 'LBL_REMOVE',
+        'widget_class' => 'SubPanelRemoveButton',
+        'module' => 'TemplateSectionLine',
+        'width' => '5%',
+        'default' => true,
+    ),
     ),
-  ),
 );
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -1,37 +1,37 @@ 
 <?php
-$module_name='TemplateSectionLine';
-$subpanel_layout = array (
+$module_name = 'TemplateSectionLine';
+$subpanel_layout = array(
   'top_buttons' => 
-  array (
+  array(
     0 => 
-    array (
+    array(
       'widget_class' => 'SubPanelTopCreateButton',
     ),
     1 => 
-    array (
+    array(
       'widget_class' => 'SubPanelTopSelectButton',
       'popup_module' => 'TemplateSectionLine',
     ),
   ),
   'where' => '',
   'list_fields' => 
-  array (
+  array(
     'grp' => 
-    array (
+    array(
       'type' => 'varchar',
       'vname' => 'LBL_GRP',
       'width' => '10%',
       'default' => true,
     ),
     'name' => 
-    array (
+    array(
       'vname' => 'LBL_NAME',
       'widget_class' => 'SubPanelDetailViewLink',
       'width' => '45%',
       'default' => true,
     ),
     'description' => 
-    array (
+    array(
       'type' => 'text',
       'vname' => 'LBL_DESCRIPTION',
       'sortable' => false,
@@ -39,7 +39,7 @@ 
       'default' => true,
     ),
     'edit_button' => 
-    array (
+    array(
       'vname' => 'LBL_EDIT_BUTTON',
       'widget_class' => 'SubPanelEditButton',
       'module' => 'TemplateSectionLine',
@@ -47,7 +47,7 @@ 
       'default' => true,
     ),
     'remove_button' => 
-    array (
+    array(
       'vname' => 'LBL_REMOVE',
       'widget_class' => 'SubPanelRemoveButton',
       'module' => 'TemplateSectionLine',

modules/TemplateSectionLine/TemplateSectionLine_sugar.php

Indentation +31 added lines, -31 removed lines

@@ -45,40 +45,40 @@
 
 
 class TemplateSectionLine_sugar extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'TemplateSectionLine';
-	var $object_name = 'TemplateSectionLine';
-	var $table_name = 'templatesectionline';
-	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+    var $new_schema = true;
+    var $module_dir = 'TemplateSectionLine';
+    var $object_name = 'TemplateSectionLine';
+    var $table_name = 'templatesectionline';
+    var $importable = false;
+    var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
-	var $assigned_user_id;
-	var $assigned_user_name;
-	var $assigned_user_link;
-	var $grp;
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
+    var $assigned_user_id;
+    var $assigned_user_name;
+    var $assigned_user_link;
+    var $grp;
 	
-	function __construct(){
-		parent::__construct();
-	}
+    function __construct(){
+        parent::__construct();
+    }
 	
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
-	}
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
+    }
 		
 }
 ?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
 	var $object_name = 'TemplateSectionLine';
 	var $table_name = 'templatesectionline';
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 
 	var $id;
 	var $name;
@@ -69,12 +69,12 @@ 
 	var $assigned_user_link;
 	var $grp;
 	
-	function __construct(){
+	function __construct() {
 		parent::__construct();
 	}
 	
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php

Indentation +37 added lines, -37 removed lines

@@ -42,48 +42,48 @@
 
 
 class AM_TaskTemplates_sugar extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AM_TaskTemplates';
-	var $object_name = 'AM_TaskTemplates';
-	var $table_name = 'am_tasktemplates';
-	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
-		var $id;
-		var $name;
-		var $date_entered;
-		var $date_modified;
-		var $modified_user_id;
-		var $modified_by_name;
-		var $created_by;
-		var $created_by_name;
-		var $description;
-		var $deleted;
-		var $created_by_link;
-		var $modified_user_link;
-		var $assigned_user_id;
-		var $assigned_user_name;
-		var $assigned_user_link;
-		var $status;
-		var $priority;
-		var $percent_complete;
-		var $predecessors;
-		var $milestone_flag;
-		var $relationship_type;
-		var $task_number;
-		var $order_number;
-		var $estimated_effort;
-		var $utilization;
-		var $duration;
+    var $new_schema = true;
+    var $module_dir = 'AM_TaskTemplates';
+    var $object_name = 'AM_TaskTemplates';
+    var $table_name = 'am_tasktemplates';
+    var $importable = false;
+    var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+        var $id;
+        var $name;
+        var $date_entered;
+        var $date_modified;
+        var $modified_user_id;
+        var $modified_by_name;
+        var $created_by;
+        var $created_by_name;
+        var $description;
+        var $deleted;
+        var $created_by_link;
+        var $modified_user_link;
+        var $assigned_user_id;
+        var $assigned_user_name;
+        var $assigned_user_link;
+        var $status;
+        var $priority;
+        var $percent_complete;
+        var $predecessors;
+        var $milestone_flag;
+        var $relationship_type;
+        var $task_number;
+        var $order_number;
+        var $estimated_effort;
+        var $utilization;
+        var $duration;
 
     function __construct(){
         parent::__construct();
     }
 
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
 }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
 	var $object_name = 'AM_TaskTemplates';
 	var $table_name = 'am_tasktemplates';
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -75,16 +75,16 @@ 
 		var $utilization;
 		var $duration;
 
-    function __construct(){
+    function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AM_TaskTemplates_sugar(){
+    function AM_TaskTemplates_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -94,8 +94,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -347,8 +347,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();

modules/ModuleBuilder/parsers/parser.searchfields.php

Indentation +22 added lines, -22 removed lines

@@ -45,8 +45,8 @@ 
 class ParserSearchFields extends ModuleBuilderParser
 {
 
-	var $searchFields;
-	var $packageKey;
+    var $searchFields;
+    var $packageKey;
 
     function __construct ($moduleName, $packageName='')
     {
@@ -63,36 +63,36 @@ 
 
     function addSearchField($name, $searchField)
     {
-    	if(empty($name) || empty($searchField) || !is_array($searchField))
-    	{
-    		return;
-    	}
+        if(empty($name) || empty($searchField) || !is_array($searchField))
+        {
+            return;
+        }
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+        $key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
         $this->searchFields[$key][$name] = $searchField;
     }
 
     function removeSearchField($name)
     {
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+        $key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
 
-    	if(isset($this->searchFields[$key][$name]))
-    	{
-    		unset($this->searchFields[$key][$name]);
-    	}
+        if(isset($this->searchFields[$key][$name]))
+        {
+            unset($this->searchFields[$key][$name]);
+        }
     }
 
     function getSearchFields()
     {
-    	$searchFields = array();
+        $searchFields = array();
         if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) //we are in Module builder
         {
-			include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");
+            include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");
         } else if(file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
-			include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");
+            include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");
         } else if(file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
-			include("modules/{$this->moduleName}/metadata/SearchFields.php");
+            include("modules/{$this->moduleName}/metadata/SearchFields.php");
         }
 
         return $searchFields;
@@ -102,19 +102,19 @@ 
     {
         if (!empty($this->packageName)) //we are in Module builder
         {
-			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+            $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
             if(!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
-               mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");
+                mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");
             }
-			write_array_to_file("searchFields['{$this->packageKey}_{$this->moduleName}']", $searchFields["{$this->packageKey}_{$this->moduleName}"], "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);
+            write_array_to_file("searchFields['{$this->packageKey}_{$this->moduleName}']", $searchFields["{$this->packageKey}_{$this->moduleName}"], "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);
         } else {
-			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+            $header = file_get_contents('modules/ModuleBuilder/MB/header.php');
             if(!file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
-               mkdir_recursive("custom/modules/{$this->moduleName}/metadata");
+                mkdir_recursive("custom/modules/{$this->moduleName}/metadata");
             }
-			write_array_to_file("searchFields['{$this->moduleName}']", $searchFields[$this->moduleName], "custom/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);
+            write_array_to_file("searchFields['{$this->moduleName}']", $searchFields[$this->moduleName], "custom/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);
         }
         $this->searchFields = $searchFields;
     }

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?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.
@@ -39,7 +39,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php') ;
+require_once ('modules/ModuleBuilder/parsers/ModuleBuilderParser.php');
 require_once ('modules/ModuleBuilder/MB/MBPackage.php');
 
 class ParserSearchFields extends ModuleBuilderParser
@@ -48,7 +48,7 @@ 
 	var $searchFields;
 	var $packageKey;
 
-    function __construct ($moduleName, $packageName='')
+    function __construct($moduleName, $packageName = '')
     {
         $this->moduleName = $moduleName;
         if (!empty($packageName))
@@ -64,9 +64,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ParserSearchFields($moduleName, $packageName=''){
+    function ParserSearchFields($moduleName, $packageName = '') {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -77,21 +77,21 @@ 
 
     function addSearchField($name, $searchField)
     {
-    	if(empty($name) || empty($searchField) || !is_array($searchField))
+    	if (empty($name) || empty($searchField) || !is_array($searchField))
     	{
     		return;
     	}
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+    	$key = isset($this->packageKey) ? $this->packageKey.'_'.$this->moduleName : $this->moduleName;
         $this->searchFields[$key][$name] = $searchField;
     }
 
     function removeSearchField($name)
     {
 
-    	$key = isset($this->packageKey) ? $this->packageKey . '_' . $this->moduleName : $this->moduleName;
+    	$key = isset($this->packageKey) ? $this->packageKey.'_'.$this->moduleName : $this->moduleName;
 
-    	if(isset($this->searchFields[$key][$name]))
+    	if (isset($this->searchFields[$key][$name]))
     	{
     		unset($this->searchFields[$key][$name]);
     	}
@@ -103,28 +103,28 @@ 
         if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) //we are in Module builder
         {
 			include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");
-        } else if(file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
+        } else if (file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
 			include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");
-        } else if(file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
+        } else if (file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
 			include("modules/{$this->moduleName}/metadata/SearchFields.php");
         }
 
         return $searchFields;
     }
 
-    function saveSearchFields ($searchFields)
+    function saveSearchFields($searchFields)
     {
         if (!empty($this->packageName)) //we are in Module builder
         {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
-            if(!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
+            if (!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
                mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");
             }
 			write_array_to_file("searchFields['{$this->packageKey}_{$this->moduleName}']", $searchFields["{$this->packageKey}_{$this->moduleName}"], "custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php", 'w', $header);
         } else {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
-            if(!file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php"))
+            if (!file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
                mkdir_recursive("custom/modules/{$this->moduleName}/metadata");
             }

Braces +9 added lines, -5 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+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.
@@ -68,8 +69,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($moduleName, $packageName);
@@ -100,9 +100,11 @@ 
     function getSearchFields()
     {
     	$searchFields = array();
-        if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) //we are in Module builder
+        if (!empty($this->packageName) && file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php")) {
+            //we are in Module builder
         {
 			include("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php");
+        }
         } else if(file_exists("custom/modules/{$this->moduleName}/metadata/SearchFields.php")) {
 			include("custom/modules/{$this->moduleName}/metadata/SearchFields.php");
         } else if(file_exists("modules/{$this->moduleName}/metadata/SearchFields.php")) {
@@ -114,9 +116,11 @@ 
 
     function saveSearchFields ($searchFields)
     {
-        if (!empty($this->packageName)) //we are in Module builder
+        if (!empty($this->packageName)) {
+            //we are in Module builder
         {
 			$header = file_get_contents('modules/ModuleBuilder/MB/header.php');
+        }
             if(!file_exists("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata/SearchFields.php"))
             {
                mkdir_recursive("custom/modulebuilder/packages/{$this->packageName}/modules/{$this->moduleName}/metadata");

modules/ModuleBuilder/views/view.layoutview.php

Indentation +52 added lines, -52 removed lines

@@ -69,16 +69,16 @@ 
     }
 
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
-
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
+
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
     // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
@@ -99,13 +99,13 @@ 
         $history = $parser->getHistory () ;
         $smarty = new Sugar_Smarty ( ) ;
         //Add in the module we are viewing to our current mod strings
-		if (! $this->fromModuleBuilder) {
-			global $current_language;
-			$editModStrings = return_module_language($current_language, $this->editModule);
-			$mod_strings = sugarArrayMerge($editModStrings, $mod_strings);
-		}
+        if (! $this->fromModuleBuilder) {
+            global $current_language;
+            $editModStrings = return_module_language($current_language, $this->editModule);
+            $mod_strings = sugarArrayMerge($editModStrings, $mod_strings);
+        }
         $smarty->assign('mod', $mod_strings);
-		$smarty->assign('MOD', $mod_strings);
+        $smarty->assign('MOD', $mod_strings);
         // assign buttons
         $images = array ( 'icon_save' => 'studio_save' , 'icon_publish' => 'studio_publish' , 'icon_address' => 'icon_Address' , 'icon_emailaddress' => 'icon_EmailAddress' , 'icon_phone' => 'icon_Phone' ) ;
         foreach ( $images as $image => $file )
@@ -127,9 +127,9 @@ 
 
             //Check if we need to synch edit view to other layouts
             if($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE){
-		        $parser2 = ParserFactory::getParser(MB_EDITVIEW,$this->editModule,$this->package);
+                $parser2 = ParserFactory::getParser(MB_EDITVIEW,$this->editModule,$this->package);
                 if($this->editLayout == MB_DETAILVIEW){
-		            $disableLayout = $parser2->getSyncDetailEditViews();
+                    $disableLayout = $parser2->getSyncDetailEditViews();
                 }
                 if(!empty($_REQUEST['copyFromEditView'])){
                     $editViewPanels = $parser2->convertFromCanonicalForm ( $parser2->_viewdefs [ 'panels' ] , $parser2->_fielddefs ) ;
@@ -138,34 +138,34 @@ 
                     $parser->setUseTabs($parser2->getUseTabs());
                     $parser->setTabDefs($parser2->getTabDefs());
                 }
-		    }
+            }
 
             if (! $this->fromModuleBuilder)
             {
-	            $buttons [] = array (
+                $buttons [] = array (
                     'id' => 'saveBtn' ,
                     'text' => translate ( 'LBL_BTN_SAVE' ) ,
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handleSave();'",
-                	'disabled' => $disableLayout,
+                    'disabled' => $disableLayout,
                 ) ;
                 $buttons [] = array (
                     'id' => 'publishBtn' ,
                     'text' => translate ( 'LBL_BTN_SAVEPUBLISH' ) ,
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handlePublish();'",
-                	'disabled' => $disableLayout,
+                    'disabled' => $disableLayout,
                 ) ;
                 $buttons [] = array ( 'id' => 'spacer' , 'width' => '33px' ) ;
                 $buttons [] = array (
-	                'id' => 'historyBtn' ,
-	                'text' => translate ( 'LBL_HISTORY' ) ,
-	                'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
+                    'id' => 'historyBtn' ,
+                    'text' => translate ( 'LBL_HISTORY' ) ,
+                    'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                     'disabled' => $disableLayout,
                 ) ;
                 $buttons [] = array (
-	                'id' => 'historyDefault' ,
-	                'text' => translate ( 'LBL_RESTORE_DEFAULT' ) ,
-	                'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
-                	'disabled' => $disableLayout,
+                    'id' => 'historyDefault' ,
+                    'text' => translate ( 'LBL_RESTORE_DEFAULT' ) ,
+                    'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
+                    'disabled' => $disableLayout,
                 ) ;
             } else
             {
@@ -205,15 +205,15 @@ 
         foreach ( $buttons as $button )
         {
             if ($button['id'] == "spacer") {
-            	$html .= "<td style='width:{$button['width']}'> </td>";
+                $html .= "<td style='width:{$button['width']}'> </td>";
             } else {
-        	    $html .= "<td><input id='{$button['id']}' type='button' valign='center' class='button' style='cursor:pointer' "
-        	       . "onmousedown='this.className=\"buttonOn\";return false;' onmouseup='this.className=\"button\"' "
-        	       . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'" ;
-        	    if(!empty($button['disabled'])){
-        	    	 $html .= " disabled";
-        	    }
-        	    $html .= "></td>";
+                $html .= "<td><input id='{$button['id']}' type='button' valign='center' class='button' style='cursor:pointer' "
+                    . "onmousedown='this.className=\"buttonOn\";return false;' onmouseup='this.className=\"button\"' "
+                    . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'" ;
+                if(!empty($button['disabled'])){
+                        $html .= " disabled";
+                }
+                $html .= "></td>";
             }
         }
 
@@ -243,10 +243,10 @@ 
         }
 
         $labels = array (
-        			MB_EDITVIEW => 'LBL_EDITVIEW' ,
-        			MB_DETAILVIEW => 'LBL_DETAILVIEW' ,
-        			MB_QUICKCREATE => 'LBL_QUICKCREATE',
-        			) ;
+                    MB_EDITVIEW => 'LBL_EDITVIEW' ,
+                    MB_DETAILVIEW => 'LBL_DETAILVIEW' ,
+                    MB_QUICKCREATE => 'LBL_QUICKCREATE',
+                    ) ;
 
         $layoutLabel = 'LBL_LAYOUTS' ;
         $layoutView = 'layouts' ;
@@ -255,8 +255,8 @@ 
         $ajax = new AjaxCompose ( ) ;
 
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+        if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
+            $translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
         else if (isset($this->sm))
         {
             foreach($this->sm->sources as $file => $def)
@@ -294,20 +294,20 @@ 
         }
 
         // set up language files
-		$smarty->assign ( 'language', $parser->getLanguage() ) ; // for sugar_translate in the smarty template
+        $smarty->assign ( 'language', $parser->getLanguage() ) ; // for sugar_translate in the smarty template
         $smarty->assign('from_mb',$this->fromModuleBuilder);
         $smarty->assign('calc_field_list', json_encode($parser->getCalculatedFields()));
-		if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
+        if ($this->fromModuleBuilder) {
+            $mb = new ModuleBuilder ( ) ;
             $module = & $mb->getPackageModule ( $this->package, $this->editModule ) ;
-		    $smarty->assign('current_mod_strings', $module->getModStrings());
-		}
+            $smarty->assign('current_mod_strings', $module->getModStrings());
+        }
 
         $ajax->addSection ( 'center', $translatedViewType, $smarty->fetch ( 'modules/ModuleBuilder/tpls/layoutView.tpl' ) ) ;
         if ($preview) {
-        	echo $smarty->fetch ( 'modules/ModuleBuilder/tpls/Preview/layoutView.tpl' );
-		} else {
-			echo $ajax->getJavascript () ;
-    	}
+            echo $smarty->fetch ( 'modules/ModuleBuilder/tpls/Preview/layoutView.tpl' );
+        } else {
+            echo $ajax->getJavascript () ;
+        }
     }
 }

Spacing +125 added lines, -125 removed lines

@@ -1,6 +1,6 @@ 
 <?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
@@ -41,28 +41,28 @@ 
  ********************************************************************************/
 
 
-require_once ('modules/ModuleBuilder/parsers/ParserFactory.php') ;
-require_once ('modules/ModuleBuilder/MB/AjaxCompose.php') ;
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once ('modules/ModuleBuilder/parsers/ParserFactory.php');
+require_once ('modules/ModuleBuilder/MB/AjaxCompose.php');
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 class ViewLayoutView extends SugarView
 {
     function __construct()
     {
-        $GLOBALS [ 'log' ]->debug ( 'in ViewLayoutView' ) ;
-        $this->editModule = $_REQUEST [ 'view_module' ] ;
-        $this->editLayout = $_REQUEST [ 'view' ] ;
+        $GLOBALS ['log']->debug('in ViewLayoutView');
+        $this->editModule = $_REQUEST ['view_module'];
+        $this->editLayout = $_REQUEST ['view'];
         $this->package = null;
-        $this->fromModuleBuilder = isset ( $_REQUEST [ 'MB' ] ) || !empty($_REQUEST [ 'view_package' ]);
+        $this->fromModuleBuilder = isset ($_REQUEST ['MB']) || !empty($_REQUEST ['view_package']);
         if ($this->fromModuleBuilder)
         {
-            $this->package = $_REQUEST [ 'view_package' ] ;
+            $this->package = $_REQUEST ['view_package'];
             $this->type = $this->editLayout;
         } else
         {
-            global $app_list_strings ;
-            $moduleNames = array_change_key_case ( $app_list_strings [ 'moduleList' ] ) ;
-            $this->translatedEditModule = $moduleNames [ strtolower ( $this->editModule ) ] ;
+            global $app_list_strings;
+            $moduleNames = array_change_key_case($app_list_strings ['moduleList']);
+            $this->translatedEditModule = $moduleNames [strtolower($this->editModule)];
             $this->sm = StudioModuleFactory::getStudioModule($this->editModule);
             $this->type = $this->sm->getViewType($this->editLayout);
         }
@@ -71,9 +71,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ViewLayoutView(){
+    function ViewLayoutView() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -90,30 +90,30 @@ 
 	    global $mod_strings;
 
     	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
+    	   translate('LBL_MODULE_NAME', 'Administration'),
     	   ModuleBuilderController::getModuleTitle(),
     	   );
     }
 
     // DO NOT REMOVE - overrides parent ViewEdit preDisplay() which attempts to load a bean for a non-existent module
-    function preDisplay ()
+    function preDisplay()
     {
     }
 
-    function display ($preview = false)
+    function display($preview = false)
     {
 
-        global $mod_strings ;
-        $parser = ParserFactory::getParser($this->editLayout,$this->editModule,$this->package);
+        global $mod_strings;
+        $parser = ParserFactory::getParser($this->editLayout, $this->editModule, $this->package);
 
-        if(isset($this->view_object_map['new_parser'])) {
+        if (isset($this->view_object_map['new_parser'])) {
             $parser = $this->view_object_map['new_parser'];
         }
 
-        $history = $parser->getHistory () ;
-        $smarty = new Sugar_Smarty ( ) ;
+        $history = $parser->getHistory();
+        $smarty = new Sugar_Smarty( );
         //Add in the module we are viewing to our current mod strings
-		if (! $this->fromModuleBuilder) {
+		if (!$this->fromModuleBuilder) {
 			global $current_language;
 			$editModStrings = return_module_language($current_language, $this->editModule);
 			$mod_strings = sugarArrayMerge($editModStrings, $mod_strings);
@@ -121,171 +121,171 @@ 
         $smarty->assign('mod', $mod_strings);
 		$smarty->assign('MOD', $mod_strings);
         // assign buttons
-        $images = array ( 'icon_save' => 'studio_save' , 'icon_publish' => 'studio_publish' , 'icon_address' => 'icon_Address' , 'icon_emailaddress' => 'icon_EmailAddress' , 'icon_phone' => 'icon_Phone' ) ;
-        foreach ( $images as $image => $file )
+        $images = array('icon_save' => 'studio_save', 'icon_publish' => 'studio_publish', 'icon_address' => 'icon_Address', 'icon_emailaddress' => 'icon_EmailAddress', 'icon_phone' => 'icon_Phone');
+        foreach ($images as $image => $file)
         {
-            $smarty->assign ( $image, SugarThemeRegistry::current()->getImage($file,'',null,null,'.gif',$file) ) ;
+            $smarty->assign($image, SugarThemeRegistry::current()->getImage($file, '', null, null, '.gif', $file));
         }
 
-        $requiredFields = implode($parser->getRequiredFields () , ',');
+        $requiredFields = implode($parser->getRequiredFields(), ',');
         $slashedRequiredFields = addslashes($requiredFields);
-        $buttons = array ( ) ;
+        $buttons = array( );
         $disableLayout = false;
 
         if ($preview)
         {
-            $smarty->assign ( 'layouttitle', translate ( 'LBL_LAYOUT_PREVIEW', 'ModuleBuilder' ) ) ;
+            $smarty->assign('layouttitle', translate('LBL_LAYOUT_PREVIEW', 'ModuleBuilder'));
         } else
         {
-            $smarty->assign ( 'layouttitle', translate ( 'LBL_CURRENT_LAYOUT', 'ModuleBuilder' ) ) ;
+            $smarty->assign('layouttitle', translate('LBL_CURRENT_LAYOUT', 'ModuleBuilder'));
 
             //Check if we need to synch edit view to other layouts
-            if($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE){
-		        $parser2 = ParserFactory::getParser(MB_EDITVIEW,$this->editModule,$this->package);
-                if($this->editLayout == MB_DETAILVIEW){
+            if ($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE) {
+		        $parser2 = ParserFactory::getParser(MB_EDITVIEW, $this->editModule, $this->package);
+                if ($this->editLayout == MB_DETAILVIEW) {
 		            $disableLayout = $parser2->getSyncDetailEditViews();
                 }
-                if(!empty($_REQUEST['copyFromEditView'])){
-                    $editViewPanels = $parser2->convertFromCanonicalForm ( $parser2->_viewdefs [ 'panels' ] , $parser2->_fielddefs ) ;
-                    $parser->_viewdefs [ 'panels' ] = $editViewPanels;
+                if (!empty($_REQUEST['copyFromEditView'])) {
+                    $editViewPanels = $parser2->convertFromCanonicalForm($parser2->_viewdefs ['panels'], $parser2->_fielddefs);
+                    $parser->_viewdefs ['panels'] = $editViewPanels;
                     $parser->_fielddefs = $parser2->_fielddefs;
                     $parser->setUseTabs($parser2->getUseTabs());
                     $parser->setTabDefs($parser2->getTabDefs());
                 }
 		    }
 
-            if (! $this->fromModuleBuilder)
+            if (!$this->fromModuleBuilder)
             {
-	            $buttons [] = array (
-                    'id' => 'saveBtn' ,
-                    'text' => translate ( 'LBL_BTN_SAVE' ) ,
+	            $buttons [] = array(
+                    'id' => 'saveBtn',
+                    'text' => translate('LBL_BTN_SAVE'),
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handleSave();'",
                 	'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array (
-                    'id' => 'publishBtn' ,
-                    'text' => translate ( 'LBL_BTN_SAVEPUBLISH' ) ,
+                );
+                $buttons [] = array(
+                    'id' => 'publishBtn',
+                    'text' => translate('LBL_BTN_SAVEPUBLISH'),
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handlePublish();'",
                 	'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array ( 'id' => 'spacer' , 'width' => '33px' ) ;
-                $buttons [] = array (
-	                'id' => 'historyBtn' ,
-	                'text' => translate ( 'LBL_HISTORY' ) ,
+                );
+                $buttons [] = array('id' => 'spacer', 'width' => '33px');
+                $buttons [] = array(
+	                'id' => 'historyBtn',
+	                'text' => translate('LBL_HISTORY'),
 	                'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                     'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array (
-	                'id' => 'historyDefault' ,
-	                'text' => translate ( 'LBL_RESTORE_DEFAULT' ) ,
+                );
+                $buttons [] = array(
+	                'id' => 'historyDefault',
+	                'text' => translate('LBL_RESTORE_DEFAULT'),
 	                'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
                 	'disabled' => $disableLayout,
-                ) ;
+                );
             } else
             {
-                $buttons [] = array (
-                    'id' => 'saveBtn' ,
-                    'text' => $GLOBALS [ 'mod_strings' ] [ 'LBL_BTN_SAVE' ] ,
+                $buttons [] = array(
+                    'id' => 'saveBtn',
+                    'text' => $GLOBALS ['mod_strings'] ['LBL_BTN_SAVE'],
                     'actionScript' => "onclick='if(Studio2.checkGridLayout(\"{$this->editLayout}\")) Studio2.handlePublish();'",
                     'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array ( 'id' => 'spacer' , 'width' => '33px' ) ;
-                $buttons [] = array (
-                    'id' => 'historyBtn' ,
-                    'text' => translate ( 'LBL_HISTORY' ) ,
+                );
+                $buttons [] = array('id' => 'spacer', 'width' => '33px');
+                $buttons [] = array(
+                    'id' => 'historyBtn',
+                    'text' => translate('LBL_HISTORY'),
                     'actionScript' => "onclick='ModuleBuilder.history.browse(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                     'disabled' => $disableLayout,
-                ) ;
-                $buttons [] = array (
-                    'id' => 'historyDefault' ,
-                    'text' => translate ( 'LBL_RESTORE_DEFAULT' ) ,
+                );
+                $buttons [] = array(
+                    'id' => 'historyDefault',
+                    'text' => translate('LBL_RESTORE_DEFAULT'),
                     'actionScript' => "onclick='ModuleBuilder.history.revert(\"{$this->editModule}\", \"{$this->editLayout}\", \"{$history->getLast()}\", \"\")'",
                     'disabled' => $disableLayout,
-                ) ;
+                );
             }
 
 
-            if($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE){
-                $buttons [] = array (
-                'id' => 'copyFromEditView' ,
-                'text' => translate ( 'LBL_COPY_FROM_EDITVIEW' ) ,
+            if ($this->editLayout == MB_DETAILVIEW || $this->editLayout == MB_QUICKCREATE) {
+                $buttons [] = array(
+                'id' => 'copyFromEditView',
+                'text' => translate('LBL_COPY_FROM_EDITVIEW'),
                 'actionScript' => "onclick='ModuleBuilder.copyFromView(\"{$this->editModule}\", \"{$this->editLayout}\")'",
                 'disabled' => $disableLayout,
-                ) ;
+                );
             }
         }
 
-        $html = "" ;
-        foreach ( $buttons as $button )
+        $html = "";
+        foreach ($buttons as $button)
         {
             if ($button['id'] == "spacer") {
             	$html .= "<td style='width:{$button['width']}'> </td>";
             } else {
         	    $html .= "<td><input id='{$button['id']}' type='button' valign='center' class='button' style='cursor:pointer' "
         	       . "onmousedown='this.className=\"buttonOn\";return false;' onmouseup='this.className=\"button\"' "
-        	       . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'" ;
-        	    if(!empty($button['disabled'])){
+        	       . "onmouseout='this.className=\"button\"' {$button['actionScript']} value = '{$button['text']}'";
+        	    if (!empty($button['disabled'])) {
         	    	 $html .= " disabled";
         	    }
         	    $html .= "></td>";
             }
         }
 
-        $smarty->assign ( 'buttons', $html ) ;
+        $smarty->assign('buttons', $html);
 
         // assign fields and layout
-        $smarty->assign ( 'available_fields', $parser->getAvailableFields () ) ;
-
-        $smarty->assign ( 'disable_layout', $disableLayout) ;
-        $smarty->assign ( 'required_fields', $requiredFields) ;
-        $smarty->assign ( 'layout', $parser->getLayout () ) ;
-        $smarty->assign ( 'field_defs', $parser->getFieldDefs () ) ;
-        $smarty->assign ( 'view_module', $this->editModule ) ;
-        $smarty->assign ( 'view', $this->editLayout ) ;
-        $smarty->assign ( 'maxColumns', $parser->getMaxColumns() ) ;
-        $smarty->assign ( 'nextPanelId', $parser->getFirstNewPanelId() ) ;
-        $smarty->assign ( 'displayAsTabs', $parser->getUseTabs() ) ;
-        $smarty->assign ( 'tabDefs', $parser->getTabDefs() ) ;
-        $smarty->assign ( 'syncDetailEditViews', $parser->getSyncDetailEditViews() ) ;
-        $smarty->assign ( 'fieldwidth', 150 ) ;
-        $smarty->assign ( 'translate', $this->fromModuleBuilder ? false : true ) ;
+        $smarty->assign('available_fields', $parser->getAvailableFields());
+
+        $smarty->assign('disable_layout', $disableLayout);
+        $smarty->assign('required_fields', $requiredFields);
+        $smarty->assign('layout', $parser->getLayout());
+        $smarty->assign('field_defs', $parser->getFieldDefs());
+        $smarty->assign('view_module', $this->editModule);
+        $smarty->assign('view', $this->editLayout);
+        $smarty->assign('maxColumns', $parser->getMaxColumns());
+        $smarty->assign('nextPanelId', $parser->getFirstNewPanelId());
+        $smarty->assign('displayAsTabs', $parser->getUseTabs());
+        $smarty->assign('tabDefs', $parser->getTabDefs());
+        $smarty->assign('syncDetailEditViews', $parser->getSyncDetailEditViews());
+        $smarty->assign('fieldwidth', 150);
+        $smarty->assign('translate', $this->fromModuleBuilder ? false : true);
 
         if ($this->fromModuleBuilder)
         {
-            $smarty->assign ( 'fromModuleBuilder', $this->fromModuleBuilder ) ;
-            $smarty->assign ( 'view_package', $this->package ) ;
+            $smarty->assign('fromModuleBuilder', $this->fromModuleBuilder);
+            $smarty->assign('view_package', $this->package);
         }
 
-        $labels = array (
-        			MB_EDITVIEW => 'LBL_EDITVIEW' ,
-        			MB_DETAILVIEW => 'LBL_DETAILVIEW' ,
+        $labels = array(
+        			MB_EDITVIEW => 'LBL_EDITVIEW',
+        			MB_DETAILVIEW => 'LBL_DETAILVIEW',
         			MB_QUICKCREATE => 'LBL_QUICKCREATE',
-        			) ;
+        			);
 
-        $layoutLabel = 'LBL_LAYOUTS' ;
-        $layoutView = 'layouts' ;
+        $layoutLabel = 'LBL_LAYOUTS';
+        $layoutView = 'layouts';
 
 
-        $ajax = new AjaxCompose ( ) ;
+        $ajax = new AjaxCompose( );
 
-        $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+        $translatedViewType = '';
+		if (isset ($labels [strtolower($this->editLayout)]))
+			$translatedViewType = translate($labels [strtolower($this->editLayout)], 'ModuleBuilder');
         else if (isset($this->sm))
         {
-            foreach($this->sm->sources as $file => $def)
+            foreach ($this->sm->sources as $file => $def)
             {
                 if (!empty($def['view']) && $def['view'] == $this->editLayout && !empty($def['name']))
                 {
                     $translatedViewType = $def['name'];
                 }
             }
-            if(empty($translatedViewType))
+            if (empty($translatedViewType))
             {
-                $label = "LBL_" . strtoupper($this->editLayout);
+                $label = "LBL_".strtoupper($this->editLayout);
                 $translated = translate($label, $this->editModule);
                 if ($translated != $label)
-                    $translatedViewType =  $translated;
+                    $translatedViewType = $translated;
             }
         }
 
@@ -294,34 +294,34 @@ 
 
         if ($this->fromModuleBuilder)
         {
-            $ajax->addCrumb ( translate ( 'LBL_MODULEBUILDER', 'ModuleBuilder' ), 'ModuleBuilder.main("mb")' ) ;
-            $ajax->addCrumb ( $this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package=' . $this->package . '")' ) ;
-            $ajax->addCrumb ( $this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package=' . $this->package . '&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '&view_package=' . $this->package . '")' ) ;
-            $ajax->addCrumb ( $translatedViewType, '' ) ;
+            $ajax->addCrumb(translate('LBL_MODULEBUILDER', 'ModuleBuilder'), 'ModuleBuilder.main("mb")');
+            $ajax->addCrumb($this->package, 'ModuleBuilder.getContent("module=ModuleBuilder&action=package&package='.$this->package.'")');
+            $ajax->addCrumb($this->editModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=module&view_package='.$this->package.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&MB=true&action=wizard&view='.$layoutView.'&view_module='.$this->editModule.'&view_package='.$this->package.'")');
+            $ajax->addCrumb($translatedViewType, '');
         } else
         {
-            $ajax->addCrumb ( translate ( 'LBL_STUDIO', 'ModuleBuilder' ), 'ModuleBuilder.main("studio")' ) ;
-            $ajax->addCrumb ( $this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( translate ( $layoutLabel, 'ModuleBuilder' ), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module=' . $this->editModule . '")' ) ;
-            $ajax->addCrumb ( $translatedViewType, '' ) ;
+            $ajax->addCrumb(translate('LBL_STUDIO', 'ModuleBuilder'), 'ModuleBuilder.main("studio")');
+            $ajax->addCrumb($this->translatedEditModule, 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view_module='.$this->editModule.'")');
+            $ajax->addCrumb(translate($layoutLabel, 'ModuleBuilder'), 'ModuleBuilder.getContent("module=ModuleBuilder&action=wizard&view='.$layoutView.'&view_module='.$this->editModule.'")');
+            $ajax->addCrumb($translatedViewType, '');
         }
 
         // set up language files
-		$smarty->assign ( 'language', $parser->getLanguage() ) ; // for sugar_translate in the smarty template
-        $smarty->assign('from_mb',$this->fromModuleBuilder);
+		$smarty->assign('language', $parser->getLanguage()); // for sugar_translate in the smarty template
+        $smarty->assign('from_mb', $this->fromModuleBuilder);
         $smarty->assign('calc_field_list', json_encode($parser->getCalculatedFields()));
 		if ($this->fromModuleBuilder) {
-			$mb = new ModuleBuilder ( ) ;
-            $module = & $mb->getPackageModule ( $this->package, $this->editModule ) ;
+			$mb = new ModuleBuilder( );
+            $module = & $mb->getPackageModule($this->package, $this->editModule);
 		    $smarty->assign('current_mod_strings', $module->getModStrings());
 		}
 
-        $ajax->addSection ( 'center', $translatedViewType, $smarty->fetch ( 'modules/ModuleBuilder/tpls/layoutView.tpl' ) ) ;
+        $ajax->addSection('center', $translatedViewType, $smarty->fetch('modules/ModuleBuilder/tpls/layoutView.tpl'));
         if ($preview) {
-        	echo $smarty->fetch ( 'modules/ModuleBuilder/tpls/Preview/layoutView.tpl' );
+        	echo $smarty->fetch('modules/ModuleBuilder/tpls/Preview/layoutView.tpl');
 		} else {
-			echo $ajax->getJavascript () ;
+			echo $ajax->getJavascript();
     	}
     }
 }

Braces +9 added lines, -8 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -75,8 +76,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -269,9 +269,9 @@ 
         $ajax = new AjaxCompose ( ) ;
 
         $translatedViewType = '' ;
-		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) )
-			$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
-        else if (isset($this->sm))
+		if ( isset ( $labels [ strtolower ( $this->editLayout ) ] ) ) {
+					$translatedViewType = translate ( $labels [ strtolower( $this->editLayout ) ] , 'ModuleBuilder' ) ;
+		} else if (isset($this->sm))
         {
             foreach($this->sm->sources as $file => $def)
             {
@@ -284,8 +284,9 @@ 
             {
                 $label = "LBL_" . strtoupper($this->editLayout);
                 $translated = translate($label, $this->editModule);
-                if ($translated != $label)
-                    $translatedViewType =  $translated;
+                if ($translated != $label) {
+                                    $translatedViewType =  $translated;
+                }
             }
         }
 

include/javascript/jsAlerts.php

Indentation +85 added lines, -85 removed lines

@@ -42,28 +42,28 @@ 
 require_once("include/utils/db_utils.php");
 
 class jsAlerts{
-	var $script;
+    var $script;
 
     public function __construct() {
-		global $app_strings;
-		$this->script .= <<<EOQ
+        global $app_strings;
+        $this->script .= <<<EOQ
 		if (!alertsTimeoutId) {
 		    checkAlerts();
 		}
 
 EOQ;
-		$this->addActivities();
-		Reminder::addNotifications($this);
-		if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
-		}
-	}
-	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
+        $this->addActivities();
+        Reminder::addNotifications($this);
+        if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
+            $this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
+            $this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
+        }
+    }
+    function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
     {
-		$script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
+        $script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
         $this->script .= $script;
-	}
+    }
 
     function getScript()
     {
@@ -87,29 +87,29 @@ 
     }
 
     function addActivities(){
-		global $app_list_strings, $timedate, $current_user, $app_strings;
-		global $sugar_config;
+        global $app_list_strings, $timedate, $current_user, $app_strings;
+        global $sugar_config;
 
-		if (empty($current_user->id)) {
+        if (empty($current_user->id)) {
             return;
-		}
+        }
 
         //Create separate variable to hold timedate value
         $alertDateTimeNow = $timedate->nowDb();
 
-		// cn: get a boundary limiter
-		$dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
-		$dateTimeNow = $timedate->nowDb();
+        // cn: get a boundary limiter
+        $dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
+        $dateTimeNow = $timedate->nowDb();
 
-		global $db;
-		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
-		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
-		$desc = $db->convert("description", "text2char");
-		if($desc != "description") {
-		    $desc .= " description";
-		}
+        global $db;
+        $dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
+        $dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
+        $desc = $db->convert("description", "text2char");
+        if($desc != "description") {
+            $desc .= " description";
+        }
 
-		// Prep Meetings Query
+        // Prep Meetings Query
         $selectMeetings = "SELECT meetings.id, name,reminder_time, $desc,location, status, parent_type, parent_id, date_start, assigned_user_id
 			FROM meetings LEFT JOIN meetings_users ON meetings.id = meetings_users.meeting_id
 			WHERE meetings_users.user_id ='".$current_user->id."'
@@ -119,61 +119,61 @@ 
 				AND meetings.status = 'Planned'
 			    AND date_start >= $dateTimeNow
 			    AND date_start <= $dateTimeMax";
-		$result = $db->query($selectMeetings);
-
-		///////////////////////////////////////////////////////////////////////
-		////	MEETING INTEGRATION
-		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
-				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
-			}
-			$meetingIntegration = new $sugar_config['meeting_integration']();
-		}
-		////	END MEETING INTEGRATION
-		///////////////////////////////////////////////////////////////////////
-
-		while($row = $db->fetchByAssoc($result)) {
-			// need to concatenate since GMT times can bridge two local days
-			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
-			$timeRemind = $row['reminder_time'];
-			$timeStart -= $timeRemind;
-
-			$url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
-			$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
-
-			///////////////////////////////////////////////////////////////////
-			////	MEETING INTEGRATION
-			if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
-				$url = $meetingIntegration->miUrlGetJsAlert($row);
-				$instructions = $meetingIntegration->miGetJsAlertInstructions();
-			}
-			////	END MEETING INTEGRATION
-			///////////////////////////////////////////////////////////////////
-
-			$meetingName = from_html($row['name']);
-			$desc1 = from_html($row['description']);
-			$location = from_html($row['location']);
+        $result = $db->query($selectMeetings);
+
+        ///////////////////////////////////////////////////////////////////////
+        ////	MEETING INTEGRATION
+        $meetingIntegration = null;
+        if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+            if(!class_exists($sugar_config['meeting_integration'])) {
+                require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
+            }
+            $meetingIntegration = new $sugar_config['meeting_integration']();
+        }
+        ////	END MEETING INTEGRATION
+        ///////////////////////////////////////////////////////////////////////
+
+        while($row = $db->fetchByAssoc($result)) {
+            // need to concatenate since GMT times can bridge two local days
+            $timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
+            $timeRemind = $row['reminder_time'];
+            $timeStart -= $timeRemind;
+
+            $url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
+            $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
+
+            ///////////////////////////////////////////////////////////////////
+            ////	MEETING INTEGRATION
+            if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
+                $url = $meetingIntegration->miUrlGetJsAlert($row);
+                $instructions = $meetingIntegration->miGetJsAlertInstructions();
+            }
+            ////	END MEETING INTEGRATION
+            ///////////////////////////////////////////////////////////////////
+
+            $meetingName = from_html($row['name']);
+            $desc1 = from_html($row['description']);
+            $location = from_html($row['location']);
 
             $relatedToMeeting = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
-			$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
             $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
 
 
-			// standard functionality
-			$this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-				$app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')),
-				$app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
-				$description.
-				$instructions,
-				$timeStart - strtotime($alertDateTimeNow),
-				$url
-			);
-		}
+            // standard functionality
+            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
+                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')),
+                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                $description.
+                $instructions,
+                $timeStart - strtotime($alertDateTimeNow),
+                $url
+            );
+        }
 
-		// Prep Calls Query
-		$selectCalls = "
+        // Prep Calls Query
+        $selectCalls = "
 				SELECT calls.id, name, reminder_time, $desc, date_start, status, parent_type, parent_id
 				FROM calls LEFT JOIN calls_users ON calls.id = calls_users.call_id
 				WHERE calls_users.user_id ='".$current_user->id."'
@@ -184,14 +184,14 @@ 
 				    AND date_start >= $dateTimeNow
 				    AND date_start <= $dateTimeMax";
 
-		$result = $db->query($selectCalls);
+        $result = $db->query($selectCalls);
 
-		while($row = $db->fetchByAssoc($result)){
-			// need to concatenate since GMT times can bridge two local days
-			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
-			$timeRemind = $row['reminder_time'];
-			$timeStart -= $timeRemind;
-			$row['description'] = (isset($row['description'])) ? $row['description'] : '';
+        while($row = $db->fetchByAssoc($result)){
+            // need to concatenate since GMT times can bridge two local days
+            $timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
+            $timeRemind = $row['reminder_time'];
+            $timeStart -= $timeRemind;
+            $row['description'] = (isset($row['description'])) ? $row['description'] : '';
 
             $relatedToCall = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
@@ -199,8 +199,8 @@ 
 
 
             $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')) , $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription , $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record=' . $row['id']);
-		}
-	}
+        }
+    }
 
 
 }

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,7 +41,7 @@ 
 
 require_once("include/utils/db_utils.php");
 
-class jsAlerts{
+class jsAlerts {
 	var $script;
 
     public function __construct() {
@@ -54,20 +54,20 @@ 
 EOQ;
 		$this->addActivities();
 		Reminder::addNotifications($this);
-		if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
+		if (!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])) {
+			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'], '', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60);
+			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'], '', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60, 'index.php');
 		}
 	}
-	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
+	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect = '')
     {
-		$script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
+		$script = 'addAlert('.json_encode($type).','.json_encode($name).','.json_encode($subtitle).','.json_encode(str_replace(array("\r", "\n"), array('', '<br>'), $description)).','.$countdown.','.json_encode($redirect).');'."\n";
         $this->script .= $script;
 	}
 
     function getScript()
     {
-        return "<script>secondsSinceLoad = 0; alertList = [];" . $this->script . "</script>";
+        return "<script>secondsSinceLoad = 0; alertList = [];".$this->script."</script>";
     }
 
     /*
@@ -86,7 +86,7 @@ 
         return '';
     }
 
-    function addActivities(){
+    function addActivities() {
 		global $app_list_strings, $timedate, $current_user, $app_strings;
 		global $sugar_config;
 
@@ -105,7 +105,7 @@ 
 		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
 		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
 		$desc = $db->convert("description", "text2char");
-		if($desc != "description") {
+		if ($desc != "description") {
 		    $desc .= " description";
 		}
 
@@ -124,8 +124,8 @@ 
 		///////////////////////////////////////////////////////////////////////
 		////	MEETING INTEGRATION
 		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
+		if (isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+			if (!class_exists($sugar_config['meeting_integration'])) {
 				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
 			}
 			$meetingIntegration = new $sugar_config['meeting_integration']();
@@ -133,18 +133,18 @@ 
 		////	END MEETING INTEGRATION
 		///////////////////////////////////////////////////////////////////////
 
-		while($row = $db->fetchByAssoc($result)) {
+		while ($row = $db->fetchByAssoc($result)) {
 			// need to concatenate since GMT times can bridge two local days
 			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
 			$timeRemind = $row['reminder_time'];
 			$timeStart -= $timeRemind;
 
-			$url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
+			$url = 'index.php?action=DetailView&module=Meetings&record='.$row['id'];
 			$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
 			///////////////////////////////////////////////////////////////////
 			////	MEETING INTEGRATION
-			if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
+			if (!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
 				$url = $meetingIntegration->miUrlGetJsAlert($row);
 				$instructions = $meetingIntegration->miGetJsAlertInstructions();
 			}
@@ -158,7 +158,7 @@ 
             $relatedToMeeting = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
 			$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
-            $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
+            $description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].$row['status']."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
 			// standard functionality
@@ -186,7 +186,7 @@ 
 
 		$result = $db->query($selectCalls);
 
-		while($row = $db->fetchByAssoc($result)){
+		while ($row = $db->fetchByAssoc($result)) {
 			// need to concatenate since GMT times can bridge two local days
 			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
 			$timeRemind = $row['reminder_time'];
@@ -195,10 +195,10 @@ 
 
             $relatedToCall = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
-            $callDescription = $row['description'] ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToCall;
+            $callDescription = $row['description']."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].$row['status']."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToCall;
 
 
-            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')) , $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription , $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record=' . $row['id']);
+            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')), $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription, $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record='.$row['id']);
 		}
 	}
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/SugarFields/Parsers/DetailViewMetaParser.php

Indentation +75 added lines, -75 removed lines

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

Spacing +19 added lines, -19 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

include/generic/SugarWidgets/SugarWidgetSubPanelTopButton_c.php

Indentation +98 added lines, -98 removed lines

@@ -46,60 +46,60 @@ 
 class SugarWidgetSubPanelTopButton_c extends SugarWidget
 {
     var $module;
-	var $title;
-	var $access_key;
-	var $form_value;
-	var $additional_form_fields;
-	var $acl;
+    var $title;
+    var $access_key;
+    var $form_value;
+    var $additional_form_fields;
+    var $acl;
 
 //TODO rename defines to layout defs and make it a member variable instead of passing it multiple layers with extra copying.
 
-	/** Take the keys for the strings and look them up.  Module is literal, the rest are label keys
-	*/
-	function __construct($module='', $title='', $access_key='', $form_value='')
-	{
-		global $app_strings;
-
-		if(is_array($module))
-		{
-			// it is really the class details from the mapping
-			$class_details = $module;
-
-			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($class_details['module']))
-				$this->module = $class_details['module'];
-			if(!empty($class_details['title']))
-				$this->title = $app_strings[$class_details['title']];
-			if(!empty($class_details['access_key']))
-				$this->access_key = $app_strings[$class_details['access_key']];
-			if(!empty($class_details['form_value']))
-				$this->form_value = translate($class_details['form_value'], $this->module);
-			if(!empty($class_details['additional_form_fields']))
-				$this->additional_form_fields = $class_details['additional_form_fields'];
-			if(!empty($class_details['ACL'])){
-				$this->acl = $class_details['ACL'];
-			}
-		}
-		else
-		{
-			$this->module = $module;
-
-			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($title))
-				$this->title = $app_strings[$title];
-			if(!empty($access_key))
-				$this->access_key = $app_strings[$access_key];
-			if(!empty($form_value))
-				$this->form_value = translate($form_value, $module);
-		}
-	}
+    /** Take the keys for the strings and look them up.  Module is literal, the rest are label keys
+     */
+    function __construct($module='', $title='', $access_key='', $form_value='')
+    {
+        global $app_strings;
+
+        if(is_array($module))
+        {
+            // it is really the class details from the mapping
+            $class_details = $module;
+
+            // If keys were passed into the constructor, translate them from keys to values.
+            if(!empty($class_details['module']))
+                $this->module = $class_details['module'];
+            if(!empty($class_details['title']))
+                $this->title = $app_strings[$class_details['title']];
+            if(!empty($class_details['access_key']))
+                $this->access_key = $app_strings[$class_details['access_key']];
+            if(!empty($class_details['form_value']))
+                $this->form_value = translate($class_details['form_value'], $this->module);
+            if(!empty($class_details['additional_form_fields']))
+                $this->additional_form_fields = $class_details['additional_form_fields'];
+            if(!empty($class_details['ACL'])){
+                $this->acl = $class_details['ACL'];
+            }
+        }
+        else
+        {
+            $this->module = $module;
+
+            // If keys were passed into the constructor, translate them from keys to values.
+            if(!empty($title))
+                $this->title = $app_strings[$title];
+            if(!empty($access_key))
+                $this->access_key = $app_strings[$access_key];
+            if(!empty($form_value))
+                $this->form_value = translate($form_value, $module);
+        }
+    }
 
     public function getWidgetId($buttonSuffix = true)
     {
-    	$widgetID = parent::getWidgetId() . '_'.preg_replace('[ ]', '', strtolower($this->form_value));
-    	if($buttonSuffix){
-    		$widgetID .= '_button';
-    	}
+        $widgetID = parent::getWidgetId() . '_'.preg_replace('[ ]', '', strtolower($this->form_value));
+        if($buttonSuffix){
+            $widgetID .= '_button';
+        }
         return $widgetID;
     }
 
@@ -125,7 +125,7 @@ 
         }
 
 
-		if(!empty($this->module))
+        if(!empty($this->module))
         {
             $defines['child_module_name'] = $this->module;
         }
@@ -135,7 +135,7 @@ 
         }
 
         $defines['parent_bean_name'] = get_class( $defines['focus']);
-		$relationship_name = $this->get_subpanel_relationship_name($defines);
+        $relationship_name = $this->get_subpanel_relationship_name($defines);
 
 
         $formValues = array();
@@ -150,10 +150,10 @@ 
             // #26451,add these fields for custom one-to-many relate field.
             if(!empty($defines['child_module_name'])){
                 $formValues[$relationship_name."_name"] = $defines['focus']->name;
-            	$childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
-            	if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
-            		$formValues[$GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name']] = $defines['focus']->id;
-            	}
+                $childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
+                if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
+                    $formValues[$GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name']] = $defines['focus']->id;
+                }
             }
         }
 
@@ -216,7 +216,7 @@ 
                 $additionalFormFields['parent_id'] = $defines['focus']->account_id;
                 $additionalFormFields['account_id'] = $defines['focus']->account_id;
             } else if($defines['focus']->object_name=='Contract') {
-            	$additionalFormFields['contract_id'] = $defines['focus']->id;
+                $additionalFormFields['contract_id'] = $defines['focus']->id;
             } else {
                 $additionalFormFields['parent_id'] = $defines['focus']->id;
             }
@@ -266,17 +266,17 @@ 
         }
     }
 
-	/** This default function is used to create the HTML for a simple button */
-	function display($defines, $additionalFormFields = null, $nonbutton = false)
-	{
-		$temp='';
-		$inputID = $this->getWidgetId();
+    /** This default function is used to create the HTML for a simple button */
+    function display($defines, $additionalFormFields = null, $nonbutton = false)
+    {
+        $temp='';
+        $inputID = $this->getWidgetId();
 
-		if(!empty($this->acl) && ACLController::moduleSupportsACL($defines['module'])  &&  !ACLController::checkAccess($defines['module'], $this->acl, true)){
-			return $temp;
-		}
+        if(!empty($this->acl) && ACLController::moduleSupportsACL($defines['module'])  &&  !ACLController::checkAccess($defines['module'], $this->acl, true)){
+            return $temp;
+        }
 
-		global $app_strings;
+        global $app_strings;
 
         if ( isset($_REQUEST['layout_def_key']) && $_REQUEST['layout_def_key'] == 'UserEAPM' ) {
             // Subpanels generally don't go on the editview, so we have to handle this special
@@ -289,42 +289,42 @@ 
         }
 
         if ($nonbutton) {
-           // $button = "<a onclick=''>$this->form_value";
+            // $button = "<a onclick=''>$this->form_value";
         }
         return $button;
-	}
-
-	/**
-	 * Returns a string that is the JSON encoded version of the popup request.
-	 * Perhaps this function should be moved to a more globally accessible location?
-	 */
-	function _create_json_encoded_popup_request($popup_request_data)
-	{
-	    return json_encode($popup_request_data);
-	}
-
-	/**
-	 * get_subpanel_relationship_name
-	 * Get the relationship name based on the subapnel definition
-	 * @param mixed $defines The subpanel definition
-	 */
-	function get_subpanel_relationship_name($defines) {
-		 $relationship_name = '';
-		 if(!empty($defines)) {
-		 	$relationship_name = isset($defines['module']) ? $defines['module'] : '';
-	     	$dataSource = $defines['subpanel_definition']->get_data_source_name(true);
-         	if (!empty($dataSource)) {
-				$relationship_name = $dataSource;
-				//Try to set the relationship name to the real relationship, not the link.
-				if (!empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource])
-				 && !empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship']))
-				{
-					$relationship_name = $defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship'];
-				}
-			}
-		 }
-		 return $relationship_name;
-	}
+    }
+
+    /**
+     * Returns a string that is the JSON encoded version of the popup request.
+     * Perhaps this function should be moved to a more globally accessible location?
+     */
+    function _create_json_encoded_popup_request($popup_request_data)
+    {
+        return json_encode($popup_request_data);
+    }
+
+    /**
+     * get_subpanel_relationship_name
+     * Get the relationship name based on the subapnel definition
+     * @param mixed $defines The subpanel definition
+     */
+    function get_subpanel_relationship_name($defines) {
+            $relationship_name = '';
+            if(!empty($defines)) {
+                $relationship_name = isset($defines['module']) ? $defines['module'] : '';
+                $dataSource = $defines['subpanel_definition']->get_data_source_name(true);
+                if (!empty($dataSource)) {
+                $relationship_name = $dataSource;
+                //Try to set the relationship name to the real relationship, not the link.
+                if (!empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource])
+                 && !empty($defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship']))
+                {
+                    $relationship_name = $defines['subpanel_definition']->parent_bean->field_defs[$dataSource]['relationship'];
+                }
+            }
+            }
+            return $relationship_name;
+    }
 
 }
 ?>

Spacing +61 added lines, -61 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.
@@ -56,27 +56,27 @@ 
 
 	/** Take the keys for the strings and look them up.  Module is literal, the rest are label keys
 	*/
-	function __construct($module='', $title='', $access_key='', $form_value='')
+	function __construct($module = '', $title = '', $access_key = '', $form_value = '')
 	{
 		global $app_strings;
 
-		if(is_array($module))
+		if (is_array($module))
 		{
 			// it is really the class details from the mapping
 			$class_details = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($class_details['module']))
+			if (!empty($class_details['module']))
 				$this->module = $class_details['module'];
-			if(!empty($class_details['title']))
+			if (!empty($class_details['title']))
 				$this->title = $app_strings[$class_details['title']];
-			if(!empty($class_details['access_key']))
+			if (!empty($class_details['access_key']))
 				$this->access_key = $app_strings[$class_details['access_key']];
-			if(!empty($class_details['form_value']))
+			if (!empty($class_details['form_value']))
 				$this->form_value = translate($class_details['form_value'], $this->module);
-			if(!empty($class_details['additional_form_fields']))
+			if (!empty($class_details['additional_form_fields']))
 				$this->additional_form_fields = $class_details['additional_form_fields'];
-			if(!empty($class_details['ACL'])){
+			if (!empty($class_details['ACL'])) {
 				$this->acl = $class_details['ACL'];
 			}
 		}
@@ -85,19 +85,19 @@ 
 			$this->module = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($title))
+			if (!empty($title))
 				$this->title = $app_strings[$title];
-			if(!empty($access_key))
+			if (!empty($access_key))
 				$this->access_key = $app_strings[$access_key];
-			if(!empty($form_value))
+			if (!empty($form_value))
 				$this->form_value = translate($form_value, $module);
 		}
 	}
 
     public function getWidgetId($buttonSuffix = true)
     {
-    	$widgetID = parent::getWidgetId() . '_'.preg_replace('[ ]', '', strtolower($this->form_value));
-    	if($buttonSuffix){
+    	$widgetID = parent::getWidgetId().'_'.preg_replace('[ ]', '', strtolower($this->form_value));
+    	if ($buttonSuffix) {
     		$widgetID .= '_button';
     	}
         return $widgetID;
@@ -109,11 +109,11 @@ 
         global $currentModule;
 
         // Create the additional form fields with real values if they were not passed in
-        if(empty($additionalFormFields) && $this->additional_form_fields)
+        if (empty($additionalFormFields) && $this->additional_form_fields)
         {
-            foreach($this->additional_form_fields as $key=>$value)
+            foreach ($this->additional_form_fields as $key=>$value)
             {
-                if(!empty($defines['focus']->$value))
+                if (!empty($defines['focus']->$value))
                 {
                     $additionalFormFields[$key] = $defines['focus']->$value;
                 }
@@ -125,7 +125,7 @@ 
         }
 
 
-		if(!empty($this->module))
+		if (!empty($this->module))
         {
             $defines['child_module_name'] = $this->module;
         }
@@ -134,7 +134,7 @@ 
             $defines['child_module_name'] = $defines['module'];
         }
 
-        $defines['parent_bean_name'] = get_class( $defines['focus']);
+        $defines['parent_bean_name'] = get_class($defines['focus']);
 		$relationship_name = $this->get_subpanel_relationship_name($defines);
 
 
@@ -144,65 +144,65 @@ 
         $formValues['module'] = $defines['child_module_name'];
         $formValues[strtolower($defines['parent_bean_name'])."_id"] = $defines['focus']->id;
 
-        if(isset($defines['focus']->name))
+        if (isset($defines['focus']->name))
         {
             $formValues[strtolower($defines['parent_bean_name'])."_name"] = $defines['focus']->name;
             // #26451,add these fields for custom one-to-many relate field.
-            if(!empty($defines['child_module_name'])){
+            if (!empty($defines['child_module_name'])) {
                 $formValues[$relationship_name."_name"] = $defines['focus']->name;
             	$childFocusName = !empty($GLOBALS['beanList'][$defines['child_module_name']]) ? $GLOBALS['beanList'][$defines['child_module_name']] : "";
-            	if(!empty($GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name'])){
-            		$formValues[$GLOBALS['dictionary'][ $childFocusName ]["fields"][$relationship_name .'_name']['id_name']] = $defines['focus']->id;
+            	if (!empty($GLOBALS['dictionary'][$childFocusName]["fields"][$relationship_name.'_name']['id_name'])) {
+            		$formValues[$GLOBALS['dictionary'][$childFocusName]["fields"][$relationship_name.'_name']['id_name']] = $defines['focus']->id;
             	}
             }
         }
 
         $formValues['return_module'] = $currentModule;
 
-        if($currentModule == 'Campaigns'){
+        if ($currentModule == 'Campaigns') {
             $formValues['return_action'] = "DetailView";
-        }else{
+        } else {
             $formValues['return_action'] = $defines['action'];
-            if ( $formValues['return_action'] == 'SubPanelViewer' ) {
+            if ($formValues['return_action'] == 'SubPanelViewer') {
                 $formValues['return_action'] = 'DetailView';
             }
         }
 
         $formValues['return_id'] = $defines['focus']->id;
         $formValues['return_relationship'] = $relationship_name;
-        switch ( strtolower( $currentModule ) )
+        switch (strtolower($currentModule))
         {
             case 'prospects' :
-                $name = $defines['focus']->account_name ;
-                break ;
+                $name = $defines['focus']->account_name;
+                break;
             case 'documents' :
-                $name = $defines['focus']->document_name ;
-                break ;
+                $name = $defines['focus']->document_name;
+                break;
             case 'kbdocuments' :
-                $name = $defines['focus']->kbdocument_name ;
-                break ;
+                $name = $defines['focus']->kbdocument_name;
+                break;
             case 'leads' :
             case 'contacts' :
-                $name = $defines['focus']->first_name . " " .$defines['focus']->last_name ;
-                break ;
+                $name = $defines['focus']->first_name." ".$defines['focus']->last_name;
+                break;
             default :
                $name = (isset($defines['focus']->name)) ? $defines['focus']->name : "";
         }
         $formValues['return_name'] = $name;
 
         // TODO: move this out and get $additionalFormFields working properly
-        if(empty($additionalFormFields['parent_type']))
+        if (empty($additionalFormFields['parent_type']))
         {
-            if($defines['focus']->object_name=='Contact') {
+            if ($defines['focus']->object_name == 'Contact') {
                 $additionalFormFields['parent_type'] = 'Accounts';
             }
             else {
                 $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
             }
         }
-        if(empty($additionalFormFields['parent_name']))
+        if (empty($additionalFormFields['parent_name']))
         {
-            if($defines['focus']->object_name=='Contact') {
+            if ($defines['focus']->object_name == 'Contact') {
                 $additionalFormFields['parent_name'] = $defines['focus']->account_name;
                 $additionalFormFields['account_name'] = $defines['focus']->account_name;
             }
@@ -210,55 +210,55 @@ 
                 $additionalFormFields['parent_name'] = $defines['focus']->name;
             }
         }
-        if(empty($additionalFormFields['parent_id']))
+        if (empty($additionalFormFields['parent_id']))
         {
-            if($defines['focus']->object_name=='Contact') {
+            if ($defines['focus']->object_name == 'Contact') {
                 $additionalFormFields['parent_id'] = $defines['focus']->account_id;
                 $additionalFormFields['account_id'] = $defines['focus']->account_id;
-            } else if($defines['focus']->object_name=='Contract') {
+            } else if ($defines['focus']->object_name == 'Contract') {
             	$additionalFormFields['contract_id'] = $defines['focus']->id;
             } else {
                 $additionalFormFields['parent_id'] = $defines['focus']->id;
             }
         }
 
-        if ($defines['focus']->object_name=='Opportunity') {
+        if ($defines['focus']->object_name == 'Opportunity') {
             $additionalFormFields['account_id'] = $defines['focus']->account_id;
             $additionalFormFields['account_name'] = $defines['focus']->account_name;
         }
 
-        if (!empty($defines['child_module_name']) and $defines['child_module_name']=='Contacts' and !empty($defines['parent_bean_name']) and $defines['parent_bean_name']=='contact' ) {
-            if (!empty($defines['focus']->id ) and !empty($defines['focus']->name)) {
+        if (!empty($defines['child_module_name']) and $defines['child_module_name'] == 'Contacts' and !empty($defines['parent_bean_name']) and $defines['parent_bean_name'] == 'contact') {
+            if (!empty($defines['focus']->id) and !empty($defines['focus']->name)) {
                 $formValues['reports_to_id'] = $defines['focus']->id;
                 $formValues['reports_to_name'] = $defines['focus']->name;
             }
         }
         $formValues['action'] = "EditView";
 
-        if ( $asUrl ) {
+        if ($asUrl) {
             $returnLink = '';
-            foreach($formValues as $key => $value ) {
+            foreach ($formValues as $key => $value) {
                 $returnLink .= $key.'='.$value.'&';
             }
-            foreach($additionalFormFields as $key => $value ) {
+            foreach ($additionalFormFields as $key => $value) {
                 $returnLink .= $key.'='.$value.'&';
             }
-            $returnLink = rtrim($returnLink,'&');
+            $returnLink = rtrim($returnLink, '&');
 
             return $returnLink;
         } else {
 
-            $form = 'form' . $relationship_name;
-            $button = '<form action="index.php" method="post" name="form" id="' . $form . "\">\n";
-            foreach($formValues as $key => $value) {
+            $form = 'form'.$relationship_name;
+            $button = '<form action="index.php" method="post" name="form" id="'.$form."\">\n";
+            foreach ($formValues as $key => $value) {
                 if (empty($value->defs)) {
-                    $button .= "<input type='hidden' name='" . $key . "' value='" . $value . "' />\n";
+                    $button .= "<input type='hidden' name='".$key."' value='".$value."' />\n";
                 }
             }
             // fill in additional form fields for all but action
-            foreach($additionalFormFields as $key => $value) {
-                if($key != 'action') {
-                    $button .= "<input type='hidden' name='" . $key . "' value='" . $value . "' />\n";
+            foreach ($additionalFormFields as $key => $value) {
+                if ($key != 'action') {
+                    $button .= "<input type='hidden' name='".$key."' value='".$value."' />\n";
                 }
             }
 
@@ -270,18 +270,18 @@ 
 	/** This default function is used to create the HTML for a simple button */
 	function display($defines, $additionalFormFields = null, $nonbutton = false)
 	{
-		$temp='';
+		$temp = '';
 		$inputID = $this->getWidgetId();
 
-		if(!empty($this->acl) && ACLController::moduleSupportsACL($defines['module'])  &&  !ACLController::checkAccess($defines['module'], $this->acl, true)){
+		if (!empty($this->acl) && ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], $this->acl, true)) {
 			return $temp;
 		}
 
 		global $app_strings;
 
-        if ( isset($_REQUEST['layout_def_key']) && $_REQUEST['layout_def_key'] == 'UserEAPM' ) {
+        if (isset($_REQUEST['layout_def_key']) && $_REQUEST['layout_def_key'] == 'UserEAPM') {
             // Subpanels generally don't go on the editview, so we have to handle this special
-            $megaLink = $this->_get_form($defines, $additionalFormFields,true);
+            $megaLink = $this->_get_form($defines, $additionalFormFields, true);
             //$button = "<input title='$this->title' accesskey='$this->access_key' class='button' type='submit' name='$inputID' id='$inputID' value='$this->form_value' onclick='javascript:document.location=\"index.php?".$megaLink."\"; return false;'/>";
         } else {
             $button = $this->_get_form($defines, $additionalFormFields);
@@ -311,7 +311,7 @@ 
 	 */
 	function get_subpanel_relationship_name($defines) {
 		 $relationship_name = '';
-		 if(!empty($defines)) {
+		 if (!empty($defines)) {
 		 	$relationship_name = isset($defines['module']) ? $defines['module'] : '';
 	     	$dataSource = $defines['subpanel_definition']->get_data_source_name(true);
          	if (!empty($dataSource)) {

Braces +33 added lines, -28 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,31 +68,38 @@ 
 			$class_details = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($class_details['module']))
-				$this->module = $class_details['module'];
-			if(!empty($class_details['title']))
-				$this->title = $app_strings[$class_details['title']];
-			if(!empty($class_details['access_key']))
-				$this->access_key = $app_strings[$class_details['access_key']];
-			if(!empty($class_details['form_value']))
-				$this->form_value = translate($class_details['form_value'], $this->module);
-			if(!empty($class_details['additional_form_fields']))
-				$this->additional_form_fields = $class_details['additional_form_fields'];
+			if(!empty($class_details['module'])) {
+							$this->module = $class_details['module'];
+			}
+			if(!empty($class_details['title'])) {
+							$this->title = $app_strings[$class_details['title']];
+			}
+			if(!empty($class_details['access_key'])) {
+							$this->access_key = $app_strings[$class_details['access_key']];
+			}
+			if(!empty($class_details['form_value'])) {
+							$this->form_value = translate($class_details['form_value'], $this->module);
+			}
+			if(!empty($class_details['additional_form_fields'])) {
+							$this->additional_form_fields = $class_details['additional_form_fields'];
+			}
 			if(!empty($class_details['ACL'])){
 				$this->acl = $class_details['ACL'];
 			}
-		}
-		else
+		} else
 		{
 			$this->module = $module;
 
 			// If keys were passed into the constructor, translate them from keys to values.
-			if(!empty($title))
-				$this->title = $app_strings[$title];
-			if(!empty($access_key))
-				$this->access_key = $app_strings[$access_key];
-			if(!empty($form_value))
-				$this->form_value = translate($form_value, $module);
+			if(!empty($title)) {
+							$this->title = $app_strings[$title];
+			}
+			if(!empty($access_key)) {
+							$this->access_key = $app_strings[$access_key];
+			}
+			if(!empty($form_value)) {
+							$this->form_value = translate($form_value, $module);
+			}
 		}
 	}
 
@@ -116,8 +125,7 @@ 
                 if(!empty($defines['focus']->$value))
                 {
                     $additionalFormFields[$key] = $defines['focus']->$value;
-                }
-                else
+                } else
                 {
                     $additionalFormFields[$key] = '';
                 }
@@ -128,8 +136,7 @@ 
 		if(!empty($this->module))
         {
             $defines['child_module_name'] = $this->module;
-        }
-        else
+        } else
         {
             $defines['child_module_name'] = $defines['module'];
         }
@@ -161,7 +168,7 @@ 
 
         if($currentModule == 'Campaigns'){
             $formValues['return_action'] = "DetailView";
-        }else{
+        } else{
             $formValues['return_action'] = $defines['action'];
             if ( $formValues['return_action'] == 'SubPanelViewer' ) {
                 $formValues['return_action'] = 'DetailView';
@@ -195,8 +202,7 @@ 
         {
             if($defines['focus']->object_name=='Contact') {
                 $additionalFormFields['parent_type'] = 'Accounts';
-            }
-            else {
+            } else {
                 $additionalFormFields['parent_type'] = $defines['focus']->module_dir;
             }
         }
@@ -205,8 +211,7 @@ 
             if($defines['focus']->object_name=='Contact') {
                 $additionalFormFields['parent_name'] = $defines['focus']->account_name;
                 $additionalFormFields['account_name'] = $defines['focus']->account_name;
-            }
-            else {
+            } else {
                 $additionalFormFields['parent_name'] = $defines['focus']->name;
             }
         }