adamjakab / SuiteCRM

modules/AOS_Products/metadata/sidecreateviewdefs.php

Spacing +7 added lines, -7 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');
 /**
  * Products, Quotations & Invoices modules.
  * Extensions to SugarCRM
@@ -40,16 +40,16 @@ 
                                             array('label' => '10', 'field' => '30'),
                                          ),
                         ),
- 'panels' =>array (
+ 'panels' =>array(
   'DEFAULT' =>
-  array (
+  array(
     array(
-      array('name'=>'name', 'displayParams'=>array('required'=>true,'size'=>20)),
+      array('name'=>'name', 'displayParams'=>array('required'=>true, 'size'=>20)),
     ),
-    array (
-      array('name'=>'description','displayParams'=>array('rows'=>3, 'cols'=>20)),
+    array(
+      array('name'=>'description', 'displayParams'=>array('rows'=>3, 'cols'=>20)),
     ),
-    array (
+    array(
       array('name'=>'assigned_user_name', 'displayParams'=>array('required'=>true, 'size'=>11, 'selectOnly'=>true)),
     ),
   ),

Indentation +16 added lines, -16 removed lines

@@ -29,32 +29,32 @@
 $module_name = 'AOS_Products';
 $viewdefs[$module_name]['SideQuickCreate'] = array(
     'templateMeta' => array('form'=>array('buttons'=>array('SAVE'),
-    								      'button_location'=>'bottom',
-                                          'headerTpl'=>'include/EditView/header.tpl',
-                                          'footerTpl'=>'include/EditView/footer.tpl',
-                                          ),
-							'maxColumns' => '1',
-							'panelClass'=>'none',
-							'labelsOnTop'=>true,
+                                            'button_location'=>'bottom',
+                                            'headerTpl'=>'include/EditView/header.tpl',
+                                            'footerTpl'=>'include/EditView/footer.tpl',
+                                            ),
+                            'maxColumns' => '1',
+                            'panelClass'=>'none',
+                            'labelsOnTop'=>true,
                             'widths' => array(
                                             array('label' => '10', 'field' => '30'),
-                                         ),
+                                            ),
                         ),
- 'panels' =>array (
-  'DEFAULT' =>
-  array (
+    'panels' =>array (
+    'DEFAULT' =>
+    array (
     array(
-      array('name'=>'name', 'displayParams'=>array('required'=>true,'size'=>20)),
+        array('name'=>'name', 'displayParams'=>array('required'=>true,'size'=>20)),
     ),
     array (
-      array('name'=>'description','displayParams'=>array('rows'=>3, 'cols'=>20)),
+        array('name'=>'description','displayParams'=>array('rows'=>3, 'cols'=>20)),
     ),
     array (
-      array('name'=>'assigned_user_name', 'displayParams'=>array('required'=>true, 'size'=>11, 'selectOnly'=>true)),
+        array('name'=>'assigned_user_name', 'displayParams'=>array('required'=>true, 'size'=>11, 'selectOnly'=>true)),
+    ),
     ),
-  ),
 
- )
+    )
 
 
 );

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.

modules/TableDictionary.php

Indentation +1 added lines, -1 removed lines

@@ -125,6 +125,6 @@
 include('metadata/securitygroups_usersMetaData.php');
 
 if(file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')){
-	include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
+    include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
 }
 ?>

Spacing +2 added lines, -2 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.
@@ -124,7 +124,7 @@ 
 include('metadata/securitygroups_recordsMetaData.php');
 include('metadata/securitygroups_usersMetaData.php');
 
-if(file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')){
+if (file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')) {
 	include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
 }
 ?>

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.

modules/AOS_Products_Quotes/Line_Items.php

Braces +9 added lines, -8 removed lines

@@ -84,8 +84,7 @@ 
             $html .= '<script>insertGroup();</script>';
         }
 
-    }
-    else if($view == 'DetailView'){
+    } else if($view == 'DetailView'){
         $params = array('currency_id' => $focus->currency_id);
 
         $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
@@ -111,7 +110,9 @@ 
 
             if($enable_groups && ($group_id != $row['group_id'] || $i == 0)){
                 $html .= $groupStart.$product.$service.$groupEnd;
-                if($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                if($i != 0) {
+                    $html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                }
                 $groupStart = '';
                 $groupEnd = '';
                 $product = '';
@@ -229,15 +230,13 @@ 
         if($type == 'Amount')
         {
             return currency_format_number($amount,$params )."</td>";
-        }
-        else if($locale->getPrecision())
+        } else if($locale->getPrecision())
         {
             return rtrim(rtrim(format_number($amount), '0'),$sep[1])."%";
         } else{
             return format_number($amount)."%";
         }
-    }
-    else
+    } else
     {
         return "-";
     }
@@ -248,7 +247,9 @@ 
     if($view == 'EditView'){
         global $app_list_strings;
 
-        if($value != '') $value = format_number($value);
+        if($value != '') {
+            $value = format_number($value);
+        }
 
         $html = "<input id='shipping_tax_amt' type='text' tabindex='0' title='' value='".$value."' maxlength='26,6' size='22' name='shipping_tax_amt' onblur='calculateTotal(\"lineItems\");'>";
         $html .= "<select name='shipping_tax' id='shipping_tax' onchange='calculateTotal(\"lineItems\");' >".get_select_options_with_id($app_list_strings['vat_list'], (isset($focus->shipping_tax) ? $focus->shipping_tax : ''))."</select>";

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
  * @author SalesAgility <info@salesagility.com>
  */
 
