adamjakab / SuiteCRM

modules/AOR_Reports/metadata/searchdefs.php

Indentation +15 added lines, -15 removed lines

@@ -22,21 +22,21 @@
  * @author SalesAgility <info@salesagility.com>
  */
  
-  $searchdefs['AOR_Reports'] = array(
-					'templateMeta' => array(
-							'maxColumns' => '3',
-  							'maxColumnsBasic' => '4', 
+    $searchdefs['AOR_Reports'] = array(
+                    'templateMeta' => array(
+                            'maxColumns' => '3',
+                                'maxColumnsBasic' => '4', 
                             'widths' => array('label' => '10', 'field' => '30'),                 
-                           ),
+                            ),
                     'layout' => array(  					
-						'basic_search' => array(
-							'name', 
-							array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
-							),
-						'advanced_search' => array(
-							'name', 
-							array('name' => 'assigned_user_id', 'label' => 'LBL_ASSIGNED_TO', 'type' => 'enum', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
-						),
-					),
- 			   );
+                        'basic_search' => array(
+                            'name', 
+                            array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
+                            ),
+                        'advanced_search' => array(
+                            'name', 
+                            array('name' => 'assigned_user_id', 'label' => 'LBL_ASSIGNED_TO', 'type' => 'enum', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
+                        ),
+                    ),
+                );
 ?>

modules/AOR_Reports/metadata/subpanels/default.php

Indentation +26 added lines, -26 removed lines

@@ -25,36 +25,36 @@
 
 
 $subpanel_layout = array(
-	'top_buttons' => array(
-		array('widget_class' => 'SubPanelTopCreateButton'),
-		array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'AOR_Reports'),
-	),
+    'top_buttons' => array(
+        array('widget_class' => 'SubPanelTopCreateButton'),
+        array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'AOR_Reports'),
+    ),
 
-	'where' => '',
+    'where' => '',
 
-	'list_fields' => array(
-		'name'=>array(
-	 		'vname' => 'LBL_NAME',
-			'widget_class' => 'SubPanelDetailViewLink',
-	 		'width' => '45%',
-		),
-		'date_modified'=>array(
-	 		'vname' => 'LBL_DATE_MODIFIED',
-	 		'width' => '45%',
-		),
-		'edit_button'=>array(
+    'list_fields' => array(
+        'name'=>array(
+                'vname' => 'LBL_NAME',
+            'widget_class' => 'SubPanelDetailViewLink',
+                'width' => '45%',
+        ),
+        'date_modified'=>array(
+                'vname' => 'LBL_DATE_MODIFIED',
+                'width' => '45%',
+        ),
+        'edit_button'=>array(
             'vname' => 'LBL_EDIT_BUTTON',
-			'widget_class' => 'SubPanelEditButton',
-		 	'module' => 'AOR_Reports',
-	 		'width' => '4%',
-		),
-		'remove_button'=>array(
+            'widget_class' => 'SubPanelEditButton',
+                'module' => 'AOR_Reports',
+                'width' => '4%',
+        ),
+        'remove_button'=>array(
             'vname' => 'LBL_REMOVE',
-			'widget_class' => 'SubPanelRemoveButton',
-		 	'module' => 'AOR_Reports',
-			'width' => '5%',
-		),
-	),
+            'widget_class' => 'SubPanelRemoveButton',
+                'module' => 'AOR_Reports',
+            'width' => '5%',
+        ),
+    ),
 );
 
 ?>

modules/AOR_Conditions/vardefs.php

