adamjakab / SuiteCRM

include/MVC/Controller/file_access_control_map.php

Indentation +24 added lines, -24 removed lines

@@ -46,29 +46,29 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $file_access_control_map = array(
-	'modules' => array(
-		'administration' => array(
-			'actions' => array(
-				'backups',
-				'updater',
-			),
-			'links'	=> array(
-				'update',
-				'backup_management',
-				'upgrade_wizard',
-				'moduleBuilder',
-			),
-		),
-		'upgradewizard' => array(
-				'actions' => array(
-					'index',
-				),
-		),
-		'modulebuilder' => array(
-				'actions' => array(
-					'index' => array('params' => array('type' => array('mb'))),
-				),
-		),
-	)
+    'modules' => array(
+        'administration' => array(
+            'actions' => array(
+                'backups',
+                'updater',
+            ),
+            'links'	=> array(
+                'update',
+                'backup_management',
+                'upgrade_wizard',
+                'moduleBuilder',
+            ),
+        ),
+        'upgradewizard' => array(
+                'actions' => array(
+                    'index',
+                ),
+        ),
+        'modulebuilder' => array(
+                'actions' => array(
+                    'index' => array('params' => array('type' => array('mb'))),
+                ),
+        ),
+    )
 );
 ?>
\ No newline at end of file

include/javascript/jsAlerts.php

Indentation +86 added lines, -86 removed lines

@@ -42,28 +42,28 @@ 
 require_once("include/utils/db_utils.php");
 
 class jsAlerts{
-	var $script;
+    var $script;
 
-	function jsAlerts(){
-		global $app_strings;
-		$this->script .= <<<EOQ
+    function jsAlerts(){
+        global $app_strings;
+        $this->script .= <<<EOQ
 		if (!alertsTimeoutId) {
 		    checkAlerts();
 		}
 
 EOQ;
-		$this->addActivities();
-		Reminder::addNotifications($this);
-		if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
-			$this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
-		}
-	}
-	function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
+        $this->addActivities();
+        Reminder::addNotifications($this);
+        if(!empty($GLOBALS['sugar_config']['enable_timeout_alerts'])){
+            $this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_1'], (session_cache_expire() - 2) * 60 );
+            $this->addAlert($app_strings['ERROR_JS_ALERT_SYSTEM_CLASS'], $app_strings['ERROR_JS_ALERT_TIMEOUT_TITLE'],'', $app_strings['ERROR_JS_ALERT_TIMEOUT_MSG_2'], (session_cache_expire()) * 60 , 'index.php');
+        }
+    }
+    function addAlert($type, $name, $subtitle, $description, $countdown, $redirect='')
     {
-		$script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
+        $script = 'addAlert(' . json_encode($type) .',' . json_encode($name). ',' . json_encode($subtitle). ','. json_encode(str_replace(array("\r", "\n"), array('','<br>'),$description)) . ',' . $countdown . ','.json_encode($redirect).');' . "\n";
         $this->script .= $script;
-	}
+    }
 
     function getScript()
     {
@@ -87,29 +87,29 @@ 
     }
 
     function addActivities(){
-		global $app_list_strings, $timedate, $current_user, $app_strings;
-		global $sugar_config;
+        global $app_list_strings, $timedate, $current_user, $app_strings;
+        global $sugar_config;
 
-		if (empty($current_user->id)) {
+        if (empty($current_user->id)) {
             return;
-		}
+        }
 
         //Create separate variable to hold timedate value
         $alertDateTimeNow = $timedate->nowDb();
 
-		// cn: get a boundary limiter
-		$dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
-		$dateTimeNow = $timedate->nowDb();
+        // cn: get a boundary limiter
+        $dateTimeMax = $timedate->getNow()->modify("+{$app_list_strings['reminder_max_time']} seconds")->asDb();
+        $dateTimeNow = $timedate->nowDb();
 
-		global $db;
-		$dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
-		$dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
-		$desc = $db->convert("description", "text2char");
-		if($desc != "description") {
-		    $desc .= " description";
-		}
+        global $db;
+        $dateTimeNow = $db->convert($db->quoted($dateTimeNow), 'datetime');
+        $dateTimeMax = $db->convert($db->quoted($dateTimeMax), 'datetime');
+        $desc = $db->convert("description", "text2char");
+        if($desc != "description") {
+            $desc .= " description";
+        }
 
-		// Prep Meetings Query
+        // Prep Meetings Query
         $selectMeetings = "SELECT meetings.id, name,reminder_time, $desc,location, status, parent_type, parent_id, date_start, assigned_user_id
 			FROM meetings LEFT JOIN meetings_users ON meetings.id = meetings_users.meeting_id
 			WHERE meetings_users.user_id ='".$current_user->id."'
@@ -119,61 +119,61 @@ 
 				AND meetings.status = 'Planned'
 			    AND date_start >= $dateTimeNow
 			    AND date_start <= $dateTimeMax";
-		$result = $db->query($selectMeetings);
-
-		///////////////////////////////////////////////////////////////////////
-		////	MEETING INTEGRATION
-		$meetingIntegration = null;
-		if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
-			if(!class_exists($sugar_config['meeting_integration'])) {
-				require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
-			}
-			$meetingIntegration = new $sugar_config['meeting_integration']();
-		}
-		////	END MEETING INTEGRATION
-		///////////////////////////////////////////////////////////////////////
-
-		while($row = $db->fetchByAssoc($result)) {
-			// need to concatenate since GMT times can bridge two local days
-			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
-			$timeRemind = $row['reminder_time'];
-			$timeStart -= $timeRemind;
-
-			$url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
-			$instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
-
-			///////////////////////////////////////////////////////////////////
-			////	MEETING INTEGRATION
-			if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
-				$url = $meetingIntegration->miUrlGetJsAlert($row);
-				$instructions = $meetingIntegration->miGetJsAlertInstructions();
-			}
-			////	END MEETING INTEGRATION
-			///////////////////////////////////////////////////////////////////
-
-			$meetingName = from_html($row['name']);
-			$desc1 = from_html($row['description']);
-			$location = from_html($row['location']);
+        $result = $db->query($selectMeetings);
+
+        ///////////////////////////////////////////////////////////////////////
+        ////	MEETING INTEGRATION
+        $meetingIntegration = null;
+        if(isset($sugar_config['meeting_integration']) && !empty($sugar_config['meeting_integration'])) {
+            if(!class_exists($sugar_config['meeting_integration'])) {
+                require_once("modules/{$sugar_config['meeting_integration']}/{$sugar_config['meeting_integration']}.php");
+            }
+            $meetingIntegration = new $sugar_config['meeting_integration']();
+        }
+        ////	END MEETING INTEGRATION
+        ///////////////////////////////////////////////////////////////////////
+
+        while($row = $db->fetchByAssoc($result)) {
+            // need to concatenate since GMT times can bridge two local days
+            $timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
+            $timeRemind = $row['reminder_time'];
+            $timeStart -= $timeRemind;
+
+            $url = 'index.php?action=DetailView&module=Meetings&record=' . $row['id'];
+            $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
+
+            ///////////////////////////////////////////////////////////////////
+            ////	MEETING INTEGRATION
+            if(!empty($meetingIntegration) && $meetingIntegration->isIntegratedMeeting($row['id'])) {
+                $url = $meetingIntegration->miUrlGetJsAlert($row);
+                $instructions = $meetingIntegration->miGetJsAlertInstructions();
+            }
+            ////	END MEETING INTEGRATION
+            ///////////////////////////////////////////////////////////////////
+
+            $meetingName = from_html($row['name']);
+            $desc1 = from_html($row['description']);
+            $location = from_html($row['location']);
 
             $relatedToMeeting = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
-			$description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
             $description = $description  ."\n" .$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . $row['status'] ."\n". $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO']. $relatedToMeeting;
 
 
-			// standard functionality
-			$this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-				$app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')),
-				$app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
-				$description.
-				$instructions,
-				$timeStart - strtotime($alertDateTimeNow),
-				$url
-			);
-		}
+            // standard functionality
+            $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
+                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')),
+                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                $description.
+                $instructions,
+                $timeStart - strtotime($alertDateTimeNow),
+                $url
+            );
+        }
 
-		// Prep Calls Query
-		$selectCalls = "
+        // Prep Calls Query
+        $selectCalls = "
 				SELECT calls.id, name, reminder_time, $desc, date_start, status, parent_type, parent_id
 				FROM calls LEFT JOIN calls_users ON calls.id = calls_users.call_id
 				WHERE calls_users.user_id ='".$current_user->id."'
@@ -184,14 +184,14 @@ 
 				    AND date_start >= $dateTimeNow
 				    AND date_start <= $dateTimeMax";
 
-		$result = $db->query($selectCalls);
+        $result = $db->query($selectCalls);
 
