Inspection of "Merge branch 'hotfix'" - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 24ce66...da2f36 )

by Adam

created 2017-09-15 10:29 UTC

Status

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -42,31 +42,31 @@
 block discarded – undo
     return additionalDetailsaCase($fields);
 }
 function additionalDetailsaCase($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Cases');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Cases');
+    }
 		
-	$overlib_string = '';
+    $overlib_string = '';
 		
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-		$overlib_string .= '<br>';
-	}
-	if(!empty($fields['RESOLUTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
-	}		
+    if(!empty($fields['DESCRIPTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+        $overlib_string .= '<br>';
+    }
+    if(!empty($fields['RESOLUTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
+        if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+    }		
 	
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'width' => '400',
-				 'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'width' => '400',
+                    'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  
  
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -43,21 +43,21 @@  discard block
 block discarded – undo
 }
 function additionalDetailsaCase($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Cases');
 	}
 		
 	$overlib_string = '';
 		
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 		$overlib_string .= '<br>';
 	}
-	if(!empty($fields['RESOLUTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['RESOLUTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_RESOLUTION'].'</b> '.substr($fields['RESOLUTION'], 0, 300);
+		if (strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
 	}		
 	
 	return array('fieldToAddTo' => 'NAME', 

Please login to merge, or discard this patch.

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@  discard block
 block discarded – undo
 <?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.
@@ -52,12 +54,16 @@  discard block
 block discarded – undo
 		
 	if(!empty($fields['DESCRIPTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 		$overlib_string .= '<br>';
 	}
 	if(!empty($fields['RESOLUTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['RESOLUTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}		
 	
 	return array('fieldToAddTo' => 'NAME', 

Please login to merge, or discard this patch.

modules/Cases/metadata/detailviewdefs.php 2 patches

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -39,129 +39,129 @@
 block discarded – undo
 
 $viewdefs ['Cases'] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
-          3 => 'FIND_DUPLICATES',
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+            3 => 'FIND_DUPLICATES',
         ),
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
-      ),
-      'useTabs' => true,
-      'tabDefs' => 
-      array (
+        ),
+        'useTabs' => true,
+        'tabDefs' => 
+        array (
         'LBL_CASE_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_AOP_CASE_UPDATES' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_case_information' => 
-      array (
+        'lbl_case_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'case_number',
             'label' => 'LBL_CASE_NUMBER',
-          ),
-          1 => 'priority',
+            ),
+            1 => 'priority',
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'state',
             'comment' => 'The state of the case (i.e. open/closed)',
             'label' => 'LBL_STATE',
-          ),
-          1 => 'status',
+            ),
+            1 => 'status',
         ),
         2 => 
         array (
-          0 => 'type',
-          1 => 'account_name',
+            0 => 'type',
+            1 => 'account_name',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 'description',
+            0 => 'description',
         ),
         5 => 
         array (
-          0 => 'resolution',
+            0 => 'resolution',
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
+            ),
         ),
         7 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_AOP_CASE_UPDATES' => 
-      array (
+        'LBL_AOP_CASE_UPDATES' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'aop_case_updates_threaded',
             'studio' => 'visible',
             'label' => 'LBL_AOP_CASE_UPDATES_THREADED',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

Please login to merge, or discard this patch.

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -38,15 +38,15 @@  discard block
 block discarded – undo
  ********************************************************************************/
 
 $viewdefs ['Cases'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
@@ -55,50 +55,50 @@  discard block
 block discarded – undo
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'LBL_CASE_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_AOP_CASE_UPDATES' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_case_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'case_number',
             'label' => 'LBL_CASE_NUMBER',
           ),
           1 => 'priority',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'state',
             'comment' => 'The state of the case (i.e. open/closed)',
             'label' => 'LBL_STATE',
@@ -106,43 +106,43 @@  discard block
 block discarded – undo
           1 => 'status',
         ),
         2 => 
-        array (
+        array(
           0 => 'type',
           1 => 'account_name',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
           ),
         ),
         4 => 
-        array (
+        array(
           0 => 'description',
         ),
         5 => 
-        array (
+        array(
           0 => 'resolution',
         ),
         6 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
           ),
         ),
         7 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
           ),
           1 => 
-          array (
+          array(
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
         ),
       ),
       'LBL_AOP_CASE_UPDATES' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'aop_case_updates_threaded',
             'studio' => 'visible',
             'label' => 'LBL_AOP_CASE_UPDATES_THREADED',

Please login to merge, or discard this patch.

modules/Cases/metadata/quickcreatedefs.php 3 patches

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -45,32 +45,32 @@
 block discarded – undo
                                         array('label' => '10', 'field' => '30'), 
                                         array('label' => '10', 'field' => '30')
                                         ),
-                       ),
+                        ),
 'panels' =>
 
 array (
   
-  array (
+    array (
     array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
     'priority'
-  ),
+    ),
   
-  array (
+    array (
     'status',
     array('name'=>'account_name'),
-  ),
+    ),
   
-  array (
+    array (
     'assigned_user_name',
-  ),
+    ),
   
-  array (
     array (
-      'name' => 'description',
-      'displayParams' => array ('rows' => '4','cols' => '60'),
-      'nl2br' => true,
+    array (
+        'name' => 'description',
+        'displayParams' => array ('rows' => '4','cols' => '60'),
+        'nl2br' => true,
+    ),
     ),
-  ),
 
 ),
 

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -48,26 +48,26 @@  discard block
 block discarded – undo
                        ),
 'panels' =>
 
-array (
+array(
   
-  array (
-    array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
+  array(
+    array('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
     'priority'
   ),
   
-  array (
+  array(
     'status',
     array('name'=>'account_name'),
   ),
   
-  array (
+  array(
     'assigned_user_name',
   ),
   
-  array (
-    array (
+  array(
+    array(
       'name' => 'description',
-      'displayParams' => array ('rows' => '4','cols' => '60'),
+      'displayParams' => array('rows' => '4', 'cols' => '60'),
       'nl2br' => true,
     ),
   ),

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

modules/Cases/metadata/listviewdefs.php 3 patches

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -43,41 +43,41 @@
 block discarded – undo
 
 
 $listViewDefs['Cases'] = array(
-	'CASE_NUMBER' => array(
-		'width' => '5', 
-		'label' => 'LBL_LIST_NUMBER',
+    'CASE_NUMBER' => array(
+        'width' => '5', 
+        'label' => 'LBL_LIST_NUMBER',
         'default' => true), 
-	'NAME' => array(
-		'width' => '25', 
-		'label' => 'LBL_LIST_SUBJECT', 
-		'link' => true,
+    'NAME' => array(
+        'width' => '25', 
+        'label' => 'LBL_LIST_SUBJECT', 
+        'link' => true,
         'default' => true), 
-	'ACCOUNT_NAME' => array(
-		'width' => '20', 
-		'label' => 'LBL_LIST_ACCOUNT_NAME', 
-		'module' => 'Accounts',
-		'id' => 'ACCOUNT_ID',
-		'link' => true,
+    'ACCOUNT_NAME' => array(
+        'width' => '20', 
+        'label' => 'LBL_LIST_ACCOUNT_NAME', 
+        'module' => 'Accounts',
+        'id' => 'ACCOUNT_ID',
+        'link' => true,
         'default' => true,
         'ACLTag' => 'ACCOUNT',
         'related_fields' => array('account_id')),
-	'PRIORITY' => array(
-		'width' => '10', 
-		'label' => 'LBL_LIST_PRIORITY',
+    'PRIORITY' => array(
+        'width' => '10', 
+        'label' => 'LBL_LIST_PRIORITY',
         'default' => true),  
-	'STATUS' => array(
-		'width' => '10', 
-		'label' => 'LBL_LIST_STATUS',
+    'STATUS' => array(
+        'width' => '10', 
+        'label' => 'LBL_LIST_STATUS',
         'default' => true),
-	'ASSIGNED_USER_NAME' => array(
-		'width' => '10', 
-		'label' => 'LBL_ASSIGNED_TO_NAME',
-		'module' => 'Employees',
+    'ASSIGNED_USER_NAME' => array(
+        'width' => '10', 
+        'label' => 'LBL_ASSIGNED_TO_NAME',
+        'module' => 'Employees',
         'id' => 'ASSIGNED_USER_ID',
         'default' => true),
-	'DATE_ENTERED' => array (
-	    'width' => '10',
-	    'label' => 'LBL_DATE_ENTERED',
-	    'default' => true),
+    'DATE_ENTERED' => array (
+        'width' => '10',
+        'label' => 'LBL_DATE_ENTERED',
+        'default' => true),
 );
 ?>

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 		'module' => 'Employees',
         'id' => 'ASSIGNED_USER_ID',
         'default' => true),
-	'DATE_ENTERED' => array (
+	'DATE_ENTERED' => array(
 	    'width' => '10',
 	    'label' => 'LBL_DATE_ENTERED',
 	    'default' => true),

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

modules/Opportunities/field_arrays.php 3 patches

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -46,27 +46,27 @@
 block discarded – undo
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['Opportunity'] = array ('column_fields' => Array("id"
-		, "name"
-		, "opportunity_type"
-		, "lead_source"
-		, "amount"
-		, "currency_id"
-		, "amount_usdollar"
-		, "date_entered"
-		, "date_modified"
-		, "modified_user_id"
-		, "assigned_user_id"
-		, "created_by"
-		, "date_closed"
-		, "next_step"
-		, "sales_stage"
-		, "probability"
-		, "description"
-		,"campaign_id"
-		),
+        , "name"
+        , "opportunity_type"
+        , "lead_source"
+        , "amount"
+        , "currency_id"
+        , "amount_usdollar"
+        , "date_entered"
+        , "date_modified"
+        , "modified_user_id"
+        , "assigned_user_id"
+        , "created_by"
+        , "date_closed"
+        , "next_step"
+        , "sales_stage"
+        , "probability"
+        , "description"
+        ,"campaign_id"
+        ),
         'list_fields' => Array('id', 'name', 'account_id', 'sales_stage', 'account_name', 'date_closed', 'amount', 'assigned_user_name', 'assigned_user_id','sales_stage','probability','lead_source','opportunity_type'
-	, "amount_usdollar"
-	),
+    , "amount_usdollar"
+    ),
         'required_fields' => Array('name'=>1, 'date_closed'=>2, 'amount'=>3, 'sales_stage'=>4, 'account_name'=>5),
 );
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['Opportunity'] = array ('column_fields' => Array("id"
+$fields_array['Opportunity'] = array('column_fields' => Array("id"
 		, "name"
 		, "opportunity_type"
 		, "lead_source"
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
 		, "description"
 		,"campaign_id"
 		),
-        'list_fields' => Array('id', 'name', 'account_id', 'sales_stage', 'account_name', 'date_closed', 'amount', 'assigned_user_name', 'assigned_user_id','sales_stage','probability','lead_source','opportunity_type'
+        'list_fields' => Array('id', 'name', 'account_id', 'sales_stage', 'account_name', 'date_closed', 'amount', 'assigned_user_name', 'assigned_user_id', 'sales_stage', 'probability', 'lead_source', 'opportunity_type'
 	, "amount_usdollar"
 	),
         'required_fields' => Array('name'=>1, 'date_closed'=>2, 'amount'=>3, 'sales_stage'=>4, 'account_name'=>5),

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

modules/Opportunities/vardefs.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -319,7 +319,7 @@
 block discarded – undo
             array(
                 'name' => 'emails',
                 'type' => 'link',
-                'relationship' => 'emails_opportunities_rel',/* reldef in emails */
+                'relationship' => 'emails_opportunities_rel', /* reldef in emails */
                 'source' => 'non-db',
                 'vname' => 'LBL_EMAILS',
             ),

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

modules/Opportunities/SubPanelViewProjects.php 3 patches

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -71,12 +71,12 @@  discard block
 block discarded – undo
 /// SETUP PARENT POPUP
 
 $popup_request_data = array(
-	'call_back_function' => 'set_return_and_save',
-	'form_name' => 'DetailView',
-	'field_to_name_array' => array(
-		'id' => 'opportunity_id',
-		),
-	);
+    'call_back_function' => 'set_return_and_save',
+    'form_name' => 'DetailView',
+    'field_to_name_array' => array(
+        'id' => 'opportunity_id',
+        ),
+    );
 
 $json = getJSONobj();
 $encoded_popup_request_data = $json->encode($popup_request_data);
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
 $button .= "<input type='hidden' name='return_id' value='".$focus->id."'>\n";
 $button .= "<input type='hidden' name='action'>\n";
 $button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
-	."' accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
-	."' type='button' class='button' value='  "
-	.$app_strings['LBL_SELECT_BUTTON_LABEL']
-	."  ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
+    ."' accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
+    ."' type='button' class='button' value='  "
+    .$app_strings['LBL_SELECT_BUTTON_LABEL']
+    ."  ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
 $button .= "</form>\n";
 $header_text = '';
 if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){	
-		$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
+        $header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
 }
 $ListView = new ListView();
 $ListView->initNewXTemplate('modules/Opportunities/SubPanelViewProjects.html',$current_module_strings);

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
 	."  ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
 $button .= "</form>\n";
 $header_text = '';
-if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){	
-		$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
+if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])) {	
+		$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=".$_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDITLAYOUT'])."</a>";
 }
 $ListView = new ListView();
-$ListView->initNewXTemplate('modules/Opportunities/SubPanelViewProjects.html',$current_module_strings);
+$ListView->initNewXTemplate('modules/Opportunities/SubPanelViewProjects.html', $current_module_strings);
 $ListView->xTemplateAssign("RETURN_URL", "&return_module=".$currentModule."&return_action=DetailView&return_id={$_REQUEST['record']}");
-$ListView->xTemplateAssign("REMOVE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_REMOVE']));
-$ListView->setHeaderTitle($project_module_strings['LBL_OPPORTUNITY_SUBPANEL_TITLE']. $header_text );
+$ListView->xTemplateAssign("REMOVE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LNK_REMOVE']));
+$ListView->setHeaderTitle($project_module_strings['LBL_OPPORTUNITY_SUBPANEL_TITLE'].$header_text);
 $ListView->setHeaderText($button);
 $ListView->processListView($focus_list, "main", "OPPORTUNITY");
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

modules/Opportunities/SaveOverload.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -40,11 +40,11 @@
 block discarded – undo
 
 
 function perform_save(&$focus){
-	//US DOLLAR
-	if(isset($focus->amount) && !number_empty($focus->amount)){
-		$currency = new Currency();
-		$currency->retrieve($focus->currency_id);
-		$focus->amount_usdollar = $currency->convertToDollar(unformat_number($focus->amount));
-	}	
+    //US DOLLAR
+    if(isset($focus->amount) && !number_empty($focus->amount)){
+        $currency = new Currency();
+        $currency->retrieve($focus->currency_id);
+        $focus->amount_usdollar = $currency->convertToDollar(unformat_number($focus->amount));
+    }	
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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,9 +39,9 @@  discard block
 block discarded – undo
  ********************************************************************************/
 
 
-function perform_save(&$focus){
+function perform_save(&$focus) {
 	//US DOLLAR
-	if(isset($focus->amount) && !number_empty($focus->amount)){
+	if (isset($focus->amount) && !number_empty($focus->amount)) {
 		$currency = new Currency();
 		$currency->retrieve($focus->currency_id);
 		$focus->amount_usdollar = $currency->convertToDollar(unformat_number($focus->amount));

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

modules/Opportunities/OpportunitiesQuickCreate.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?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.
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
         $this->ss->assign("LEAD_SOURCE_OPTIONS", get_select_options_with_id($app_list_strings['lead_source_dom'], ''));
         $this->ss->assign('prob_array', $json->encode($app_list_strings['sales_probability_dom']));        
         
-        if($this->viaAJAX) { // override for ajax call
+        if ($this->viaAJAX) { // override for ajax call
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"opportunitiesQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"opportunities\"); else return false;'");
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_opportunities\")';");
         }

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?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.

Please login to merge, or discard this patch.

		@@ -42,31 +42,31 @@
		block discarded – undo
42	42	return additionalDetailsaCase($fields);
43	43	}
44	44	function additionalDetailsaCase($fields) {
45		- static $mod_strings;
46		- if(empty($mod_strings)) {
47		- global $current_language;
48		- $mod_strings = return_module_language($current_language, 'Cases');
49		- }
	45	+ static $mod_strings;
	46	+ if(empty($mod_strings)) {
	47	+ global $current_language;
	48	+ $mod_strings = return_module_language($current_language, 'Cases');
	49	+ }
50	50
51		- $overlib_string = '';
	51	+ $overlib_string = '';
52	52
53		- if(!empty($fields['DESCRIPTION'])) {
54		- $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55		- if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
56		- $overlib_string .= '<br>';
57		- }
58		- if(!empty($fields['RESOLUTION'])) {
59		- $overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
60		- if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
61		- }
	53	+ if(!empty($fields['DESCRIPTION'])) {
	54	+ $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
	55	+ if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
	56	+ $overlib_string .= '<br>';
	57	+ }
	58	+ if(!empty($fields['RESOLUTION'])) {
	59	+ $overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
	60	+ if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
	61	+ }
62	62
63		- return array('fieldToAddTo' => 'NAME',
64		- 'string' => $overlib_string,
65		- 'width' => '400',
66		- 'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}",
67		- 'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
	63	+ return array('fieldToAddTo' => 'NAME',
	64	+ 'string' => $overlib_string,
	65	+ 'width' => '400',
	66	+ 'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}",
	67	+ 'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
68	68	}
69	69
70		- ?>
	70	+ ?>
71	71
72	72
73	73	\ No newline at end of file

		@@ -1,5 +1,5 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if (!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
3	3	/*********************************************************************************
4	4	* SugarCRM Community Edition is a customer relationship management program developed by
5	5	* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
		@@ -43,21 +43,21 @@ discard block
		block discarded – undo
43	43	}
44	44	function additionalDetailsaCase($fields) {
45	45	static $mod_strings;
46		- if(empty($mod_strings)) {
	46	+ if (empty($mod_strings)) {
47	47	global $current_language;
48	48	$mod_strings = return_module_language($current_language, 'Cases');
49	49	}
50	50
51	51	$overlib_string = '';
52	52
53		- if(!empty($fields['DESCRIPTION'])) {
54		- $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55		- if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
	53	+ if (!empty($fields['DESCRIPTION'])) {
	54	+ $overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
	55	+ if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
56	56	$overlib_string .= '<br>';
57	57	}
58		- if(!empty($fields['RESOLUTION'])) {
59		- $overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
60		- if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
	58	+ if (!empty($fields['RESOLUTION'])) {
	59	+ $overlib_string .= '<b>'.$mod_strings['LBL_RESOLUTION'].'</b> '.substr($fields['RESOLUTION'], 0, 300);
	60	+ if (strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
61	61	}
62	62
63	63	return array('fieldToAddTo' => 'NAME',

		@@ -1,5 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2		-if(!defined('sugarEntry') \|\| !sugarEntry) die('Not A Valid Entry Point');
	2	+if(!defined('sugarEntry') \|\| !sugarEntry) {
	3	+ die('Not A Valid Entry Point');
	4	+}
3	5	/*********************************************************************************
4	6	* SugarCRM Community Edition is a customer relationship management program developed by
5	7	* SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
		@@ -52,12 +54,16 @@ discard block
		block discarded – undo
52	54
53	55	if(!empty($fields['DESCRIPTION'])) {
54	56	$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55		- if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
	57	+ if(strlen($fields['DESCRIPTION']) > 300) {
	58	+ $overlib_string .= '...';
	59	+ }
56	60	$overlib_string .= '<br>';
57	61	}
58	62	if(!empty($fields['RESOLUTION'])) {
59	63	$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
60		- if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
	64	+ if(strlen($fields['RESOLUTION']) > 300) {
	65	+ $overlib_string .= '...';
	66	+ }
61	67	}
62	68
63	69	return array('fieldToAddTo' => 'NAME',

		@@ -39,129 +39,129 @@
		block discarded – undo
39	39
40	40	$viewdefs ['Cases'] =
41	41	array (
42		- 'DetailView' =>
43		- array (
	42	+ 'DetailView' =>
	43	+ array (
44	44	'templateMeta' =>
45	45	array (
46		- 'form' =>
47		- array (
	46	+ 'form' =>
	47	+ array (
48	48	'buttons' =>
49	49	array (
50		- 0 => 'EDIT',
51		- 1 => 'DUPLICATE',
52		- 2 => 'DELETE',
53		- 3 => 'FIND_DUPLICATES',
	50	+ 0 => 'EDIT',
	51	+ 1 => 'DUPLICATE',
	52	+ 2 => 'DELETE',
	53	+ 3 => 'FIND_DUPLICATES',
54	54	),
55		- ),
56		- 'maxColumns' => '2',
57		- 'widths' =>
58		- array (
	55	+ ),
	56	+ 'maxColumns' => '2',
	57	+ 'widths' =>
	58	+ array (
59	59	0 =>
60	60	array (
61		- 'label' => '10',
62		- 'field' => '30',
	61	+ 'label' => '10',
	62	+ 'field' => '30',
63	63	),
64	64	1 =>
65	65	array (
66		- 'label' => '10',
67		- 'field' => '30',
	66	+ 'label' => '10',
	67	+ 'field' => '30',
68	68	),
69		- ),
70		- 'useTabs' => true,
71		- 'tabDefs' =>
72		- array (
	69	+ ),
	70	+ 'useTabs' => true,
	71	+ 'tabDefs' =>
	72	+ array (
73	73	'LBL_CASE_INFORMATION' =>
74	74	array (
75		- 'newTab' => true,
76		- 'panelDefault' => 'expanded',
	75	+ 'newTab' => true,
	76	+ 'panelDefault' => 'expanded',
77	77	),
78	78	'LBL_AOP_CASE_UPDATES' =>
79	79	array (
80		- 'newTab' => false,
81		- 'panelDefault' => 'expanded',
	80	+ 'newTab' => false,
	81	+ 'panelDefault' => 'expanded',
	82	+ ),
82	83	),
83		- ),
84	84	),
85	85	'panels' =>
86	86	array (
87		- 'lbl_case_information' =>
88		- array (
	87	+ 'lbl_case_information' =>
	88	+ array (
89	89	0 =>
90	90	array (
91		- 0 =>
92		- array (
	91	+ 0 =>
	92	+ array (
93	93	'name' => 'case_number',
94	94	'label' => 'LBL_CASE_NUMBER',
95		- ),
96		- 1 => 'priority',
	95	+ ),
	96	+ 1 => 'priority',
97	97	),
98	98	1 =>
99	99	array (
100		- 0 =>
101		- array (
	100	+ 0 =>
	101	+ array (
102	102	'name' => 'state',
103	103	'comment' => 'The state of the case (i.e. open/closed)',
104	104	'label' => 'LBL_STATE',
105		- ),
106		- 1 => 'status',
	105	+ ),
	106	+ 1 => 'status',
107	107	),
108	108	2 =>
109	109	array (
110		- 0 => 'type',
111		- 1 => 'account_name',
	110	+ 0 => 'type',
	111	+ 1 => 'account_name',
112	112	),
113	113	3 =>
114	114	array (
115		- 0 =>
116		- array (
	115	+ 0 =>
	116	+ array (
117	117	'name' => 'name',
118	118	'label' => 'LBL_SUBJECT',
119		- ),
	119	+ ),
120	120	),
121	121	4 =>
122	122	array (
123		- 0 => 'description',
	123	+ 0 => 'description',
124	124	),
125	125	5 =>
126	126	array (
127		- 0 => 'resolution',
	127	+ 0 => 'resolution',
128	128	),
129	129	6 =>
130	130	array (
131		- 0 =>
132		- array (
	131	+ 0 =>
	132	+ array (
133	133	'name' => 'assigned_user_name',
134	134	'label' => 'LBL_ASSIGNED_TO',
135		- ),
	135	+ ),
136	136	),
137	137	7 =>
138	138	array (
139		- 0 =>
140		- array (
	139	+ 0 =>
	140	+ array (
141	141	'name' => 'date_entered',
142	142	'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
143		- ),
144		- 1 =>
145		- array (
	143	+ ),
	144	+ 1 =>
	145	+ array (
146	146	'name' => 'date_modified',
147	147	'label' => 'LBL_DATE_MODIFIED',
148	148	'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
149		- ),
	149	+ ),
	150	+ ),
150	151	),
151		- ),
152		- 'LBL_AOP_CASE_UPDATES' =>
153		- array (
	152	+ 'LBL_AOP_CASE_UPDATES' =>
	153	+ array (
154	154	0 =>
155	155	array (
156		- 0 =>
157		- array (
	156	+ 0 =>
	157	+ array (
158	158	'name' => 'aop_case_updates_threaded',
159	159	'studio' => 'visible',
160	160	'label' => 'LBL_AOP_CASE_UPDATES_THREADED',
161		- ),
	161	+ ),
	162	+ ),
162	163	),
163		- ),
164	164	),
165		- ),
	165	+ ),
166	166	);
167	167	?>

		@@ -38,15 +38,15 @@ discard block
		block discarded – undo
38	38	********************************************************************************/
39	39
40	40	$viewdefs ['Cases'] =
41		-array (
	41	+array(
42	42	'DetailView' =>
43		- array (
	43	+ array(
44	44	'templateMeta' =>
45		- array (
	45	+ array(
46	46	'form' =>
47		- array (
	47	+ array(
48	48	'buttons' =>
49		- array (
	49	+ array(
50	50	0 => 'EDIT',
51	51	1 => 'DUPLICATE',
52	52	2 => 'DELETE',
		@@ -55,50 +55,50 @@ discard block
		block discarded – undo
55	55	),
56	56	'maxColumns' => '2',
57	57	'widths' =>
58		- array (
	58	+ array(
59	59	0 =>
60		- array (
	60	+ array(
61	61	'label' => '10',
62	62	'field' => '30',
63	63	),
64	64	1 =>
65		- array (
	65	+ array(
66	66	'label' => '10',
67	67	'field' => '30',
68	68	),
69	69	),
70	70	'useTabs' => true,
71	71	'tabDefs' =>
72		- array (
	72	+ array(
73	73	'LBL_CASE_INFORMATION' =>
74		- array (
	74	+ array(
75	75	'newTab' => true,
76	76	'panelDefault' => 'expanded',
77	77	),
78	78	'LBL_AOP_CASE_UPDATES' =>
79		- array (
	79	+ array(
80	80	'newTab' => false,
81	81	'panelDefault' => 'expanded',
82	82	),
83	83	),
84	84	),
85	85	'panels' =>
86		- array (
	86	+ array(
87	87	'lbl_case_information' =>
88		- array (
	88	+ array(
89	89	0 =>
90		- array (
	90	+ array(
91	91	0 =>
92		- array (
	92	+ array(
93	93	'name' => 'case_number',
94	94	'label' => 'LBL_CASE_NUMBER',
95	95	),
96	96	1 => 'priority',
97	97	),
98	98	1 =>
99		- array (
	99	+ array(
100	100	0 =>
101		- array (
	101	+ array(
102	102	'name' => 'state',
103	103	'comment' => 'The state of the case (i.e. open/closed)',
104	104	'label' => 'LBL_STATE',
		@@ -106,43 +106,43 @@ discard block
		block discarded – undo
106	106	1 => 'status',
107	107	),
108	108	2 =>
109		- array (
	109	+ array(
110	110	0 => 'type',
111	111	1 => 'account_name',
112	112	),
113	113	3 =>
114		- array (
	114	+ array(
115	115	0 =>
116		- array (
	116	+ array(
117	117	'name' => 'name',
118	118	'label' => 'LBL_SUBJECT',
119	119	),
120	120	),
121	121	4 =>
122		- array (
	122	+ array(
123	123	0 => 'description',
124	124	),
125	125	5 =>
126		- array (
	126	+ array(
127	127	0 => 'resolution',
128	128	),
129	129	6 =>
130		- array (
	130	+ array(
131	131	0 =>
132		- array (
	132	+ array(
133	133	'name' => 'assigned_user_name',
134	134	'label' => 'LBL_ASSIGNED_TO',
135	135	),
136	136	),
137	137	7 =>
138		- array (
	138	+ array(
139	139	0 =>
140		- array (
	140	+ array(
141	141	'name' => 'date_entered',
142	142	'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
143	143	),
144	144	1 =>
145		- array (
	145	+ array(
146	146	'name' => 'date_modified',
147	147	'label' => 'LBL_DATE_MODIFIED',
148	148	'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
		@@ -150,11 +150,11 @@ discard block
		block discarded – undo
150	150	),
151	151	),
152	152	'LBL_AOP_CASE_UPDATES' =>
153		- array (
	153	+ array(
154	154	0 =>
155		- array (
	155	+ array(
156	156	0 =>
157		- array (
	157	+ array(
158	158	'name' => 'aop_case_updates_threaded',
159	159	'studio' => 'visible',
160	160	'label' => 'LBL_AOP_CASE_UPDATES_THREADED',

		@@ -45,32 +45,32 @@
		block discarded – undo
45	45	array('label' => '10', 'field' => '30'),
46	46	array('label' => '10', 'field' => '30')
47	47	),
48		- ),
	48	+ ),
49	49	'panels' =>
50	50
51	51	array (
52	52
53		- array (
	53	+ array (
54	54	array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
55	55	'priority'
56		- ),
	56	+ ),
57	57
58		- array (
	58	+ array (
59	59	'status',
60	60	array('name'=>'account_name'),
61		- ),
	61	+ ),
62	62
63		- array (
	63	+ array (
64	64	'assigned_user_name',
65		- ),
	65	+ ),
66	66
67		- array (
68	67	array (
69		- 'name' => 'description',
70		- 'displayParams' => array ('rows' => '4','cols' => '60'),
71		- 'nl2br' => true,
	68	+ array (
	69	+ 'name' => 'description',
	70	+ 'displayParams' => array ('rows' => '4','cols' => '60'),
	71	+ 'nl2br' => true,
	72	+ ),
72	73	),
73		- ),
74	74
75	75	),
76	76

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

		@@ -43,41 +43,41 @@
		block discarded – undo
43	43
44	44
45	45	$listViewDefs['Cases'] = array(
46		- 'CASE_NUMBER' => array(
47		- 'width' => '5',
48		- 'label' => 'LBL_LIST_NUMBER',
	46	+ 'CASE_NUMBER' => array(
	47	+ 'width' => '5',
	48	+ 'label' => 'LBL_LIST_NUMBER',
49	49	'default' => true),
50		- 'NAME' => array(
51		- 'width' => '25',
52		- 'label' => 'LBL_LIST_SUBJECT',
53		- 'link' => true,
	50	+ 'NAME' => array(
	51	+ 'width' => '25',
	52	+ 'label' => 'LBL_LIST_SUBJECT',
	53	+ 'link' => true,
54	54	'default' => true),
55		- 'ACCOUNT_NAME' => array(
56		- 'width' => '20',
57		- 'label' => 'LBL_LIST_ACCOUNT_NAME',
58		- 'module' => 'Accounts',
59		- 'id' => 'ACCOUNT_ID',
60		- 'link' => true,
	55	+ 'ACCOUNT_NAME' => array(
	56	+ 'width' => '20',
	57	+ 'label' => 'LBL_LIST_ACCOUNT_NAME',
	58	+ 'module' => 'Accounts',
	59	+ 'id' => 'ACCOUNT_ID',
	60	+ 'link' => true,
61	61	'default' => true,
62	62	'ACLTag' => 'ACCOUNT',
63	63	'related_fields' => array('account_id')),
64		- 'PRIORITY' => array(
65		- 'width' => '10',
66		- 'label' => 'LBL_LIST_PRIORITY',
	64	+ 'PRIORITY' => array(
	65	+ 'width' => '10',
	66	+ 'label' => 'LBL_LIST_PRIORITY',
67	67	'default' => true),
68		- 'STATUS' => array(
69		- 'width' => '10',
70		- 'label' => 'LBL_LIST_STATUS',
	68	+ 'STATUS' => array(
	69	+ 'width' => '10',
	70	+ 'label' => 'LBL_LIST_STATUS',
71	71	'default' => true),
72		- 'ASSIGNED_USER_NAME' => array(
73		- 'width' => '10',
74		- 'label' => 'LBL_ASSIGNED_TO_NAME',
75		- 'module' => 'Employees',
	72	+ 'ASSIGNED_USER_NAME' => array(
	73	+ 'width' => '10',
	74	+ 'label' => 'LBL_ASSIGNED_TO_NAME',
	75	+ 'module' => 'Employees',
76	76	'id' => 'ASSIGNED_USER_ID',
77	77	'default' => true),
78		- 'DATE_ENTERED' => array (
79		- 'width' => '10',
80		- 'label' => 'LBL_DATE_ENTERED',
81		- 'default' => true),
	78	+ 'DATE_ENTERED' => array (
	79	+ 'width' => '10',
	80	+ 'label' => 'LBL_DATE_ENTERED',
	81	+ 'default' => true),
82	82	);
83	83	?>

		@@ -46,27 +46,27 @@
		block discarded – undo
46	46	* Contributor(s): ______________________________________..
47	47	********************************************************************************/
48	48	$fields_array['Opportunity'] = array ('column_fields' => Array("id"
49		- , "name"
50		- , "opportunity_type"
51		- , "lead_source"
52		- , "amount"
53		- , "currency_id"
54		- , "amount_usdollar"
55		- , "date_entered"
56		- , "date_modified"
57		- , "modified_user_id"
58		- , "assigned_user_id"
59		- , "created_by"
60		- , "date_closed"
61		- , "next_step"
62		- , "sales_stage"
63		- , "probability"
64		- , "description"
65		- ,"campaign_id"
66		- ),
	49	+ , "name"
	50	+ , "opportunity_type"
	51	+ , "lead_source"
	52	+ , "amount"
	53	+ , "currency_id"
	54	+ , "amount_usdollar"
	55	+ , "date_entered"
	56	+ , "date_modified"
	57	+ , "modified_user_id"
	58	+ , "assigned_user_id"
	59	+ , "created_by"
	60	+ , "date_closed"
	61	+ , "next_step"
	62	+ , "sales_stage"
	63	+ , "probability"
	64	+ , "description"
	65	+ ,"campaign_id"
	66	+ ),
67	67	'list_fields' => Array('id', 'name', 'account_id', 'sales_stage', 'account_name', 'date_closed', 'amount', 'assigned_user_name', 'assigned_user_id','sales_stage','probability','lead_source','opportunity_type'
68		- , "amount_usdollar"
69		- ),
	68	+ , "amount_usdollar"
	69	+ ),
70	70	'required_fields' => Array('name'=>1, 'date_closed'=>2, 'amount'=>3, 'sales_stage'=>4, 'account_name'=>5),
71	71	);
72	72	?>
73	73	\ No newline at end of file

		@@ -319,7 +319,7 @@
		block discarded – undo
319	319	array(
320	320	'name' => 'emails',
321	321	'type' => 'link',
322		- 'relationship' => 'emails_opportunities_rel',/* reldef in emails */
	322	+ 'relationship' => 'emails_opportunities_rel', /* reldef in emails */
323	323	'source' => 'non-db',
324	324	'vname' => 'LBL_EMAILS',
325	325	),

		@@ -71,12 +71,12 @@ discard block
		block discarded – undo
71	71	/// SETUP PARENT POPUP
72	72
73	73	$popup_request_data = array(
74		- 'call_back_function' => 'set_return_and_save',
75		- 'form_name' => 'DetailView',
76		- 'field_to_name_array' => array(
77		- 'id' => 'opportunity_id',
78		- ),
79		- );
	74	+ 'call_back_function' => 'set_return_and_save',
	75	+ 'form_name' => 'DetailView',
	76	+ 'field_to_name_array' => array(
	77	+ 'id' => 'opportunity_id',
	78	+ ),
	79	+ );
80	80
81	81	$json = getJSONobj();
82	82	$encoded_popup_request_data = $json->encode($popup_request_data);
		@@ -94,14 +94,14 @@ discard block
		block discarded – undo
94	94	$button .= "<input type='hidden' name='return_id' value='".$focus->id."'>\n";
95	95	$button .= "<input type='hidden' name='action'>\n";
96	96	$button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
97		- ."' accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
98		- ."' type='button' class='button' value=' "
99		- .$app_strings['LBL_SELECT_BUTTON_LABEL']
100		- ." ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
	97	+ ."' accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
	98	+ ."' type='button' class='button' value=' "
	99	+ .$app_strings['LBL_SELECT_BUTTON_LABEL']
	100	+ ." ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
101	101	$button .= "</form>\n";
102	102	$header_text = '';
103	103	if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){
104		- $header_text = " <a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
	104	+ $header_text = " <a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
105	105	}
106	106	$ListView = new ListView();
107	107	$ListView->initNewXTemplate('modules/Opportunities/SubPanelViewProjects.html',$current_module_strings);

		@@ -40,11 +40,11 @@
		block discarded – undo
40	40
41	41
42	42	function perform_save(&$focus){
43		- //US DOLLAR
44		- if(isset($focus->amount) && !number_empty($focus->amount)){
45		- $currency = new Currency();
46		- $currency->retrieve($focus->currency_id);
47		- $focus->amount_usdollar = $currency->convertToDollar(unformat_number($focus->amount));
48		- }
	43	+ //US DOLLAR
	44	+ if(isset($focus->amount) && !number_empty($focus->amount)){
	45	+ $currency = new Currency();
	46	+ $currency->retrieve($focus->currency_id);
	47	+ $focus->amount_usdollar = $currency->convertToDollar(unformat_number($focus->amount));
	48	+ }
49	49	}
50	50	?>
51	51	\ No newline at end of file

adamjakab / SuiteCRM

Push — master ( 24ce66...da2f36 )

Status

Category

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch