adamjakab / SuiteCRM

modules/AOS_Products/AOS_Products.php

Spacing +9 added lines, -9 removed lines

@@ -30,16 +30,16 @@ 
 require_once('modules/AOS_Products/AOS_Products_sugar.php');
 class AOS_Products extends AOS_Products_sugar {
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function AOS_Products(){
+    function AOS_Products() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -49,10 +49,10 @@ 
     }
 
 
-	function save($check_notify=false){
-		global $sugar_config,$mod_strings;
+	function save($check_notify = false) {
+		global $sugar_config, $mod_strings;
 
-		if (isset($_POST['deleteAttachment']) && $_POST['deleteAttachment']=='1') {
+		if (isset($_POST['deleteAttachment']) && $_POST['deleteAttachment'] == '1') {
 			$this->product_image = '';
 		}
 
@@ -60,14 +60,14 @@ 
 		$GLOBALS['log']->debug('UPLOADING PRODUCT IMAGE');
 		$upload_file = new UploadFile('uploadfile');
 
-		if (isset($_FILES['uploadimage']['tmp_name'])&&$_FILES['uploadimage']['tmp_name']!=""){
+		if (isset($_FILES['uploadimage']['tmp_name']) && $_FILES['uploadimage']['tmp_name'] != "") {
 
-            if($_FILES['uploadimage']['size'] > $sugar_config['upload_maxsize']) {
+            if ($_FILES['uploadimage']['size'] > $sugar_config['upload_maxsize']) {
                 die($mod_strings['LBL_IMAGE_UPLOAD_FAIL'].$sugar_config['upload_maxsize']);
 
             }
             else {
-                $this->product_image=$sugar_config['site_url'].'/'.$sugar_config['upload_dir'].$_FILES['uploadimage']['name'];
+                $this->product_image = $sugar_config['site_url'].'/'.$sugar_config['upload_dir'].$_FILES['uploadimage']['name'];
                 move_uploaded_file($_FILES['uploadimage']['tmp_name'], $sugar_config['upload_dir'].$_FILES['uploadimage']['name']);
 
             }

Braces +2 added lines, -4 removed lines

@@ -41,8 +41,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -65,8 +64,7 @@ 
             if($_FILES['uploadimage']['size'] > $sugar_config['upload_maxsize']) {
                 die($mod_strings['LBL_IMAGE_UPLOAD_FAIL'].$sugar_config['upload_maxsize']);
 
-            }
-            else {
+            } else {
                 $this->product_image=$sugar_config['site_url'].'/'.$sugar_config['upload_dir'].$_FILES['uploadimage']['name'];
                 move_uploaded_file($_FILES['uploadimage']['tmp_name'], $sugar_config['upload_dir'].$_FILES['uploadimage']['name']);
 

modules/Trackers/monitor/Monitor.php

Indentation +145 added lines, -145 removed lines

@@ -54,69 +54,69 @@ 
     var $monitor_id;
     var $table_name;
     protected $enabled = true;
-	protected $dirty = false;
+    protected $dirty = false;
 
-	var $date_start;
-	var $date_end;
-	var $active;
-	var $round_trips;
-	var $seconds;
-	var $session_id;
+    var $date_start;
+    var $date_end;
+    var $active;
+    var $round_trips;
+    var $seconds;
+    var $session_id;
 
     /**
      * Monitor constructor
      */
     public function __construct($name='', $monitorId='', $metadata='', $store='') {
 
-    	if(empty($metadata) || !file_exists($metadata)) {
-    	   $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING'] . "($metadata)");
-    	   throw new Exception($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING'] . "($metadata)");
-    	}
-
-    	$this->name = $name;
-    	$this->metricsFile = $metadata;
-
-    	require($this->metricsFile);
-    	$fields = $dictionary[$this->name]['fields'];
-    	$this->table_name = !empty($dictionary[$this->name]['table']) ? $dictionary[$this->name]['table'] : $this->name;
-    	$this->metrics = array();
-    	foreach($fields as $field) {
-
-    	   //We need to skip auto_increment fields; they are not real metrics
-    	   //since they are generated by the database.
-    	   if(isset($field['auto_increment'])) {
-    	   	  continue;
-    	   }
-
-    	   $type = isset($field['dbType']) ? $field['dbType'] : $field['type'];
-    	   $name = $field['name'];
-    	   $this->metrics[$name] = new Metric($type, $name);
-    	}
-
-    	$this->monitor_id = $monitorId;
-    	$this->stores = $store;
-
-    	if(isset($this->metrics['session_id'])) {
-	 		//set the value of the session id for 2 reasons:
-	 		//1) it is the same value no matter where it is set
-	 		//2) ensure it follows some filter rules.
-	 		$this->setValue('session_id', $this->getSessionId());
-    	}
+        if(empty($metadata) || !file_exists($metadata)) {
+            $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING'] . "($metadata)");
+            throw new Exception($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING'] . "($metadata)");
+        }
+
+        $this->name = $name;
+        $this->metricsFile = $metadata;
+
+        require($this->metricsFile);
+        $fields = $dictionary[$this->name]['fields'];
+        $this->table_name = !empty($dictionary[$this->name]['table']) ? $dictionary[$this->name]['table'] : $this->name;
+        $this->metrics = array();
+        foreach($fields as $field) {
+
+            //We need to skip auto_increment fields; they are not real metrics
+            //since they are generated by the database.
+            if(isset($field['auto_increment'])) {
+                    continue;
+            }
+
+            $type = isset($field['dbType']) ? $field['dbType'] : $field['type'];
+            $name = $field['name'];
+            $this->metrics[$name] = new Metric($type, $name);
+        }
+
+        $this->monitor_id = $monitorId;
+        $this->stores = $store;
+
+        if(isset($this->metrics['session_id'])) {
+                //set the value of the session id for 2 reasons:
+                //1) it is the same value no matter where it is set
+                //2) ensure it follows some filter rules.
+                $this->setValue('session_id', $this->getSessionId());
+        }
     }
 
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function Monitor($name='', $monitorId='', $metadata='', $store=''){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct($name, $monitorId, $metadata, $store);
-	}
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function Monitor($name='', $monitorId='', $metadata='', $store=''){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct($name, $monitorId, $metadata, $store);
+    }
 
     /**
      * setValue
@@ -127,16 +127,16 @@ 
      */
     public function setValue($name, $value) {
         if(!isset($this->metrics[$name])) {
-          $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC'] . "($name)");
-          throw new Exception($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC'] . "($name)");
+            $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC'] . "($name)");
+            throw new Exception($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC'] . "($name)");
         } else if($this->metrics[$name]->isMutable()) {
-          $this->$name = is_object($value) ? get_class($value) : $value;
-          $this->dirty = true;
+            $this->$name = is_object($value) ? get_class($value) : $value;
+            $this->dirty = true;
         }
     }
 
     public function getValue($name){
-    	return $this->$name;
+        return $this->$name;
     }
 
     /**
@@ -154,17 +154,17 @@ 
      * @return Array of metric instances defined for monitor instance
      */
     function getMetrics() {
-    	return $this->metrics;
+        return $this->metrics;
     }
 
-	/**
-	 * isDirty
-	 * Returns if the monitor has data that needs to be saved
-	 * @return $dirty boolean
-	 */
-	function isDirty(){
-		return $this->dirty;
-	}
+    /**
+     * isDirty
+     * Returns if the monitor has data that needs to be saved
+     * @return $dirty boolean
+     */
+    function isDirty(){
+        return $this->dirty;
+    }
 
     /**
      * save
@@ -173,89 +173,89 @@ 
      * @param $flush boolean parameter indicating whether or not to flush the instance data to store or possibly cache
      */
     public function save($flush=true) {
-    	//If the monitor is not enabled, do not save
-    	if(!$this->isEnabled()&&$this->name!='tracker_sessions')return false;
-
-    	//if the monitor does not have values set no need to do the work saving.
-    	if(!$this->dirty)return false;
-
-    	if(empty($GLOBALS['tracker_' . $this->table_name])) {
-    	    foreach($this->stores as $s) {
-	    		$store = $this->getStore($s);
-	    		$store->flush($this);
-    		}
-    	}
-    	$this->clear();
+        //If the monitor is not enabled, do not save
+        if(!$this->isEnabled()&&$this->name!='tracker_sessions')return false;
+
+        //if the monitor does not have values set no need to do the work saving.
+        if(!$this->dirty)return false;
+
+        if(empty($GLOBALS['tracker_' . $this->table_name])) {
+            foreach($this->stores as $s) {
+                $store = $this->getStore($s);
+                $store->flush($this);
+            }
+        }
+        $this->clear();
     }
 
-	/**
-	 * clear
-	 * This function clears the metrics data in the monitor instance
-	 */
-	public function clear() {
-	    $metrics = $this->getMetrics();
-	    foreach($metrics as $name=>$metric) {
-	    	    if($metric->isMutable()) {
-                   $this->$name = '';
-	    	    }
-	    }
-		$this->dirty = false;
-	}
-
-	/**
-	 * getStore
-	 * This method checks if the Store implementation has already been instantiated and
-	 * will return the one stored; otherwise it will create the Store implementation and
-	 * save it to the Array of Stores.
-	 * @param $store The name of the store as defined in the 'modules/Trackers/config.php' settings
-	 * @return An instance of a Store implementation
-	 * @throws Exception Thrown if $store class cannot be loaded
-	 */
-	protected function getStore($store) {
-
-		if(isset($this->cachedStores[$store])) {
-		   return $this->cachedStores[$store];
-		}
+    /**
+     * clear
+     * This function clears the metrics data in the monitor instance
+     */
+    public function clear() {
+        $metrics = $this->getMetrics();
+        foreach($metrics as $name=>$metric) {
+                if($metric->isMutable()) {
+                    $this->$name = '';
+                }
+        }
+        $this->dirty = false;
+    }
+
+    /**
+     * getStore
+     * This method checks if the Store implementation has already been instantiated and
+     * will return the one stored; otherwise it will create the Store implementation and
+     * save it to the Array of Stores.
+     * @param $store The name of the store as defined in the 'modules/Trackers/config.php' settings
+     * @return An instance of a Store implementation
+     * @throws Exception Thrown if $store class cannot be loaded
+     */
+    protected function getStore($store) {
+
+        if(isset($this->cachedStores[$store])) {
+            return $this->cachedStores[$store];
+        }
 
         if(!file_exists("modules/Trackers/store/$store.php")) {
-           $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING'] . "($store)");
-           throw new Exception($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING'] . "($store)");
+            $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING'] . "($store)");
+            throw new Exception($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING'] . "($store)");
+        }
+
+        require_once("modules/Trackers/store/$store.php");
+        $s = new $store();
+        $this->cachedStores[$store] = $s;
+        return $s;
+    }
+
+        public function getSessionId(){
+            $sessionid = session_id();
+        if(!empty($sessionid) && strlen($sessionid) > MAX_SESSION_LENGTH) {
+            $sessionid = md5($sessionid);
+        }
+        return $sessionid;
+        }
+
+        /**
+         * Returns the monitor's metrics/values as an Array
+         * @return An Array of data for the monitor's corresponding metrics
+         */
+        public function toArray() {
+            $to_arr = array();
+            $metrics = $this->getMetrics();
+        foreach($metrics as $name=>$metric) {
+                $to_arr[$name] = isset($this->$name) ? $this->$name : null;
+        }
+        return $to_arr;
         }
 
-		require_once("modules/Trackers/store/$store.php");
-		$s = new $store();
-		$this->cachedStores[$store] = $s;
-		return $s;
-	}
-
- 	public function getSessionId(){
- 		$sessionid = session_id();
-	    if(!empty($sessionid) && strlen($sessionid) > MAX_SESSION_LENGTH) {
-	       $sessionid = md5($sessionid);
-	    }
-	    return $sessionid;
- 	}
-
- 	/**
- 	 * Returns the monitor's metrics/values as an Array
- 	 * @return An Array of data for the monitor's corresponding metrics
- 	 */
- 	public function toArray() {
- 		$to_arr = array();
- 		$metrics = $this->getMetrics();
-	    foreach($metrics as $name=>$metric) {
-	    	    $to_arr[$name] = isset($this->$name) ? $this->$name : null;
-	    }
-	    return $to_arr;
- 	}
-
- 	public function setEnabled($enable=true) {
- 		$this->enabled = $enable;
- 	}
-
- 	public function isEnabled() {
- 		return $this->enabled;
- 	}
+        public function setEnabled($enable=true) {
+            $this->enabled = $enable;
+        }
+
+        public function isEnabled() {
+            return $this->enabled;
+        }
 }
 
 ?>

Spacing +31 added lines, -31 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.
@@ -66,11 +66,11 @@ 
     /**
      * Monitor constructor
      */
-    public function __construct($name='', $monitorId='', $metadata='', $store='') {
+    public function __construct($name = '', $monitorId = '', $metadata = '', $store = '') {
 
-    	if(empty($metadata) || !file_exists($metadata)) {
-    	   $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING'] . "($metadata)");
-    	   throw new Exception($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING'] . "($metadata)");
+    	if (empty($metadata) || !file_exists($metadata)) {
+    	   $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING']."($metadata)");
+    	   throw new Exception($GLOBALS['app_strings']['ERR_MONITOR_FILE_MISSING']."($metadata)");
     	}
 
     	$this->name = $name;
@@ -80,11 +80,11 @@ 
     	$fields = $dictionary[$this->name]['fields'];
     	$this->table_name = !empty($dictionary[$this->name]['table']) ? $dictionary[$this->name]['table'] : $this->name;
     	$this->metrics = array();
-    	foreach($fields as $field) {
+    	foreach ($fields as $field) {
 
     	   //We need to skip auto_increment fields; they are not real metrics
     	   //since they are generated by the database.
-    	   if(isset($field['auto_increment'])) {
+    	   if (isset($field['auto_increment'])) {
     	   	  continue;
     	   }
 
@@ -96,7 +96,7 @@ 
     	$this->monitor_id = $monitorId;
     	$this->stores = $store;
 
-    	if(isset($this->metrics['session_id'])) {
+    	if (isset($this->metrics['session_id'])) {
 	 		//set the value of the session id for 2 reasons:
 	 		//1) it is the same value no matter where it is set
 	 		//2) ensure it follows some filter rules.
@@ -107,9 +107,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function Monitor($name='', $monitorId='', $metadata='', $store=''){
+	public function Monitor($name = '', $monitorId = '', $metadata = '', $store = '') {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -126,16 +126,16 @@ 
      * @throws Exception Thrown if metric name is not configured for monitor instance
      */
     public function setValue($name, $value) {
-        if(!isset($this->metrics[$name])) {
-          $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC'] . "($name)");
-          throw new Exception($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC'] . "($name)");
-        } else if($this->metrics[$name]->isMutable()) {
+        if (!isset($this->metrics[$name])) {
+          $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC']."($name)");
+          throw new Exception($GLOBALS['app_strings']['ERR_UNDEFINED_METRIC']."($name)");
+        } else if ($this->metrics[$name]->isMutable()) {
           $this->$name = is_object($value) ? get_class($value) : $value;
           $this->dirty = true;
         }
     }
 
-    public function getValue($name){
+    public function getValue($name) {
     	return $this->$name;
     }
 
@@ -162,7 +162,7 @@ 
 	 * Returns if the monitor has data that needs to be saved
 	 * @return $dirty boolean
 	 */
-	function isDirty(){
+	function isDirty() {
 		return $this->dirty;
 	}
 
@@ -172,15 +172,15 @@ 
      * the flush method passing with the montior ($this) instance.
      * @param $flush boolean parameter indicating whether or not to flush the instance data to store or possibly cache
      */
-    public function save($flush=true) {
+    public function save($flush = true) {
     	//If the monitor is not enabled, do not save
-    	if(!$this->isEnabled()&&$this->name!='tracker_sessions')return false;
+    	if (!$this->isEnabled() && $this->name != 'tracker_sessions')return false;
 
     	//if the monitor does not have values set no need to do the work saving.
-    	if(!$this->dirty)return false;
+    	if (!$this->dirty)return false;
 
-    	if(empty($GLOBALS['tracker_' . $this->table_name])) {
-    	    foreach($this->stores as $s) {
+    	if (empty($GLOBALS['tracker_'.$this->table_name])) {
+    	    foreach ($this->stores as $s) {
 	    		$store = $this->getStore($s);
 	    		$store->flush($this);
     		}
@@ -194,8 +194,8 @@ 
 	 */
 	public function clear() {
 	    $metrics = $this->getMetrics();
-	    foreach($metrics as $name=>$metric) {
-	    	    if($metric->isMutable()) {
+	    foreach ($metrics as $name=>$metric) {
+	    	    if ($metric->isMutable()) {
                    $this->$name = '';
 	    	    }
 	    }
@@ -213,13 +213,13 @@ 
 	 */
 	protected function getStore($store) {
 
-		if(isset($this->cachedStores[$store])) {
+		if (isset($this->cachedStores[$store])) {
 		   return $this->cachedStores[$store];
 		}
 
-        if(!file_exists("modules/Trackers/store/$store.php")) {
-           $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING'] . "($store)");
-           throw new Exception($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING'] . "($store)");
+        if (!file_exists("modules/Trackers/store/$store.php")) {
+           $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING']."($store)");
+           throw new Exception($GLOBALS['app_strings']['ERR_STORE_FILE_MISSING']."($store)");
         }
 
 		require_once("modules/Trackers/store/$store.php");
@@ -228,9 +228,9 @@ 
 		return $s;
 	}
 
- 	public function getSessionId(){
+ 	public function getSessionId() {
  		$sessionid = session_id();
-	    if(!empty($sessionid) && strlen($sessionid) > MAX_SESSION_LENGTH) {
+	    if (!empty($sessionid) && strlen($sessionid) > MAX_SESSION_LENGTH) {
 	       $sessionid = md5($sessionid);
 	    }
 	    return $sessionid;
@@ -243,13 +243,13 @@ 
  	public function toArray() {
  		$to_arr = array();
  		$metrics = $this->getMetrics();
-	    foreach($metrics as $name=>$metric) {
+	    foreach ($metrics as $name=>$metric) {
 	    	    $to_arr[$name] = isset($this->$name) ? $this->$name : null;
 	    }
 	    return $to_arr;
  	}
 
- 	public function setEnabled($enable=true) {
+ 	public function setEnabled($enable = true) {
  		$this->enabled = $enable;
  	}
 

Braces +10 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.
@@ -111,8 +113,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct($name, $monitorId, $metadata, $store);
@@ -174,10 +175,14 @@ 
      */
     public function save($flush=true) {
     	//If the monitor is not enabled, do not save
-    	if(!$this->isEnabled()&&$this->name!='tracker_sessions')return false;
+    	if(!$this->isEnabled()&&$this->name!='tracker_sessions') {
+    	    return false;
+    	}
 
     	//if the monitor does not have values set no need to do the work saving.
-    	if(!$this->dirty)return false;
+    	if(!$this->dirty) {
+    	    return false;
+    	}
 
     	if(empty($GLOBALS['tracker_' . $this->table_name])) {
     	    foreach($this->stores as $s) {

modules/Trackers/monitor/tracker_monitor.php

Spacing +9 added lines, -9 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.
@@ -46,16 +46,16 @@ 
     /**
      * Monitor constructor
      */
-    public function __construct($name='', $monitorId='', $metadata='', $store='') {
+    public function __construct($name = '', $monitorId = '', $metadata = '', $store = '') {
         parent::__construct($name, $monitorId, $metadata, $store);
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function tracker_monitor($name='', $monitorId='', $metadata='', $store=''){
+    public function tracker_monitor($name = '', $monitorId = '', $metadata = '', $store = '') {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -72,16 +72,16 @@ 
      * the flush method passing with the montior ($this) instance.
      * @param $flush boolean parameter indicating whether or not to flush the instance data to store or possibly cache
      */
-    public function save($flush=true) {
+    public function save($flush = true) {
     	//if the monitor does not have values set no need to do the work saving.
-    	if(!$this->dirty)return false;
+    	if (!$this->dirty)return false;
 
-    	if(!$this->isEnabled() && (isset($this->visible) && !$this->getValue('visible'))) {
+    	if (!$this->isEnabled() && (isset($this->visible) && !$this->getValue('visible'))) {
     		return false;
     	}
 
-    	if(empty($GLOBALS['tracker_' . $this->table_name])) {
-    	    foreach($this->stores as $s) {
+    	if (empty($GLOBALS['tracker_'.$this->table_name])) {
+    	    foreach ($this->stores as $s) {
 	    		$store = $this->getStore($s);
 	    		$store->flush($this);
     		}

Braces +7 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -57,8 +59,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($name, $monitorId, $metadata, $store);
@@ -74,7 +75,9 @@ 
      */
     public function save($flush=true) {
     	//if the monitor does not have values set no need to do the work saving.
-    	if(!$this->dirty)return false;
+    	if(!$this->dirty) {
+    	    return false;
+    	}
 
     	if(!$this->isEnabled() && (isset($this->visible) && !$this->getValue('visible'))) {
     		return false;

modules/Trackers/monitor/BlankMonitor.php

Indentation +32 added lines, -32 removed lines

@@ -53,19 +53,19 @@ 
     }
 
 
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function BlankMonitor(){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function BlankMonitor(){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
 
     /**
      * setValue
@@ -93,7 +93,7 @@ 
      * @return Array of metric instances defined for monitor instance
      */
     function getMetrics() {
-    	return null;
+        return null;
     }
 
     /**
@@ -107,27 +107,27 @@ 
     }
 
 
-	/**
-	 * getStore
-	 * This method checks if the Store implementation has already been instantiated and
-	 * will return the one stored; otherwise it will create the Store implementation and
-	 * save it to the Array of Stores.
-	 * @param $store The name of the store as defined in the 'modules/Trackers/config.php' settings
-	 * @return An instance of a Store implementation
-	 * @throws Exception Thrown if $store class cannot be loaded
-	 */
-	protected function getStore($store) {
-		return null;
-	}
+    /**
+     * getStore
+     * This method checks if the Store implementation has already been instantiated and
+     * will return the one stored; otherwise it will create the Store implementation and
+     * save it to the Array of Stores.
+     * @param $store The name of the store as defined in the 'modules/Trackers/config.php' settings
+     * @return An instance of a Store implementation
+     * @throws Exception Thrown if $store class cannot be loaded
+     */
+    protected function getStore($store) {
+        return null;
+    }
 
 
-	/**
-	 * clear
-	 * This function clears the metrics data in the monitor instance
-	 */
-	public function clear() {
+    /**
+     * clear
+     * This function clears the metrics data in the monitor instance
+     */
+    public function clear() {
 
-	}
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +3 added lines, -3 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.
@@ -56,9 +56,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function BlankMonitor(){
+	public function BlankMonitor() {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {

modules/Trackers/BreadCrumbStack.php

Indentation +205 added lines, -205 removed lines

@@ -41,231 +41,231 @@
 
 class BreadCrumbStack {
 
-   /**
-	* Maintain an ordered list of items in the breadcrumbs
-	*
-	* @var unknown_type
-	*/
-   private $stack;
-   /**
-    * Maps an item_id to the position index in stack
-    *
-    * @var unknown_type
-    */
-   private $stackMap;
-   /**
-    * Boolean flag to determine whether or not entries not visible should be removed
-    *
-    * @var
-    */
-   private $deleteInvisible = false;
+    /**
+     * Maintain an ordered list of items in the breadcrumbs
+     *
+     * @var unknown_type
+     */
+    private $stack;
+    /**
+     * Maps an item_id to the position index in stack
+     *
+     * @var unknown_type
+     */
+    private $stackMap;
+    /**
+     * Boolean flag to determine whether or not entries not visible should be removed
+     *
+     * @var
+     */
+    private $deleteInvisible = false;
 
 
-   /**
-    * BreadCrumbStack
-    * Constructor for BreadCrumbStack that builds list of breadcrumbs using tracker table
-    *
-    * @param $user_id String value of user id to get bread crumb items for
-    * @param $modules mixed value of module name(s) to provide extra filtering
-    */
-   public function __construct($user_id, $modules='') {
-      $this->stack = array();
-      $this->stackMap = array();
+    /**
+     * BreadCrumbStack
+     * Constructor for BreadCrumbStack that builds list of breadcrumbs using tracker table
+     *
+     * @param $user_id String value of user id to get bread crumb items for
+     * @param $modules mixed value of module name(s) to provide extra filtering
+     */
+    public function __construct($user_id, $modules='') {
+        $this->stack = array();
+        $this->stackMap = array();
 
-      $admin = new Administration();
-	  $admin->retrieveSettings('tracker');
+        $admin = new Administration();
+        $admin->retrieveSettings('tracker');
 
-      $this->deleteInvisible = !empty($admin->settings['tracker_Tracker']);
-      $db = DBManagerFactory::getInstance();
+        $this->deleteInvisible = !empty($admin->settings['tracker_Tracker']);
+        $db = DBManagerFactory::getInstance();
 
-      $module_query = '';
-      if(!empty($modules)) {
-      	 $history_max_viewed = 10;
-         $module_query = is_array($modules) ? ' AND module_name IN (\'' . implode("','" , $modules) . '\')' :  ' AND module_name = \'' . $modules . '\'';
-      } else {
-      	 $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
-      }
+        $module_query = '';
+        if(!empty($modules)) {
+            $history_max_viewed = 10;
+            $module_query = is_array($modules) ? ' AND module_name IN (\'' . implode("','" , $modules) . '\')' :  ' AND module_name = \'' . $modules . '\'';
+        } else {
+            $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
+        }
 
-      $query = 'SELECT distinct item_id AS item_id, id, item_summary, module_name, monitor_id, date_modified FROM tracker WHERE user_id = \'' . $user_id . '\' AND deleted = 0 AND visible = 1 ' . $module_query . ' ORDER BY date_modified DESC';
-      $result = $db->limitQuery($query, 0, $history_max_viewed);
-      $items = array();
-      while(($row = $db->fetchByAssoc($result))) {
-      		$items[] = $row;
-      }
-      $items = array_reverse($items);
-      foreach($items as $item) {
-      	  $this->push($item);
-      }
-   }
+        $query = 'SELECT distinct item_id AS item_id, id, item_summary, module_name, monitor_id, date_modified FROM tracker WHERE user_id = \'' . $user_id . '\' AND deleted = 0 AND visible = 1 ' . $module_query . ' ORDER BY date_modified DESC';
+        $result = $db->limitQuery($query, 0, $history_max_viewed);
+        $items = array();
+        while(($row = $db->fetchByAssoc($result))) {
+                $items[] = $row;
+        }
+        $items = array_reverse($items);
+        foreach($items as $item) {
+            $this->push($item);
+        }
+    }
 
-	/**
-	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
-	 */
-	public function BreadCrumbStack($user_id, $modules=''){
-		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
-			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct($user_id, $modules);
-	}
+    /**
+     * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
+     */
+    public function BreadCrumbStack($user_id, $modules=''){
+        $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
+        if(isset($GLOBALS['log'])) {
+            $GLOBALS['log']->deprecated($deprecatedMessage);
+        }
+        else {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct($user_id, $modules);
+    }
 
-   /**
-    * contains
-    * Returns true if the stack contains the specified item_id, false otherwise.
-    *
-    * @param item_id the item id to search for
-    * @return id of the first item on the stack
-    */
-   public function contains($item_id) {
-   	  	if(!empty($this->stackMap)){
-   	  		return array_key_exists($item_id, $this->stackMap);
-   	  	}else
-   	  		return false;
-   }
+    /**
+     * contains
+     * Returns true if the stack contains the specified item_id, false otherwise.
+     *
+     * @param item_id the item id to search for
+     * @return id of the first item on the stack
+     */
+    public function contains($item_id) {
+                if(!empty($this->stackMap)){
+                    return array_key_exists($item_id, $this->stackMap);
+                }else
+                    return false;
+    }
 
-   /**
-    * Push an element onto the stack.
-    * This will only maintain a list of unique item_ids, if an item_id is found to
-    * already exist in the stack, we want to remove it and update the database to reflect it's
-    * visibility.
-    *
-    * @param array $row - a trackable item to store in memory
-    */
-   public function push($row) {
-   	  if(is_array($row) && !empty($row['item_id'])) {
-	   	  if($this->contains($row['item_id'])) {
-			//if this item already exists in the stack then update the found items
-			//to visible = 0 and add our new item to the stack
-			$item = $this->stack[$this->stackMap[$row['item_id']]];
-	   	  	if(!empty($item['id']) && $row['id'] != $item['id']){
-	   	  		$this->makeItemInvisible($item['id'], 0);
-	   	  	}
-	   	  	$this->popItem($item['item_id']);
-	   	  }
-	   	  //If we reach the max count, shift the first element off the stack
-	   	  $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
+    /**
+     * Push an element onto the stack.
+     * This will only maintain a list of unique item_ids, if an item_id is found to
+     * already exist in the stack, we want to remove it and update the database to reflect it's
+     * visibility.
+     *
+     * @param array $row - a trackable item to store in memory
+     */
+    public function push($row) {
+            if(is_array($row) && !empty($row['item_id'])) {
+                if($this->contains($row['item_id'])) {
+            //if this item already exists in the stack then update the found items
+            //to visible = 0 and add our new item to the stack
+            $item = $this->stack[$this->stackMap[$row['item_id']]];
+                    if(!empty($item['id']) && $row['id'] != $item['id']){
+                        $this->makeItemInvisible($item['id'], 0);
+                    }
+                    $this->popItem($item['item_id']);
+                }
+                //If we reach the max count, shift the first element off the stack
+                $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
 
-	   	  if($this->length() >= $history_max_viewed) {
-	   	  	$this->pop();
-	   	  }
-	   	  //Push the element into the stack
-	   	  $this->addItem($row);
-   	  }
-   }
+                if($this->length() >= $history_max_viewed) {
+                    $this->pop();
+                }
+                //Push the element into the stack
+                $this->addItem($row);
+            }
+    }
 
-   /**
-    * Pop an item off the stack
-    *
-    */
-   public function pop(){
-   		$item = array_shift($this->stack);
-   		if(!empty($item['item_id']) && isset($this->stackMap[$item['item_id']])){
-   			unset($this->stackMap[$item['item_id']]);
-   			$this->heal();
-   		}
-   }
+    /**
+     * Pop an item off the stack
+     *
+     */
+    public function pop(){
+            $item = array_shift($this->stack);
+            if(!empty($item['item_id']) && isset($this->stackMap[$item['item_id']])){
+                unset($this->stackMap[$item['item_id']]);
+                $this->heal();
+            }
+    }
 
-   /**
-    * Change the visibility of an item
-    *
-    * @param int $id
-    */
-   private function makeItemInvisible($id){
-   	    if($this->deleteInvisible) {
-   	      $query = "DELETE FROM tracker where id = '{$id}'";
-   	    } else {
-   		  $query = "UPDATE tracker SET visible = 0 WHERE id = '{$id}'";
-   	    }
+    /**
+     * Change the visibility of an item
+     *
+     * @param int $id
+     */
+    private function makeItemInvisible($id){
+            if($this->deleteInvisible) {
+                $query = "DELETE FROM tracker where id = '{$id}'";
+            } else {
+                $query = "UPDATE tracker SET visible = 0 WHERE id = '{$id}'";
+            }
         $GLOBALS['db']->query($query, true);
-   }
+    }
 
-   /**
-    * Pop an Item off the stack. Call heal to reconstruct the indices properly
-    *
-    * @param string $item_id - the item id to remove from the stack
-    */
-   public function popItem($item_id){
-   		if(isset($this->stackMap[$item_id])){
-   			$idx = $this->stackMap[$item_id];
-	   		unset($this->stack[$idx]);
-	   		unset($this->stackMap[$item_id]);
-	   		$this->heal();
-   		}
-   }
+    /**
+     * Pop an Item off the stack. Call heal to reconstruct the indices properly
+     *
+     * @param string $item_id - the item id to remove from the stack
+     */
+    public function popItem($item_id){
+            if(isset($this->stackMap[$item_id])){
+                $idx = $this->stackMap[$item_id];
+                unset($this->stack[$idx]);
+                unset($this->stackMap[$item_id]);
+                $this->heal();
+            }
+    }
 
-   /**
-    * Add an item to the stack
-    *
-    * @param array $row - the row from the db query
-    */
-   private function addItem($row){
-   		$this->stack[] = $row;
-   		$this->stackMap[$row['item_id']] = ($this->length() - 1);
-   }
+    /**
+     * Add an item to the stack
+     *
+     * @param array $row - the row from the db query
+     */
+    private function addItem($row){
+            $this->stack[] = $row;
+            $this->stackMap[$row['item_id']] = ($this->length() - 1);
+    }
 
-   /**
-    * Once we have removed an item from the stack we need to be sure to have the
-    * ids and indices match up properly.  Heal takes care of that.  This method should only
-    * be called when an item_id is already in the stack and needs to be removed
-    *
-    */
-   private function heal(){
-   		$vals = array_values($this->stack);
-   		$this->stack = array();
-   		$this->stackMap = array();
-   		foreach($vals as $key => $val){
-   			$this->addItem($val);
-   		}
-   }
+    /**
+     * Once we have removed an item from the stack we need to be sure to have the
+     * ids and indices match up properly.  Heal takes care of that.  This method should only
+     * be called when an item_id is already in the stack and needs to be removed
+     *
+     */
+    private function heal(){
+            $vals = array_values($this->stack);
+            $this->stack = array();
+            $this->stackMap = array();
+            foreach($vals as $key => $val){
+                $this->addItem($val);
+            }
+    }
 
-   /**
-    * Return the number of elements in the stack
-    *
-    * @return int - the number of elements in the stack
-    */
-   public function length(){
-   		return count($this->stack);
-   }
+    /**
+     * Return the number of elements in the stack
+     *
+     * @return int - the number of elements in the stack
+     */
+    public function length(){
+            return count($this->stack);
+    }
 
-   /**
-    * Return the list of breadcrubmbs currently in memory
-    *
-    * @return array of breadcrumbs
-    */
-   public function getBreadCrumbList($filter_module='') {
-   	  if(!empty($filter_module)) {
-   	  	 $s2 = array();
-   	  	 if(is_array($filter_module)) {
-   	  	 	 foreach($this->stack as $entry) {
-	   	  	    if(in_array($entry['module_name'], $filter_module)) {
-	   	  	       $s2[$entry['item_id']] = $entry;
-	   	  	    }
-	   	  	 }
-   	  	 } else {
-	   	  	 foreach($this->stack as $entry) {
-	   	  	    if($entry['module_name'] == $filter_module) {
-	   	  	       $s2[$entry['item_id']] = $entry;
-	   	  	    }
-	   	  	 }
-   	  	 }
+    /**
+     * Return the list of breadcrubmbs currently in memory
+     *
+     * @return array of breadcrumbs
+     */
+    public function getBreadCrumbList($filter_module='') {
+            if(!empty($filter_module)) {
+                $s2 = array();
+                if(is_array($filter_module)) {
+                    foreach($this->stack as $entry) {
+                        if(in_array($entry['module_name'], $filter_module)) {
+                        $s2[$entry['item_id']] = $entry;
+                        }
+                    }
+                } else {
+                    foreach($this->stack as $entry) {
+                        if($entry['module_name'] == $filter_module) {
+                        $s2[$entry['item_id']] = $entry;
+                        }
+                    }
+                }
 
-   	  	 $s2 = array_reverse($s2);
-   	     if(count($s2) > 10) {
-   	  	 	$s2 = array_slice($s2, 0, 10);
-   	  	 }
-   	  	 return $s2;
-   	  }
+                $s2 = array_reverse($s2);
+            if(count($s2) > 10) {
+                    $s2 = array_slice($s2, 0, 10);
+                }
+                return $s2;
+            }
 
-   	  $s = $this->stack;
-   	  $s = array_reverse($s);
-   	  if(count($s) > 10) {
-   	  	 $s = array_slice($s, 0, 10);
-   	  }
-      return $s;
-   }
+            $s = $this->stack;
+            $s = array_reverse($s);
+            if(count($s) > 10) {
+                $s = array_slice($s, 0, 10);
+            }
+        return $s;
+    }
 }
 
 ?>

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
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -68,7 +68,7 @@ 
     * @param $user_id String value of user id to get bread crumb items for
     * @param $modules mixed value of module name(s) to provide extra filtering
     */
-   public function __construct($user_id, $modules='') {
+   public function __construct($user_id, $modules = '') {
       $this->stack = array();
       $this->stackMap = array();
 
@@ -79,21 +79,21 @@ 
       $db = DBManagerFactory::getInstance();
 
       $module_query = '';
-      if(!empty($modules)) {
+      if (!empty($modules)) {
       	 $history_max_viewed = 10;
-         $module_query = is_array($modules) ? ' AND module_name IN (\'' . implode("','" , $modules) . '\')' :  ' AND module_name = \'' . $modules . '\'';
+         $module_query = is_array($modules) ? ' AND module_name IN (\''.implode("','", $modules).'\')' : ' AND module_name = \''.$modules.'\'';
       } else {
-      	 $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
+      	 $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed'])) ? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
       }
 
-      $query = 'SELECT distinct item_id AS item_id, id, item_summary, module_name, monitor_id, date_modified FROM tracker WHERE user_id = \'' . $user_id . '\' AND deleted = 0 AND visible = 1 ' . $module_query . ' ORDER BY date_modified DESC';
+      $query = 'SELECT distinct item_id AS item_id, id, item_summary, module_name, monitor_id, date_modified FROM tracker WHERE user_id = \''.$user_id.'\' AND deleted = 0 AND visible = 1 '.$module_query.' ORDER BY date_modified DESC';
       $result = $db->limitQuery($query, 0, $history_max_viewed);
       $items = array();
-      while(($row = $db->fetchByAssoc($result))) {
+      while (($row = $db->fetchByAssoc($result))) {
       		$items[] = $row;
       }
       $items = array_reverse($items);
-      foreach($items as $item) {
+      foreach ($items as $item) {
       	  $this->push($item);
       }
    }
@@ -101,9 +101,9 @@ 
 	/**
 	 * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
 	 */
-	public function BreadCrumbStack($user_id, $modules=''){
+	public function BreadCrumbStack($user_id, $modules = '') {
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-		if(isset($GLOBALS['log'])) {
+		if (isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
 		}
 		else {
@@ -120,9 +120,9 @@ 
     * @return id of the first item on the stack
     */
    public function contains($item_id) {
-   	  	if(!empty($this->stackMap)){
+   	  	if (!empty($this->stackMap)) {
    	  		return array_key_exists($item_id, $this->stackMap);
-   	  	}else
+   	  	} else
    	  		return false;
    }
 
@@ -135,20 +135,20 @@ 
     * @param array $row - a trackable item to store in memory
     */
    public function push($row) {
-   	  if(is_array($row) && !empty($row['item_id'])) {
-	   	  if($this->contains($row['item_id'])) {
+   	  if (is_array($row) && !empty($row['item_id'])) {
+	   	  if ($this->contains($row['item_id'])) {
 			//if this item already exists in the stack then update the found items
 			//to visible = 0 and add our new item to the stack
 			$item = $this->stack[$this->stackMap[$row['item_id']]];
-	   	  	if(!empty($item['id']) && $row['id'] != $item['id']){
+	   	  	if (!empty($item['id']) && $row['id'] != $item['id']) {
 	   	  		$this->makeItemInvisible($item['id'], 0);
 	   	  	}
 	   	  	$this->popItem($item['item_id']);
 	   	  }
 	   	  //If we reach the max count, shift the first element off the stack
-	   	  $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
+	   	  $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed'])) ? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
 
-	   	  if($this->length() >= $history_max_viewed) {
+	   	  if ($this->length() >= $history_max_viewed) {
 	   	  	$this->pop();
 	   	  }
 	   	  //Push the element into the stack
@@ -160,9 +160,9 @@ 
     * Pop an item off the stack
     *
     */
-   public function pop(){
+   public function pop() {
    		$item = array_shift($this->stack);
-   		if(!empty($item['item_id']) && isset($this->stackMap[$item['item_id']])){
+   		if (!empty($item['item_id']) && isset($this->stackMap[$item['item_id']])) {
    			unset($this->stackMap[$item['item_id']]);
    			$this->heal();
    		}
@@ -173,8 +173,8 @@ 
     *
     * @param int $id
     */
-   private function makeItemInvisible($id){
-   	    if($this->deleteInvisible) {
+   private function makeItemInvisible($id) {
+   	    if ($this->deleteInvisible) {
    	      $query = "DELETE FROM tracker where id = '{$id}'";
    	    } else {
    		  $query = "UPDATE tracker SET visible = 0 WHERE id = '{$id}'";
@@ -187,8 +187,8 @@ 
     *
     * @param string $item_id - the item id to remove from the stack
     */
-   public function popItem($item_id){
-   		if(isset($this->stackMap[$item_id])){
+   public function popItem($item_id) {
+   		if (isset($this->stackMap[$item_id])) {
    			$idx = $this->stackMap[$item_id];
 	   		unset($this->stack[$idx]);
 	   		unset($this->stackMap[$item_id]);
@@ -201,7 +201,7 @@ 
     *
     * @param array $row - the row from the db query
     */
-   private function addItem($row){
+   private function addItem($row) {
    		$this->stack[] = $row;
    		$this->stackMap[$row['item_id']] = ($this->length() - 1);
    }
@@ -212,11 +212,11 @@ 
     * be called when an item_id is already in the stack and needs to be removed
     *
     */
-   private function heal(){
+   private function heal() {
    		$vals = array_values($this->stack);
    		$this->stack = array();
    		$this->stackMap = array();
-   		foreach($vals as $key => $val){
+   		foreach ($vals as $key => $val) {
    			$this->addItem($val);
    		}
    }
@@ -226,7 +226,7 @@ 
     *
     * @return int - the number of elements in the stack
     */
-   public function length(){
+   public function length() {
    		return count($this->stack);
    }
 
@@ -235,25 +235,25 @@ 
     *
     * @return array of breadcrumbs
     */
-   public function getBreadCrumbList($filter_module='') {
-   	  if(!empty($filter_module)) {
+   public function getBreadCrumbList($filter_module = '') {
+   	  if (!empty($filter_module)) {
    	  	 $s2 = array();
-   	  	 if(is_array($filter_module)) {
-   	  	 	 foreach($this->stack as $entry) {
-	   	  	    if(in_array($entry['module_name'], $filter_module)) {
+   	  	 if (is_array($filter_module)) {
+   	  	 	 foreach ($this->stack as $entry) {
+	   	  	    if (in_array($entry['module_name'], $filter_module)) {
 	   	  	       $s2[$entry['item_id']] = $entry;
 	   	  	    }
 	   	  	 }
    	  	 } else {
-	   	  	 foreach($this->stack as $entry) {
-	   	  	    if($entry['module_name'] == $filter_module) {
+	   	  	 foreach ($this->stack as $entry) {
+	   	  	    if ($entry['module_name'] == $filter_module) {
 	   	  	       $s2[$entry['item_id']] = $entry;
 	   	  	    }
 	   	  	 }
    	  	 }
 
    	  	 $s2 = array_reverse($s2);
-   	     if(count($s2) > 10) {
+   	     if (count($s2) > 10) {
    	  	 	$s2 = array_slice($s2, 0, 10);
    	  	 }
    	  	 return $s2;
@@ -261,7 +261,7 @@ 
 
    	  $s = $this->stack;
    	  $s = array_reverse($s);
-   	  if(count($s) > 10) {
+   	  if (count($s) > 10) {
    	  	 $s = array_slice($s, 0, 10);
    	  }
       return $s;

Braces +7 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.
@@ -105,8 +107,7 @@ 
 		$deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
 		if(isset($GLOBALS['log'])) {
 			$GLOBALS['log']->deprecated($deprecatedMessage);
-		}
-		else {
+		} else {
 			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
 		}
 		self::__construct($user_id, $modules);
@@ -122,8 +123,9 @@ 
    public function contains($item_id) {
    	  	if(!empty($this->stackMap)){
    	  		return array_key_exists($item_id, $this->stackMap);
-   	  	}else
-   	  		return false;
+   	  	} else {
+   	  	   	  		return false;
+   	  	}
    }
 
    /**

modules/Trackers/Metric.php

Spacing +3 added lines, -3 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.
@@ -50,9 +50,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function Metric($type, $name){
+    public function Metric($type, $name) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +4 added lines, -3 removed lines

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

modules/Trackers/TrackerManager.php

Spacing +32 added lines, -32 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.
@@ -64,9 +64,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    private function TrackerManager(){
+    private function TrackerManager() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -83,13 +83,13 @@ 
  *
  */
 private function setup() {
-	if(!empty($this->metadata) && empty($GLOBALS['installing'])) {
+	if (!empty($this->metadata) && empty($GLOBALS['installing'])) {
 
 		$admin = new Administration();
 		$admin->retrieveSettings('tracker');
-		foreach($this->metadata as $key=>$entry) {
-		   if(isset($entry['bean'])) {
-		   	  if(!empty($admin->settings['tracker_'. $entry['name']])) {
+		foreach ($this->metadata as $key=>$entry) {
+		   if (isset($entry['bean'])) {
+		   	  if (!empty($admin->settings['tracker_'.$entry['name']])) {
 		   	  	 $this->disabledMonitors[$entry['name']] = true;
 		   	  }
 		   }
@@ -99,7 +99,7 @@ 
 
 public function setMonitorId($id) {
     self::$monitor_id = $id;
-    foreach($this->monitors as $monitor) {
+    foreach ($this->monitors as $monitor) {
        $monitor->monitor_id = self::$monitor_id;
     }
 }
@@ -118,7 +118,7 @@ 
  * Singleton method to return static instance of TrackerManager
  * @returns static TrackerManager instance
  */
-static function getInstance(){
+static function getInstance() {
     if (!isset(self::$instance)) {
         self::$instance = new TrackerManager();
 		//Set global variable for tracker monitor instances that are disabled
@@ -135,12 +135,12 @@ 
  */
 public function getMonitor($name) {
 	//don't waste our time on disabled monitors
-	if($name!='tracker_sessions' && !empty($this->disabledMonitors[$name]))return false;
-	if(isset($this->monitors[$name])) {
+	if ($name != 'tracker_sessions' && !empty($this->disabledMonitors[$name]))return false;
+	if (isset($this->monitors[$name])) {
 	   return $this->monitors[$name];
 	}
 
-	if(isset($this->metadata) && isset($this->metadata[$name])) {
+	if (isset($this->metadata) && isset($this->metadata[$name])) {
 
 
        try {
@@ -151,7 +151,7 @@ 
 	                               );
 	       $this->monitors[$name] = $instance;
 	       return $this->monitors[$name];
-       } catch (Exception $ex) {
+       }catch (Exception $ex) {
        	   $GLOBALS['log']->error($ex->getMessage());
        	   $GLOBALS['log']->error($ex->getTraceAsString());
        	   require_once('modules/Trackers/monitor/BlankMonitor.php');
@@ -160,27 +160,27 @@ 
        }
 
     } else {
-       $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_MONITOR_NOT_CONFIGURED'] . "($name)");
+       $GLOBALS['log']->error($GLOBALS['app_strings']['ERR_MONITOR_NOT_CONFIGURED']."($name)");
        require_once('modules/Trackers/monitor/BlankMonitor.php');
        $this->monitors[$name] = new BlankMonitor();
        return $this->monitors[$name];
     }
 }
 
-private function _getMonitor($name='', $monitorId='', $metadata='', $store=''){
+private function _getMonitor($name = '', $monitorId = '', $metadata = '', $store = '') {
 	$class = strtolower($name.'_monitor');
 	$monitor = null;
-	if(file_exists('custom/modules/Trackers/monitor/'.$class.'.php')){
+	if (file_exists('custom/modules/Trackers/monitor/'.$class.'.php')) {
 		require_once('custom/modules/Trackers/monitor/'.$class.'.php');
-		if(class_exists($class)){
+		if (class_exists($class)) {
 			$monitor = new $class($name, $monitorId, $metadata, $store);
 		}
-	}elseif(file_exists('modules/Trackers/monitor/'.$class.'.php')){
+	}elseif (file_exists('modules/Trackers/monitor/'.$class.'.php')) {
 		require_once('modules/Trackers/monitor/'.$class.'.php');
-		if(class_exists($class)){
+		if (class_exists($class)) {
 			$monitor = new $class($name, $monitorId, $metadata, $store);
 		}
-	}else{
+	} else {
 		$monitor = new Monitor($name, $monitorId, $metadata, $store);
 	}
 
@@ -196,14 +196,14 @@ 
 public function save() {
 
     // Session tracker always saves.
-    if ( isset($this->monitors['tracker_sessions']) ) {
+    if (isset($this->monitors['tracker_sessions'])) {
         $this->monitors['tracker_sessions']->save();
         unset($this->monitors['tracker_sessions']);
     }
 
-    if(!$this->isPaused()){
-		foreach($this->monitors as $monitor) {
-			if(array_key_exists('Trackable', class_implements($monitor))) {
+    if (!$this->isPaused()) {
+		foreach ($this->monitors as $monitor) {
+			if (array_key_exists('Trackable', class_implements($monitor))) {
 			   $monitor->save();
 		    }
     	}
@@ -215,15 +215,15 @@ 
  * Saves the monitor instance and then clears it
  * If ignoreDisabled is set the ignore the fact of this monitor being disabled
  */
-public function saveMonitor($monitor, $flush=true, $ignoreDisabled = false) {
+public function saveMonitor($monitor, $flush = true, $ignoreDisabled = false) {
 
-	if(!$this->isPaused() && !empty($monitor)){
+	if (!$this->isPaused() && !empty($monitor)) {
 
-		if((empty($this->disabledMonitors[$monitor->name]) || $ignoreDisabled) && array_key_exists('Trackable', class_implements($monitor))) {
+		if ((empty($this->disabledMonitors[$monitor->name]) || $ignoreDisabled) && array_key_exists('Trackable', class_implements($monitor))) {
 
 		   $monitor->save($flush);
 
-		   if($flush) {
+		   if ($flush) {
 			   $monitor->clear();
 			   unset($this->monitors[strtolower($monitor->name)]);
 		   }
@@ -236,7 +236,7 @@ 
  * Method to unset the monitor so that it will not be saved
  */
 public function unsetMonitor($monitor) {
-   if(!empty($monitor)) {
+   if (!empty($monitor)) {
       unset($this->monitors[strtolower($monitor->name)]);
    }
 }
@@ -248,7 +248,7 @@ 
  *
  * Usage: TrackerManager::getInstance()->pauseTracking();
  */
-public function pause(){
+public function pause() {
 	self::$paused = true;
 }
 
@@ -259,7 +259,7 @@ 
  *
  *  * Usage: TrackerManager::getInstance()->unPauseTracking();
  */
-public function unPause(){
+public function unPause() {
 	self::$paused = false;
 }
 
@@ -303,7 +303,7 @@ 
  */
 public function unsetMonitors() {
 	$mons = $this->monitors;
-	foreach($mons as $key=>$m) {
+	foreach ($mons as $key=>$m) {
 		$this->unsetMonitor($m);
 	}
 }

Braces +9 added lines, -6 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.
@@ -68,8 +70,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -135,7 +136,9 @@ 
  */
 public function getMonitor($name) {
 	//don't waste our time on disabled monitors
-	if($name!='tracker_sessions' && !empty($this->disabledMonitors[$name]))return false;
+	if($name!='tracker_sessions' && !empty($this->disabledMonitors[$name])) {
+	    return false;
+	}
 	if(isset($this->monitors[$name])) {
 	   return $this->monitors[$name];
 	}
@@ -175,12 +178,12 @@ 
 		if(class_exists($class)){
 			$monitor = new $class($name, $monitorId, $metadata, $store);
 		}
-	}elseif(file_exists('modules/Trackers/monitor/'.$class.'.php')){
+	} elseif(file_exists('modules/Trackers/monitor/'.$class.'.php')){
 		require_once('modules/Trackers/monitor/'.$class.'.php');
 		if(class_exists($class)){
 			$monitor = new $class($name, $monitorId, $metadata, $store);
 		}
-	}else{
+	} else{
 		$monitor = new Monitor($name, $monitorId, $metadata, $store);
 	}
 

modules/Trackers/Tracker.php

Spacing +20 added lines, -20 removed lines

@@ -39,7 +39,7 @@ 
 
 
 
-if(!class_exists('Tracker')){
+if (!class_exists('Tracker')) {
 
 require_once 'data/SugarBean.php';
 
@@ -68,9 +68,9 @@ 
     function __construct()
     {
         global $dictionary;
-        if(isset($this->module_dir) && isset($this->object_name) && !isset($GLOBALS['dictionary'][$this->object_name])){
+        if (isset($this->module_dir) && isset($this->object_name) && !isset($GLOBALS['dictionary'][$this->object_name])) {
             $path = 'modules/Trackers/vardefs.php';
-            if(defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
+            if (defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
             require_once($path);
         }
         parent::__construct();
@@ -79,9 +79,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function Tracker(){
+    public function Tracker() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -100,25 +100,25 @@ 
     function get_recently_viewed($user_id, $modules = '')
     {
         $path = 'modules/Trackers/BreadCrumbStack.php';
-        if(defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
+        if (defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
         require_once($path);
-        if(empty($_SESSION['breadCrumbs'])) {
+        if (empty($_SESSION['breadCrumbs'])) {
             $breadCrumb = new BreadCrumbStack($user_id, $modules);
             $_SESSION['breadCrumbs'] = $breadCrumb;
             $GLOBALS['log']->info(string_format($GLOBALS['app_strings']['LBL_BREADCRUMBSTACK_CREATED'], array($user_id)));
         } else {
 			$breadCrumb = $_SESSION['breadCrumbs'];
 	        $module_query = '';
-	        if(!empty($modules)) {
+	        if (!empty($modules)) {
 	           $history_max_viewed = 10;
-	           $module_query = is_array($modules) ? ' AND module_name IN (\'' . implode("','" , $modules) . '\')' :  ' AND module_name = \'' . $modules . '\'';
+	           $module_query = is_array($modules) ? ' AND module_name IN (\''.implode("','", $modules).'\')' : ' AND module_name = \''.$modules.'\'';
 	        } else {
-	           $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed']))? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
+	           $history_max_viewed = (!empty($GLOBALS['sugar_config']['history_max_viewed'])) ? $GLOBALS['sugar_config']['history_max_viewed'] : 50;
 	        }
 
-	        $query = 'SELECT item_id, item_summary, module_name, id FROM ' . $this->table_name . ' WHERE id = (SELECT MAX(id) as id FROM ' . $this->table_name . ' WHERE user_id = \'' . $user_id . '\' AND deleted = 0 AND visible = 1' . $module_query . ')';
-	        $result = $this->db->limitQuery($query,0,$history_max_viewed,true,$query);
-	        while(($row = $this->db->fetchByAssoc($result))) {
+	        $query = 'SELECT item_id, item_summary, module_name, id FROM '.$this->table_name.' WHERE id = (SELECT MAX(id) as id FROM '.$this->table_name.' WHERE user_id = \''.$user_id.'\' AND deleted = 0 AND visible = 1'.$module_query.')';
+	        $result = $this->db->limitQuery($query, 0, $history_max_viewed, true, $query);
+	        while (($row = $this->db->fetchByAssoc($result))) {
 	               $breadCrumb->push($row);
 	        }
         }
@@ -133,20 +133,20 @@ 
         $query = "UPDATE $this->table_name SET visible = 0 WHERE item_id = '$item_id' AND visible = 1";
         $this->db->query($query, true);
         $path = 'modules/Trackers/BreadCrumbStack.php';
-        if(defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
+        if (defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
         require_once($path);
-        if(!empty($_SESSION['breadCrumbs'])){
+        if (!empty($_SESSION['breadCrumbs'])) {
             $breadCrumbs = $_SESSION['breadCrumbs'];
             $breadCrumbs->popItem($item_id);
         }
     }
 
-    static function logPage(){
+    static function logPage() {
         $time_on_last_page = 0;
         //no need to calculate it if it is a redirection page
-        if(empty($GLOBALS['app']->headerDisplayed ))return;
-        if(!empty($_SESSION['lpage']))$time_on_last_page = time() - $_SESSION['lpage'];
-        $_SESSION['lpage']=time();
+        if (empty($GLOBALS['app']->headerDisplayed))return;
+        if (!empty($_SESSION['lpage']))$time_on_last_page = time() - $_SESSION['lpage'];
+        $_SESSION['lpage'] = time();
     }
 
 
@@ -154,7 +154,7 @@ 
      * bean_implements
      * Override method to support ACL roles
      */
-    function bean_implements($interface){
+    function bean_implements($interface) {
         return false;
     }
 }

Braces +16 added lines, -7 removed lines

@@ -70,7 +70,9 @@ 
         global $dictionary;
         if(isset($this->module_dir) && isset($this->object_name) && !isset($GLOBALS['dictionary'][$this->object_name])){
             $path = 'modules/Trackers/vardefs.php';
-            if(defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
+            if(defined('TEMPLATE_URL')) {
+                $path = SugarTemplateUtilities::getFilePath($path);
+            }
             require_once($path);
         }
         parent::__construct();
@@ -83,8 +85,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -100,7 +101,9 @@ 
     function get_recently_viewed($user_id, $modules = '')
     {
         $path = 'modules/Trackers/BreadCrumbStack.php';
-        if(defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
+        if(defined('TEMPLATE_URL')) {
+            $path = SugarTemplateUtilities::getFilePath($path);
+        }
         require_once($path);
         if(empty($_SESSION['breadCrumbs'])) {
             $breadCrumb = new BreadCrumbStack($user_id, $modules);
@@ -133,7 +136,9 @@ 
         $query = "UPDATE $this->table_name SET visible = 0 WHERE item_id = '$item_id' AND visible = 1";
         $this->db->query($query, true);
         $path = 'modules/Trackers/BreadCrumbStack.php';
-        if(defined('TEMPLATE_URL'))$path = SugarTemplateUtilities::getFilePath($path);
+        if(defined('TEMPLATE_URL')) {
+            $path = SugarTemplateUtilities::getFilePath($path);
+        }
         require_once($path);
         if(!empty($_SESSION['breadCrumbs'])){
             $breadCrumbs = $_SESSION['breadCrumbs'];
@@ -144,8 +149,12 @@ 
     static function logPage(){
         $time_on_last_page = 0;
         //no need to calculate it if it is a redirection page
-        if(empty($GLOBALS['app']->headerDisplayed ))return;
-        if(!empty($_SESSION['lpage']))$time_on_last_page = time() - $_SESSION['lpage'];
+        if(empty($GLOBALS['app']->headerDisplayed )) {
+            return;
+        }
+        if(!empty($_SESSION['lpage'])) {
+            $time_on_last_page = time() - $_SESSION['lpage'];
+        }
         $_SESSION['lpage']=time();
     }
 

modules/SugarFeed/SugarFeed.php

Spacing +125 added lines, -125 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-2012 SugarCRM Inc.
@@ -59,16 +59,16 @@ 
 		var $assigned_user_name;
 		var $assigned_user_link;
 
-	function __construct(){
+	function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SugarFeed(){
+    function SugarFeed() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -78,78 +78,78 @@ 
     }
 
 
-    static function activateModuleFeed( $module, $updateDB = true ) {
-        if ( $module != 'UserFeed' ) {
+    static function activateModuleFeed($module, $updateDB = true) {
+        if ($module != 'UserFeed') {
             // UserFeed is a fake module, used for the user postings to the feed
             // Don't try to load up any classes for it
             $fileList = SugarFeed::getModuleFeedFiles($module);
 
-            foreach ( $fileList as $fileName ) {
-                $feedClass = substr(basename($fileName),0,-4);
+            foreach ($fileList as $fileName) {
+                $feedClass = substr(basename($fileName), 0, -4);
 
                 require_once($fileName);
                 $tmpClass = new $feedClass();
-                $tmpClass->installHook($fileName,$feedClass);
+                $tmpClass->installHook($fileName, $feedClass);
             }
         }
-        if ( $updateDB == true ) {
+        if ($updateDB == true) {
 
             $admin = new Administration();
-            $admin->saveSetting('sugarfeed','module_'.$admin->db->quote($module),'1');
+            $admin->saveSetting('sugarfeed', 'module_'.$admin->db->quote($module), '1');
         }
     }
 
-    static function disableModuleFeed( $module, $updateDB = true ) {
-        if ( $module != 'UserFeed' ) {
+    static function disableModuleFeed($module, $updateDB = true) {
+        if ($module != 'UserFeed') {
             // UserFeed is a fake module, used for the user postings to the feed
             // Don't try to load up any classes for it
             $fileList = SugarFeed::getModuleFeedFiles($module);
 
-            foreach ( $fileList as $fileName ) {
-                $feedClass = substr(basename($fileName),0,-4);
+            foreach ($fileList as $fileName) {
+                $feedClass = substr(basename($fileName), 0, -4);
 
                 require_once($fileName);
                 $tmpClass = new $feedClass();
-                $tmpClass->removeHook($fileName,$feedClass);
+                $tmpClass->removeHook($fileName, $feedClass);
             }
         }
 
-        if ( $updateDB == true ) {
+        if ($updateDB == true) {
 
             $admin = new Administration();
-            $admin->saveSetting('sugarfeed','module_'.$admin->db->quote($module),'0');
+            $admin->saveSetting('sugarfeed', 'module_'.$admin->db->quote($module), '0');
         }
     }
 
     static function flushBackendCache( ) {
         // This function will flush the cache files used for the module list and the link type lists
         sugar_cache_clear('SugarFeedModules');
-        if ( file_exists($cachefile = sugar_cached('modules/SugarFeed/moduleCache.php'))) {
+        if (file_exists($cachefile = sugar_cached('modules/SugarFeed/moduleCache.php'))) {
             unlink($cachefile);
         }
 
         sugar_cache_clear('SugarFeedLinkType');
-        if ( file_exists($cachefile = sugar_cached('modules/SugarFeed/linkTypeCache.php'))) {
+        if (file_exists($cachefile = sugar_cached('modules/SugarFeed/linkTypeCache.php'))) {
             unlink($cachefile);
         }
     }
 
 
-    static function getModuleFeedFiles( $module ) {
+    static function getModuleFeedFiles($module) {
         $baseDirList = array('modules/'.$module.'/SugarFeeds/', 'custom/modules/'.$module.'/SugarFeeds/');
 
         // We store the files in a list sorted by the filename so you can override a default feed by
         // putting your replacement feed in the custom directory with the same filename
         $fileList = array();
 
-        foreach ( $baseDirList as $baseDir ) {
-            if ( ! file_exists($baseDir) ) {
+        foreach ($baseDirList as $baseDir) {
+            if (!file_exists($baseDir)) {
                 continue;
             }
             $d = dir($baseDir);
-            while ( $file = $d->read() ) {
-                if ( $file{0} == '.' ) { continue; }
-                if ( substr($file,-4) == '.php' ) {
+            while ($file = $d->read()) {
+                if ($file{0} == '.') { continue; }
+                if (substr($file, -4) == '.php') {
                     // We found one
                     $fileList[$file] = $baseDir.$file;
                 }
@@ -162,14 +162,14 @@ 
     static function getActiveFeedModules( ) {
         // Stored in a cache somewhere
         $feedModules = sugar_cache_retrieve('SugarFeedModules');
-        if ( $feedModules != null ) {
+        if ($feedModules != null) {
             return($feedModules);
         }
 
         // Already stored in a file
-        if ( file_exists($cachefile = sugar_cached('modules/SugarFeed/moduleCache.php'))) {
+        if (file_exists($cachefile = sugar_cached('modules/SugarFeed/moduleCache.php'))) {
             require_once($cachefile);
-            sugar_cache_put('SugarFeedModules',$feedModules);
+            sugar_cache_put('SugarFeedModules', $feedModules);
             return $feedModules;
         }
 
@@ -179,13 +179,13 @@ 
         $admin->retrieveSettings();
 
         $feedModules = array();
-        if ( isset($admin->settings['sugarfeed_enabled']) && $admin->settings['sugarfeed_enabled'] == '1' ) {
+        if (isset($admin->settings['sugarfeed_enabled']) && $admin->settings['sugarfeed_enabled'] == '1') {
             // Only enable modules if the feed system is enabled
-            foreach ( $admin->settings as $key => $value ) {
-                if ( strncmp($key,'sugarfeed_module_',17) === 0 ) {
+            foreach ($admin->settings as $key => $value) {
+                if (strncmp($key, 'sugarfeed_module_', 17) === 0) {
                     // It's a module setting
-                    if ( $value == '1' ) {
-                        $moduleName = substr($key,17);
+                    if ($value == '1') {
+                        $moduleName = substr($key, 17);
                         $feedModules[$moduleName] = $moduleName;
                     }
                 }
@@ -193,12 +193,12 @@ 
         }
 
 
-        sugar_cache_put('SugarFeedModules',$feedModules);
-        if ( ! file_exists($cachedir = sugar_cached('modules/SugarFeed')))  {
+        sugar_cache_put('SugarFeedModules', $feedModules);
+        if (!file_exists($cachedir = sugar_cached('modules/SugarFeed'))) {
             mkdir_recursive($cachedir);
         }
-        $fd = fopen("$cachedir/moduleCache.php",'w');
-        fwrite($fd,'<'."?php\n\n".'$feedModules = '.var_export($feedModules,true).';');
+        $fd = fopen("$cachedir/moduleCache.php", 'w');
+        fwrite($fd, '<'."?php\n\n".'$feedModules = '.var_export($feedModules, true).';');
         fclose($fd);
 
         return $feedModules;
@@ -209,17 +209,17 @@ 
         $feedModules = array('UserFeed'=>'UserFeed');
 
         $baseDirList = array('modules/', 'custom/modules/');
-        foreach ( $baseDirList as $baseDir ) {
-            if ( ! file_exists($baseDir) ) {
+        foreach ($baseDirList as $baseDir) {
+            if (!file_exists($baseDir)) {
                 continue;
             }
             $d = dir($baseDir);
-            while ( $module = $d->read() ) {
-                if ( file_exists($baseDir.$module.'/SugarFeeds/') ) {
+            while ($module = $d->read()) {
+                if (file_exists($baseDir.$module.'/SugarFeeds/')) {
                     $dFeed = dir($baseDir.$module.'/SugarFeeds/');
-                    while ( $file = $dFeed->read() ) {
-                        if ( $file{0} == '.' ) { continue; }
-                        if ( substr($file,-4) == '.php' ) {
+                    while ($file = $dFeed->read()) {
+                        if ($file{0} == '.') { continue; }
+                        if (substr($file, -4) == '.php') {
                             // We found one
                             $feedModules[$module] = $module;
                         }
@@ -240,7 +240,7 @@ 
      * @param $link_type boolean value indicating whether or not feed is a link type
      * @param $link_url String value of the URL (for link types only)
      */
-    static function pushFeed2($text, $bean, $link_type=false, $link_url=false) {
+    static function pushFeed2($text, $bean, $link_type = false, $link_url = false) {
             self::pushFeed($text, $bean->module_dir, $bean->id
 								,$bean->assigned_user_id
 								,$link_type
@@ -249,31 +249,31 @@ 
     }
 
 	static function pushFeed($text, $module, $id,
-		$record_assigned_user_id=false,
-		$link_type=false,
-		$link_url=false
+		$record_assigned_user_id = false,
+		$link_type = false,
+		$link_url = false
 		) {
 		$feed = new SugarFeed();
-		if((empty($text) && empty($link_url)) || !$feed->ACLAccess('save', true) )
+		if ((empty($text) && empty($link_url)) || !$feed->ACLAccess('save', true))
 		{
 			$GLOBALS['log']->error('Unable to save SugarFeed record (missing data or no ACL access)');
 			return;
 		}
 
-		if(!empty($link_url)){
+		if (!empty($link_url)) {
             $linkClass = SugarFeed::getLinkClass($link_type);
-            if ( $linkClass !== FALSE ) {
-                $linkClass->handleInput($feed,$link_type,$link_url);
+            if ($linkClass !== FALSE) {
+                $linkClass->handleInput($feed, $link_type, $link_url);
             }
         }
         $text = strip_tags(from_html($text));
-		$text = '<b>{this.CREATED_BY}</b> ' . $text;
+		$text = '<b>{this.CREATED_BY}</b> '.$text;
 		$feed->name = substr($text, 0, 255);
-		if(strlen($text) > 255){
+		if (strlen($text) > 255) {
 			$feed->description = substr($text, 255, 510);
 		}
 
-		if ( $record_assigned_user_id === false ) {
+		if ($record_assigned_user_id === false) {
 			$feed->assigned_user_id = $GLOBALS['current_user']->id;
 		} else {
 			$feed->assigned_user_id = $record_assigned_user_id;
@@ -287,62 +287,62 @@ 
         static $linkTypeList = null;
 
         // Fastest, already stored in the static variable
-        if ( $linkTypeList != null ) {
+        if ($linkTypeList != null) {
             return $linkTypeList;
         }
 
         // Second fastest, stored in a cache somewhere
         $linkTypeList = sugar_cache_retrieve('SugarFeedLinkType');
-        if ( $linkTypeList != null ) {
+        if ($linkTypeList != null) {
             return($linkTypeList);
         }
 
         // Third fastest, already stored in a file
-        if ( file_exists($cachedfile = sugar_cached('modules/SugarFeed/linkTypeCache.php'))) {
+        if (file_exists($cachedfile = sugar_cached('modules/SugarFeed/linkTypeCache.php'))) {
             require_once($cachedfile);
-            sugar_cache_put('SugarFeedLinkType',$linkTypeList);
+            sugar_cache_put('SugarFeedLinkType', $linkTypeList);
             return $linkTypeList;
         }
 
         // Slow, have to actually collect the data
-        $baseDirs = array('custom/modules/SugarFeed/linkHandlers/','modules/SugarFeed/linkHandlers');
+        $baseDirs = array('custom/modules/SugarFeed/linkHandlers/', 'modules/SugarFeed/linkHandlers');
 
         $linkTypeList = array();
 
-        foreach ( $baseDirs as $dirName ) {
-            if ( !file_exists($dirName) ) { continue; }
+        foreach ($baseDirs as $dirName) {
+            if (!file_exists($dirName)) { continue; }
             $d = dir($dirName);
-            while ( $file = $d->read() ) {
-                if ( $file{0} == '.' ) { continue; }
-                if ( substr($file,-4) == '.php' ) {
+            while ($file = $d->read()) {
+                if ($file{0} == '.') { continue; }
+                if (substr($file, -4) == '.php') {
                     // We found one
-                    $typeName = substr($file,0,-4);
+                    $typeName = substr($file, 0, -4);
                     $linkTypeList[$typeName] = $typeName;
                 }
             }
         }
 
-        sugar_cache_put('SugarFeedLinkType',$linkTypeList);
-        if ( ! file_exists($cachedir = sugar_cached('modules/SugarFeed')) ) {
+        sugar_cache_put('SugarFeedLinkType', $linkTypeList);
+        if (!file_exists($cachedir = sugar_cached('modules/SugarFeed'))) {
             mkdir_recursive($cachedir);
         }
-        $fd = fopen("$cachedir/linkTypeCache.php",'w');
-        fwrite($fd,'<'."?php\n\n".'$linkTypeList = '.var_export($linkTypeList,true).';');
+        $fd = fopen("$cachedir/linkTypeCache.php", 'w');
+        fwrite($fd, '<'."?php\n\n".'$linkTypeList = '.var_export($linkTypeList, true).';');
         fclose($fd);
 
         return $linkTypeList;
     }
 
-    static function getLinkClass( $linkName ) {
+    static function getLinkClass($linkName) {
         $linkTypeList = SugarFeed::getLinkTypes();
 
         // Have to make sure the linkName is on the list, so they can't pass in linkName's like ../../config.php ... not that they could get anywhere if they did
-        if ( ! isset($linkTypeList[$linkName]) ) {
+        if (!isset($linkTypeList[$linkName])) {
             // No class by this name...
             return FALSE;
         }
 
-        if ( file_exists('custom/modules/SugarFeed/linkHandlers/'.$linkName.'.php') ) {
+        if (file_exists('custom/modules/SugarFeed/linkHandlers/'.$linkName.'.php')) {
             require_once('custom/modules/SugarFeed/linkHandlers/'.$linkName.'.php');
         } else {
             require_once('modules/SugarFeed/linkHandlers/'.$linkName.'.php');
@@ -355,7 +355,7 @@ 
         return($linkClass);
     }
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		$data = parent::get_list_view_data();
 		$delete = '';
 		/* BEGIN - SECURITY GROUPS */
@@ -365,63 +365,63 @@ 
 		if (ACLController::moduleSupportsACL($data['RELATED_MODULE'])) {
     		$in_group = 'not_set';
 			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess($data['RELATED_MODULE'],$data['RELATED_ID'],'list');
-			if(
-			 !ACLController::checkAccess($data['RELATED_MODULE'], 'view', $data['CREATED_BY'] == $GLOBALS['current_user']->id,'module', $in_group)
-			&& !ACLController::checkAccess($data['RELATED_MODULE'], 'list', $data['CREATED_BY'] == $GLOBALS['current_user']->id,'module', $in_group)
+			$in_group = SecurityGroup::groupHasAccess($data['RELATED_MODULE'], $data['RELATED_ID'], 'list');
+			if (
+			 !ACLController::checkAccess($data['RELATED_MODULE'], 'view', $data['CREATED_BY'] == $GLOBALS['current_user']->id, 'module', $in_group)
+			&& !ACLController::checkAccess($data['RELATED_MODULE'], 'list', $data['CREATED_BY'] == $GLOBALS['current_user']->id, 'module', $in_group)
 
-			){
+			) {
 			$data['NAME'] = '';
 			return $data;
 			}
 		}
-        if(is_admin($GLOBALS['current_user']) || (isset($data['CREATED_BY']) && $data['CREATED_BY'] == $GLOBALS['current_user']->id) ) {
-            $delete = ' - <a id="sugarFeedDeleteLink'.$data['ID'].'" href="#" onclick=\'SugarFeed.deleteFeed("'. $data['ID'] . '", "{this.id}"); return false;\'>'. $GLOBALS['app_strings']['LBL_DELETE_BUTTON_LABEL'].'</a>';
+        if (is_admin($GLOBALS['current_user']) || (isset($data['CREATED_BY']) && $data['CREATED_BY'] == $GLOBALS['current_user']->id)) {
+            $delete = ' - <a id="sugarFeedDeleteLink'.$data['ID'].'" href="#" onclick=\'SugarFeed.deleteFeed("'.$data['ID'].'", "{this.id}"); return false;\'>'.$GLOBALS['app_strings']['LBL_DELETE_BUTTON_LABEL'].'</a>';
         }
 		/* END - SECURITY GROUPS */
 		$data['NAME'] .= $data['DESCRIPTION'];
-		$data['NAME'] =  '<div style="padding:3px">' . html_entity_decode($data['NAME']);
-		if(!empty($data['LINK_URL'])){
+		$data['NAME'] = '<div style="padding:3px">'.html_entity_decode($data['NAME']);
+		if (!empty($data['LINK_URL'])) {
             $linkClass = SugarFeed::getLinkClass($data['LINK_TYPE']);
-            if ( $linkClass !== FALSE ) {
+            if ($linkClass !== FALSE) {
                 $data['NAME'] .= $linkClass->getDisplay($data);
             }
 		}
         $data['NAME'] .= '<div class="byLineBox"><span class="byLineLeft">';
-		$data['NAME'] .= $this->getTimeLapse($data['DATE_ENTERED']) . '&nbsp;</span><div class="byLineRight"><a id="sugarFeedReplyLink'.$data['ID'].'" href="#" onclick=\'SugarFeed.buildReplyForm("'.$data['ID'].'", "{this.id}", this); return false;\'>'.$GLOBALS['app_strings']['LBL_EMAIL_REPLY'].'</a>' .$delete. '</div></div>';
+		$data['NAME'] .= $this->getTimeLapse($data['DATE_ENTERED']).'&nbsp;</span><div class="byLineRight"><a id="sugarFeedReplyLink'.$data['ID'].'" href="#" onclick=\'SugarFeed.buildReplyForm("'.$data['ID'].'", "{this.id}", this); return false;\'>'.$GLOBALS['app_strings']['LBL_EMAIL_REPLY'].'</a>'.$delete.'</div></div>';
 
         $data['NAME'] .= $this->fetchReplies($data);
-		return  $data ;
+		return  $data;
 	}
 
     function fetchReplies($data) {
         $seedBean = new SugarFeed;
 
-        $replies = $seedBean->get_list('date_entered',"related_module = 'SugarFeed' AND related_id = '".$data['ID']."'");
+        $replies = $seedBean->get_list('date_entered', "related_module = 'SugarFeed' AND related_id = '".$data['ID']."'");
 
-        if ( count($replies['list']) < 1 ) {
+        if (count($replies['list']) < 1) {
             return '';
         }
 
 
         $replyHTML = '<div class="clear"></div><blockquote>';
 
-        foreach ( $replies['list'] as $reply ) {
+        foreach ($replies['list'] as $reply) {
             // Setup the delete link
             $delete = '';
-            if(is_admin($GLOBALS['current_user']) || $data['CREATED_BY'] == $GLOBALS['current_user']->id) {
-                $delete = '<a id="sugarFieldDeleteLink'.$reply->id.'" href="#" onclick=\'SugarFeed.deleteFeed("'. $reply->id . '", "{this.id}"); return false;\'>'. $GLOBALS['app_strings']['LBL_DELETE_BUTTON_LABEL'].'</a>';
+            if (is_admin($GLOBALS['current_user']) || $data['CREATED_BY'] == $GLOBALS['current_user']->id) {
+                $delete = '<a id="sugarFieldDeleteLink'.$reply->id.'" href="#" onclick=\'SugarFeed.deleteFeed("'.$reply->id.'", "{this.id}"); return false;\'>'.$GLOBALS['app_strings']['LBL_DELETE_BUTTON_LABEL'].'</a>';
             }
 
             $image_url = 'include/images/default_user_feed_picture.png';
-            if ( isset($reply->created_by) ) {
+            if (isset($reply->created_by)) {
                 $user = loadBean('Users');
                 $user->retrieve($reply->created_by);
                 $image_url = 'index.php?entryPoint=download&id='.$user->picture.'&type=SugarFieldImage&isTempFile=1&isProfile=1';
             }
             $replyHTML .= '<div style="float: left; margin-right: 3px; width: 50px; height: 50px;"><!--not_in_theme!--><img src="'.$image_url.'" style="max-width: 50px; max-height: 50px;"></div> ';
-            $replyHTML .= str_replace("{this.CREATED_BY}",get_assigned_user_name($reply->created_by),html_entity_decode($reply->name)).'<br>';
-            $replyHTML .= '<div class="byLineBox"><span class="byLineLeft">'. $this->getTimeLapse($reply->date_entered) . '&nbsp;</span><div class="byLineRight">  &nbsp;' .$delete. '</div></div><div class="clear"></div>';
+            $replyHTML .= str_replace("{this.CREATED_BY}", get_assigned_user_name($reply->created_by), html_entity_decode($reply->name)).'<br>';
+            $replyHTML .= '<div class="byLineBox"><span class="byLineLeft">'.$this->getTimeLapse($reply->date_entered).'&nbsp;</span><div class="byLineRight">  &nbsp;'.$delete.'</div></div><div class="clear"></div>';
         }
 
         $replyHTML .= '</blockquote>';
@@ -432,52 +432,52 @@ 
 	static function getTimeLapse($startDate)
 	{
 		$seconds = $GLOBALS['timedate']->getNow()->ts - $GLOBALS['timedate']->fromUser($startDate)->ts;
-		$minutes =   $seconds/60;
+		$minutes = $seconds / 60;
 		$seconds = $seconds % 60;
-		$hours = floor( $minutes / 60);
+		$hours = floor($minutes / 60);
 		$minutes = $minutes % 60;
-		$days = floor( $hours / 24);
+		$days = floor($hours / 24);
 		$hours = $hours % 24;
-		$weeks = floor( $days / 7);
+		$weeks = floor($days / 7);
 		$days = $days % 7;
 		$result = '';
-		if($weeks == 1){
-			$result = translate('LBL_TIME_LAST_WEEK','SugarFeed').' ';
+		if ($weeks == 1) {
+			$result = translate('LBL_TIME_LAST_WEEK', 'SugarFeed').' ';
 			return $result;
-		}else if($weeks > 1){
-			$result .= $weeks . ' '.translate('LBL_TIME_WEEKS','SugarFeed').' ';
-			if($days > 0) {
-                $result .= $days . ' '.translate('LBL_TIME_DAYS','SugarFeed').' ';
+		} else if ($weeks > 1) {
+			$result .= $weeks.' '.translate('LBL_TIME_WEEKS', 'SugarFeed').' ';
+			if ($days > 0) {
+                $result .= $days.' '.translate('LBL_TIME_DAYS', 'SugarFeed').' ';
             }
-		}else{
-			if($days == 1){
-				$result = translate('LBL_TIME_YESTERDAY','SugarFeed').' ';
+		} else {
+			if ($days == 1) {
+				$result = translate('LBL_TIME_YESTERDAY', 'SugarFeed').' ';
 				return $result;
-			}else if($days > 1){
-				$result .= $days . ' '. translate('LBL_TIME_DAYS','SugarFeed').' ';
-			}else{
-				if($hours == 1) {
-                    $result .= $hours . ' '.translate('LBL_TIME_HOUR','SugarFeed').' ';
+			} else if ($days > 1) {
+				$result .= $days.' '.translate('LBL_TIME_DAYS', 'SugarFeed').' ';
+			} else {
+				if ($hours == 1) {
+                    $result .= $hours.' '.translate('LBL_TIME_HOUR', 'SugarFeed').' ';
                 } else {
-                    $result .= $hours . ' '.translate('LBL_TIME_HOURS','SugarFeed').' ';
+                    $result .= $hours.' '.translate('LBL_TIME_HOURS', 'SugarFeed').' ';
                 }
-				if($hours < 6){
-					if($minutes == 1) {
-                        $result .= $minutes . ' ' . translate('LBL_TIME_MINUTE','SugarFeed'). ' ';
+				if ($hours < 6) {
+					if ($minutes == 1) {
+                        $result .= $minutes.' '.translate('LBL_TIME_MINUTE', 'SugarFeed').' ';
                     } else {
-                        $result .= $minutes . ' ' . translate('LBL_TIME_MINUTES','SugarFeed'). ' ';
+                        $result .= $minutes.' '.translate('LBL_TIME_MINUTES', 'SugarFeed').' ';
                     }
 				}
-				if($hours == 0 && $minutes == 0) {
-                    if($seconds == 1 ) {
-                        $result = $seconds . ' ' . translate('LBL_TIME_SECOND','SugarFeed');
+				if ($hours == 0 && $minutes == 0) {
+                    if ($seconds == 1) {
+                        $result = $seconds.' '.translate('LBL_TIME_SECOND', 'SugarFeed');
                     } else {
-                        $result = $seconds . ' ' . translate('LBL_TIME_SECONDS','SugarFeed');
+                        $result = $seconds.' '.translate('LBL_TIME_SECONDS', 'SugarFeed');
                     }
                 }
 			}
 		}
-		return $result . ' ' . translate('LBL_TIME_AGO','SugarFeed');
+		return $result.' '.translate('LBL_TIME_AGO', 'SugarFeed');
     }
 
     /**
@@ -486,9 +486,9 @@ 
      * @param  $input
      * @return void
      */
-    public static function parseMessage($input){
+    public static function parseMessage($input) {
         $urls = getUrls($input);
-        foreach($urls as $url){
+        foreach ($urls as $url) {
 			$output = "<a href='$url' target='_blank'>".$url."</a>";
 			$input = str_replace($url, $output, $input);
 		}

Braces +8 added lines, -7 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-2012 SugarCRM Inc.
@@ -70,8 +72,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -444,18 +445,18 @@ 
 		if($weeks == 1){
 			$result = translate('LBL_TIME_LAST_WEEK','SugarFeed').' ';
 			return $result;
-		}else if($weeks > 1){
+		} else if($weeks > 1){
 			$result .= $weeks . ' '.translate('LBL_TIME_WEEKS','SugarFeed').' ';
 			if($days > 0) {
                 $result .= $days . ' '.translate('LBL_TIME_DAYS','SugarFeed').' ';
             }
-		}else{
+		} else{
 			if($days == 1){
 				$result = translate('LBL_TIME_YESTERDAY','SugarFeed').' ';
 				return $result;
-			}else if($days > 1){
+			} else if($days > 1){
 				$result .= $days . ' '. translate('LBL_TIME_DAYS','SugarFeed').' ';
-			}else{
+			} else{
 				if($hours == 1) {
                     $result .= $hours . ' '.translate('LBL_TIME_HOUR','SugarFeed').' ';
                 } else {