-		while($row = $db->fetchByAssoc($result)){
-			// need to concatenate since GMT times can bridge two local days
-			$timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
-			$timeRemind = $row['reminder_time'];
-			$timeStart -= $timeRemind;
-			$row['description'] = (isset($row['description'])) ? $row['description'] : '';
+        while($row = $db->fetchByAssoc($result)){
+            // need to concatenate since GMT times can bridge two local days
+            $timeStart = strtotime($db->fromConvert($row['date_start'], 'datetime'));
+            $timeRemind = $row['reminder_time'];
+            $timeStart -= $timeRemind;
+            $row['description'] = (isset($row['description'])) ? $row['description'] : '';
 
             $relatedToCall = $this->getRelatedName($row['parent_type'], $row['parent_id']);
 
@@ -199,8 +199,8 @@ 
 
 
             $this->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_CALL'], $row['name'], $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$timedate->to_display_date_time($db->fromConvert($row['date_start'], 'datetime')) , $app_strings['MSG_JS_ALERT_MTG_REMINDER_DESC'].$callDescription , $timeStart - strtotime($alertDateTimeNow), 'index.php?action=DetailView&module=Calls&record=' . $row['id']);
-		}
-	}
+        }
+    }
 
 
 }

include/javascript/getYUIComboFile.php

Indentation +23 added lines, -23 removed lines

@@ -42,13 +42,13 @@ 
 
 $yui_path = array(
     "2.9.0" => "include/javascript/yui",
-	"2_9_0" => "include/javascript/yui",
-	"3.3.0" => "include/javascript/yui3",
-	"3_3_0" => "include/javascript/yui3"
+    "2_9_0" => "include/javascript/yui",
+    "3.3.0" => "include/javascript/yui3",
+    "3_3_0" => "include/javascript/yui3"
 );
 $types = array(
     "js" => "application/javascript",
-	"css" => "text/css",
+    "css" => "text/css",
 );
 $out = "";
 
@@ -57,36 +57,36 @@ 
 
 foreach ($_REQUEST as $param => $val)
 {
-	//No backtracking in the path
-	if (strpos($param, "..") !== false)
+    //No backtracking in the path
+    if (strpos($param, "..") !== false)
         continue;
 
-	$version = explode("/", $param);
-	$version = $version[0];
+    $version = explode("/", $param);
+    $version = $version[0];
     if (empty($yui_path[$version])) continue;
 
     $path = $yui_path[$version] . substr($param, strlen($version));
 
-	$extension = substr($path, strrpos($path, "_") + 1);
+    $extension = substr($path, strrpos($path, "_") + 1);
 
-	//Only allowed file extensions
-	if (empty($types[$extension]))
-	   continue;
+    //Only allowed file extensions
+    if (empty($types[$extension]))
+        continue;
 
-	if (empty($contentType))
+    if (empty($contentType))
     {
         $contentType = $types[$extension];
     }
-	//Put together the final filepath
-	$path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
-	$contents = '';
-	if (is_file($path)) {
-	   $out .= "/*" . $path . "*/\n";
-	   $contents =  file_get_contents($path);
-	   $out .= $contents . "\n";
-	}
-	$path = empty($contents) ? $path : $contents;
-	$allpath .= md5($path);
+    //Put together the final filepath
+    $path = substr($path, 0, strrpos($path, "_")) . "." . $extension;
+    $contents = '';
+    if (is_file($path)) {
+        $out .= "/*" . $path . "*/\n";
+        $contents =  file_get_contents($path);
+        $out .= $contents . "\n";
+    }
+    $path = empty($contents) ? $path : $contents;
+    $allpath .= md5($path);
 }
 
 $etag = '"'.md5($allpath).'"';

include/Dashlets/DashletGenericChart.php

Indentation +10 added lines, -10 removed lines

@@ -139,7 +139,7 @@ 
      */
     public function setRefreshIcon()
     {
-    	$additionalTitle = '';
+        $additionalTitle = '';
         if($this->isRefreshable)
 
             $additionalTitle .= '<a href="#" onclick="SUGAR.mySugar.retrieveDashlet(\''
@@ -165,9 +165,9 @@ 
     public function displayScript()
     {
 
-		require_once('include/SugarCharts/SugarChartFactory.php');
-		$sugarChart = SugarChartFactory::getInstance();
-		return $sugarChart->getDashletScript($this->id);
+        require_once('include/SugarCharts/SugarChartFactory.php');
+        $sugarChart = SugarChartFactory::getInstance();
+        return $sugarChart->getDashletScript($this->id);
 
     }
 
@@ -272,11 +272,11 @@ 
         $this->getConfigureSmartyInstance()->assign('showClearButton', $this->isConfigPanelClearShown);
         
         if($this->isAutoRefreshable()) {
-       		$this->getConfigureSmartyInstance()->assign('isRefreshable', true);
-			$this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
-			$this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
-			$this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
-		}
+                $this->getConfigureSmartyInstance()->assign('isRefreshable', true);
+            $this->getConfigureSmartyInstance()->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
+            $this->getConfigureSmartyInstance()->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
+            $this->getConfigureSmartyInstance()->assign('autoRefreshSelect', $this->autoRefresh);
+        }
 
         return parent::displayOptions() . $this->getConfigureSmartyInstance()->fetch($this->_configureTpl);
     }