Indentation +29 added lines, -29 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 $dictionary['AOR_Condition'] = array(
-	'table'=>'aor_conditions',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-  'aor_report_id' =>
-  array (
+    'table'=>'aor_conditions',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+    'aor_report_id' =>
+    array (
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -45,9 +45,9 @@ 
     'merge_filter' => 'disabled',
     'len' => 36,
     'size' => '20',
-  ),
-  'condition_order' => 
-  array (
+    ),
+    'condition_order' => 
+    array (
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -66,7 +66,7 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'disable_num_format' => '',
-  ),
+    ),
         'logic_op' => array(
             'name' => 'logic_op',
             'vname' => 'LBL_LOGIC_OP',
@@ -78,15 +78,15 @@ 
             'vname' => 'LBL_PARENTHESIS',
             'type' => 'varchar',
         ),
-  'module_path' =>
-  array (
+    'module_path' =>
+    array (
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
-  ),
-  'field' => 
-  array (
+    ),
+    'field' => 
+    array (
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -106,9 +106,9 @@ 
     'options' => 'user_type_dom',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'operator' => 
-  array (
+    ),
+    'operator' => 
+    array (
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -129,7 +129,7 @@ 
     'options' => 'aor_operator_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
+    ),
     'value_type' =>
     array (
     'required' => false,
@@ -152,9 +152,9 @@ 
     'options' => 'aor_condition_type_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'value' => 
-  array (
+    ),
+    'value' => 
+    array (
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -171,7 +171,7 @@ 
     'merge_filter' => 'disabled',
     'len' => '255',
     'size' => '20',
-  ),
+    ),
         'parameter' =>
             array (
                 'required' => false,
@@ -190,17 +190,17 @@ 
                 'merge_filter' => 'disabled',
                 'studio' => 'visible',
             ),
-  'aor_reports' =>
-  array (
+    'aor_reports' =>
+    array (
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
     'module'=>'AOR_Reports',
     'bean_name'=>'AOR_Reports',
     'source'=>'non-db',
-  ),
+    ),
 ),
-	'relationships'=>array (
+    'relationships'=>array (
 ),
     'indices' => array(
         array(
@@ -209,8 +209,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

modules/Home/UnifiedSearchAdvanced.php

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/ModuleBuilder/views/view.modulefields.php

Indentation +38 added lines, -38 removed lines

@@ -45,20 +45,20 @@ 
     var $mbModule;
     
     /**
-	 * @see SugarView::_getModuleTitleParams()
-	 */
-	protected function _getModuleTitleParams($browserTitle = false)
-	{
-	    global $mod_strings;
+     * @see SugarView::_getModuleTitleParams()
+     */
+    protected function _getModuleTitleParams($browserTitle = false)
+    {
+        global $mod_strings;
 	    
-    	return array(
-    	   translate('LBL_MODULE_NAME','Administration'),
-    	   ModuleBuilderController::getModuleTitle(),
-    	   );
+        return array(
+            translate('LBL_MODULE_NAME','Administration'),
+            ModuleBuilderController::getModuleTitle(),
+            );
     }
 
-	function display()
-	{
+    function display()
+    {
         $smarty = new Sugar_Smarty();
         global $mod_strings;
         $bak_mod_strings=$mod_strings;
@@ -92,13 +92,13 @@ 
                 if ($this->isValidStudioField($def))
                 {
                     $def['label'] = translate($def['vname'], $module_name);
-					//Custom relate fields will have a non-db source, but custom_module set
-                	if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
-                       $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
-                       $def['custom'] = true;
+                    //Custom relate fields will have a non-db source, but custom_module set
+                    if(isset($def['source']) && $def['source'] == 'custom_fields' || isset($def['custom_module'])) {
+                        $f[$mod_strings['LBL_HCUSTOM']][$def['name']] = $def;
+                        $def['custom'] = true;
                     } else {
-                       $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
-                       $def['custom'] = false;
+                        $f[$mod_strings['LBL_HDEFAULT']][$def['name']] = $def;
+                        $def['custom'] = false;
                     }
 
                     $def['type'] = isset($fieldTypes[$def['type']]) ? $fieldTypes[$def['type']] : ucfirst($def['type']);
@@ -183,15 +183,15 @@ 
                     {
                         if (isset($loadedFields[$field]))
                         {
-                           unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
+                            unset($this->mbModule->mbvardefs->vardefs['fields'][$k][$field]);
                         } else {
-                           $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
-                           $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
-                           $loadedFields[$field] = true;
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['label'] = isset($def['vname']) && isset($this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']]) ? $this->mbModule->mblanguage->strings[$current_language.'.lang.php'][$def['vname']] : $field;
+                            $customFieldsData[$field] = ($k == $this->mbModule->name) ? true : false;
+                            $loadedFields[$field] = true;
 
-                           $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
-                           $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
-                           $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
+                            $type = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'];
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field]['type'] = isset($fieldTypes[$type]) ? $fieldTypes[$type] : ucfirst($type);
+                            $fieldsData[] = $this->mbModule->mbvardefs->vardefs['fields'][$k][$field];
                         }
                     }
                 }
@@ -249,29 +249,29 @@ 
     function isValidStudioField(
         $def
         )
-	{
-    	if (isset($def['studio'])) {
+    {
+        if (isset($def['studio'])) {
             if (is_array($def [ 'studio' ]))
             {
-    			if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
+                if (isset($def['studio']['editField']) && $def['studio']['editField'] == true)
                     return true;
-    			if (isset($def['studio']['required']) && $def['studio']['required'])
+                if (isset($def['studio']['required']) && $def['studio']['required'])
                     return true;
                     
-    		} else
-    		{
-    			if ($def['studio'] == 'visible')
+            } else
+            {
+                if ($def['studio'] == 'visible')
                     return true;
                 if ($def['studio'] == 'hidden' || $def['studio'] == 'false' || !$def['studio'] )
                     return false;
             }
         }
-    	if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
-		{
-    		if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
-		  return true;
-		}
+        if (empty($def ['source']) || $def ['source'] == 'db' || $def ['source'] == 'custom_fields')
+        {
+            if ($def ['type'] != 'id' && (empty($def ['dbType']) || $def ['dbType'] != 'id'))
+            return true;
+        }
 		
-		return false;
-	}
+        return false;
+    }
 }
\ No newline at end of file

data/SugarBean.php

Indentation +9 added lines, -9 removed lines

@@ -579,7 +579,7 @@ 
      * Internal Function, do not override.
      */
     public static function get_union_related_list($parentbean, $order_by = "", $sort_order = '', $where = "",
-                                           $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $subpanel_def)
+                                            $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0, $subpanel_def)
     {
         $secondary_queries = array();
         global $layout_edit_mode;
@@ -845,7 +845,7 @@ 
      * @return array $fetched data.
      */
     public function process_union_list_query($parent_bean, $query,
-                                      $row_offset, $limit = -1, $max_per_page = -1, $where = '', $subpanel_def, $query_row_count = '', $secondary_queries = array())
+                                        $row_offset, $limit = -1, $max_per_page = -1, $where = '', $subpanel_def, $query_row_count = '', $secondary_queries = array())
     {
         $db = DBManagerFactory::getInstance('listviews');
         /**
@@ -3345,16 +3345,16 @@ 
         return $ret_array['select'] . $ret_array['from'] . $ret_array['where'] . $ret_array['order_by'];
     }
 
-	public function get_relationship_field($field)
-	{
-		foreach ($this->field_defs as $field_def => $value) {
-			if (isset($value['relationship_fields']) && 
-				in_array($field, $value['relationship_fields']) &&
+    public function get_relationship_field($field)
+    {
+        foreach ($this->field_defs as $field_def => $value) {
+            if (isset($value['relationship_fields']) && 
+                in_array($field, $value['relationship_fields']) &&
                 (!isset($value['link_type']) || $value['link_type'] != 'relationship_info')
             ) {
                 return $field_def;
             }
-		}
+        }
 
         return false;
     }
@@ -4326,7 +4326,7 @@ 
      * Internal function, do not override.
      */
     public function get_related_list($child_seed, $related_field_name, $order_by = "", $where = "",
-                              $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0)
+                                $row_offset = 0, $limit = -1, $max = -1, $show_deleted = 0)
     {
         global $layout_edit_mode;
 

modules/jjwg_Maps/views/view.quick_radius.php

Indentation +5 added lines, -5 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewQuick_Radius extends SugarView {
 
- 	function __construct() {
- 		parent::__construct();
- 	}
+        function __construct() {
+            parent::__construct();
+        }
 
-	function display() {
+    function display() {
 
         if (!isset($_REQUEST['quick_address'])) $_REQUEST['quick_address'] = '';
 ?>
@@ -66,5 +66,5 @@ 
 </form>
 
 <?php
-  }
+    }
 }

modules/jjwg_Maps/views/view.map_markers.php

Indentation +20 added lines, -20 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewMap_Markers extends SugarView {
 
-  function __construct() {
+    function __construct() {
     parent::__construct();
-  }
+    }
 
-  function display() {
+    function display() {
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
@@ -125,22 +125,22 @@ 
     // Define Dir of Group Icons
     $icons_dir_base = 'themes/default/images/jjwg_Maps/';
     if ($num_groups <= 10) {
-      $icons_dir = $icons_dir_base.'0-10/';
+        $icons_dir = $icons_dir_base.'0-10/';
     } elseif ($num_groups <= 25) {
-      $icons_dir = $icons_dir_base.'0-25/';
+        $icons_dir = $icons_dir_base.'0-25/';
     } elseif ($num_groups <= 100) {
-      $icons_dir = $icons_dir_base.'0-100/';
+        $icons_dir = $icons_dir_base.'0-100/';
     } elseif ($num_groups <= 216) {
-      $icons_dir = $icons_dir_base.'0-216/';
+        $icons_dir = $icons_dir_base.'0-216/';
     } else {
-      $icons_dir = $icons_dir_base.'0-10/'; // Demo Version
+        $icons_dir = $icons_dir_base.'0-10/'; // Demo Version
     }
 
     // Define Custom Markers Dir and Common Icons
     $custom_markers_dir = 'custom/themes/default/images/jjwg_Markers/';
     $custom_markers_icons = array();
     foreach($this->bean->custom_markers as $marker) {
-      $custom_markers_icons[] = $marker['image'];
+        $custom_markers_icons[] = $marker['image'];
     }
     $num_custom_markers = count($this->bean->custom_markers);
     $custom_markers_icons = array_unique($custom_markers_icons);
@@ -890,21 +890,21 @@ 
   <br clear="all" />
 
 <?php
-  if (!empty($this->bean->map_center) || $num_markers > 0) {
+    if (!empty($this->bean->map_center) || $num_markers > 0) {
 ?>
   <div id="legend">
   <b><?php echo $GLOBALS['mod_strings']['LBL_MAP_LEGEND']; ?></b><br/>
 <?php
-  if (!empty($this->bean->map_center)) {
+    if (!empty($this->bean->map_center)) {
 ?>
     <img src="<?php echo './'.$icons_dir.'/marker_0.png'; ?>" align="middle" />
     <?php echo $this->bean->map_center['name']; ?><br/>
 <?php
-  }
+    }
 ?>
   <!-- <b><?php echo $GLOBALS['mod_strings']['LBL_MAP_USER_GROUPS']; ?> </b><br/> -->
 <?php
-  foreach($group_name_to_num as $group_name => $group_number) {
+    foreach($group_name_to_num as $group_name => $group_number) {
 ?>
     <img src="<?php echo './'.$icons_dir.'/marker_'.$group_number.'.png'; ?>"
          rel="<?php echo $group_number; ?>" align="middle" />
@@ -916,15 +916,15 @@ 
     }
     ?><br/>
 <?php
-  }
+    }
 ?>
   </div>
 <?php
-  }
+    }
 ?>
 
 <?php
-  if ($num_markers > 0) {
+    if ($num_markers > 0) {
 ?>
     <div id="DataTable">
         <table cellpadding="3" cellspacing="0" border="1" width="100%" class="list view" id="displayDataTable">
@@ -947,11 +947,11 @@ 
         </table>
     </div>
 <?php
-  }
+    }
 ?>
 
 <?php
-  if (in_array($this->bean->display_object->module_name, array('Accounts', 'Contacts', 'Leads', 'Prospects', 'Users')) &&
+    if (in_array($this->bean->display_object->module_name, array('Accounts', 'Contacts', 'Leads', 'Prospects', 'Users')) &&
           ($GLOBALS['current_user']->isAdmin() || $this->bean->ACLAccess('list')) &&
           empty($_REQUEST['list_id']) && !empty($this->bean->list_array)) {
 ?>
@@ -972,7 +972,7 @@ 
     </form>
 </div>
 <?php
-  }
+    }
 ?>
 
 </body>
@@ -992,5 +992,5 @@ 
 </html>
 <?php
 
-   }
+    }
 }

modules/jjwg_Maps/views/view.geocoded_counts.php

Indentation +17 added lines, -17 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewGeocoded_Counts extends SugarView {
 
-   function __construct() {
-     parent::__construct();
-   }
+    function __construct() {
+        parent::__construct();
+    }
 
-  function display() {
+    function display() {
 
     echo '<div class="moduleTitle"><h2>'.$GLOBALS['mod_strings']['LBL_GEOCODED_COUNTS'].'</h2><div class="clear"></div></div>';
     echo '<div class="clear"></div>';
@@ -17,14 +17,14 @@ 
 
     // Display last status code, if set.
     if (!empty($_REQUEST['last_status']) && preg_match('/[A-Z\_]/', $_REQUEST['last_status'])) {
-      echo '<div><b>'.$GLOBALS['mod_strings']['LBL_MAP_LAST_STATUS'].': '.$_REQUEST['last_status'].'</b></div>';
-      echo '<br /><br />';
+        echo '<div><b>'.$GLOBALS['mod_strings']['LBL_MAP_LAST_STATUS'].': '.$_REQUEST['last_status'].'</b></div>';
+        echo '<br /><br />';
     }
 
     echo '<table cellspacing="0" cellpadding="0" border="0" class="list view" style="width: 50% !important;"><tbody>';
     echo '<tr><th>'.$GLOBALS['mod_strings']['LBL_MODULE_HEADING'].'</th>';
     foreach ($this->bean->geocoded_headings as $heading) {
-      echo '<th>'.$heading.'</th>';
+        echo '<th>'.$heading.'</th>';
     }
     echo '<th>'.$GLOBALS['mod_strings']['LBL_MODULE_TOTAL_HEADING'].'</th>';
     echo '<th>'.$GLOBALS['mod_strings']['LBL_MODULE_RESET_HEADING'].'</th>';
@@ -32,17 +32,17 @@ 
 
     foreach ($GLOBALS['jjwg_config']['valid_geocode_modules'] as $module) {
 
-      $geocode_url = './index.php?module=jjwg_Maps&action=geocode_addresses&display_module='.$module;
-      $reset_url = './index.php?module=jjwg_Maps&action=reset_geocoding&display_module='.$module;
+        $geocode_url = './index.php?module=jjwg_Maps&action=geocode_addresses&display_module='.$module;
+        $reset_url = './index.php?module=jjwg_Maps&action=reset_geocoding&display_module='.$module;
 
-      echo '<tr>';
-      echo '<td><strong><a href="'.htmlspecialchars($geocode_url).'">'.$GLOBALS['app_list_strings']['moduleList'][$module].'</a></strong></td>';
-      foreach ($this->bean->geocoded_headings as $heading) {
+        echo '<tr>';
+        echo '<td><strong><a href="'.htmlspecialchars($geocode_url).'">'.$GLOBALS['app_list_strings']['moduleList'][$module].'</a></strong></td>';
+        foreach ($this->bean->geocoded_headings as $heading) {
         echo '<td>'.$this->bean->geocoded_counts[$module][$heading].'</td>';
-      }
-      echo '<td><strong>'.$this->bean->geocoded_module_totals[$module].'</strong></td>';
-      echo '<td><strong><a href="'.htmlspecialchars($reset_url).'">'.$GLOBALS['mod_strings']['LBL_MODULE_RESET_HEADING'].'</a.</strong></td>';
-      echo '</tr>'."\n";
+        }
+        echo '<td><strong>'.$this->bean->geocoded_module_totals[$module].'</strong></td>';
+        echo '<td><strong><a href="'.htmlspecialchars($reset_url).'">'.$GLOBALS['mod_strings']['LBL_MODULE_RESET_HEADING'].'</a.</strong></td>';
+        echo '</tr>'."\n";
     }
 
     echo '</tbody></table>';
@@ -87,6 +87,6 @@ 
     $delete_url = './index.php?module=jjwg_Maps&action=delete_all_address_cache';
     echo '<a href="'.htmlspecialchars($delete_url).'">'.$GLOBALS['app_strings']['LBL_DELETE'].' - '.$GLOBALS['mod_strings']['LBL_ADDRESS_CACHE'].'</a>';
 
-  }
+    }
 }