adamjakab / SuiteCRM

modules/AOR_Fields/vardefs.php

Indentation +27 added lines, -27 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 /**
- * Advanced OpenReports, SugarCRM Reporting.
- * @package Advanced OpenReports for SugarCRM
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author SalesAgility <info@salesagility.com>
- */
+     * Advanced OpenReports, SugarCRM Reporting.
+     * @package Advanced OpenReports for SugarCRM
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author SalesAgility <info@salesagility.com>
+     */
 
 $dictionary['AOR_Field'] = array(
-	'table'=>'aor_fields',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
+    'table'=>'aor_fields',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
         'aor_report_id' =>
         array (
             'required' => false,
@@ -338,8 +338,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-		'unified_search'=>true,
+    'optimistic_locking'=>true,
+        'unified_search'=>true,
 );
 if (!class_exists('VardefManager')){
         require_once('include/SugarObjects/VardefManager.php');

modules/Reminders_Invitees/Reminder_Invitee.php

Indentation +24 added lines, -24 removed lines

@@ -67,12 +67,12 @@ 
         return false;
     }
 
-	/**
-	 * Save multiple reminders invitees data.
-	 * 
-	 * @param string $reminderId Related Reminder GUID
-	 * @param array $inviteesData Invitees Data
-	 */
+    /**
+     * Save multiple reminders invitees data.
+     * 
+     * @param string $reminderId Related Reminder GUID
+     * @param array $inviteesData Invitees Data
+     */
     public static function saveRemindersInviteesData($reminderId, $inviteesData) {
         $savedInviteeIds = array();
         foreach($inviteesData as $k => $inviteeData) {
@@ -98,16 +98,16 @@ 
         self::deleteRemindersInviteesMultiple($reminderId, $savedInviteeIds);
     }
 	
-	/**
-	 * Load reminders invitees data.
-	 * 
-	 * @param string $reminderId Related Reminder GUID
-	 * @return array Invitees data
-	 */
-	public static function loadRemindersInviteesData($reminderId, $isDuplicate = false) {
-		$ret = array();
-		$reminderInviteeBeen = new Reminder_Invitee();
-		$reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
+    /**
+     * Load reminders invitees data.
+     * 
+     * @param string $reminderId Related Reminder GUID
+     * @return array Invitees data
+     */
+    public static function loadRemindersInviteesData($reminderId, $isDuplicate = false) {
+        $ret = array();
+        $reminderInviteeBeen = new Reminder_Invitee();
+        $reminderInvitees = $reminderInviteeBeen->get_full_list("reminders_invitees.date_entered", "reminders_invitees.reminder_id = '$reminderId'");
         if($reminderInvitees) {
             foreach ($reminderInvitees as $reminderInvitee) {
                 $ret[] = array(
@@ -118,8 +118,8 @@ 
                 );
             }
         }
-		return $ret;
-	}
+        return $ret;
+    }
 
     private static function getInviteeName($module, $moduleId) {
         $retValue = "unknown";
@@ -147,12 +147,12 @@ 
         return $retValue;
     }
 
-	/**
-	 * Delete reminders invitees multiple.
-	 * 
-	 * @param string $reminderId Related Reminder GUID
-	 * @param array $inviteeIds (optional) Exluded Invitees GUIDs, the invitee will not deleted if this argument contains that. Default is empty array.
-	 */
+    /**
+     * Delete reminders invitees multiple.
+     * 
+     * @param string $reminderId Related Reminder GUID
+     * @param array $inviteeIds (optional) Exluded Invitees GUIDs, the invitee will not deleted if this argument contains that. Default is empty array.
+     */
     public static function deleteRemindersInviteesMultiple($reminderId, $inviteeIds = array()) {
         $invitees = BeanFactory::getBean('Reminders_Invitees')->get_full_list("", "reminders_invitees.reminder_id = '$reminderId'");
         if($invitees) {

modules/AOP_Case_Updates/AOP_Case_Updates_sugar.php

Indentation +51 added lines, -51 removed lines

@@ -1,26 +1,26 @@ 
 <?PHP
 /**
- *
- * @package Advanced OpenPortal
- * @copyright SalesAgility Ltd http://www.salesagility.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
- * along with this program; if not, see http://www.gnu.org/licenses
- * or write to the Free Software Foundation,Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301  USA
- *
- * @author Salesagility Ltd <support@salesagility.com>
- */
+     *
+     * @package Advanced OpenPortal
+     * @copyright SalesAgility Ltd http://www.salesagility.com
+     *
+     * This program is free software; you can redistribute it and/or modify
+     * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by
+     * the Free Software Foundation; either version 3 of the License, or
+     * (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     *
+     * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
+     * along with this program; if not, see http://www.gnu.org/licenses
+     * or write to the Free Software Foundation,Inc., 51 Franklin Street,
+     * Fifth Floor, Boston, MA 02110-1301  USA
+     *
+     * @author Salesagility Ltd <support@salesagility.com>
+     */
 
 /**
  * THIS CLASS IS GENERATED BY MODULE BUILDER
@@ -30,37 +30,37 @@ 
 
 
 class AOP_Case_Updates_sugar extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AOP_Case_Updates';
-	var $object_name = 'AOP_Case_Updates';
-	var $table_name = 'aop_case_updates';
-	var $tracker_visibility = false;
-	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
-		var $id;
-		var $name;
-		var $date_entered;
-		var $date_modified;
-		var $modified_user_id;
-		var $modified_by_name;
-		var $created_by;
-		var $created_by_name;
-		var $description;
-		var $deleted;
-		var $created_by_link;
-		var $modified_user_link;
-		var $assigned_user_id;
-		var $assigned_user_name;
-		var $assigned_user_link;
-		function AOP_Case_Updates_sugar(){	
-		parent::Basic();
-	}
+    var $new_schema = true;
+    var $module_dir = 'AOP_Case_Updates';
+    var $object_name = 'AOP_Case_Updates';
+    var $table_name = 'aop_case_updates';
+    var $tracker_visibility = false;
+    var $importable = false;
+    var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+        var $id;
+        var $name;
+        var $date_entered;
+        var $date_modified;
+        var $modified_user_id;
+        var $modified_by_name;
+        var $created_by;
+        var $created_by_name;
+        var $description;
+        var $deleted;
+        var $created_by_link;
+        var $modified_user_link;
+        var $assigned_user_id;
+        var $assigned_user_name;
+        var $assigned_user_link;
+        function AOP_Case_Updates_sugar(){	
+        parent::Basic();
+    }
 	
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
 }
 		
 }

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

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

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

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

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'));
+    }
 }
 
 

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();
+    }
 }