@@ -339,7 +339,7 @@ 
             $dashletOffset = 0;
             $module = $_REQUEST['module'];
             if(isset($_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'])) {
-            	$dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
+                $dashletOffset = $_REQUEST[$module.'2_'.strtoupper($this->getSeedBean()->object_name).'_offset'];
             }
         }
 

include/Dashlets/DashletRssFeedTitle.php

Indentation +65 added lines, -65 removed lines

@@ -43,79 +43,79 @@
  * Created: Sep 12, 2011
  */
 class DashletRssFeedTitle {
-	public $defaultEncoding = "UTF-8";
-	public $readBytes = 8192;
-	public $url;
-	public $cut = 70;
-	public $contents = "";
-	public $title = "";
-	public $endWith = "...";
-	public $xmlEncoding = false;
-	public $fileOpen = false;
+    public $defaultEncoding = "UTF-8";
+    public $readBytes = 8192;
+    public $url;
+    public $cut = 70;
+    public $contents = "";
+    public $title = "";
+    public $endWith = "...";
+    public $xmlEncoding = false;
+    public $fileOpen = false;
 
-	public function __construct($url) {
-		$this->url = $url;
-	}
+    public function __construct($url) {
+        $this->url = $url;
+    }
 
-	public function generateTitle() {
-		if ($this->readFeed()) {
-			$this->getTitle();
-			if (!empty($this->title)) {
-				$this->convertEncoding();
-				$this->cutLength();
-			}
-		}
-		return $this->title;
-	}
+    public function generateTitle() {
+        if ($this->readFeed()) {
+            $this->getTitle();
+            if (!empty($this->title)) {
+                $this->convertEncoding();
+                $this->cutLength();
+            }
+        }
+        return $this->title;
+    }
 
-	/**
-	 * @todo use curl with waiting timeout instead of fopen
-	 */
-	public function readFeed() {
-		if ($this->url) {
+    /**
+     * @todo use curl with waiting timeout instead of fopen
+     */
+    public function readFeed() {
+        if ($this->url) {
                     if (!in_array(strtolower(parse_url($this->url, PHP_URL_SCHEME)), array("http", "https"), true)) {
                         return false;
                     }
-			$fileOpen = @fopen($this->url, 'r');
-			if ($fileOpen) {
-				$this->fileOpen = true;
-				$this->contents = fread($fileOpen, $this->readBytes);
-				fclose($fileOpen);
-				return true;
-			}
-		}
-		return false;
-	}
+            $fileOpen = @fopen($this->url, 'r');
+            if ($fileOpen) {
+                $this->fileOpen = true;
+                $this->contents = fread($fileOpen, $this->readBytes);
+                fclose($fileOpen);
+                return true;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 *
-	 */
-	public function getTitle() {
-		$matches = array ();
-		preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
-		if (isset($matches[0])) {
-			$this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
-		}
-	}
+    /**
+     *
+     */
+    public function getTitle() {
+        $matches = array ();
+        preg_match("/<title>.*?<\/title>/i", $this->contents, $matches);
+        if (isset($matches[0])) {
+            $this->title = str_replace(array('<![CDATA[', '<title>', '</title>', ']]>'), '', $matches[0]);
+        }
+    }
 
-	public function cutLength() {
-		if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
-			$this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
-		}
-	}
+    public function cutLength() {
+        if (mb_strlen(trim($this->title), $this->defaultEncoding) > $this->cut) {
+            $this->title = mb_substr($this->title, 0, $this->cut, $this->defaultEncoding) . $this->endWith;
+        }
+    }
 
-	private function _identifyXmlEncoding() {
-		$matches = array ();
-		preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
-		if (isset($matches[0])) {
-			$this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');
-		}
-	}
+    private function _identifyXmlEncoding() {
+        $matches = array ();
+        preg_match('/encoding\=*\".*?\"/', $this->contents, $matches);
+        if (isset($matches[0])) {
+            $this->xmlEncoding = trim(str_replace('encoding="', '"', $matches[0]), '"');
+        }
+    }
 
-	public function convertEncoding() {
-		$this->_identifyXmlEncoding();
-		if ($this->xmlEncoding && $this->xmlEncoding != $this->defaultEncoding) {
-			$this->title = iconv($this->xmlEncoding, $this->defaultEncoding, $this->title);
-		}
-	}
+    public function convertEncoding() {
+        $this->_identifyXmlEncoding();
+        if ($this->xmlEncoding && $this->xmlEncoding != $this->defaultEncoding) {
+            $this->title = iconv($this->xmlEncoding, $this->defaultEncoding, $this->title);
+        }
+    }
 }

include/SugarPHPMailer.php

Indentation +237 added lines, -237 removed lines

@@ -48,116 +48,116 @@ 
  */
 class SugarPHPMailer extends PHPMailer
 {
-	var $oe; // OutboundEmail
-	var $protocol = "tcp://";
-	var $preppedForOutbound = false;
-	var $disclosureEnabled;
-	var $disclosureText;
-	var $isHostEmpty = false;
-	var $opensslOpened = true;
-
-	/**
-	 * Sole constructor
-	 */
-	function SugarPHPMailer() {
-		global $locale;
-		global $current_user;
-		global $sugar_config;
-
-		$admin = new Administration();
-		$admin->retrieveSettings();
-
-		if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
-			$this->disclosureEnabled = true;
-			$this->disclosureText = $admin->settings['disclosure_text'];
-		}
-
-		$this->oe = new OutboundEmail();
-		$this->oe->getUserMailerSettings($current_user);
-
-		$this->SetLanguage('en', 'include/phpmailer/language/');
-		$this->PluginDir	= 'include/phpmailer/';
-		$this->Mailer	 	= 'smtp';
+    var $oe; // OutboundEmail
+    var $protocol = "tcp://";
+    var $preppedForOutbound = false;
+    var $disclosureEnabled;
+    var $disclosureText;
+    var $isHostEmpty = false;
+    var $opensslOpened = true;
+
+    /**
+     * Sole constructor
+     */
+    function SugarPHPMailer() {
+        global $locale;
+        global $current_user;
+        global $sugar_config;
+
+        $admin = new Administration();
+        $admin->retrieveSettings();
+
+        if(isset($admin->settings['disclosure_enable']) && !empty($admin->settings['disclosure_enable'])) {
+            $this->disclosureEnabled = true;
+            $this->disclosureText = $admin->settings['disclosure_text'];
+        }
+
+        $this->oe = new OutboundEmail();
+        $this->oe->getUserMailerSettings($current_user);
+
+        $this->SetLanguage('en', 'include/phpmailer/language/');
+        $this->PluginDir	= 'include/phpmailer/';
+        $this->Mailer	 	= 'smtp';
         // cn: i18n
         $this->CharSet		= $locale->getPrecedentPreference('default_email_charset');
-		$this->Encoding		= 'quoted-printable';
+        $this->Encoding		= 'quoted-printable';
         $this->IsHTML(false);  // default to plain-text email
         $this->Hostname = $sugar_config['host_name'];
         $this->WordWrap		= 996;
-		// cn: gmail fix
-		$this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
+        // cn: gmail fix
+        $this->protocol = ($this->oe->mail_smtpssl == 1) ? "ssl://" : $this->protocol;
 
-	}
+    }
 
 
-	/**
-	 * Prefills outbound details
-	 */
-	function setMailer() {
-		global $current_user;
+    /**
+     * Prefills outbound details
+     */
+    function setMailer() {
+        global $current_user;
 
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getUserMailerSettings($current_user);
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getUserMailerSettings($current_user);
 
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertently set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
 
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
-            	$this->SMTPSecure = 'ssl';
+                $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
 
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-			$this->Mailer = "sendmail";
-	}
-
-	/**
-	 * Prefills mailer for system
-	 */
-	function setMailerForSystem() {
-		require_once("include/OutboundEmail/OutboundEmail.php");
-		$oe = new OutboundEmail();
-		$oe = $oe->getSystemMailerSettings();
-
-		// ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
-		$this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
-
-		if($oe->mail_sendtype == "SMTP")
-		{
-    		//Set mail send type information
-    		$this->Mailer = "smtp";
-    		$this->Host = $oe->mail_smtpserver;
-    		$this->Port = $oe->mail_smtpport;
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
+
+    /**
+     * Prefills mailer for system
+     */
+    function setMailerForSystem() {
+        require_once("include/OutboundEmail/OutboundEmail.php");
+        $oe = new OutboundEmail();
+        $oe = $oe->getSystemMailerSettings();
+
+        // ssl or tcp - keeping outside isSMTP b/c a default may inadvertantly set ssl://
+        $this->protocol = ($oe->mail_smtpssl) ? "ssl://" : "tcp://";
+
+        if($oe->mail_sendtype == "SMTP")
+        {
+            //Set mail send type information
+            $this->Mailer = "smtp";
+            $this->Host = $oe->mail_smtpserver;
+            $this->Port = $oe->mail_smtpport;
             if ($oe->mail_smtpssl == 1) {
                 $this->SMTPSecure = 'ssl';
             } // if
             if ($oe->mail_smtpssl == 2) {
-            	$this->SMTPSecure = 'tls';
+                $this->SMTPSecure = 'tls';
             } // if
-    		if($oe->mail_smtpauth_req) {
-    			$this->SMTPAuth = TRUE;
-    			$this->Username = $oe->mail_smtpuser;
-    			$this->Password = $oe->mail_smtppass;
-    		}
-		}
-		else
-		  $this->Mailer = "sendmail";
-	}
+            if($oe->mail_smtpauth_req) {
+                $this->SMTPAuth = TRUE;
+                $this->Username = $oe->mail_smtpuser;
+                $this->Password = $oe->mail_smtppass;
+            }
+        }
+        else
+            $this->Mailer = "sendmail";
+    }
 
     /**
      * Attaches all fs, string, and binary attachments to the message.
@@ -216,38 +216,38 @@ 
         return join("", $mime);
     }*/
 
-	/**
-	 * handles Charset translation for all visual parts of the email.
-	 * @param string charset Default = ''
-	 */
-	function prepForOutbound() {
-		global $locale;
-
-		if($this->preppedForOutbound == false) {
-			//bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
-			//$this->preppedForOutbound = true; // flag so we don't redo this
-			$OBCharset = $locale->getPrecedentPreference('default_email_charset');
-
-			// handle disclosure
-			if($this->disclosureEnabled) {
-				$this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
-				$this->AltBody .= "\r\r{$this->disclosureText}";
-			}
+    /**
+     * handles Charset translation for all visual parts of the email.
+     * @param string charset Default = ''
+     */
+    function prepForOutbound() {
+        global $locale;
+
+        if($this->preppedForOutbound == false) {
+            //bug 28534. We should not set it to true to circumvent the following conversion as each email is independent.
+            //$this->preppedForOutbound = true; // flag so we don't redo this
+            $OBCharset = $locale->getPrecedentPreference('default_email_charset');
+
+            // handle disclosure
+            if($this->disclosureEnabled) {
+                $this->Body .= "<br />&nbsp;<br />{$this->disclosureText}";
+                $this->AltBody .= "\r\r{$this->disclosureText}";
+            }
 
-			// body text
-			$this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
-			$this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
+            // body text
+            $this->Body		= from_html($locale->translateCharset(trim($this->Body), 'UTF-8', $OBCharset));
+            $this->AltBody		= from_html($locale->translateCharset(trim($this->AltBody), 'UTF-8', $OBCharset));
             $subjectUTF8		= from_html(trim($this->Subject));
             $subject			= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
             $this->Subject		= $locale->translateCharset($subjectUTF8, 'UTF-8', $OBCharset);
 
-			// HTML email RFC compliance
-			if($this->ContentType == "text/html") {
-				if(strpos($this->Body, '<html') === false) {
+            // HTML email RFC compliance
+            if($this->ContentType == "text/html") {
+                if(strpos($this->Body, '<html') === false) {
 
                     $langHeader = get_language_header();
 
-					$head=<<<eoq
+                    $head=<<<eoq
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" {$langHeader}>
 <head>
@@ -256,15 +256,15 @@ 
 </head>
 <body>
 eoq;
-					$this->Body = $head.$this->Body."</body></html>";
-				}
-			}
+                    $this->Body = $head.$this->Body."</body></html>";
+                }
+            }
 
-			// Headers /////////////////////////////////
-			// the below is done in PHPMailer::CreateHeader();
-			//$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
-			$this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
-			/*
+            // Headers /////////////////////////////////
+            // the below is done in PHPMailer::CreateHeader();
+            //$this->Subject			= $locale->translateCharsetMIME(trim($this->Subject), 'UTF-8', $locale->getPrecedentPreference('default_email_charset'));
+            $this->FromName		= $locale->translateCharset(trim($this->FromName), 'UTF-8', $OBCharset);
+            /*
 			foreach($this->ReplyTo as $k => $v) {
 				$this->ReplyTo[$k][1] = $locale->translateCharset(trim($v[1]), 'UTF-8', $OBCharset);
 			}
@@ -282,129 +282,129 @@ 
 			}
 			*/
 
-		}
-	}
-
-	/**
-	 * Replace images with locations specified by regex with cid: images
-	 * and attach needed files
-	 * @param string $regex Regular expression
-	 * @param string $local_prefix Prefix where local files are stored
-	 * @param bool $object Use attachment object
-	 */
-	public function replaceImageByRegex($regex, $local_prefix, $object = false)
-	{
-		preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
-		$i = 0;
+        }
+    }
+
+    /**
+     * Replace images with locations specified by regex with cid: images
+     * and attach needed files
+     * @param string $regex Regular expression
+     * @param string $local_prefix Prefix where local files are stored
+     * @param bool $object Use attachment object
+     */
+    public function replaceImageByRegex($regex, $local_prefix, $object = false)
+    {
+        preg_match_all("#<img[^>]*[\s]+src[^=]*=[\s]*[\"']($regex)(.+?)[\"']#si", $this->Body, $matches);
+        $i = 0;
         foreach($matches[2] as $match) {
-			$filename = urldecode($match);
-			$cid = $filename;
-			$file_location = $local_prefix.$filename;
-			if(!file_exists($file_location)) continue;
-			if($object) {
-			    if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
-			        switch(strtolower($typematch[1])) {
-			            case 'documents':
-			                $beanname = 'DocumentRevisions';
-			                break;
-			            case 'notes':
-			                $beanname = 'Notes';
-			                break;
-			        }
-			    }
-			    $mime_type = "application/octet-stream";
-			    if(isset($beanname)) {
-			        $bean = SugarModule::get($beanname)->loadBean();
-    			    $bean->retrieve($filename);
-    			    if(!empty($bean->id)) {
-        			    $mime_type = $bean->file_mime_type;
-        			    $filename = $bean->filename;
-    			    }
-			    }
-			} else {
-			    $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-			}
-		    if (!$this->embeddedAttachmentExists($cid)) {
-		    	$this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
-		    }
-		    $i++;
+            $filename = urldecode($match);
+            $cid = $filename;
+            $file_location = $local_prefix.$filename;
+            if(!file_exists($file_location)) continue;
+            if($object) {
+                if(preg_match('#&(?:amp;)?type=([\w]+)#i', $matches[0][$i], $typematch)) {
+                    switch(strtolower($typematch[1])) {
+                        case 'documents':
+                            $beanname = 'DocumentRevisions';
+                            break;
+                        case 'notes':
+                            $beanname = 'Notes';
+                            break;
+                    }
+                }
+                $mime_type = "application/octet-stream";
+                if(isset($beanname)) {
+                    $bean = SugarModule::get($beanname)->loadBean();
+                    $bean->retrieve($filename);
+                    if(!empty($bean->id)) {
+                        $mime_type = $bean->file_mime_type;
+                        $filename = $bean->filename;
+                    }
+                }
+            } else {
+                $mime_type = "image/".strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+            }
+            if (!$this->embeddedAttachmentExists($cid)) {
+                $this->AddEmbeddedImage($file_location, $cid, $filename, 'base64', $mime_type);
+            }
+            $i++;
         }
-		//replace references to cache with cid tag
-		$this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
-		// remove bad img line from outbound email
-		$this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
-	}
+        //replace references to cache with cid tag
+        $this->Body = preg_replace("|\"$regex|i",'"cid:',$this->Body);
+        // remove bad img line from outbound email
+        $this->Body = preg_replace('#<img[^>]+src[^=]*=\"\/([^>]*?[^>]*)>#sim', '', $this->Body);
+    }
 	
-	/**
-	 * @param notes	array of note beans
-	 */
-	function handleAttachments($notes) {
-		global $sugar_config;
+    /**
+     * @param notes	array of note beans
+     */
+    function handleAttachments($notes) {
+        global $sugar_config;
 
-		// cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
-		$this->ClearAttachments();
+        // cn: bug 4864 - reusing same SugarPHPMailer class, need to clear attachments
+        $this->ClearAttachments();
 
-		//replace references to cache/images with cid tag
+        //replace references to cache/images with cid tag
         $this->Body = preg_replace(';=\s*"'.preg_quote(sugar_cached('images/'), ';').';','="cid:',$this->Body);
 
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
-
-		//Replace any embeded images using the secure entryPoint for src url.
-		$this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
-
-		if (empty($notes)) {
-				return;
-		}
-		//Handle regular attachments.
-		foreach($notes as $note) {
-				$mime_type = 'text/plain';
-				$file_location = '';
-				$filename = '';
-
-				if($note->object_name == 'Note') {
-					if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
-						$file_location = $note->file->temp_file_location;
-						$filename = $note->file->original_file_name;
-						$mime_type = $note->file->mime_type;
-					} else {
-						$file_location = "upload://{$note->id}";
-						$filename = $note->id.$note->filename;
-						$mime_type = $note->file_mime_type;
-					}
-				} elseif($note->object_name == 'DocumentRevision') { // from Documents
-					$filename = $note->id.$note->filename;
-					$file_location = "upload://$filename";
-					$mime_type = $note->file_mime_type;
-				}
-
-				$filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
-				if (!$note->embed_flag) {
-					$this->AddAttachment($file_location, $filename, 'base64', $mime_type);
-				} // else
-			}
-	}
-
-	/**
-	 * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
-	 *
-	 */
-	function SetError($msg) {
-		$GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
-		parent::SetError($msg);
-	}
-
-	function SmtpConnect($options = array()) {
-		$connection = parent::SmtpConnect();
-		if (!$connection) {
-			global $app_strings;
-			if(isset($this->oe) && $this->oe->type == "system") {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
-			} else {
-				$this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
-			} // else
-		}
-		return $connection;
-	} // fn
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?/?cache/images/", sugar_cached("images/"));
+
+        //Replace any embeded images using the secure entryPoint for src url.
+        $this->replaceImageByRegex("(?:{$sugar_config['site_url']})?index.php[?]entryPoint=download&(?:amp;)?[^\"]+?id=", "upload://", true);
+
+        if (empty($notes)) {
+                return;
+        }
+        //Handle regular attachments.
+        foreach($notes as $note) {
+                $mime_type = 'text/plain';
+                $file_location = '';
+                $filename = '';
+
+                if($note->object_name == 'Note') {
+                    if (! empty($note->file->temp_file_location) && is_file($note->file->temp_file_location)) {
+                        $file_location = $note->file->temp_file_location;
+                        $filename = $note->file->original_file_name;
+                        $mime_type = $note->file->mime_type;
+                    } else {
+                        $file_location = "upload://{$note->id}";
+                        $filename = $note->id.$note->filename;
+                        $mime_type = $note->file_mime_type;
+                    }
+                } elseif($note->object_name == 'DocumentRevision') { // from Documents
+                    $filename = $note->id.$note->filename;
+                    $file_location = "upload://$filename";
+                    $mime_type = $note->file_mime_type;
+                }
+
+                $filename = substr($filename, 36, strlen($filename)); // strip GUID	for PHPMailer class to name outbound file
+                if (!$note->embed_flag) {
+                    $this->AddAttachment($file_location, $filename, 'base64', $mime_type);
+                } // else
+            }
+    }
+
+    /**
+     * overloads class.phpmailer's SetError() method so that we can log errors in sugarcrm.log
+     *
+     */
+    function SetError($msg) {
+        $GLOBALS['log']->fatal("SugarPHPMailer encountered an error: {$msg}");
+        parent::SetError($msg);
+    }
+
+    function SmtpConnect($options = array()) {
+        $connection = parent::SmtpConnect();
+        if (!$connection) {
+            global $app_strings;
+            if(isset($this->oe) && $this->oe->type == "system") {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_SYSTEM_OUTBOUND']);
+            } else {
+                $this->SetError($app_strings['LBL_EMAIL_INVALID_PERSONAL_OUTBOUND']);
+            } // else
+        }
+        return $connection;
+    } // fn
 
     /*
      * overloads PHPMailer::PreSend() to allow for empty messages to go out.

include/Smarty/plugins/function.sugar_number_format.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 function smarty_function_sugar_number_format($params, &$smarty) {
     global $locale;
     
-	if(!isset($params['var']) || $params['var'] === '') {  
+    if(!isset($params['var']) || $params['var'] === '') {  
         return '';
     } 
 

include/Smarty/plugins/block.nocache.php

Indentation +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 //implements Smarty 3 style {nocache}{/nocache} block to prevent caching of a section of a template.
 //remove this upon upgrade to Smarty 3
 function smarty_block_nocache($param, $content, &$smarty) {
-   return $content;
+    return $content;
 } 
 ?>
\ No newline at end of file

include/Smarty/plugins/function.html_radios.php

Indentation +13 added lines, -13 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
+     * Smarty plugin
+     * @package Smarty
+     * @subpackage plugins
+     */
 
 
 /**
@@ -130,18 +130,18 @@ 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
     $_output = '';
     if ($labels) {
-      if($label_ids) {
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-          $_output .= '<label for="' . $_id . '">';
-      } else {
-          $_output .= '<label>';           
-      }
-   }
-   $_output .= '<input type="radio" name="'
+        if($label_ids) {
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
+            $_output .= '<label for="' . $_id . '">';
+        } else {
+            $_output .= '<label>';           
+        }
+    }
+    $_output .= '<input type="radio" name="'
         . smarty_function_escape_special_chars($name) . '" value="'
         . smarty_function_escape_special_chars($value) . '"';
 
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
+    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
 
     if ((string)$value==$selected) {
         $_output .= ' checked="checked"';