adamjakab / SuiteCRM

modules/Project/Dashlets/MyProjectDashlet/MyProjectDashlet.php

Spacing +4 added lines, -4 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 is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004 - 2008 SugarCRM Inc.
@@ -48,7 +48,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_PROJECT', 'Project');
+        if (empty($def['title'])) $this->title = translate('LBL_LIST_MY_PROJECT', 'Project');
 
         $this->searchFields = $dashletData['MyProjectDashlet']['searchFields'];
         $this->columns = $dashletData['MyProjectDashlet']['columns'];
@@ -58,9 +58,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MyProjectDashlet($id, $def = null){
+    function MyProjectDashlet($id, $def = null) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +7 added lines, -4 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 is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004 - 2008 SugarCRM Inc.
@@ -48,7 +50,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_PROJECT', 'Project');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_LIST_MY_PROJECT', 'Project');
+        }
 
         $this->searchFields = $dashletData['MyProjectDashlet']['searchFields'];
         $this->columns = $dashletData['MyProjectDashlet']['columns'];
@@ -62,8 +66,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($id, $def);

modules/SavedSearch/UpgradeSavedSearch.php

Indentation +91 added lines, -91 removed lines

@@ -40,108 +40,108 @@
 
 class UpgradeSavedSearch {
 
-	function __construct() {
+    function __construct() {
 
-		$result = $GLOBALS['db']->query("SELECT id FROM saved_search");
-		while($row = $GLOBALS['db']->fetchByAssoc($result)) {
-		      $focus = new SavedSearch();
-			  $focus->retrieve($row['id']);
-			  $contents = unserialize(base64_decode($focus->contents));
-              $has_team_name_saved = isset($contents['team_name_advanced']) || isset($contents['team_name_basic']) ? true : false;
-			  //If $contents['searchFormTab'] is set then this is coming from a 4.x saved search
-			  if(isset($contents['searchFormTab']) && $contents['searchFormTab'] == 'saved_views') {
-			  	 $new_contents = array();
-			  	 $module = $contents['search_module'];
-			  	 $advanced = !empty($contents['advanced']);
-			  	 $field_map = array();
+        $result = $GLOBALS['db']->query("SELECT id FROM saved_search");
+        while($row = $GLOBALS['db']->fetchByAssoc($result)) {
+                $focus = new SavedSearch();
+                $focus->retrieve($row['id']);
+                $contents = unserialize(base64_decode($focus->contents));
+                $has_team_name_saved = isset($contents['team_name_advanced']) || isset($contents['team_name_basic']) ? true : false;
+                //If $contents['searchFormTab'] is set then this is coming from a 4.x saved search
+                if(isset($contents['searchFormTab']) && $contents['searchFormTab'] == 'saved_views') {
+                    $new_contents = array();
+                    $module = $contents['search_module'];
+                    $advanced = !empty($contents['advanced']);
+                    $field_map = array();
 
-			  	 if(file_exists("custom/modules/{$module}/metadata/searchdefs.php")) {
-			  	 	require("custom/modules/{$module}/metadata/searchdefs.php");
-			  	 	$field_map = $advanced ? $searchdefs[$module]['layout']['advanced_search'] : $searchdefs[$module]['layout']['basic_search'];
-			     }else if(file_exists("modules/{$module}/metadata/SearchFields.php")) {
-			  	 	require("modules/{$module}/metadata/SearchFields.php");
-			  	 	$field_map = $searchFields[$module];
-			  	 } else {
+                    if(file_exists("custom/modules/{$module}/metadata/searchdefs.php")) {
+                        require("custom/modules/{$module}/metadata/searchdefs.php");
+                        $field_map = $advanced ? $searchdefs[$module]['layout']['advanced_search'] : $searchdefs[$module]['layout']['basic_search'];
+                    }else if(file_exists("modules/{$module}/metadata/SearchFields.php")) {
+                        require("modules/{$module}/metadata/SearchFields.php");
+                        $field_map = $searchFields[$module];
+                    } else {
 
-				  	$bean = loadBean($module);
-				  	$field_map = $bean->field_name_map;
-			  	 }
+                        $bean = loadBean($module);
+                        $field_map = $bean->field_name_map;
+                    }
 
-			  	 //Special case for team_id field (from 4.5.x)
-			  	 if(isset($contents['team_id'])) {
-			  	    $contents['team_name'] = $contents['team_id'];
-			  	    unset($contents['team_id']);
-			  	 }
+                    //Special case for team_id field (from 4.5.x)
+                    if(isset($contents['team_id'])) {
+                        $contents['team_name'] = $contents['team_id'];
+                        unset($contents['team_id']);
+                    }
 
-			  	 foreach($contents as $key=>$value) {
-			  	 	 if(isset($field_map[$key])) {
-			  	 	 	$new_key = $key . ($advanced ? '_advanced' : '_basic');
-			  	 	    if(preg_match('/^team_name_(advanced|basic)$/', $new_key)) {
+                    foreach($contents as $key=>$value) {
+                        if(isset($field_map[$key])) {
+                            $new_key = $key . ($advanced ? '_advanced' : '_basic');
+                            if(preg_match('/^team_name_(advanced|basic)$/', $new_key)) {
 
-			  	 	       if(!is_array($value)) {
-			  	 	       	  $temp_value = array();
-			  	 	       	  $teap_value[] = $value;
-			  	 	       	  $value = $temp_value;
-			  	 	       }
+                                if(!is_array($value)) {
+                                    $temp_value = array();
+                                    $teap_value[] = $value;
+                                    $value = $temp_value;
+                                }
 
-			  	 	       $team_results = $GLOBALS['db']->query("SELECT id, name FROM teams where id in ('" . implode("','", $value) . "')");
-			  	 	       if(!empty($team_results)) {
-			  	 	       	  $count = 0;
-			  	 	       	  while($team_row = $GLOBALS['db']->fetchByAssoc($team_results)) {
-			  	 	       	 	 	$team_key = $new_key . '_collection_' . $count;
-				  	 	       	 	$new_contents[$team_key] = $team_row['name'];
-				  	 	       	 	$new_contents['id_' . $team_key] = $team_row['id'];
-				  	 	       	 	$count++;
-			  	 	       	  } //while
-			  	 	       } //if
+                                $team_results = $GLOBALS['db']->query("SELECT id, name FROM teams where id in ('" . implode("','", $value) . "')");
+                                if(!empty($team_results)) {
+                                    $count = 0;
+                                    while($team_row = $GLOBALS['db']->fetchByAssoc($team_results)) {
+                                            $team_key = $new_key . '_collection_' . $count;
+                                            $new_contents[$team_key] = $team_row['name'];
+                                            $new_contents['id_' . $team_key] = $team_row['id'];
+                                            $count++;
+                                    } //while
+                                } //if
 
 
-			  	 	       //Unset the original key
-			  	 	       unset($new_contents[$key]);
+                                //Unset the original key
+                                unset($new_contents[$key]);
 
-			  	 	       //Add the any switch
-			  	 	       $new_contents[$new_key . '_type'] = 'any';
-			  	 	 	} else {
-			  	 	 	   $new_contents[$new_key] = $value;
-			  	 	 	}
-			  	 	 } else {
-			  	 	 	$new_contents[$key] = $value;
-			  	 	 }
-			  	 }
-			  	 $new_contents['searchFormTab'] = $advanced ? 'advanced_search' : 'basic_search';
-			  	 $content = base64_encode(serialize($new_contents));
-			  	 $GLOBALS['db']->query("UPDATE saved_search SET contents = '{$content}' WHERE id = '{$row['id']}'");
-			} else if($has_team_name_saved) {
-			     //Otherwise, if the boolean has_team_name_saved is set to true, we also need to parse (coming from 5.x)
-			  	 if(isset($contents['team_name_advanced'])) {
-			  	 	$team_results = $GLOBALS['db']->query("SELECT name FROM teams where id = '{$contents['team_name_advanced']}'");
-			  	 	if(!empty($team_results)) {
-			  	 		$team_row = $GLOBALS['db']->fetchByAssoc($team_results);
-				  	 	$contents['team_name_advanced_collection_0'] = $team_row['name'];
-				  	 	$contents['id_team_name_advanced_collection_0'] = $contents['team_name_advanced'];
-				  	 	$contents['team_name_advanced_type'] = 'any';
-				  	 	unset($contents['team_name_advanced']);
-					  	$content = base64_encode(serialize($contents));
-					  	$GLOBALS['db']->query("UPDATE saved_search SET contents = '{$content}' WHERE id = '{$row['id']}'");
-			  	 	}
-			  	 }
-			}
-		} //while
-	}
+                                //Add the any switch
+                                $new_contents[$new_key . '_type'] = 'any';
+                            } else {
+                                $new_contents[$new_key] = $value;
+                            }
+                        } else {
+                            $new_contents[$key] = $value;
+                        }
+                    }
+                    $new_contents['searchFormTab'] = $advanced ? 'advanced_search' : 'basic_search';
+                    $content = base64_encode(serialize($new_contents));
+                    $GLOBALS['db']->query("UPDATE saved_search SET contents = '{$content}' WHERE id = '{$row['id']}'");
+            } else if($has_team_name_saved) {
+                    //Otherwise, if the boolean has_team_name_saved is set to true, we also need to parse (coming from 5.x)
+                    if(isset($contents['team_name_advanced'])) {
+                        $team_results = $GLOBALS['db']->query("SELECT name FROM teams where id = '{$contents['team_name_advanced']}'");
+                        if(!empty($team_results)) {
+                            $team_row = $GLOBALS['db']->fetchByAssoc($team_results);
+                            $contents['team_name_advanced_collection_0'] = $team_row['name'];
+                            $contents['id_team_name_advanced_collection_0'] = $contents['team_name_advanced'];
+                            $contents['team_name_advanced_type'] = 'any';
+                            unset($contents['team_name_advanced']);
+                            $content = base64_encode(serialize($contents));
+                            $GLOBALS['db']->query("UPDATE saved_search SET contents = '{$content}' WHERE id = '{$row['id']}'");
+                        }
+                    }
+            }
+        } //while
+    }
 
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function UpgradeSavedSearch(){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function UpgradeSavedSearch(){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +22 added lines, -22 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.
@@ -43,22 +43,22 @@ 
 	function __construct() {
 
 		$result = $GLOBALS['db']->query("SELECT id FROM saved_search");
-		while($row = $GLOBALS['db']->fetchByAssoc($result)) {
+		while ($row = $GLOBALS['db']->fetchByAssoc($result)) {
 		      $focus = new SavedSearch();
 			  $focus->retrieve($row['id']);
 			  $contents = unserialize(base64_decode($focus->contents));
               $has_team_name_saved = isset($contents['team_name_advanced']) || isset($contents['team_name_basic']) ? true : false;
 			  //If $contents['searchFormTab'] is set then this is coming from a 4.x saved search
-			  if(isset($contents['searchFormTab']) && $contents['searchFormTab'] == 'saved_views') {
+			  if (isset($contents['searchFormTab']) && $contents['searchFormTab'] == 'saved_views') {
 			  	 $new_contents = array();
 			  	 $module = $contents['search_module'];
 			  	 $advanced = !empty($contents['advanced']);
 			  	 $field_map = array();
 
-			  	 if(file_exists("custom/modules/{$module}/metadata/searchdefs.php")) {
+			  	 if (file_exists("custom/modules/{$module}/metadata/searchdefs.php")) {
 			  	 	require("custom/modules/{$module}/metadata/searchdefs.php");
 			  	 	$field_map = $advanced ? $searchdefs[$module]['layout']['advanced_search'] : $searchdefs[$module]['layout']['basic_search'];
-			     }else if(file_exists("modules/{$module}/metadata/SearchFields.php")) {
+			     } else if (file_exists("modules/{$module}/metadata/SearchFields.php")) {
 			  	 	require("modules/{$module}/metadata/SearchFields.php");
 			  	 	$field_map = $searchFields[$module];
 			  	 } else {
@@ -68,29 +68,29 @@ 
 			  	 }
 
 			  	 //Special case for team_id field (from 4.5.x)
-			  	 if(isset($contents['team_id'])) {
+			  	 if (isset($contents['team_id'])) {
 			  	    $contents['team_name'] = $contents['team_id'];
 			  	    unset($contents['team_id']);
 			  	 }
 
-			  	 foreach($contents as $key=>$value) {
-			  	 	 if(isset($field_map[$key])) {
-			  	 	 	$new_key = $key . ($advanced ? '_advanced' : '_basic');
-			  	 	    if(preg_match('/^team_name_(advanced|basic)$/', $new_key)) {
+			  	 foreach ($contents as $key=>$value) {
+			  	 	 if (isset($field_map[$key])) {
+			  	 	 	$new_key = $key.($advanced ? '_advanced' : '_basic');
+			  	 	    if (preg_match('/^team_name_(advanced|basic)$/', $new_key)) {
 
-			  	 	       if(!is_array($value)) {
+			  	 	       if (!is_array($value)) {
 			  	 	       	  $temp_value = array();
 			  	 	       	  $teap_value[] = $value;
 			  	 	       	  $value = $temp_value;
 			  	 	       }
 
-			  	 	       $team_results = $GLOBALS['db']->query("SELECT id, name FROM teams where id in ('" . implode("','", $value) . "')");
-			  	 	       if(!empty($team_results)) {
+			  	 	       $team_results = $GLOBALS['db']->query("SELECT id, name FROM teams where id in ('".implode("','", $value)."')");
+			  	 	       if (!empty($team_results)) {
 			  	 	       	  $count = 0;
-			  	 	       	  while($team_row = $GLOBALS['db']->fetchByAssoc($team_results)) {
-			  	 	       	 	 	$team_key = $new_key . '_collection_' . $count;
+			  	 	       	  while ($team_row = $GLOBALS['db']->fetchByAssoc($team_results)) {
+			  	 	       	 	 	$team_key = $new_key.'_collection_'.$count;
 				  	 	       	 	$new_contents[$team_key] = $team_row['name'];
-				  	 	       	 	$new_contents['id_' . $team_key] = $team_row['id'];
+				  	 	       	 	$new_contents['id_'.$team_key] = $team_row['id'];
 				  	 	       	 	$count++;
 			  	 	       	  } //while
 			  	 	       } //if
@@ -100,7 +100,7 @@ 
 			  	 	       unset($new_contents[$key]);
 
 			  	 	       //Add the any switch
-			  	 	       $new_contents[$new_key . '_type'] = 'any';
+			  	 	       $new_contents[$new_key.'_type'] = 'any';
 			  	 	 	} else {
 			  	 	 	   $new_contents[$new_key] = $value;
 			  	 	 	}
@@ -111,11 +111,11 @@ 
 			  	 $new_contents['searchFormTab'] = $advanced ? 'advanced_search' : 'basic_search';
 			  	 $content = base64_encode(serialize($new_contents));
 			  	 $GLOBALS['db']->query("UPDATE saved_search SET contents = '{$content}' WHERE id = '{$row['id']}'");
-			} else if($has_team_name_saved) {
+			} else if ($has_team_name_saved) {
 			     //Otherwise, if the boolean has_team_name_saved is set to true, we also need to parse (coming from 5.x)
-			  	 if(isset($contents['team_name_advanced'])) {
+			  	 if (isset($contents['team_name_advanced'])) {
 			  	 	$team_results = $GLOBALS['db']->query("SELECT name FROM teams where id = '{$contents['team_name_advanced']}'");
-			  	 	if(!empty($team_results)) {
+			  	 	if (!empty($team_results)) {
 			  	 		$team_row = $GLOBALS['db']->fetchByAssoc($team_results);
 				  	 	$contents['team_name_advanced_collection_0'] = $team_row['name'];
 				  	 	$contents['id_team_name_advanced_collection_0'] = $contents['team_name_advanced'];
@@ -132,9 +132,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function UpgradeSavedSearch(){
+	public function UpgradeSavedSearch() {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {

Braces +5 added lines, -4 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.
@@ -58,7 +60,7 @@ 
 			  	 if(file_exists("custom/modules/{$module}/metadata/searchdefs.php")) {
 			  	 	require("custom/modules/{$module}/metadata/searchdefs.php");
 			  	 	$field_map = $advanced ? $searchdefs[$module]['layout']['advanced_search'] : $searchdefs[$module]['layout']['basic_search'];
-			     }else if(file_exists("modules/{$module}/metadata/SearchFields.php")) {
+			     } else if(file_exists("modules/{$module}/metadata/SearchFields.php")) {
 			  	 	require("modules/{$module}/metadata/SearchFields.php");
 			  	 	$field_map = $searchFields[$module];
 			  	 } else {
@@ -136,8 +138,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct();

modules/SavedSearch/SavedSearch.php

Indentation +193 added lines, -193 removed lines

@@ -49,81 +49,81 @@ 
 
 
 class SavedSearch extends SugarBean {
-	var $db;
+    var $db;
     var $field_name_map;
 
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $assigned_user_id;
-	var $assigned_user_name;
-	var $modified_by_name;
-	var $name;
-	var $description;
-	var $content;
-	var $search_module;
-
-	var $object_name = 'SavedSearch';
-	var $table_name = 'saved_search';
-
-	var $module_dir = 'SavedSearch';
-	var $field_defs = array();
-	var $field_defs_map = array();
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $assigned_user_id;
+    var $assigned_user_name;
+    var $modified_by_name;
+    var $name;
+    var $description;
+    var $content;
+    var $search_module;
+
+    var $object_name = 'SavedSearch';
+    var $table_name = 'saved_search';
+
+    var $module_dir = 'SavedSearch';
+    var $field_defs = array();
+    var $field_defs_map = array();
 
     var $columns;
 
     public function __construct($columns = array(), $orderBy = null, $sortOrder = 'DESC') {
-		parent::__construct();
+        parent::__construct();
         $this->columns = $columns;
         $this->orderBy = $orderBy;
         $this->sortOrder = $sortOrder;
-		$this->setupCustomFields('SavedSearch');
-		foreach ($this->field_defs as $field) {
-			$this->field_name_map[$field['name']] = $field;
-		}
-
-	}
-
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function SavedSearch($columns = array(), $orderBy = null, $sortOrder = 'DESC'){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct($columns, $orderBy, $sortOrder);
-	}
-
-	// Saved Search Form
-	function getForm($module, $inline = true) {
-	    global $db, $current_user, $currentModule, $current_language, $app_strings;
+        $this->setupCustomFields('SavedSearch');
+        foreach ($this->field_defs as $field) {
+            $this->field_name_map[$field['name']] = $field;
+        }
+
+    }
+
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function SavedSearch($columns = array(), $orderBy = null, $sortOrder = 'DESC'){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct($columns, $orderBy, $sortOrder);
+    }
+
+    // Saved Search Form
+    function getForm($module, $inline = true) {
+        global $db, $current_user, $currentModule, $current_language, $app_strings;
         $json = getJSONobj();
 
-		$saved_search_mod_strings = return_module_language($current_language, 'SavedSearch');
+        $saved_search_mod_strings = return_module_language($current_language, 'SavedSearch');
 
-		$query = 'SELECT id, name FROM saved_search
+        $query = 'SELECT id, name FROM saved_search
 				  WHERE
 					deleted = \'0\' AND
 				  	assigned_user_id = \'' . $current_user->id . '\' AND
 					search_module =  \'' . $module . '\'
 				  ORDER BY name';
-	    $result = $db->query($query, true, "Error filling in saved search list: ");
-
-		$savedSearchArray['_none'] = $app_strings['LBL_NONE'];
-	    while ($row = $db->fetchByAssoc($result, -1, FALSE)) {
-	        $savedSearchArray[$row['id']] = htmlspecialchars($row['name'], ENT_QUOTES);
-	    }
-		$sugarSmarty = new Sugar_Smarty();
-		$sugarSmarty->assign('SEARCH_MODULE', $module);
-		$sugarSmarty->assign('MOD', $saved_search_mod_strings);
-		$sugarSmarty->assign('DELETE', $app_strings['LBL_DELETE_BUTTON_LABEL']);
+        $result = $db->query($query, true, "Error filling in saved search list: ");
+
+        $savedSearchArray['_none'] = $app_strings['LBL_NONE'];
+        while ($row = $db->fetchByAssoc($result, -1, FALSE)) {
+            $savedSearchArray[$row['id']] = htmlspecialchars($row['name'], ENT_QUOTES);
+        }
+        $sugarSmarty = new Sugar_Smarty();
+        $sugarSmarty->assign('SEARCH_MODULE', $module);
+        $sugarSmarty->assign('MOD', $saved_search_mod_strings);
+        $sugarSmarty->assign('DELETE', $app_strings['LBL_DELETE_BUTTON_LABEL']);
         $sugarSmarty->assign('UPDATE', $app_strings['LBL_UPDATE']);
-		$sugarSmarty->assign('SAVE', $app_strings['LBL_SAVE_BUTTON_LABEL']);
+        $sugarSmarty->assign('SAVE', $app_strings['LBL_SAVE_BUTTON_LABEL']);
 
         // Column Chooser
         $chooser = new TemplateGroupChooser();
@@ -139,23 +139,23 @@ 
         }
 
         if((!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') || (isset($this->contents['displayColumns']) && $this->contents['displayColumns'] != 'undefined')) {
-             // columns to display
-             if(!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') $temp_displayColumns = $_REQUEST['displayColumns'];
-             else $temp_displayColumns = $this->contents['displayColumns'];
-             foreach(explode('|', $temp_displayColumns) as $num => $name) {
-             		if (!isset($this->columns[$name])) {
-						// Ignore any column that is not on the list.
-             			continue;
-             		}
+                // columns to display
+                if(!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') $temp_displayColumns = $_REQUEST['displayColumns'];
+                else $temp_displayColumns = $this->contents['displayColumns'];
+                foreach(explode('|', $temp_displayColumns) as $num => $name) {
+                        if (!isset($this->columns[$name])) {
+                        // Ignore any column that is not on the list.
+                            continue;
+                        }
                     $chooser->args['values_array'][0][$name] = trim(translate($this->columns[$name]['label'], $module), ':');
-             }
-             // columns not displayed
-             foreach(array_diff(array_keys($this->columns), array_values(explode('|', $temp_displayColumns))) as $num => $name) {
+                }
+                // columns not displayed
+                foreach(array_diff(array_keys($this->columns), array_values(explode('|', $temp_displayColumns))) as $num => $name) {
                     $chooser->args['values_array'][1][$name] = trim(translate($this->columns[$name]['label'], $module), ':');
-             }
+                }
         }
         else {
-             foreach($this->columns as $name => $val) {
+                foreach($this->columns as $name => $val) {
                 if(!empty($val['default']) && $val['default'])
                     $chooser->args['values_array'][0][$name] = trim(translate($val['label'], $module), ':');
                 else
@@ -187,7 +187,7 @@ 
         $json = getJSONobj();
 
         return $sugarSmarty->fetch('modules/SavedSearch/SavedSearchForm.tpl');
-	}
+    }
 
     function getSelect($module) {
 
@@ -242,135 +242,135 @@ 
 }
 
     function returnSavedSearchContents($id) {
-		global $db, $current_user, $currentModule;
-		$query = 'SELECT id, name, contents, search_module FROM saved_search
+        global $db, $current_user, $currentModule;
+        $query = 'SELECT id, name, contents, search_module FROM saved_search
 				  WHERE
 				  	id = \'' . $id . '\'';
-	    $result = $db->query($query, true, "Error filling in saved search list: ");
+        $result = $db->query($query, true, "Error filling in saved search list: ");
 
-	    $header = 'Location: index.php?action=index&module=';
-	    $contents = '';
-	    $saved_search_name = '';
-	    while ($row = $db->fetchByAssoc($result, false)) {
-	        $header .= $row['search_module'];
+        $header = 'Location: index.php?action=index&module=';
+        $contents = '';
+        $saved_search_name = '';
+        while ($row = $db->fetchByAssoc($result, false)) {
+            $header .= $row['search_module'];
             if(empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
             $_SESSION['LastSavedView'][$row['search_module']] = $row['id'];
-	        $contents = unserialize(base64_decode($row['contents']));
-	        $saved_search_id = $row['id'];
+            $contents = unserialize(base64_decode($row['contents']));
+            $saved_search_id = $row['id'];
             $saved_search_name = $row['name'];
-	    }
+        }
 
-	    return $contents;
-	}
+        return $contents;
+    }
 
-	function handleDelete($id) {
-		$this->mark_deleted($id);
-		header("Location: index.php?action=index&module={$_REQUEST['search_module']}&advanced={$_REQUEST['advanced']}&query=true&clear_query=true");
-	}
+    function handleDelete($id) {
+        $this->mark_deleted($id);
+        header("Location: index.php?action=index&module={$_REQUEST['search_module']}&advanced={$_REQUEST['advanced']}&query=true&clear_query=true");
+    }
 
-	function handleSave($prefix, $redirect = true, $useRequired = false, $id = null, $searchModuleBean) {
+    function handleSave($prefix, $redirect = true, $useRequired = false, $id = null, $searchModuleBean) {
 
-		global $current_user, $timedate;
+        global $current_user, $timedate;
 
-		$focus = new SavedSearch();
-		if($id) $focus->retrieve($id);
+        $focus = new SavedSearch();
+        if($id) $focus->retrieve($id);
 
-		if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
-			return null;
-		}
+        if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
+            return null;
+        }
 
-		$ignored_inputs = array('PHPSESSID', 'module', 'action', 'saved_search_name', 'saved_search_select', 'advanced', 'Calls_divs', 'ACLRoles_divs');
+        $ignored_inputs = array('PHPSESSID', 'module', 'action', 'saved_search_name', 'saved_search_select', 'advanced', 'Calls_divs', 'ACLRoles_divs');
 
         $contents = $_REQUEST;
-		if($id == null) $focus->name = $contents['saved_search_name'];
-		$focus->search_module = $contents['search_module'];
-
-		foreach($contents as $input=>$value)
-		{
-			if(in_array($input, $ignored_inputs))
-			{
-				unset($contents[$input]);
-				continue;
-			}
-
-			//Filter date fields to ensure it is saved to DB format, but also avoid empty values
-			if(!empty($value) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $input, $match))
-			{
-			   $field = $match[2];
-			   if(isset($searchModuleBean->field_defs[$field]['type']) && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
-			   {
-			   	  $type = $searchModuleBean->field_defs[$field]['type'];
-
-			   	  //Avoid macro values for the date types
-			   	  if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && !preg_match('/^\[.*?\]$/', $value))
-			   	  {
-			   	  	 $db_format = $timedate->to_db_date($value, false);
-			   	  	 $contents[$input] = $db_format;
-			   	  } else if ($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') {
-
-			   	  	if(preg_match('/[^\d]/', $value)) {
-				   	  	 require_once('modules/Currencies/Currency.php');
-				   	  	 $contents[$input] = unformat_number($value);
-				   	  	 //Flag this value as having been unformatted
-				   	  	 $contents[$input . '_unformatted_number'] = true;
-				   	  	 //If the type is of currency and there was a currency symbol (non-digit), save the symbol
-				   	  	 if($type == 'currency' && preg_match('/^([^\d])/', $value, $match))
-				   	  	 {
-				   	  	 	$contents[$input . '_currency_symbol'] = $match[1];
-				   	  	 }
-			   	  	} else {
-			   	  		 //unset any flags
-			   	  		 if(isset($contents[$input . '_unformatted_number']))
-			   	  		 {
-			   	  		 	unset($contents[$input . '_unformatted_number']);
-			   	  		 }
-
-			   	  		 if(isset($contents[$input . '_currency_symbol']))
-			   	  		 {
-			   	  		 	unset($contents[$input . '_currency_symbol']);
-			   	  		 }
-			   	  	}
-			   	  }
-			   }
-			}
-
-		}
-
-		$contents['advanced'] = true;
-
-		$focus->contents = base64_encode(serialize($contents));
-
-		$focus->assigned_user_id = $current_user->id;
-		$focus->new_schema = true;
-
-		$saved_search_id = $focus->save();
-
-		$GLOBALS['log']->debug("Saved record with id of " . $focus->id);
-		$orderBy = empty($contents['orderBy'])? 'name' : $contents['orderBy'];
+        if($id == null) $focus->name = $contents['saved_search_name'];
+        $focus->search_module = $contents['search_module'];
+
+        foreach($contents as $input=>$value)
+        {
+            if(in_array($input, $ignored_inputs))
+            {
+                unset($contents[$input]);
+                continue;
+            }
+
+            //Filter date fields to ensure it is saved to DB format, but also avoid empty values
+            if(!empty($value) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $input, $match))
+            {
+                $field = $match[2];
+                if(isset($searchModuleBean->field_defs[$field]['type']) && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
+                {
+                        $type = $searchModuleBean->field_defs[$field]['type'];
+
+                        //Avoid macro values for the date types
+                        if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && !preg_match('/^\[.*?\]$/', $value))
+                        {
+                            $db_format = $timedate->to_db_date($value, false);
+                            $contents[$input] = $db_format;
+                        } else if ($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') {
+
+                            if(preg_match('/[^\d]/', $value)) {
+                                require_once('modules/Currencies/Currency.php');
+                                $contents[$input] = unformat_number($value);
+                                //Flag this value as having been unformatted
+                                $contents[$input . '_unformatted_number'] = true;
+                                //If the type is of currency and there was a currency symbol (non-digit), save the symbol
+                                if($type == 'currency' && preg_match('/^([^\d])/', $value, $match))
+                                {
+                                    $contents[$input . '_currency_symbol'] = $match[1];
+                                }
+                            } else {
+                                //unset any flags
+                                if(isset($contents[$input . '_unformatted_number']))
+                                {
+                                    unset($contents[$input . '_unformatted_number']);
+                                }
+
+                                if(isset($contents[$input . '_currency_symbol']))
+                                {
+                                    unset($contents[$input . '_currency_symbol']);
+                                }
+                            }
+                        }
+                }
+            }
+
+        }
+
+        $contents['advanced'] = true;
+
+        $focus->contents = base64_encode(serialize($contents));
+
+        $focus->assigned_user_id = $current_user->id;
+        $focus->new_schema = true;
+
+        $saved_search_id = $focus->save();
+
+        $GLOBALS['log']->debug("Saved record with id of " . $focus->id);
+        $orderBy = empty($contents['orderBy'])? 'name' : $contents['orderBy'];
         $search_query = "&orderBy=" . $orderBy . "&sortOrder=".$contents['sortOrder'] . "&query=" . $_REQUEST['query'] . "&searchFormTab=" . $_REQUEST['searchFormTab'].'&showSSDIV=' . $contents['showSSDIV'];
 
         if($redirect)
         {
-        	$this->handleRedirect($focus->search_module, $search_query, $saved_search_id, 'true');
+            $this->handleRedirect($focus->search_module, $search_query, $saved_search_id, 'true');
         }
     }
 
-	function handleRedirect($return_module, $search_query, $saved_search_id, $advanced = 'false') {
+    function handleRedirect($return_module, $search_query, $saved_search_id, $advanced = 'false') {
         $_SESSION['LastSavedView'][$return_module] = $saved_search_id;
         $return_action = 'index';
         $ajaxLoad = empty($_REQUEST['ajax_load']) ? "" : "&ajax_load=" . $_REQUEST['ajax_load'];
         //Reduce the params to avoid the problems caused by URL max length in IE ( the reduced params can be get from saved search according to saved_search_id).
         header("Location: index.php?action=$return_action&module=$return_module&saved_search_select={$saved_search_id}{$search_query}&advanced={$advanced}$ajaxLoad");
         die();
-	}
+    }
 
-	function fill_in_additional_list_fields() {
-		global $app_list_strings;
-		// Fill in the assigned_user_name
-		$this->search_module = $app_list_strings['moduleList'][$this->contents['search_module']];
-		$this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
+    function fill_in_additional_list_fields() {
+        global $app_list_strings;
+        // Fill in the assigned_user_name
+        $this->search_module = $app_list_strings['moduleList'][$this->contents['search_module']];
+        $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
-	}
+    }
 
 
     function retrieveSavedSearch($id) {
@@ -380,36 +380,36 @@ 
 
     function populateRequest(){
 
-    	global $timedate;
+        global $timedate;
 
         if(isset($this->contents['search_module']))
         {
-           $searchModuleBean = loadBean($this->contents['search_module']);
+            $searchModuleBean = loadBean($this->contents['search_module']);
         }
 
         foreach($this->contents as $key=>$val){
             if($key != 'advanced' && $key != 'module' && !strpos($key, '_ORDER_BY') && $key != 'lvso') {
-            	if(isset($searchModuleBean) && !empty($val) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $key, $match))
-            	{
-            	   $field = $match[2];
-				   if(isset($searchModuleBean->field_defs[$field]['type'])  && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
-				   {
-				   	  $type = $searchModuleBean->field_defs[$field]['type'];
-
-				   	  //Avoid macro values for the date types
-				   	  if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && preg_match('/^\d{4}-\d{2}-\d{2}$/', $val) && !preg_match('/^\[.*?\]$/', $val))
-				   	  {
-				   	  	 $val = $timedate->to_display_date($val, false);
-				   	  }  else if (($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') && isset($this->contents[$key . '_unformatted_number']) && preg_match('/^\d+$/', $val)) {
-				   	  	 require_once('modules/Currencies/Currency.php');
-				   	  	 $val = format_number($val);
-				   	  	 if($type == 'currency' && isset($this->contents[$key . '_currency_symbol']))
-				   	  	 {
-				   	  	 	$val = $this->contents[$key . '_currency_symbol'] . $val;
-				   	  	 }
-				   	  }
-				   }
-            	}
+                if(isset($searchModuleBean) && !empty($val) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $key, $match))
+                {
+                    $field = $match[2];
+                    if(isset($searchModuleBean->field_defs[$field]['type'])  && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
+                    {
+                            $type = $searchModuleBean->field_defs[$field]['type'];
+
+                            //Avoid macro values for the date types
+                            if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && preg_match('/^\d{4}-\d{2}-\d{2}$/', $val) && !preg_match('/^\[.*?\]$/', $val))
+                            {
+                                $val = $timedate->to_display_date($val, false);
+                            }  else if (($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') && isset($this->contents[$key . '_unformatted_number']) && preg_match('/^\d+$/', $val)) {
+                                require_once('modules/Currencies/Currency.php');
+                                $val = format_number($val);
+                                if($type == 'currency' && isset($this->contents[$key . '_currency_symbol']))
+                                {
+                                    $val = $this->contents[$key . '_currency_symbol'] . $val;
+                                }
+                            }
+                    }
+                }
 
                 $_REQUEST[$key] = $val;
                 $_GET[$key] = $val;

Spacing +58 added lines, -58 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.
@@ -88,9 +88,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function SavedSearch($columns = array(), $orderBy = null, $sortOrder = 'DESC'){
+	public function SavedSearch($columns = array(), $orderBy = null, $sortOrder = 'DESC') {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -109,8 +109,8 @@ 
 		$query = 'SELECT id, name FROM saved_search
 				  WHERE
 					deleted = \'0\' AND
-				  	assigned_user_id = \'' . $current_user->id . '\' AND
-					search_module =  \'' . $module . '\'
+				  	assigned_user_id = \'' . $current_user->id.'\' AND
+					search_module =  \'' . $module.'\'
 				  ORDER BY name';
 	    $result = $db->query($query, true, "Error filling in saved search list: ");
 
@@ -134,15 +134,15 @@ 
         $chooser->args['values_array'][0] = array();
         $chooser->args['values_array'][1] = array();
 
-        if(isset($_REQUEST['saved_search_select']) && $_REQUEST['saved_search_select']!='_none') {
+        if (isset($_REQUEST['saved_search_select']) && $_REQUEST['saved_search_select'] != '_none') {
             $this->retrieveSavedSearch($_REQUEST['saved_search_select']);
         }
 
-        if((!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') || (isset($this->contents['displayColumns']) && $this->contents['displayColumns'] != 'undefined')) {
+        if ((!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') || (isset($this->contents['displayColumns']) && $this->contents['displayColumns'] != 'undefined')) {
              // columns to display
-             if(!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') $temp_displayColumns = $_REQUEST['displayColumns'];
+             if (!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') $temp_displayColumns = $_REQUEST['displayColumns'];
              else $temp_displayColumns = $this->contents['displayColumns'];
-             foreach(explode('|', $temp_displayColumns) as $num => $name) {
+             foreach (explode('|', $temp_displayColumns) as $num => $name) {
              		if (!isset($this->columns[$name])) {
 						// Ignore any column that is not on the list.
              			continue;
@@ -150,33 +150,33 @@ 
                     $chooser->args['values_array'][0][$name] = trim(translate($this->columns[$name]['label'], $module), ':');
              }
              // columns not displayed
-             foreach(array_diff(array_keys($this->columns), array_values(explode('|', $temp_displayColumns))) as $num => $name) {
+             foreach (array_diff(array_keys($this->columns), array_values(explode('|', $temp_displayColumns))) as $num => $name) {
                     $chooser->args['values_array'][1][$name] = trim(translate($this->columns[$name]['label'], $module), ':');
              }
         }
         else {
-             foreach($this->columns as $name => $val) {
-                if(!empty($val['default']) && $val['default'])
+             foreach ($this->columns as $name => $val) {
+                if (!empty($val['default']) && $val['default'])
                     $chooser->args['values_array'][0][$name] = trim(translate($val['label'], $module), ':');
                 else
                     $chooser->args['values_array'][1][$name] = trim(translate($val['label'], $module), ':');
             }
         }
 
-        if(!empty($_REQUEST['sortOrder'])) $this->sortOrder = $_REQUEST['sortOrder'];
-        if(!empty($_REQUEST['orderBy'])) $this->orderBy = $_REQUEST['orderBy'];
+        if (!empty($_REQUEST['sortOrder'])) $this->sortOrder = $_REQUEST['sortOrder'];
+        if (!empty($_REQUEST['orderBy'])) $this->orderBy = $_REQUEST['orderBy'];
 
         $chooser->args['left_name'] = 'display_tabs';
         $chooser->args['right_name'] = 'hide_tabs';
         $chooser->args['alt_tip'] = $app_strings['LBL_SORT'];
 
-        $chooser->args['left_label'] =  $app_strings['LBL_DISPLAY_COLUMNS'];
-        $chooser->args['right_label'] =  $app_strings['LBL_HIDE_COLUMNS'];
-        $chooser->args['title'] =  '';
+        $chooser->args['left_label'] = $app_strings['LBL_DISPLAY_COLUMNS'];
+        $chooser->args['right_label'] = $app_strings['LBL_HIDE_COLUMNS'];
+        $chooser->args['title'] = '';
         $sugarSmarty->assign('columnChooser', $chooser->display());
 
         $sugarSmarty->assign('selectedOrderBy', $this->orderBy);
-        if(empty($this->sortOrder)) $this->sortOrder = 'ASC';
+        if (empty($this->sortOrder)) $this->sortOrder = 'ASC';
         $sugarSmarty->assign('selectedSortOrder', $this->sortOrder);
 
         $lastSavedView = (empty($_SESSION['LastSavedView'][$module]) ? '' : $_SESSION['LastSavedView'][$module]);
@@ -198,8 +198,8 @@ 
         $query = 'SELECT id, name FROM saved_search
                   WHERE
                     deleted = \'0\' AND
-                    assigned_user_id = \'' . $current_user->id . '\' AND
-                    search_module =  \'' . $module . '\'
+                    assigned_user_id = \'' . $current_user->id.'\' AND
+                    search_module =  \'' . $module.'\'
                   ORDER BY name';
         $result = $db->query($query, true, "Error filling in saved search list: ");
 
@@ -212,7 +212,7 @@ 
         $sugarSmarty->assign('SEARCH_MODULE', $module);
         $sugarSmarty->assign('MOD', $saved_search_mod_strings);
 
-        if(!empty($_SESSION['LastSavedView'][$module]) && (($_REQUEST['action'] == 'ListView') || ($_REQUEST['action'] == 'index')))
+        if (!empty($_SESSION['LastSavedView'][$module]) && (($_REQUEST['action'] == 'ListView') || ($_REQUEST['action'] == 'index')))
             $selectedSearch = $_SESSION['LastSavedView'][$module];
         else
             $selectedSearch = '';
@@ -222,7 +222,7 @@ 
         return $sugarSmarty->fetch('modules/SavedSearch/SavedSearchSelects.tpl');
     }
 
-    function returnSavedSearch($id, $searchFormTab = 'advanced_search', $showDiv='no') {
+    function returnSavedSearch($id, $searchFormTab = 'advanced_search', $showDiv = 'no') {
         global $db, $current_user, $currentModule;
         $this->retrieveSavedSearch($id);
 
@@ -230,22 +230,22 @@ 
 
         $saved_search_name = '';
         $header .= $this->contents['search_module'];
-        if(empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
+        if (empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
         $_SESSION['LastSavedView'][$this->contents['search_module']] = $id;
         $saved_search_id = $id;
         $saved_search_name = $this->name;
         $search_form_tab = $this->contents['searchFormTab'];
         $query = $this->contents['query'];
-        $orderBy = empty($this->contents['orderBy'])? 'name' : $this->contents['orderBy'];
+        $orderBy = empty($this->contents['orderBy']) ? 'name' : $this->contents['orderBy'];
         //Reduce the params to avoid the problems caused by URL max length in IE.
-        header($header . '&saved_search_select=' . $saved_search_id . '&saved_search_select_name=' . $saved_search_name . '&orderBy=' . $orderBy . '&sortOrder=' . $this->contents['sortOrder'] . '&query=' . $query . '&searchFormTab='. $search_form_tab .'&showSSDIV=' . $showDiv);
+        header($header.'&saved_search_select='.$saved_search_id.'&saved_search_select_name='.$saved_search_name.'&orderBy='.$orderBy.'&sortOrder='.$this->contents['sortOrder'].'&query='.$query.'&searchFormTab='.$search_form_tab.'&showSSDIV='.$showDiv);
 }
 
     function returnSavedSearchContents($id) {
 		global $db, $current_user, $currentModule;
 		$query = 'SELECT id, name, contents, search_module FROM saved_search
 				  WHERE
-				  	id = \'' . $id . '\'';
+				  	id = \'' . $id.'\'';
 	    $result = $db->query($query, true, "Error filling in saved search list: ");
 
 	    $header = 'Location: index.php?action=index&module=';
@@ -253,7 +253,7 @@ 
 	    $saved_search_name = '';
 	    while ($row = $db->fetchByAssoc($result, false)) {
 	        $header .= $row['search_module'];
-            if(empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
+            if (empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
             $_SESSION['LastSavedView'][$row['search_module']] = $row['id'];
 	        $contents = unserialize(base64_decode($row['contents']));
 	        $saved_search_id = $row['id'];
@@ -273,61 +273,61 @@ 
 		global $current_user, $timedate;
 
 		$focus = new SavedSearch();
-		if($id) $focus->retrieve($id);
+		if ($id) $focus->retrieve($id);
 
-		if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
+		if ($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
 			return null;
 		}
 
 		$ignored_inputs = array('PHPSESSID', 'module', 'action', 'saved_search_name', 'saved_search_select', 'advanced', 'Calls_divs', 'ACLRoles_divs');
 
         $contents = $_REQUEST;
-		if($id == null) $focus->name = $contents['saved_search_name'];
+		if ($id == null) $focus->name = $contents['saved_search_name'];
 		$focus->search_module = $contents['search_module'];
 
-		foreach($contents as $input=>$value)
+		foreach ($contents as $input=>$value)
 		{
-			if(in_array($input, $ignored_inputs))
+			if (in_array($input, $ignored_inputs))
 			{
 				unset($contents[$input]);
 				continue;
 			}
 
 			//Filter date fields to ensure it is saved to DB format, but also avoid empty values
-			if(!empty($value) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $input, $match))
+			if (!empty($value) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $input, $match))
 			{
 			   $field = $match[2];
-			   if(isset($searchModuleBean->field_defs[$field]['type']) && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
+			   if (isset($searchModuleBean->field_defs[$field]['type']) && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
 			   {
 			   	  $type = $searchModuleBean->field_defs[$field]['type'];
 
 			   	  //Avoid macro values for the date types
-			   	  if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && !preg_match('/^\[.*?\]$/', $value))
+			   	  if (($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && !preg_match('/^\[.*?\]$/', $value))
 			   	  {
 			   	  	 $db_format = $timedate->to_db_date($value, false);
 			   	  	 $contents[$input] = $db_format;
 			   	  } else if ($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') {
 
-			   	  	if(preg_match('/[^\d]/', $value)) {
+			   	  	if (preg_match('/[^\d]/', $value)) {
 				   	  	 require_once('modules/Currencies/Currency.php');
 				   	  	 $contents[$input] = unformat_number($value);
 				   	  	 //Flag this value as having been unformatted
-				   	  	 $contents[$input . '_unformatted_number'] = true;
+				   	  	 $contents[$input.'_unformatted_number'] = true;
 				   	  	 //If the type is of currency and there was a currency symbol (non-digit), save the symbol
-				   	  	 if($type == 'currency' && preg_match('/^([^\d])/', $value, $match))
+				   	  	 if ($type == 'currency' && preg_match('/^([^\d])/', $value, $match))
 				   	  	 {
-				   	  	 	$contents[$input . '_currency_symbol'] = $match[1];
+				   	  	 	$contents[$input.'_currency_symbol'] = $match[1];
 				   	  	 }
 			   	  	} else {
 			   	  		 //unset any flags
-			   	  		 if(isset($contents[$input . '_unformatted_number']))
+			   	  		 if (isset($contents[$input.'_unformatted_number']))
 			   	  		 {
-			   	  		 	unset($contents[$input . '_unformatted_number']);
+			   	  		 	unset($contents[$input.'_unformatted_number']);
 			   	  		 }
 
-			   	  		 if(isset($contents[$input . '_currency_symbol']))
+			   	  		 if (isset($contents[$input.'_currency_symbol']))
 			   	  		 {
-			   	  		 	unset($contents[$input . '_currency_symbol']);
+			   	  		 	unset($contents[$input.'_currency_symbol']);
 			   	  		 }
 			   	  	}
 			   	  }
@@ -345,11 +345,11 @@ 
 
 		$saved_search_id = $focus->save();
 
-		$GLOBALS['log']->debug("Saved record with id of " . $focus->id);
-		$orderBy = empty($contents['orderBy'])? 'name' : $contents['orderBy'];
-        $search_query = "&orderBy=" . $orderBy . "&sortOrder=".$contents['sortOrder'] . "&query=" . $_REQUEST['query'] . "&searchFormTab=" . $_REQUEST['searchFormTab'].'&showSSDIV=' . $contents['showSSDIV'];
+		$GLOBALS['log']->debug("Saved record with id of ".$focus->id);
+		$orderBy = empty($contents['orderBy']) ? 'name' : $contents['orderBy'];
+        $search_query = "&orderBy=".$orderBy."&sortOrder=".$contents['sortOrder']."&query=".$_REQUEST['query']."&searchFormTab=".$_REQUEST['searchFormTab'].'&showSSDIV='.$contents['showSSDIV'];
 
-        if($redirect)
+        if ($redirect)
         {
         	$this->handleRedirect($focus->search_module, $search_query, $saved_search_id, 'true');
         }
@@ -358,7 +358,7 @@ 
 	function handleRedirect($return_module, $search_query, $saved_search_id, $advanced = 'false') {
         $_SESSION['LastSavedView'][$return_module] = $saved_search_id;
         $return_action = 'index';
-        $ajaxLoad = empty($_REQUEST['ajax_load']) ? "" : "&ajax_load=" . $_REQUEST['ajax_load'];
+        $ajaxLoad = empty($_REQUEST['ajax_load']) ? "" : "&ajax_load=".$_REQUEST['ajax_load'];
         //Reduce the params to avoid the problems caused by URL max length in IE ( the reduced params can be get from saved search according to saved_search_id).
         header("Location: index.php?action=$return_action&module=$return_module&saved_search_select={$saved_search_id}{$search_query}&advanced={$advanced}$ajaxLoad");
         die();
@@ -378,34 +378,34 @@ 
         $this->contents = unserialize(base64_decode($this->contents));
     }
 
-    function populateRequest(){
+    function populateRequest() {
 
     	global $timedate;
 
-        if(isset($this->contents['search_module']))
+        if (isset($this->contents['search_module']))
         {
            $searchModuleBean = loadBean($this->contents['search_module']);
         }
 
-        foreach($this->contents as $key=>$val){
-            if($key != 'advanced' && $key != 'module' && !strpos($key, '_ORDER_BY') && $key != 'lvso') {
-            	if(isset($searchModuleBean) && !empty($val) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $key, $match))
+        foreach ($this->contents as $key=>$val) {
+            if ($key != 'advanced' && $key != 'module' && !strpos($key, '_ORDER_BY') && $key != 'lvso') {
+            	if (isset($searchModuleBean) && !empty($val) && preg_match('/^(start_range_|end_range_|range_)?(.*?)(_advanced|_basic)$/', $key, $match))
             	{
             	   $field = $match[2];
-				   if(isset($searchModuleBean->field_defs[$field]['type'])  && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
+				   if (isset($searchModuleBean->field_defs[$field]['type']) && empty($searchModuleBean->field_defs[$field]['disable_num_format']))
 				   {
 				   	  $type = $searchModuleBean->field_defs[$field]['type'];
 
 				   	  //Avoid macro values for the date types
-				   	  if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && preg_match('/^\d{4}-\d{2}-\d{2}$/', $val) && !preg_match('/^\[.*?\]$/', $val))
+				   	  if (($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && preg_match('/^\d{4}-\d{2}-\d{2}$/', $val) && !preg_match('/^\[.*?\]$/', $val))
 				   	  {
 				   	  	 $val = $timedate->to_display_date($val, false);
-				   	  }  else if (($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') && isset($this->contents[$key . '_unformatted_number']) && preg_match('/^\d+$/', $val)) {
+				   	  } else if (($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') && isset($this->contents[$key.'_unformatted_number']) && preg_match('/^\d+$/', $val)) {
 				   	  	 require_once('modules/Currencies/Currency.php');
 				   	  	 $val = format_number($val);
-				   	  	 if($type == 'currency' && isset($this->contents[$key . '_currency_symbol']))
+				   	  	 if ($type == 'currency' && isset($this->contents[$key.'_currency_symbol']))
 				   	  	 {
-				   	  	 	$val = $this->contents[$key . '_currency_symbol'] . $val;
+				   	  	 	$val = $this->contents[$key.'_currency_symbol'].$val;
 				   	  	 }
 				   	  }
 				   }

Braces +42 added lines, -23 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.
@@ -92,8 +94,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct($columns, $orderBy, $sortOrder);
@@ -140,8 +141,11 @@ 
 
         if((!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') || (isset($this->contents['displayColumns']) && $this->contents['displayColumns'] != 'undefined')) {
              // columns to display
-             if(!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') $temp_displayColumns = $_REQUEST['displayColumns'];
-             else $temp_displayColumns = $this->contents['displayColumns'];
+             if(!empty($_REQUEST['displayColumns']) && $_REQUEST['displayColumns'] != 'undefined') {
+                 $temp_displayColumns = $_REQUEST['displayColumns'];
+             } else {
+                 $temp_displayColumns = $this->contents['displayColumns'];
+             }
              foreach(explode('|', $temp_displayColumns) as $num => $name) {
              		if (!isset($this->columns[$name])) {
 						// Ignore any column that is not on the list.
@@ -153,18 +157,22 @@ 
              foreach(array_diff(array_keys($this->columns), array_values(explode('|', $temp_displayColumns))) as $num => $name) {
                     $chooser->args['values_array'][1][$name] = trim(translate($this->columns[$name]['label'], $module), ':');
              }
-        }
-        else {
+        } else {
              foreach($this->columns as $name => $val) {
-                if(!empty($val['default']) && $val['default'])
-                    $chooser->args['values_array'][0][$name] = trim(translate($val['label'], $module), ':');
-                else
-                    $chooser->args['values_array'][1][$name] = trim(translate($val['label'], $module), ':');
+                if(!empty($val['default']) && $val['default']) {
+                                    $chooser->args['values_array'][0][$name] = trim(translate($val['label'], $module), ':');
+                } else {
+                                    $chooser->args['values_array'][1][$name] = trim(translate($val['label'], $module), ':');
+                }
             }
         }
 
-        if(!empty($_REQUEST['sortOrder'])) $this->sortOrder = $_REQUEST['sortOrder'];
-        if(!empty($_REQUEST['orderBy'])) $this->orderBy = $_REQUEST['orderBy'];
+        if(!empty($_REQUEST['sortOrder'])) {
+            $this->sortOrder = $_REQUEST['sortOrder'];
+        }
+        if(!empty($_REQUEST['orderBy'])) {
+            $this->orderBy = $_REQUEST['orderBy'];
+        }
 
         $chooser->args['left_name'] = 'display_tabs';
         $chooser->args['right_name'] = 'hide_tabs';
@@ -176,7 +184,9 @@ 
         $sugarSmarty->assign('columnChooser', $chooser->display());
 
         $sugarSmarty->assign('selectedOrderBy', $this->orderBy);
-        if(empty($this->sortOrder)) $this->sortOrder = 'ASC';
+        if(empty($this->sortOrder)) {
+            $this->sortOrder = 'ASC';
+        }
         $sugarSmarty->assign('selectedSortOrder', $this->sortOrder);
 
         $lastSavedView = (empty($_SESSION['LastSavedView'][$module]) ? '' : $_SESSION['LastSavedView'][$module]);
@@ -212,10 +222,11 @@ 
         $sugarSmarty->assign('SEARCH_MODULE', $module);
         $sugarSmarty->assign('MOD', $saved_search_mod_strings);
 
-        if(!empty($_SESSION['LastSavedView'][$module]) && (($_REQUEST['action'] == 'ListView') || ($_REQUEST['action'] == 'index')))
-            $selectedSearch = $_SESSION['LastSavedView'][$module];
-        else
-            $selectedSearch = '';
+        if(!empty($_SESSION['LastSavedView'][$module]) && (($_REQUEST['action'] == 'ListView') || ($_REQUEST['action'] == 'index'))) {
+                    $selectedSearch = $_SESSION['LastSavedView'][$module];
+        } else {
+                    $selectedSearch = '';
+        }
 
         $sugarSmarty->assign('SAVED_SEARCHES_OPTIONS', get_select_options_with_id($savedSearchArray, $selectedSearch));
 
@@ -230,7 +241,9 @@ 
 
         $saved_search_name = '';
         $header .= $this->contents['search_module'];
-        if(empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
+        if(empty($_SESSION['LastSavedView'])) {
+            $_SESSION['LastSavedView'] = array();
+        }
         $_SESSION['LastSavedView'][$this->contents['search_module']] = $id;
         $saved_search_id = $id;
         $saved_search_name = $this->name;
@@ -253,7 +266,9 @@ 
 	    $saved_search_name = '';
 	    while ($row = $db->fetchByAssoc($result, false)) {
 	        $header .= $row['search_module'];
-            if(empty($_SESSION['LastSavedView'])) $_SESSION['LastSavedView'] = array();
+            if(empty($_SESSION['LastSavedView'])) {
+                $_SESSION['LastSavedView'] = array();
+            }
             $_SESSION['LastSavedView'][$row['search_module']] = $row['id'];
 	        $contents = unserialize(base64_decode($row['contents']));
 	        $saved_search_id = $row['id'];
@@ -273,7 +288,9 @@ 
 		global $current_user, $timedate;
 
 		$focus = new SavedSearch();
-		if($id) $focus->retrieve($id);
+		if($id) {
+		    $focus->retrieve($id);
+		}
 
 		if($useRequired && !checkRequired($prefix, array_keys($focus->required_fields))) {
 			return null;
@@ -282,7 +299,9 @@ 
 		$ignored_inputs = array('PHPSESSID', 'module', 'action', 'saved_search_name', 'saved_search_select', 'advanced', 'Calls_divs', 'ACLRoles_divs');
 
         $contents = $_REQUEST;
-		if($id == null) $focus->name = $contents['saved_search_name'];
+		if($id == null) {
+		    $focus->name = $contents['saved_search_name'];
+		}
 		$focus->search_module = $contents['search_module'];
 
 		foreach($contents as $input=>$value)
@@ -400,7 +419,7 @@ 
 				   	  if(($type == 'date' || $type == 'datetime' || $type == 'datetimecombo') && preg_match('/^\d{4}-\d{2}-\d{2}$/', $val) && !preg_match('/^\[.*?\]$/', $val))
 				   	  {
 				   	  	 $val = $timedate->to_display_date($val, false);
-				   	  }  else if (($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') && isset($this->contents[$key . '_unformatted_number']) && preg_match('/^\d+$/', $val)) {
+				   	  } else if (($type == 'int' || $type == 'currency' || $type == 'decimal' || $type == 'float') && isset($this->contents[$key . '_unformatted_number']) && preg_match('/^\d+$/', $val)) {
 				   	  	 require_once('modules/Currencies/Currency.php');
 				   	  	 $val = format_number($val);
 				   	  	 if($type == 'currency' && isset($this->contents[$key . '_currency_symbol']))

modules/AOD_IndexEvent/AOD_IndexEvent_sugar.php

Spacing +6 added lines, -6 removed lines

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

Braces +1 added lines, -2 removed lines

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

modules/AOD_IndexEvent/AOD_IndexEvent.php

Indentation +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
 require_once('modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php');
 class AM_TaskTemplates extends AM_TaskTemplates_sugar {
 
-	public function __construct(){
-		parent::__construct();
-	}
+    public function __construct(){
+        parent::__construct();
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead

Spacing +3 added lines, -3 removed lines

@@ -43,16 +43,16 @@
 require_once('modules/AOD_IndexEvent/AOD_IndexEvent_sugar.php');
 class AOD_IndexEvent extends AOD_IndexEvent_sugar {
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function AOD_IndexEvent(){
+    public function AOD_IndexEvent() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +1 added lines, -2 removed lines

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

modules/EmailTemplates/views/view.classic.php

Spacing +4 added lines, -4 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 is a customer relationship management program developed by
@@ -47,7 +47,7 @@ 
 
 class EmailTemplatesViewClassic extends ViewClassic {
 
- 	function __construct(){
+ 	function __construct() {
 
 		/* BEGIN - SECURITY GROUPS - The whole file is custom but the purpose is the following code */
         //turn on normal display of subpanels
@@ -60,9 +60,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function EmailTemplatesViewClassic(){
+    function EmailTemplatesViewClassic() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups_sugar.php

Spacing +6 added lines, -6 removed lines

@@ -38,18 +38,18 @@ 
 	var $table_name = 'aos_line_item_groups';
 	var $tracker_visibility = false;
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AOS_Line_Item_Groups_sugar(){
+    function AOS_Line_Item_Groups_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -59,8 +59,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return false;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

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

modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups.php

Spacing +10 added lines, -10 removed lines

@@ -51,9 +51,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AOS_Line_Item_Groups(){
+    function AOS_Line_Item_Groups() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -67,18 +67,18 @@ 
     {
 
         $groups = array();
-        $group_count = isset($post_data[$key . 'group_number']) ? count($post_data[$key . 'group_number']) : 0;
+        $group_count = isset($post_data[$key.'group_number']) ? count($post_data[$key.'group_number']) : 0;
         $j = 0;
         for ($i = 0; $i < $group_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $product_quote_group = new AOS_Line_Item_Groups();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        $product_quote_group->$field_name = $post_data[$key . $field_name][$i];
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        $product_quote_group->$field_name = $post_data[$key.$field_name][$i];
                     }
                 }
                 $product_quote_group->number = ++$j;
@@ -87,10 +87,10 @@ 
                 $product_quote_group->parent_id = $parent->id;
                 $product_quote_group->parent_type = $parent->object_name;
                 $product_quote_group->save();
-                $post_data[$key . 'id'][$i] = $product_quote_group->id;
+                $post_data[$key.'id'][$i] = $product_quote_group->id;
 
-                if (isset($post_data[$key . 'group_number'][$i])) {
-                    $groups[$post_data[$key . 'group_number'][$i]] = $product_quote_group->id;
+                if (isset($post_data[$key.'group_number'][$i])) {
+                    $groups[$post_data[$key.'group_number'][$i]] = $product_quote_group->id;
                 }
 
             }

Braces +1 added lines, -2 removed lines

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

modules/AOK_KnowledgeBase/views/view.detail.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');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -41,16 +41,16 @@ 
 require_once('include/MVC/View/views/view.detail.php');
 
 class AOK_KnowledgeBaseViewDetail extends ViewDetail {
-    function __construct(){
+    function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AOK_KnowledgeBaseViewDetail(){
+    function AOK_KnowledgeBaseViewDetail() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -60,13 +60,13 @@ 
     }
 
 
-    function display(){
+    function display() {
         $this->setDecodeHTML();
         parent::display();
     }
 
-    function setDecodeHTML(){
-        $this->bean->description = html_entity_decode(str_replace('&nbsp;',' ',$this->bean->description));
+    function setDecodeHTML() {
+        $this->bean->description = html_entity_decode(str_replace('&nbsp;', ' ', $this->bean->description));
     }
 }
 ?>
\ No newline at end of file

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();