-function display_lines($focus, $field, $value, $view){
+function display_lines($focus, $field, $value, $view) {
 
     global $sugar_config, $locale, $app_list_strings, $mod_strings;
 
@@ -31,10 +31,10 @@ 
 
     $html = '';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOS_Products_Quotes/line_items.js"></script>';
-        if(file_exists('custom/modules/AOS_Products_Quotes/line_items.js')){
+        if (file_exists('custom/modules/AOS_Products_Quotes/line_items.js')) {
             $html .= '<script src="custom/modules/AOS_Products_Quotes/line_items.js"></script>';
         }
         $html .= '<script language="javascript">var sig_digits = '.$locale->getPrecision().';';
@@ -45,18 +45,18 @@ 
 
         $html .= "<table border='0' cellspacing='4' width='37.5%' id='lineItems'></table>";
 
-        if($enable_groups){
+        if ($enable_groups) {
             $html .= "<div style='padding-top: 10px; padding-bottom:10px;'>";
             $html .= "<input type=\"button\" tabindex=\"116\" class=\"button\" value=\"".$mod_strings['LBL_ADD_GROUP']."\" id=\"addGroup\" onclick=\"insertGroup(0)\" />";
             $html .= "</div>";
         }
         $html .= '<input type="hidden" name="vathidden" id="vathidden" value="'.get_select_options_with_id($app_list_strings['vat_list'], '').'">
 				  <input type="hidden" name="discounthidden" id="discounthidden" value="'.get_select_options_with_id($app_list_strings['discount_list'], '').'">';
-        if($focus->id != '') {
+        if ($focus->id != '') {
             require_once('modules/AOS_Products_Quotes/AOS_Products_Quotes.php');
             require_once('modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups.php');
 
-            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '" . $focus->object_name . "' AND pg.parent_id = '" . $focus->id . "' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
+            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
 
             $result = $focus->db->query($sql);
             $html .= "<script>
@@ -75,17 +75,17 @@ 
                     $group_item = json_encode($group_item->toArray());
                 }
                 $html .= "<script>
-                        insertLineItems(" . $line_item . "," . $group_item . ");
+                        insertLineItems(" . $line_item.",".$group_item.");
                     </script>";
 
             }
         }
-        if(!$enable_groups){
+        if (!$enable_groups) {
             $html .= '<script>insertGroup();</script>';
         }
 
     }
-    else if($view == 'DetailView'){
+    else if ($view == 'DetailView') {
         $params = array('currency_id' => $focus->currency_id);
 
         $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
@@ -109,9 +109,9 @@ 
             $line_item->retrieve($row['id']);
 
 
-            if($enable_groups && ($group_id != $row['group_id'] || $i == 0)){
+            if ($enable_groups && ($group_id != $row['group_id'] || $i == 0)) {
                 $html .= $groupStart.$product.$service.$groupEnd;
-                if($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                if ($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
                 $groupStart = '';
                 $groupEnd = '';
                 $product = '';
@@ -152,8 +152,8 @@ 
                 $groupEnd .= "<td class='tabDetailViewDL' style='text-align: right;padding:2px;'>".currency_format_number($group_item->total_amount, $params)."</td>";
                 $groupEnd .= "</tr>";
             }
-            if($line_item->product_id != '0' && $line_item->product_id != null){
-                if($productCount == 0)
+            if ($line_item->product_id != '0' && $line_item->product_id != null) {
+                if ($productCount == 0)
                 {
                     $product .= "<tr>";
                     $product .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -169,26 +169,26 @@ 
                 }
 
                 $product .= "<tr>";
-                $product_note = wordwrap($line_item->description,40,"<br />\n");
+                $product_note = wordwrap($line_item->description, 40, "<br />\n");
                 $product .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$productCount."</td>";
-                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty),$sep[1])."</td>";
+                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty), $sep[1])."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='padding:2px;'><a href='index.php?module=AOS_Products&action=DetailView&record=".$line_item->product_id."' class='tabDetailViewDFLink'>".$line_item->name."</a><br />".$product_note."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params )."</td>";
-                if($locale->getPrecision()){
-                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'),$sep[1])."%</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
+                if ($locale->getPrecision()) {
+                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
                 } else {
                     $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".format_number($line_item->vat)."%</td>";
                 }
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $product .= "</tr>";
             } else {
-                if($serviceCount == 0)
+                if ($serviceCount == 0)
                 {
                     $service .= "<tr>";
                     $service .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -205,15 +205,15 @@ 
                 $service .= "<tr>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$serviceCount."</td>";
                 $service .= "<td class='tabDetailViewDF' style='padding:2px;' colspan='2'>".$line_item->name."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
 
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $service .= "</tr>";
 
             }
@@ -230,22 +230,22 @@ 
 //field was 0.
 //The approach below will strip off the fractional part if it is only zeroes (and in this case the decimal separator
 //will also be stripped off) The custom decimal separator is passed in to the function from the locale settings
-function stripDecimalPointsAndTrailingZeroes($inputString,$decimalSeparator)
+function stripDecimalPointsAndTrailingZeroes($inputString, $decimalSeparator)
 {
-    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/','',$inputString);
+    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/', '', $inputString);
 }
 
-function get_discount_string($type, $amount, $params, $locale, $sep){
-    if($amount != '' && $amount != '0.00')
+function get_discount_string($type, $amount, $params, $locale, $sep) {
+    if ($amount != '' && $amount != '0.00')
     {
-        if($type == 'Amount')
+        if ($type == 'Amount')
         {
-            return currency_format_number($amount,$params )."</td>";
+            return currency_format_number($amount, $params)."</td>";
         }
-        else if($locale->getPrecision())
+        else if ($locale->getPrecision())
         {
-            return rtrim(rtrim(format_number($amount), '0'),$sep[1])."%";
-        } else{
+            return rtrim(rtrim(format_number($amount), '0'), $sep[1])."%";
+        } else {
             return format_number($amount)."%";
         }
     }
@@ -255,12 +255,12 @@ 
     }
 }
 
-function display_shipping_vat($focus, $field, $value, $view){
+function display_shipping_vat($focus, $field, $value, $view) {
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         global $app_list_strings;
 
-        if($value != '') $value = format_number($value);
+        if ($value != '') $value = format_number($value);
 
         $html = "<input id='shipping_tax_amt' type='text' tabindex='0' title='' value='".$value."' maxlength='26,6' size='22' name='shipping_tax_amt' onblur='calculateTotal(\"lineItems\");'>";
         $html .= "<select name='shipping_tax' id='shipping_tax' onchange='calculateTotal(\"lineItems\");' >".get_select_options_with_id($app_list_strings['vat_list'], (isset($focus->shipping_tax) ? $focus->shipping_tax : ''))."</select>";

modules/AOS_Products_Quotes/vardefs.php

Indentation +98 added lines, -98 removed lines

@@ -23,43 +23,43 @@ 
  */
 
 $dictionary['AOS_Products_Quotes'] = array(
-	'table'=>'aos_products_quotes',
-	'audited'=>true,
-	'fields'=>array (
-  'name' => 
+    'table'=>'aos_products_quotes',
+    'audited'=>true,
+    'fields'=>array (
+    'name' => 
     array (
-      'name' => 'name',
-      'vname' => 'LBL_NAME',
-      'type' => 'text',
-      'link' => true,
-      'unified_search' => true,
-      'required' => true,
-      'importable' => 'required',
+        'name' => 'name',
+        'vname' => 'LBL_NAME',
+        'type' => 'text',
+        'link' => true,
+        'unified_search' => true,
+        'required' => true,
+        'importable' => 'required',
     ),
     'currency_id' =>
-     array (
-      'required' => false,
-      'name' => 'currency_id',
-      'vname' => 'LBL_CURRENCY',
-      'type' => 'id',
-      'massupdate' => 0,
-      'comments' => '',
-      'help' => '',
-      'importable' => 'true',
-      'duplicate_merge' => 'disabled',
-      'duplicate_merge_dom_value' => 0,
-      'audited' => false,
-      'reportable' => false,
-      'len' => 36,
-      'size' => '20',
-      'studio' => 'visible',
-      'function' =>
+        array (
+        'required' => false,
+        'name' => 'currency_id',
+        'vname' => 'LBL_CURRENCY',
+        'type' => 'id',
+        'massupdate' => 0,
+        'comments' => '',
+        'help' => '',
+        'importable' => 'true',
+        'duplicate_merge' => 'disabled',
+        'duplicate_merge_dom_value' => 0,
+        'audited' => false,
+        'reportable' => false,
+        'len' => 36,
+        'size' => '20',
+        'studio' => 'visible',
+        'function' =>
         array (
             'name' => 'getCurrencyDropDown',
             'returns' => 'html',
         ),
     ),
-  'part_number' =>
+    'part_number' =>
     array (
         'required' => false,
         'name' => 'part_number',
@@ -90,8 +90,8 @@ 
             'rows' => 6,
             'cols' => 80,
         ),
-  'number' => 
-  array (
+    'number' => 
+    array (
     'required' => false,
     'name' => 'number',
     'vname' => 'LBL_LIST_NUM',
@@ -106,9 +106,9 @@ 
     'reportable' => true,
     'len' => '11',
     'disable_num_format' => '',
-  ),
-  'product_qty' => 
-  array (
+    ),
+    'product_qty' => 
+    array (
     'required' => false,
     'name' => 'product_qty',
     'vname' => 'LBL_PRODUCT_QTY',
@@ -125,9 +125,9 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'precision' => '4',
-  ),
-  'product_cost_price' => 
-  array (
+    ),
+    'product_cost_price' => 
+    array (
     'required' => false,
     'name' => 'product_cost_price',
     'vname' => 'LBL_PRODUCT_COST_PRICE',
@@ -141,7 +141,7 @@ 
     'audited' => 0,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_cost_price_usdollar' =>
             array (
                 'name' => 'product_cost_price_usdollar',
@@ -159,8 +159,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_list_price' => 
-  array (
+    'product_list_price' => 
+    array (
     'required' => false,
     'name' => 'product_list_price',
     'vname' => 'LBL_PRODUCT_LIST_PRICE',
@@ -174,7 +174,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_list_price_usdollar' =>
             array (
                 'name' => 'product_list_price_usdollar',
@@ -192,8 +192,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_discount' => 
-  array (
+    'product_discount' => 
+    array (
     'required' => false,
     'name' => 'product_discount',
     'vname' => 'LBL_PRODUCT_DISCOUNT',
@@ -207,7 +207,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_discount_usdollar' =>
             array (
                 'name' => 'product_discount_usdollar',
@@ -225,8 +225,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_discount_amount' => 
-  array (
+    'product_discount_amount' => 
+    array (
     'required' => false,
     'name' => 'product_discount_amount',
     'vname' => 'LBL_PRODUCT_DISCOUNT_AMOUNT',
@@ -240,7 +240,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_discount_amount_usdollar' =>
             array (
                 'name' => 'product_discount_amount_usdollar',
@@ -258,8 +258,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'discount' => 
-  array (
+    'discount' => 
+    array (
     'required' => false,
     'name' => 'discount',
     'vname' => 'LBL_DISCOUNT',
@@ -276,10 +276,10 @@ 
     'len' => 255,
     'options' => 'discount_list',
     'studio' => 'visible',
-  ),
+    ),
 
-  'product_unit_price' => 
-  array (
+    'product_unit_price' => 
+    array (
     'required' => '1',
     'name' => 'product_unit_price',
     'vname' => 'LBL_PRODUCT_UNIT_PRICE',
@@ -293,7 +293,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_unit_price_usdollar' =>
             array (
                 'name' => 'product_unit_price_usdollar',
@@ -311,8 +311,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'vat_amt' => 
-  array (
+    'vat_amt' => 
+    array (
     'required' => '1',
     'name' => 'vat_amt',
     'vname' => 'LBL_VAT_AMT',
@@ -326,7 +326,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'vat_amt_usdollar' =>
             array (
                 'name' => 'vat_amt_usdollar',
@@ -344,8 +344,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'product_total_price' => 
-  array (
+    'product_total_price' => 
+    array (
     'required' => '1',
     'name' => 'product_total_price',
     'vname' => 'LBL_PRODUCT_TOTAL_PRICE',
@@ -359,7 +359,7 @@ 
     'audited' => 1,
     'reportable' => true,
     'len' => '26,6',
-  ),
+    ),
         'product_total_price_usdollar' =>
             array (
                 'name' => 'product_total_price_usdollar',
@@ -377,8 +377,8 @@ 
                 ),
                 'len' => '26,6',
             ),
-  'vat' => 
-  array (
+    'vat' => 
+    array (
     'required' => false,
     'name' => 'vat',
     'vname' => 'LBL_VAT',
@@ -395,9 +395,9 @@ 
     'len' => 100,
     'options' => 'vat_list',
     'studio' => 'visible',
-  ),
-  'parent_name' => 
-  array (
+    ),
+    'parent_name' => 
+    array (
     'required' => false,
     'source' => 'non-db',
     'name' => 'parent_name',
@@ -417,9 +417,9 @@ 
     'type_name' => 'parent_type',
     'id_name' => 'parent_id',
     'parent_type' => 'record_type_display',
-  ),
-  'parent_type' => 
-  array (
+    ),
+    'parent_type' => 
+    array (
     'required' => false,
     'name' => 'parent_type',
     'vname' => 'LBL_PARENT_TYPE',
@@ -435,9 +435,9 @@ 
     'len' => 100,
     'dbType' => 'varchar',
     'studio' => 'hidden',
-  ),
-  'parent_id' => 
-  array (
+    ),
+    'parent_id' => 
+    array (
     'required' => false,
     'name' => 'parent_id',
     'vname' => 'LBL_PARENT_ID',
@@ -451,9 +451,9 @@ 
     'audited' => 0,
     'reportable' => 0,
     'len' => 36,
-  ),
-  'product_id' => 
-  array (
+    ),
+    'product_id' => 
+    array (
     'required' => false,
     'name' => 'product_id',
     'vname' => '',
@@ -467,9 +467,9 @@ 
     'audited' => 0,
     'reportable' => 0,
     'len' => 36,
-  ),
-  'group_name' =>
-  array(
+    ),
+    'group_name' =>
+    array(
     'name'=>'group_name',
     'rname'=>'name',
     'vname' => 'LBL_GROUP_NAME',
@@ -480,9 +480,9 @@ 
     'id_name' => 'group_id',
     'module'=>'AOS_Line_Item_Groups',
     'duplicate_merge'=>'disabled',
-  ),
-  'group_id' => 
-  array (
+    ),
+    'group_id' => 
+    array (
     'required' => false,
     'name' => 'group_id',
     'vname' => '',
@@ -496,37 +496,37 @@ 
     'audited' => 0,
     'reportable' => 0,
     'len' => 36,
-  ),
-   'aos_products' =>
-  array (
-  'name' => 'aos_products',
+    ),
+    'aos_products' =>
+    array (
+    'name' => 'aos_products',
     'type' => 'link',
     'relationship' => 'aos_product_quotes_aos_products',
     'module'=>'AOS_Products',
     'bean_name'=>'AOS_Products',
     'source'=>'non-db',
- ),
+    ),
 ),
 'indices' => array (
     array (
-    	'name' => 'idx_aospq_par_del',
-    	'type' => 'index',
-    	'fields' => array('parent_id','parent_type','deleted')
+        'name' => 'idx_aospq_par_del',
+        'type' => 'index',
+        'fields' => array('parent_id','parent_type','deleted')
     )
 ),
 'relationships'=>array (
-	'aos_product_quotes_aos_products' =>
-	array (
-	'lhs_module'=> 'AOS_Products', 
-	'lhs_table'=> 'aos_products', 
-	'lhs_key' => 'id',
-	'rhs_module'=> 'AOS_Products_Quotes', 
-	'rhs_table'=> 'aos_products_quotes', 
-	'rhs_key' => 'product_id',
-	'relationship_type'=>'one-to-many',
-	),
+    'aos_product_quotes_aos_products' =>
+    array (
+    'lhs_module'=> 'AOS_Products', 
+    'lhs_table'=> 'aos_products', 
+    'lhs_key' => 'id',
+    'rhs_module'=> 'AOS_Products_Quotes', 
+    'rhs_table'=> 'aos_products_quotes', 
+    'rhs_key' => 'product_id',
+    'relationship_type'=>'one-to-many',
+    ),
 ),
-	'optimistic_lock'=>true,
+    'optimistic_lock'=>true,
 );
 require_once('include/SugarObjects/VardefManager.php');
 VardefManager::createVardef('AOS_Products_Quotes','AOS_Products_Quotes', array('basic','assignable'));

Spacing +36 added lines, -36 removed lines

@@ -25,9 +25,9 @@ 
 $dictionary['AOS_Products_Quotes'] = array(
 	'table'=>'aos_products_quotes',
 	'audited'=>true,
-	'fields'=>array (
+	'fields'=>array(
   'name' => 
-    array (
+    array(
       'name' => 'name',
       'vname' => 'LBL_NAME',
       'type' => 'text',
@@ -37,7 +37,7 @@ 
       'importable' => 'required',
     ),
     'currency_id' =>
-     array (
+     array(
       'required' => false,
       'name' => 'currency_id',
       'vname' => 'LBL_CURRENCY',
@@ -54,13 +54,13 @@ 
       'size' => '20',
       'studio' => 'visible',
       'function' =>
-        array (
+        array(
             'name' => 'getCurrencyDropDown',
             'returns' => 'html',
         ),
     ),
   'part_number' =>
-    array (
+    array(
         'required' => false,
         'name' => 'part_number',
         'vname' => 'LBL_PART_NUMBER',
@@ -82,7 +82,7 @@ 
         'id' => 'AOS_Products_Quotespart_number',
     ),
     'item_description' =>
-        array (
+        array(
             'name' => 'item_description',
             'vname' => 'LBL_PRODUCT_DESCRIPTION',
             'type' => 'text',
@@ -91,7 +91,7 @@ 
             'cols' => 80,
         ),
   'number' => 
-  array (
+  array(
     'required' => false,
     'name' => 'number',
     'vname' => 'LBL_LIST_NUM',
@@ -108,7 +108,7 @@ 
     'disable_num_format' => '',
   ),
   'product_qty' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_qty',
     'vname' => 'LBL_PRODUCT_QTY',
@@ -127,7 +127,7 @@ 
     'precision' => '4',
   ),
   'product_cost_price' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_cost_price',
     'vname' => 'LBL_PRODUCT_COST_PRICE',
@@ -143,7 +143,7 @@ 
     'len' => '26,6',
   ),
         'product_cost_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_cost_price_usdollar',
                 'vname' => 'LBL_PRODUCT_COST_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -160,7 +160,7 @@ 
                 'len' => '26,6',
             ),
   'product_list_price' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_list_price',
     'vname' => 'LBL_PRODUCT_LIST_PRICE',
@@ -176,7 +176,7 @@ 
     'len' => '26,6',
   ),
         'product_list_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_list_price_usdollar',
                 'vname' => 'LBL_PRODUCT_LIST_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -193,7 +193,7 @@ 
                 'len' => '26,6',
             ),
   'product_discount' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_discount',
     'vname' => 'LBL_PRODUCT_DISCOUNT',
@@ -209,7 +209,7 @@ 
     'len' => '26,6',
   ),
         'product_discount_usdollar' =>
-            array (
+            array(
                 'name' => 'product_discount_usdollar',
                 'vname' => 'LBL_PRODUCT_DISCOUNT_USDOLLAR',
                 'type' => 'currency',
@@ -226,7 +226,7 @@ 
                 'len' => '26,6',
             ),
   'product_discount_amount' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_discount_amount',
     'vname' => 'LBL_PRODUCT_DISCOUNT_AMOUNT',
@@ -242,7 +242,7 @@ 
     'len' => '26,6',
   ),
         'product_discount_amount_usdollar' =>
-            array (
+            array(
                 'name' => 'product_discount_amount_usdollar',
                 'vname' => 'LBL_PRODUCT_DISCOUNT_AMOUNT_USDOLLAR',
                 'type' => 'currency',
@@ -259,7 +259,7 @@ 
                 'len' => '26,6',
             ),
   'discount' => 
-  array (
+  array(
     'required' => false,
     'name' => 'discount',
     'vname' => 'LBL_DISCOUNT',
@@ -279,7 +279,7 @@ 
   ),
 
   'product_unit_price' => 
-  array (
+  array(
     'required' => '1',
     'name' => 'product_unit_price',
     'vname' => 'LBL_PRODUCT_UNIT_PRICE',
@@ -295,7 +295,7 @@ 
     'len' => '26,6',
   ),
         'product_unit_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_unit_price_usdollar',
                 'vname' => 'LBL_PRODUCT_UNIT_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -312,7 +312,7 @@ 
                 'len' => '26,6',
             ),
   'vat_amt' => 
-  array (
+  array(
     'required' => '1',
     'name' => 'vat_amt',
     'vname' => 'LBL_VAT_AMT',
@@ -328,7 +328,7 @@ 
     'len' => '26,6',
   ),
         'vat_amt_usdollar' =>
-            array (
+            array(
                 'name' => 'vat_amt_usdollar',
                 'vname' => 'LBL_VAT_AMT_USDOLLAR',
                 'type' => 'currency',
@@ -345,7 +345,7 @@ 
                 'len' => '26,6',
             ),
   'product_total_price' => 
-  array (
+  array(
     'required' => '1',
     'name' => 'product_total_price',
     'vname' => 'LBL_PRODUCT_TOTAL_PRICE',
@@ -361,7 +361,7 @@ 
     'len' => '26,6',
   ),
         'product_total_price_usdollar' =>
-            array (
+            array(
                 'name' => 'product_total_price_usdollar',
                 'vname' => 'LBL_PRODUCT_TOTAL_PRICE_USDOLLAR',
                 'type' => 'currency',
@@ -378,7 +378,7 @@ 
                 'len' => '26,6',
             ),
   'vat' => 
-  array (
+  array(
     'required' => false,
     'name' => 'vat',
     'vname' => 'LBL_VAT',
@@ -397,7 +397,7 @@ 
     'studio' => 'visible',
   ),
   'parent_name' => 
-  array (
+  array(
     'required' => false,
     'source' => 'non-db',
     'name' => 'parent_name',
@@ -419,7 +419,7 @@ 
     'parent_type' => 'record_type_display',
   ),
   'parent_type' => 
-  array (
+  array(
     'required' => false,
     'name' => 'parent_type',
     'vname' => 'LBL_PARENT_TYPE',
@@ -437,7 +437,7 @@ 
     'studio' => 'hidden',
   ),
   'parent_id' => 
-  array (
+  array(
     'required' => false,
     'name' => 'parent_id',
     'vname' => 'LBL_PARENT_ID',
@@ -453,7 +453,7 @@ 
     'len' => 36,
   ),
   'product_id' => 
-  array (
+  array(
     'required' => false,
     'name' => 'product_id',
     'vname' => '',
@@ -482,7 +482,7 @@ 
     'duplicate_merge'=>'disabled',
   ),
   'group_id' => 
-  array (
+  array(
     'required' => false,
     'name' => 'group_id',
     'vname' => '',
@@ -498,7 +498,7 @@ 
     'len' => 36,
   ),
    'aos_products' =>
-  array (
+  array(
   'name' => 'aos_products',
     'type' => 'link',
     'relationship' => 'aos_product_quotes_aos_products',
@@ -507,16 +507,16 @@ 
     'source'=>'non-db',
  ),
 ),
-'indices' => array (
-    array (
+'indices' => array(
+    array(
     	'name' => 'idx_aospq_par_del',
     	'type' => 'index',
-    	'fields' => array('parent_id','parent_type','deleted')
+    	'fields' => array('parent_id', 'parent_type', 'deleted')
     )
 ),
-'relationships'=>array (
+'relationships'=>array(
 	'aos_product_quotes_aos_products' =>
-	array (
+	array(
 	'lhs_module'=> 'AOS_Products', 
 	'lhs_table'=> 'aos_products', 
 	'lhs_key' => 'id',
@@ -529,4 +529,4 @@ 
 	'optimistic_lock'=>true,
 );
 require_once('include/SugarObjects/VardefManager.php');
-VardefManager::createVardef('AOS_Products_Quotes','AOS_Products_Quotes', array('basic','assignable'));
+VardefManager::createVardef('AOS_Products_Quotes', 'AOS_Products_Quotes', array('basic', 'assignable'));

modules/Home/language/en_us.lang.php

Indentation +133 added lines, -133 removed lines

@@ -55,7 +55,7 @@ 
     'LBL_EMAIL_ADDRESS' => 'Email Address:',
     'LBL_MY_PIPELINE_FORM_TITLE' => 'My Pipeline',
     'LBL_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
-		'LBL_RGraph_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
+        'LBL_RGraph_PIPELINE_FORM_TITLE' => 'Pipeline By Sales Stage',
     'LBL_CAMPAIGN_ROI_FORM_TITLE' => 'Campaign ROI',
     'LBL_MY_CLOSED_OPPORTUNITIES_GAUGE' => 'My Closed Won Opportunities Gauge',
     'LNK_NEW_CONTACT' => 'Create Contact',
@@ -80,35 +80,35 @@ 
     'LBL_NO_RESULTS' => '<h2>There were no results found. Please search again.</h2><br>',
     'LBL_NO_RESULTS_TIPS' => '<h3>Search Tips:</h3><ul><li>Make sure you have the proper categories selected above.</li><li>Broaden your search criteria.</li><li>If you still cannot find any results try the advanced search option.</li></ul>',
 
-  'LBL_RELOAD_PAGE' => 'Please <a href="javascript: window.location.reload()">reload the window</a> to use this SuiteCRM Dashlet.',
-  'LBL_ADD_DASHLETS' => 'Add SuiteCRM Dashlets',
-  'LBL_ADD_PAGE' => 'Add Page',
-  'LBL_DEL_PAGE' => 'Delete Page',
-  'LBL_WEBSITE_TITLE' => 'Website',
-  'LBL_RSS_TITLE' => 'News Feed',
-  'LBL_DELETE_PAGE' => 'Delete Page',
-  'LBL_CHANGE_LAYOUT' => 'Change Layout',
-  'LBL_RENAME_PAGE' => 'Rename Page',
-  'LBL_CLOSE_DASHLETS' => 'Close',
-  'LBL_OPTIONS' => 'Options',
-  // dashlet search fields
-  'LBL_TODAY'=>'Today',
-  'LBL_YESTERDAY' => 'Yesterday',
-  'LBL_TOMORROW'=>'Tomorrow',
-  'LBL_LAST_WEEK'=>'Last Week',
-  'LBL_NEXT_WEEK'=>'Next Week',
-  'LBL_LAST_7_DAYS'=>'Last 7 Days',
-  'LBL_NEXT_7_DAYS'=>'Next 7 Days',
-  'LBL_LAST_MONTH'=>'Last Month',
-  'LBL_NEXT_MONTH'=>'Next Month',
-  'LBL_LAST_QUARTER'=>'Last Quarter',
-  'LBL_THIS_QUARTER'=>'This Quarter',
-  'LBL_LAST_YEAR'=>'Last Year',
-  'LBL_NEXT_YEAR'=>'Next Year',
-  'LBL_LAST_30_DAYS' => 'Last 30 Days',
-  'LBL_NEXT_30_DAYS' => 'Next 30 Days',
-  'LBL_THIS_MONTH' => 'This Month',
-  'LBL_THIS_YEAR' => 'This Year',
+    'LBL_RELOAD_PAGE' => 'Please <a href="javascript: window.location.reload()">reload the window</a> to use this SuiteCRM Dashlet.',
+    'LBL_ADD_DASHLETS' => 'Add SuiteCRM Dashlets',
+    'LBL_ADD_PAGE' => 'Add Page',
+    'LBL_DEL_PAGE' => 'Delete Page',
+    'LBL_WEBSITE_TITLE' => 'Website',
+    'LBL_RSS_TITLE' => 'News Feed',
+    'LBL_DELETE_PAGE' => 'Delete Page',
+    'LBL_CHANGE_LAYOUT' => 'Change Layout',
+    'LBL_RENAME_PAGE' => 'Rename Page',
+    'LBL_CLOSE_DASHLETS' => 'Close',
+    'LBL_OPTIONS' => 'Options',
+    // dashlet search fields
+    'LBL_TODAY'=>'Today',
+    'LBL_YESTERDAY' => 'Yesterday',
+    'LBL_TOMORROW'=>'Tomorrow',
+    'LBL_LAST_WEEK'=>'Last Week',
+    'LBL_NEXT_WEEK'=>'Next Week',
+    'LBL_LAST_7_DAYS'=>'Last 7 Days',
+    'LBL_NEXT_7_DAYS'=>'Next 7 Days',
+    'LBL_LAST_MONTH'=>'Last Month',
+    'LBL_NEXT_MONTH'=>'Next Month',
+    'LBL_LAST_QUARTER'=>'Last Quarter',
+    'LBL_THIS_QUARTER'=>'This Quarter',
+    'LBL_LAST_YEAR'=>'Last Year',
+    'LBL_NEXT_YEAR'=>'Next Year',
+    'LBL_LAST_30_DAYS' => 'Last 30 Days',
+    'LBL_NEXT_30_DAYS' => 'Next 30 Days',
+    'LBL_THIS_MONTH' => 'This Month',
+    'LBL_THIS_YEAR' => 'This Year',
 
     'LBL_MODULES' => 'Modules',
     'LBL_CHARTS' => 'Charts',
@@ -116,44 +116,44 @@ 
     'LBL_WEB' => 'Web',
     'LBL_SEARCH_RESULTS' => 'Search Result',
 
-  // Dashlet Categories
-  'dashlet_categories_dom' => array(
-      'Module Views' => 'Module Views',
-      'Portal' => 'Portal',
-      'Charts' => 'Charts',
-      'Tools' => 'Tools',
-      'Miscellaneous' => 'Miscellaneous'),
-  'LBL_MAX_DASHLETS_REACHED' => 'You have reached the maximum number of SuiteCRM Dashlets your administrator has set. Please remove a SuiteCRM Dashlet to add a new one.',
-  'LBL_ADDING_DASHLET' => 'Adding SuiteCRM Dashlet ...',
-  'LBL_ADDED_DASHLET' => 'SuiteCRM Dashlet Added',
-  'LBL_REMOVE_DASHLET_CONFIRM' => 'Are you sure you want to remove this SuiteCRM Dashlet?',
-  'LBL_REMOVING_DASHLET' => 'Removing SuiteCRM Dashlet ...',
-  'LBL_REMOVED_DASHLET' => 'SuiteCRM Dashlet Removed',
-  'LBL_DASHLET_CONFIGURE_GENERAL' => 'General',
-  'LBL_DASHLET_CONFIGURE_FILTERS' => 'Filters',
-  'LBL_DASHLET_CONFIGURE_MY_ITEMS_ONLY' => 'Only My Items',
-  'LBL_DASHLET_CONFIGURE_TITLE' => 'Title',
-  'LBL_DASHLET_CONFIGURE_DISPLAY_ROWS' => 'Display Rows',
+    // Dashlet Categories
+    'dashlet_categories_dom' => array(
+        'Module Views' => 'Module Views',
+        'Portal' => 'Portal',
+        'Charts' => 'Charts',
+        'Tools' => 'Tools',
+        'Miscellaneous' => 'Miscellaneous'),
+    'LBL_MAX_DASHLETS_REACHED' => 'You have reached the maximum number of SuiteCRM Dashlets your administrator has set. Please remove a SuiteCRM Dashlet to add a new one.',
+    'LBL_ADDING_DASHLET' => 'Adding SuiteCRM Dashlet ...',
+    'LBL_ADDED_DASHLET' => 'SuiteCRM Dashlet Added',
+    'LBL_REMOVE_DASHLET_CONFIRM' => 'Are you sure you want to remove this SuiteCRM Dashlet?',
+    'LBL_REMOVING_DASHLET' => 'Removing SuiteCRM Dashlet ...',
+    'LBL_REMOVED_DASHLET' => 'SuiteCRM Dashlet Removed',
+    'LBL_DASHLET_CONFIGURE_GENERAL' => 'General',
+    'LBL_DASHLET_CONFIGURE_FILTERS' => 'Filters',
+    'LBL_DASHLET_CONFIGURE_MY_ITEMS_ONLY' => 'Only My Items',
+    'LBL_DASHLET_CONFIGURE_TITLE' => 'Title',
+    'LBL_DASHLET_CONFIGURE_DISPLAY_ROWS' => 'Display Rows',
 
-  'LBL_DASHLET_DELETE' => 'Delete SuiteCRM Dashlet',
-  'LBL_DASHLET_REFRESH' => 'Refresh SuiteCRM Dashlet',
-  'LBL_DASHLET_EDIT' => 'Edit SuiteCRM Dashlet',
+    'LBL_DASHLET_DELETE' => 'Delete SuiteCRM Dashlet',
+    'LBL_DASHLET_REFRESH' => 'Refresh SuiteCRM Dashlet',
+    'LBL_DASHLET_EDIT' => 'Edit SuiteCRM Dashlet',
 
     'LBL_TRAINING_TITLE' => 'Training',
 
-  'LBL_CREATING_NEW_PAGE' => 'Creating New Page...',
-  'LBL_NEW_PAGE_FEEDBACK' => 'You have created a new page. You can add new content with the Add SuiteCRM Dashlets option.',
-  'LBL_DELETE_PAGE_CONFIRM' => 'Are you sure you want to delete this page?',
-  'LBL_SAVING_PAGE_TITLE' => 'Saving Page Title...',
-  'LBL_RETRIEVING_PAGE' => 'Retrieving Page...',
+    'LBL_CREATING_NEW_PAGE' => 'Creating New Page...',
+    'LBL_NEW_PAGE_FEEDBACK' => 'You have created a new page. You can add new content with the Add SuiteCRM Dashlets option.',
+    'LBL_DELETE_PAGE_CONFIRM' => 'Are you sure you want to delete this page?',
+    'LBL_SAVING_PAGE_TITLE' => 'Saving Page Title...',
+    'LBL_RETRIEVING_PAGE' => 'Retrieving Page...',
 
-  // Default out-of-box names for tabs
-  'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
-  'LBL_HOME_PAGE_2_NAME' => 'Sales',
-  'LBL_HOME_PAGE_3_NAME' => 'Support',
-  'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
-  'LBL_HOME_PAGE_4_NAME' => 'Tracker',
-  'LBL_CLOSE_SITEMAP' => 'Close',
+    // Default out-of-box names for tabs
+    'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
+    'LBL_HOME_PAGE_2_NAME' => 'Sales',
+    'LBL_HOME_PAGE_3_NAME' => 'Support',
+    'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
+    'LBL_HOME_PAGE_4_NAME' => 'Tracker',
+    'LBL_CLOSE_SITEMAP' => 'Close',
 
     'LBL_SEARCH' => 'Search',
     'LBL_CLEAR' => 'Clear',
@@ -166,7 +166,7 @@ 
     'LBL_MY_TEAM_REPORT_CHARTS' => 'My Team Reports',
     'LBL_MY_SAVED_REPORT_CHARTS' => 'My Saved Reports',
 
-  'LBL_DASHLET_SEARCH' => 'Find SuiteCRM Dashlet',
+    'LBL_DASHLET_SEARCH' => 'Find SuiteCRM Dashlet',
 
 //ABOUT page
     'LBL_VERSION' => 'Version',
@@ -177,77 +177,77 @@ 
     'LBL_ADD_TERM_COM' => '<P>The interactive user interfaces in modified source and object code versions of this program must display Appropriate Legal Notices, as required under Section 5 of the GNU Affero General Public License version 3. In accordance with Section 7(b) of the GNU General Public License version 3, these Appropriate Legal Notices must retain the display of the &quot;Powered by SugarCRM&quot; logo. If the display of the logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices must display the words &quot;Powered by SugarCRM&quot;.</P>',
 
 
-  'LBL_SUGAR_COMMUNITY_EDITION' => 'Sugar Community Edition',
-  'LBL_AND' => "and",
-  'LBL_ARE' => "are",
-  'LBL_TRADEMARKS' => 'trademarks',
-  'LBL_OF' => 'of',
-  'LBL_FOUNDERS' => 'Founders',
-  'LBL_JOIN_SUGAR_COMMUNITY' => 'Join the SuiteCRM Community',
-  'LBL_DETAILS_SUGARFORGE' => 'Collaborate and develop SuiteCRM extensions',
-  'LBL_DETAILS_SUGAREXCHANGE' => 'Buy and sell certified SuiteCRM extensions',
-  'LBL_TRAINING' => 'Training',
-  'LBL_DETAILS_TRAINING' => 'Learn about SuiteCRM using online and interactive learning content',
-  'LBL_FORUMS' => 'Forums',
-  'LBL_DETAILS_FORUMS' => 'Discuss SuiteCRM with expert community users and developers',
-  'LBL_WIKI' => 'Wiki',
-  'LBL_DETAILS_WIKI' => 'Search the knowledge base of user and developer topics',
-  'LBL_DEVSITE' => 'Developer Site',
-  'LBL_DETAILS_DEVSITE' => 'Discover resources, tutorials, and helpful links to get you up to speed on SuiteCRM development',
- 'LBL_GET_SUGARCRM_RSS' => 'Get SuiteCRM RSS',
-  'LBL_SUGARCRM_NEWS' => 'SuiteCRM News',
-  'LBL_SUGARCRM_TRAINING_NEWS' => 'SuiteCRM Training News',
-  'LBL_SUGARCRM_FORUMS' => 'SuiteCRM Forums',
-  'LBL_SUGARFORGE_NEWS' => 'SuiteCRM News',
-  'LBL_ALL_NEWS' => 'All News',
-  'LBL_SOURCE_CODE' => 'Source Code',
+    'LBL_SUGAR_COMMUNITY_EDITION' => 'Sugar Community Edition',
+    'LBL_AND' => "and",
+    'LBL_ARE' => "are",
+    'LBL_TRADEMARKS' => 'trademarks',
+    'LBL_OF' => 'of',
+    'LBL_FOUNDERS' => 'Founders',
+    'LBL_JOIN_SUGAR_COMMUNITY' => 'Join the SuiteCRM Community',
+    'LBL_DETAILS_SUGARFORGE' => 'Collaborate and develop SuiteCRM extensions',
+    'LBL_DETAILS_SUGAREXCHANGE' => 'Buy and sell certified SuiteCRM extensions',
+    'LBL_TRAINING' => 'Training',
+    'LBL_DETAILS_TRAINING' => 'Learn about SuiteCRM using online and interactive learning content',
+    'LBL_FORUMS' => 'Forums',
+    'LBL_DETAILS_FORUMS' => 'Discuss SuiteCRM with expert community users and developers',
+    'LBL_WIKI' => 'Wiki',
+    'LBL_DETAILS_WIKI' => 'Search the knowledge base of user and developer topics',
+    'LBL_DEVSITE' => 'Developer Site',
+    'LBL_DETAILS_DEVSITE' => 'Discover resources, tutorials, and helpful links to get you up to speed on SuiteCRM development',
+    'LBL_GET_SUGARCRM_RSS' => 'Get SuiteCRM RSS',
+    'LBL_SUGARCRM_NEWS' => 'SuiteCRM News',
+    'LBL_SUGARCRM_TRAINING_NEWS' => 'SuiteCRM Training News',
+    'LBL_SUGARCRM_FORUMS' => 'SuiteCRM Forums',
+    'LBL_SUGARFORGE_NEWS' => 'SuiteCRM News',
+    'LBL_ALL_NEWS' => 'All News',
+    'LBL_SOURCE_CODE' => 'Source Code',
     'LBL_SOURCE_SUGAR' => 'SugarCRM Inc - providers of CE framework',
-  'LBL_SOURCE_XTEMPLATE' => 'XTemplate - A template engine for PHP created by Barnabás Debreceni',
-  'LBL_SOURCE_NUSOAP' => 'NuSOAP - A set of PHP classes that allow developers to create and consume web services created by NuSphere Corporation and Dietrich Ayala',
-  'LBL_SOURCE_JSCALENDAR' => 'JS Calendar - A calendar for entering dates created by Mihai Bazon',
-  'LBL_SOURCE_PHPPDF' => 'PHP PDF - A library for creating PDF documents created by Wayne Munro',
-  'LBL_SOURCE_HTTP_WEBDAV_SERVER' => 'HTTP_WebDAV_Server - A WebDAV Server Implementation in PHP.',
-  'LBL_SOURCE_PCLZIP' => 'PclZip - library offers compression and extraction functions for Zip formatted archives by Vincent Blavet',
-  'LBL_SOURCE_SMARTY' => 'Smarty - A template engine for PHP.',
-  'LBL_SOURCE_YAHOO_UI_LIB' => 'Yahoo! User Interface Library - The UI Library Utilities facilitate the implementation of rich client-side features.',
-  'LBL_SOURCE_PHPMAILER' => 'PHPMailer - A full featured email transfer class for PHP',
-  'LBL_SOURCE_JSHRINK' => 'JShrink - A Javascript minifier written in PHP',
-  'LBL_SOURCE_CRYPT_BLOWFISH' => 'Crypt_Blowfish - Allows for quick two-way blowfish encryption without requiring the MCrypt PHP extension.',
-  'LBL_SOURCE_XML_HTMLSAX3' => 'XML_HTMLSax3 - A SAX parser for HTML and other badly formed XML documents',
-  'LBL_SOURCE_YAHOO_UI_LIB_EXT' => 'Yahoo! UI Extensions Library - Extensions to the Yahoo! User Interface Library by Jack Slocum',
-  'LBL_SOURCE_SWFOBJECT' => 'SWFObject - Javascript Flash Player detection and embed script.',
-  'LBL_SOURCE_TINYMCE' => 'TinyMCE - A WYSIWYG editor control for web browsers that enables the user to edit HTML contents',
-  'LBL_SOURCE_EXT' => 'Ext - A client-side JavaScript framework for building web applications.',
-  'LBL_SOURCE_RECAPTCHA' => 'reCAPTCHA - A free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.',
-  'LBL_SOURCE_TCPDF' => 'TCPDF - A PHP class for generating PDF documents.',
-  'LBL_SOURCE_CSSMIN' => 'CssMin - A css parser and minifier.',
-  'LBL_SOURCE_PHPSAML' => 'PHP-SAML - A simple SAML toolkit for PHP.',
-  'LBL_SOURCE_ISCROLL' => 'iScroll - The overflow:scroll for mobile webkit.  Native scrolling inside a fixed width/height element.',
-  'LBL_SOURCE_FLASHCANVAS' => 'FlashCanvas - FlashCanvas is a JavaScript library which adds the HTML5 Canvas support to Internet Explorer. It renders shapes and images via Flash drawing API. It supports almost all Canvas APIs and, in many cases, runs faster than other similar libraries which use VML or Silverlight.',
-  'LBL_SOURCE_JIT' => 'JavaScript InfoVis Toolkit - The JavaScript InfoVis Toolkit provides tools for creating Interactive Data Visualizations for the Web.',
-  'LBL_SOURCE_ZEND' => 'Zend Framework - An open source, object oriented web application framework for PHP5.',
-  'LBL_SOURCE_PARSECSV' => 'parseCSV - CSV data parser for PHP',
-  'LBL_SOURCE_PHPJS' => 'php.js - Use PHP functions in JavaScript',
-  'LBL_SOURCE_PHPSQL' => 'PHP SQL Parser',
-  'LBL_SOURCE_HTMLPURIFIER' => 'HTML Purifier - A standards-compliant HTML filtering library.',
-  'LBL_SOURCE_XHPROF' => 'XHProf - A function-level hierarchical profiler for PHP.',
-  'LBL_SOURCE_ELASTICA' => 'Elastica - PHP client for the distributed search engine elasticsearch ',
-  'LBL_SOURCE_FACEBOOKSDK' => 'Facebook PHP SDK',
-  'LBL_SOURCE_JQUERY' => 'jQuery - jQuery is a fast, small, and feature-rich JavaScript library.',
-  'LBL_SOURCE_JQUERY_UI' => 'jQuery UI - jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.',
-  'LBL_SOURCE_OVERLIB' => 'OverlibMWS - The overlibmws library uses javascript for DHTML popups that serve as informational and navigational aids for websites.',
+    'LBL_SOURCE_XTEMPLATE' => 'XTemplate - A template engine for PHP created by Barnabás Debreceni',
+    'LBL_SOURCE_NUSOAP' => 'NuSOAP - A set of PHP classes that allow developers to create and consume web services created by NuSphere Corporation and Dietrich Ayala',
+    'LBL_SOURCE_JSCALENDAR' => 'JS Calendar - A calendar for entering dates created by Mihai Bazon',
+    'LBL_SOURCE_PHPPDF' => 'PHP PDF - A library for creating PDF documents created by Wayne Munro',
+    'LBL_SOURCE_HTTP_WEBDAV_SERVER' => 'HTTP_WebDAV_Server - A WebDAV Server Implementation in PHP.',
+    'LBL_SOURCE_PCLZIP' => 'PclZip - library offers compression and extraction functions for Zip formatted archives by Vincent Blavet',
+    'LBL_SOURCE_SMARTY' => 'Smarty - A template engine for PHP.',
+    'LBL_SOURCE_YAHOO_UI_LIB' => 'Yahoo! User Interface Library - The UI Library Utilities facilitate the implementation of rich client-side features.',
+    'LBL_SOURCE_PHPMAILER' => 'PHPMailer - A full featured email transfer class for PHP',
+    'LBL_SOURCE_JSHRINK' => 'JShrink - A Javascript minifier written in PHP',
+    'LBL_SOURCE_CRYPT_BLOWFISH' => 'Crypt_Blowfish - Allows for quick two-way blowfish encryption without requiring the MCrypt PHP extension.',
+    'LBL_SOURCE_XML_HTMLSAX3' => 'XML_HTMLSax3 - A SAX parser for HTML and other badly formed XML documents',
+    'LBL_SOURCE_YAHOO_UI_LIB_EXT' => 'Yahoo! UI Extensions Library - Extensions to the Yahoo! User Interface Library by Jack Slocum',
+    'LBL_SOURCE_SWFOBJECT' => 'SWFObject - Javascript Flash Player detection and embed script.',
+    'LBL_SOURCE_TINYMCE' => 'TinyMCE - A WYSIWYG editor control for web browsers that enables the user to edit HTML contents',
+    'LBL_SOURCE_EXT' => 'Ext - A client-side JavaScript framework for building web applications.',
+    'LBL_SOURCE_RECAPTCHA' => 'reCAPTCHA - A free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.',
+    'LBL_SOURCE_TCPDF' => 'TCPDF - A PHP class for generating PDF documents.',
+    'LBL_SOURCE_CSSMIN' => 'CssMin - A css parser and minifier.',
+    'LBL_SOURCE_PHPSAML' => 'PHP-SAML - A simple SAML toolkit for PHP.',
+    'LBL_SOURCE_ISCROLL' => 'iScroll - The overflow:scroll for mobile webkit.  Native scrolling inside a fixed width/height element.',
+    'LBL_SOURCE_FLASHCANVAS' => 'FlashCanvas - FlashCanvas is a JavaScript library which adds the HTML5 Canvas support to Internet Explorer. It renders shapes and images via Flash drawing API. It supports almost all Canvas APIs and, in many cases, runs faster than other similar libraries which use VML or Silverlight.',
+    'LBL_SOURCE_JIT' => 'JavaScript InfoVis Toolkit - The JavaScript InfoVis Toolkit provides tools for creating Interactive Data Visualizations for the Web.',
+    'LBL_SOURCE_ZEND' => 'Zend Framework - An open source, object oriented web application framework for PHP5.',
+    'LBL_SOURCE_PARSECSV' => 'parseCSV - CSV data parser for PHP',
+    'LBL_SOURCE_PHPJS' => 'php.js - Use PHP functions in JavaScript',
+    'LBL_SOURCE_PHPSQL' => 'PHP SQL Parser',
+    'LBL_SOURCE_HTMLPURIFIER' => 'HTML Purifier - A standards-compliant HTML filtering library.',
+    'LBL_SOURCE_XHPROF' => 'XHProf - A function-level hierarchical profiler for PHP.',
+    'LBL_SOURCE_ELASTICA' => 'Elastica - PHP client for the distributed search engine elasticsearch ',
+    'LBL_SOURCE_FACEBOOKSDK' => 'Facebook PHP SDK',
+    'LBL_SOURCE_JQUERY' => 'jQuery - jQuery is a fast, small, and feature-rich JavaScript library.',
+    'LBL_SOURCE_JQUERY_UI' => 'jQuery UI - jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.',
+    'LBL_SOURCE_OVERLIB' => 'OverlibMWS - The overlibmws library uses javascript for DHTML popups that serve as informational and navigational aids for websites.',
 
-  'LBL_DASHLET_TITLE' => 'My Sites',
-  'LBL_DASHLET_OPT_TITLE' => 'Title',
-  'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
-  'LBL_DASHLET_OPT_URL' => 'Website Location',
-  'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
-  'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
-  'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
-	'LBL_POWERED_BY_SUGAR' => 'Powered By SugarCRM' /*for 508 compliance fix*/,
-	'LBL_MORE_DETAIL' => 'More Detail' /*for 508 compliance fix*/,
-	'LBL_BASIC_SEARCH' => 'Basic Search' /*for 508 compliance fix*/,
-	'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
+    'LBL_DASHLET_TITLE' => 'My Sites',
+    'LBL_DASHLET_OPT_TITLE' => 'Title',
+    'LBL_DASHLET_INCORRECT_URL' => 'Incorrect website location is specified',
+    'LBL_DASHLET_OPT_URL' => 'Website Location',
+    'LBL_DASHLET_OPT_HEIGHT' => 'Dashlet Height (in pixels)',
+    'LBL_DASHLET_SUGAR_NEWS' => 'SuiteCRM News',
+    'LBL_DASHLET_DISCOVER_SUGAR_PRO' => 'Discover SuiteCRM',
+    'LBL_POWERED_BY_SUGAR' => 'Powered By SugarCRM' /*for 508 compliance fix*/,
+    'LBL_MORE_DETAIL' => 'More Detail' /*for 508 compliance fix*/,
+    'LBL_BASIC_SEARCH' => 'Basic Search' /*for 508 compliance fix*/,
+    'LBL_ADVANCED_SEARCH' => 'Advanced Search' /*for 508 compliance fix*/,
     'LBL_TOUR_HOME' => 'Home Icon',
     'LBL_TOUR_HOME_DESCRIPTION' => 'Quickly get back to your Home Page dashboard in one click.',
     'LBL_TOUR_MODULES' => 'Modules',

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-$mod_strings  = array(
+$mod_strings = array(
     'LBL_MODULE_NAME' => 'Home',
     'LBL_MODULES_TO_SEARCH' => 'Modules to Search',
     'LBL_NEW_FORM_TITLE' => 'New Contact',
@@ -151,7 +151,7 @@ 
   'LBL_HOME_PAGE_1_NAME' => 'My SuiteCRM',
   'LBL_HOME_PAGE_2_NAME' => 'Sales',
   'LBL_HOME_PAGE_3_NAME' => 'Support',
-  'LBL_HOME_PAGE_6_NAME' => 'Marketing',//bug 16510, separate the support and marketing page from each other
+  'LBL_HOME_PAGE_6_NAME' => 'Marketing', //bug 16510, separate the support and marketing page from each other
   'LBL_HOME_PAGE_4_NAME' => 'Tracker',
   'LBL_CLOSE_SITEMAP' => 'Close',
 

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.

modules/Home/UnifiedSearchAdvanced.php

Spacing +98 added lines, -98 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.
@@ -58,10 +58,10 @@ 
     /*search form class name*/
     var $searchFormClass = 'SearchForm';
 
-    function __construct(){
-        if(!empty($_REQUEST['query_string'])){
+    function __construct() {
+        if (!empty($_REQUEST['query_string'])) {
             $query_string = trim($_REQUEST['query_string']);
-            if(!empty($query_string)){
+            if (!empty($query_string)) {
                 $this->query_string = $query_string;
             }
         }
@@ -72,7 +72,7 @@ 
 	function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
 		global $app_list_strings, $app_strings;
 
-		if(!file_exists($this->cache_search))
+		if (!file_exists($this->cache_search))
 		{
 			$this->buildCache();
 		}
@@ -83,10 +83,10 @@ 
 		$users_modules = $current_user->getPreference('globalSearch', 'search');
 
 		// preferences are empty, select all
-		if(empty($users_modules)) {
+		if (empty($users_modules)) {
 			$users_modules = array();
-			foreach($unified_search_modules_display as $module=>$data) {
-				if (!empty($data['visible']) ) {
+			foreach ($unified_search_modules_display as $module=>$data) {
+				if (!empty($data['visible'])) {
                     $users_modules[$module] = $beanList[$module];
                 }
 			}
@@ -97,15 +97,15 @@ 
 
 		$modules_to_search = array();
 
-		foreach($users_modules as $key=>$module)
+		foreach ($users_modules as $key=>$module)
 		{
-            if(ACLController::checkAccess($key, 'list', true))
+            if (ACLController::checkAccess($key, 'list', true))
             {
                 $modules_to_search[$key]['checked'] = true;
             }
 		}
 
-		if(!empty($this->query_string))
+		if (!empty($this->query_string))
 		{
 			$sugar_smarty->assign('query_string', securexss($this->query_string));
 		} else {
@@ -121,9 +121,9 @@ 
 		$json_disabled = array();
 
 		//Now add the rest of the modules that are searchable via Global Search settings
-		foreach($unified_search_modules_display as $module=>$data)
+		foreach ($unified_search_modules_display as $module=>$data)
 		{
-			if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
+			if (!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
 			{
 			   $modules_to_search[$module]['checked'] = false;
 			} else if (isset($modules_to_search[$module]) && !$data['visible']) {
@@ -132,10 +132,10 @@ 
 		}
 
 		//Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
-		foreach($modules_to_search as $module=>$data)
+		foreach ($modules_to_search as $module=>$data)
 		{
 			$label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-			if(!empty($data['checked']))
+			if (!empty($data['checked']))
 			{
 				$json_enabled[] = array("module" => $module, 'label' => $label);
 			} else {
@@ -147,7 +147,7 @@ 
 		$sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
 
 		$showDiv = $current_user->getPreference('showGSDiv', 'search');
-		if(!isset($showDiv))
+		if (!isset($showDiv))
 		{
 		   $showDiv = 'no';
 		}
@@ -181,11 +181,11 @@ 
 
 		$this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
 
-		if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
+		if (!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
 			$modules_to_search = array();
-			if(!empty($_REQUEST['search_modules']))
+			if (!empty($_REQUEST['search_modules']))
 			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
+			    foreach (explode(',', $_REQUEST['search_modules']) as $key)
 	            {
                     if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
                     {
@@ -200,16 +200,16 @@ 
 			$users_modules = $current_user->getPreference('globalSearch', 'search');
 			$modules_to_search = array();
 
-			if(!empty($users_modules)) {
+			if (!empty($users_modules)) {
 				// use user's previous selections
-			    foreach ( $users_modules as $key => $value ) {
+			    foreach ($users_modules as $key => $value) {
 			    	if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
 		            	$modules_to_search[$key] = $beanList[$key];
 		        	}
 			    }
 			} else {
-				foreach($unified_search_modules_display as $module=>$data) {
-				    if (!empty($data['visible']) ) {
+				foreach ($unified_search_modules_display as $module=>$data) {
+				    if (!empty($data['visible'])) {
 				        $modules_to_search[$module] = $beanList[$module];
 				    }
 				}
@@ -219,7 +219,7 @@ 
 
 
 		$templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
-		if(file_exists('custom/' . $templateFile))
+		if (file_exists('custom/'.$templateFile))
 		{
 		   $templateFile = 'custom/'.$templateFile;
 		}
@@ -230,9 +230,9 @@ 
 		$module_counts = array();
 		$has_results = false;
 
-		if(!empty($this->query_string)) {
-			foreach($modules_to_search as $moduleName => $beanName) {
-                require_once $beanFiles[$beanName] ;
+		if (!empty($this->query_string)) {
+			foreach ($modules_to_search as $moduleName => $beanName) {
+                require_once $beanFiles[$beanName];
                 $seed = new $beanName();
 
                 $lv = new ListViewSmarty();
@@ -243,25 +243,25 @@ 
                 require('modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
 				$orig_listViewDefs = $listViewDefs;
 
-                if(file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
+                if (file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
                 {
                     require('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
                 }
 
-                if ( !isset($listViewDefs) || !isset($listViewDefs[$seed->module_dir]) )
+                if (!isset($listViewDefs) || !isset($listViewDefs[$seed->module_dir]))
                 {
                     continue;
                 }
 
-			    $unifiedSearchFields = array () ;
+			    $unifiedSearchFields = array();
                 $innerJoins = array();
-                foreach ( $unified_search_modules[ $moduleName ]['fields'] as $field=>$def )
+                foreach ($unified_search_modules[$moduleName]['fields'] as $field=>$def)
                 {
                 	$listViewCheckField = strtoupper($field);
                 	//check to see if the field is in listview defs
-					if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+					if (empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default'])) {
 						//check to see if field is in original list view defs (in case we are using custom layout defs)
-						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default'])) {
 							//if we are here then the layout has been customized, but the field is still needed for query creation
 							$listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
 						}
@@ -270,9 +270,9 @@ 
 
                     //bug: 34125 we might want to try to use the LEFT JOIN operator instead of the INNER JOIN in the case we are
                     //joining against a field that has not been populated.
-                    if(!empty($def['innerjoin']) )
+                    if (!empty($def['innerjoin']))
                     {
-                        if (empty($def['db_field']) )
+                        if (empty($def['db_field']))
                         {
                             continue;
                         }
@@ -280,37 +280,37 @@ 
                         $def['innerjoin'] = str_replace('INNER', 'LEFT', $def['innerjoin']);
                     }
 
-                    if(isset($seed->field_defs[$field]['type']))
+                    if (isset($seed->field_defs[$field]['type']))
                     {
                         $type = $seed->field_defs[$field]['type'];
-                        if($type == 'int' && !is_numeric($this->query_string))
+                        if ($type == 'int' && !is_numeric($this->query_string))
                         {
                             continue;
                         }
                     }
 
-                    $unifiedSearchFields[ $moduleName ] [ $field ] = $def ;
-                    $unifiedSearchFields[ $moduleName ] [ $field ][ 'value' ] = $this->query_string ;
+                    $unifiedSearchFields[$moduleName] [$field] = $def;
+                    $unifiedSearchFields[$moduleName] [$field]['value'] = $this->query_string;
                 }
 
                 /*
                  * Use searchForm2->generateSearchWhere() to create the search query, as it can generate SQL for the full set of comparisons required
                  * generateSearchWhere() expects to find the search conditions for a field in the 'value' parameter of the searchFields entry for that field
                  */
-                require_once $beanFiles[$beanName] ;
+                require_once $beanFiles[$beanName];
                 $seed = new $beanName();
                 
 				require_once $this->searchFormPath;
-                $searchForm = new $this->searchFormClass ( $seed, $moduleName ) ;
+                $searchForm = new $this->searchFormClass($seed, $moduleName);
 
-                $searchForm->setup (array ( $moduleName => array() ) , $unifiedSearchFields , '' , 'saved_views' /* hack to avoid setup doing further unwanted processing */ ) ;
-                $where_clauses = $searchForm->generateSearchWhere() ;
+                $searchForm->setup(array($moduleName => array()), $unifiedSearchFields, '', 'saved_views' /* hack to avoid setup doing further unwanted processing */);
+                $where_clauses = $searchForm->generateSearchWhere();
                 //add inner joins back into the where clause
                 $params = array('custom_select' => "");
-                foreach($innerJoins as $field=>$def) {
+                foreach ($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                      foreach ($def['db_field'] as $dbfield)
+                          $where_clauses[] = $dbfield." LIKE '".$this->query_string."%'";
                           $params['custom_select'] .= ", $dbfield";
                           $params['distinct'] = true;
                           //$filterFields[$dbfield] = $dbfield;
@@ -319,7 +319,7 @@ 
 
                 if (count($where_clauses) > 0)
                 {
-                    $where = '(('. implode(' ) OR ( ', $where_clauses) . '))';
+                    $where = '(('.implode(' ) OR ( ', $where_clauses).'))';
                 }
                 else
                 {
@@ -328,16 +328,16 @@ 
                     $where = '';
                 }
                 $displayColumns = array();
-                foreach($listViewDefs[$seed->module_dir] as $colName => $param)
+                foreach ($listViewDefs[$seed->module_dir] as $colName => $param)
                 {
-                    if(!empty($param['default']) && $param['default'] == true)
+                    if (!empty($param['default']) && $param['default'] == true)
                     {
-                        $param['url_sort'] = true;//bug 27933
+                        $param['url_sort'] = true; //bug 27933
                         $displayColumns[$colName] = $param;
                     }
                 }
 
-                if(count($displayColumns) > 0)
+                if (count($displayColumns) > 0)
                 {
                 	$lv->displayColumns = $displayColumns;
                 } else {
@@ -354,12 +354,12 @@ 
 
                 $lv->setup($seed, 'include/ListView/ListViewNoMassUpdate.tpl', $where, $params, 0, 10);
 
-                $module_results[$moduleName] = '<br /><br />' . get_form_header($GLOBALS['app_list_strings']['moduleList'][$seed->module_dir] . ' (' . $lv->data['pageData']['offsets']['total'] . ')', '', false);
+                $module_results[$moduleName] = '<br /><br />'.get_form_header($GLOBALS['app_list_strings']['moduleList'][$seed->module_dir].' ('.$lv->data['pageData']['offsets']['total'].')', '', false);
                 $module_counts[$moduleName] = $lv->data['pageData']['offsets']['total'];
 
-                if($lv->data['pageData']['offsets']['total'] == 0) {
+                if ($lv->data['pageData']['offsets']['total'] == 0) {
                     //$module_results[$moduleName] .= "<li class='noBullet' id='whole_subpanel_{$moduleName}'><div id='div_{$moduleName}'><h2>" . $home_mod_strings['LBL_NO_RESULTS_IN_MODULE'] . '</h2></div></li>';
-                    $module_results[$moduleName] .= '<h2>' . $home_mod_strings['LBL_NO_RESULTS_IN_MODULE'] . '</h2>';
+                    $module_results[$moduleName] .= '<h2>'.$home_mod_strings['LBL_NO_RESULTS_IN_MODULE'].'</h2>';
                 } else {
                     $has_results = true;
                     //$module_results[$moduleName] .= "<li class='noBullet' id='whole_subpanel_{$moduleName}'><div id='div_{$moduleName}'>" . $lv->display(false, false) . '</div></li>';
@@ -369,11 +369,11 @@ 
 			}
 		}
 
-		if($has_results) {
-			foreach($module_counts as $name=>$value) {
+		if ($has_results) {
+			foreach ($module_counts as $name=>$value) {
 				echo $module_results[$name];
 			}
-		} else if(empty($_REQUEST['form_only'])) {
+		} else if (empty($_REQUEST['form_only'])) {
 			echo $home_mod_strings['LBL_NO_RESULTS'];
 			echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
 		}
@@ -387,68 +387,68 @@ 
 
 		$supported_modules = array();
 
-		foreach($beanList as $moduleName=>$beanName)
+		foreach ($beanList as $moduleName=>$beanName)
 		{
 			if (!isset($beanFiles[$beanName]))
 				continue;
 
 			$beanName = BeanFactory::getObjectName($moduleName);
-			$manager = new VardefManager ( );
-			$manager->loadVardef( $moduleName , $beanName ) ;
+			$manager = new VardefManager( );
+			$manager->loadVardef($moduleName, $beanName);
 
 			// obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
-			if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
+			if (file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')) {
                 require('custom/modules/'.$moduleName.'/metadata/metafiles.php');
-            }elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
+            }elseif (file_exists('modules/'.$moduleName.'/metadata/metafiles.php')) {
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
 
-			if(!empty($metafiles[$moduleName]['searchfields']))
+			if (!empty($metafiles[$moduleName]['searchfields']))
 			{
-				require $metafiles[$moduleName]['searchfields'] ;
-			} else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
-				require "modules/{$moduleName}/metadata/SearchFields.php" ;
+				require $metafiles[$moduleName]['searchfields'];
+			} else if (file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
+				require "modules/{$moduleName}/metadata/SearchFields.php";
 			}
 
 			//Load custom SearchFields.php if it exists
-			if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
+			if (file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
 			{
-				require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
+				require "custom/modules/{$moduleName}/metadata/SearchFields.php";
 			}				
 
             //If there are $searchFields are empty, just continue, there are no search fields defined for the module
-            if(empty($searchFields[$moduleName]))
+            if (empty($searchFields[$moduleName]))
             {
                 continue;
             }
 
-			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
+			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i', $moduleName);
 
 			//If the bean supports unified search or if it's a custom module bean and unified search is not defined
-			if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
+			if (!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
 			{
 				$fields = array();
-				foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
+				foreach ($dictionary [$beanName]['fields'] as $field => $def)
 				{
 					// We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
 					// the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
 					// So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
 
-					if (strpos($field,'email') !== false)
+					if (strpos($field, 'email') !== false)
 					{
-						$field = 'email' ;
+						$field = 'email';
 					}
 
 					//bug: 38139 - allow phone to be searched through Global Search
-					if (strpos($field,'phone') !== false)
+					if (strpos($field, 'phone') !== false)
 					{
-						$field = 'phone' ;
+						$field = 'phone';
 					}
 
-					if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
+					if (!empty($def['unified_search']) && isset ($searchFields [$moduleName] [$field]))
 					{
-						$fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
+						$fields [$field] = $searchFields [$moduleName] [$field];
 					}
 				}
 
@@ -463,7 +463,7 @@ 
                     }
                 }
 
-				if(count($fields) > 0) {
+				if (count($fields) > 0) {
 					$supported_modules [$moduleName] ['fields'] = $fields;
 					if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
 					{
@@ -494,10 +494,10 @@ 
         //Add the translated attribute for display label
         $json_enabled = array();
         $json_disabled = array();
-        foreach($unified_search_modules_display as $module=>$data)
+        foreach ($unified_search_modules_display as $module=>$data)
         {
             $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-            if($data['visible'] === true)
+            if ($data['visible'] === true)
             {
                 $json_enabled[] = array("module" => $module, 'label' => $label);
             }
@@ -508,7 +508,7 @@ 
         }
 
         //If the file doesn't exist
-        if(!file_exists($this->cache_search))
+        if (!file_exists($this->cache_search))
         {
             $this->buildCache();
         }
@@ -516,12 +516,12 @@ 
         include($this->cache_search);
 
         //Now add any new modules that may have since been added to unified_search_modules.php
-        foreach($unified_search_modules as $module=>$data)
+        foreach ($unified_search_modules as $module=>$data)
         {
-            if(!isset($unified_search_modules_display[$module]))
+            if (!isset($unified_search_modules_display[$module]))
             {
                 $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-                if($data['default'])
+                if ($data['default'])
                 {
                   $json_enabled[] = array("module" => $module, 'label' => $label);
                 } else {
@@ -542,20 +542,20 @@ 
 	 */
 	function saveGlobalSearchSettings()
 	{
-		if(isset($_REQUEST['enabled_modules']))
+		if (isset($_REQUEST['enabled_modules']))
 		{
             $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
 			$new_unified_search_modules_display = array();
 
-            foreach(explode (',', $_REQUEST['enabled_modules'] ) as $module)
+            foreach (explode(',', $_REQUEST['enabled_modules']) as $module)
             {
                 $new_unified_search_modules_display[$module]['visible'] = true;
             }
 
-			foreach($unified_search_modules_display as $module=>$data)
+			foreach ($unified_search_modules_display as $module=>$data)
 			{
-				if(!isset($new_unified_search_modules_display[$module]))
+				if (!isset($new_unified_search_modules_display[$module]))
 				{
 				   $new_unified_search_modules_display[$module]['visible'] = false;
 				}
@@ -569,7 +569,7 @@ 
 	public static function unlinkUnifiedSearchModulesFile() {
 		//clear the unified_search_module.php file
 		$cache_search = sugar_cached('modules/unified_search_modules.php');
-    	if(file_exists($cache_search))
+    	if (file_exists($cache_search))
     	{
     		$GLOBALS['log']->info("unlink {$cache_search}");
     		unlink($cache_search);
@@ -589,14 +589,14 @@ 
     {
 		//Make directory if it doesn't exist
         $cachedir = sugar_cached('modules');
-		if(!file_exists($cachedir))
+		if (!file_exists($cachedir))
 		{
 		   mkdir_recursive($cachedir);
 		}
 
 		//Load unified_search_modules.php file
         $cachedFile = sugar_cached('modules/unified_search_modules.php');
-		if(!file_exists($cachedFile))
+		if (!file_exists($cachedFile))
 		{
 			$this->buildCache();
 		}
@@ -616,15 +616,15 @@ 
      */
     public function getUnifiedSearchModulesDisplay()
     {
-		if(!file_exists('custom/modules/unified_search_modules_display.php'))
+		if (!file_exists('custom/modules/unified_search_modules_display.php'))
 		{
             $unified_search_modules = $this->getUnifiedSearchModules();
 
             $unified_search_modules_display = array();
 
-            if(!empty($unified_search_modules))
+            if (!empty($unified_search_modules))
             {
-                foreach($unified_search_modules as $module=>$data)
+                foreach ($unified_search_modules as $module=>$data)
                 {
                     $unified_search_modules_display[$module]['visible'] = (isset($data['default']) && $data['default']) ? true : false;
                 }
@@ -647,12 +647,12 @@ 
 	 */
 	private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
 	{
-		if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
+		if (is_null($unified_search_modules_display) || empty($unified_search_modules_display))
 		{
 		   return false;
 		}
 
-	    if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
+	    if (!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
 	    {
 	    	//Log error message and throw Exception
 	    	global $app_strings;
@@ -667,7 +667,7 @@ 
 
 
 function unified_search_modules_cmp($a, $b) {
-	if(!isset($a['translated']) || !isset($b['translated']))
+	if (!isset($a['translated']) || !isset($b['translated']))
 	{
 	   return 0;
 	}

Braces +12 added lines, -10 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.
@@ -309,8 +311,9 @@ 
                 $params = array('custom_select' => "");
                 foreach($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                      foreach($def['db_field'] as $dbfield) {
+                                                $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                      }
                           $params['custom_select'] .= ", $dbfield";
                           $params['distinct'] = true;
                           //$filterFields[$dbfield] = $dbfield;
@@ -320,8 +323,7 @@ 
                 if (count($where_clauses) > 0)
                 {
                     $where = '(('. implode(' ) OR ( ', $where_clauses) . '))';
-                }
-                else
+                } else
                 {
                     /* Clear $where from prev. module
                        if in current module $where_clauses */
@@ -389,8 +391,9 @@ 
 
 		foreach($beanList as $moduleName=>$beanName)
 		{
-			if (!isset($beanFiles[$beanName]))
-				continue;
+			if (!isset($beanFiles[$beanName])) {
+							continue;
+			}
 
 			$beanName = BeanFactory::getObjectName($moduleName);
 			$manager = new VardefManager ( );
@@ -399,7 +402,7 @@ 
 			// obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
 			if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('custom/modules/'.$moduleName.'/metadata/metafiles.php');
-            }elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
+            } elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
@@ -500,8 +503,7 @@ 
             if($data['visible'] === true)
             {
                 $json_enabled[] = array("module" => $module, 'label' => $label);
-            }
-            else
+            } else
             {
                 $json_disabled[] = array("module" => $module, 'label' => $label);
             }

Indentation +297 added lines, -297 removed lines

@@ -69,95 +69,95 @@ 
         $this->cache_display = sugar_cached('modules/unified_search_modules_display.php');
     }
 
-	function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
-		global $app_list_strings, $app_strings;
+    function getDropDownDiv($tpl = 'modules/Home/UnifiedSearchAdvanced.tpl') {
+        global $app_list_strings, $app_strings;
 
-		if(!file_exists($this->cache_search))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($this->cache_search))
+        {
+            $this->buildCache();
+        }
 
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-		global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
-		$users_modules = $current_user->getPreference('globalSearch', 'search');
+        global $mod_strings, $modListHeader, $app_list_strings, $current_user, $app_strings, $beanList;
+        $users_modules = $current_user->getPreference('globalSearch', 'search');
 
-		// preferences are empty, select all
-		if(empty($users_modules)) {
-			$users_modules = array();
-			foreach($unified_search_modules_display as $module=>$data) {
-				if (!empty($data['visible']) ) {
+        // preferences are empty, select all
+        if(empty($users_modules)) {
+            $users_modules = array();
+            foreach($unified_search_modules_display as $module=>$data) {
+                if (!empty($data['visible']) ) {
                     $users_modules[$module] = $beanList[$module];
                 }
-			}
-			$current_user->setPreference('globalSearch', $users_modules, 0, 'search');
-		}
+            }
+            $current_user->setPreference('globalSearch', $users_modules, 0, 'search');
+        }
 
-		$sugar_smarty = new Sugar_Smarty();
+        $sugar_smarty = new Sugar_Smarty();
 
-		$modules_to_search = array();
+        $modules_to_search = array();
 
-		foreach($users_modules as $key=>$module)
-		{
+        foreach($users_modules as $key=>$module)
+        {
             if(ACLController::checkAccess($key, 'list', true))
             {
                 $modules_to_search[$key]['checked'] = true;
             }
-		}
-
-		if(!empty($this->query_string))
-		{
-			$sugar_smarty->assign('query_string', securexss($this->query_string));
-		} else {
-			$sugar_smarty->assign('query_string', '');
-		}
-
-		$sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
-		$sugar_smarty->assign('APP', $app_strings);
-		$sugar_smarty->assign('USE_SEARCH_GIF', 0);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
-		$sugar_smarty->assign('LBL_SEARCH_BUTTON_TITLE', $app_strings['LBL_SEARCH_BUTTON_TITLE']);
-		$sugar_smarty->assign('LBL_SEARCH', $app_strings['LBL_SEARCH']);
-
-		$json_enabled = array();
-		$json_disabled = array();
-
-		//Now add the rest of the modules that are searchable via Global Search settings
-		foreach($unified_search_modules_display as $module=>$data)
-		{
-			if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
-			{
-			   $modules_to_search[$module]['checked'] = false;
-			} else if (isset($modules_to_search[$module]) && !$data['visible']) {
-			   unset($modules_to_search[$module]);
-			}
-		}
-
-		//Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
-		foreach($modules_to_search as $module=>$data)
-		{
-			$label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
-			if(!empty($data['checked']))
-			{
-				$json_enabled[] = array("module" => $module, 'label' => $label);
-			} else {
-				$json_disabled[] = array("module" => $module, 'label' => $label);
-			}
-		}
-
-		$sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
-		$sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
-
-		$showDiv = $current_user->getPreference('showGSDiv', 'search');
-		if(!isset($showDiv))
-		{
-		   $showDiv = 'no';
-		}
-
-		$sugar_smarty->assign('SHOWGSDIV', $showDiv);
-		$sugar_smarty->debugging = true;
-		return $sugar_smarty->fetch($tpl);
-	}
+        }
+
+        if(!empty($this->query_string))
+        {
+            $sugar_smarty->assign('query_string', securexss($this->query_string));
+        } else {
+            $sugar_smarty->assign('query_string', '');
+        }
+
+        $sugar_smarty->assign('MOD', return_module_language($GLOBALS['current_language'], 'Administration'));
+        $sugar_smarty->assign('APP', $app_strings);
+        $sugar_smarty->assign('USE_SEARCH_GIF', 0);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_LABEL', $app_strings['LBL_SEARCH_BUTTON_LABEL']);
+        $sugar_smarty->assign('LBL_SEARCH_BUTTON_TITLE', $app_strings['LBL_SEARCH_BUTTON_TITLE']);
+        $sugar_smarty->assign('LBL_SEARCH', $app_strings['LBL_SEARCH']);
+
+        $json_enabled = array();
+        $json_disabled = array();
+
+        //Now add the rest of the modules that are searchable via Global Search settings
+        foreach($unified_search_modules_display as $module=>$data)
+        {
+            if(!isset($modules_to_search[$module]) && $data['visible'] && ACLController::checkAccess($module, 'list', true))
+            {
+                $modules_to_search[$module]['checked'] = false;
+            } else if (isset($modules_to_search[$module]) && !$data['visible']) {
+                unset($modules_to_search[$module]);
+            }
+        }
+
+        //Create the two lists (doing it this way preserves the user's ordering choice for enabled modules)
+        foreach($modules_to_search as $module=>$data)
+        {
+            $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
+            if(!empty($data['checked']))
+            {
+                $json_enabled[] = array("module" => $module, 'label' => $label);
+            } else {
+                $json_disabled[] = array("module" => $module, 'label' => $label);
+            }
+        }
+
+        $sugar_smarty->assign('enabled_modules', json_encode($json_enabled));
+        $sugar_smarty->assign('disabled_modules', json_encode($json_disabled));
+
+        $showDiv = $current_user->getPreference('showGSDiv', 'search');
+        if(!isset($showDiv))
+        {
+            $showDiv = 'no';
+        }
+
+        $sugar_smarty->assign('SHOWGSDIV', $showDiv);
+        $sugar_smarty->debugging = true;
+        return $sugar_smarty->fetch($tpl);
+    }
 
 
     /**
@@ -170,70 +170,70 @@ 
      *
      *
      */
-	function search() {
+    function search() {
 
         $unified_search_modules = $this->getUnifiedSearchModules();
-		$unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
+        $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
 
-		require_once 'include/ListView/ListViewSmarty.php';
+        require_once 'include/ListView/ListViewSmarty.php';
 
-		global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
-		$home_mod_strings = return_module_language($current_language, 'Home');
+        global $modListHeader, $beanList, $beanFiles, $current_language, $app_strings, $current_user, $mod_strings;
+        $home_mod_strings = return_module_language($current_language, 'Home');
 
-		$this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
+        $this->query_string = $GLOBALS['db']->quote(securexss(from_html(clean_string($this->query_string, 'UNIFIED_SEARCH'))));
 
-		if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
-			$modules_to_search = array();
-			if(!empty($_REQUEST['search_modules']))
-			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
-	            {
+        if(!empty($_REQUEST['advanced']) && $_REQUEST['advanced'] != 'false') {
+            $modules_to_search = array();
+            if(!empty($_REQUEST['search_modules']))
+            {
+                foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
+                {
                     if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
                     {
                         $modules_to_search[$key] = $beanList[$key];
                     }
-	            }
-			}
-
-			$current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
-			$current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
-		} else {
-			$users_modules = $current_user->getPreference('globalSearch', 'search');
-			$modules_to_search = array();
-
-			if(!empty($users_modules)) {
-				// use user's previous selections
-			    foreach ( $users_modules as $key => $value ) {
-			    	if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
-		            	$modules_to_search[$key] = $beanList[$key];
-		        	}
-			    }
-			} else {
-				foreach($unified_search_modules_display as $module=>$data) {
-				    if (!empty($data['visible']) ) {
-				        $modules_to_search[$module] = $beanList[$module];
-				    }
-				}
-			}
-			$current_user->setPreference('globalSearch', $modules_to_search, 'search');
-		}
-
-
-		$templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
-		if(file_exists('custom/' . $templateFile))
-		{
-		   $templateFile = 'custom/'.$templateFile;
-		}
-
-		echo $this->getDropDownDiv($templateFile);
-
-		$module_results = array();
-		$module_counts = array();
-		$has_results = false;
-
-		if(!empty($this->query_string)) {
-			foreach($modules_to_search as $moduleName => $beanName) {
+                }
+            }
+
+            $current_user->setPreference('showGSDiv', isset($_REQUEST['showGSDiv']) ? $_REQUEST['showGSDiv'] : 'no', 0, 'search');
+            $current_user->setPreference('globalSearch', $modules_to_search, 0, 'search'); // save selections to user preference
+        } else {
+            $users_modules = $current_user->getPreference('globalSearch', 'search');
+            $modules_to_search = array();
+
+            if(!empty($users_modules)) {
+                // use user's previous selections
+                foreach ( $users_modules as $key => $value ) {
+                    if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible'])) {
+                        $modules_to_search[$key] = $beanList[$key];
+                    }
+                }
+            } else {
+                foreach($unified_search_modules_display as $module=>$data) {
+                    if (!empty($data['visible']) ) {
+                        $modules_to_search[$module] = $beanList[$module];
+                    }
+                }
+            }
+            $current_user->setPreference('globalSearch', $modules_to_search, 'search');
+        }
+
+
+        $templateFile = 'modules/Home/UnifiedSearchAdvancedForm.tpl';
+        if(file_exists('custom/' . $templateFile))
+        {
+            $templateFile = 'custom/'.$templateFile;
+        }
+
+        echo $this->getDropDownDiv($templateFile);
+
+        $module_results = array();
+        $module_counts = array();
+        $has_results = false;
+
+        if(!empty($this->query_string)) {
+            foreach($modules_to_search as $moduleName => $beanName) {
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
 
@@ -243,7 +243,7 @@ 
 
                 //retrieve the original list view defs and store for processing in case of custom layout changes
                 require('modules/'.$seed->module_dir.'/metadata/listviewdefs.php');
-				$orig_listViewDefs = $listViewDefs;
+                $orig_listViewDefs = $listViewDefs;
 
                 if(file_exists('custom/modules/'.$seed->module_dir.'/metadata/listviewdefs.php'))
                 {
@@ -255,20 +255,20 @@ 
                     continue;
                 }
 
-			    $unifiedSearchFields = array () ;
+                $unifiedSearchFields = array () ;
                 $innerJoins = array();
                 foreach ( $unified_search_modules[ $moduleName ]['fields'] as $field=>$def )
                 {
-                	$listViewCheckField = strtoupper($field);
-                	//check to see if the field is in listview defs
-					if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
-						//check to see if field is in original list view defs (in case we are using custom layout defs)
-						if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
-							//if we are here then the layout has been customized, but the field is still needed for query creation
-							$listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
-						}
+                    $listViewCheckField = strtoupper($field);
+                    //check to see if the field is in listview defs
+                    if ( empty($listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+                        //check to see if field is in original list view defs (in case we are using custom layout defs)
+                        if (!empty($orig_listViewDefs[$seed->module_dir][$listViewCheckField]['default']) ) {
+                            //if we are here then the layout has been customized, but the field is still needed for query creation
+                            $listViewDefs[$seed->module_dir][$listViewCheckField] = $orig_listViewDefs[$seed->module_dir][$listViewCheckField];
+                        }
 
-					}
+                    }
 
                     //bug: 34125 we might want to try to use the LEFT JOIN operator instead of the INNER JOIN in the case we are
                     //joining against a field that has not been populated.
@@ -302,7 +302,7 @@ 
                 require_once $beanFiles[$beanName] ;
                 $seed = new $beanName();
                 
-				require_once $this->searchFormPath;
+                require_once $this->searchFormPath;
                 $searchForm = new $this->searchFormClass ( $seed, $moduleName ) ;
 
                 $searchForm->setup (array ( $moduleName => array() ) , $unifiedSearchFields , '' , 'saved_views' /* hack to avoid setup doing further unwanted processing */ ) ;
@@ -311,11 +311,11 @@ 
                 $params = array('custom_select' => "");
                 foreach($innerJoins as $field=>$def) {
                     if (isset ($def['db_field'])) {
-                      foreach($def['db_field'] as $dbfield)
-                          $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
-                          $params['custom_select'] .= ", $dbfield";
-                          $params['distinct'] = true;
-                          //$filterFields[$dbfield] = $dbfield;
+                        foreach($def['db_field'] as $dbfield)
+                            $where_clauses[] = $dbfield . " LIKE '" . $this->query_string . "%'";
+                            $params['custom_select'] .= ", $dbfield";
+                            $params['distinct'] = true;
+                            //$filterFields[$dbfield] = $dbfield;
                     }
                 }
 
@@ -341,9 +341,9 @@ 
 
                 if(count($displayColumns) > 0)
                 {
-                	$lv->displayColumns = $displayColumns;
+                    $lv->displayColumns = $displayColumns;
                 } else {
-                	$lv->displayColumns = $listViewDefs[$seed->module_dir];
+                    $lv->displayColumns = $listViewDefs[$seed->module_dir];
                 }
 
                 $lv->export = false;
@@ -368,56 +368,56 @@ 
                     $module_results[$moduleName] .= $lv->display(false, false);
                 }
 
-			}
-		}
+            }
+        }
 
-		if($has_results) {
-			foreach($module_counts as $name=>$value) {
-				echo $module_results[$name];
-			}
-		} else if(empty($_REQUEST['form_only'])) {
-			echo $home_mod_strings['LBL_NO_RESULTS'];
-			echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
-		}
+        if($has_results) {
+            foreach($module_counts as $name=>$value) {
+                echo $module_results[$name];
+            }
+        } else if(empty($_REQUEST['form_only'])) {
+            echo $home_mod_strings['LBL_NO_RESULTS'];
+            echo $home_mod_strings['LBL_NO_RESULTS_TIPS'];
+        }
 
-	}
+    }
 
-	function buildCache()
-	{
+    function buildCache()
+    {
 
-		global $beanList, $beanFiles, $dictionary;
+        global $beanList, $beanFiles, $dictionary;
 
-		$supported_modules = array();
+        $supported_modules = array();
 
-		foreach($beanList as $moduleName=>$beanName)
-		{
-			if (!isset($beanFiles[$beanName]))
-				continue;
+        foreach($beanList as $moduleName=>$beanName)
+        {
+            if (!isset($beanFiles[$beanName]))
+                continue;
 
-			$beanName = BeanFactory::getObjectName($moduleName);
-			$manager = new VardefManager ( );
-			$manager->loadVardef( $moduleName , $beanName ) ;
+            $beanName = BeanFactory::getObjectName($moduleName);
+            $manager = new VardefManager ( );
+            $manager->loadVardef( $moduleName , $beanName ) ;
 
-			// obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
-			if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
+            // obtain the field definitions used by generateSearchWhere (duplicate code in view.list.php)
+            if(file_exists('custom/modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('custom/modules/'.$moduleName.'/metadata/metafiles.php');
             }elseif(file_exists('modules/'.$moduleName.'/metadata/metafiles.php')){
                 require('modules/'.$moduleName.'/metadata/metafiles.php');
             }
 
 
-			if(!empty($metafiles[$moduleName]['searchfields']))
-			{
-				require $metafiles[$moduleName]['searchfields'] ;
-			} else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
-				require "modules/{$moduleName}/metadata/SearchFields.php" ;
-			}
+            if(!empty($metafiles[$moduleName]['searchfields']))
+            {
+                require $metafiles[$moduleName]['searchfields'] ;
+            } else if(file_exists("modules/{$moduleName}/metadata/SearchFields.php")) {
+                require "modules/{$moduleName}/metadata/SearchFields.php" ;
+            }
 
-			//Load custom SearchFields.php if it exists
-			if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
-			{
-				require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
-			}				
+            //Load custom SearchFields.php if it exists
+            if(file_exists("custom/modules/{$moduleName}/metadata/SearchFields.php"))
+            {
+                require "custom/modules/{$moduleName}/metadata/SearchFields.php" ;
+            }				
 
             //If there are $searchFields are empty, just continue, there are no search fields defined for the module
             if(empty($searchFields[$moduleName]))
@@ -425,34 +425,34 @@ 
                 continue;
             }
 
-			$isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
-
-			//If the bean supports unified search or if it's a custom module bean and unified search is not defined
-			if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
-			{
-				$fields = array();
-				foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
-				{
-					// We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
-					// the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
-					// So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
-
-					if (strpos($field,'email') !== false)
-					{
-						$field = 'email' ;
-					}
-
-					//bug: 38139 - allow phone to be searched through Global Search
-					if (strpos($field,'phone') !== false)
-					{
-						$field = 'phone' ;
-					}
-
-					if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
-					{
-						$fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
-					}
-				}
+            $isCustomModule = preg_match('/^([a-z0-9]{1,5})_([a-z0-9_]+)$/i' , $moduleName);
+
+            //If the bean supports unified search or if it's a custom module bean and unified search is not defined
+            if(!empty($dictionary[$beanName]['unified_search']) || $isCustomModule)
+            {
+                $fields = array();
+                foreach ( $dictionary [ $beanName ][ 'fields' ] as $field => $def )
+                {
+                    // We cannot enable or disable unified_search for email in the vardefs as we don't actually have a vardef entry for 'email'
+                    // the searchFields entry for 'email' doesn't correspond to any vardef entry. Instead it contains SQL to directly perform the search.
+                    // So as a proxy we allow any field in the vardefs that has a name starting with 'email...' to be tagged with the 'unified_search' parameter
+
+                    if (strpos($field,'email') !== false)
+                    {
+                        $field = 'email' ;
+                    }
+
+                    //bug: 38139 - allow phone to be searched through Global Search
+                    if (strpos($field,'phone') !== false)
+                    {
+                        $field = 'phone' ;
+                    }
+
+                    if ( !empty($def['unified_search']) && isset ( $searchFields [ $moduleName ] [ $field ]  ))
+                    {
+                        $fields [ $field ] = $searchFields [ $moduleName ] [ $field ] ;
+                    }
+                }
 
                 foreach ($searchFields[$moduleName] as $field => $def)
                 {
@@ -465,23 +465,23 @@ 
                     }
                 }
 
-				if(count($fields) > 0) {
-					$supported_modules [$moduleName] ['fields'] = $fields;
-					if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
-					{
+                if(count($fields) > 0) {
+                    $supported_modules [$moduleName] ['fields'] = $fields;
+                    if (isset($dictionary[$beanName]['unified_search_default_enabled']) && $dictionary[$beanName]['unified_search_default_enabled'] === TRUE)
+                    {
                         $supported_modules [$moduleName]['default'] = true;
                     } else {
                         $supported_modules [$moduleName]['default'] = false;
                     }
-				}
+                }
 
-			}
+            }
 
-		}
+        }
 
-		ksort($supported_modules);
-		write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
-	}
+        ksort($supported_modules);
+        write_array_to_file('unified_search_modules', $supported_modules, $this->cache_search);
+    }
 
     /**
      * Retrieve the enabled and disabled modules used for global search.
@@ -525,9 +525,9 @@ 
                 $label = isset($app_list_strings['moduleList'][$module]) ? $app_list_strings['moduleList'][$module] : $module;
                 if($data['default'])
                 {
-                  $json_enabled[] = array("module" => $module, 'label' => $label);
+                    $json_enabled[] = array("module" => $module, 'label' => $label);
                 } else {
-                  $json_disabled[] = array("module" => $module, 'label' => $label);
+                    $json_disabled[] = array("module" => $module, 'label' => $label);
                 }
             }
         }
@@ -536,47 +536,47 @@ 
     }
 
 
-	/**
-	 * saveGlobalSearchSettings
-	 * This method handles the administrator's request to save the searchable modules selected and stores
-	 * the results in the unified_search_modules_display.php file
-	 *
-	 */
-	function saveGlobalSearchSettings()
-	{
-		if(isset($_REQUEST['enabled_modules']))
-		{
+    /**
+     * saveGlobalSearchSettings
+     * This method handles the administrator's request to save the searchable modules selected and stores
+     * the results in the unified_search_modules_display.php file
+     *
+     */
+    function saveGlobalSearchSettings()
+    {
+        if(isset($_REQUEST['enabled_modules']))
+        {
             $unified_search_modules_display = $this->getUnifiedSearchModulesDisplay();
 
-			$new_unified_search_modules_display = array();
+            $new_unified_search_modules_display = array();
 
             foreach(explode (',', $_REQUEST['enabled_modules'] ) as $module)
             {
                 $new_unified_search_modules_display[$module]['visible'] = true;
             }
 
-			foreach($unified_search_modules_display as $module=>$data)
-			{
-				if(!isset($new_unified_search_modules_display[$module]))
-				{
-				   $new_unified_search_modules_display[$module]['visible'] = false;
-				}
-			}
-
-			$this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
-		}
-	}
-
-
-	public static function unlinkUnifiedSearchModulesFile() {
-		//clear the unified_search_module.php file
-		$cache_search = sugar_cached('modules/unified_search_modules.php');
-    	if(file_exists($cache_search))
-    	{
-    		$GLOBALS['log']->info("unlink {$cache_search}");
-    		unlink($cache_search);
-    	}
-	}
+            foreach($unified_search_modules_display as $module=>$data)
+            {
+                if(!isset($new_unified_search_modules_display[$module]))
+                {
+                    $new_unified_search_modules_display[$module]['visible'] = false;
+                }
+            }
+
+            $this->writeUnifiedSearchModulesDisplayFile($new_unified_search_modules_display);
+        }
+    }
+
+
+    public static function unlinkUnifiedSearchModulesFile() {
+        //clear the unified_search_module.php file
+        $cache_search = sugar_cached('modules/unified_search_modules.php');
+        if(file_exists($cache_search))
+        {
+            $GLOBALS['log']->info("unlink {$cache_search}");
+            unlink($cache_search);
+        }
+    }
     
 
     /**
@@ -589,21 +589,21 @@ 
      */
     public function getUnifiedSearchModules()
     {
-		//Make directory if it doesn't exist
+        //Make directory if it doesn't exist
         $cachedir = sugar_cached('modules');
-		if(!file_exists($cachedir))
-		{
-		   mkdir_recursive($cachedir);
-		}
+        if(!file_exists($cachedir))
+        {
+            mkdir_recursive($cachedir);
+        }
 
-		//Load unified_search_modules.php file
+        //Load unified_search_modules.php file
         $cachedFile = sugar_cached('modules/unified_search_modules.php');
-		if(!file_exists($cachedFile))
-		{
-			$this->buildCache();
-		}
+        if(!file_exists($cachedFile))
+        {
+            $this->buildCache();
+        }
 
-		include $cachedFile;
+        include $cachedFile;
         return $unified_search_modules;
     }
 
@@ -618,8 +618,8 @@ 
      */
     public function getUnifiedSearchModulesDisplay()
     {
-		if(!file_exists('custom/modules/unified_search_modules_display.php'))
-		{
+        if(!file_exists('custom/modules/unified_search_modules_display.php'))
+        {
             $unified_search_modules = $this->getUnifiedSearchModules();
 
             $unified_search_modules_display = array();
@@ -633,13 +633,13 @@ 
             }
 
             $this->writeUnifiedSearchModulesDisplayFile($unified_search_modules_display);
-		}
+        }
 
-		include('custom/modules/unified_search_modules_display.php');
+        include('custom/modules/unified_search_modules_display.php');
         return $unified_search_modules_display;
     }
 
-	/*
+    /*
 	 * writeUnifiedSearchModulesDisplayFile
 	 * Private method to handle writing the unified_search_modules_display value to file
 	 *
@@ -647,35 +647,35 @@ 
 	 * @return boolean value indication whether or not file was successfully written
 	 * @throws Exception Thrown if the file write operation fails
 	 */
-	private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
-	{
-		if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
-		{
-		   return false;
-		}
-
-	    if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
-	    {
-	    	//Log error message and throw Exception
-	    	global $app_strings;
-	    	$msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
-	    	$GLOBALS['log']->error($msg);
-	    	throw new Exception($msg);
-	    }
-
-	    return true;
-	}
+    private function writeUnifiedSearchModulesDisplayFile($unified_search_modules_display)
+    {
+        if(is_null($unified_search_modules_display) || empty($unified_search_modules_display))
+        {
+            return false;
+        }
+
+        if(!write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php'))
+        {
+            //Log error message and throw Exception
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+        }
+
+        return true;
+    }
 }
 
 
 function unified_search_modules_cmp($a, $b) {
-	if(!isset($a['translated']) || !isset($b['translated']))
-	{
-	   return 0;
-	}
+    if(!isset($a['translated']) || !isset($b['translated']))
+    {
+        return 0;
+    }
 
-	$name1 = strtolower($a['translated']);
-	$name2 = strtolower($b['translated']);
+    $name1 = strtolower($a['translated']);
+    $name2 = strtolower($b['translated']);
 
-	return $name1 < $name2 ? -1 : 1;
+    return $name1 < $name2 ? -1 : 1;
 }

modules/Home/index.php

Spacing +43 added lines, -43 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.
@@ -45,7 +45,7 @@ 
 require_once('include/MySugar/MySugar.php');
 
 // build dashlet cache file if not found
-if(!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
+if (!is_file($cachefile = sugar_cached('dashlets/dashlets.php'))) {
     require_once('include/Dashlets/DashletCacheBuilder.php');
 
     $dc = new DashletCacheBuilder();
@@ -63,7 +63,7 @@ 
 
 $hasUserPreferences = (!isset($pages) || empty($pages) || !isset($dashlets) || empty($dashlets)) ? false : true;
 
-if(!$hasUserPreferences){
+if (!$hasUserPreferences) {
     $dashlets = array();
 
     //list of preferences to move over and to where
@@ -88,7 +88,7 @@ 
     $old_columns = $current_user->getPreference('columns', 'home');
     $old_dashlets = $current_user->getPreference('dashlets', 'home');
 
-    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)){
+    if (isset($old_columns) && !empty($old_columns) && isset($old_dashlets) && !empty($old_dashlets)) {
         $columns = $old_columns;
         $dashlets = $old_dashlets;
 
@@ -98,23 +98,23 @@ 
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
     }
-    else{
+    else {
         // This is here to get Sugar dashlets added above the rest
-        $dashlets[create_guid()] = array ('className' => 'SugarFeedDashlet',
+        $dashlets[create_guid()] = array('className' => 'SugarFeedDashlet',
             'module' => 'SugarFeed',
             'forceColumn' => 1,
             'fileLocation' => $dashletsFiles['SugarFeedDashlet']['file'],
         );
 
-        foreach($defaultDashlets as $dashletName=>$module){
+        foreach ($defaultDashlets as $dashletName=>$module) {
             // clint - fixes bug #20398
             // only display dashlets that are from visibile modules and that the user has permission to list
             $myDashlet = new MySugar($module);
             $displayDashlet = $myDashlet->checkDashletDisplay();
-            if (isset($dashletsFiles[$dashletName]) && $displayDashlet){
+            if (isset($dashletsFiles[$dashletName]) && $displayDashlet) {
                 $options = array();
-                $prefsforthisdashlet = array_keys($prefstomove,$dashletName);
-                foreach ( $prefsforthisdashlet as $pref ) {
+                $prefsforthisdashlet = array_keys($prefstomove, $dashletName);
+                foreach ($prefsforthisdashlet as $pref) {
                     $options[$pref] = $current_user->getPreference($pref);
                 }
                 $dashlets[create_guid()] = array('className' => $dashletName,
@@ -134,8 +134,8 @@ 
         $columns[1]['width'] = '40%';
         $columns[1]['dashlets'] = array();
 
-        foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
+        foreach ($dashlets as $guid=>$dashlet) {
+            if ($dashlet['forceColumn'] == 0) array_push($columns[0]['dashlets'], $guid);
             else array_push($columns[1]['dashlets'], $guid);
             $count++;
         }
@@ -150,29 +150,29 @@ 
 // handles upgrading from versions that had the 'Dashboard' module; move those items over to the Home page
 $pagesDashboard = $current_user->getPreference('pages', 'Dashboard');
 $dashletsDashboard = $current_user->getPreference('dashlets', 'Dashboard');
-if ( !empty($pagesDashboard) ) {
+if (!empty($pagesDashboard)) {
     // move dashlets from the dashboard to be at the end of the home screen dashlets
-    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn ) {
-        foreach ($dashboardColumn['dashlets'] as $dashletItem ) {
+    foreach ($pagesDashboard[0]['columns'] as $dashboardColumnKey => $dashboardColumn) {
+        foreach ($dashboardColumn['dashlets'] as $dashletItem) {
             $pages[0]['columns'][$dashboardColumnKey]['dashlets'][] = $dashletItem;
         }
     }
-    $pages = array_merge($pages,$pagesDashboard);
+    $pages = array_merge($pages, $pagesDashboard);
     $current_user->setPreference('pages', $pages, 0, 'Home');
 }
-if ( !empty($dashletsDashboard) ) {
-    $dashlets = array_merge($dashlets,$dashletsDashboard);
+if (!empty($dashletsDashboard)) {
+    $dashlets = array_merge($dashlets, $dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if (!empty($pagesDashboard) || !empty($dashletsDashboard))
     $current_user->resetPreferences('Dashboard');
 
-if (empty($pages)){
+if (empty($pages)) {
     $pages = array();
     $pageIndex = 0;
     $pages[0]['columns'] = $columns;
     $pages[0]['numColumns'] = '3';
-    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME';	// "My Sugar"
+    $pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME'; // "My Sugar"
     $pageIndex++;
     $current_user->setPreference('pages', $pages, 0, 'Home');
     $activePage = 0;
@@ -191,34 +191,34 @@ 
 $dashletIds = array(); // collect ids to pass to javascript
 $display = array();
 
-foreach($pages[$activePage]['columns'] as $colNum => $column) {
-    if ($colNum == $numCols){
+foreach ($pages[$activePage]['columns'] as $colNum => $column) {
+    if ($colNum == $numCols) {
         break;
     }
     $display[$colNum]['width'] = $column['width'];
     $display[$colNum]['dashlets'] = array();
-    foreach($column['dashlets'] as $num => $id) {
+    foreach ($column['dashlets'] as $num => $id) {
         // clint - fixes bug #20398
         // only display dashlets that are from visibile modules and that the user has permission to list
-        if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
+        if (!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
+            if (!empty($dashletsFiles[$dashlets[$id]['className']]['module']))
                 $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
+            elseif (!empty($dashlets[$id]['module']))
                 $module = $dashlets[$id]['module'];
 
             $myDashlet = new MySugar($module);
 
-            if($myDashlet->checkDashletDisplay()) {
+            if ($myDashlet->checkDashletDisplay()) {
                 require_once($dashlets[$id]['fileLocation']);
 
 
                 $dashlet = new $dashlets[$id]['className']($id, (isset($dashlets[$id]['options']) ? $dashlets[$id]['options'] : array()));
                 // Need to add support to dynamically display/hide dashlets
                 // If it has a method 'shouldDisplay' we will call it to see if we should display it or not
-                if (method_exists($dashlet,'shouldDisplay')) {
+                if (method_exists($dashlet, 'shouldDisplay')) {
                     if (!$dashlet->shouldDisplay()) {
                         // This dashlet doesn't want us to show it, skip it.
                         continue;
@@ -229,7 +229,7 @@ 
 
                 $dashlets = $current_user->getPreference('dashlets', 'Home'); // Using hardcoded 'Home' because DynamicAction.php $_REQUEST['module'] value is always Home
                 $lvsParams = array();
-                if(!empty($dashlets[$id]['sort_options'])){
+                if (!empty($dashlets[$id]['sort_options'])) {
                     $lvsParams = $dashlets[$id]['sort_options'];
                 }
 
@@ -238,10 +238,10 @@ 
                     $display[$colNum]['dashlets'][$id]['display'] = $dashlet->display();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
-                    if($dashlet->hasScript) {
+                    if ($dashlet->hasScript) {
                         $display[$colNum]['dashlets'][$id]['script'] = $dashlet->displayScript();
                     }
-                } catch (Exception $ex) {
+                }catch (Exception $ex) {
                     $display[$colNum]['dashlets'][$id]['display'] = $ex->getMessage();
                     $display[$colNum]['dashlets'][$id]['displayHeader'] = $dashlet->getHeader();
                     $display[$colNum]['dashlets'][$id]['displayFooter'] = $dashlet->getFooter();
@@ -253,18 +253,18 @@ 
 
 
 $i = 0;
-    while($i < count($pages)){
-        if($i == 0){
+    while ($i < count($pages)) {
+        if ($i == 0) {
             $pageTabs[$i]['pageTitle'] = $GLOBALS['app_strings']['LBL_SUITE_DASHBOARD'];
 //            $pageTabs[$i]['active'] = 'current';
-        }else{
+        } else {
             $pageTabs[$i]['pageTitle'] = $pages[$i]['pageTitle'];
             $divPages[] = $i;
         }
         $i++;
     }
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if (!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);
 $sugar_smarty->assign('sugarFlavor', $sugar_flavor);
@@ -274,7 +274,7 @@ 
 
 $sugar_smarty->assign('maxCount', empty($sugar_config['max_dashlets_homepage']) ? 15 : $sugar_config['max_dashlets_homepage']);
 $sugar_smarty->assign('dashletCount', $count);
-$sugar_smarty->assign('dashletIds', '["' . implode('","', $dashletIds) . '"]');
+$sugar_smarty->assign('dashletIds', '["'.implode('","', $dashletIds).'"]');
 $sugar_smarty->assign('columns', $display);
 
 global $theme;
@@ -305,16 +305,16 @@ 
 $sugar_smarty->assign('chartResources', $resources);
 $sugar_smarty->assign('mySugarChartResources', $mySugarResources);
 
-if (file_exists("custom/themes/" . $theme ."/tpls/MySugar.tpl")) {
-    echo $sugar_smarty->fetch("custom/themes/" . $theme ."/tpls/MySugar.tpl");
+if (file_exists("custom/themes/".$theme."/tpls/MySugar.tpl")) {
+    echo $sugar_smarty->fetch("custom/themes/".$theme."/tpls/MySugar.tpl");
 }
-else if(file_exists('custom/include/MySugar/tpls/MySugar.tpl')) {
+else if (file_exists('custom/include/MySugar/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('custom/include/MySugar/tpls/MySugar.tpl');
 }
-elseif (file_exists("themes/" . $theme ."/tpls/MySugar.tpl")) {
-    echo $sugar_smarty->fetch("themes/" . $theme ."/tpls/MySugar.tpl");
+elseif (file_exists("themes/".$theme."/tpls/MySugar.tpl")) {
+    echo $sugar_smarty->fetch("themes/".$theme."/tpls/MySugar.tpl");
 }
-else if(file_exists('include/MySugar/tpls/MySugar.tpl')) {
+else if (file_exists('include/MySugar/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('include/MySugar/tpls/MySugar.tpl');
 }
 else {

Braces +25 added lines, -20 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.
@@ -97,8 +99,7 @@ 
         $old_dashlets = array();
         $current_user->setPreference('columns', $old_columns, 0, 'home');
         $current_user->setPreference('dashlets', $old_dashlets, 0, 'home');
-    }
-    else{
+    } else{
         // This is here to get Sugar dashlets added above the rest
         $dashlets[create_guid()] = array ('className' => 'SugarFeedDashlet',
             'module' => 'SugarFeed',
@@ -135,8 +136,11 @@ 
         $columns[1]['dashlets'] = array();
 
         foreach($dashlets as $guid=>$dashlet) {
-            if( $dashlet['forceColumn'] == 0 ) array_push($columns[0]['dashlets'], $guid);
-            else array_push($columns[1]['dashlets'], $guid);
+            if( $dashlet['forceColumn'] == 0 ) {
+                array_push($columns[0]['dashlets'], $guid);
+            } else {
+                array_push($columns[1]['dashlets'], $guid);
+            }
             $count++;
         }
     }
@@ -164,8 +168,9 @@ 
     $dashlets = array_merge($dashlets,$dashletsDashboard);
     $current_user->setPreference('dashlets', $dashlets, 0, 'Home');
 }
-if ( !empty($pagesDashboard) || !empty($dashletsDashboard) )
+if ( !empty($pagesDashboard) || !empty($dashletsDashboard) ) {
     $current_user->resetPreferences('Dashboard');
+}
 
 if (empty($pages)){
     $pages = array();
@@ -202,12 +207,14 @@ 
         // only display dashlets that are from visibile modules and that the user has permission to list
         if(!empty($id) && isset($dashlets[$id]) && is_file($dashlets[$id]['fileLocation'])) {
             $module = 'Home';
-            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) )
-                $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            if ( !empty($dashletsFiles[$dashlets[$id]['className']]['module']) ) {
+                            $module = $dashletsFiles[$dashlets[$id]['className']]['module'];
+            }
             // Bug 24772 - Look into the user preference for the module the dashlet is a part of in case
             //             of the Report Chart dashlets.
-            elseif ( !empty($dashlets[$id]['module']) )
-                $module = $dashlets[$id]['module'];
+            elseif ( !empty($dashlets[$id]['module']) ) {
+                            $module = $dashlets[$id]['module'];
+            }
 
             $myDashlet = new MySugar($module);
 
@@ -257,14 +264,16 @@ 
         if($i == 0){
             $pageTabs[$i]['pageTitle'] = $GLOBALS['app_strings']['LBL_SUITE_DASHBOARD'];
 //            $pageTabs[$i]['active'] = 'current';
-        }else{
+        } else{
             $pageTabs[$i]['pageTitle'] = $pages[$i]['pageTitle'];
             $divPages[] = $i;
         }
         $i++;
     }
 
-if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) $sugar_smarty->assign('lock_homepage', true);
+if(!empty($sugar_config['lock_homepage']) && $sugar_config['lock_homepage'] == true) {
+    $sugar_smarty->assign('lock_homepage', true);
+}
 
 $sugar_smarty->assign('sugarVersion', $sugar_version);
 $sugar_smarty->assign('sugarFlavor', $sugar_flavor);
@@ -307,17 +316,13 @@ 
 
 if (file_exists("custom/themes/" . $theme ."/tpls/MySugar.tpl")) {
     echo $sugar_smarty->fetch("custom/themes/" . $theme ."/tpls/MySugar.tpl");
-}
-else if(file_exists('custom/include/MySugar/tpls/MySugar.tpl')) {
+} else if(file_exists('custom/include/MySugar/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('custom/include/MySugar/tpls/MySugar.tpl');
-}
-elseif (file_exists("themes/" . $theme ."/tpls/MySugar.tpl")) {
+} elseif (file_exists("themes/" . $theme ."/tpls/MySugar.tpl")) {
     echo $sugar_smarty->fetch("themes/" . $theme ."/tpls/MySugar.tpl");
-}
-else if(file_exists('include/MySugar/tpls/MySugar.tpl')) {
+} else if(file_exists('include/MySugar/tpls/MySugar.tpl')) {
     echo $sugar_smarty->fetch('include/MySugar/tpls/MySugar.tpl');
-}
-else {
+} else {
     $GLOBALS['log']->fatal('MySugar.tpl not found');
 }
 

modules/Project/delete_project_tasks.php

Spacing +2 added lines, -2 removed lines

@@ -24,12 +24,12 @@
  * Used to delete a project's related tasks after a project is deleted
  */
 class delete_project_tasks {
-    function delete_tasks(&$bean, $event, $arguments){
+    function delete_tasks(&$bean, $event, $arguments) {
         global $db;
         $Task = BeanFactory::getBean('ProjectTask');
         $tasks = $Task->get_full_list("order_number", "project_task.project_id = '".$bean->id."'");
 
-        foreach($tasks as $task){
+        foreach ($tasks as $task) {
             $query = "UPDATE project_task SET deleted ='1' WHERE id ='".$task->id."'";
             $update = $db->query($query);
         }

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.

modules/Project/ProjectQuickCreate.php

Indentation +11 added lines, -11 removed lines

@@ -66,24 +66,24 @@
         $this->javascript->setSugarBean($focus);
         $this->javascript->addAllFields('');
 
-		//$this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['project_status_dom'], $focus->status));
+        //$this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['project_status_dom'], $focus->status));
         $this->ss->assign('additionalScripts', $this->javascript->getScript(false));
         $this->ss->assign('CALENDAR_DATEFORMAT', $timedate->get_cal_date_format());
         
         
         $json = getJSONobj();
         
-		$popup_request_data = array(
-			'call_back_function' => 'set_return',
-			'form_name' => 'projectsQuickCreate',
-			'field_to_name_array' => array(
-				'id' => 'account_id',
-				'name' => 'account_name',
-			),
-		);
+        $popup_request_data = array(
+            'call_back_function' => 'set_return',
+            'form_name' => 'projectsQuickCreate',
+            'field_to_name_array' => array(
+                'id' => 'account_id',
+                'name' => 'account_name',
+            ),
+        );
 	
-		$encoded_popup_request_data = $json->encode($popup_request_data);
-		$this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
+        $encoded_popup_request_data = $json->encode($popup_request_data);
+        $this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
 
         
     }   

Spacing +2 added lines, -2 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.
@@ -55,7 +55,7 @@ 
   
         $this->ss->assign("SALUTATION_OPTIONS", get_select_options_with_id($app_list_strings['salutation_dom'], ''));
 
-        if($this->viaAJAX) { // override for ajax call
+        if ($this->viaAJAX) { // override for ajax call
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"contactsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"contacts\"); else return false;'");
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_contacts\")';");
         }

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.