adamjakab / SuiteCRM

modules/SchedulersJobs/field_arrays.php

Indentation +18 added lines, -18 removed lines

@@ -40,23 +40,23 @@
 
 
 $fields_array['Schedulers_jobs'] = array (
-	'column_fields' => array (
-		'id',
-		'deleted',
-		'date_entered',
-		'date_modified',
-		'job_id',
-		'execute_time',
-		'status',
-	),
-	'list_fields' => array (
-		'id',
-		'job_id',
-		'execute_time'
-	),
-	'required_fields' => array (
-		'job_id' => 1,
-		'execute_time' => 1
-	)
+    'column_fields' => array (
+        'id',
+        'deleted',
+        'date_entered',
+        'date_modified',
+        'job_id',
+        'execute_time',
+        'status',
+    ),
+    'list_fields' => array (
+        'id',
+        'job_id',
+        'execute_time'
+    ),
+    'required_fields' => array (
+        'job_id' => 1,
+        'execute_time' => 1
+    )
 );
 ?>

Spacing +5 added lines, -5 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.
@@ -39,8 +39,8 @@ 
  ********************************************************************************/
 
 
-$fields_array['Schedulers_jobs'] = array (
-	'column_fields' => array (
+$fields_array['Schedulers_jobs'] = array(
+	'column_fields' => array(
 		'id',
 		'deleted',
 		'date_entered',
@@ -49,12 +49,12 @@ 
 		'execute_time',
 		'status',
 	),
-	'list_fields' => array (
+	'list_fields' => array(
 		'id',
 		'job_id',
 		'execute_time'
 	),
-	'required_fields' => array (
+	'required_fields' => array(
 		'job_id' => 1,
 		'execute_time' => 1
 	)

Braces +3 added lines, -1 removed lines

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

modules/SchedulersJobs/SchedulersJob.php

Indentation +207 added lines, -207 removed lines

@@ -55,17 +55,17 @@ 
     const JOB_FAILURE = 'failure';
 
     // schema attributes
-	public $id;
-	public $name;
-	public $deleted;
-	public $date_entered;
-	public $date_modified;
-	public $scheduler_id;
-	public $execute_time; // when to execute
+    public $id;
+    public $name;
+    public $deleted;
+    public $date_entered;
+    public $date_modified;
+    public $scheduler_id;
+    public $execute_time; // when to execute
     public $status;
     public $resolution;
     public $message;
-	public $target; // URL or function name
+    public $target; // URL or function name
     public $data; // Data set
     public $requeue; // Requeue on failure?
     public $retry_count;
@@ -76,61 +76,61 @@ 
     public $execute_time_db;
     public $percent_complete; // how much of the job is done
 
-	// standard SugarBean child attrs
-	var $table_name		= "job_queue";
-	var $object_name		= "SchedulersJob";
-	var $module_dir		= "SchedulersJobs";
-	var $new_schema		= true;
-	var $process_save_dates = true;
-	// related fields
-	var $job_name;	// the Scheduler's 'name' field
-	var $job;		// the Scheduler's 'job' field
-	// object specific attributes
-	public $user; // User object
-	var $scheduler; // Scheduler parent
-	public $min_interval = 30; // minimal interval for job reruns
-	protected $job_done = true;
+    // standard SugarBean child attrs
+    var $table_name		= "job_queue";
+    var $object_name		= "SchedulersJob";
+    var $module_dir		= "SchedulersJobs";
+    var $new_schema		= true;
+    var $process_save_dates = true;
+    // related fields
+    var $job_name;	// the Scheduler's 'name' field
+    var $job;		// the Scheduler's 'job' field
+    // object specific attributes
+    public $user; // User object
+    var $scheduler; // Scheduler parent
+    public $min_interval = 30; // minimal interval for job reruns
+    protected $job_done = true;
     protected $old_user;
 
-	/**
-	 * Job constructor.
-	 */
-	function SchedulersJob()
-	{
+    /**
+     * Job constructor.
+     */
+    function SchedulersJob()
+    {
         parent::Basic();
         if(!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
             $this->min_interval = $GLOBALS['sugar_config']['jobs']['min_retry_interval'];
         }
-	}
+    }
 
-	public function check_date_relationships_load()
-	{
+    public function check_date_relationships_load()
+    {
         // Hack to work around the mess with dates being auto-converted to user format on retrieve
-	    $this->execute_time_db = $this->db->fromConvert($this->execute_time, 'datetime');
-	    parent::check_date_relationships_load();
+        $this->execute_time_db = $this->db->fromConvert($this->execute_time, 'datetime');
+        parent::check_date_relationships_load();
     }
-	/**
+    /**
      * handleDateFormat
      *
-	 * This function handles returning a datetime value.  It allows a user instance to be passed in, but will default to the
+     * This function handles returning a datetime value.  It allows a user instance to be passed in, but will default to the
      * user member variable instance if none is found.
      *
-	 * @param string $date String value of the date to calculate, defaults to 'now'
-	 * @param object $user The User instance to use in calculating the time value, if empty, it will default to user member variable
-	 * @param boolean $user_format Boolean indicating whether or not to convert to user's time format, defaults to false
+     * @param string $date String value of the date to calculate, defaults to 'now'
+     * @param object $user The User instance to use in calculating the time value, if empty, it will default to user member variable
+     * @param boolean $user_format Boolean indicating whether or not to convert to user's time format, defaults to false
      *
-	 * @return string Formatted datetime value
-	 */
-	function handleDateFormat($date='now', $user=null, $user_format=false) {
-		global $timedate;
+     * @return string Formatted datetime value
+     */
+    function handleDateFormat($date='now', $user=null, $user_format=false) {
+        global $timedate;
 
-		if(!isset($timedate) || empty($timedate))
+        if(!isset($timedate) || empty($timedate))
         {
-			$timedate = new TimeDate();
-		}
+            $timedate = new TimeDate();
+        }
 
-		// get user for calculation
-		$user = (empty($user)) ? $this->user : $user;
+        // get user for calculation
+        $user = (empty($user)) ? $this->user : $user;
 
         if($date == 'now')
         {
@@ -141,109 +141,109 @@ 
 
         // if $user_format is set to true then just return as th user's time format, otherwise, return as database format
         return $user_format ? $dbTime : $timedate->fromUser($dbTime, $user)->asDb();
-	}
-
-
-	///////////////////////////////////////////////////////////////////////////
-	////	SCHEDULERSJOB HELPER FUNCTIONS
-
-	/**
-	 * This function takes a passed URL and cURLs it to fake multi-threading with another httpd instance
-	 * @param	$job		String in URI-clean format
-	 * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
-	 */
-	public function fireUrl($job, $timeout=30)
-	{
-	// TODO: figure out what error is thrown when no more apache instances can be spun off
-	    // cURL inits
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $job); // set url
-		curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
-		curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
-		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
-		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
-		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
-		curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
-		curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
-		$urlparts = parse_url($job);
-		if(empty($urlparts['port'])) {
-		    if($urlparts['scheme'] == 'https'){
-				$urlparts['port'] = 443;
-			} else {
-				$urlparts['port'] = 80;
-			}
-		}
-		curl_setopt($ch, CURLOPT_PORT, $urlparts['port']); // set port as reported by Server
-		//TODO make the below configurable
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // most customers will not have Certificate Authority account
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // most customers will not have Certificate Authority account
-
-		curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
-		$result = curl_exec($ch);
-		$cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
-									//ssl_verify_result,total_time,namelookup_time,connect_time
-									//pretransfer_time,size_upload,size_download,speed_download,
-									//speed_upload,download_content_length,upload_content_length
-									//starttransfer_time,redirect_time
-		if(curl_errno($ch)) {
-		    $this->errors .= curl_errno($ch)."\n";
-		}
-		curl_close($ch);
-
-		if($result !== FALSE && $cInfo['http_code'] < 400) {
-			$GLOBALS['log']->debug("----->Firing was successful: $job");
-			$GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
-			return true;
-		} else {
-			$GLOBALS['log']->fatal("Job failed: $job");
-			return false;
-		}
-	}
-	////	END SCHEDULERSJOB HELPER FUNCTIONS
-	///////////////////////////////////////////////////////////////////////////
-
-
-	///////////////////////////////////////////////////////////////////////////
-	////	STANDARD SUGARBEAN OVERRIDES
-	/**
-	 * This function gets DB data and preps it for ListViews
-	 */
-	function get_list_view_data()
-	{
-		global $mod_strings;
-
-		$temp_array = $this->get_list_view_array();
-		$temp_array['JOB_NAME'] = $this->job_name;
-		$temp_array['JOB']		= $this->job;
-
-    	return $temp_array;
-	}
-
-	/** method stub for future customization
-	 *
-	 */
-	function fill_in_additional_list_fields()
-	{
-		$this->fill_in_additional_detail_fields();
-	}
-
-
-	/**
-	 * Mark this job as failed
-	 * @param string $message
-	 */
+    }
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    ////	SCHEDULERSJOB HELPER FUNCTIONS
+
+    /**
+     * This function takes a passed URL and cURLs it to fake multi-threading with another httpd instance
+     * @param	$job		String in URI-clean format
+     * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
+     */
+    public function fireUrl($job, $timeout=30)
+    {
+    // TODO: figure out what error is thrown when no more apache instances can be spun off
+        // cURL inits
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $job); // set url
+        curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
+        curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
+        curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
+        curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
+        curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
+        curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
+        curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
+        $urlparts = parse_url($job);
+        if(empty($urlparts['port'])) {
+            if($urlparts['scheme'] == 'https'){
+                $urlparts['port'] = 443;
+            } else {
+                $urlparts['port'] = 80;
+            }
+        }
+        curl_setopt($ch, CURLOPT_PORT, $urlparts['port']); // set port as reported by Server
+        //TODO make the below configurable
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); // most customers will not have Certificate Authority account
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // most customers will not have Certificate Authority account
+
+        curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
+        $result = curl_exec($ch);
+        $cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
+                                    //ssl_verify_result,total_time,namelookup_time,connect_time
+                                    //pretransfer_time,size_upload,size_download,speed_download,
+                                    //speed_upload,download_content_length,upload_content_length
+                                    //starttransfer_time,redirect_time
+        if(curl_errno($ch)) {
+            $this->errors .= curl_errno($ch)."\n";
+        }
+        curl_close($ch);
+
+        if($result !== FALSE && $cInfo['http_code'] < 400) {
+            $GLOBALS['log']->debug("----->Firing was successful: $job");
+            $GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
+            return true;
+        } else {
+            $GLOBALS['log']->fatal("Job failed: $job");
+            return false;
+        }
+    }
+    ////	END SCHEDULERSJOB HELPER FUNCTIONS
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    ///////////////////////////////////////////////////////////////////////////
+    ////	STANDARD SUGARBEAN OVERRIDES
+    /**
+     * This function gets DB data and preps it for ListViews
+     */
+    function get_list_view_data()
+    {
+        global $mod_strings;
+
+        $temp_array = $this->get_list_view_array();
+        $temp_array['JOB_NAME'] = $this->job_name;
+        $temp_array['JOB']		= $this->job;
+
+        return $temp_array;
+    }
+
+    /** method stub for future customization
+     *
+     */
+    function fill_in_additional_list_fields()
+    {
+        $this->fill_in_additional_detail_fields();
+    }
+
+
+    /**
+     * Mark this job as failed
+     * @param string $message
+     */
     public function failJob($message = null)
     {
         return $this->resolveJob(self::JOB_FAILURE, $message);
     }
 
-	/**
-	 * Mark this job as success
-	 * @param string $message
-	 */
+    /**
+     * Mark this job as success
+     * @param string $message
+     */
     public function succeedJob($message = null)
     {
         return $this->resolveJob(self::JOB_SUCCESS, $message);
@@ -413,28 +413,28 @@ 
     {
         switch($errno)
         {
-    		case E_USER_WARNING:
-    		case E_COMPILE_WARNING:
-    		case E_CORE_WARNING:
-    		case E_WARNING:
-    			$type = "Warning";
-    			break;
-    		case E_USER_ERROR:
-    		case E_COMPILE_ERROR:
-    		case E_CORE_ERROR:
-    		case E_ERROR:
-    			$type = "Fatal Error";
-	    		break;
-    		case E_PARSE:
-    			$type = "Parse Error";
-	    		break;
-    		case E_RECOVERABLE_ERROR:
-    			$type = "Recoverable Error";
-	    		break;
-		    default:
-		        // Ignore errors we don't know about
-		        return;
-    	}
+            case E_USER_WARNING:
+            case E_COMPILE_WARNING:
+            case E_CORE_WARNING:
+            case E_WARNING:
+                $type = "Warning";
+                break;
+            case E_USER_ERROR:
+            case E_COMPILE_ERROR:
+            case E_CORE_ERROR:
+            case E_ERROR:
+                $type = "Fatal Error";
+                break;
+            case E_PARSE:
+                $type = "Parse Error";
+                break;
+            case E_RECOVERABLE_ERROR:
+                $type = "Recoverable Error";
+                break;
+            default:
+                // Ignore errors we don't know about
+                return;
+        }
         $errstr = strip_tags($errstr);
         $this->errors .= sprintf(translate('ERR_PHP', 'SchedulersJobs'), $type, $errno, $errstr, $errfile, $errline)."\n";
     }
@@ -451,13 +451,13 @@ 
             session_destroy();
         }
         if(!headers_sent()) {
-    		session_start();
+            session_start();
             session_regenerate_id();
         }
         $_SESSION['is_valid_session']= true;
-    	$_SESSION['user_id'] = $user->id;
-    	$_SESSION['type'] = 'user';
-    	$_SESSION['authenticated_user_id'] = $user->id;
+        $_SESSION['user_id'] = $user->id;
+        $_SESSION['type'] = 'user';
+        $_SESSION['authenticated_user_id'] = $user->id;
     }
 
     /**
@@ -509,48 +509,48 @@ 
             if(!$this->setJobUser()) {
                 return false;
             }
-    		$func = $exJob[1];
-			$GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
+            $func = $exJob[1];
+            $GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
             set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-			if(!is_callable($func)) {
-			    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
-			}
-			$data = array($this);
-			if(!empty($this->data)) {
-			    $data[] = $this->data;
-			}
+            if(!is_callable($func)) {
+                $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
+            }
+            $data = array($this);
+            if(!empty($this->data)) {
+                $data[] = $this->data;
+            }
             $res = call_user_func_array($func, $data);
             restore_error_handler();
             $this->restoreJobUser();
-			if($this->status == self::JOB_STATUS_RUNNING) {
-			    // nobody updated the status yet - job function could do that
-    			if($res) {
-    			    $this->resolveJob(self::JOB_SUCCESS);
-    				return true;
-    			} else {
-    			    $this->resolveJob(self::JOB_FAILURE);
-    			    return false;
-    			}
-			} else {
-			    return $this->resolution != self::JOB_FAILURE;
-			}
-		} elseif($exJob[0] == 'url') {
-			if(function_exists('curl_init')) {
-				$GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
+            if($this->status == self::JOB_STATUS_RUNNING) {
+                // nobody updated the status yet - job function could do that
+                if($res) {
+                    $this->resolveJob(self::JOB_SUCCESS);
+                    return true;
+                } else {
+                    $this->resolveJob(self::JOB_FAILURE);
+                    return false;
+                }
+            } else {
+                return $this->resolution != self::JOB_FAILURE;
+            }
+        } elseif($exJob[0] == 'url') {
+            if(function_exists('curl_init')) {
+                $GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
                 set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-				if($this->fireUrl($exJob[1])) {
+                if($this->fireUrl($exJob[1])) {
                     restore_error_handler();
                     $this->resolveJob(self::JOB_SUCCESS);
-					return true;
-				} else {
+                    return true;
+                } else {
                     restore_error_handler();
-				    $this->resolveJob(self::JOB_FAILURE);
-					return false;
-				}
-			} else {
-			    $this->resolveJob(self::JOB_FAILURE, translate('ERR_CURL', 'SchedulersJobs'));
-			}
-		} elseif ($exJob[0] == 'class') {
+                    $this->resolveJob(self::JOB_FAILURE);
+                    return false;
+                }
+            } else {
+                $this->resolveJob(self::JOB_FAILURE, translate('ERR_CURL', 'SchedulersJobs'));
+            }
+        } elseif ($exJob[0] == 'class') {
             $tmpJob = new $exJob[1]();
             if($tmpJob instanceof RunnableSchedulerJob)
             {
@@ -579,9 +579,9 @@ 
             }
         }
         else {
-		    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
-		}
-		return false;
+            $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
+        }
+        return false;
     }
 
 }  // end class Job

Spacing +49 added lines, -49 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.
@@ -70,7 +70,7 @@ 
     public $requeue; // Requeue on failure?
     public $retry_count;
     public $failure_count;
-    public $job_delay=0; // Frequency to run it
+    public $job_delay = 0; // Frequency to run it
     public $assigned_user_id; // User under which the task is running
     public $client; // Client ID that owns this job
     public $execute_time_db;
@@ -78,13 +78,13 @@ 
 
 	// standard SugarBean child attrs
 	var $table_name		= "job_queue";
-	var $object_name		= "SchedulersJob";
+	var $object_name = "SchedulersJob";
 	var $module_dir		= "SchedulersJobs";
 	var $new_schema		= true;
 	var $process_save_dates = true;
 	// related fields
-	var $job_name;	// the Scheduler's 'name' field
-	var $job;		// the Scheduler's 'job' field
+	var $job_name; // the Scheduler's 'name' field
+	var $job; // the Scheduler's 'job' field
 	// object specific attributes
 	public $user; // User object
 	var $scheduler; // Scheduler parent
@@ -98,7 +98,7 @@ 
 	function SchedulersJob()
 	{
         parent::Basic();
-        if(!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
+        if (!empty($GLOBALS['sugar_config']['jobs']['min_retry_interval'])) {
             $this->min_interval = $GLOBALS['sugar_config']['jobs']['min_retry_interval'];
         }
 	}
@@ -121,10 +121,10 @@ 
      *
 	 * @return string Formatted datetime value
 	 */
-	function handleDateFormat($date='now', $user=null, $user_format=false) {
+	function handleDateFormat($date = 'now', $user = null, $user_format = false) {
 		global $timedate;
 
-		if(!isset($timedate) || empty($timedate))
+		if (!isset($timedate) || empty($timedate))
         {
 			$timedate = new TimeDate();
 		}
@@ -132,7 +132,7 @@ 
 		// get user for calculation
 		$user = (empty($user)) ? $this->user : $user;
 
-        if($date == 'now')
+        if ($date == 'now')
         {
             $dbTime = $timedate->asUser($timedate->getNow(), $user);
         } else {
@@ -152,7 +152,7 @@ 
 	 * @param	$job		String in URI-clean format
 	 * @param	$timeout	Int value in secs for cURL to timeout. 30 default.
 	 */
-	public function fireUrl($job, $timeout=30)
+	public function fireUrl($job, $timeout = 30)
 	{
 	// TODO: figure out what error is thrown when no more apache instances can be spun off
 	    // cURL inits
@@ -161,16 +161,16 @@ 
 		curl_setopt($ch, CURLOPT_FAILONERROR, true); // silent failure (code >300);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // do not follow location(); inits - we always use the current
 		curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
-		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false);  // not thread-safe
+		curl_setopt($ch, CURLOPT_DNS_USE_GLOBAL_CACHE, false); // not thread-safe
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); // return into a variable to continue program execution
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // never times out - bad idea?
 		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); // 5 secs for connect timeout
-		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);  // open brand new conn
+		curl_setopt($ch, CURLOPT_FRESH_CONNECT, true); // open brand new conn
 		curl_setopt($ch, CURLOPT_HEADER, true); // do not return header info with result
 		curl_setopt($ch, CURLOPT_NOPROGRESS, true); // do not have progress bar
 		$urlparts = parse_url($job);
-		if(empty($urlparts['port'])) {
-		    if($urlparts['scheme'] == 'https'){
+		if (empty($urlparts['port'])) {
+		    if ($urlparts['scheme'] == 'https') {
 				$urlparts['port'] = 443;
 			} else {
 				$urlparts['port'] = 80;
@@ -183,17 +183,17 @@ 
 
 		curl_setopt($ch, CURLOPT_NOSIGNAL, true); // ignore any cURL signals to PHP (for multi-threading)
 		$result = curl_exec($ch);
-		$cInfo = curl_getinfo($ch);	//url,content_type,header_size,request_size,filetime,http_code
+		$cInfo = curl_getinfo($ch); //url,content_type,header_size,request_size,filetime,http_code
 									//ssl_verify_result,total_time,namelookup_time,connect_time
 									//pretransfer_time,size_upload,size_download,speed_download,
 									//speed_upload,download_content_length,upload_content_length
 									//starttransfer_time,redirect_time
-		if(curl_errno($ch)) {
+		if (curl_errno($ch)) {
 		    $this->errors .= curl_errno($ch)."\n";
 		}
 		curl_close($ch);
 
-		if($result !== FALSE && $cInfo['http_code'] < 400) {
+		if ($result !== FALSE && $cInfo['http_code'] < 400) {
 			$GLOBALS['log']->debug("----->Firing was successful: $job");
 			$GLOBALS['log']->debug('----->WTIH RESULT: '.strip_tags($result).' AND '.strip_tags(print_r($cInfo, true)));
 			return true;
@@ -217,7 +217,7 @@ 
 
 		$temp_array = $this->get_list_view_array();
 		$temp_array['JOB_NAME'] = $this->job_name;
-		$temp_array['JOB']		= $this->job;
+		$temp_array['JOB'] = $this->job;
 
     	return $temp_array;
 	}
@@ -276,12 +276,12 @@ 
     public function resolveJob($resolution, $message = null)
     {
         $GLOBALS['log']->info("Resolving job {$this->id} as $resolution: $message");
-        if($resolution == self::JOB_FAILURE) {
+        if ($resolution == self::JOB_FAILURE) {
             $this->failure_count++;
-            if($this->requeue && $this->retry_count > 0) {
+            if ($this->requeue && $this->retry_count > 0) {
                 // retry failed job
                 $this->status = self::JOB_STATUS_QUEUED;
-                if($this->job_delay < $this->min_interval) {
+                if ($this->job_delay < $this->min_interval) {
                     $this->job_delay = $this->min_interval;
                 }
                 $this->execute_time = $GLOBALS['timedate']->getNow()->modify("+{$this->job_delay} seconds")->asDb();
@@ -299,7 +299,7 @@ 
         $this->addMessages($message);
         $this->resolution = $resolution;
         $this->save();
-        if($this->status == self::JOB_STATUS_DONE && $this->resolution == self::JOB_SUCCESS) {
+        if ($this->status == self::JOB_STATUS_DONE && $this->resolution == self::JOB_SUCCESS) {
             $this->updateSchedulerSuccess();
         }
         return true;
@@ -310,7 +310,7 @@ 
      */
     protected function updateSchedulerSuccess()
     {
-        if(empty($this->scheduler_id)) {
+        if (empty($this->scheduler_id)) {
             return;
         }
         $this->db->query("UPDATE schedulers SET last_run={$this->db->now()} WHERE id=".$this->db->quoted($this->scheduler_id));
@@ -323,11 +323,11 @@ 
      */
     protected function addMessages($message)
     {
-        if(!empty($this->errors)) {
+        if (!empty($this->errors)) {
             $this->message .= $this->errors;
             $this->errors = '';
         }
-        if(!empty($message)) {
+        if (!empty($message)) {
             $this->message .= "$message\n";
         }
     }
@@ -343,7 +343,7 @@ 
         $this->status = self::JOB_STATUS_QUEUED;
         $this->addMessages($message);
         $this->resolution = self::JOB_PARTIAL;
-        if(empty($delay)) {
+        if (empty($delay)) {
             $delay = intval($this->job_delay);
         }
         $this->execute_time = $GLOBALS['timedate']->getNow()->modify("+$delay seconds")->asDb();
@@ -367,7 +367,7 @@ 
      */
     public function unexpectedExit()
     {
-        if(!$this->job_done) {
+        if (!$this->job_done) {
             // Job wasn't properly finished, fail it
             $this->resolveJob(self::JOB_FAILURE, translate('ERR_FAILED', 'SchedulersJobs'));
         }
@@ -383,15 +383,15 @@ 
     {
         $job = new self();
         $job->retrieve($id);
-        if(empty($job->id)) {
+        if (empty($job->id)) {
             $GLOBALS['log']->fatal("Job $id not found.");
             return "Job $id not found.";
         }
-        if($job->status != self::JOB_STATUS_RUNNING) {
+        if ($job->status != self::JOB_STATUS_RUNNING) {
             $GLOBALS['log']->fatal("Job $id is not marked as running.");
             return "Job $id is not marked as running.";
         }
-        if($job->client != $client) {
+        if ($job->client != $client) {
             $GLOBALS['log']->fatal("Job $id belongs to client {$job->client}, can not run as $client.");
             return "Job $id belongs to another client, can not run as $client.";
         }
@@ -411,7 +411,7 @@ 
      */
     public function errorHandler($errno, $errstr, $errfile, $errline)
     {
-        switch($errno)
+        switch ($errno)
         {
     		case E_USER_WARNING:
     		case E_COMPILE_WARNING:
@@ -447,14 +447,14 @@ 
     {
         $GLOBALS['current_user'] = $user;
         // Reset the session
-        if(session_id()) {
+        if (session_id()) {
             session_destroy();
         }
-        if(!headers_sent()) {
+        if (!headers_sent()) {
     		session_start();
             session_regenerate_id();
         }
-        $_SESSION['is_valid_session']= true;
+        $_SESSION['is_valid_session'] = true;
     	$_SESSION['user_id'] = $user->id;
     	$_SESSION['type'] = 'user';
     	$_SESSION['authenticated_user_id'] = $user->id;
@@ -467,11 +467,11 @@ 
     protected function setJobUser()
     {
         // set up the current user and drop session
-        if(!empty($this->assigned_user_id)) {
+        if (!empty($this->assigned_user_id)) {
             $this->old_user = $GLOBALS['current_user'];
-            if(empty($this->user->id) || $this->assigned_user_id != $this->user->id) {
+            if (empty($this->user->id) || $this->assigned_user_id != $this->user->id) {
                 $this->user = BeanFactory::getBean('Users', $this->assigned_user_id);
-                if(empty($this->user->id)) {
+                if (empty($this->user->id)) {
                     $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_NOSUCHUSER', 'SchedulersJobs'), $this->assigned_user_id));
                     return false;
                 }
@@ -489,7 +489,7 @@ 
      */
     protected function restoreJobUser()
     {
-        if(!empty($this->old_user->id) && $this->old_user->id != $this->user->id) {
+        if (!empty($this->old_user->id) && $this->old_user->id != $this->user->id) {
             $this->sudo($this->old_user);
         }
     }
@@ -504,27 +504,27 @@ 
 
         $this->errors = "";
         $exJob = explode('::', $this->target, 2);
-        if($exJob[0] == 'function') {
+        if ($exJob[0] == 'function') {
             // set up the current user and drop session
-            if(!$this->setJobUser()) {
+            if (!$this->setJobUser()) {
                 return false;
             }
     		$func = $exJob[1];
 			$GLOBALS['log']->debug("----->SchedulersJob calling function: $func");
             set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-			if(!is_callable($func)) {
+			if (!is_callable($func)) {
 			    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_CALL', 'SchedulersJobs'), $func));
 			}
 			$data = array($this);
-			if(!empty($this->data)) {
+			if (!empty($this->data)) {
 			    $data[] = $this->data;
 			}
             $res = call_user_func_array($func, $data);
             restore_error_handler();
             $this->restoreJobUser();
-			if($this->status == self::JOB_STATUS_RUNNING) {
+			if ($this->status == self::JOB_STATUS_RUNNING) {
 			    // nobody updated the status yet - job function could do that
-    			if($res) {
+    			if ($res) {
     			    $this->resolveJob(self::JOB_SUCCESS);
     				return true;
     			} else {
@@ -534,11 +534,11 @@ 
 			} else {
 			    return $this->resolution != self::JOB_FAILURE;
 			}
-		} elseif($exJob[0] == 'url') {
-			if(function_exists('curl_init')) {
+		} elseif ($exJob[0] == 'url') {
+			if (function_exists('curl_init')) {
 				$GLOBALS['log']->debug('----->SchedulersJob firing URL job: '.$exJob[1]);
                 set_error_handler(array($this, "errorHandler"), E_ALL & ~E_NOTICE & ~E_STRICT);
-				if($this->fireUrl($exJob[1])) {
+				if ($this->fireUrl($exJob[1])) {
                     restore_error_handler();
                     $this->resolveJob(self::JOB_SUCCESS);
 					return true;
@@ -552,10 +552,10 @@ 
 			}
 		} elseif ($exJob[0] == 'class') {
             $tmpJob = new $exJob[1]();
-            if($tmpJob instanceof RunnableSchedulerJob)
+            if ($tmpJob instanceof RunnableSchedulerJob)
             {
                 // set up the current user and drop session
-                if(!$this->setJobUser()) {
+                if (!$this->setJobUser()) {
                     return false;
                 }
                 $tmpJob->setJob($this);

Braces +5 added lines, -5 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.
@@ -573,12 +575,10 @@ 
                 } else {
                     return $this->resolution != self::JOB_FAILURE;
                 }
-            }
-            else {
+            } else {
                 $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
             }
-        }
-        else {
+        } else {
 		    $this->resolveJob(self::JOB_FAILURE, sprintf(translate('ERR_JOBTYPE', 'SchedulersJobs'), strip_tags($this->target)));
 		}
 		return false;

Doc Comments +3 added lines

@@ -356,6 +356,7 @@ 
     /**
      * Delete a job
      * @see SugarBean::mark_deleted($id)
+     * @param string $id
      */
     public function mark_deleted($id)
     {
@@ -595,12 +596,14 @@ 
     /**
      * @abstract
      * @param SchedulersJob $job
+     * @return void
      */
     public function setJob(SchedulersJob $job);
 
     /**
      * @abstract
      *
+     * @return boolean
      */
     public function run($data);
 }

modules/Import/ImportFieldSanitize.php

Spacing +36 added lines, -36 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
@@ -87,24 +87,24 @@ 
     {
         static $sfh;
         
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
         $value = $params[0];
         $vardef = $params[1];
-        if ( isset($params[2]) )
+        if (isset($params[2]))
             $focus = $params[2];
         else
             $focus = null;
-        if ( $name == 'relate' && !empty($params[3]) )
+        if ($name == 'relate' && !empty($params[3]))
             $this->addRelatedBean = true;
         else
             $this->addRelatedBean = false;
         
         $field = $sfh->getSugarField(ucfirst($name));
-        if ( $field instanceOf SugarFieldBase ) {
-            $value = $field->importSanitize($value,$vardef,$focus,$this);
+        if ($field instanceOf SugarFieldBase) {
+            $value = $field->importSanitize($value, $vardef, $focus, $this);
         }
         
         return $value;
@@ -128,10 +128,10 @@ 
 
         $format = $this->dateformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
+        if (!$timedate->check_matching_format($value, $format))
             return false;
 
-        if ( !$this->isValidTimeDate($value, $format) )
+        if (!$this->isValidTimeDate($value, $format))
             return false;
 
         $value = $timedate->swap_formats(
@@ -156,11 +156,11 @@ 
         // cache $sea instance
         static $sea;
         
-        if ( !($sea instanceof SugarEmailAddress) ) {
+        if (!($sea instanceof SugarEmailAddress)) {
             $sea = new SugarEmailAddress;
         }
         
-        if ( !empty($value) && !preg_match($sea->regex,$value) ) {
+        if (!empty($value) && !preg_match($sea->regex, $value)) {
             return false;
         }
 
@@ -184,18 +184,18 @@ 
         static $focus_user;
 
         // cache this object since we'll be reusing it a bunch
-        if ( !($focus_user instanceof User) ) {
+        if (!($focus_user instanceof User)) {
 
             $focus_user = new User();
         }
 
 
-        if ( !empty($value) && strtolower($value) != "all" ) {
-            $theList   = explode(",",$value);
+        if (!empty($value) && strtolower($value) != "all") {
+            $theList   = explode(",", $value);
             $isValid   = true;
             $bad_names = array();
             foreach ($theList as $eachItem) {
-                if ( $focus_user->retrieve_user_id($eachItem)
+                if ($focus_user->retrieve_user_id($eachItem)
                         || $focus_user->retrieve($eachItem)
                 ) {
                     // all good
@@ -206,7 +206,7 @@ 
                     continue;
                 }
             }
-            if(!$isValid) {
+            if (!$isValid) {
                 return false;
             }
         }
@@ -232,10 +232,10 @@ 
 
         $format = $this->timeformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
+        if (!$timedate->check_matching_format($value, $format))
             return false;
 
-        if ( !$this->isValidTimeDate($value, $format) )
+        if (!$this->isValidTimeDate($value, $format))
             return false;
 
         $value = $timedate->swap_formats(
@@ -266,46 +266,46 @@ 
         $reg = $timedate->get_regular_expression($format);
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
 
-        if ( empty($dateparts) )
+        if (empty($dateparts))
             return false;
-        if ( isset($reg['positions']['a'])
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
+        if (isset($reg['positions']['a'])
+                && !in_array($dateparts[$reg['positions']['a']], array('am', 'pm')))
             return false;
-        if ( isset($reg['positions']['A'])
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
+        if (isset($reg['positions']['A'])
+                && !in_array($dateparts[$reg['positions']['A']], array('AM', 'PM')))
             return false;
-        if ( isset($reg['positions']['h']) && (
+        if (isset($reg['positions']['h']) && (
                 !is_numeric($dateparts[$reg['positions']['h']])
                 || $dateparts[$reg['positions']['h']] < 1
-                || $dateparts[$reg['positions']['h']] > 12 ) )
+                || $dateparts[$reg['positions']['h']] > 12 ))
             return false;
-        if ( isset($reg['positions']['H']) && (
+        if (isset($reg['positions']['H']) && (
                 !is_numeric($dateparts[$reg['positions']['H']])
                 || $dateparts[$reg['positions']['H']] < 0
-                || $dateparts[$reg['positions']['H']] > 23 ) )
+                || $dateparts[$reg['positions']['H']] > 23 ))
             return false;
-        if ( isset($reg['positions']['i']) && (
+        if (isset($reg['positions']['i']) && (
                 !is_numeric($dateparts[$reg['positions']['i']])
                 || $dateparts[$reg['positions']['i']] < 0
-                || $dateparts[$reg['positions']['i']] > 59 ) )
+                || $dateparts[$reg['positions']['i']] > 59 ))
             return false;
-        if ( isset($reg['positions']['s']) && (
+        if (isset($reg['positions']['s']) && (
                 !is_numeric($dateparts[$reg['positions']['s']])
                 || $dateparts[$reg['positions']['s']] < 0
-                || $dateparts[$reg['positions']['s']] > 59 ) )
+                || $dateparts[$reg['positions']['s']] > 59 ))
             return false;
-        if ( isset($reg['positions']['d']) && (
+        if (isset($reg['positions']['d']) && (
                 !is_numeric($dateparts[$reg['positions']['d']])
                 || $dateparts[$reg['positions']['d']] < 1
-                || $dateparts[$reg['positions']['d']] > 31 ) )
+                || $dateparts[$reg['positions']['d']] > 31 ))
             return false;
-        if ( isset($reg['positions']['m']) && (
+        if (isset($reg['positions']['m']) && (
                 !is_numeric($dateparts[$reg['positions']['m']])
                 || $dateparts[$reg['positions']['m']] < 1
-                || $dateparts[$reg['positions']['m']] > 12 ) )
+                || $dateparts[$reg['positions']['m']] > 12 ))
             return false;
-        if ( isset($reg['positions']['Y']) &&
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
+        if (isset($reg['positions']['Y']) &&
+                !is_numeric($dateparts[$reg['positions']['Y']]))
             return false;
 
         return true;

Braces +56 added lines, -39 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
@@ -93,14 +95,16 @@ 
         }
         $value = $params[0];
         $vardef = $params[1];
-        if ( isset($params[2]) )
-            $focus = $params[2];
-        else
-            $focus = null;
-        if ( $name == 'relate' && !empty($params[3]) )
-            $this->addRelatedBean = true;
-        else
-            $this->addRelatedBean = false;
+        if ( isset($params[2]) ) {
+                    $focus = $params[2];
+        } else {
+                    $focus = null;
+        }
+        if ( $name == 'relate' && !empty($params[3]) ) {
+                    $this->addRelatedBean = true;
+        } else {
+                    $this->addRelatedBean = false;
+        }
         
         $field = $sfh->getSugarField(ucfirst($name));
         if ( $field instanceOf SugarFieldBase ) {
@@ -128,11 +132,13 @@ 
 
         $format = $this->dateformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
-            return false;
+        if ( !$timedate->check_matching_format($value, $format) ) {
+                    return false;
+        }
 
-        if ( !$this->isValidTimeDate($value, $format) )
-            return false;
+        if ( !$this->isValidTimeDate($value, $format) ) {
+                    return false;
+        }
 
         $value = $timedate->swap_formats(
             $value, $format, $timedate->get_date_format());
@@ -199,8 +205,7 @@ 
                         || $focus_user->retrieve($eachItem)
                 ) {
                     // all good
-                }
-                else {
+                } else {
                     $isValid     = false;
                     $bad_names[] = $eachItem;
                     continue;
@@ -232,11 +237,13 @@ 
 
         $format = $this->timeformat;
 
-        if ( !$timedate->check_matching_format($value, $format) )
-            return false;
+        if ( !$timedate->check_matching_format($value, $format) ) {
+                    return false;
+        }
 
-        if ( !$this->isValidTimeDate($value, $format) )
-            return false;
+        if ( !$this->isValidTimeDate($value, $format) ) {
+                    return false;
+        }
 
         $value = $timedate->swap_formats(
             $value, $format, $timedate->get_time_format());
@@ -266,47 +273,57 @@ 
         $reg = $timedate->get_regular_expression($format);
         preg_match('@'.$reg['format'].'@', $value, $dateparts);
 
-        if ( empty($dateparts) )
-            return false;
+        if ( empty($dateparts) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['a'])
-                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) )
-            return false;
+                && !in_array($dateparts[$reg['positions']['a']], array('am','pm')) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['A'])
-                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) )
-            return false;
+                && !in_array($dateparts[$reg['positions']['A']], array('AM','PM')) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['h']) && (
                 !is_numeric($dateparts[$reg['positions']['h']])
                 || $dateparts[$reg['positions']['h']] < 1
-                || $dateparts[$reg['positions']['h']] > 12 ) )
-            return false;
+                || $dateparts[$reg['positions']['h']] > 12 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['H']) && (
                 !is_numeric($dateparts[$reg['positions']['H']])
                 || $dateparts[$reg['positions']['H']] < 0
-                || $dateparts[$reg['positions']['H']] > 23 ) )
-            return false;
+                || $dateparts[$reg['positions']['H']] > 23 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['i']) && (
                 !is_numeric($dateparts[$reg['positions']['i']])
                 || $dateparts[$reg['positions']['i']] < 0
-                || $dateparts[$reg['positions']['i']] > 59 ) )
-            return false;
+                || $dateparts[$reg['positions']['i']] > 59 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['s']) && (
                 !is_numeric($dateparts[$reg['positions']['s']])
                 || $dateparts[$reg['positions']['s']] < 0
-                || $dateparts[$reg['positions']['s']] > 59 ) )
-            return false;
+                || $dateparts[$reg['positions']['s']] > 59 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['d']) && (
                 !is_numeric($dateparts[$reg['positions']['d']])
                 || $dateparts[$reg['positions']['d']] < 1
-                || $dateparts[$reg['positions']['d']] > 31 ) )
-            return false;
+                || $dateparts[$reg['positions']['d']] > 31 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['m']) && (
                 !is_numeric($dateparts[$reg['positions']['m']])
                 || $dateparts[$reg['positions']['m']] < 1
-                || $dateparts[$reg['positions']['m']] > 12 ) )
-            return false;
+                || $dateparts[$reg['positions']['m']] > 12 ) ) {
+                    return false;
+        }
         if ( isset($reg['positions']['Y']) &&
-                !is_numeric($dateparts[$reg['positions']['Y']]) )
-            return false;
+                !is_numeric($dateparts[$reg['positions']['Y']]) ) {
+                    return false;
+        }
 
         return true;
     }

Doc Comments +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
      *
      * @param  $value  string
      * @param  $format string
-     * @return string sanitized and validated value on success, bool false on failure
+     * @return boolean sanitized and validated value on success, bool false on failure
      */
     public function isValidTimeDate(
         $value,

modules/Import/maps/ImportMapOutlook.php

Indentation +4 added lines, -4 removed lines

@@ -49,11 +49,11 @@ 
 
 class ImportMapOutlook extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'outlook';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter = ',';
@@ -61,7 +61,7 @@ 
      * Field enclosure
      */
     public $enclosure = '"';
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
@@ -72,7 +72,7 @@ 
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {

Switch Indentation +13 added lines, -13 removed lines

@@ -78,19 +78,19 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Job Title"=>"title",
-                "Home Country"=>"alt_address_country",
-                "E-mail 2 Address"=>"email2",
-                );
-            break;
-        case 'Accounts':
-            return $return_array;
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Job Title"=>"title",
+                    "Home Country"=>"alt_address_country",
+                    "E-mail 2 Address"=>"email2",
+                    );
+                break;
+            case 'Accounts':
+                return $return_array;
+                break;
+            default:
+                return $return_array;
         }
     }
 }

Spacing +1 added lines, -1 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.

Braces +3 added lines, -1 removed lines

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

modules/Import/maps/ImportMapGoogle.php

Indentation +27 added lines, -27 removed lines

@@ -44,7 +44,7 @@ 
 
 class ImportMapGoogle extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'google';
@@ -55,38 +55,38 @@ 
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping($module)
+    public function getMapping($module)
     {
-         $return_array = array(
-             'first_name' => array('sugar_key' => 'first_name', 'sugar_label' => '', 'default_label' => 'Given Name'),
-             'last_name' => array('sugar_key' => 'last_name', 'sugar_label' => '', 'default_label' => 'Family Name'),
-             'birthday' => array('sugar_key' => 'birthdate', 'sugar_label' => '', 'default_label' => 'Birthday'),
-             'title' => array('sugar_key' => 'title', 'sugar_label' => '', 'default_label' => 'Title'),
-             'notes' => array('sugar_key' => 'description', 'sugar_label' => '', 'default_label' => 'Notes'),
+            $return_array = array(
+                'first_name' => array('sugar_key' => 'first_name', 'sugar_label' => '', 'default_label' => 'Given Name'),
+                'last_name' => array('sugar_key' => 'last_name', 'sugar_label' => '', 'default_label' => 'Family Name'),
+                'birthday' => array('sugar_key' => 'birthdate', 'sugar_label' => '', 'default_label' => 'Birthday'),
+                'title' => array('sugar_key' => 'title', 'sugar_label' => '', 'default_label' => 'Title'),
+                'notes' => array('sugar_key' => 'description', 'sugar_label' => '', 'default_label' => 'Notes'),
 
-             'alt_address_street' => array('sugar_key' => 'alt_address_street', 'sugar_label' => '', 'default_label' => 'Home Street'),
-             'alt_address_postcode' => array('sugar_key' => 'alt_address_postalcode', 'sugar_label' => '', 'default_label' => 'Home Postcode'),
-             'alt_address_city' => array('sugar_key' => 'alt_address_city', 'sugar_label' => '', 'default_label' => 'Home City'),
-             'alt_address_state' => array('sugar_key' => 'alt_address_state', 'sugar_label' => '', 'default_label' => 'Home State'),
-             'alt_address_country' => array('sugar_key' => 'alt_address_country', 'sugar_label' => '', 'default_label' => 'Home Country'),
+                'alt_address_street' => array('sugar_key' => 'alt_address_street', 'sugar_label' => '', 'default_label' => 'Home Street'),
+                'alt_address_postcode' => array('sugar_key' => 'alt_address_postalcode', 'sugar_label' => '', 'default_label' => 'Home Postcode'),
+                'alt_address_city' => array('sugar_key' => 'alt_address_city', 'sugar_label' => '', 'default_label' => 'Home City'),
+                'alt_address_state' => array('sugar_key' => 'alt_address_state', 'sugar_label' => '', 'default_label' => 'Home State'),
+                'alt_address_country' => array('sugar_key' => 'alt_address_country', 'sugar_label' => '', 'default_label' => 'Home Country'),
 
-             'primary_address_street' => array('sugar_key' => 'primary_address_street', 'sugar_label' => '', 'default_label' => 'Work Street'),
-             'primary_address_postcode' => array('sugar_key' => 'primary_address_postalcode', 'sugar_label' => '', 'default_label' => 'Work Postcode'),
-             'primary_address_city' => array('sugar_key' => 'primary_address_city', 'sugar_label' => '', 'default_label' => 'Work City'),
-             'primary_address_state' => array('sugar_key' => 'primary_address_state', 'sugar_label' => '', 'default_label' => 'Work State'),
-             'primary_address_country' => array('sugar_key' => 'primary_address_country', 'sugar_label' => '', 'default_label' => 'Work Country'),
+                'primary_address_street' => array('sugar_key' => 'primary_address_street', 'sugar_label' => '', 'default_label' => 'Work Street'),
+                'primary_address_postcode' => array('sugar_key' => 'primary_address_postalcode', 'sugar_label' => '', 'default_label' => 'Work Postcode'),
+                'primary_address_city' => array('sugar_key' => 'primary_address_city', 'sugar_label' => '', 'default_label' => 'Work City'),
+                'primary_address_state' => array('sugar_key' => 'primary_address_state', 'sugar_label' => '', 'default_label' => 'Work State'),
+                'primary_address_country' => array('sugar_key' => 'primary_address_country', 'sugar_label' => '', 'default_label' => 'Work Country'),
 
-             'phone_main' => array('sugar_key' => 'phone_other', 'sugar_label' => '', 'default_label' => 'Main Phone'),
-             'phone_mobile' => array('sugar_key' => 'phone_mobile', 'sugar_label' => '', 'default_label' => 'Mobile Phone'),
-             'phone_home' => array('sugar_key' => 'phone_home', 'sugar_label' => '', 'default_label' => 'Home phone'),
-             'phone_work' => array('sugar_key' => 'phone_work', 'sugar_label' => '', 'default_label' => 'Work phone'),
-             'phone_fax' => array('sugar_key' => 'phone_fax', 'sugar_label' => '', 'default_label' => 'Fax phone'),
+                'phone_main' => array('sugar_key' => 'phone_other', 'sugar_label' => '', 'default_label' => 'Main Phone'),
+                'phone_mobile' => array('sugar_key' => 'phone_mobile', 'sugar_label' => '', 'default_label' => 'Mobile Phone'),
+                'phone_home' => array('sugar_key' => 'phone_home', 'sugar_label' => '', 'default_label' => 'Home phone'),
+                'phone_work' => array('sugar_key' => 'phone_work', 'sugar_label' => '', 'default_label' => 'Work phone'),
+                'phone_fax' => array('sugar_key' => 'phone_fax', 'sugar_label' => '', 'default_label' => 'Fax phone'),
 
-             'email1' => array('sugar_key' => 'email1', 'sugar_label' => 'LBL_EMAIL_ADDRESS', 'default_label' => 'Email Address'),
-             'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
+                'email1' => array('sugar_key' => 'email1', 'sugar_label' => 'LBL_EMAIL_ADDRESS', 'default_label' => 'Email Address'),
+                'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
 
-             'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
-             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
+                'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
+                'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
             );
 
         if($module == 'Users')

Spacing +5 added lines, -5 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.
@@ -86,13 +86,13 @@ 
              'email2' => array('sugar_key' => 'email2', 'sugar_label' => 'LBL_OTHER_EMAIL_ADDRESS', 'default_label' => 'Other Email'),
 
              'assigned_user_name' => array('sugar_key' => 'assigned_user_name', 'sugar_help_key' => 'LBL_EXTERNAL_ASSIGNED_TOOLTIP', 'sugar_label' => 'LBL_ASSIGNED_TO_NAME', 'default_label' => 'Assigned To'),
-             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP','sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
+             'team_name' => array('sugar_key' => 'team_name', 'sugar_help_key' => 'LBL_EXTERNAL_TEAM_TOOLTIP', 'sugar_label' => 'LBL_TEAMS', 'default_label' => 'Teams'),
             );
 
-        if($module == 'Users')
+        if ($module == 'Users')
         {
-            $return_array['status'] =  array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
-            $return_array['full_name'] =  array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
+            $return_array['status'] = array('sugar_key' => 'status', 'sugar_label' => '', 'default_label' => 'Status');
+            $return_array['full_name'] = array('sugar_key' => 'user_name', 'sugar_label' => '', 'default_label' => 'Full Name');
         }
         return $return_array;
     }

Braces +3 added lines, -1 removed lines

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

modules/Import/maps/ImportMapSalesforce.php

Indentation +13 added lines, -13 removed lines

@@ -49,11 +49,11 @@ 
 
 class ImportMapSalesforce extends ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'salesforce';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter = ',';
@@ -61,18 +61,18 @@ 
      * Field enclosure
      */
     public $enclosure = '"';
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
 
-	/**
+    /**
      * Gets the default mapping for a module
      *
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {
@@ -151,15 +151,15 @@ 
         }
     }
 	
-	/**
-	* @see ImportMapOther::getIgnoredFields()
+    /**
+     * @see ImportMapOther::getIgnoredFields()
      */
-	public function getIgnoredFields(
-		$module
-		)
-	{
-		return array_merge(parent::getIgnoredFields($module),array('id'));
-	}
+    public function getIgnoredFields(
+        $module
+        )
+    {
+        return array_merge(parent::getIgnoredFields($module),array('id'));
+    }
 }
 
 

Switch Indentation +70 added lines, -70 removed lines

@@ -78,76 +78,76 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Description"=>"description",
-                "Birthdate"=>"birthdate",
-                "Lead Source"=>"lead_source",
-                "Assistant"=>"assistant",
-                "Asst. Phone"=>"assistant_phone",
-                "Mailing Street"=>"primary_address_street",
-                "Mailing Address Line1"=>"primary_address_street_2",
-                "Mailing Address Line2"=>"primary_address_street_3",
-                "Mailing Address Line3"=>"primary_address_street_4",
-                "Mailing City"=>"primary_address_city",
-                "Mailing State"=>"primary_address_state",
-                "Mailing Zip/Postal Code"=>"primary_address_postalcode",
-                "Mailing Country"=>"primary_address_country",
-                "Other Street"=>"alt_address_street",
-                "Other Address Line 1"=>"alt_address_street_2",
-                "Other Address Line 2"=>"alt_address_street_3",
-                "Other Address Line 3"=>"alt_address_street_4",
-                "Other City"=>"alt_address_city",
-                "Other State"=>"alt_address_state",
-                "Other Zip/Postal Code"=>"alt_address_postalcode",
-                "Other Country"=>"alt_address_country",
-                "Phone"=>"phone_work",
-                "Mobile"=>"phone_mobile",
-                "Home Phone"=>"phone_home",
-                "Other Phone"=>"phone_other",
-                "Fax"=>"phone_fax",
-                "Email"=>"email1",
-                "Email Opt Out"=>"email_opt_out",
-                "Do Not Call"=>"do_not_call",
-                "Account Name"=>"account_name",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Account Name"=>"name",
-                "Annual Revenue"=>"annual_revenue",
-                "Type"=>"account_type",
-                "Ticker Symbol"=>"ticker_symbol",
-                "Rating"=>"rating",
-                "Industry"=>"industry",
-                "SIC Code"=>"sic_code",
-                "Ownership"=>"ownership",
-                "Employees"=>"employees",
-                "Description"=>"description",
-                "Billing Street"=>"billing_address_street",
-                "Billing Address Line1"=>"billing_address_street_2",
-                "Billing Address Line2"=>"billing_address_street_3",
-                "Billing City"=>"billing_address_city",
-                "Billing State"=>"billing_address_state",
-                "Billing State/Province"=>"billing_address_state",
-                "Billing Zip/Postal Code"=>"billing_address_postalcode",
-                "Billing Country"=>"billing_address_country",
-                "Shipping Street"=>"shipping_address_street",
-                "Shipping Address Line1"=>"shipping_address_street_2",
-                "Shipping Address Line2"=>"shipping_address_street_3",
-                "Shipping City"=>"shipping_address_city",
-                "Shipping State"=>"shipping_address_state",
-                "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
-                "Shipping Country"=>"shipping_address_country",
-                "Phone"=>"phone_office",
-                "Fax"=>"phone_fax",
-                "Website"=>"website",
-                "Created Date"=>"date_entered",
-                );
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Description"=>"description",
+                    "Birthdate"=>"birthdate",
+                    "Lead Source"=>"lead_source",
+                    "Assistant"=>"assistant",
+                    "Asst. Phone"=>"assistant_phone",
+                    "Mailing Street"=>"primary_address_street",
+                    "Mailing Address Line1"=>"primary_address_street_2",
+                    "Mailing Address Line2"=>"primary_address_street_3",
+                    "Mailing Address Line3"=>"primary_address_street_4",
+                    "Mailing City"=>"primary_address_city",
+                    "Mailing State"=>"primary_address_state",
+                    "Mailing Zip/Postal Code"=>"primary_address_postalcode",
+                    "Mailing Country"=>"primary_address_country",
+                    "Other Street"=>"alt_address_street",
+                    "Other Address Line 1"=>"alt_address_street_2",
+                    "Other Address Line 2"=>"alt_address_street_3",
+                    "Other Address Line 3"=>"alt_address_street_4",
+                    "Other City"=>"alt_address_city",
+                    "Other State"=>"alt_address_state",
+                    "Other Zip/Postal Code"=>"alt_address_postalcode",
+                    "Other Country"=>"alt_address_country",
+                    "Phone"=>"phone_work",
+                    "Mobile"=>"phone_mobile",
+                    "Home Phone"=>"phone_home",
+                    "Other Phone"=>"phone_other",
+                    "Fax"=>"phone_fax",
+                    "Email"=>"email1",
+                    "Email Opt Out"=>"email_opt_out",
+                    "Do Not Call"=>"do_not_call",
+                    "Account Name"=>"account_name",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Account Name"=>"name",
+                    "Annual Revenue"=>"annual_revenue",
+                    "Type"=>"account_type",
+                    "Ticker Symbol"=>"ticker_symbol",
+                    "Rating"=>"rating",
+                    "Industry"=>"industry",
+                    "SIC Code"=>"sic_code",
+                    "Ownership"=>"ownership",
+                    "Employees"=>"employees",
+                    "Description"=>"description",
+                    "Billing Street"=>"billing_address_street",
+                    "Billing Address Line1"=>"billing_address_street_2",
+                    "Billing Address Line2"=>"billing_address_street_3",
+                    "Billing City"=>"billing_address_city",
+                    "Billing State"=>"billing_address_state",
+                    "Billing State/Province"=>"billing_address_state",
+                    "Billing Zip/Postal Code"=>"billing_address_postalcode",
+                    "Billing Country"=>"billing_address_country",
+                    "Shipping Street"=>"shipping_address_street",
+                    "Shipping Address Line1"=>"shipping_address_street_2",
+                    "Shipping Address Line2"=>"shipping_address_street_3",
+                    "Shipping City"=>"shipping_address_city",
+                    "Shipping State"=>"shipping_address_state",
+                    "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
+                    "Shipping Country"=>"shipping_address_country",
+                    "Phone"=>"phone_office",
+                    "Fax"=>"phone_fax",
+                    "Website"=>"website",
+                    "Created Date"=>"date_entered",
+                    );
+                break;
+            default:
+                return $return_array;
         }
     }
 	

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -158,7 +158,7 @@ 
 		$module
 		)
 	{
-		return array_merge(parent::getIgnoredFields($module),array('id'));
+		return array_merge(parent::getIgnoredFields($module), array('id'));
 	}
 }
 

Braces +3 added lines, -1 removed lines

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

modules/Import/maps/ImportMapOther.php

Indentation +12 added lines, -12 removed lines

@@ -47,11 +47,11 @@ 
 
 class ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'other';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter;
@@ -59,18 +59,18 @@ 
      * Field enclosure
      */
     public $enclosure;
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
 
-	/**
+    /**
      * Gets the default mapping for a module
      *
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {
@@ -142,18 +142,18 @@ 
         }
     }
 	
-	/**
+    /**
      * Returns a list of fields that should be ignorred for the module during import
      *
      * @param  string $module
      * @return array of fields to ignor
      */
-	public function getIgnoredFields(
-		$module
-		)
-	{
-		return array();
-	}
+    public function getIgnoredFields(
+        $module
+        )
+    {
+        return array();
+    }
 }
 
 

Switch Indentation +64 added lines, -64 removed lines

@@ -75,70 +75,70 @@
         )
     {
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return array(
-                "Salutation"=>"salutation",
-                "Full Name"=>"full_name",
-                "Company"=>"company",
-                "First Name"=>"first_name",
-                "Last Name"=>"last_name",
-                "Title"=>"title",
-                "Department"=>"department",
-                "Birthday"=>"birthdate",
-                "Home Phone"=>"phone_home",
-                "Mobile Phone"=>"phone_mobile",
-                "Business Phone"=>"phone_work",
-                "Other Phone"=>"phone_other",
-                "Business Fax"=>"phone_fax",
-                "E-mail Address"=>"email1",
-                "E-mail 2"=>"email2",
-                "Assistant's Name"=>"assistant",
-                "Assistant's Phone"=>"assistant_phone",
-                "Business Street"=>"primary_address_street",
-                "Business Street 2"=>"primary_address_street_2",
-                "Business Street 3"=>"primary_address_street_3",
-                "Business City"=>"primary_address_city",
-                "Business State"=>"primary_address_state",
-                "Business Postal Code"=>"primary_address_postalcode",
-                "Business Country/Region"=>"primary_address_country",
-                "Home Street"=>"alt_address_street",
-                "Home Street 2"=>"alt_address_street_2",
-                "Home Street 3"=>"alt_address_street_3",
-                "Home City"=>"alt_address_city",
-                "Home State"=>"alt_address_state",
-                "Home Postal Code"=>"alt_address_postalcode",
-                "Home Country/Region"=>"alt_address_country",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Company"=>"name",
-                "Business Street"=>"billing_address_street",
-                "Business City"=>"billing_address_city",
-                "Business State"=>"billing_address_state",
-                "Business Country"=>"billing_address_country",
-                "Business Postal Code"=>"billing_address_postalcode",
-                "Business Fax"=>"phone_fax",
-                "Company Main Phone"=>"phone_office",
-                "Web Page"=>"website",
-                );
-            break;
-        case 'Opportunities':
-            return array(
-                "Opportunity Name"=>"name" ,
-                "Type"=>"opportunity_type",
-                "Lead Source"=>"lead_source",
-                "Amount"=>"amount",
-                "Created Date"=>"date_entered",
-                "Close Date"=>"date_closed",
-                "Next Step"=>"next_step",
-                "Stage"=>"sales_stage",
-                "Probability (%)"=>"probability",
-                "Account Name"=>"account_name");
-            break;
-        default:
-            return array();
+            case 'Contacts':
+            case 'Leads':
+                return array(
+                    "Salutation"=>"salutation",
+                    "Full Name"=>"full_name",
+                    "Company"=>"company",
+                    "First Name"=>"first_name",
+                    "Last Name"=>"last_name",
+                    "Title"=>"title",
+                    "Department"=>"department",
+                    "Birthday"=>"birthdate",
+                    "Home Phone"=>"phone_home",
+                    "Mobile Phone"=>"phone_mobile",
+                    "Business Phone"=>"phone_work",
+                    "Other Phone"=>"phone_other",
+                    "Business Fax"=>"phone_fax",
+                    "E-mail Address"=>"email1",
+                    "E-mail 2"=>"email2",
+                    "Assistant's Name"=>"assistant",
+                    "Assistant's Phone"=>"assistant_phone",
+                    "Business Street"=>"primary_address_street",
+                    "Business Street 2"=>"primary_address_street_2",
+                    "Business Street 3"=>"primary_address_street_3",
+                    "Business City"=>"primary_address_city",
+                    "Business State"=>"primary_address_state",
+                    "Business Postal Code"=>"primary_address_postalcode",
+                    "Business Country/Region"=>"primary_address_country",
+                    "Home Street"=>"alt_address_street",
+                    "Home Street 2"=>"alt_address_street_2",
+                    "Home Street 3"=>"alt_address_street_3",
+                    "Home City"=>"alt_address_city",
+                    "Home State"=>"alt_address_state",
+                    "Home Postal Code"=>"alt_address_postalcode",
+                    "Home Country/Region"=>"alt_address_country",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Company"=>"name",
+                    "Business Street"=>"billing_address_street",
+                    "Business City"=>"billing_address_city",
+                    "Business State"=>"billing_address_state",
+                    "Business Country"=>"billing_address_country",
+                    "Business Postal Code"=>"billing_address_postalcode",
+                    "Business Fax"=>"phone_fax",
+                    "Company Main Phone"=>"phone_office",
+                    "Web Page"=>"website",
+                    );
+                break;
+            case 'Opportunities':
+                return array(
+                    "Opportunity Name"=>"name" ,
+                    "Type"=>"opportunity_type",
+                    "Lead Source"=>"lead_source",
+                    "Amount"=>"amount",
+                    "Created Date"=>"date_entered",
+                    "Close Date"=>"date_closed",
+                    "Next Step"=>"next_step",
+                    "Stage"=>"sales_stage",
+                    "Probability (%)"=>"probability",
+                    "Account Name"=>"account_name");
+                break;
+            default:
+                return array();
         }
     }
 	

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -126,7 +126,7 @@ 
             break;
         case 'Opportunities':
             return array(
-                "Opportunity Name"=>"name" ,
+                "Opportunity Name"=>"name",
                 "Type"=>"opportunity_type",
                 "Lead Source"=>"lead_source",
                 "Amount"=>"amount",

Braces +3 added lines, -1 removed lines

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

modules/Import/maps/ImportMap.php

Indentation +13 added lines, -13 removed lines

@@ -175,19 +175,19 @@ 
      * @see SugarBean::retrieve()
      */
     public function retrieve($id = -1, $encode=true,$deleted=true)
-	{
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
+    {
+        $returnVal = parent::retrieve($id,$encode,$deleted);
 
-	    if ( !($returnVal instanceOf $this) ) {
-	        return $returnVal;
-	    }
+        if ( !($returnVal instanceOf $this) ) {
+            return $returnVal;
+        }
 
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
-	        $this->delimiter = "\t";
-	    }
+        if ( $this->source == 'tab' && $this->delimiter == '' ) {
+            $this->delimiter = "\t";
+        }
 
-	    return $this;
-	}
+        return $this;
+    }
 
     /**
      * Save
@@ -372,10 +372,10 @@ 
         //list of field values we track during import wizard
         $import_step_fields = array(
         //step1
-          //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
+            //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
         //step2
-           // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
-         //step3
+            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
+            //step3
             'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',

Spacing +38 added lines, -38 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.
@@ -107,11 +107,11 @@ 
     public function getMapping()
     {
         $mapping_arr = array();
-        if ( !empty($this->content) )
+        if (!empty($this->content))
         {
-            $pairs = explode("&",$this->content);
-            foreach ($pairs as $pair){
-                list($name,$value) = explode("=",$pair);
+            $pairs = explode("&", $this->content);
+            foreach ($pairs as $pair) {
+                list($name, $value) = explode("=", $pair);
                 $mapping_arr[trim($name)] = $value;
             }
         }
@@ -128,7 +128,7 @@ 
         $mapping_arr
         )
     {
-        $output = array ();
+        $output = array();
         foreach ($mapping_arr as $key => $item) {
             $output[] = "$key=$item";
         }
@@ -143,11 +143,11 @@ 
     public function getDefaultValues()
     {
         $defa_arr = array();
-        if ( !empty($this->default_values) )
+        if (!empty($this->default_values))
         {
-            $pairs = explode("&",$this->default_values);
-            foreach ($pairs as $pair){
-                list($name,$value) = explode("=",$pair);
+            $pairs = explode("&", $this->default_values);
+            foreach ($pairs as $pair) {
+                list($name, $value) = explode("=", $pair);
                 $defa_arr[trim($name)] = $value;
             }
         }
@@ -164,7 +164,7 @@ 
         $defa_arr
         )
     {
-        $output = array ();
+        $output = array();
         foreach ($defa_arr as $key => $item) {
             $output[] = "$key=$item";
         }
@@ -174,15 +174,15 @@ 
     /**
      * @see SugarBean::retrieve()
      */
-    public function retrieve($id = -1, $encode=true,$deleted=true)
+    public function retrieve($id = -1, $encode = true, $deleted = true)
 	{
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
+	    $returnVal = parent::retrieve($id, $encode, $deleted);
 
-	    if ( !($returnVal instanceOf $this) ) {
+	    if (!($returnVal instanceOf $this)) {
 	        return $returnVal;
 	    }
 
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
+	    if ($this->source == 'tab' && $this->delimiter == '') {
 	        $this->delimiter = "\t";
 	    }
 
@@ -227,7 +227,7 @@ 
 
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
         // it is an empty string, instead of as a null
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
+        if (strlen($enclosure) <= 0) $enclosure = ' ';
 
         $this->assigned_user_id = $owner_id;
         $this->name             = $name;
@@ -242,7 +242,7 @@ 
         parent::save();
 
         // Bug 29365 - The enclosure character isn't saved correctly if it's a tab using MssqlManager, so resave it
-        if ( $enclosure == '\\t' && $this->db instanceOf MssqlManager ) {
+        if ($enclosure == '\\t' && $this->db instanceOf MssqlManager) {
             $this->enclosure = $enclosure;
             parent::save();
         }
@@ -262,11 +262,11 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) ) {
+        if (!is_admin($current_user)) {
             $other_map = new ImportMap();
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
 
-            if ( $other_map->assigned_user_id != $current_user->id )
+            if ($other_map->assigned_user_id != $current_user->id)
                 return false;
         }
 
@@ -287,7 +287,7 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) )
+        if (!is_admin($current_user))
             return false;
 
         // check for problems
@@ -313,16 +313,16 @@ 
         $other_map->retrieve_by_string_fields($query_arr, false);
 
         // if we find this other map, quit
-        if ( isset($other_map->id) )
+        if (isset($other_map->id))
             return false;
 
         // otherwise update the is_published flag
         $query = "UPDATE $this->table_name
-                    SET is_published = '". ($flag?'yes':'no') . "',
+                    SET is_published = '".($flag ? 'yes' : 'no')."',
                         assigned_user_id = '$user_id'
                     WHERE id = '{$this->id}'";
 
-        $this->db->query($query,true,"Error marking import map published: ");
+        $this->db->query($query, true, "Error marking import map published: ");
 
         return true;
     }
@@ -339,21 +339,21 @@ 
     {
         $query = "SELECT *
                     FROM {$this->table_name}
-                    " . $this->get_where($fields_array);
+                    ".$this->get_where($fields_array);
 
-        $result = $this->db->query($query,true," Error: ");
+        $result = $this->db->query($query, true, " Error: ");
         $obj_arr = array();
 
-        while ($row = $this->db->fetchByAssoc($result,FALSE) ) {
+        while ($row = $this->db->fetchByAssoc($result, FALSE)) {
             $focus = new ImportMap();
 
-            foreach($this->column_fields as $field) {
-                if(isset($row[$field])) {
+            foreach ($this->column_fields as $field) {
+                if (isset($row[$field])) {
                     $focus->$field = $row[$field];
                 }
             }
             $focus->fill_in_additional_detail_fields();
-            $obj_arr[]=$focus;
+            $obj_arr[] = $focus;
         }
 
         return $obj_arr;
@@ -376,37 +376,37 @@ 
         //step2
            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
          //step3
-            'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
+            'display_tabs_def', 'custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',
         '   importlocale_default_locale_name_format');
 
         //retrieve user preferences and populate preference array
         $preference_values_str = $current_user->getPreference('field_values', 'import');
-        $preference_values = json_decode($preference_values_str,true);
+        $preference_values = json_decode($preference_values_str, true);
 
-        foreach ($import_step_fields as $val){
+        foreach ($import_step_fields as $val) {
             //overwrite preference array with new values from request if the value is different or new
-            if((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])){
+            if ((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])) {
                 $preference_values[$val] = $_REQUEST[$val];
                 $set = true;
             }
         }
 
         //force the values to passed in array if array is set
-        if(!empty($ForceValsArr) && is_array($ForceValsArr)){
-            foreach ($ForceValsArr as $forceKey=>$forceVal){
+        if (!empty($ForceValsArr) && is_array($ForceValsArr)) {
+            foreach ($ForceValsArr as $forceKey=>$forceVal) {
                 $preference_values[$forceKey] = $forceVal;
                 $set = true;
             }
         }
 
         //set preferences if any changes were made and return the new array
-        if($set){
-            $preference_values_str =  json_encode($preference_values);
+        if ($set) {
+            $preference_values_str = json_encode($preference_values);
             $current_user->setPreference('field_values', $preference_values_str, 0, 'import');
         }
-        if(empty($preference_values)){
+        if (empty($preference_values)) {
             return array();
         }
 

Braces +16 added lines, -10 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -227,7 +229,9 @@ 
 
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
         // it is an empty string, instead of as a null
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
+        if ( strlen($enclosure) <= 0 ) {
+            $enclosure = ' ';
+        }
 
         $this->assigned_user_id = $owner_id;
         $this->name             = $name;
@@ -266,8 +270,9 @@ 
             $other_map = new ImportMap();
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
 
-            if ( $other_map->assigned_user_id != $current_user->id )
-                return false;
+            if ( $other_map->assigned_user_id != $current_user->id ) {
+                            return false;
+            }
         }
 
         return parent::mark_deleted($id);
@@ -287,8 +292,9 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) )
-            return false;
+        if ( !is_admin($current_user) ) {
+                    return false;
+        }
 
         // check for problems
         if ($flag) {
@@ -299,8 +305,7 @@ 
                 'name'         =>$this->name,
                 'is_published' =>'yes'
                 );
-        }
-        else {
+        } else {
             // if you are trying to unpublish a map
             // but you own an unpublished map by the same name
             $query_arr = array(
@@ -313,8 +318,9 @@ 
         $other_map->retrieve_by_string_fields($query_arr, false);
 
         // if we find this other map, quit
-        if ( isset($other_map->id) )
-            return false;
+        if ( isset($other_map->id) ) {
+                    return false;
+        }
 
         // otherwise update the is_published flag
         $query = "UPDATE $this->table_name

Doc Comments -8 removed lines

@@ -192,13 +192,6 @@ 
     /**
      * Save
      *
-     * @param  string $owner_id
-     * @param  string $name
-     * @param  string $module
-     * @param  string $source
-     * @param  string $has_header
-     * @param  string $delimiter
-     * @param  string $enclosure
      * @return bool
      */
     public function save($check_notify = FALSE) {
@@ -362,7 +355,6 @@ 
     /**
      * set and get field elements in request field to and from user preferences
      *
-     * @param  array $fields_array
      * @return array $obj_arr
      */
     public function set_get_import_wizard_fields($ForceValsArr = '')

modules/Import/ImportDuplicateCheck.php

Spacing +63 added lines, -63 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
@@ -56,7 +56,7 @@ 
     /*
      * holds current field when a duplicate has been found
      */
-    public $_dupedFields =array();
+    public $_dupedFields = array();
 
     /**
      * Constructor
@@ -78,18 +78,18 @@ 
         $indexes = $this->_focus->getIndices();
 
         //grab any custom indexes if they exist
-        if($this->_focus->hasCustomFields()){
+        if ($this->_focus->hasCustomFields()) {
             $custmIndexes = $this->_focus->db->helper->get_indices($this->_focus->table_name.'_cstm');
-            $indexes = array_merge($custmIndexes,$indexes);
+            $indexes = array_merge($custmIndexes, $indexes);
         }
 
-        if ( $this->_focus->getFieldDefinition('email1') )
+        if ($this->_focus->getFieldDefinition('email1'))
             $indexes[] = array(
                 'name' => 'special_idx_email1',
                 'type' => 'index',
                 'fields' => array('email1')
                 );
-        if ( $this->_focus->getFieldDefinition('email2') )
+        if ($this->_focus->getFieldDefinition('email2'))
             $indexes[] = array(
                 'name' => 'special_idx_email2',
                 'type' => 'index',
@@ -112,18 +112,18 @@ 
             );
 
         $index_array = array();
-        foreach ($this->_getIndexVardefs() as $index){
-            if ($index['type'] == "index"){
+        foreach ($this->_getIndexVardefs() as $index) {
+            if ($index['type'] == "index") {
                 $labelsArray = array();
-                foreach ($index['fields'] as $field){
+                foreach ($index['fields'] as $field) {
                     if ($field == 'deleted') continue;
                     $fieldDef = $this->_focus->getFieldDefinition($field);
-                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) )
+                    if (isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]))
                         $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
                     else
                         $labelsArray[$fieldDef['name']] = $fieldDef['name'];
                 }
-                $index_array[$index['name']] = str_replace(":", "",implode(", ",$labelsArray));
+                $index_array[$index['name']] = str_replace(":", "", implode(", ", $labelsArray));
             }
         }
 
@@ -138,21 +138,21 @@ 
      */
     public function isADuplicateRecordByFields($fieldList)
     {
-        foreach($fieldList as $field)
+        foreach ($fieldList as $field)
         {
-            if ( $field == 'email1' || $field == 'email2' )
+            if ($field == 'email1' || $field == 'email2')
             {
                 $emailAddress = new SugarEmailAddress();
                 $email = $field;
-                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 )
+                if ($emailAddress->getCountEmailAddressByBean($this->_focus->$email, $this->_focus, ($field == 'email1')) > 0)
                     return true;
             }
             else
             {
                 $index_fields = array('deleted' => '0');
-                if( is_array($field) )
+                if (is_array($field))
                 {
-                    foreach($field as $tmpField)
+                    foreach ($field as $tmpField)
                     {
                         if ($tmpField == 'deleted')
                             continue;
@@ -160,16 +160,16 @@ 
                             $index_fields[$tmpField] = $this->_focus->$tmpField;
                     }
                 }
-                elseif($field != 'deleted' && strlen($this->_focus->$field) > 0)
+                elseif ($field != 'deleted' && strlen($this->_focus->$field) > 0)
                     $index_fields[$field] = $this->_focus->$field;
 
-                if ( count($index_fields) <= 1 )
+                if (count($index_fields) <= 1)
                     continue;
 
                 $newfocus = loadBean($this->_focus->module_dir);
-                $result = $newfocus->retrieve_by_string_fields($index_fields,true);
+                $result = $newfocus->retrieve_by_string_fields($index_fields, true);
 
-                if ( !is_null($result) )
+                if (!is_null($result))
                     return true;
             }
         }
@@ -183,15 +183,15 @@ 
      * @param  array $indexlist
      * @return bool true if this bean is a duplicate or false if it isn't
      */
-    public function isADuplicateRecord( $indexlist )
+    public function isADuplicateRecord($indexlist)
     {
         // Bug #51264 : Importing updates to rows prevented by duplicates check
-        if ( !empty($this->_focus) && ($this->_focus instanceof SugarBean) && !empty($this->_focus->id) )
+        if (!empty($this->_focus) && ($this->_focus instanceof SugarBean) && !empty($this->_focus->id))
         {
             $_focus = clone $this->_focus;
             $_focus->id = null;
             $_focus->retrieve($this->_focus->id);
-            if ( !empty($_focus->id) )
+            if (!empty($_focus->id))
             {
                 return false;
             }
@@ -200,20 +200,20 @@ 
 
         //lets strip the indexes of the name field in the value and leave only the index name
         $origIndexList = $indexlist;
-        $indexlist=array();
-        $fieldlist=array();
-        $customIndexlist=array();
-        foreach($origIndexList as $iv){
-            if(empty($iv)) continue;
-            $field_index_array = explode('::',$iv);
-            if($field_index_array[0] == 'customfield'){
+        $indexlist = array();
+        $fieldlist = array();
+        $customIndexlist = array();
+        foreach ($origIndexList as $iv) {
+            if (empty($iv)) continue;
+            $field_index_array = explode('::', $iv);
+            if ($field_index_array[0] == 'customfield') {
                 //this is a custom field, so place in custom array
                 $customIndexlist[] = $field_index_array[1];
 
-            }else{
+            } else {
                 //this is not a custom field, so place in index list
                 $indexlist[] = $field_index_array[0];
-                if(isset($field_index_array[1])) {
+                if (isset($field_index_array[1])) {
                     $fieldlist[] = $field_index_array[1];
                 }
             }
@@ -221,11 +221,11 @@ 
 
         //if full_name is set, then manually search on the first and last name fields before iterating through rest of fields
         //this is a special handling of the name fields on people objects, the rest of the fields are checked individually
-        if(in_array('full_name',$indexlist)){
+        if (in_array('full_name', $indexlist)) {
             $newfocus = loadBean($this->_focus->module_dir);
-            $result = $newfocus->retrieve_by_string_fields(array('deleted' =>'0', 'first_name'=>$this->_focus->first_name, 'last_name'=>$this->_focus->last_name),true);
+            $result = $newfocus->retrieve_by_string_fields(array('deleted' =>'0', 'first_name'=>$this->_focus->first_name, 'last_name'=>$this->_focus->last_name), true);
 
-            if ( !is_null($result) ){
+            if (!is_null($result)) {
                 //set dupe field to full_name and name fields
                 $this->_dupedFields[] = 'full_name';
                 $this->_dupedFields[] = 'first_name';
@@ -235,61 +235,61 @@ 
         }
 
         // loop through var def indexes and compare with selected indexes
-        foreach ($this->_getIndexVardefs() as $index){
+        foreach ($this->_getIndexVardefs() as $index) {
             // if we get an index not in the indexlist, loop
-            if ( !in_array($index['name'],$indexlist) )
+            if (!in_array($index['name'], $indexlist))
                 continue;
 
             // This handles the special case of duplicate email checking
-            if ( $index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2' ) {
+            if ($index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2') {
                 $emailAddress = new SugarEmailAddress();
                 $email = $index['fields'][0];
-                if ( $emailAddress->getCountEmailAddressByBean(
+                if ($emailAddress->getCountEmailAddressByBean(
                         $this->_focus->$email,
                         $this->_focus,
                         ($index['name'] == 'special_idx_email1')
-                        ) > 0 ){ foreach($index['fields'] as $field){
-                        if($field !='deleted')
+                        ) > 0) { foreach ($index['fields'] as $field) {
+                        if ($field != 'deleted')
                             $this->_dupedFields[] = $field;
                     }
                 }
             }
             // Adds a hook so you can define a method in the bean to handle dupe checking
-            elseif ( isset($index['dupeCheckFunction']) ) {
-                $functionName = substr_replace($index['dupeCheckFunction'],'',0,9);
-                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true)
+            elseif (isset($index['dupeCheckFunction'])) {
+                $functionName = substr_replace($index['dupeCheckFunction'], '', 0, 9);
+                if (method_exists($this->_focus, $functionName) && $this->_focus->$functionName($index) === true)
                     return $this->_focus->$functionName($index);
             }
             else {
                 $index_fields = array('deleted' => '0');
                 //search only for the field we have selected
-                foreach($index['fields'] as $field){
-                    if ($field == 'deleted' ||  !in_array($field,$fieldlist))
+                foreach ($index['fields'] as $field) {
+                    if ($field == 'deleted' || !in_array($field, $fieldlist))
                         continue;
-                    if (!in_array($field,$index_fields))
+                    if (!in_array($field, $index_fields))
                         if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
                             $index_fields[$field] = $this->_focus->$field;
                 }
 
                 // if there are no valid fields in the index field list, loop
-                if ( count($index_fields) <= 1 )
+                if (count($index_fields) <= 1)
                     continue;
 
                 $newfocus = loadBean($this->_focus->module_dir);
-                $result = $newfocus->retrieve_by_string_fields($index_fields,true);
+                $result = $newfocus->retrieve_by_string_fields($index_fields, true);
 
-                if ( !is_null($result) ){
+                if (!is_null($result)) {
                     //remove deleted as a duped field
                     unset($index_fields['deleted']);
 
                     //create string based on array of dupe fields
-                    $this->_dupedFields = array_merge(array_keys($index_fields),$this->_dupedFields);
+                    $this->_dupedFields = array_merge(array_keys($index_fields), $this->_dupedFields);
                 }
             }
         }
 
         //return true if any dupes were found
-        if(!empty($this->_dupedFields)){
+        if (!empty($this->_dupedFields)) {
             return true;
         }
 
@@ -301,33 +301,33 @@ 
     {
         require_once('include/export_utils.php');
         $import_fields = $this->_focus->get_importable_fields();
-        $importable_keys = array_keys($import_fields);//
+        $importable_keys = array_keys($import_fields); //
 
         $index_array = array();
         $fields_used = array();
-        $mstr_exclude_array = array('all'=>array('team_set_id','id','deleted'),'contacts'=>array('email2'), array('leads'=>'reports_to_id'), array('prospects'=>'tracker_key'));
+        $mstr_exclude_array = array('all'=>array('team_set_id', 'id', 'deleted'), 'contacts'=>array('email2'), array('leads'=>'reports_to_id'), array('prospects'=>'tracker_key'));
 
         //create exclude array from subset of applicable mstr_exclude_array elements
-        $exclude_array =  isset($mstr_exclude_array[strtolower($this->_focus->module_dir)])?array_merge($mstr_exclude_array[strtolower($this->_focus->module_dir)], $mstr_exclude_array['all']) : $mstr_exclude_array['all'];
+        $exclude_array = isset($mstr_exclude_array[strtolower($this->_focus->module_dir)]) ? array_merge($mstr_exclude_array[strtolower($this->_focus->module_dir)], $mstr_exclude_array['all']) : $mstr_exclude_array['all'];
 
 
 
         //process all fields belonging to indexes
-        foreach ($this->_getIndexVardefs() as $index){
-            if ($index['type'] == "index"){
+        foreach ($this->_getIndexVardefs() as $index) {
+            if ($index['type'] == "index") {
 
-                foreach ($index['fields'] as $field){
-                    $fieldName='';
+                foreach ($index['fields'] as $field) {
+                    $fieldName = '';
 
                     //skip this field if it is the deleted field, not in the importable keys array, or a field in the exclude array
                     if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) continue;
                     $fieldDef = $this->_focus->getFieldDefinition($field);
 
                     //skip if this field is already defined (from another index)
-                    if (in_array($fieldDef['name'],$fields_used)) continue;
+                    if (in_array($fieldDef['name'], $fields_used)) continue;
 
                     //get the proper export label
-                    $fieldName = translateForExport($fieldDef['name'],$this->_focus);
+                    $fieldName = translateForExport($fieldDef['name'], $this->_focus);
 
 
                     $index_array[$index['name'].'::'.$fieldDef['name']] = $fieldName;
@@ -338,9 +338,9 @@ 
         }
 
         //special handling for beans with first_name and last_name
-        if(in_array('first_name', $fields_used) && in_array('last_name', $fields_used)){
+        if (in_array('first_name', $fields_used) && in_array('last_name', $fields_used)) {
             //since both full name and last name fields have been mapped, add full name index
-            $index_array['full_name::full_name'] = translateForExport('full_name',$this->_focus);
+            $index_array['full_name::full_name'] = translateForExport('full_name', $this->_focus);
             $fields_used[] = 'full_name';
         }
 

Braces +64 added lines, -42 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
@@ -83,18 +85,20 @@ 
             $indexes = array_merge($custmIndexes,$indexes);
         }
 
-        if ( $this->_focus->getFieldDefinition('email1') )
-            $indexes[] = array(
+        if ( $this->_focus->getFieldDefinition('email1') ) {
+                    $indexes[] = array(
                 'name' => 'special_idx_email1',
                 'type' => 'index',
                 'fields' => array('email1')
                 );
-        if ( $this->_focus->getFieldDefinition('email2') )
-            $indexes[] = array(
+        }
+        if ( $this->_focus->getFieldDefinition('email2') ) {
+                    $indexes[] = array(
                 'name' => 'special_idx_email2',
                 'type' => 'index',
                 'fields' => array('email2')
                 );
+        }
 
         return $indexes;
     }
@@ -116,12 +120,15 @@ 
             if ($index['type'] == "index"){
                 $labelsArray = array();
                 foreach ($index['fields'] as $field){
-                    if ($field == 'deleted') continue;
+                    if ($field == 'deleted') {
+                        continue;
+                    }
                     $fieldDef = $this->_focus->getFieldDefinition($field);
-                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) )
-                        $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
-                    else
-                        $labelsArray[$fieldDef['name']] = $fieldDef['name'];
+                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) ) {
+                                            $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
+                    } else {
+                                            $labelsArray[$fieldDef['name']] = $fieldDef['name'];
+                    }
                 }
                 $index_array[$index['name']] = str_replace(":", "",implode(", ",$labelsArray));
             }
@@ -144,33 +151,37 @@ 
             {
                 $emailAddress = new SugarEmailAddress();
                 $email = $field;
-                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 )
-                    return true;
-            }
-            else
+                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 ) {
+                                    return true;
+                }
+            } else
             {
                 $index_fields = array('deleted' => '0');
                 if( is_array($field) )
                 {
                     foreach($field as $tmpField)
                     {
-                        if ($tmpField == 'deleted')
-                            continue;
-                        if (strlen($this->_focus->$tmpField) > 0)
-                            $index_fields[$tmpField] = $this->_focus->$tmpField;
+                        if ($tmpField == 'deleted') {
+                                                    continue;
+                        }
+                        if (strlen($this->_focus->$tmpField) > 0) {
+                                                    $index_fields[$tmpField] = $this->_focus->$tmpField;
+                        }
                     }
+                } elseif($field != 'deleted' && strlen($this->_focus->$field) > 0) {
+                                    $index_fields[$field] = $this->_focus->$field;
                 }
-                elseif($field != 'deleted' && strlen($this->_focus->$field) > 0)
-                    $index_fields[$field] = $this->_focus->$field;
 
-                if ( count($index_fields) <= 1 )
-                    continue;
+                if ( count($index_fields) <= 1 ) {
+                                    continue;
+                }
 
                 $newfocus = loadBean($this->_focus->module_dir);
                 $result = $newfocus->retrieve_by_string_fields($index_fields,true);
 
-                if ( !is_null($result) )
-                    return true;
+                if ( !is_null($result) ) {
+                                    return true;
+                }
             }
         }
 
@@ -204,13 +215,15 @@ 
         $fieldlist=array();
         $customIndexlist=array();
         foreach($origIndexList as $iv){
-            if(empty($iv)) continue;
+            if(empty($iv)) {
+                continue;
+            }
             $field_index_array = explode('::',$iv);
             if($field_index_array[0] == 'customfield'){
                 //this is a custom field, so place in custom array
                 $customIndexlist[] = $field_index_array[1];
 
-            }else{
+            } else{
                 //this is not a custom field, so place in index list
                 $indexlist[] = $field_index_array[0];
                 if(isset($field_index_array[1])) {
@@ -237,8 +250,9 @@ 
         // loop through var def indexes and compare with selected indexes
         foreach ($this->_getIndexVardefs() as $index){
             // if we get an index not in the indexlist, loop
-            if ( !in_array($index['name'],$indexlist) )
-                continue;
+            if ( !in_array($index['name'],$indexlist) ) {
+                            continue;
+            }
 
             // This handles the special case of duplicate email checking
             if ( $index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2' ) {
@@ -249,31 +263,35 @@ 
                         $this->_focus,
                         ($index['name'] == 'special_idx_email1')
                         ) > 0 ){ foreach($index['fields'] as $field){
-                        if($field !='deleted')
-                            $this->_dupedFields[] = $field;
+                        if($field !='deleted') {
+                                                    $this->_dupedFields[] = $field;
+                        }
                     }
                 }
             }
             // Adds a hook so you can define a method in the bean to handle dupe checking
             elseif ( isset($index['dupeCheckFunction']) ) {
                 $functionName = substr_replace($index['dupeCheckFunction'],'',0,9);
-                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true)
-                    return $this->_focus->$functionName($index);
-            }
-            else {
+                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true) {
+                                    return $this->_focus->$functionName($index);
+                }
+            } else {
                 $index_fields = array('deleted' => '0');
                 //search only for the field we have selected
                 foreach($index['fields'] as $field){
-                    if ($field == 'deleted' ||  !in_array($field,$fieldlist))
-                        continue;
-                    if (!in_array($field,$index_fields))
-                        if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
+                    if ($field == 'deleted' ||  !in_array($field,$fieldlist)) {
+                                            continue;
+                    }
+                    if (!in_array($field,$index_fields)) {
+                                            if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
                             $index_fields[$field] = $this->_focus->$field;
+                    }
                 }
 
                 // if there are no valid fields in the index field list, loop
-                if ( count($index_fields) <= 1 )
-                    continue;
+                if ( count($index_fields) <= 1 ) {
+                                    continue;
+                }
 
                 $newfocus = loadBean($this->_focus->module_dir);
                 $result = $newfocus->retrieve_by_string_fields($index_fields,true);
@@ -320,11 +338,15 @@ 
                     $fieldName='';
 
                     //skip this field if it is the deleted field, not in the importable keys array, or a field in the exclude array
-                    if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) continue;
+                    if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) {
+                        continue;
+                    }
                     $fieldDef = $this->_focus->getFieldDefinition($field);
 
                     //skip if this field is already defined (from another index)
-                    if (in_array($fieldDef['name'],$fields_used)) continue;
+                    if (in_array($fieldDef['name'],$fields_used)) {
+                        continue;
+                    }
 
                     //get the proper export label
                     $fieldName = translateForExport($fieldDef['name'],$this->_focus);

Doc Comments -1 removed lines

@@ -133,7 +133,6 @@
     /**
      * Checks to see if the given bean is a duplicate based off the given fields
      *
-     * @param  array $indexlist
      * @return bool true if this bean is a duplicate or false if it isn't
      */
     public function isADuplicateRecordByFields($fieldList)