adamjakab / SuiteCRM

modules/ModuleBuilder/Module/MainTree.php

Indentation +6 added lines, -6 removed lines

@@ -40,12 +40,12 @@
 require_once('modules/ModuleBuilder/MB/MBPackageTree.php');
 require_once('modules/ModuleBuilder/Module/StudioBrowser.php');
 class MainTree extends MBPackageTree{
-	function __construct(){
-		$this->tree = new Tree('package_tree');
-		$this->tree->id = 'package_tree';
-		$this->mb = new StudioBrowser();
-		$this->populateTree(array(), $this->tree);
-	}
+    function __construct(){
+        $this->tree = new Tree('package_tree');
+        $this->tree->id = 'package_tree';
+        $this->mb = new StudioBrowser();
+        $this->populateTree(array(), $this->tree);
+    }
 
     /**
      * @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 +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
 
 require_once('modules/ModuleBuilder/MB/MBPackageTree.php');
 require_once('modules/ModuleBuilder/Module/StudioBrowser.php');
-class MainTree extends MBPackageTree{
-	function __construct(){
+class MainTree extends MBPackageTree {
+	function __construct() {
 		$this->tree = new Tree('package_tree');
 		$this->tree->id = 'package_tree';
 		$this->mb = new StudioBrowser();
@@ -50,9 +50,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 MainTree(){
+    function MainTree() {
         $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/ModuleBuilder/Module/StudioTree.php

Spacing +5 added lines, -5 removed lines

@@ -39,8 +39,8 @@ 
 
 require_once('modules/ModuleBuilder/MB/MBPackageTree.php');
 require_once('modules/ModuleBuilder/Module/StudioBrowser.php');
-class StudioTree extends MBPackageTree{
-	function __construct(){
+class StudioTree extends MBPackageTree {
+	function __construct() {
 		$this->tree = new Tree('package_tree');
 		$this->tree->id = 'package_tree';
 		$this->mb = new StudioBrowser();
@@ -50,9 +50,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 StudioTree(){
+    function StudioTree() {
         $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 {
@@ -62,7 +62,7 @@ 
     }
 
 
-	function getName(){
+	function getName() {
 		return translate('LBL_SECTION_MODULES');
 	}
 

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/Roles/Role.php

Indentation +123 added lines, -123 removed lines

@@ -52,29 +52,29 @@ 
 
 class Role extends SugarBean {
 
-	var $field_name_map;
-
-	var $id;
-	var $deleted;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $created_by;
-	var $name;
-	var $description;
-	var $modules;
-	var $disable_row_level_security = true;
-
-	var $table_name = 'roles';
-	var $rel_module_table = 'roles_modules';
-	var $object_name = 'Role';
-	var $module_dir = 'Roles';
-	var $new_schema = true;
+    var $field_name_map;
+
+    var $id;
+    var $deleted;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $created_by;
+    var $name;
+    var $description;
+    var $modules;
+    var $disable_row_level_security = true;
+
+    var $table_name = 'roles';
+    var $rel_module_table = 'roles_modules';
+    var $object_name = 'Role';
+    var $module_dir = 'Roles';
+    var $new_schema = true;
 
     public function __construct()
-	{
-		parent::__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
@@ -91,129 +91,129 @@ 
     }
 
 
-	function get_summary_text()
-	{
-		return $this->name;
-	}
-
-	function create_export_query($order_by, $where)
-	{
-		return $this->create_new_list_query($order_by, $where);
-	}
+    function get_summary_text()
+    {
+        return $this->name;
+    }
 
-	function query_modules($allow = 1)
-	{
-		$query = "SELECT module_id FROM roles_modules WHERE ";
-		$query .= "role_id = '$this->id' AND allow = '$allow' AND deleted=0";
-		$result = $this->db->query($query);
+    function create_export_query($order_by, $where)
+    {
+        return $this->create_new_list_query($order_by, $where);
+    }
 
-		$return_array = array();
-
-		while($row = $this->db->fetchByAssoc($result))
-		{
-			array_push($return_array, $row['module_id']);
-		}
+    function query_modules($allow = 1)
+    {
+        $query = "SELECT module_id FROM roles_modules WHERE ";
+        $query .= "role_id = '$this->id' AND allow = '$allow' AND deleted=0";
+        $result = $this->db->query($query);
 
-		return $return_array;
-	}
-	function set_module_relationship($role_id, &$mod_ids, $allow)
-	{
-		foreach($mod_ids as $mod_id)
-		{
-			if($mod_id != '')
-				$this->set_relationship('roles_modules', array( 'module_id'=>$mod_id, 'role_id'=>$role_id, 'allow'=>$allow ));
-		}
-	}
+        $return_array = array();
 
-	function clear_module_relationship($role_id)
-	{
-		$query = "DELETE FROM roles_modules WHERE role_id='$role_id'";
-		$this->db->query($query);
-	}
+        while($row = $this->db->fetchByAssoc($result))
+        {
+            array_push($return_array, $row['module_id']);
+        }
 
-	function set_user_relationship($role_id, &$user_ids)
-	{
-		foreach($user_ids as $user_id)
-		{
-			if($user_id != '')
-				$this->set_relationship('roles_users', array( 'user_id'=>$user_id, 'role_id'=>$role_id ));
-		}
-	}
+        return $return_array;
+    }
+    function set_module_relationship($role_id, &$mod_ids, $allow)
+    {
+        foreach($mod_ids as $mod_id)
+        {
+            if($mod_id != '')
+                $this->set_relationship('roles_modules', array( 'module_id'=>$mod_id, 'role_id'=>$role_id, 'allow'=>$allow ));
+        }
+    }
 
-	function clear_user_relationship($role_id, $user_id)
-	{
-		$query = "DELETE FROM roles_users WHERE role_id='$role_id' AND user_id='$user_id'";
-		$this->db->query($query);
-	}
+    function clear_module_relationship($role_id)
+    {
+        $query = "DELETE FROM roles_modules WHERE role_id='$role_id'";
+        $this->db->query($query);
+    }
 
-	function query_user_allowed_modules($user_id)
-	{
-		$userArray = array();
-		global $app_list_strings;
+    function set_user_relationship($role_id, &$user_ids)
+    {
+        foreach($user_ids as $user_id)
+        {
+            if($user_id != '')
+                $this->set_relationship('roles_users', array( 'user_id'=>$user_id, 'role_id'=>$role_id ));
+        }
+    }
 
+    function clear_user_relationship($role_id, $user_id)
+    {
+        $query = "DELETE FROM roles_users WHERE role_id='$role_id' AND user_id='$user_id'";
+        $this->db->query($query);
+    }
 
+    function query_user_allowed_modules($user_id)
+    {
+        $userArray = array();
+        global $app_list_strings;
 
-		$sql = "SELECT role_id FROM roles_users WHERE user_id='$user_id'";
 
-		$result = $this->db->query($sql);
 
-		while($row = $this->db->fetchByAssoc($result))
-		{
-			$role_id = $row["role_id"];
-			$sql = "SELECT module_id FROM roles_modules WHERE role_id='$role_id' AND allow='1'";
-			$res = $this->db->query($sql);
+        $sql = "SELECT role_id FROM roles_users WHERE user_id='$user_id'";
 
-			while($col = $this->db->fetchByAssoc($res))
-			{
-				$key = $col['module_id'];
-				if(!(array_key_exists($key, $userArray)))
-				{
-					$userArray[$key] = $app_list_strings['moduleList'][$key];
-				}
-			}
-		}
+        $result = $this->db->query($sql);
 
-		return $userArray;
-	}
+        while($row = $this->db->fetchByAssoc($result))
+        {
+            $role_id = $row["role_id"];
+            $sql = "SELECT module_id FROM roles_modules WHERE role_id='$role_id' AND allow='1'";
+            $res = $this->db->query($sql);
 
-	function query_user_disallowed_modules($user_id, &$allowed)
-	{
-		global $moduleList;
+            while($col = $this->db->fetchByAssoc($res))
+            {
+                $key = $col['module_id'];
+                if(!(array_key_exists($key, $userArray)))
+                {
+                    $userArray[$key] = $app_list_strings['moduleList'][$key];
+                }
+            }
+        }
 
-		$returnArray = array();
+        return $userArray;
+    }
 
-		foreach($moduleList as $key=>$val)
-		{
-			if(array_key_exists($val, $allowed))
-				continue;
-			$returnArray[$val] = $val;
-		}
+    function query_user_disallowed_modules($user_id, &$allowed)
+    {
+        global $moduleList;
 
-		return $returnArray;
-
-	}
-
-	function get_users()
-	{
-		// First, get the list of IDs.
-
-
-
-		$query = "SELECT user_id as id FROM roles_users WHERE role_id='$this->id' AND deleted=0";
+        $returnArray = array();
+
+        foreach($moduleList as $key=>$val)
+        {
+            if(array_key_exists($val, $allowed))
+                continue;
+            $returnArray[$val] = $val;
+        }
+
+        return $returnArray;
+
+    }
+
+    function get_users()
+    {
+        // First, get the list of IDs.
 
-		return $this->build_related_list($query, new User());
-	}
 
-	function check_user_role_count($user_id)
-	{
-		$query =  "SELECT count(*) AS num FROM roles_users WHERE ";
-		$query .= "user_id='$user_id' AND deleted=0";
-		$result = $this->db->query($query);
-
-		$row = $this->db->fetchByAssoc($result);
 
-		return $row['num'];
-	}
+        $query = "SELECT user_id as id FROM roles_users WHERE role_id='$this->id' AND deleted=0";
+
+        return $this->build_related_list($query, new User());
+    }
+
+    function check_user_role_count($user_id)
+    {
+        $query =  "SELECT count(*) AS num FROM roles_users WHERE ";
+        $query .= "user_id='$user_id' AND deleted=0";
+        $result = $this->db->query($query);
+
+        $row = $this->db->fetchByAssoc($result);
+
+        return $row['num'];
+    }
 
 }
 

Spacing +16 added lines, -16 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.
@@ -79,9 +79,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 Role(){
+    public function Role() {
         $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,7 +109,7 @@ 
 
 		$return_array = array();
 
-		while($row = $this->db->fetchByAssoc($result))
+		while ($row = $this->db->fetchByAssoc($result))
 		{
 			array_push($return_array, $row['module_id']);
 		}
@@ -118,10 +118,10 @@ 
 	}
 	function set_module_relationship($role_id, &$mod_ids, $allow)
 	{
-		foreach($mod_ids as $mod_id)
+		foreach ($mod_ids as $mod_id)
 		{
-			if($mod_id != '')
-				$this->set_relationship('roles_modules', array( 'module_id'=>$mod_id, 'role_id'=>$role_id, 'allow'=>$allow ));
+			if ($mod_id != '')
+				$this->set_relationship('roles_modules', array('module_id'=>$mod_id, 'role_id'=>$role_id, 'allow'=>$allow));
 		}
 	}
 
@@ -133,10 +133,10 @@ 
 
 	function set_user_relationship($role_id, &$user_ids)
 	{
-		foreach($user_ids as $user_id)
+		foreach ($user_ids as $user_id)
 		{
-			if($user_id != '')
-				$this->set_relationship('roles_users', array( 'user_id'=>$user_id, 'role_id'=>$role_id ));
+			if ($user_id != '')
+				$this->set_relationship('roles_users', array('user_id'=>$user_id, 'role_id'=>$role_id));
 		}
 	}
 
@@ -157,16 +157,16 @@ 
 
 		$result = $this->db->query($sql);
 
-		while($row = $this->db->fetchByAssoc($result))
+		while ($row = $this->db->fetchByAssoc($result))
 		{
 			$role_id = $row["role_id"];
 			$sql = "SELECT module_id FROM roles_modules WHERE role_id='$role_id' AND allow='1'";
 			$res = $this->db->query($sql);
 
-			while($col = $this->db->fetchByAssoc($res))
+			while ($col = $this->db->fetchByAssoc($res))
 			{
 				$key = $col['module_id'];
-				if(!(array_key_exists($key, $userArray)))
+				if (!(array_key_exists($key, $userArray)))
 				{
 					$userArray[$key] = $app_list_strings['moduleList'][$key];
 				}
@@ -182,9 +182,9 @@ 
 
 		$returnArray = array();
 
-		foreach($moduleList as $key=>$val)
+		foreach ($moduleList as $key=>$val)
 		{
-			if(array_key_exists($val, $allowed))
+			if (array_key_exists($val, $allowed))
 				continue;
 			$returnArray[$val] = $val;
 		}
@@ -206,7 +206,7 @@ 
 
 	function check_user_role_count($user_id)
 	{
-		$query =  "SELECT count(*) AS num FROM roles_users WHERE ";
+		$query = "SELECT count(*) AS num FROM roles_users WHERE ";
 		$query .= "user_id='$user_id' AND deleted=0";
 		$result = $this->db->query($query);
 

Braces +13 added lines, -9 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.
@@ -83,8 +85,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();
@@ -120,8 +121,9 @@ 
 	{
 		foreach($mod_ids as $mod_id)
 		{
-			if($mod_id != '')
-				$this->set_relationship('roles_modules', array( 'module_id'=>$mod_id, 'role_id'=>$role_id, 'allow'=>$allow ));
+			if($mod_id != '') {
+							$this->set_relationship('roles_modules', array( 'module_id'=>$mod_id, 'role_id'=>$role_id, 'allow'=>$allow ));
+			}
 		}
 	}
 
@@ -135,8 +137,9 @@ 
 	{
 		foreach($user_ids as $user_id)
 		{
-			if($user_id != '')
-				$this->set_relationship('roles_users', array( 'user_id'=>$user_id, 'role_id'=>$role_id ));
+			if($user_id != '') {
+							$this->set_relationship('roles_users', array( 'user_id'=>$user_id, 'role_id'=>$role_id ));
+			}
 		}
 	}
 
@@ -184,8 +187,9 @@ 
 
 		foreach($moduleList as $key=>$val)
 		{
-			if(array_key_exists($val, $allowed))
-				continue;
+			if(array_key_exists($val, $allowed)) {
+							continue;
+			}
 			$returnArray[$val] = $val;
 		}
 

modules/Leads/LeadsListViewSmarty.php

Spacing +10 added lines, -10 removed lines

@@ -5,7 +5,7 @@ 
 
 class LeadsListViewSmarty extends ListViewSmarty {
 
-	function __construct(){
+	function __construct() {
 
 		parent::__construct();
 		$this->targetList = true;
@@ -15,9 +15,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 LeadsListViewSmarty(){
+    function LeadsListViewSmarty() {
         $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 {
@@ -30,25 +30,25 @@ 
 	function process($file, $data, $htmlVar) {
 		parent::process($file, $data, $htmlVar);
 
-        	if(!ACLController::checkAccess($this->seed->module_dir,'export',true) || !$this->export) {
+        	if (!ACLController::checkAccess($this->seed->module_dir, 'export', true) || !$this->export) {
 			$this->ss->assign('exportLink', $this->buildExportLink());
 		}
 	}
 
-	function buildExportLink($id = 'export_link'){
+	function buildExportLink($id = 'export_link') {
 		global $app_strings;
 		global $sugar_config;
 
 		$script = "";
-		if(ACLController::checkAccess($this->seed->module_dir,'export',true)) {
-			if($this->export) {
+		if (ACLController::checkAccess($this->seed->module_dir, 'export', true)) {
+			if ($this->export) {
                 		$script = parent::buildExportLink($id);
             		}
         	}
 
-            $script .= "<a href='javascript:void(0)' id='map_listview_top' " .
-                    " onclick=\"return sListView.send_form(true, 'jjwg_Maps', " .
-                    "'index.php?entryPoint=jjwg_Maps&display_module={$_REQUEST['module']}', " .
+            $script .= "<a href='javascript:void(0)' id='map_listview_top' ".
+                    " onclick=\"return sListView.send_form(true, 'jjwg_Maps', ".
+                    "'index.php?entryPoint=jjwg_Maps&display_module={$_REQUEST['module']}', ".
                     "'{$app_strings['LBL_LISTVIEW_NO_SELECTED']}')\">{$app_strings['LBL_MAP']}</a>";
 
 		return formLetter::LVSmarty().$script;

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/Leads/Lead.php

Indentation +430 added lines, -430 removed lines

@@ -59,97 +59,97 @@ 
 
 // Lead is used to store profile information for people who may become customers.
 class Lead extends Person {
-	var $field_name_map;
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $assigned_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $description;
-	var $salutation;
-	var $first_name;
-	var $last_name;
-	var $title;
-	var $department;
-	var $reports_to_id;
-	var $do_not_call;
-	var $phone_home;
-	var $phone_mobile;
-	var $phone_work;
-	var $phone_other;
-	var $phone_fax;
-	var $refered_by;
-	var $email1;
-	var $email2;
-	var $primary_address_street;
-	var $primary_address_city;
-	var $primary_address_state;
-	var $primary_address_postalcode;
-	var $primary_address_country;
-	var $alt_address_street;
-	var $alt_address_city;
-	var $alt_address_state;
-	var $alt_address_postalcode;
-	var $alt_address_country;
-	var $name;
-	var $full_name;
-	var $portal_name;
-	var $portal_app;
-	var $contact_id;
-	var $contact_name;
-	var $account_id;
-	var $opportunity_id;
-	var $opportunity_name;
-	var $opportunity_amount;
-	//used for vcard export only
-	var $birthdate;
-	var $status;
-	var $status_description;
-
-	var $lead_source;
-	var $lead_source_description;
-	// These are for related fields
-	var $account_name;
-	var $acc_name_from_accounts;
-	var $account_site;
-	var $account_description;
-	var $case_role;
-	var $case_rel_id;
-	var $case_id;
-	var $task_id;
-	var $note_id;
-	var $meeting_id;
-	var $call_id;
-	var $email_id;
-	var $assigned_user_name;
-	var $campaign_id;
-	var $campaign_name;
+    var $field_name_map;
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $assigned_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $description;
+    var $salutation;
+    var $first_name;
+    var $last_name;
+    var $title;
+    var $department;
+    var $reports_to_id;
+    var $do_not_call;
+    var $phone_home;
+    var $phone_mobile;
+    var $phone_work;
+    var $phone_other;
+    var $phone_fax;
+    var $refered_by;
+    var $email1;
+    var $email2;
+    var $primary_address_street;
+    var $primary_address_city;
+    var $primary_address_state;
+    var $primary_address_postalcode;
+    var $primary_address_country;
+    var $alt_address_street;
+    var $alt_address_city;
+    var $alt_address_state;
+    var $alt_address_postalcode;
+    var $alt_address_country;
+    var $name;
+    var $full_name;
+    var $portal_name;
+    var $portal_app;
+    var $contact_id;
+    var $contact_name;
+    var $account_id;
+    var $opportunity_id;
+    var $opportunity_name;
+    var $opportunity_amount;
+    //used for vcard export only
+    var $birthdate;
+    var $status;
+    var $status_description;
+
+    var $lead_source;
+    var $lead_source_description;
+    // These are for related fields
+    var $account_name;
+    var $acc_name_from_accounts;
+    var $account_site;
+    var $account_description;
+    var $case_role;
+    var $case_rel_id;
+    var $case_id;
+    var $task_id;
+    var $note_id;
+    var $meeting_id;
+    var $call_id;
+    var $email_id;
+    var $assigned_user_name;
+    var $campaign_id;
+    var $campaign_name;
     var $alt_address_street_2;
     var $alt_address_street_3;
     var $primary_address_street_2;
     var $primary_address_street_3;
 
 
-	var $table_name = "leads";
-	var $object_name = "Lead";
-	var $object_names = "Leads";
-	var $module_dir = "Leads";
-	var $new_schema = true;
-	var $emailAddress;
+    var $table_name = "leads";
+    var $object_name = "Lead";
+    var $object_names = "Leads";
+    var $module_dir = "Leads";
+    var $new_schema = true;
+    var $emailAddress;
 
-	var $importable = true;
+    var $importable = true;
 
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array('assigned_user_name', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id');
-	var $relationship_fields = Array('email_id'=>'emails','call_id'=>'calls','meeting_id'=>'meetings','task_id'=>'tasks',);
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = Array('assigned_user_name', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id');
+    var $relationship_fields = Array('email_id'=>'emails','call_id'=>'calls','meeting_id'=>'meetings','task_id'=>'tasks',);
 
-	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
@@ -166,150 +166,150 @@ 
     }
 
 
-	function get_account()
-	{
-		if(isset($this->account_id) && !empty($this->account_id)){
-			$query = "SELECT name , assigned_user_id account_name_owner FROM accounts WHERE id='{$this->account_id}'";
-
-	        //requireSingleResult has beeen deprecated.
-			//$result = $this->db->requireSingleResult($query);
-			$result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
-
-			if(!empty($result)){
-				$row = $this->db->fetchByAssoc($result);
-				$this->account_name = $row['name'];
-				$this->account_name_owner = $row['account_name_owner'];
-				$this->account_name_mod = 'Accounts';
-			}
-
-	}}
-	function get_opportunity()
-	{
-		if(isset($this->opportunity_id) && !empty($this->opportunity_id)){
-			$query = "SELECT name, assigned_user_id opportunity_name_owner FROM opportunities WHERE id='{$this->opportunity_id}'";
-
-	        //requireSingleResult has beeen deprecated.
-			//$result = $this->db->requireSingleResult($query);
-			$result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
-
-			if(!empty($result)){
-				$row = $this->db->fetchByAssoc($result);
-				$this->opportunity_name = $row['name'];
-				$this->opportunity_name_owner = $row['opportunity_name_owner'];
-				$this->opportunity_name_mod = 'Opportunities';
-			}
-
-	}}
-	function get_contact()
-	{
-		global $locale;
-		if(isset($this->contact_id) && !empty($this->contact_id)){
-			$query = "SELECT first_name, last_name, assigned_user_id contact_name_owner FROM contacts WHERE id='{$this->contact_id}'";
-
-	        //requireSingleResult has beeen deprecated.
-			//$result = $this->db->requireSingleResult($query);
-			$result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
-			if(!empty($result)){
-				$row= $this->db->fetchByAssoc($result);
-				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
-				$this->contact_name_owner = $row['contact_name_owner'];
-				$this->contact_name_mod = 'Contacts';
-			}
-
-	}}
-
-	function create_list_query($order_by, $where, $show_deleted=0)
-	{
+    function get_account()
+    {
+        if(isset($this->account_id) && !empty($this->account_id)){
+            $query = "SELECT name , assigned_user_id account_name_owner FROM accounts WHERE id='{$this->account_id}'";
+
+            //requireSingleResult has beeen deprecated.
+            //$result = $this->db->requireSingleResult($query);
+            $result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
+
+            if(!empty($result)){
+                $row = $this->db->fetchByAssoc($result);
+                $this->account_name = $row['name'];
+                $this->account_name_owner = $row['account_name_owner'];
+                $this->account_name_mod = 'Accounts';
+            }
+
+    }}
+    function get_opportunity()
+    {
+        if(isset($this->opportunity_id) && !empty($this->opportunity_id)){
+            $query = "SELECT name, assigned_user_id opportunity_name_owner FROM opportunities WHERE id='{$this->opportunity_id}'";
+
+            //requireSingleResult has beeen deprecated.
+            //$result = $this->db->requireSingleResult($query);
+            $result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
+
+            if(!empty($result)){
+                $row = $this->db->fetchByAssoc($result);
+                $this->opportunity_name = $row['name'];
+                $this->opportunity_name_owner = $row['opportunity_name_owner'];
+                $this->opportunity_name_mod = 'Opportunities';
+            }
+
+    }}
+    function get_contact()
+    {
+        global $locale;
+        if(isset($this->contact_id) && !empty($this->contact_id)){
+            $query = "SELECT first_name, last_name, assigned_user_id contact_name_owner FROM contacts WHERE id='{$this->contact_id}'";
+
+            //requireSingleResult has beeen deprecated.
+            //$result = $this->db->requireSingleResult($query);
+            $result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
+            if(!empty($result)){
+                $row= $this->db->fetchByAssoc($result);
+                $this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
+                $this->contact_name_owner = $row['contact_name_owner'];
+                $this->contact_name_mod = 'Contacts';
+            }
+
+    }}
+
+    function create_list_query($order_by, $where, $show_deleted=0)
+    {
         $custom_join = $this->getCustomJoin();
                 $query = "SELECT ";
 
 
-			$query .= "$this->table_name.*, users.user_name assigned_user_name";
+            $query .= "$this->table_name.*, users.user_name assigned_user_name";
         $query .= $custom_join['select'];
             $query .= " FROM leads ";
 
-			$query .= "			LEFT JOIN users
+            $query .= "			LEFT JOIN users
                                 ON leads.assigned_user_id=users.id ";
-			$query .= "LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 ";
-        	$query .= "LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id) ";
+            $query .= "LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = leads.id AND eabl.bean_module = 'Leads' and eabl.primary_address = 1 and eabl.deleted=0 ";
+            $query .= "LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id) ";
         $query .= $custom_join['join'];
-			$where_auto = '1=1';
-			if($show_deleted == 0){
-				$where_auto = " leads.deleted=0 ";
-			}else if($show_deleted == 1){
-				$where_auto = " leads.deleted=1 ";
-			}
-
-		if($where != "")
-			$query .= "where ($where) AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto; //."and (leads.converted='0')";
-
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
-
-		return $query;
-	}
-
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false){
-
-		$ret_array = parent::create_new_list_query($order_by, $where, $filter, $params, $show_deleted, $join_type, true, $parentbean, $singleSelect, $ifListForExport);
-		if(strpos($ret_array['select'],"leads.account_name") == false && strpos($ret_array['select'],"leads.*") == false)
-			$ret_array['select'] .= " ,leads.account_name";
-    	if ( !$return_array )
+            $where_auto = '1=1';
+            if($show_deleted == 0){
+                $where_auto = " leads.deleted=0 ";
+            }else if($show_deleted == 1){
+                $where_auto = " leads.deleted=1 ";
+            }
+
+        if($where != "")
+            $query .= "where ($where) AND ".$where_auto;
+        else
+            $query .= "where ".$where_auto; //."and (leads.converted='0')";
+
+        if(!empty($order_by))
+            $query .= " ORDER BY $order_by";
+
+        return $query;
+    }
+
+    function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false){
+
+        $ret_array = parent::create_new_list_query($order_by, $where, $filter, $params, $show_deleted, $join_type, true, $parentbean, $singleSelect, $ifListForExport);
+        if(strpos($ret_array['select'],"leads.account_name") == false && strpos($ret_array['select'],"leads.*") == false)
+            $ret_array['select'] .= " ,leads.account_name";
+        if ( !$return_array )
             return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
         return $ret_array;
-	}
+    }
 
     function converted_lead($leadid, $contactid, $accountid, $opportunityid){
-    	$query = "UPDATE leads set converted='1', contact_id=$contactid, account_id=$accountid, opportunity_id=$opportunityid where  id=$leadid and deleted=0";
-		$this->db->query($query,true,"Error converting lead: ");
-
-		//we must move the status out here in order to be able to capture workflow conditions
-		$leadid = str_replace("'","", $leadid);
-		$lead = new Lead();
-		$lead->retrieve($leadid);
-		$lead->status='Converted';
-		$lead->save();
+        $query = "UPDATE leads set converted='1', contact_id=$contactid, account_id=$accountid, opportunity_id=$opportunityid where  id=$leadid and deleted=0";
+        $this->db->query($query,true,"Error converting lead: ");
+
+        //we must move the status out here in order to be able to capture workflow conditions
+        $leadid = str_replace("'","", $leadid);
+        $lead = new Lead();
+        $lead->retrieve($leadid);
+        $lead->status='Converted';
+        $lead->save();
     }
 
-	function fill_in_additional_list_fields()
-	{
-		parent::fill_in_additional_list_fields();
-		$this->_create_proper_name_field();
-		$this->get_account();
-
-	}
-
-	function fill_in_additional_detail_fields()
-	{
-		//Fill in the assigned_user_name
-		//if(!empty($this->status))
-		//$this->status = translate('lead_status_dom', '', $this->status);
-	    parent::fill_in_additional_detail_fields();
-	    $this->_create_proper_name_field();
-		$this->get_contact();
-		$this->get_opportunity();
-		$this->get_account();
+    function fill_in_additional_list_fields()
+    {
+        parent::fill_in_additional_list_fields();
+        $this->_create_proper_name_field();
+        $this->get_account();
 
-		if(!empty($this->campaign_id)){
+    }
 
-			$camp = new Campaign();
-			$where = "campaigns.id='$this->campaign_id'";
-			$campaign_list = $camp->get_full_list("campaigns.name", $where, true);
-			if(!empty($campaign_list))
-				$this->campaign_name = $campaign_list[0]->name;
-		}
-	}
+    function fill_in_additional_detail_fields()
+    {
+        //Fill in the assigned_user_name
+        //if(!empty($this->status))
+        //$this->status = translate('lead_status_dom', '', $this->status);
+        parent::fill_in_additional_detail_fields();
+        $this->_create_proper_name_field();
+        $this->get_contact();
+        $this->get_opportunity();
+        $this->get_account();
+
+        if(!empty($this->campaign_id)){
+
+            $camp = new Campaign();
+            $where = "campaigns.id='$this->campaign_id'";
+            $campaign_list = $camp->get_full_list("campaigns.name", $where, true);
+            if(!empty($campaign_list))
+                $this->campaign_name = $campaign_list[0]->name;
+        }
+    }
 
-	function get_list_view_data(){
+    function get_list_view_data(){
 
-		$temp_array = parent::get_list_view_data();
+        $temp_array = parent::get_list_view_data();
 
-		$temp_array['ACC_NAME_FROM_ACCOUNTS'] = empty($temp_array['ACC_NAME_FROM_ACCOUNTS']) ? ($temp_array['ACCOUNT_NAME']) : ($temp_array['ACC_NAME_FROM_ACCOUNTS']);
+        $temp_array['ACC_NAME_FROM_ACCOUNTS'] = empty($temp_array['ACC_NAME_FROM_ACCOUNTS']) ? ($temp_array['ACCOUNT_NAME']) : ($temp_array['ACC_NAME_FROM_ACCOUNTS']);
 
-		return $temp_array;
-	}
+        return $temp_array;
+    }
 
     /**
      * Returns an array of fields that are of type link.
@@ -318,253 +318,253 @@ 
      *
      * Internal function, do not override.
      */
-	//fix for bug 27339 Shine
+    //fix for bug 27339 Shine
     function get_linked_fields()
     {
-    	$linked_fields=array();
-    	$fieldDefs = $this->getFieldDefinitions();
-
-    	//find all definitions of type link.
-    	if (!empty($fieldDefs))
-    	{
-    		foreach ($fieldDefs as $name=>$properties)
-    		{
-    			if ($name == 'oldmeetings' || $name == 'oldcalls') { continue; }
-    			elseif (array_search('link',$properties) === 'type')
-    			{
-    				$linked_fields[$name]=$properties;
-    			}
-    		}
-    	}
-    	return $linked_fields;
+        $linked_fields=array();
+        $fieldDefs = $this->getFieldDefinitions();
+
+        //find all definitions of type link.
+        if (!empty($fieldDefs))
+        {
+            foreach ($fieldDefs as $name=>$properties)
+            {
+                if ($name == 'oldmeetings' || $name == 'oldcalls') { continue; }
+                elseif (array_search('link',$properties) === 'type')
+                {
+                    $linked_fields[$name]=$properties;
+                }
+            }
+        }
+        return $linked_fields;
     }
 
-	/**
+    /**
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause ($the_query_string) {
-	$where_clauses = Array();
-	$the_query_string = $GLOBALS['db']->quote($the_query_string);
-
-	array_push($where_clauses, "leads.last_name like '$the_query_string%'");
-	array_push($where_clauses, "leads.account_name like '$the_query_string%'");
-	array_push($where_clauses, "leads.first_name like '$the_query_string%'");
-	array_push($where_clauses, "ea.email_address like '$the_query_string%'");
-
-	if (is_numeric($the_query_string)) {
-		array_push($where_clauses, "leads.phone_home like '%$the_query_string%'");
-		array_push($where_clauses, "leads.phone_mobile like '%$the_query_string%'");
-		array_push($where_clauses, "leads.phone_work like '%$the_query_string%'");
-		array_push($where_clauses, "leads.phone_other like '%$the_query_string%'");
-		array_push($where_clauses, "leads.phone_fax like '%$the_query_string%'");
-
-	}
-
-	$the_where = "";
-	foreach($where_clauses as $clause)
-	{
-		if($the_where != "") $the_where .= " or ";
-		$the_where .= $clause;
-	}
-
-
-	return $the_where;
-	}
-
-	function set_notification_body($xtpl, $lead)
-	{
-		global $app_list_strings;
+     */
+    function build_generic_where_clause ($the_query_string) {
+    $where_clauses = Array();
+    $the_query_string = $GLOBALS['db']->quote($the_query_string);
+
+    array_push($where_clauses, "leads.last_name like '$the_query_string%'");
+    array_push($where_clauses, "leads.account_name like '$the_query_string%'");
+    array_push($where_clauses, "leads.first_name like '$the_query_string%'");
+    array_push($where_clauses, "ea.email_address like '$the_query_string%'");
+
+    if (is_numeric($the_query_string)) {
+        array_push($where_clauses, "leads.phone_home like '%$the_query_string%'");
+        array_push($where_clauses, "leads.phone_mobile like '%$the_query_string%'");
+        array_push($where_clauses, "leads.phone_work like '%$the_query_string%'");
+        array_push($where_clauses, "leads.phone_other like '%$the_query_string%'");
+        array_push($where_clauses, "leads.phone_fax like '%$the_query_string%'");
+
+    }
+
+    $the_where = "";
+    foreach($where_clauses as $clause)
+    {
+        if($the_where != "") $the_where .= " or ";
+        $the_where .= $clause;
+    }
+
+
+    return $the_where;
+    }
+
+    function set_notification_body($xtpl, $lead)
+    {
+        global $app_list_strings;
         global $locale;
 
-		$xtpl->assign("LEAD_NAME", $locale->getLocaleFormattedName($lead->first_name, $lead->last_name, $lead->salutation));
-		$xtpl->assign("LEAD_SOURCE", (isset($lead->lead_source) ? $app_list_strings['lead_source_dom'][$lead->lead_source] : ""));
-		$xtpl->assign("LEAD_STATUS", (isset($lead->status)? $app_list_strings['lead_status_dom'][$lead->status]:""));
-		$xtpl->assign("LEAD_DESCRIPTION", $lead->description);
-
-		return $xtpl;
-	}
-
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
-	function listviewACLHelper(){
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->account_name)){
-
-			if(!empty($this->account_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->account_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			else {
-				global $current_user;
+        $xtpl->assign("LEAD_NAME", $locale->getLocaleFormattedName($lead->first_name, $lead->last_name, $lead->salutation));
+        $xtpl->assign("LEAD_SOURCE", (isset($lead->lead_source) ? $app_list_strings['lead_source_dom'][$lead->lead_source] : ""));
+        $xtpl->assign("LEAD_STATUS", (isset($lead->status)? $app_list_strings['lead_status_dom'][$lead->status]:""));
+        $xtpl->assign("LEAD_DESCRIPTION", $lead->description);
+
+        return $xtpl;
+    }
+
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
+    function listviewACLHelper(){
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->account_name)){
+
+            if(!empty($this->account_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->account_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Accounts',$this->account_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Accounts', $this->account_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Accounts', $this->account_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if( ACLController::checkAccess('Accounts', 'view', $is_owner)){
-			*/
-			if( ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['ACCOUNT'] = 'a';
-			}else{
-				$array_assign['ACCOUNT'] = 'span';
-			}
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->opportunity_name)){
-
-			if(!empty($this->opportunity_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->opportunity_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			else {
-				global $current_user;
+             */
+            if( ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['ACCOUNT'] = 'a';
+            }else{
+                $array_assign['ACCOUNT'] = 'span';
+            }
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->opportunity_name)){
+
+            if(!empty($this->opportunity_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->opportunity_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Opportunities',$this->opportunity_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Opportunities', $this->opportunity_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Opportunities', $this->opportunity_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if( ACLController::checkAccess('Opportunities', 'view', $is_owner)){
-			*/
-			if( ACLController::checkAccess('Opportunities', 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['OPPORTUNITY'] = 'a';
-			}else{
-				$array_assign['OPPORTUNITY'] = 'span';
-			}
-
-
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)){
-
-			if(!empty($this->contact_name_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->contact_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//contact_name_owner not being set for whatever reason so we need to figure this out
-			else {
-				global $current_user;
+             */
+            if( ACLController::checkAccess('Opportunities', 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['OPPORTUNITY'] = 'a';
+            }else{
+                $array_assign['OPPORTUNITY'] = 'span';
+            }
+
+
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->contact_name)){
+
+            if(!empty($this->contact_name_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->contact_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //contact_name_owner not being set for whatever reason so we need to figure this out
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner)){
-			*/
-			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['CONTACT'] = 'a';
-			}else{
-				$array_assign['CONTACT'] = 'span';
-			}
-
-		return $array_assign;
-	}
+             */
+            if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['CONTACT'] = 'a';
+            }else{
+                $array_assign['CONTACT'] = 'span';
+            }
+
+        return $array_assign;
+    }
 
 //carrys forward custom lead fields to contacts, accounts, opportunities during Lead Conversion
-	function convertCustomFieldsForm(&$form, &$tempBean, &$prefix) {
-
-		global $mod_strings, $app_list_strings, $app_strings, $lbl_required_symbol;
-
-		foreach($this->field_defs as $field => $value) {
-
-			if(!empty($value['source']) && $value['source'] == 'custom_fields') {
-				if( !empty($tempBean->field_defs[$field]) AND isset($tempBean->field_defs[$field]) ) {
-					$form .= "<tr><td nowrap colspan='4' class='dataLabel'>".$mod_strings[$tempBean->field_defs[$field]['vname']].":";
-
-					if( !empty($tempBean->custom_fields->avail_fields[$field]['required']) AND ( ($tempBean->custom_fields->avail_fields[$field]['required']== 1) OR ($tempBean->custom_fields->avail_fields[$field]['required']== '1') OR ($tempBean->custom_fields->avail_fields[$field]['required']== 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required']== true) ) ) {
-						$form .= "&nbsp;<span class='required'>".$lbl_required_symbol."</span>";
-					}
-					$form .= "</td></tr>";
-					$form .= "<tr><td nowrap colspan='4' class='dataField' nowrap>";
-
-					if(isset($value['isMultiSelect']) && $value['isMultiSelect'] == 1){
-						$this->$field = unencodeMultienum($this->$field);
-						$multiple = "multiple";
-						$array = '[]';
-					} else {
-						$multiple = null;
-						$array = null;
-					}
-
-					if(!empty($value['options']) AND isset($value['options']) ) {
-						$form .= "<select " . $multiple . " name='".$prefix.$field.$array."'>";
-						$form .= get_select_options_with_id($app_list_strings[$value['options']], $this->$field);
-						$form .= "</select";
-					} elseif($value['type'] == 'bool' ) {
-						if( ($this->$field == 1) OR ($this->$field == '1') ) { $checked = 'checked'; } else { $checked = ''; }
-						$form .= "<input type='checkbox' name='".$prefix.$field."' id='".$prefix.$field."'  value='1' ".$checked."/>";
-					} elseif($value['type'] == 'text' ) {
-						$form .= "<textarea name='".$prefix.$field."' rows='6' cols='50'>".$this->$field."</textarea>";
-					} elseif($value['type'] == 'date' ) {
-						$form .= "<input name='".$prefix.$field."' id='jscal_field".$field."' type='text'  size='11' maxlength='10' value='".$this->$field."'>&nbsp;".SugarThemeRegistry::current()->getImage("jscalendar", "id='jscal_trigger".$field."' align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ENTERDATE'])."' <span class='dateFormat'>yyyy-mm-dd</span><script type='text/javascript'>Calendar.setup ({inputField : 'jscal_field".$field."', ifFormat : '%Y-%m-%d', showsTime : false, button : 'jscal_trigger".$field."', singleClick : true, step : 1, weekNumbers:false}); addToValidate('ConvertLead', '".$field."', 'date', false,'".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
-					} else {
-						$form .= "<input name='".$prefix.$field."' type='text' value='".$this->$field."'>";
-
-						if($this->custom_fields->avail_fields[$field]['type'] == 'int') {
-							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'int', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
-						}
-						elseif($this->custom_fields->avail_fields[$field]['type'] == 'float') {
-							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'float', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
-						}
-
-					}
-
-					if( !empty($tempBean->custom_fields->avail_fields[$field]['required']) AND ( ($tempBean->custom_fields->avail_fields[$field]['required']== 1) OR ($tempBean->custom_fields->avail_fields[$field]['required']== '1') OR ($tempBean->custom_fields->avail_fields[$field]['required']== 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required']== true) ) ) {
-							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'relate', true,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
-						}
-
-					$form .= "</td></tr>";
-
-
-				}
-			}
-
-		}
-
-		return true;
-	}
-
-	function save($check_notify = false) {
-		if(empty($this->status))
-			$this->status = 'New';
-		// call save first so that $this->id will be set
-		$value = parent::save($check_notify);
-		return $value;
-	}
-	function get_unlinked_email_query($type=array()) {
-
-		return get_unlinked_email_query($type, $this);
-	}
+    function convertCustomFieldsForm(&$form, &$tempBean, &$prefix) {
+
+        global $mod_strings, $app_list_strings, $app_strings, $lbl_required_symbol;
+
+        foreach($this->field_defs as $field => $value) {
+
+            if(!empty($value['source']) && $value['source'] == 'custom_fields') {
+                if( !empty($tempBean->field_defs[$field]) AND isset($tempBean->field_defs[$field]) ) {
+                    $form .= "<tr><td nowrap colspan='4' class='dataLabel'>".$mod_strings[$tempBean->field_defs[$field]['vname']].":";
+
+                    if( !empty($tempBean->custom_fields->avail_fields[$field]['required']) AND ( ($tempBean->custom_fields->avail_fields[$field]['required']== 1) OR ($tempBean->custom_fields->avail_fields[$field]['required']== '1') OR ($tempBean->custom_fields->avail_fields[$field]['required']== 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required']== true) ) ) {
+                        $form .= "&nbsp;<span class='required'>".$lbl_required_symbol."</span>";
+                    }
+                    $form .= "</td></tr>";
+                    $form .= "<tr><td nowrap colspan='4' class='dataField' nowrap>";
+
+                    if(isset($value['isMultiSelect']) && $value['isMultiSelect'] == 1){
+                        $this->$field = unencodeMultienum($this->$field);
+                        $multiple = "multiple";
+                        $array = '[]';
+                    } else {
+                        $multiple = null;
+                        $array = null;
+                    }
+
+                    if(!empty($value['options']) AND isset($value['options']) ) {
+                        $form .= "<select " . $multiple . " name='".$prefix.$field.$array."'>";
+                        $form .= get_select_options_with_id($app_list_strings[$value['options']], $this->$field);
+                        $form .= "</select";
+                    } elseif($value['type'] == 'bool' ) {
+                        if( ($this->$field == 1) OR ($this->$field == '1') ) { $checked = 'checked'; } else { $checked = ''; }
+                        $form .= "<input type='checkbox' name='".$prefix.$field."' id='".$prefix.$field."'  value='1' ".$checked."/>";
+                    } elseif($value['type'] == 'text' ) {
+                        $form .= "<textarea name='".$prefix.$field."' rows='6' cols='50'>".$this->$field."</textarea>";
+                    } elseif($value['type'] == 'date' ) {
+                        $form .= "<input name='".$prefix.$field."' id='jscal_field".$field."' type='text'  size='11' maxlength='10' value='".$this->$field."'>&nbsp;".SugarThemeRegistry::current()->getImage("jscalendar", "id='jscal_trigger".$field."' align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ENTERDATE'])."' <span class='dateFormat'>yyyy-mm-dd</span><script type='text/javascript'>Calendar.setup ({inputField : 'jscal_field".$field."', ifFormat : '%Y-%m-%d', showsTime : false, button : 'jscal_trigger".$field."', singleClick : true, step : 1, weekNumbers:false}); addToValidate('ConvertLead', '".$field."', 'date', false,'".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
+                    } else {
+                        $form .= "<input name='".$prefix.$field."' type='text' value='".$this->$field."'>";
+
+                        if($this->custom_fields->avail_fields[$field]['type'] == 'int') {
+                            $form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'int', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
+                        }
+                        elseif($this->custom_fields->avail_fields[$field]['type'] == 'float') {
+                            $form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'float', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
+                        }
+
+                    }
+
+                    if( !empty($tempBean->custom_fields->avail_fields[$field]['required']) AND ( ($tempBean->custom_fields->avail_fields[$field]['required']== 1) OR ($tempBean->custom_fields->avail_fields[$field]['required']== '1') OR ($tempBean->custom_fields->avail_fields[$field]['required']== 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required']== true) ) ) {
+                            $form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'relate', true,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
+                        }
+
+                    $form .= "</td></tr>";
+
+
+                }
+            }
+
+        }
+
+        return true;
+    }
+
+    function save($check_notify = false) {
+        if(empty($this->status))
+            $this->status = 'New';
+        // call save first so that $this->id will be set
+        $value = parent::save($check_notify);
+        return $value;
+    }
+    function get_unlinked_email_query($type=array()) {
+
+        return get_unlinked_email_query($type, $this);
+    }
 
     /**
      * Returns query to find the related calls created pre-5.1

Spacing +80 added lines, -80 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.
@@ -145,7 +145,7 @@ 
 
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = Array('assigned_user_name', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id');
-	var $relationship_fields = Array('email_id'=>'emails','call_id'=>'calls','meeting_id'=>'meetings','task_id'=>'tasks',);
+	var $relationship_fields = Array('email_id'=>'emails', 'call_id'=>'calls', 'meeting_id'=>'meetings', 'task_id'=>'tasks',);
 
 	public function __construct() {
 		parent::__construct();
@@ -154,9 +154,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 Lead(){
+    public function Lead() {
         $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 {
@@ -168,14 +168,14 @@ 
 
 	function get_account()
 	{
-		if(isset($this->account_id) && !empty($this->account_id)){
+		if (isset($this->account_id) && !empty($this->account_id)) {
 			$query = "SELECT name , assigned_user_id account_name_owner FROM accounts WHERE id='{$this->account_id}'";
 
 	        //requireSingleResult has beeen deprecated.
 			//$result = $this->db->requireSingleResult($query);
-			$result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
+			$result = $this->db->limitQuery($query, 0, 1, true, "Want only a single row");
 
-			if(!empty($result)){
+			if (!empty($result)) {
 				$row = $this->db->fetchByAssoc($result);
 				$this->account_name = $row['name'];
 				$this->account_name_owner = $row['account_name_owner'];
@@ -185,14 +185,14 @@ 
 	}}
 	function get_opportunity()
 	{
-		if(isset($this->opportunity_id) && !empty($this->opportunity_id)){
+		if (isset($this->opportunity_id) && !empty($this->opportunity_id)) {
 			$query = "SELECT name, assigned_user_id opportunity_name_owner FROM opportunities WHERE id='{$this->opportunity_id}'";
 
 	        //requireSingleResult has beeen deprecated.
 			//$result = $this->db->requireSingleResult($query);
-			$result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
+			$result = $this->db->limitQuery($query, 0, 1, true, "Want only a single row");
 
-			if(!empty($result)){
+			if (!empty($result)) {
 				$row = $this->db->fetchByAssoc($result);
 				$this->opportunity_name = $row['name'];
 				$this->opportunity_name_owner = $row['opportunity_name_owner'];
@@ -203,14 +203,14 @@ 
 	function get_contact()
 	{
 		global $locale;
-		if(isset($this->contact_id) && !empty($this->contact_id)){
+		if (isset($this->contact_id) && !empty($this->contact_id)) {
 			$query = "SELECT first_name, last_name, assigned_user_id contact_name_owner FROM contacts WHERE id='{$this->contact_id}'";
 
 	        //requireSingleResult has beeen deprecated.
 			//$result = $this->db->requireSingleResult($query);
-			$result = $this->db->limitQuery($query,0,1,true, "Want only a single row");
-			if(!empty($result)){
-				$row= $this->db->fetchByAssoc($result);
+			$result = $this->db->limitQuery($query, 0, 1, true, "Want only a single row");
+			if (!empty($result)) {
+				$row = $this->db->fetchByAssoc($result);
 				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
 				$this->contact_name_owner = $row['contact_name_owner'];
 				$this->contact_name_mod = 'Contacts';
@@ -218,7 +218,7 @@ 
 
 	}}
 
-	function create_list_query($order_by, $where, $show_deleted=0)
+	function create_list_query($order_by, $where, $show_deleted = 0)
 	{
         $custom_join = $this->getCustomJoin();
                 $query = "SELECT ";
@@ -234,42 +234,42 @@ 
         	$query .= "LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id) ";
         $query .= $custom_join['join'];
 			$where_auto = '1=1';
-			if($show_deleted == 0){
+			if ($show_deleted == 0) {
 				$where_auto = " leads.deleted=0 ";
-			}else if($show_deleted == 1){
+			} else if ($show_deleted == 1) {
 				$where_auto = " leads.deleted=1 ";
 			}
 
-		if($where != "")
+		if ($where != "")
 			$query .= "where ($where) AND ".$where_auto;
 		else
 			$query .= "where ".$where_auto; //."and (leads.converted='0')";
 
-		if(!empty($order_by))
+		if (!empty($order_by))
 			$query .= " ORDER BY $order_by";
 
 		return $query;
 	}
 
-	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false){
+	function create_new_list_query($order_by, $where, $filter = array(), $params = array(), $show_deleted = 0, $join_type = '', $return_array = false, $parentbean = null, $singleSelect = false, $ifListForExport = false) {
 
 		$ret_array = parent::create_new_list_query($order_by, $where, $filter, $params, $show_deleted, $join_type, true, $parentbean, $singleSelect, $ifListForExport);
-		if(strpos($ret_array['select'],"leads.account_name") == false && strpos($ret_array['select'],"leads.*") == false)
+		if (strpos($ret_array['select'], "leads.account_name") == false && strpos($ret_array['select'], "leads.*") == false)
 			$ret_array['select'] .= " ,leads.account_name";
-    	if ( !$return_array )
-            return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
+    	if (!$return_array)
+            return  $ret_array['select'].$ret_array['from'].$ret_array['where'].$ret_array['order_by'];
         return $ret_array;
 	}
 
-    function converted_lead($leadid, $contactid, $accountid, $opportunityid){
+    function converted_lead($leadid, $contactid, $accountid, $opportunityid) {
     	$query = "UPDATE leads set converted='1', contact_id=$contactid, account_id=$accountid, opportunity_id=$opportunityid where  id=$leadid and deleted=0";
-		$this->db->query($query,true,"Error converting lead: ");
+		$this->db->query($query, true, "Error converting lead: ");
 
 		//we must move the status out here in order to be able to capture workflow conditions
-		$leadid = str_replace("'","", $leadid);
+		$leadid = str_replace("'", "", $leadid);
 		$lead = new Lead();
 		$lead->retrieve($leadid);
-		$lead->status='Converted';
+		$lead->status = 'Converted';
 		$lead->save();
     }
 
@@ -292,17 +292,17 @@ 
 		$this->get_opportunity();
 		$this->get_account();
 
-		if(!empty($this->campaign_id)){
+		if (!empty($this->campaign_id)) {
 
 			$camp = new Campaign();
 			$where = "campaigns.id='$this->campaign_id'";
 			$campaign_list = $camp->get_full_list("campaigns.name", $where, true);
-			if(!empty($campaign_list))
+			if (!empty($campaign_list))
 				$this->campaign_name = $campaign_list[0]->name;
 		}
 	}
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 
 		$temp_array = parent::get_list_view_data();
 
@@ -321,7 +321,7 @@ 
 	//fix for bug 27339 Shine
     function get_linked_fields()
     {
-    	$linked_fields=array();
+    	$linked_fields = array();
     	$fieldDefs = $this->getFieldDefinitions();
 
     	//find all definitions of type link.
@@ -330,9 +330,9 @@ 
     		foreach ($fieldDefs as $name=>$properties)
     		{
     			if ($name == 'oldmeetings' || $name == 'oldcalls') { continue; }
-    			elseif (array_search('link',$properties) === 'type')
+    			elseif (array_search('link', $properties) === 'type')
     			{
-    				$linked_fields[$name]=$properties;
+    				$linked_fields[$name] = $properties;
     			}
     		}
     	}
@@ -343,7 +343,7 @@ 
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
 	*/
-	function build_generic_where_clause ($the_query_string) {
+	function build_generic_where_clause($the_query_string) {
 	$where_clauses = Array();
 	$the_query_string = $GLOBALS['db']->quote($the_query_string);
 
@@ -362,9 +362,9 @@ 
 	}
 
 	$the_where = "";
-	foreach($where_clauses as $clause)
+	foreach ($where_clauses as $clause)
 	{
-		if($the_where != "") $the_where .= " or ";
+		if ($the_where != "") $the_where .= " or ";
 		$the_where .= $clause;
 	}
 
@@ -379,33 +379,33 @@ 
 
 		$xtpl->assign("LEAD_NAME", $locale->getLocaleFormattedName($lead->first_name, $lead->last_name, $lead->salutation));
 		$xtpl->assign("LEAD_SOURCE", (isset($lead->lead_source) ? $app_list_strings['lead_source_dom'][$lead->lead_source] : ""));
-		$xtpl->assign("LEAD_STATUS", (isset($lead->status)? $app_list_strings['lead_status_dom'][$lead->status]:""));
+		$xtpl->assign("LEAD_STATUS", (isset($lead->status) ? $app_list_strings['lead_status_dom'][$lead->status] : ""));
 		$xtpl->assign("LEAD_DESCRIPTION", $lead->description);
 
 		return $xtpl;
 	}
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
 	}
-	function listviewACLHelper(){
+	function listviewACLHelper() {
 		$array_assign = parent::listviewACLHelper();
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->account_name)){
+		if (!empty($this->account_name)) {
 
-			if(!empty($this->account_name_owner)){
+			if (!empty($this->account_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->account_name_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Accounts',$this->account_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Accounts', $this->account_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -417,25 +417,25 @@ 
 			/**
 			if( ACLController::checkAccess('Accounts', 'view', $is_owner)){
 			*/
-			if( ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
+			if (ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['ACCOUNT'] = 'a';
-			}else{
+			} else {
 				$array_assign['ACCOUNT'] = 'span';
 			}
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->opportunity_name)){
+		if (!empty($this->opportunity_name)) {
 
-			if(!empty($this->opportunity_name_owner)){
+			if (!empty($this->opportunity_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->opportunity_name_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Opportunities',$this->opportunity_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Opportunities', $this->opportunity_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -447,19 +447,19 @@ 
 			/**
 			if( ACLController::checkAccess('Opportunities', 'view', $is_owner)){
 			*/
-			if( ACLController::checkAccess('Opportunities', 'view', $is_owner, 'module', $in_group)){
+			if (ACLController::checkAccess('Opportunities', 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['OPPORTUNITY'] = 'a';
-			}else{
+			} else {
 				$array_assign['OPPORTUNITY'] = 'span';
 			}
 
 
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)){
+		if (!empty($this->contact_name)) {
 
-			if(!empty($this->contact_name_owner)){
+			if (!empty($this->contact_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->contact_name_owner;
 			}
@@ -467,8 +467,8 @@ 
 			//contact_name_owner not being set for whatever reason so we need to figure this out
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Contacts', $this->contact_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -480,10 +480,10 @@ 
 			/**
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner)){
 			*/
-			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
+			if (ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['CONTACT'] = 'a';
-			}else{
+			} else {
 				$array_assign['CONTACT'] = 'span';
 			}
 
@@ -495,19 +495,19 @@ 
 
 		global $mod_strings, $app_list_strings, $app_strings, $lbl_required_symbol;
 
-		foreach($this->field_defs as $field => $value) {
+		foreach ($this->field_defs as $field => $value) {
 
-			if(!empty($value['source']) && $value['source'] == 'custom_fields') {
-				if( !empty($tempBean->field_defs[$field]) AND isset($tempBean->field_defs[$field]) ) {
+			if (!empty($value['source']) && $value['source'] == 'custom_fields') {
+				if (!empty($tempBean->field_defs[$field]) AND isset($tempBean->field_defs[$field])) {
 					$form .= "<tr><td nowrap colspan='4' class='dataLabel'>".$mod_strings[$tempBean->field_defs[$field]['vname']].":";
 
-					if( !empty($tempBean->custom_fields->avail_fields[$field]['required']) AND ( ($tempBean->custom_fields->avail_fields[$field]['required']== 1) OR ($tempBean->custom_fields->avail_fields[$field]['required']== '1') OR ($tempBean->custom_fields->avail_fields[$field]['required']== 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required']== true) ) ) {
+					if (!empty($tempBean->custom_fields->avail_fields[$field]['required']) AND (($tempBean->custom_fields->avail_fields[$field]['required'] == 1) OR ($tempBean->custom_fields->avail_fields[$field]['required'] == '1') OR ($tempBean->custom_fields->avail_fields[$field]['required'] == 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required'] == true))) {
 						$form .= "&nbsp;<span class='required'>".$lbl_required_symbol."</span>";
 					}
 					$form .= "</td></tr>";
 					$form .= "<tr><td nowrap colspan='4' class='dataField' nowrap>";
 
-					if(isset($value['isMultiSelect']) && $value['isMultiSelect'] == 1){
+					if (isset($value['isMultiSelect']) && $value['isMultiSelect'] == 1) {
 						$this->$field = unencodeMultienum($this->$field);
 						$multiple = "multiple";
 						$array = '[]';
@@ -516,30 +516,30 @@ 
 						$array = null;
 					}
 
-					if(!empty($value['options']) AND isset($value['options']) ) {
-						$form .= "<select " . $multiple . " name='".$prefix.$field.$array."'>";
+					if (!empty($value['options']) AND isset($value['options'])) {
+						$form .= "<select ".$multiple." name='".$prefix.$field.$array."'>";
 						$form .= get_select_options_with_id($app_list_strings[$value['options']], $this->$field);
 						$form .= "</select";
-					} elseif($value['type'] == 'bool' ) {
-						if( ($this->$field == 1) OR ($this->$field == '1') ) { $checked = 'checked'; } else { $checked = ''; }
+					} elseif ($value['type'] == 'bool') {
+						if (($this->$field == 1) OR ($this->$field == '1')) { $checked = 'checked'; } else { $checked = ''; }
 						$form .= "<input type='checkbox' name='".$prefix.$field."' id='".$prefix.$field."'  value='1' ".$checked."/>";
-					} elseif($value['type'] == 'text' ) {
+					} elseif ($value['type'] == 'text') {
 						$form .= "<textarea name='".$prefix.$field."' rows='6' cols='50'>".$this->$field."</textarea>";
-					} elseif($value['type'] == 'date' ) {
+					} elseif ($value['type'] == 'date') {
 						$form .= "<input name='".$prefix.$field."' id='jscal_field".$field."' type='text'  size='11' maxlength='10' value='".$this->$field."'>&nbsp;".SugarThemeRegistry::current()->getImage("jscalendar", "id='jscal_trigger".$field."' align='absmiddle'", null, null, ".gif", $mod_strings['LBL_ENTERDATE'])."' <span class='dateFormat'>yyyy-mm-dd</span><script type='text/javascript'>Calendar.setup ({inputField : 'jscal_field".$field."', ifFormat : '%Y-%m-%d', showsTime : false, button : 'jscal_trigger".$field."', singleClick : true, step : 1, weekNumbers:false}); addToValidate('ConvertLead', '".$field."', 'date', false,'".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
 					} else {
 						$form .= "<input name='".$prefix.$field."' type='text' value='".$this->$field."'>";
 
-						if($this->custom_fields->avail_fields[$field]['type'] == 'int') {
+						if ($this->custom_fields->avail_fields[$field]['type'] == 'int') {
 							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'int', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
 						}
-						elseif($this->custom_fields->avail_fields[$field]['type'] == 'float') {
+						elseif ($this->custom_fields->avail_fields[$field]['type'] == 'float') {
 							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'float', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
 						}
 
 					}
 
-					if( !empty($tempBean->custom_fields->avail_fields[$field]['required']) AND ( ($tempBean->custom_fields->avail_fields[$field]['required']== 1) OR ($tempBean->custom_fields->avail_fields[$field]['required']== '1') OR ($tempBean->custom_fields->avail_fields[$field]['required']== 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required']== true) ) ) {
+					if (!empty($tempBean->custom_fields->avail_fields[$field]['required']) AND (($tempBean->custom_fields->avail_fields[$field]['required'] == 1) OR ($tempBean->custom_fields->avail_fields[$field]['required'] == '1') OR ($tempBean->custom_fields->avail_fields[$field]['required'] == 'true') OR ($tempBean->custom_fields->avail_fields[$field]['required'] == true))) {
 							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'relate', true,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
 						}
 
@@ -555,13 +555,13 @@ 
 	}
 
 	function save($check_notify = false) {
-		if(empty($this->status))
+		if (empty($this->status))
 			$this->status = 'New';
 		// call save first so that $this->id will be set
 		$value = parent::save($check_notify);
 		return $value;
 	}
-	function get_unlinked_email_query($type=array()) {
+	function get_unlinked_email_query($type = array()) {
 
 		return get_unlinked_email_query($type, $this);
 	}
@@ -573,9 +573,9 @@ 
      */
     public function get_old_related_calls()
     {
-        $return_array['select']='SELECT calls.id ';
-        $return_array['from']='FROM calls ';
-        $return_array['where']=" WHERE calls.parent_id = '$this->id'
+        $return_array['select'] = 'SELECT calls.id ';
+        $return_array['from'] = 'FROM calls ';
+        $return_array['where'] = " WHERE calls.parent_id = '$this->id'
             AND calls.parent_type = 'Leads' AND calls.id NOT IN ( SELECT call_id FROM calls_leads ) ";
         $return_array['join'] = "";
         $return_array['join_tables'][0] = '';
@@ -605,9 +605,9 @@ 
      */
     public function get_old_related_meetings()
     {
-        $return_array['select']='SELECT meetings.id ';
-        $return_array['from']='FROM meetings ';
-        $return_array['where']=" WHERE meetings.parent_id = '$this->id'
+        $return_array['select'] = 'SELECT meetings.id ';
+        $return_array['from'] = 'FROM meetings ';
+        $return_array['where'] = " WHERE meetings.parent_id = '$this->id'
             AND meetings.parent_type = 'Leads' AND meetings.id NOT IN ( SELECT meeting_id FROM meetings_leads ) ";
         $return_array['join'] = "";
         $return_array['join_tables'][0] = '';

Braces +35 added lines, -28 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -158,8 +160,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();
@@ -236,17 +237,20 @@ 
 			$where_auto = '1=1';
 			if($show_deleted == 0){
 				$where_auto = " leads.deleted=0 ";
-			}else if($show_deleted == 1){
+			} else if($show_deleted == 1){
 				$where_auto = " leads.deleted=1 ";
 			}
 
-		if($where != "")
-			$query .= "where ($where) AND ".$where_auto;
-		else
-			$query .= "where ".$where_auto; //."and (leads.converted='0')";
+		if($where != "") {
+					$query .= "where ($where) AND ".$where_auto;
+		} else {
+					$query .= "where ".$where_auto;
+		}
+		//."and (leads.converted='0')";
 
-		if(!empty($order_by))
-			$query .= " ORDER BY $order_by";
+		if(!empty($order_by)) {
+					$query .= " ORDER BY $order_by";
+		}
 
 		return $query;
 	}
@@ -254,10 +258,12 @@ 
 	function create_new_list_query($order_by, $where,$filter=array(),$params=array(), $show_deleted = 0,$join_type='', $return_array = false,$parentbean=null, $singleSelect = false, $ifListForExport = false){
 
 		$ret_array = parent::create_new_list_query($order_by, $where, $filter, $params, $show_deleted, $join_type, true, $parentbean, $singleSelect, $ifListForExport);
-		if(strpos($ret_array['select'],"leads.account_name") == false && strpos($ret_array['select'],"leads.*") == false)
-			$ret_array['select'] .= " ,leads.account_name";
-    	if ( !$return_array )
-            return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
+		if(strpos($ret_array['select'],"leads.account_name") == false && strpos($ret_array['select'],"leads.*") == false) {
+					$ret_array['select'] .= " ,leads.account_name";
+		}
+    	if ( !$return_array ) {
+    	            return  $ret_array['select'] . $ret_array['from'] . $ret_array['where']. $ret_array['order_by'];
+    	}
         return $ret_array;
 	}
 
@@ -297,8 +303,9 @@ 
 			$camp = new Campaign();
 			$where = "campaigns.id='$this->campaign_id'";
 			$campaign_list = $camp->get_full_list("campaigns.name", $where, true);
-			if(!empty($campaign_list))
-				$this->campaign_name = $campaign_list[0]->name;
+			if(!empty($campaign_list)) {
+							$this->campaign_name = $campaign_list[0]->name;
+			}
 		}
 	}
 
@@ -329,8 +336,7 @@ 
     	{
     		foreach ($fieldDefs as $name=>$properties)
     		{
-    			if ($name == 'oldmeetings' || $name == 'oldcalls') { continue; }
-    			elseif (array_search('link',$properties) === 'type')
+    			if ($name == 'oldmeetings' || $name == 'oldcalls') { continue; } elseif (array_search('link',$properties) === 'type')
     			{
     				$linked_fields[$name]=$properties;
     			}
@@ -364,7 +370,9 @@ 
 	$the_where = "";
 	foreach($where_clauses as $clause)
 	{
-		if($the_where != "") $the_where .= " or ";
+		if($the_where != "") {
+		    $the_where .= " or ";
+		}
 		$the_where .= $clause;
 	}
 
@@ -420,7 +428,7 @@ 
 			if( ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['ACCOUNT'] = 'a';
-			}else{
+			} else{
 				$array_assign['ACCOUNT'] = 'span';
 			}
 		$is_owner = false;
@@ -450,7 +458,7 @@ 
 			if( ACLController::checkAccess('Opportunities', 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['OPPORTUNITY'] = 'a';
-			}else{
+			} else{
 				$array_assign['OPPORTUNITY'] = 'span';
 			}
 
@@ -483,7 +491,7 @@ 
 			if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['CONTACT'] = 'a';
-			}else{
+			} else{
 				$array_assign['CONTACT'] = 'span';
 			}
 
@@ -532,8 +540,7 @@ 
 
 						if($this->custom_fields->avail_fields[$field]['type'] == 'int') {
 							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'int', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
-						}
-						elseif($this->custom_fields->avail_fields[$field]['type'] == 'float') {
+						} elseif($this->custom_fields->avail_fields[$field]['type'] == 'float') {
 							$form .= "<script>addToValidate('ConvertLead', '".$prefix.$field."', 'float', false,'".$prefix.":".$mod_strings[$tempBean->field_defs[$field]['vname']]."' );</script>";
 						}
 
@@ -555,8 +562,9 @@ 
 	}
 
 	function save($check_notify = false) {
-		if(empty($this->status))
-			$this->status = 'New';
+		if(empty($this->status)) {
+					$this->status = 'New';
+		}
 		// call save first so that $this->id will be set
 		$value = parent::save($check_notify);
 		return $value;
@@ -592,8 +600,7 @@ 
 
         if (isset($GLOBALS['app_list_strings']['lead_conv_activity_opt'])) {
             return $GLOBALS['app_list_strings']['lead_conv_activity_opt'];
-        }
-        else {
+        } else {
             return array();
         }
     }

modules/Leads/Dashlets/MyLeadsDashlet/MyLeadsDashlet.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 Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,7 +52,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_LEADS', 'Leads');
+        if (empty($def['title'])) $this->title = translate('LBL_LIST_MY_LEADS', 'Leads');
 
         $this->searchFields = $dashletData['MyLeadsDashlet']['searchFields'];
         $this->columns = $dashletData['MyLeadsDashlet']['columns'];
@@ -62,9 +62,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 MyLeadsDashlet($id, $def = null){
+    function MyLeadsDashlet($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 Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,7 +54,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_LEADS', 'Leads');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_LIST_MY_LEADS', 'Leads');
+        }
 
         $this->searchFields = $dashletData['MyLeadsDashlet']['searchFields'];
         $this->columns = $dashletData['MyLeadsDashlet']['columns'];
@@ -66,8 +70,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/Leads/controller.php

Indentation +38 added lines, -38 removed lines

@@ -38,9 +38,9 @@ 
  ********************************************************************************/
 
 class LeadsController extends SugarController{
-	function __construct(){
-		parent::__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
@@ -56,48 +56,48 @@ 
         self::__construct();
     }
 
-	function pre_editview(){
-		//IF we have a prospect id leads convert it to a lead
-		if (empty($this->bean->id) && !empty($_REQUEST['return_module']) &&$_REQUEST['return_module'] == 'Prospects' ) {
+    function pre_editview(){
+        //IF we have a prospect id leads convert it to a lead
+        if (empty($this->bean->id) && !empty($_REQUEST['return_module']) &&$_REQUEST['return_module'] == 'Prospects' ) {
 
-			$prospect=new Prospect();
-			$prospect->retrieve($_REQUEST['return_id']);
-			foreach($prospect->field_defs as $key=>$value)
-			{
-				if ($key == 'id' or $key=='deleted' )continue;
-				if (isset($this->bean->field_defs[$key])) {
-					$this->bean->$key = $prospect->$key;
-				}
-			}
-			$_POST['is_converted']=true;
-		}
-		return true;
-	}
-	function action_editview(){
-		$this->view = 'edit';
-		return true;
-	}
+            $prospect=new Prospect();
+            $prospect->retrieve($_REQUEST['return_id']);
+            foreach($prospect->field_defs as $key=>$value)
+            {
+                if ($key == 'id' or $key=='deleted' )continue;
+                if (isset($this->bean->field_defs[$key])) {
+                    $this->bean->$key = $prospect->$key;
+                }
+            }
+            $_POST['is_converted']=true;
+        }
+        return true;
+    }
+    function action_editview(){
+        $this->view = 'edit';
+        return true;
+    }
 
-	protected function callLegacyCode(){
-    	if(strtolower($this->do_action) == 'convertlead'){
-        	if(file_exists('modules/Leads/ConvertLead.php') && !file_exists('custom/modules/Leads/metadata/convertdefs.php')){
-	        	if(!empty($_REQUEST['emailAddressWidget'])) {
-				   foreach($_REQUEST as $key=>$value) {
-				   	  if(preg_match('/^Leads.*?emailAddress[\d]+$/', $key)) {
-				   	  	 $_REQUEST['Leads_email_widget_id'] = 0;
-				   	  	 break;
-				   	  }
-				   }
-				}
-        		$this->action_default();
+    protected function callLegacyCode(){
+        if(strtolower($this->do_action) == 'convertlead'){
+            if(file_exists('modules/Leads/ConvertLead.php') && !file_exists('custom/modules/Leads/metadata/convertdefs.php')){
+                if(!empty($_REQUEST['emailAddressWidget'])) {
+                    foreach($_REQUEST as $key=>$value) {
+                            if(preg_match('/^Leads.*?emailAddress[\d]+$/', $key)) {
+                                $_REQUEST['Leads_email_widget_id'] = 0;
+                                break;
+                            }
+                    }
+                }
+                $this->action_default();
                 $this->_processed = true;
             }else{
-            	$this->view = 'convertlead';
+                $this->view = 'convertlead';
                 $this->_processed = true;
             }
-  		}else{
+            }else{
                 parent::callLegacyCode();
         }
-	}
+    }
 }
 ?>
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -37,17 +37,17 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-class LeadsController extends SugarController{
-	function __construct(){
+class LeadsController extends SugarController {
+	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 LeadsController(){
+    function LeadsController() {
         $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 {
@@ -56,34 +56,34 @@ 
         self::__construct();
     }
 
-	function pre_editview(){
+	function pre_editview() {
 		//IF we have a prospect id leads convert it to a lead
-		if (empty($this->bean->id) && !empty($_REQUEST['return_module']) &&$_REQUEST['return_module'] == 'Prospects' ) {
+		if (empty($this->bean->id) && !empty($_REQUEST['return_module']) && $_REQUEST['return_module'] == 'Prospects') {
 
-			$prospect=new Prospect();
+			$prospect = new Prospect();
 			$prospect->retrieve($_REQUEST['return_id']);
-			foreach($prospect->field_defs as $key=>$value)
+			foreach ($prospect->field_defs as $key=>$value)
 			{
-				if ($key == 'id' or $key=='deleted' )continue;
+				if ($key == 'id' or $key == 'deleted')continue;
 				if (isset($this->bean->field_defs[$key])) {
 					$this->bean->$key = $prospect->$key;
 				}
 			}
-			$_POST['is_converted']=true;
+			$_POST['is_converted'] = true;
 		}
 		return true;
 	}
-	function action_editview(){
+	function action_editview() {
 		$this->view = 'edit';
 		return true;
 	}
 
-	protected function callLegacyCode(){
-    	if(strtolower($this->do_action) == 'convertlead'){
-        	if(file_exists('modules/Leads/ConvertLead.php') && !file_exists('custom/modules/Leads/metadata/convertdefs.php')){
-	        	if(!empty($_REQUEST['emailAddressWidget'])) {
-				   foreach($_REQUEST as $key=>$value) {
-				   	  if(preg_match('/^Leads.*?emailAddress[\d]+$/', $key)) {
+	protected function callLegacyCode() {
+    	if (strtolower($this->do_action) == 'convertlead') {
+        	if (file_exists('modules/Leads/ConvertLead.php') && !file_exists('custom/modules/Leads/metadata/convertdefs.php')) {
+	        	if (!empty($_REQUEST['emailAddressWidget'])) {
+				   foreach ($_REQUEST as $key=>$value) {
+				   	  if (preg_match('/^Leads.*?emailAddress[\d]+$/', $key)) {
 				   	  	 $_REQUEST['Leads_email_widget_id'] = 0;
 				   	  	 break;
 				   	  }
@@ -91,11 +91,11 @@ 
 				}
         		$this->action_default();
                 $this->_processed = true;
-            }else{
+            } else {
             	$this->view = 'convertlead';
                 $this->_processed = true;
             }
-  		}else{
+  		} else {
                 parent::callLegacyCode();
         }
 	}

Braces +6 added lines, -5 removed lines

@@ -49,8 +49,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();
@@ -64,7 +63,9 @@ 
 			$prospect->retrieve($_REQUEST['return_id']);
 			foreach($prospect->field_defs as $key=>$value)
 			{
-				if ($key == 'id' or $key=='deleted' )continue;
+				if ($key == 'id' or $key=='deleted' ) {
+				    continue;
+				}
 				if (isset($this->bean->field_defs[$key])) {
 					$this->bean->$key = $prospect->$key;
 				}
@@ -91,11 +92,11 @@ 
 				}
         		$this->action_default();
                 $this->_processed = true;
-            }else{
+            } else{
             	$this->view = 'convertlead';
                 $this->_processed = true;
             }
-  		}else{
+  		} else{
                 parent::callLegacyCode();
         }
 	}

modules/Favorites/Favorites.php

Spacing +13 added lines, -13 removed lines

@@ -52,9 +52,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 Favorites(){
+    public function Favorites() {
         $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 {
@@ -64,13 +64,13 @@ 
     }
 
 
-    public function deleteFavorite($id){
-        if($id){
-            $favorite_record = BeanFactory::getBean('Favorites',$id);
+    public function deleteFavorite($id) {
+        if ($id) {
+            $favorite_record = BeanFactory::getBean('Favorites', $id);
             $favorite_record->deleted = 1;
             $favorite_record->save();
             return true;
-        }else{
+        } else {
             return false;
         }
 
@@ -79,7 +79,7 @@ 
     public function getFavoriteID($module, $record_id)
     {
         global $db, $current_user;
-        $query = "SELECT id FROM favorites WHERE parent_id= '" . $record_id . "' AND parent_type = '" . $module . "' AND assigned_user_id = '" . $current_user->id . "' AND deleted = 0 ORDER BY date_entered desc";
+        $query = "SELECT id FROM favorites WHERE parent_id= '".$record_id."' AND parent_type = '".$module."' AND assigned_user_id = '".$current_user->id."' AND deleted = 0 ORDER BY date_entered desc";
         return $db->getOne($query);
     }
 
@@ -89,10 +89,10 @@ 
 
         $return_array = array();
 
-        if($id){
-            $query = "SELECT parent_id, parent_type FROM favorites WHERE assigned_user_id = '" . $current_user->id . "' AND parent_id = '" . $id . "' AND deleted = 0 ORDER BY date_entered desc";
-        }else{
-            $query = "SELECT parent_id, parent_type FROM favorites WHERE assigned_user_id = '" . $current_user->id . "' AND deleted = 0 ORDER BY date_entered desc";
+        if ($id) {
+            $query = "SELECT parent_id, parent_type FROM favorites WHERE assigned_user_id = '".$current_user->id."' AND parent_id = '".$id."' AND deleted = 0 ORDER BY date_entered desc";
+        } else {
+            $query = "SELECT parent_id, parent_type FROM favorites WHERE assigned_user_id = '".$current_user->id."' AND deleted = 0 ORDER BY date_entered desc";
         }
 
         $result = $db->query($query);
@@ -100,12 +100,12 @@ 
         $i = 0;
         while ($row = $db->fetchByAssoc($result)) {
 
-            $bean = BeanFactory::getBean($row['parent_type'],$row['parent_id']);
+            $bean = BeanFactory::getBean($row['parent_type'], $row['parent_id']);
             $return_array[$i]['item_summary'] = $bean->name;
             $return_array[$i]['item_summary_short'] = to_html(getTrackerSubstring($bean->name));
             $return_array[$i]['id'] = $row['parent_id'];
             $return_array[$i]['module_name'] = $row['parent_type'];
-            $return_array[$i]['image'] = SugarThemeRegistry::current() ->getImage($row['parent_type'],'border="0" align="absmiddle"',null,null,'.gif',$bean->name);
+            $return_array[$i]['image'] = SugarThemeRegistry::current() ->getImage($row['parent_type'], 'border="0" align="absmiddle"', null, null, '.gif', $bean->name);
 
             $i++;
         }

Braces +3 added lines, -4 removed lines

@@ -56,8 +56,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();
@@ -70,7 +69,7 @@ 
             $favorite_record->deleted = 1;
             $favorite_record->save();
             return true;
-        }else{
+        } else{
             return false;
         }
 
@@ -91,7 +90,7 @@ 
 
         if($id){
             $query = "SELECT parent_id, parent_type FROM favorites WHERE assigned_user_id = '" . $current_user->id . "' AND parent_id = '" . $id . "' AND deleted = 0 ORDER BY date_entered desc";
-        }else{
+        } else{
             $query = "SELECT parent_id, parent_type FROM favorites WHERE assigned_user_id = '" . $current_user->id . "' AND deleted = 0 ORDER BY date_entered desc";
         }
 

modules/Favorites/Favorites_sugar.php

Spacing +2 added lines, -2 removed lines

@@ -79,9 +79,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 Favorites_sugar(){
+    public function Favorites_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 {

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);