adamjakab / SuiteCRM

modules/Administration/UpgradeWizard_commit.php

Indentation +159 added lines, -159 removed lines

@@ -43,11 +43,11 @@ 
 require_once('modules/Administration/UpgradeWizardCommon.php');
 require_once('modules/Configurator/Configurator.php');
 function UWrebuild() {
-	global $log;
-	global $db;
-	$log->info('Deleting Relationship Cache. Relationships will automatically refresh.');
+    global $log;
+    global $db;
+    $log->info('Deleting Relationship Cache. Relationships will automatically refresh.');
 
-	echo "
+    echo "
 	<div id='rrresult'></div>
 	<script>
 		var xmlhttp=false;
@@ -88,10 +88,10 @@ 
 		xmlhttp.send(null);
 		</script>";
 
-	$log->info('Rebuilding everything.');
-	require_once('ModuleInstall/ModuleInstaller.php');
-	$mi = new ModuleInstaller();
-	$mi->rebuild_all();
+    $log->info('Rebuilding everything.');
+    require_once('ModuleInstall/ModuleInstaller.php');
+    $mi = new ModuleInstaller();
+    $mi->rebuild_all();
 }
 
 unset($_SESSION['rebuild_relationships']);
@@ -140,19 +140,19 @@ 
 
 $id_name = '';
 if(isset($_REQUEST['id_name'])){
- $id_name = $_REQUEST['id_name'];
+    $id_name = $_REQUEST['id_name'];
 }
 $s_manifest = '';
 if(isset($_REQUEST['s_manifest'])){
- $s_manifest = $_REQUEST['s_manifest'];
+    $s_manifest = $_REQUEST['s_manifest'];
 }
 $previous_version = '';
 if(isset($_REQUEST['previous_version'])){
-	$previous_version = $_REQUEST['previous_version'];
+    $previous_version = $_REQUEST['previous_version'];
 }
 $previous_id = '';
 if(isset($_REQUEST['previous_id'])){
-	$previous_id = $_REQUEST['previous_id'];
+    $previous_id = $_REQUEST['previous_id'];
 }
 if( $install_type != "module" ){
     if( !isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "") ){
@@ -170,11 +170,11 @@ 
 }
 $remove_tables = 'true';
 if(isset($_REQUEST['remove_tables'])){
-	$remove_tables = $_REQUEST['remove_tables'];
+    $remove_tables = $_REQUEST['remove_tables'];
 }
 $overwrite_files = true;
 if(isset($_REQUEST['radio_overwrite'])){
- $overwrite_files = (($_REQUEST['radio_overwrite'] == 'do_not_overwrite') ? false : true);
+    $overwrite_files = (($_REQUEST['radio_overwrite'] == 'do_not_overwrite') ? false : true);
 }
 
 //rrs
@@ -200,13 +200,13 @@ 
 
 if (((defined('MODULE_INSTALLER_PACKAGE_SCAN') && MODULE_INSTALLER_PACKAGE_SCAN)
     || !empty($GLOBALS['sugar_config']['moduleInstaller']['packageScan'])) && $install_type != 'patch') {
-	require_once('ModuleInstall/ModuleScanner.php');
-	$ms = new ModuleScanner();
-	$ms->scanPackage($unzip_dir);
-	if($ms->hasIssues()){
-		$ms->displayIssues();
-		sugar_cleanup(true);
-	}
+    require_once('ModuleInstall/ModuleScanner.php');
+    $ms = new ModuleScanner();
+    $ms->scanPackage($unzip_dir);
+    if($ms->hasIssues()){
+        $ms->displayIssues();
+        sugar_cleanup(true);
+    }
 }
 
 //
@@ -214,29 +214,29 @@ 
 //
 if($install_type == 'patch' || $install_type == 'module')
 {
-	switch($mode)
- 	{
- 		case 'Install':
- 			$file = "$unzip_dir/" . constant('SUGARCRM_PRE_INSTALL_FILE');
-			if(is_file($file))
-			{
-				print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-				include($file);
-				pre_install();
-   		}
- 			break;
- 		case 'Uninstall':
- 			$file = "$unzip_dir/" . constant('SUGARCRM_PRE_UNINSTALL_FILE');
-			if(is_file($file))
-			{
-				print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-				include($file);
-				pre_uninstall();
-   		}
- 			break;
- 		default:
- 			break;
- 		}
+    switch($mode)
+        {
+            case 'Install':
+             $file = "$unzip_dir/" . constant('SUGARCRM_PRE_INSTALL_FILE');
+            if(is_file($file))
+            {
+                print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                include($file);
+                pre_install();
+            }
+                break;
+            case 'Uninstall':
+             $file = "$unzip_dir/" . constant('SUGARCRM_PRE_UNINSTALL_FILE');
+            if(is_file($file))
+            {
+                print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                include($file);
+                pre_uninstall();
+            }
+                break;
+            default:
+             break;
+            }
 }
 
 //
@@ -251,9 +251,9 @@ 
         $sugar_home_dir = getCwd();
         $dest_file  = clean_path( "$sugar_home_dir/$zip_to_dir/$file_to_copy" );
         if($zip_to_dir != '.')
-        	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
+            $rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
         else
-        	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+            $rest_file  = clean_path("$rest_dir/$file_to_copy");
 
         switch( $mode ){
             case "Install":
@@ -261,11 +261,11 @@ 
 
                 if($install_type=="patch" && is_file($dest_file))
                 {
-	                if(!is_dir(dirname( $rest_file )))
-                		mkdir_recursive( dirname( $rest_file ) );
+                    if(!is_dir(dirname( $rest_file )))
+                        mkdir_recursive( dirname( $rest_file ) );
 
-	                copy( $dest_file, $rest_file);
-	                sugar_touch( $rest_file, filemtime($dest_file) );
+                    copy( $dest_file, $rest_file);
+                    sugar_touch( $rest_file, filemtime($dest_file) );
                 }
 
                 if( !copy( $src_file, $dest_file ) ){
@@ -276,8 +276,8 @@ 
             case "Uninstall":
                 if($install_type=="patch" && is_file($rest_file))
                 {
-	                copy( $rest_file, $dest_file);
-	                sugar_touch( $dest_file, filemtime($rest_file) );
+                    copy( $rest_file, $dest_file);
+                    sugar_touch( $dest_file, filemtime($rest_file) );
                 }
                 elseif(file_exists($dest_file) && !unlink($dest_file))
                 {
@@ -312,21 +312,21 @@ 
                     $new_langs += array( $key => $value );
                 }
             }
-			$sugar_config['languages'] = $new_langs;
-
-	        $default_sugar_instance_lang = 'en_us';
-	        if($current_language == $_REQUEST['new_lang_name']){
-	        	$_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
-	        	$lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
-
-	        if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
-	        	$cfg = new Configurator();
-             	$cfg->config['languages'] = $new_langs;
-				$cfg->config['default_language'] = $default_sugar_instance_lang;
-				$cfg->handleOverride();
-	        	$lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
+            $sugar_config['languages'] = $new_langs;
+
+            $default_sugar_instance_lang = 'en_us';
+            if($current_language == $_REQUEST['new_lang_name']){
+                $_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
+                $lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+            }
+
+            if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
+                $cfg = new Configurator();
+                    $cfg->config['languages'] = $new_langs;
+                $cfg->config['default_language'] = $default_sugar_instance_lang;
+                $cfg->handleOverride();
+                $lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+            }
         }
         ksort( $sugar_config );
         if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
@@ -339,39 +339,39 @@ 
         switch( $mode ){
             case "Install":
             //here we can determine if this is an upgrade or a new version
-            	if(!empty($previous_version)){
-            		$mi->install( "$unzip_dir", true, $previous_version);
-            	}else{
-                	$mi->install( "$unzip_dir" );
-            	}
-
-				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-				if(is_file($file))
-				{
-					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-					include($file);
-					post_install();
-				}
-            	break;
+                if(!empty($previous_version)){
+                    $mi->install( "$unzip_dir", true, $previous_version);
+                }else{
+                    $mi->install( "$unzip_dir" );
+                }
+
+                $file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
+                if(is_file($file))
+                {
+                    print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                    include($file);
+                    post_install();
+                }
+                break;
             case "Uninstall":
                 if($remove_tables == 'false')
-                	$GLOBALS['mi_remove_tables'] = false;
+                    $GLOBALS['mi_remove_tables'] = false;
                 else
-                	$GLOBALS['mi_remove_tables'] = true;
+                    $GLOBALS['mi_remove_tables'] = true;
                 $mi->uninstall( "$unzip_dir" );
                 break;
-             case "Disable":
+                case "Disable":
                 if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
+                    $GLOBALS['mi_overwrite_files'] = false;
                 else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                    $GLOBALS['mi_overwrite_files'] = true;
                 $mi->disable( "$unzip_dir" );
                 break;
-             case "Enable":
+                case "Enable":
                 if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
+                    $GLOBALS['mi_overwrite_files'] = false;
                 else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                    $GLOBALS['mi_overwrite_files'] = true;
                 $mi->enable( "$unzip_dir" );
                 break;
             default:
@@ -382,46 +382,46 @@ 
     case "full":
         // purposely flow into "case: patch"
     case "patch":
- 		switch($mode)
- 		{
- 			case 'Install':
- 				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-				if(is_file($file))
-				{
-					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-					include($file);
-					post_install();
-				}
-
-				UWrebuild();
- 				break;
- 			case 'Uninstall':
- 				$file = "$unzip_dir/" . constant('SUGARCRM_POST_UNINSTALL_FILE');
- 				if(is_file($file)) {
-					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-					include($file);
-					post_uninstall();
-				}
-
-				if(is_dir($rest_dir))
-				{
-					rmdir_recursive($rest_dir);
-				}
-
-				UWrebuild();
- 				break;
- 			default:
- 				break;
- 		}
-
-		require( "sugar_version.php" );
-		$sugar_config['sugar_version'] = $sugar_version;
-		ksort( $sugar_config );
-
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) )
-		{
-			die($mod_strings['ERR_UW_UPDATE_CONFIG']);
-		}
+         switch($mode)
+            {
+                case 'Install':
+                 $file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
+                if(is_file($file))
+                {
+                    print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                    include($file);
+                    post_install();
+                }
+
+                UWrebuild();
+                    break;
+                case 'Uninstall':
+                 $file = "$unzip_dir/" . constant('SUGARCRM_POST_UNINSTALL_FILE');
+                    if(is_file($file)) {
+                    print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                    include($file);
+                    post_uninstall();
+                }
+
+                if(is_dir($rest_dir))
+                {
+                    rmdir_recursive($rest_dir);
+                }
+
+                UWrebuild();
+                    break;
+                default:
+                 break;
+            }
+
+        require( "sugar_version.php" );
+        $sugar_config['sugar_version'] = $sugar_version;
+        ksort( $sugar_config );
+
+        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) )
+        {
+            die($mod_strings['ERR_UW_UPDATE_CONFIG']);
+        }
         break;
     default:
         break;
@@ -434,15 +434,15 @@ 
         $new_upgrade = new UpgradeHistory();
         //determine if this module has already been installed given the unique_key to
         //identify the module
-       // $new_upgrade->checkForExisting($unique_key);
-       	if(!empty($previous_id)){
-       		$new_upgrade->id = $previous_id;
-       		$uh = new UpgradeHistory();
-       		$uh->retrieve($previous_id);
-       		if(is_file($uh->filename)) {
-       		unlink($uh->filename);
-       		}
-       	}
+        // $new_upgrade->checkForExisting($unique_key);
+            if(!empty($previous_id)){
+                $new_upgrade->id = $previous_id;
+                $uh = new UpgradeHistory();
+                $uh->retrieve($previous_id);
+                if(is_file($uh->filename)) {
+                unlink($uh->filename);
+                }
+            }
         $new_upgrade->filename      = $install_file;
         $new_upgrade->md5sum        = md5_file( $install_file );
         $new_upgrade->type          = $install_type;
@@ -457,25 +457,25 @@ 
         //Check if we need to show a page for the user to finalize their install with.
         if (is_file("$unzip_dir/manifest.php"))
         {
-        	include("$unzip_dir/manifest.php");
-        	if (!empty($manifest['post_install_url']))
-        	{
-        		$url_conf = $manifest['post_install_url'];
-        		if (is_string($url_conf))
-        			$url_conf = array('url' => $url_conf);
-        		if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
-        		{
-        			echo '<script type="text/javascript">window.open("' . $url_conf['url']
-        			   . '","' . (empty($url_conf['name']) ? 'sugar_popup' : $url_conf['name']) . '","'
-        			   . 'height=' . (empty($url_conf['height']) ? '500' : $url_conf['height']) . ','
-        			   . 'width=' . (empty($url_conf['width']) ? '800' : $url_conf['width']) . '");</script>';
-        		} else
-        		{
-        			echo '<iframe src="' . $url_conf['url'] . '" '
-        			   . 'width="' . (empty($url_conf['width']) ? '100%' : $url_conf['width']) . '" '
-        			   . 'height="' . (empty($url_conf['height']) ? '500px' : $url_conf['height']) . '"></iframe>';
-        		}
-        	}
+            include("$unzip_dir/manifest.php");
+            if (!empty($manifest['post_install_url']))
+            {
+                $url_conf = $manifest['post_install_url'];
+                if (is_string($url_conf))
+                    $url_conf = array('url' => $url_conf);
+                if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
+                {
+                    echo '<script type="text/javascript">window.open("' . $url_conf['url']
+                        . '","' . (empty($url_conf['name']) ? 'sugar_popup' : $url_conf['name']) . '","'
+                        . 'height=' . (empty($url_conf['height']) ? '500' : $url_conf['height']) . ','
+                        . 'width=' . (empty($url_conf['width']) ? '800' : $url_conf['width']) . '");</script>';
+                } else
+                {
+                    echo '<iframe src="' . $url_conf['url'] . '" '
+                        . 'width="' . (empty($url_conf['width']) ? '100%' : $url_conf['width']) . '" '
+                        . 'height="' . (empty($url_conf['height']) ? '500px' : $url_conf['height']) . '"></iframe>';
+                }
+            }
         }
     break;
     case "Uninstall":
@@ -499,7 +499,7 @@ 
             die( "{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file." );
         }
         foreach( $md5_matches as $md5_match ){
-             $md5_match->enabled = 0;
+                $md5_match->enabled = 0;
             $md5_match->save();
         }
         break;
@@ -532,7 +532,7 @@ 
 echo "</div>";
 echo "<br>";
 if(isset($lang_changed_string))
-	print($lang_changed_string);
+    print($lang_changed_string);
 if ($install_type != "module" && $install_type != "langpack"){
     if( sizeof( $files_to_handle ) > 0 ){
         echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" onclick=\'this.style.display="none"; toggleDisplay("more");\' id="all_text">' . SugarThemeRegistry::current()->getImage('advanced_search', '', null, null, ".gif", $mod_strings['LBL_ADVANCED_SEARCH']) . ' Show Details</div><div id=\'more\' style=\'display: none\'>

modules/Administration/UpgradeHistory.php

Spacing +56 added lines, -56 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,12 +64,12 @@ 
     var $tracker_visibility = false;
     var $table_name = "upgrade_history";
     var $object_name = "UpgradeHistory";
-    var $column_fields = Array( "id", "filename", "md5sum", "type", "version", "status", "date_entered" );
+    var $column_fields = Array("id", "filename", "md5sum", "type", "version", "status", "date_entered");
     var $disable_custom_fields = true;
 
     function delete()
     {
-        $this->db->query( "delete from " . $this->table_name . " where id = " . $this->db->quoted($this->id));
+        $this->db->query("delete from ".$this->table_name." where id = ".$this->db->quoted($this->id));
     }
 
     public function __construct()
@@ -81,9 +81,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 UpgradeHistory(){
+    public function UpgradeHistory() {
         $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 {
@@ -93,8 +93,8 @@ 
     }
 
 
-    function getAllOrderBy($orderBy){
-        $query = "SELECT id FROM " . $this->table_name . " ORDER BY ".$orderBy;
+    function getAllOrderBy($orderBy) {
+        $query = "SELECT id FROM ".$this->table_name." ORDER BY ".$orderBy;
         return $this->getList($query);
     }
     /**
@@ -103,33 +103,33 @@ 
      * @param id      the id of the item you are comparing to
      * @return upgrade_history object if found, null otherwise
      */
-    function checkForExisting($patch_to_check){
+    function checkForExisting($patch_to_check) {
         $uh = new UpgradeHistory();
-        if($patch_to_check != null){
+        if ($patch_to_check != null) {
 
-            if(empty($patch_to_check->id_name)){
+            if (empty($patch_to_check->id_name)) {
                 $where = " WHERE name = '$patch_to_check->name' ";
-            }else{
+            } else {
                 $where = " WHERE id_name = '$patch_to_check->id_name' ";
             }
 
-            if(!empty($patch_to_check->id)){
+            if (!empty($patch_to_check->id)) {
                 $where .= "  AND id != '$patch_to_check->id'  ";
-            }else{
+            } else {
                 $where .= "  AND id is not null  ";
             }
 
-            $query = "SELECT id FROM " . $this->table_name . " ". $where;
+            $query = "SELECT id FROM ".$this->table_name." ".$where;
 
             $result = $uh->db->query($query);
-            if(empty($result)){
+            if (empty($result)) {
                 return null;
             }
             $row = $uh->db->fetchByAssoc($result);
-            if(empty($row)){
+            if (empty($row)) {
                 return null;
             }
-            if(!empty($row['id'])){
+            if (!empty($row['id'])) {
                 return $uh->retrieve($row['id']);
             }
         }
@@ -139,22 +139,22 @@ 
     /**
      * Check if this is an upgrade, if it is then return the latest version before this installation
      */
-    function determineIfUpgrade($id_name, $version){
-        $query = "SELECT id, version FROM " . $this->table_name . " WHERE id_name = '$id_name' ORDER BY date_entered DESC";
+    function determineIfUpgrade($id_name, $version) {
+        $query = "SELECT id, version FROM ".$this->table_name." WHERE id_name = '$id_name' ORDER BY date_entered DESC";
         $result = $this->db->query($query);
-         if(empty($result)){
+         if (empty($result)) {
             return null;
-         }else{
+         } else {
             $temp_version = 0;
             $id = '';
-            while($row = $this->db->fetchByAssoc($result))
+            while ($row = $this->db->fetchByAssoc($result))
             {
-                if(!$this->is_right_version_greater(explode('.', $row['version']), explode('.', $temp_version))){
+                if (!$this->is_right_version_greater(explode('.', $row['version']), explode('.', $temp_version))) {
                     $temp_version = $row['version'];
                     $id = $row['id'];
                 }
             }//end while
-            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
+            if ($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
                 return array('id' => $id, 'version' => $temp_version);
             else
                 return null;
@@ -163,38 +163,38 @@ 
 
     function getAll()
     {
-        $query = "SELECT id FROM " . $this->table_name . " ORDER BY date_entered desc";
+        $query = "SELECT id FROM ".$this->table_name." ORDER BY date_entered desc";
         return $this->getList($query);
     }
 
-    function getList($query){
-        return( parent::build_related_list( $query, $this ) );
+    function getList($query) {
+        return(parent::build_related_list($query, $this));
     }
 
-    function findByMd5( $var_md5 )
+    function findByMd5($var_md5)
     {
-        $query = "SELECT id FROM " . $this->table_name . " where md5sum = '$var_md5'";
-        return( parent::build_related_list( $query, $this ) );
+        $query = "SELECT id FROM ".$this->table_name." where md5sum = '$var_md5'";
+        return(parent::build_related_list($query, $this));
     }
 
     function UninstallAvailable($patch_list, $patch_to_check)
     {
         //before we even go through the list, let us try to see if we find a match.
         $history_object = $this->checkForExisting($patch_to_check);
-        if($history_object != null){
-            if((!empty($history_object->id_name) && !empty($patch_to_check->id_name) && strcmp($history_object->id_name,  $patch_to_check->id_name) == 0) || strcmp($history_object->name,  $patch_to_check->name) == 0){
+        if ($history_object != null) {
+            if ((!empty($history_object->id_name) && !empty($patch_to_check->id_name) && strcmp($history_object->id_name, $patch_to_check->id_name) == 0) || strcmp($history_object->name, $patch_to_check->name) == 0) {
                 //we have found a match
                 //if the patch_to_check version is greater than the found version
                 return ($this->is_right_version_greater(explode('.', $history_object->version), explode('.', $patch_to_check->version)));
-            }else{
+            } else {
                 return true;
             }
         }
         //we will only go through this loop if we have not found another UpgradeHistory object
         //with a matching unique_key in the database
-        foreach($patch_list as $more_recent_patch)
+        foreach ($patch_list as $more_recent_patch)
         {
-            if($more_recent_patch->id == $patch_to_check->id)
+            if ($more_recent_patch->id == $patch_to_check->id)
                 break;
 
             //we will only resort to checking the files if we cannot find the unique_keys
@@ -217,31 +217,31 @@ 
 
     function foundConflict($check_path, $recent_path)
     {
-        if(is_file($check_path))
+        if (is_file($check_path))
         {
-            if(file_exists($recent_path))
+            if (file_exists($recent_path))
                 return true;
             else
                 return false;
         }
-        elseif(is_dir($check_path))
+        elseif (is_dir($check_path))
         {
             $status = false;
 
-            $d = dir( $check_path );
-            while( $f = $d->read() )
+            $d = dir($check_path);
+            while ($f = $d->read())
             {
-                if( $f == "." || $f == ".." )
+                if ($f == "." || $f == "..")
                     continue;
 
                 $status = $this->foundConflict("$check_path/$f", "$recent_path/$f");
 
-                if($status)
+                if ($status)
                     break;
             }
 
             $d->close();
-            return( $status );
+            return($status);
         }
 
         return false;
@@ -256,19 +256,19 @@ 
      * return               true if the right version is greater or they are equal
      *                      false if the left version is greater
      */
-    function is_right_version_greater($left, $right, $equals_is_greater = true){
-        if(count($left) == 0 && count($right) == 0){
+    function is_right_version_greater($left, $right, $equals_is_greater = true) {
+        if (count($left) == 0 && count($right) == 0) {
             return $equals_is_greater;
         }
-        else if(count($left) == 0 || count($right) == 0){
+        else if (count($left) == 0 || count($right) == 0) {
             return true;
         }
-        else if($left[0] == $right[0]){
+        else if ($left[0] == $right[0]) {
             array_shift($left);
             array_shift($right);
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
         }
-        else if($left[0] < $right[0]){
+        else if ($left[0] < $right[0]) {
            return true;
         }
         else
@@ -283,28 +283,28 @@ 
      *
      * @return not_found	an array of id_names that were not found to be installed on the system
      */
-    function checkDependencies($dependencies = array()){
+    function checkDependencies($dependencies = array()) {
         $not_found = array();
-        foreach($dependencies as $dependent){
+        foreach ($dependencies as $dependent) {
             $found = false;
             $query = "SELECT id FROM $this->table_name WHERE id_name = '".$dependent['id_name']."'";
             $matches = $this->getList($query);
-            if(0 != sizeof($matches)){
-                foreach($matches as $match){
-                    if($this->is_right_version_greater(explode('.', $match->version), explode('.', $dependent['version']))){
+            if (0 != sizeof($matches)) {
+                foreach ($matches as $match) {
+                    if ($this->is_right_version_greater(explode('.', $match->version), explode('.', $dependent['version']))) {
                         $found = true;
                         break;
                     }//fi
                 }//rof
             }//fi
-            if(!$found){
+            if (!$found) {
                 $not_found[] = $dependent['id_name'];
             }//fi
         }//rof
         return $not_found;
     }
-    function retrieve($id = -1, $encode=true,$deleted=true) {
-        return parent::retrieve($id,$encode,false);  //ignore the deleted filter. the table does not have the deleted column in it.
+    function retrieve($id = -1, $encode = true, $deleted = true) {
+        return parent::retrieve($id, $encode, false); //ignore the deleted filter. the table does not have the deleted column in it.
     }
 
 }

Braces +33 added lines, -31 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.
@@ -85,8 +87,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();
@@ -109,13 +110,13 @@ 
 
             if(empty($patch_to_check->id_name)){
                 $where = " WHERE name = '$patch_to_check->name' ";
-            }else{
+            } else{
                 $where = " WHERE id_name = '$patch_to_check->id_name' ";
             }
 
             if(!empty($patch_to_check->id)){
                 $where .= "  AND id != '$patch_to_check->id'  ";
-            }else{
+            } else{
                 $where .= "  AND id is not null  ";
             }
 
@@ -144,7 +145,7 @@ 
         $result = $this->db->query($query);
          if(empty($result)){
             return null;
-         }else{
+         } else{
             $temp_version = 0;
             $id = '';
             while($row = $this->db->fetchByAssoc($result))
@@ -154,10 +155,11 @@ 
                     $id = $row['id'];
                 }
             }//end while
-            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
-                return array('id' => $id, 'version' => $temp_version);
-            else
-                return null;
+            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false)) {
+                            return array('id' => $id, 'version' => $temp_version);
+            } else {
+                            return null;
+            }
          }
     }
 
@@ -186,7 +188,7 @@ 
                 //we have found a match
                 //if the patch_to_check version is greater than the found version
                 return ($this->is_right_version_greater(explode('.', $history_object->version), explode('.', $patch_to_check->version)));
-            }else{
+            } else{
                 return true;
             }
         }
@@ -194,8 +196,9 @@ 
         //with a matching unique_key in the database
         foreach($patch_list as $more_recent_patch)
         {
-            if($more_recent_patch->id == $patch_to_check->id)
-                break;
+            if($more_recent_patch->id == $patch_to_check->id) {
+                            break;
+            }
 
             //we will only resort to checking the files if we cannot find the unique_keys
             //or the unique_keys do not match
@@ -219,25 +222,27 @@ 
     {
         if(is_file($check_path))
         {
-            if(file_exists($recent_path))
-                return true;
-            else
-                return false;
-        }
-        elseif(is_dir($check_path))
+            if(file_exists($recent_path)) {
+                            return true;
+            } else {
+                            return false;
+            }
+        } elseif(is_dir($check_path))
         {
             $status = false;
 
             $d = dir( $check_path );
             while( $f = $d->read() )
             {
-                if( $f == "." || $f == ".." )
-                    continue;
+                if( $f == "." || $f == ".." ) {
+                                    continue;
+                }
 
                 $status = $this->foundConflict("$check_path/$f", "$recent_path/$f");
 
-                if($status)
-                    break;
+                if($status) {
+                                    break;
+                }
             }
 
             $d->close();
@@ -259,20 +264,17 @@ 
     function is_right_version_greater($left, $right, $equals_is_greater = true){
         if(count($left) == 0 && count($right) == 0){
             return $equals_is_greater;
-        }
-        else if(count($left) == 0 || count($right) == 0){
+        } else if(count($left) == 0 || count($right) == 0){
             return true;
-        }
-        else if($left[0] == $right[0]){
+        } else if($left[0] == $right[0]){
             array_shift($left);
             array_shift($right);
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
-        }
-        else if($left[0] < $right[0]){
+        } else if($left[0] < $right[0]){
            return true;
+        } else {
+                    return false;
         }
-        else
-            return false;
     }
 
     /**

modules/AOK_KnowledgeBase/AOK_KnowledgeBase.php

Spacing +3 added lines, -3 removed lines

@@ -43,16 +43,16 @@
 require_once('modules/AOK_KnowledgeBase/AOK_KnowledgeBase_sugar.php');
 class AOK_KnowledgeBase extends AOK_KnowledgeBase_sugar {
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function AOK_KnowledgeBase(){
+    public function AOK_KnowledgeBase() {
         $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 {

Indentation +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
 require_once('modules/AM_TaskTemplates/AM_TaskTemplates_sugar.php');
 class AM_TaskTemplates extends AM_TaskTemplates_sugar {
 
-	public function __construct(){
-		parent::__construct();
-	}
+    public function __construct(){
+        parent::__construct();
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/AOK_KnowledgeBase/AOK_KnowledgeBase_sugar.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
 	var $object_name = 'AOK_KnowledgeBase';
 	var $table_name = 'aok_knowledgebase';
 	var $importable = false;
-	var $disable_row_level_security = true ; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
+	var $disable_row_level_security = true; // to ensure that modules created and deployed under CE will continue to function under team security if the instance is upgraded to PRO
 		var $id;
 		var $name;
 		var $date_entered;
@@ -73,16 +73,16 @@ 
 		var $user_id1_c;
 		var $approver;
 
-    public function __construct(){
+    public function __construct() {
 		parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function AOK_KnowledgeBase_sugar(){
+    public function AOK_KnowledgeBase_sugar() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -92,8 +92,8 @@ 
     }
 
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/Meetings/Meeting.php

Indentation +652 added lines, -652 removed lines

@@ -40,150 +40,150 @@ 
 
 
 class Meeting extends SugarBean {
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $assigned_user_id;
-	var $modified_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $description;
-	var $name;
-	var $location;
-	var $status;
-	var $type;
-	var $date_start;
-	var $time_start;
-	var $date_end;
-	var $duration_hours;
-	var $duration_minutes;
-	var $time_meridiem;
-	var $parent_type;
-	var $parent_type_options;
-	var $parent_id;
-	var $field_name_map;
-	var $contact_id;
-	var $user_id;
-	var $meeting_id;
-	var $reminder_time;
-	var $reminder_checked;
-	var $email_reminder_time;
-	var $email_reminder_checked;
-	var $email_reminder_sent;
-	var $required;
-	var $accept_status;
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
-	var $account_id;
-	var $opportunity_id;
-	var $case_id;
-	var $assigned_user_name;
-	var $outlook_id;
-	var $sequence;
-	var $syncing = false;
-	var $recurring_source;
-
-	var $update_vcal = true;
-	var $contacts_arr;
-	var $users_arr;
-	var $meetings_arr;
-	// when assoc w/ a user/contact:
-	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
-	var $table_name = "meetings";
-	var $rel_users_table = "meetings_users";
-	var $rel_contacts_table = "meetings_contacts";
-	var $rel_leads_table = "meetings_leads";
-	var $module_dir = "Meetings";
-	var $object_name = "Meeting";
-
-	var $importable = true;
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name', 'accept_status');
-	var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
-									 'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
-	// so you can run get_users() twice and run query only once
-	var $cached_get_users = null;
-	var $new_schema = true;
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $assigned_user_id;
+    var $modified_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $description;
+    var $name;
+    var $location;
+    var $status;
+    var $type;
+    var $date_start;
+    var $time_start;
+    var $date_end;
+    var $duration_hours;
+    var $duration_minutes;
+    var $time_meridiem;
+    var $parent_type;
+    var $parent_type_options;
+    var $parent_id;
+    var $field_name_map;
+    var $contact_id;
+    var $user_id;
+    var $meeting_id;
+    var $reminder_time;
+    var $reminder_checked;
+    var $email_reminder_time;
+    var $email_reminder_checked;
+    var $email_reminder_sent;
+    var $required;
+    var $accept_status;
+    var $parent_name;
+    var $contact_name;
+    var $contact_phone;
+    var $contact_email;
+    var $account_id;
+    var $opportunity_id;
+    var $case_id;
+    var $assigned_user_name;
+    var $outlook_id;
+    var $sequence;
+    var $syncing = false;
+    var $recurring_source;
+
+    var $update_vcal = true;
+    var $contacts_arr;
+    var $users_arr;
+    var $meetings_arr;
+    // when assoc w/ a user/contact:
+    var $minutes_value_default = 15;
+    var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+    var $table_name = "meetings";
+    var $rel_users_table = "meetings_users";
+    var $rel_contacts_table = "meetings_contacts";
+    var $rel_leads_table = "meetings_leads";
+    var $module_dir = "Meetings";
+    var $object_name = "Meeting";
+
+    var $importable = true;
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name', 'accept_status');
+    var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
+                                        'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
+    // so you can run get_users() twice and run query only once
+    var $cached_get_users = null;
+    var $new_schema = true;
     var $date_changed = false;
 
-	/**
-	 * sole constructor
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->setupCustomFields('Meetings');
-		foreach($this->field_defs as $field) {
-			$this->field_name_map[$field['name']] = $field;
-		}
+    /**
+     * sole constructor
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->setupCustomFields('Meetings');
+        foreach($this->field_defs as $field) {
+            $this->field_name_map[$field['name']] = $field;
+        }
 //		$this->fill_in_additional_detail_fields();
         if(!empty($GLOBALS['app_list_strings']['duration_intervals'])) {
             $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
         }
-	}
-
-	/**
-	 * @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 Meeting(){
-		$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();
-	}
-
-	/**
-	 * Disable edit if meeting is recurring and source is not Sugar. It should be edited only from Outlook.
-	 * @param $view string
-	 * @param $is_owner bool
-	 */
-	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
-		// don't check if meeting is being synced from Outlook
-		if($this->syncing == false){
-			$view = strtolower($view);
-			switch($view){
-				case 'edit':
-				case 'save':
-				case 'editview':
-				case 'delete':
-					if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
-						return false;
-					}
-			}
-		}
-		return parent::ACLAccess($view,$is_owner,$in_group);
-	}
-
-	/**
-	 * Stub for integration
-	 * @return bool
-	 */
-	function hasIntegratedMeeting() {
-		return false;
-	}
-
-	// save date_end by calculating user input
-	// this is for calendar
-	function save($check_notify = FALSE) {
-		global $timedate;
-		global $current_user;
-
-		global $disable_date_format;
+    }
+
+    /**
+     * @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 Meeting(){
+        $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();
+    }
+
+    /**
+     * Disable edit if meeting is recurring and source is not Sugar. It should be edited only from Outlook.
+     * @param $view string
+     * @param $is_owner bool
+     */
+    function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
+        // don't check if meeting is being synced from Outlook
+        if($this->syncing == false){
+            $view = strtolower($view);
+            switch($view){
+                case 'edit':
+                case 'save':
+                case 'editview':
+                case 'delete':
+                    if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
+                        return false;
+                    }
+            }
+        }
+        return parent::ACLAccess($view,$is_owner,$in_group);
+    }
+
+    /**
+     * Stub for integration
+     * @return bool
+     */
+    function hasIntegratedMeeting() {
+        return false;
+    }
+
+    // save date_end by calculating user input
+    // this is for calendar
+    function save($check_notify = FALSE) {
+        global $timedate;
+        global $current_user;
+
+        global $disable_date_format;
 
         if(isset($this->date_start))
         {
             $td = $timedate->fromDb($this->date_start);
             if(!$td){
-            		$this->date_start = $timedate->to_db($this->date_start);
-            		$td = $timedate->fromDb($this->date_start);
+                    $this->date_start = $timedate->to_db($this->date_start);
+                    $td = $timedate->fromDb($this->date_start);
             }
             if($td)
             {
@@ -199,30 +199,30 @@ 
             }
         }
 
-		$check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
-				$old_record = new Meeting();
-				$old_record->retrieve($this->id);
-				$old_assigned_user_id = $old_record->assigned_user_id;
-			}
-			if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
-				$this->special_notification = true;
-				$check_notify = true;
+        $check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
+        if(empty($_REQUEST['send_invites'])) {
+            if(!empty($this->id)) {
+                $old_record = new Meeting();
+                $old_record->retrieve($this->id);
+                $old_assigned_user_id = $old_record->assigned_user_id;
+            }
+            if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
+                $this->special_notification = true;
+                $check_notify = true;
                 if(isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
-			}
-		}
-		/*nsingh 7/3/08  commenting out as bug #20814 is invalid
+            }
+        }
+        /*nsingh 7/3/08  commenting out as bug #20814 is invalid
 		if($current_user->getPreference('reminder_time')!= -1 &&  isset($_POST['reminder_checked']) && isset($_POST['reminder_time']) && $_POST['reminder_checked']==0  && $_POST['reminder_time']==-1){
 			$this->reminder_checked = '1';
 			$this->reminder_time = $current_user->getPreference('reminder_time');
 		}*/
 
-		// prevent a mass mailing for recurring meetings created in Calendar module
-		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
-			$check_notify = false;
+        // prevent a mass mailing for recurring meetings created in Calendar module
+        if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
+            $check_notify = false;
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -243,8 +243,8 @@ 
         }
 
         if (empty($this->type)) {
-			$this->type = 'Sugar';
-		}
+            $this->type = 'Sugar';
+        }
 
         if ( isset($api) && is_a($api,'WebMeeting') && empty($this->in_relationship_update) ) {
             // Make sure the API initialized and it supports Web Meetings
@@ -272,175 +272,175 @@ 
             $api->logoff();
         }
 
-		$return_id = parent::save($check_notify);
+        $return_id = parent::save($check_notify);
 
-		if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
-		}
+        if($this->update_vcal) {
+            vCal::cache_sugar_vcal($current_user);
+        }
 
-		if(isset($_REQUEST['reminders_data'])) {
-			Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
-		}
+        if(isset($_REQUEST['reminders_data'])) {
+            Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
+        }
 
 
-		return $return_id;
-	}
+        return $return_id;
+    }
 
-	// this is for calendar
-	function mark_deleted($id) {
+    // this is for calendar
+    function mark_deleted($id) {
 
-		require_once("modules/Calendar/CalendarUtils.php");
-		CalendarUtils::correctRecurrences($this, $id);
+        require_once("modules/Calendar/CalendarUtils.php");
+        CalendarUtils::correctRecurrences($this, $id);
 
-		global $current_user;
+        global $current_user;
 
-		parent::mark_deleted($id);
+        parent::mark_deleted($id);
 
-		if($this->update_vcal) {
-			vCal::cache_sugar_vcal($current_user);
-		}
-	}
+        if($this->update_vcal) {
+            vCal::cache_sugar_vcal($current_user);
+        }
+    }
 
-	function get_summary_text() {
-		return "$this->name";
-	}
+    function get_summary_text() {
+        return "$this->name";
+    }
 
     function create_export_query($order_by, $where, $relate_link_join='')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
-		$contact_required = stristr($where, "contacts");
+        $contact_required = stristr($where, "contacts");
 
-		if($contact_required) {
-			$query = "SELECT meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
+        if($contact_required) {
+            $query = "SELECT meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
             $query .= $custom_join['select'];
-			$query .= " FROM contacts, meetings, meetings_contacts ";
-			$where_auto = " meetings_contacts.contact_id = contacts.id AND meetings_contacts.meeting_id = meetings.id AND meetings.deleted=0 AND contacts.deleted=0";
-		} else {
-			$query = 'SELECT meetings.*, users.user_name as assigned_user_name  ';
+            $query .= " FROM contacts, meetings, meetings_contacts ";
+            $where_auto = " meetings_contacts.contact_id = contacts.id AND meetings_contacts.meeting_id = meetings.id AND meetings.deleted=0 AND contacts.deleted=0";
+        } else {
+            $query = 'SELECT meetings.*, users.user_name as assigned_user_name  ';
             $query .= $custom_join['select'];
-			$query .= ' FROM meetings ';
-			$where_auto = "meetings.deleted=0";
-		}
-		$query .= "  LEFT JOIN users ON meetings.assigned_user_id=users.id ";
+            $query .= ' FROM meetings ';
+            $where_auto = "meetings.deleted=0";
+        }
+        $query .= "  LEFT JOIN users ON meetings.assigned_user_id=users.id ";
 
         $query .= $custom_join['join'];
 
-		if($where != "")
-			$query .= " where $where AND ".$where_auto;
-		else
-			$query .= " where ".$where_auto;
+        if($where != "")
+            $query .= " where $where AND ".$where_auto;
+        else
+            $query .= " where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
             $query .= ' ORDER BY ' . $order_by;
         }
 
-		return $query;
-	}
-
-
-
-	function fill_in_additional_detail_fields() {
-		global $locale;
-		// Fill in the assigned_user_name
-		$this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
-
-		if (!empty($this->contact_id)) {
-			$query  = "SELECT first_name, last_name FROM contacts ";
-			$query .= "WHERE id='$this->contact_id' AND deleted=0";
-			$result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
+        return $query;
+    }
 
-			// Get the contact name.
-			$row = $this->db->fetchByAssoc($result);
-			$GLOBALS['log']->info("additional call fields $query");
-			if($row != null)
-			{
-				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
-				$GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
-				$GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
-			}
-		}
 
 
+    function fill_in_additional_detail_fields() {
+        global $locale;
+        // Fill in the assigned_user_name
+        $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
 
-		$this->created_by_name = get_assigned_user_name($this->created_by);
-		$this->modified_by_name = get_assigned_user_name($this->modified_user_id);
-		$this->fill_in_additional_parent_fields();
+        if (!empty($this->contact_id)) {
+            $query  = "SELECT first_name, last_name FROM contacts ";
+            $query .= "WHERE id='$this->contact_id' AND deleted=0";
+            $result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
 
-		if (!isset($this->time_hour_start)) {
-			$this->time_start_hour = intval(substr($this->time_start, 0, 2));
-		} //if-else
+            // Get the contact name.
+            $row = $this->db->fetchByAssoc($result);
+            $GLOBALS['log']->info("additional call fields $query");
+            if($row != null)
+            {
+                $this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
+                $GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
+                $GLOBALS['log']->debug("Call($this->id): contact_id = $this->contact_id");
+            }
+        }
 
-		if (isset($this->time_minute_start)) {
-			$time_start_minutes = $this->time_minute_start;
-		} else {
-			$time_start_minutes = substr($this->time_start, 3, 5);
-			if ($time_start_minutes > 0 && $time_start_minutes < 15) {
-				$time_start_minutes = "15";
-			} else if ($time_start_minutes > 15 && $time_start_minutes < 30) {
-				$time_start_minutes = "30";
-			} else if ($time_start_minutes > 30 && $time_start_minutes < 45) {
-				$time_start_minutes = "45";
-			} else if ($time_start_minutes > 45) {
-				$this->time_start_hour += 1;
-				$time_start_minutes = "00";
-		    } //if-else
-		} //if-else
 
 
-		if (isset($this->time_hour_start)) {
-			$time_start_hour = $this->time_hour_start;
-		} else {
-			$time_start_hour = intval(substr($this->time_start, 0, 2));
-		}
+        $this->created_by_name = get_assigned_user_name($this->created_by);
+        $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+        $this->fill_in_additional_parent_fields();
+
+        if (!isset($this->time_hour_start)) {
+            $this->time_start_hour = intval(substr($this->time_start, 0, 2));
+        } //if-else
+
+        if (isset($this->time_minute_start)) {
+            $time_start_minutes = $this->time_minute_start;
+        } else {
+            $time_start_minutes = substr($this->time_start, 3, 5);
+            if ($time_start_minutes > 0 && $time_start_minutes < 15) {
+                $time_start_minutes = "15";
+            } else if ($time_start_minutes > 15 && $time_start_minutes < 30) {
+                $time_start_minutes = "30";
+            } else if ($time_start_minutes > 30 && $time_start_minutes < 45) {
+                $time_start_minutes = "45";
+            } else if ($time_start_minutes > 45) {
+                $this->time_start_hour += 1;
+                $time_start_minutes = "00";
+            } //if-else
+        } //if-else
+
+
+        if (isset($this->time_hour_start)) {
+            $time_start_hour = $this->time_hour_start;
+        } else {
+            $time_start_hour = intval(substr($this->time_start, 0, 2));
+        }
 
-		global $timedate;
+        global $timedate;
         $this->time_meridiem = $timedate->AMPMMenu('', $this->time_start, 'onchange="SugarWidgetScheduler.update_time();"');
-		$hours_arr = array ();
-		$num_of_hours = 13;
-		$start_at = 1;
-
-		if (empty ($time_meridiem)) {
-			$num_of_hours = 24;
-			$start_at = 0;
-		} //if
-
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
-			$i = $i."";
-			if (strlen($i) == 1) {
-				$i = "0".$i;
-			}
-			$hours_arr[$i] = $i;
-		} //for
+        $hours_arr = array ();
+        $num_of_hours = 13;
+        $start_at = 1;
+
+        if (empty ($time_meridiem)) {
+            $num_of_hours = 24;
+            $start_at = 0;
+        } //if
+
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
+            $i = $i."";
+            if (strlen($i) == 1) {
+                $i = "0".$i;
+            }
+            $hours_arr[$i] = $i;
+        } //for
 
         if (!isset($this->duration_minutes)) {
-			$this->duration_minutes = $this->minutes_value_default;
-		}
+            $this->duration_minutes = $this->minutes_value_default;
+        }
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
-		if (is_null($this->duration_hours)) {
-			$this->duration_hours = "0";
-		}
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
-
-		if(empty($this->id) && !empty($_REQUEST['date_start'])){
-			$this->date_start = $_REQUEST['date_start'];
-		}
+        if (is_null($this->date_start))
+            $this->date_start = $timedate->now();
+        if (is_null($this->time_start))
+            $this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+        if (is_null($this->duration_hours)) {
+            $this->duration_hours = "0";
+        }
+        if (is_null($this->duration_minutes))
+            $this->duration_minutes = "1";
+
+        if(empty($this->id) && !empty($_REQUEST['date_start'])){
+            $this->date_start = $_REQUEST['date_start'];
+        }
         if(!empty($this->date_start))
         {
             $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(),$this->date_start);
             if (!empty($td))
             {
-    	        if (!empty($this->duration_hours) && $this->duration_hours != '')
+                if (!empty($this->duration_hours) && $this->duration_hours != '')
                 {
-		            $td = $td->modify("+{$this->duration_hours} hours");
-		        }
+                    $td = $td->modify("+{$this->duration_hours} hours");
+                }
                 if (!empty($this->duration_minutes) && $this->duration_minutes != '')
                 {
                     $td = $td->modify("+{$this->duration_minutes} mins");
@@ -451,77 +451,77 @@ 
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
-		}
-
-		global $app_list_strings;
-		$parent_types = $app_list_strings['record_type_display'];
-		$disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
-		foreach($disabled_parent_types as $disabled_parent_type){
-			if($disabled_parent_type != $this->parent_type){
-				unset($parent_types[$disabled_parent_type]);
-			}
-		}
-
-		$this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
-		if (empty($this->reminder_time)) {
-			$this->reminder_time = -1;
-		}
-
-		if ( empty($this->id) ) {
-		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
-		}
-		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
-
-		if (empty($this->email_reminder_time)) {
-			$this->email_reminder_time = -1;
-		}
-		if(empty($this->id)){
-			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
-		}
-		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
-
-		if (isset ($_REQUEST['parent_type']) && empty($this->parent_type)) {
-			$this->parent_type = $_REQUEST['parent_type'];
-		} elseif (is_null($this->parent_type)) {
-			$this->parent_type = $app_list_strings['record_type_default_key'];
-		}
-
-	}
-
-	function get_list_view_data() {
-		$meeting_fields = $this->get_list_view_array();
-
-		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
-		if($this->status == "Planned") {
-			//cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
-			if(empty($action))
-			     $action = "index";
+        }
+
+        global $app_list_strings;
+        $parent_types = $app_list_strings['record_type_display'];
+        $disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
+        foreach($disabled_parent_types as $disabled_parent_type){
+            if($disabled_parent_type != $this->parent_type){
+                unset($parent_types[$disabled_parent_type]);
+            }
+        }
+
+        $this->parent_type_options = get_select_options_with_id($parent_types, $this->parent_type);
+        if (empty($this->reminder_time)) {
+            $this->reminder_time = -1;
+        }
+
+        if ( empty($this->id) ) {
+            $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
+            if ( isset($reminder_t) )
+                $this->reminder_time = $reminder_t;
+        }
+        $this->reminder_checked = $this->reminder_time == -1 ? false : true;
+
+        if (empty($this->email_reminder_time)) {
+            $this->email_reminder_time = -1;
+        }
+        if(empty($this->id)){
+            $reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
+            if(isset($reminder_t))
+                    $this->email_reminder_time = $reminder_t;
+        }
+        $this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
+
+        if (isset ($_REQUEST['parent_type']) && empty($this->parent_type)) {
+            $this->parent_type = $_REQUEST['parent_type'];
+        } elseif (is_null($this->parent_type)) {
+            $this->parent_type = $app_list_strings['record_type_default_key'];
+        }
+
+    }
+
+    function get_list_view_data() {
+        $meeting_fields = $this->get_list_view_array();
+
+        global $app_list_strings, $focus, $action, $currentModule;
+        if(isset($this->parent_type))
+            $meeting_fields['PARENT_MODULE'] = $this->parent_type;
+        if($this->status == "Planned") {
+            //cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
+            if(empty($action))
+                    $action = "index";
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
-			if ($this->ACLAccess('edit')) {
+            if ($this->ACLAccess('edit')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $meeting_fields['SET_COMPLETE'] = '';
             }
-		}
-		global $timedate;
-		$today = $timedate->nowDb();
-		$nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
-		$mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
-		$date_db = $timedate->to_db($mergeTime);
-		if($date_db	< $today	) {
-			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
-			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
-		} else {
-			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
-		}
-		$this->fill_in_additional_detail_fields();
+        }
+        global $timedate;
+        $today = $timedate->nowDb();
+        $nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
+        $mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
+        $date_db = $timedate->to_db($mergeTime);
+        if($date_db	< $today	) {
+            $meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
+        }else if($date_db	< $nextday) {
+            $meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
+        } else {
+            $meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
+        }
+        $this->fill_in_additional_detail_fields();
 
         // make sure we grab the localized version of the contact name, if a contact is provided
         if (!empty($this->contact_id))
@@ -537,342 +537,342 @@ 
 
         $meeting_fields['CONTACT_ID'] = $this->contact_id;
         $meeting_fields['CONTACT_NAME'] = $this->contact_name;
-		$meeting_fields['PARENT_NAME'] = $this->parent_name;
+        $meeting_fields['PARENT_NAME'] = $this->parent_name;
         $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
         $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
 
 
-		return $meeting_fields;
-	}
-
-	function set_notification_body($xtpl, &$meeting) {
-		global $sugar_config;
-		global $app_list_strings;
-		global $current_user;
-		global $timedate;
-
-
-		// cn: bug 9494 - passing a contact breaks this call
-		$notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
-		// cn: bug 8078 - fixed call to $timedate
-		if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} else {
-			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
-							'/index.php?entryPoint=acceptDecline&module=Meetings&user_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		}
-		$xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
-		$xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
-		$xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
-		$typekey = strtolower($meeting->type);
-		if(isset($meeting->type)) {
-		    if(!empty($app_list_strings['eapm_list'][$typekey])) {
-    		    $typestring = $app_list_strings['eapm_list'][$typekey];
-	    	} else {
-		        $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
-		    }
-		}
-		$xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
-		$startdate = $timedate->fromDb($meeting->date_start);
-		$xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
-		$enddate = $timedate->fromDb($meeting->date_end);
-		$xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));
-		$xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
-		$xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
-		$xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
+        return $meeting_fields;
+    }
+
+    function set_notification_body($xtpl, &$meeting) {
+        global $sugar_config;
+        global $app_list_strings;
+        global $current_user;
+        global $timedate;
+
+
+        // cn: bug 9494 - passing a contact breaks this call
+        $notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
+        // cn: bug 8078 - fixed call to $timedate
+        if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        } elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        } else {
+            $xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
+                            '/index.php?entryPoint=acceptDecline&module=Meetings&user_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
+        }
+        $xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
+        $xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
+        $xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
+        $typekey = strtolower($meeting->type);
+        if(isset($meeting->type)) {
+            if(!empty($app_list_strings['eapm_list'][$typekey])) {
+                $typestring = $app_list_strings['eapm_list'][$typekey];
+            } else {
+                $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
+            }
+        }
+        $xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
+        $startdate = $timedate->fromDb($meeting->date_start);
+        $xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
+        $enddate = $timedate->fromDb($meeting->date_end);
+        $xtpl->assign("MEETING_ENDDATE", $timedate->asUser($enddate, $notifyUser)." ".TimeDate::userTimezoneSuffix($enddate, $notifyUser));
+        $xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
+        $xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
+        $xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
         if ( !empty($meeting->join_url) ) {
             $xtpl->assign('MEETING_URL', $meeting->join_url);
             $xtpl->parse('Meeting.Meeting_External_API');
         }
 
-		return $xtpl;
-	}
+        return $xtpl;
+    }
 
-	/**
-	 * Redefine method to attach ics file to notification email
-	 */
-	public function create_notification_email($notify_user){
+    /**
+     * Redefine method to attach ics file to notification email
+     */
+    public function create_notification_email($notify_user){
         // reset acceptance status for non organizer if date is changed
         if (($notify_user->id != $GLOBALS['current_user']->id) && $this->date_changed) {
             $this->set_accept_status($notify_user, 'none');
         }
 
-		$notify_mail = parent::create_notification_email($notify_user);
-
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
-
-		require_once("modules/vCals/vCal.php");
-		$content = vCal::get_ical_event($this, $GLOBALS['current_user']);
-
-		if(file_put_contents($path,$content)){
-			$notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
-		}
-		return $notify_mail;
-	}
-
-	/**
-	 * Redefine method to remove ics after email is sent
-	 */
-	public function send_assignment_notifications($notify_user, $admin){
-		parent::send_assignment_notifications($notify_user, $admin);
-
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
-		unlink($path);
-	}
-
-	function get_meeting_users() {
-		$template = new User();
-		// First, get the list of IDs.
-		$query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.user_id from meetings_users where meetings_users.meeting_id='$this->id' AND meetings_users.deleted=0";
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
-			$record = $template->retrieve($row['user_id']);
-			$template->required = $row['required'];
-			$template->accept_status = $row['accept_status'];
-
-			if($record != null) {
-				// this copies the object into the array
-				$list[] = $template;
-			}
-		}
-		return $list;
-	}
-
-	function get_invite_meetings(&$user) {
-		$template = $this;
-		// First, get the list of IDs.
-		$GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
-		$query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.meeting_id from meetings_users where meetings_users.user_id='$user->id' AND( meetings_users.accept_status IS NULL OR	meetings_users.accept_status='none') AND meetings_users.deleted=0";
-		$result = $this->db->query($query, true);
-		$list = Array();
-
-		while($row = $this->db->fetchByAssoc($result)) {
-			$record = $template->retrieve($row['meeting_id']);
-			$template->required = $row['required'];
-			$template->accept_status = $row['accept_status'];
-
-
-			if($record != null)
-			{
-			// this copies the object into the array
-			$list[] = $template;
-			}
-		}
-		return $list;
-	}
-
-
-	function set_accept_status(&$user,$status)
-	{
-		if($user->object_name == 'User')
-		{
-			$relate_values = array('user_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
-			global $current_user;
-
-			if($this->update_vcal)
-			{
-				vCal::cache_sugar_vcal($user);
-			}
-		}
-		else if($user->object_name == 'Contact')
-		{
-			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-		}
+        $notify_mail = parent::create_notification_email($notify_user);
+
+        $path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+
+        require_once("modules/vCals/vCal.php");
+        $content = vCal::get_ical_event($this, $GLOBALS['current_user']);
+
+        if(file_put_contents($path,$content)){
+            $notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
+        }
+        return $notify_mail;
+    }
+
+    /**
+     * Redefine method to remove ics after email is sent
+     */
+    public function send_assignment_notifications($notify_user, $admin){
+        parent::send_assignment_notifications($notify_user, $admin);
+
+        $path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+        unlink($path);
+    }
+
+    function get_meeting_users() {
+        $template = new User();
+        // First, get the list of IDs.
+        $query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.user_id from meetings_users where meetings_users.meeting_id='$this->id' AND meetings_users.deleted=0";
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
+            $record = $template->retrieve($row['user_id']);
+            $template->required = $row['required'];
+            $template->accept_status = $row['accept_status'];
+
+            if($record != null) {
+                // this copies the object into the array
+                $list[] = $template;
+            }
+        }
+        return $list;
+    }
+
+    function get_invite_meetings(&$user) {
+        $template = $this;
+        // First, get the list of IDs.
+        $GLOBALS['log']->debug("Finding linked records $this->object_name: ".$query);
+        $query = "SELECT meetings_users.required, meetings_users.accept_status, meetings_users.meeting_id from meetings_users where meetings_users.user_id='$user->id' AND( meetings_users.accept_status IS NULL OR	meetings_users.accept_status='none') AND meetings_users.deleted=0";
+        $result = $this->db->query($query, true);
+        $list = Array();
+
+        while($row = $this->db->fetchByAssoc($result)) {
+            $record = $template->retrieve($row['meeting_id']);
+            $template->required = $row['required'];
+            $template->accept_status = $row['accept_status'];
+
+
+            if($record != null)
+            {
+            // this copies the object into the array
+            $list[] = $template;
+            }
+        }
+        return $list;
+    }
+
+
+    function set_accept_status(&$user,$status)
+    {
+        if($user->object_name == 'User')
+        {
+            $relate_values = array('user_id'=>$user->id,'meeting_id'=>$this->id);
+            $data_values = array('accept_status'=>$status);
+            $this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
+            global $current_user;
+
+            if($this->update_vcal)
+            {
+                vCal::cache_sugar_vcal($user);
+            }
+        }
+        else if($user->object_name == 'Contact')
+        {
+            $relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
+            $data_values = array('accept_status'=>$status);
+            $this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
+        }
         else if($user->object_name == 'Lead')
-		{
-			$relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
-			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
-		}
-	}
+        {
+            $relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
+            $data_values = array('accept_status'=>$status);
+            $this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+        }
+    }
 
 
-	function get_notification_recipients() {
-		if($this->special_notification) {
-			return parent::get_notification_recipients();
-		}
+    function get_notification_recipients() {
+        if($this->special_notification) {
+            return parent::get_notification_recipients();
+        }
 
-		$list = array();
-		if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
-		}
+        $list = array();
+        if(!is_array($this->contacts_arr)) {
+            $this->contacts_arr =	array();
+        }
 
-		if(!is_array($this->users_arr)) {
-			$this->users_arr =	array();
-		}
+        if(!is_array($this->users_arr)) {
+            $this->users_arr =	array();
+        }
 
         if(!is_array($this->leads_arr)) {
-			$this->leads_arr =	array();
-		}
-
-		foreach($this->users_arr as $user_id) {
-			$notify_user = new User();
-			$notify_user->retrieve($user_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-
-		foreach($this->contacts_arr as $contact_id) {
-			$notify_user = new Contact();
-			$notify_user->retrieve($contact_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
+            $this->leads_arr =	array();
+        }
+
+        foreach($this->users_arr as $user_id) {
+            $notify_user = new User();
+            $notify_user->retrieve($user_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+
+        foreach($this->contacts_arr as $contact_id) {
+            $notify_user = new Contact();
+            $notify_user->retrieve($contact_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
 
         foreach($this->leads_arr as $lead_id) {
-			$notify_user = new Lead();
-			$notify_user->retrieve($lead_id);
-			$notify_user->new_assigned_user_name = $notify_user->full_name;
-			$GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
-			$list[$notify_user->id] = $notify_user;
-		}
-
-		global $sugar_config;
-		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
-			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
-		}
-		return $list;
-	}
-
-
-	function bean_implements($interface) {
-		switch($interface) {
-			case 'ACL':return true;
-		}
-		return false;
-	}
-
-	function listviewACLHelper() {
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)) {
-
-			if(!empty($this->parent_name_owner)) {
-				global $current_user;
-				$is_owner = $current_user->id == $this->parent_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
-				global $current_user;
+            $notify_user = new Lead();
+            $notify_user->retrieve($lead_id);
+            $notify_user->new_assigned_user_name = $notify_user->full_name;
+            $GLOBALS['log']->info("Notifications: recipient is $notify_user->new_assigned_user_name");
+            $list[$notify_user->id] = $notify_user;
+        }
+
+        global $sugar_config;
+        if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
+            global $current_user;
+            if(isset($list[$current_user->id]))
+                unset($list[$current_user->id]);
+        }
+        return $list;
+    }
+
+
+    function bean_implements($interface) {
+        switch($interface) {
+            case 'ACL':return true;
+        }
+        return false;
+    }
+
+    function listviewACLHelper() {
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->parent_name)) {
+
+            if(!empty($this->parent_name_owner)) {
+                global $current_user;
+                $is_owner = $current_user->id == $this->parent_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //parent_name_owner not being set for whatever reason so we need to figure this out
+            else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-		/* BEGIN - SECURITY GROUPS */
-		/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+        /* BEGIN - SECURITY GROUPS */
+        /**
 		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)) {
-		*/
-		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+         */
+        if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
         /* END - SECURITY GROUPS */
-			$array_assign['PARENT'] = 'a';
-		} else {
-			$array_assign['PARENT'] = 'span';
-		}
-
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-
-		if(!empty($this->contact_name)) {
-			if(!empty($this->contact_name_owner)) {
-				global $current_user;
-				$is_owner = $current_user->id == $this->contact_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//contact_name_owner not being set for whatever reason so we need to figure this out
-			else {
-				global $current_user;
+            $array_assign['PARENT'] = 'a';
+        } else {
+            $array_assign['PARENT'] = 'span';
+        }
+
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+
+        if(!empty($this->contact_name)) {
+            if(!empty($this->contact_name_owner)) {
+                global $current_user;
+                $is_owner = $current_user->id == $this->contact_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //contact_name_owner not being set for whatever reason so we need to figure this out
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-		/* BEGIN - SECURITY GROUPS */
-		/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+        /* BEGIN - SECURITY GROUPS */
+        /**
 		if(ACLController::checkAccess('Contacts', 'view', $is_owner)) {
-		*/
-		if(ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
+         */
+        if(ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
-			$array_assign['CONTACT'] = 'a';
-		} else {
-			$array_assign['CONTACT'] = 'span';
-		}
-		return $array_assign;
-	}
-
-
-	function save_relationship_changes($is_update, $exclude = array()) {
-	    if(empty($this->in_workflow)) {
-           if(empty($this->in_import)){//if a meeting is being imported then contact_id  should not be excluded
-           //if the global soap_server_object variable is not empty (as in from a soap/OPI call), then process the assigned_user_id relationship, otherwise
-           //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
-           	if(!empty($GLOBALS['soap_server_object'])){
-           		$exclude = array('contact_id', 'user_id');
-           	}else{
-	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
-           	}
-           }
-           else{
-           	$exclude = array('user_id');
-           }
-        }
-       parent::save_relationship_changes($is_update, $exclude);
-	}
-
-
-	/**
-	 * @see SugarBean::afterImportSave()
-	 */
-	public function afterImportSave()
-	{
-	    if ( $this->parent_type == 'Contacts' ) {
-	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
-	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
-	    }
-
-	    parent::afterImportSave();
-	}
+            $array_assign['CONTACT'] = 'a';
+        } else {
+            $array_assign['CONTACT'] = 'span';
+        }
+        return $array_assign;
+    }
+
+
+    function save_relationship_changes($is_update, $exclude = array()) {
+        if(empty($this->in_workflow)) {
+            if(empty($this->in_import)){//if a meeting is being imported then contact_id  should not be excluded
+            //if the global soap_server_object variable is not empty (as in from a soap/OPI call), then process the assigned_user_id relationship, otherwise
+            //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
+                if(!empty($GLOBALS['soap_server_object'])){
+                    $exclude = array('contact_id', 'user_id');
+                }else{
+                $exclude = array('contact_id', 'user_id','assigned_user_id');
+                }
+            }
+            else{
+                $exclude = array('user_id');
+            }
+        }
+        parent::save_relationship_changes($is_update, $exclude);
+    }
+
+
+    /**
+     * @see SugarBean::afterImportSave()
+     */
+    public function afterImportSave()
+    {
+        if ( $this->parent_type == 'Contacts' ) {
+            $this->load_relationship('contacts');
+            if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
+                $this->contacts->add($this->parent_id);
+        }
+        elseif ( $this->parent_type == 'Leads' ) {
+            $this->load_relationship('leads');
+            if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
+                $this->leads->add($this->parent_id);
+        }
+
+        parent::afterImportSave();
+    }
 
     public function getDefaultStatus()
     {
-         $def = $this->field_defs['status'];
-         if (isset($def['default'])) {
-             return $def['default'];
-         } else {
+            $def = $this->field_defs['status'];
+            if (isset($def['default'])) {
+                return $def['default'];
+            } else {
             $app = return_app_list_strings_language($GLOBALS['current_language']);
             if (isset($def['options']) && isset($app[$def['options']])) {
                 $keys = array_keys($app[$def['options']]);
@@ -888,9 +888,9 @@ 
 //TODO: do we really need focus, name and view params for this function
 function getMeetingsExternalApiDropDown($focus = null, $name = null, $value = null, $view = null)
 {
-	global $dictionary, $app_list_strings;
+    global $dictionary, $app_list_strings;
 
-	$cacheKeyName = 'meetings_type_drop_down';
+    $cacheKeyName = 'meetings_type_drop_down';
 
     $apiList = sugar_cache_retrieve($cacheKeyName);
     if ($apiList === null)
@@ -902,17 +902,17 @@ 
         sugar_cache_put($cacheKeyName, $apiList);
     }
 
-	if(!empty($value) && empty($apiList[$value]))
-	{
-		$apiList[$value] = $value;
+    if(!empty($value) && empty($apiList[$value]))
+    {
+        $apiList[$value] = $value;
     }
-	//bug 46294: adding list of options to dropdown list (if it is not the default list)
+    //bug 46294: adding list of options to dropdown list (if it is not the default list)
     if ($dictionary['Meeting']['fields']['type']['options'] != "eapm_list")
     {
         $apiList = array_merge(getMeetingTypeOptions($dictionary, $app_list_strings), $apiList);
     }
 
-	return $apiList;
+    return $apiList;
 }
 
 /**
@@ -923,20 +923,20 @@ 
  */
 function getMeetingTypeOptions($dictionary, $app_list_strings)
 {
-	$result = array();
+    $result = array();
 
     // getting name of meeting type to fill dropdown list by its values
     if (isset($dictionary['Meeting']['fields']['type']['options']))
-	{
-    	$typeName = $dictionary['Meeting']['fields']['type']['options'];
+    {
+        $typeName = $dictionary['Meeting']['fields']['type']['options'];
 
         if (!empty($app_list_strings[$typeName]))
-		{
-        	$typeList = $app_list_strings[$typeName];
+        {
+            $typeList = $app_list_strings[$typeName];
 
             foreach ($typeList as $key => $value)
-			{
-				$result[$value] = $value;
+            {
+                $result[$value] = $value;
             }
         }
     }

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-2013 SugarCRM Inc.
@@ -93,7 +93,7 @@ 
 	var $meetings_arr;
 	// when assoc w/ a user/contact:
 	var $minutes_value_default = 15;
-	var $minutes_values = array('0'=>'00','15'=>'15','30'=>'30','45'=>'45');
+	var $minutes_values = array('0'=>'00', '15'=>'15', '30'=>'30', '45'=>'45');
 	var $table_name = "meetings";
 	var $rel_users_table = "meetings_users";
 	var $rel_contacts_table = "meetings_contacts";
@@ -104,8 +104,8 @@ 
 	var $importable = true;
 	// This is used to retrieve related fields from form posts.
 	var $additional_column_fields = array('assigned_user_name', 'assigned_user_id', 'contact_id', 'user_id', 'contact_name', 'accept_status');
-	var $relationship_fields = array('account_id'=>'accounts','opportunity_id'=>'opportunity','case_id'=>'case',
-									 'assigned_user_id'=>'users','contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
+	var $relationship_fields = array('account_id'=>'accounts', 'opportunity_id'=>'opportunity', 'case_id'=>'case',
+									 'assigned_user_id'=>'users', 'contact_id'=>'contacts', 'user_id'=>'users', 'meeting_id'=>'meetings');
 	// so you can run get_users() twice and run query only once
 	var $cached_get_users = null;
 	var $new_schema = true;
@@ -117,11 +117,11 @@ 
 	public function __construct() {
 		parent::__construct();
 		$this->setupCustomFields('Meetings');
-		foreach($this->field_defs as $field) {
+		foreach ($this->field_defs as $field) {
 			$this->field_name_map[$field['name']] = $field;
 		}
 //		$this->fill_in_additional_detail_fields();
-        if(!empty($GLOBALS['app_list_strings']['duration_intervals'])) {
+        if (!empty($GLOBALS['app_list_strings']['duration_intervals'])) {
             $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
         }
 	}
@@ -129,9 +129,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 Meeting(){
+	public function Meeting() {
 		$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 {
@@ -145,21 +145,21 @@ 
 	 * @param $view string
 	 * @param $is_owner bool
 	 */
-	function ACLAccess($view,$is_owner='not_set',$in_group='not_set'){
+	function ACLAccess($view, $is_owner = 'not_set', $in_group = 'not_set') {
 		// don't check if meeting is being synced from Outlook
-		if($this->syncing == false){
+		if ($this->syncing == false) {
 			$view = strtolower($view);
-			switch($view){
+			switch ($view) {
 				case 'edit':
 				case 'save':
 				case 'editview':
 				case 'delete':
-					if(!empty($this->recurring_source) && $this->recurring_source != "Sugar"){
+					if (!empty($this->recurring_source) && $this->recurring_source != "Sugar") {
 						return false;
 					}
 			}
 		}
-		return parent::ACLAccess($view,$is_owner,$in_group);
+		return parent::ACLAccess($view, $is_owner, $in_group);
 	}
 
 	/**
@@ -178,14 +178,14 @@ 
 
 		global $disable_date_format;
 
-        if(isset($this->date_start))
+        if (isset($this->date_start))
         {
             $td = $timedate->fromDb($this->date_start);
-            if(!$td){
+            if (!$td) {
             		$this->date_start = $timedate->to_db($this->date_start);
             		$td = $timedate->fromDb($this->date_start);
             }
-            if($td)
+            if ($td)
             {
                 if (isset($this->duration_hours) && $this->duration_hours != '')
                 {
@@ -199,17 +199,17 @@ 
             }
         }
 
-		$check_notify =(!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
-		if(empty($_REQUEST['send_invites'])) {
-			if(!empty($this->id)) {
+		$check_notify = (!empty($_REQUEST['send_invites']) && $_REQUEST['send_invites'] == '1') ? true : false;
+		if (empty($_REQUEST['send_invites'])) {
+			if (!empty($this->id)) {
 				$old_record = new Meeting();
 				$old_record->retrieve($this->id);
 				$old_assigned_user_id = $old_record->assigned_user_id;
 			}
-			if((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id']) ){
+			if ((empty($this->id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $GLOBALS['current_user']->id != $_REQUEST['assigned_user_id']) || (isset($old_assigned_user_id) && !empty($old_assigned_user_id) && isset($_REQUEST['assigned_user_id']) && !empty($_REQUEST['assigned_user_id']) && $old_assigned_user_id != $_REQUEST['assigned_user_id'])) {
 				$this->special_notification = true;
 				$check_notify = true;
-                if(isset($_REQUEST['assigned_user_name'])) {
+                if (isset($_REQUEST['assigned_user_name'])) {
                     $this->new_assigned_user_name = $_REQUEST['assigned_user_name'];
                 }
 			}
@@ -221,23 +221,23 @@ 
 		}*/
 
 		// prevent a mass mailing for recurring meetings created in Calendar module
-		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
+		if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
 			$check_notify = false;
 
-        if (empty($this->status) ) {
+        if (empty($this->status)) {
             $this->status = $this->getDefaultStatus();
         }
 
         // Do any external API saving
         // Clear out the old external API stuff if we have changed types
-        if (isset($this->fetched_row) && $this->fetched_row['type'] != $this->type ) {
+        if (isset($this->fetched_row) && $this->fetched_row['type'] != $this->type) {
             $this->join_url = '';
             $this->host_url = '';
             $this->external_id = '';
             $this->creator = '';
         }
 
-        if (!empty($this->type) && $this->type != 'Sugar' ) {
+        if (!empty($this->type) && $this->type != 'Sugar') {
             require_once('include/externalAPI/ExternalAPIFactory.php');
             $api = ExternalAPIFactory::loadAPI($this->type);
         }
@@ -246,27 +246,27 @@ 
 			$this->type = 'Sugar';
 		}
 
-        if ( isset($api) && is_a($api,'WebMeeting') && empty($this->in_relationship_update) ) {
+        if (isset($api) && is_a($api, 'WebMeeting') && empty($this->in_relationship_update)) {
             // Make sure the API initialized and it supports Web Meetings
             // Also make suer we have an ID, the external site needs something to reference
-            if ( !isset($this->id) || empty($this->id) ) {
+            if (!isset($this->id) || empty($this->id)) {
                 $this->id = create_guid();
                 $this->new_with_id = true;
             }
             $response = $api->scheduleMeeting($this);
-            if ( $response['success'] == TRUE ) {
+            if ($response['success'] == TRUE) {
                 // Need to send out notifications
-                if ( $api->canInvite ) {
+                if ($api->canInvite) {
                     $notifyList = $this->get_notification_recipients();
-                    foreach($notifyList as $person) {
-                        $api->inviteAttendee($this,$person,$check_notify);
+                    foreach ($notifyList as $person) {
+                        $api->inviteAttendee($this, $person, $check_notify);
                     }
 
                 }
             } else {
                 // Generic Message Provides no value to End User - Log the issue with message detail and continue
                 // SugarApplication::appendErrorMessage($GLOBALS['app_strings']['ERR_EXTERNAL_API_SAVE_FAIL']);
-                $GLOBALS['log']->warn('ERR_EXTERNAL_API_SAVE_FAIL' . ": " . $this->type . " - " .  $response['errorMessage']);
+                $GLOBALS['log']->warn('ERR_EXTERNAL_API_SAVE_FAIL'.": ".$this->type." - ".$response['errorMessage']);
             }
 
             $api->logoff();
@@ -274,11 +274,11 @@ 
 
 		$return_id = parent::save($check_notify);
 
-		if($this->update_vcal) {
+		if ($this->update_vcal) {
 			vCal::cache_sugar_vcal($current_user);
 		}
 
-		if(isset($_REQUEST['reminders_data'])) {
+		if (isset($_REQUEST['reminders_data'])) {
 			Reminder::saveRemindersDataJson('Meetings', $return_id, html_entity_decode($_REQUEST['reminders_data']));
 		}
 
@@ -296,7 +296,7 @@ 
 
 		parent::mark_deleted($id);
 
-		if($this->update_vcal) {
+		if ($this->update_vcal) {
 			vCal::cache_sugar_vcal($current_user);
 		}
 	}
@@ -305,13 +305,13 @@ 
 		return "$this->name";
 	}
 
-    function create_export_query($order_by, $where, $relate_link_join='')
+    function create_export_query($order_by, $where, $relate_link_join = '')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
 		$contact_required = stristr($where, "contacts");
 
-		if($contact_required) {
+		if ($contact_required) {
 			$query = "SELECT meetings.*, contacts.first_name, contacts.last_name, contacts.assigned_user_id contact_name_owner, users.user_name as assigned_user_name   ";
             $query .= $custom_join['select'];
 			$query .= " FROM contacts, meetings, meetings_contacts ";
@@ -326,14 +326,14 @@ 
 
         $query .= $custom_join['join'];
 
-		if($where != "")
+		if ($where != "")
 			$query .= " where $where AND ".$where_auto;
 		else
 			$query .= " where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
-            $query .= ' ORDER BY ' . $order_by;
+            $query .= ' ORDER BY '.$order_by;
         }
 
 		return $query;
@@ -349,12 +349,12 @@ 
 		if (!empty($this->contact_id)) {
 			$query  = "SELECT first_name, last_name FROM contacts ";
 			$query .= "WHERE id='$this->contact_id' AND deleted=0";
-			$result = $this->db->limitQuery($query,0,1,true," Error filling in additional detail fields: ");
+			$result = $this->db->limitQuery($query, 0, 1, true, " Error filling in additional detail fields: ");
 
 			// Get the contact name.
 			$row = $this->db->fetchByAssoc($result);
 			$GLOBALS['log']->info("additional call fields $query");
-			if($row != null)
+			if ($row != null)
 			{
 				$this->contact_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '', '');
 				$GLOBALS['log']->debug("Call($this->id): contact_name = $this->contact_name");
@@ -397,7 +397,7 @@ 
 
 		global $timedate;
         $this->time_meridiem = $timedate->AMPMMenu('', $this->time_start, 'onchange="SugarWidgetScheduler.update_time();"');
-		$hours_arr = array ();
+		$hours_arr = array();
 		$num_of_hours = 13;
 		$start_at = 1;
 
@@ -406,7 +406,7 @@ 
 			$start_at = 0;
 		} //if
 
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
+		for ($i = $start_at; $i < $num_of_hours; $i++) {
 			$i = $i."";
 			if (strlen($i) == 1) {
 				$i = "0".$i;
@@ -429,12 +429,12 @@ 
 		if (is_null($this->duration_minutes))
 			$this->duration_minutes = "1";
 
-		if(empty($this->id) && !empty($_REQUEST['date_start'])){
+		if (empty($this->id) && !empty($_REQUEST['date_start'])) {
 			$this->date_start = $_REQUEST['date_start'];
 		}
-        if(!empty($this->date_start))
+        if (!empty($this->date_start))
         {
-            $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(),$this->date_start);
+            $td = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(), $this->date_start);
             if (!empty($td))
             {
     	        if (!empty($this->duration_hours) && $this->duration_hours != '')
@@ -455,9 +455,9 @@ 
 
 		global $app_list_strings;
 		$parent_types = $app_list_strings['record_type_display'];
-		$disabled_parent_types = ACLController::disabledModuleList($parent_types,false, 'list');
-		foreach($disabled_parent_types as $disabled_parent_type){
-			if($disabled_parent_type != $this->parent_type){
+		$disabled_parent_types = ACLController::disabledModuleList($parent_types, false, 'list');
+		foreach ($disabled_parent_types as $disabled_parent_type) {
+			if ($disabled_parent_type != $this->parent_type) {
 				unset($parent_types[$disabled_parent_type]);
 			}
 		}
@@ -467,9 +467,9 @@ 
 			$this->reminder_time = -1;
 		}
 
-		if ( empty($this->id) ) {
+		if (empty($this->id)) {
 		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
+		    if (isset($reminder_t))
 		        $this->reminder_time = $reminder_t;
 		}
 		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
@@ -477,9 +477,9 @@ 
 		if (empty($this->email_reminder_time)) {
 			$this->email_reminder_time = -1;
 		}
-		if(empty($this->id)){
+		if (empty($this->id)) {
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
+			if (isset($reminder_t))
 		    		$this->email_reminder_time = $reminder_t;
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
@@ -496,15 +496,15 @@ 
 		$meeting_fields = $this->get_list_view_array();
 
 		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
+		if (isset($this->parent_type))
 			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
-		if($this->status == "Planned") {
+		if ($this->status == "Planned") {
 			//cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
-			if(empty($action))
+			if (empty($action))
 			     $action = "index";
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
 			if ($this->ACLAccess('edit')) {
-                $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
+                $meeting_fields['SET_COMPLETE'] = $setCompleteUrl.SugarThemeRegistry::current()->getImage("close_inline", " border='0'", null, null, '.gif', translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $meeting_fields['SET_COMPLETE'] = '';
             }
@@ -514,9 +514,9 @@ 
 		$nextday = $timedate->asDbDate($timedate->getNow()->get("+1 day"));
 		$mergeTime = $meeting_fields['DATE_START']; //$timedate->merge_date_time($meeting_fields['DATE_START'], $meeting_fields['TIME_START']);
 		$date_db = $timedate->to_db($mergeTime);
-		if($date_db	< $today	) {
-			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
+		if ($date_db < $today) {
+			$meeting_fields['DATE_START'] = "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
+		} else if ($date_db < $nextday) {
 			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
 		} else {
 			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
@@ -538,8 +538,8 @@ 
         $meeting_fields['CONTACT_ID'] = $this->contact_id;
         $meeting_fields['CONTACT_NAME'] = $this->contact_name;
 		$meeting_fields['PARENT_NAME'] = $this->parent_name;
-        $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
-        $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
+        $meeting_fields['REMINDER_CHECKED'] = $this->reminder_time == -1 ? false : true;
+        $meeting_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time == -1 ? false : true;
 
 
 		return $meeting_fields;
@@ -553,12 +553,12 @@ 
 
 
 		// cn: bug 9494 - passing a contact breaks this call
-		$notifyUser =($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
+		$notifyUser = ($meeting->current_notify_user->object_name == 'User') ? $meeting->current_notify_user : $current_user;
 		// cn: bug 8078 - fixed call to $timedate
-		if(strtolower(get_class($meeting->current_notify_user)) == 'contact') {
+		if (strtolower(get_class($meeting->current_notify_user)) == 'contact') {
 			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
 							'/index.php?entryPoint=acceptDecline&module=Meetings&contact_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
-		} elseif(strtolower(get_class($meeting->current_notify_user)) == 'lead') {
+		} elseif (strtolower(get_class($meeting->current_notify_user)) == 'lead') {
 			$xtpl->assign("ACCEPT_URL", $sugar_config['site_url'].
 							'/index.php?entryPoint=acceptDecline&module=Meetings&lead_id='.$meeting->current_notify_user->id.'&record='.$meeting->id);
 		} else {
@@ -567,16 +567,16 @@ 
 		}
 		$xtpl->assign("MEETING_TO", $meeting->current_notify_user->new_assigned_user_name);
 		$xtpl->assign("MEETING_SUBJECT", trim($meeting->name));
-		$xtpl->assign("MEETING_STATUS",(isset($meeting->status)? $app_list_strings['meeting_status_dom'][$meeting->status]:""));
+		$xtpl->assign("MEETING_STATUS", (isset($meeting->status) ? $app_list_strings['meeting_status_dom'][$meeting->status] : ""));
 		$typekey = strtolower($meeting->type);
-		if(isset($meeting->type)) {
-		    if(!empty($app_list_strings['eapm_list'][$typekey])) {
+		if (isset($meeting->type)) {
+		    if (!empty($app_list_strings['eapm_list'][$typekey])) {
     		    $typestring = $app_list_strings['eapm_list'][$typekey];
 	    	} else {
 		        $typestring = $app_list_strings['meeting_type_dom'][$meeting->type];
 		    }
 		}
-		$xtpl->assign("MEETING_TYPE", isset($meeting->type)? $typestring:"");
+		$xtpl->assign("MEETING_TYPE", isset($meeting->type) ? $typestring : "");
 		$startdate = $timedate->fromDb($meeting->date_start);
 		$xtpl->assign("MEETING_STARTDATE", $timedate->asUser($startdate, $notifyUser)." ".TimeDate::userTimezoneSuffix($startdate, $notifyUser));
 		$enddate = $timedate->fromDb($meeting->date_end);
@@ -584,7 +584,7 @@ 
 		$xtpl->assign("MEETING_HOURS", $meeting->duration_hours);
 		$xtpl->assign("MEETING_MINUTES", $meeting->duration_minutes);
 		$xtpl->assign("MEETING_DESCRIPTION", $meeting->description);
-        if ( !empty($meeting->join_url) ) {
+        if (!empty($meeting->join_url)) {
             $xtpl->assign('MEETING_URL', $meeting->join_url);
             $xtpl->parse('Meeting.Meeting_External_API');
         }
@@ -595,7 +595,7 @@ 
 	/**
 	 * Redefine method to attach ics file to notification email
 	 */
-	public function create_notification_email($notify_user){
+	public function create_notification_email($notify_user) {
         // reset acceptance status for non organizer if date is changed
         if (($notify_user->id != $GLOBALS['current_user']->id) && $this->date_changed) {
             $this->set_accept_status($notify_user, 'none');
@@ -603,12 +603,12 @@ 
 
 		$notify_mail = parent::create_notification_email($notify_user);
 
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+		$path = SugarConfig::getInstance()->get('upload_dir', 'upload/').$this->id;
 
 		require_once("modules/vCals/vCal.php");
 		$content = vCal::get_ical_event($this, $GLOBALS['current_user']);
 
-		if(file_put_contents($path,$content)){
+		if (file_put_contents($path, $content)) {
 			$notify_mail->AddAttachment($path, 'meeting.ics', 'base64', 'text/calendar');
 		}
 		return $notify_mail;
@@ -617,10 +617,10 @@ 
 	/**
 	 * Redefine method to remove ics after email is sent
 	 */
-	public function send_assignment_notifications($notify_user, $admin){
+	public function send_assignment_notifications($notify_user, $admin) {
 		parent::send_assignment_notifications($notify_user, $admin);
 
-		$path = SugarConfig::getInstance()->get('upload_dir','upload/') . $this->id;
+		$path = SugarConfig::getInstance()->get('upload_dir', 'upload/').$this->id;
 		unlink($path);
 	}
 
@@ -632,13 +632,13 @@ 
 		$result = $this->db->query($query, true);
 		$list = Array();
 
-		while($row = $this->db->fetchByAssoc($result)) {
+		while ($row = $this->db->fetchByAssoc($result)) {
 			$template = new User(); // PHP 5 will retrieve by reference, always over-writing the "old" one
 			$record = $template->retrieve($row['user_id']);
 			$template->required = $row['required'];
 			$template->accept_status = $row['accept_status'];
 
-			if($record != null) {
+			if ($record != null) {
 				// this copies the object into the array
 				$list[] = $template;
 			}
@@ -654,13 +654,13 @@ 
 		$result = $this->db->query($query, true);
 		$list = Array();
 
-		while($row = $this->db->fetchByAssoc($result)) {
+		while ($row = $this->db->fetchByAssoc($result)) {
 			$record = $template->retrieve($row['meeting_id']);
 			$template->required = $row['required'];
 			$template->accept_status = $row['accept_status'];
 
 
-			if($record != null)
+			if ($record != null)
 			{
 			// this copies the object into the array
 			$list[] = $template;
@@ -670,54 +670,54 @@ 
 	}
 
 
-	function set_accept_status(&$user,$status)
+	function set_accept_status(&$user, $status)
 	{
-		if($user->object_name == 'User')
+		if ($user->object_name == 'User')
 		{
-			$relate_values = array('user_id'=>$user->id,'meeting_id'=>$this->id);
+			$relate_values = array('user_id'=>$user->id, 'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_users_table, $relate_values, true, true,$data_values);
+			$this->set_relationship($this->rel_users_table, $relate_values, true, true, $data_values);
 			global $current_user;
 
-			if($this->update_vcal)
+			if ($this->update_vcal)
 			{
 				vCal::cache_sugar_vcal($user);
 			}
 		}
-		else if($user->object_name == 'Contact')
+		else if ($user->object_name == 'Contact')
 		{
-			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
+			$relate_values = array('contact_id'=>$user->id, 'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
+			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true, $data_values);
 		}
-        else if($user->object_name == 'Lead')
+        else if ($user->object_name == 'Lead')
 		{
-			$relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
+			$relate_values = array('lead_id'=>$user->id, 'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
-			$this->set_relationship($this->rel_leads_table, $relate_values, true, true,$data_values);
+			$this->set_relationship($this->rel_leads_table, $relate_values, true, true, $data_values);
 		}
 	}
 
 
 	function get_notification_recipients() {
-		if($this->special_notification) {
+		if ($this->special_notification) {
 			return parent::get_notification_recipients();
 		}
 
 		$list = array();
-		if(!is_array($this->contacts_arr)) {
-			$this->contacts_arr =	array();
+		if (!is_array($this->contacts_arr)) {
+			$this->contacts_arr = array();
 		}
 
-		if(!is_array($this->users_arr)) {
-			$this->users_arr =	array();
+		if (!is_array($this->users_arr)) {
+			$this->users_arr = array();
 		}
 
-        if(!is_array($this->leads_arr)) {
-			$this->leads_arr =	array();
+        if (!is_array($this->leads_arr)) {
+			$this->leads_arr = array();
 		}
 
-		foreach($this->users_arr as $user_id) {
+		foreach ($this->users_arr as $user_id) {
 			$notify_user = new User();
 			$notify_user->retrieve($user_id);
 			$notify_user->new_assigned_user_name = $notify_user->full_name;
@@ -725,7 +725,7 @@ 
 			$list[$notify_user->id] = $notify_user;
 		}
 
-		foreach($this->contacts_arr as $contact_id) {
+		foreach ($this->contacts_arr as $contact_id) {
 			$notify_user = new Contact();
 			$notify_user->retrieve($contact_id);
 			$notify_user->new_assigned_user_name = $notify_user->full_name;
@@ -733,7 +733,7 @@ 
 			$list[$notify_user->id] = $notify_user;
 		}
 
-        foreach($this->leads_arr as $lead_id) {
+        foreach ($this->leads_arr as $lead_id) {
 			$notify_user = new Lead();
 			$notify_user->retrieve($lead_id);
 			$notify_user->new_assigned_user_name = $notify_user->full_name;
@@ -742,9 +742,9 @@ 
 		}
 
 		global $sugar_config;
-		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
+		if (isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
 			global $current_user;
-			if(isset($list[$current_user->id]))
+			if (isset($list[$current_user->id]))
 				unset($list[$current_user->id]);
 		}
 		return $list;
@@ -752,7 +752,7 @@ 
 
 
 	function bean_implements($interface) {
-		switch($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
@@ -762,18 +762,18 @@ 
 		$array_assign = parent::listviewACLHelper();
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)) {
+		if (!empty($this->parent_name)) {
 
-			if(!empty($this->parent_name_owner)) {
+			if (!empty($this->parent_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->parent_name_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+			else if (!empty($this->parent_type) && !empty($this->parent_id)) {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean($this->parent_type, $this->parent_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -786,7 +786,7 @@ 
 		/**
 		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)) {
 		*/
-		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+		if (!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
 			$array_assign['PARENT'] = 'a';
 		} else {
@@ -796,8 +796,8 @@ 
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
 
-		if(!empty($this->contact_name)) {
-			if(!empty($this->contact_name_owner)) {
+		if (!empty($this->contact_name)) {
+			if (!empty($this->contact_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->contact_name_owner;
 			}
@@ -805,8 +805,8 @@ 
 			//contact_name_owner not being set for whatever reason so we need to figure this out
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Contacts', $this->contact_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -819,7 +819,7 @@ 
 		/**
 		if(ACLController::checkAccess('Contacts', 'view', $is_owner)) {
 		*/
-		if(ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
+		if (ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
 			$array_assign['CONTACT'] = 'a';
 		} else {
@@ -830,17 +830,17 @@ 
 
 
 	function save_relationship_changes($is_update, $exclude = array()) {
-	    if(empty($this->in_workflow)) {
-           if(empty($this->in_import)){//if a meeting is being imported then contact_id  should not be excluded
+	    if (empty($this->in_workflow)) {
+           if (empty($this->in_import)) {//if a meeting is being imported then contact_id  should not be excluded
            //if the global soap_server_object variable is not empty (as in from a soap/OPI call), then process the assigned_user_id relationship, otherwise
            //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
-           	if(!empty($GLOBALS['soap_server_object'])){
+           	if (!empty($GLOBALS['soap_server_object'])) {
            		$exclude = array('contact_id', 'user_id');
-           	}else{
-	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
+           	} else {
+	    		$exclude = array('contact_id', 'user_id', 'assigned_user_id');
            	}
            }
-           else{
+           else {
            	$exclude = array('user_id');
            }
         }
@@ -853,14 +853,14 @@ 
 	 */
 	public function afterImportSave()
 	{
-	    if ( $this->parent_type == 'Contacts' ) {
+	    if ($this->parent_type == 'Contacts') {
 	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
+	        if (!$this->contacts->relationship_exists('contacts', array('id'=>$this->parent_id)))
 	            $this->contacts->add($this->parent_id);
 	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
+	    elseif ($this->parent_type == 'Leads') {
 	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
+	        if (!$this->leads->relationship_exists('leads', array('id'=>$this->parent_id)))
 	            $this->leads->add($this->parent_id);
 	    }
 
@@ -902,7 +902,7 @@ 
         sugar_cache_put($cacheKeyName, $apiList);
     }
 
-	if(!empty($value) && empty($apiList[$value]))
+	if (!empty($value) && empty($apiList[$value]))
 	{
 		$apiList[$value] = $value;
     }

Braces +49 added lines, -41 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.
@@ -133,8 +135,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();
@@ -221,8 +222,9 @@ 
 		}*/
 
 		// prevent a mass mailing for recurring meetings created in Calendar module
-		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id))
-			$check_notify = false;
+		if(empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
+					$check_notify = false;
+		}
 
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
@@ -326,10 +328,11 @@ 
 
         $query .= $custom_join['join'];
 
-		if($where != "")
-			$query .= " where $where AND ".$where_auto;
-		else
-			$query .= " where ".$where_auto;
+		if($where != "") {
+					$query .= " where $where AND ".$where_auto;
+		} else {
+					$query .= " where ".$where_auto;
+		}
 
         $order_by = $this->process_order_by($order_by);
         if (!empty($order_by)) {
@@ -419,15 +422,18 @@ 
 		}
 
         //setting default date and time
-		if (is_null($this->date_start))
-			$this->date_start = $timedate->now();
-		if (is_null($this->time_start))
-			$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		if (is_null($this->date_start)) {
+					$this->date_start = $timedate->now();
+		}
+		if (is_null($this->time_start)) {
+					$this->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
+		}
 		if (is_null($this->duration_hours)) {
 			$this->duration_hours = "0";
 		}
-		if (is_null($this->duration_minutes))
-			$this->duration_minutes = "1";
+		if (is_null($this->duration_minutes)) {
+					$this->duration_minutes = "1";
+		}
 
 		if(empty($this->id) && !empty($_REQUEST['date_start'])){
 			$this->date_start = $_REQUEST['date_start'];
@@ -446,8 +452,7 @@ 
                     $td = $td->modify("+{$this->duration_minutes} mins");
                 }
                 $this->date_end = $td->format($GLOBALS['timedate']->get_date_time_format());
-            }
-            else
+            } else
             {
                 $GLOBALS['log']->fatal("Meeting::save: Bad date {$this->date_start} for format ".$GLOBALS['timedate']->get_date_time_format());
             }
@@ -469,8 +474,9 @@ 
 
 		if ( empty($this->id) ) {
 		    $reminder_t = $GLOBALS['current_user']->getPreference('reminder_time');
-		    if ( isset($reminder_t) )
-		        $this->reminder_time = $reminder_t;
+		    if ( isset($reminder_t) ) {
+		    		        $this->reminder_time = $reminder_t;
+		    }
 		}
 		$this->reminder_checked = $this->reminder_time == -1 ? false : true;
 
@@ -479,8 +485,9 @@ 
 		}
 		if(empty($this->id)){
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
-			if(isset($reminder_t))
-		    		$this->email_reminder_time = $reminder_t;
+			if(isset($reminder_t)) {
+					    		$this->email_reminder_time = $reminder_t;
+			}
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
 
@@ -496,12 +503,14 @@ 
 		$meeting_fields = $this->get_list_view_array();
 
 		global $app_list_strings, $focus, $action, $currentModule;
-		if(isset($this->parent_type))
-			$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		if(isset($this->parent_type)) {
+					$meeting_fields['PARENT_MODULE'] = $this->parent_type;
+		}
 		if($this->status == "Planned") {
 			//cn: added this if() to deal with sequential Closes in Meetings.	this is a hack to a hack(formbase.php->handleRedirect)
-			if(empty($action))
-			     $action = "index";
+			if(empty($action)) {
+						     $action = "index";
+			}
             $setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Held\",\"listview\",\"1\");'>";
 			if ($this->ACLAccess('edit')) {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
@@ -516,7 +525,7 @@ 
 		$date_db = $timedate->to_db($mergeTime);
 		if($date_db	< $today	) {
 			$meeting_fields['DATE_START']= "<font class='overdueTask'>".$meeting_fields['DATE_START']."</font>";
-		}else if($date_db	< $nextday) {
+		} else if($date_db	< $nextday) {
 			$meeting_fields['DATE_START'] = "<font class='todaysTask'>".$meeting_fields['DATE_START']."</font>";
 		} else {
 			$meeting_fields['DATE_START'] = "<font class='futureTask'>".$meeting_fields['DATE_START']."</font>";
@@ -683,14 +692,12 @@ 
 			{
 				vCal::cache_sugar_vcal($user);
 			}
-		}
-		else if($user->object_name == 'Contact')
+		} else if($user->object_name == 'Contact')
 		{
 			$relate_values = array('contact_id'=>$user->id,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
 			$this->set_relationship($this->rel_contacts_table, $relate_values, true, true,$data_values);
-		}
-        else if($user->object_name == 'Lead')
+		} else if($user->object_name == 'Lead')
 		{
 			$relate_values = array('lead_id'=>$user->id,'meeting_id'=>$this->id);
 			$data_values = array('accept_status'=>$status);
@@ -744,8 +751,9 @@ 
 		global $sugar_config;
 		if(isset($sugar_config['disable_notify_current_user']) && $sugar_config['disable_notify_current_user']) {
 			global $current_user;
-			if(isset($list[$current_user->id]))
-				unset($list[$current_user->id]);
+			if(isset($list[$current_user->id])) {
+							unset($list[$current_user->id]);
+			}
 		}
 		return $list;
 	}
@@ -836,11 +844,10 @@ 
            //add assigned_user_id to exclude list and let the logic from MeetingFormBase determine whether assigned user id gets added to the relationship
            	if(!empty($GLOBALS['soap_server_object'])){
            		$exclude = array('contact_id', 'user_id');
-           	}else{
+           	} else{
 	    		$exclude = array('contact_id', 'user_id','assigned_user_id');
            	}
-           }
-           else{
+           } else{
            	$exclude = array('user_id');
            }
         }
@@ -855,13 +862,14 @@ 
 	{
 	    if ( $this->parent_type == 'Contacts' ) {
 	        $this->load_relationship('contacts');
-	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) )
-	            $this->contacts->add($this->parent_id);
-	    }
-	    elseif ( $this->parent_type == 'Leads' ) {
+	        if ( !$this->contacts->relationship_exists('contacts',array('id'=>$this->parent_id)) ) {
+	        	            $this->contacts->add($this->parent_id);
+	        }
+	    } elseif ( $this->parent_type == 'Leads' ) {
 	        $this->load_relationship('leads');
-	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) )
-	            $this->leads->add($this->parent_id);
+	        if ( !$this->leads->relationship_exists('leads',array('id'=>$this->parent_id)) ) {
+	        	            $this->leads->add($this->parent_id);
+	        }
 	    }
 
 	    parent::afterImportSave();

modules/Meetings/MeetingsJjwg_MapsLogicHook.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MeetingsJjwg_MapsLogicHook(){
+    function MeetingsJjwg_MapsLogicHook() {
         $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

@@ -1,6 +1,8 @@ 
 <?php
 
-if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class MeetingsJjwg_MapsLogicHook
 {
@@ -19,8 +21,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();

modules/Meetings/views/view.listbytype.php

Spacing +18 added lines, -18 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
@@ -52,9 +52,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MeetingsViewListbytype(){
+    function MeetingsViewListbytype() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -64,20 +64,20 @@ 
     }
 
 
- 	function listViewProcess(){
-        if (!$eapmBean = EAPM::getLoginInfo('IBMSmartCloud', true) ) {
+ 	function listViewProcess() {
+        if (!$eapmBean = EAPM::getLoginInfo('IBMSmartCloud', true)) {
             $smarty = new Sugar_Smarty();
             echo $smarty->fetch('include/externalAPI/IBMSmartCloud/IBMSmartCloudSignup.'.$GLOBALS['current_language'].'.tpl');
             return;
         }
 
         $apiName = 'IBMSmartCloud';
-        $api = ExternalAPIFactory::loadAPI($apiName,true);
+        $api = ExternalAPIFactory::loadAPI($apiName, true);
         $api->loadEAPM($eapmBean);
 
         $quickCheck = $api->quickCheckLogin();
-        if ( ! $quickCheck['success'] ) {
-            $errorMessage = string_format(translate('LBL_ERR_FAILED_QUICKCHECK','EAPM'), array('IBM SmartCloud'));
+        if (!$quickCheck['success']) {
+            $errorMessage = string_format(translate('LBL_ERR_FAILED_QUICKCHECK', 'EAPM'), array('IBM SmartCloud'));
             $errorMessage .= '<form method="POST" target="_EAPM_CHECK" action="index.php">';
             $errorMessage .= '<input type="hidden" name="module" value="EAPM">';
             $errorMessage .= '<input type="hidden" name="action" value="Save">';
@@ -102,18 +102,18 @@ 
 
    		unset($this->searchForm->searchdefs['layout']['advanced_search']);
 
-		if(!$this->headers) {
+		if (!$this->headers) {
 			return;
         }
 
-		if(empty($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] == false){
-			$this->lv->ss->assign("SEARCH",false);
-            if ( !isset($_REQUEST['name_basic']) ) {
+		if (empty($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] == false) {
+			$this->lv->ss->assign("SEARCH", false);
+            if (!isset($_REQUEST['name_basic'])) {
                 $_REQUEST['name_basic'] = '';
             }
-            $this->lv->ss->assign('DCSEARCH',$_REQUEST['name_basic']);
+            $this->lv->ss->assign('DCSEARCH', $_REQUEST['name_basic']);
 			$this->lv->setup($this->seed, 'include/ListView/ListViewDCMenu.tpl', $this->where, $this->params);
-			$savedSearchName = empty($_REQUEST['saved_search_select_name']) ? '' : (' - ' . $_REQUEST['saved_search_select_name']);
+			$savedSearchName = empty($_REQUEST['saved_search_select_name']) ? '' : (' - '.$_REQUEST['saved_search_select_name']);
 			echo $this->lv->display();
 		}
  	}
@@ -124,18 +124,18 @@ 
         $_REQUEST = $oldRequest;
     }
 
-    function processSearchForm(){
+    function processSearchForm() {
    		// $type = 'LotusLiveDirect';
    		$type = 'IBMSmartCloud';
           global $timedate;
 
          $two_hours_ago = $GLOBALS['db']->convert($GLOBALS['db']->quoted($timedate->asDb($timedate->getNow()->get("-2 hours"))), 'datetime');
 
-   		$where =  " meetings.type = '$type' AND meetings.status != 'Held' AND meetings.status != 'Not Held' AND meetings.date_start > {$two_hours_ago} AND ( meetings.assigned_user_id = '".$GLOBALS['db']->quote($GLOBALS['current_user']->id)."' OR exists ( SELECT id FROM meetings_users WHERE meeting_id = meetings.id AND user_id = '".$GLOBALS['db']->quote($GLOBALS['current_user']->id)."' AND deleted = 0 ) ) ";
+   		$where = " meetings.type = '$type' AND meetings.status != 'Held' AND meetings.status != 'Not Held' AND meetings.date_start > {$two_hours_ago} AND ( meetings.assigned_user_id = '".$GLOBALS['db']->quote($GLOBALS['current_user']->id)."' OR exists ( SELECT id FROM meetings_users WHERE meeting_id = meetings.id AND user_id = '".$GLOBALS['db']->quote($GLOBALS['current_user']->id)."' AND deleted = 0 ) ) ";
 
-          if ( isset($_REQUEST['name_basic']) ) {
+          if (isset($_REQUEST['name_basic'])) {
               $name_search = trim($_REQUEST['name_basic']);
-              if ( ! empty($name_search) ) {
+              if (!empty($name_search)) {
                   $where .= " AND meetings.name LIKE '".$GLOBALS['db']->quote($name_search)."%' ";
               }
           }

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/Meetings/MeetingsListViewSmarty.php

Spacing +10 added lines, -10 removed lines

@@ -14,9 +14,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MeetingsListViewSmarty(){
+    function MeetingsListViewSmarty() {
         $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 {
@@ -31,14 +31,14 @@ 
 
         global $app_strings;
 
-        $script = "<a href='javascript:void(0)' id='export_listview_top' " .
-            "onclick=\"return sListView.send_form(true, '{$_REQUEST['module']}', " .
-            "'index.php?entryPoint=export', " .
-            "'{$app_strings['LBL_LISTVIEW_NO_SELECTED']}')\">{$app_strings['LBL_EXPORT']}</a>" .
-            "</li><li>" . // List item hack
-            "<a href='javascript:void(0)' id='map_listview_top' " .
-            " onclick=\"return sListView.send_form(true, 'jjwg_Maps', " .
-            "'index.php?entryPoint=jjwg_Maps&display_module={$_REQUEST['module']}', " .
+        $script = "<a href='javascript:void(0)' id='export_listview_top' ".
+            "onclick=\"return sListView.send_form(true, '{$_REQUEST['module']}', ".
+            "'index.php?entryPoint=export', ".
+            "'{$app_strings['LBL_LISTVIEW_NO_SELECTED']}')\">{$app_strings['LBL_EXPORT']}</a>".
+            "</li><li>".// List item hack
+            "<a href='javascript:void(0)' id='map_listview_top' ".
+            " onclick=\"return sListView.send_form(true, 'jjwg_Maps', ".
+            "'index.php?entryPoint=jjwg_Maps&display_module={$_REQUEST['module']}', ".
             "'{$app_strings['LBL_LISTVIEW_NO_SELECTED']}')\">{$app_strings['LBL_MAP']}</a>";
 
         return $script;

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($seed, $module, $subPanel, $options);

modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php

Spacing +102 added lines, -102 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.
@@ -67,55 +67,55 @@ 
 		$replacements = array();
 		$replacements[] = '';
 		$replacements[] = '';
-		$this->idjs = preg_replace($pattern,$replacements,$this->id);
+		$this->idjs = preg_replace($pattern, $replacements, $this->id);
         // Add in some default categories.
-        $this->categories['ALL'] = translate('LBL_ALL','SugarFeed');
+        $this->categories['ALL'] = translate('LBL_ALL', 'SugarFeed');
         // Need to get the rest of the active SugarFeed modules
         $module_list = SugarFeed::getActiveFeedModules();
 
         // Translate the category names
-        if ( ! is_array($module_list) ) { $module_list = array(); }
-        foreach ( $module_list as $module ) {
-            if ( $module == 'UserFeed' ) {
+        if (!is_array($module_list)) { $module_list = array(); }
+        foreach ($module_list as $module) {
+            if ($module == 'UserFeed') {
                 // Fake module, need to translate specially
-                $this->categories[$module] = translate('LBL_USER_FEED','SugarFeed');
+                $this->categories[$module] = translate('LBL_USER_FEED', 'SugarFeed');
             } else {
                 $this->categories[$module] = $app_list_strings['moduleList'][$module];
             }
         }
 
         // Need to add the external api's here
-        $this->externalAPIList = ExternalAPIFactory::getModuleDropDown('SugarFeed',true);
-        if ( !is_array($this->externalAPIList) ) { $this->externalAPIList = array(); }
-        foreach ( $this->externalAPIList as $apiObj => $apiName ) {
+        $this->externalAPIList = ExternalAPIFactory::getModuleDropDown('SugarFeed', true);
+        if (!is_array($this->externalAPIList)) { $this->externalAPIList = array(); }
+        foreach ($this->externalAPIList as $apiObj => $apiName) {
             $this->categories[$apiObj] = $apiName;
         }
 
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'SugarFeed');
-		if(!empty($def['rows']))$this->displayRows = $def['rows'];
-		if(!empty($def['categories']))$this->selectedCategories = $def['categories'];
-		if(!empty($def['userfeed_created'])) $this->userfeed_created = $def['userfeed_created'];
+        if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'SugarFeed');
+		if (!empty($def['rows']))$this->displayRows = $def['rows'];
+		if (!empty($def['categories']))$this->selectedCategories = $def['categories'];
+		if (!empty($def['userfeed_created'])) $this->userfeed_created = $def['userfeed_created'];
         $this->searchFields = $dashletData['SugarFeedDashlet']['searchFields'];
         $this->columns = $dashletData['SugarFeedDashlet']['columns'];
 
         $twitter_enabled = $this->check_enabled('twitter');
         $facebook_enabled = $this->check_enabled('facebook');
 
-        if($facebook_enabled){
+        if ($facebook_enabled) {
             $this->categories["Facebook"] = "Facebook";
         }
 
-        if($twitter_enabled){
+        if ($twitter_enabled) {
             $this->categories["Twitter"] = "Twitter";
         }
 
 		$catCount = count($this->categories);
 		ACLController::filterModuleList($this->categories, false);
-		if(count($this->categories) < $catCount){
-			if(!empty($this->selectedCategories)){
+		if (count($this->categories) < $catCount) {
+			if (!empty($this->selectedCategories)) {
 				ACLController::filterModuleList($this->selectedCategories, true);
-			}else{
+			} else {
 				$this->selectedCategories = array_keys($this->categories);
 				unset($this->selectedCategories[0]);
 			}
@@ -126,9 +126,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SugarFeedDashlet($id, $def = null){
+    function SugarFeedDashlet($id, $def = null) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -147,7 +147,7 @@ 
         $lvsParams['massupdate'] = false;
 
         // apply filters
-        if(isset($this->filters) || $this->myItemsOnly) {
+        if (isset($this->filters) || $this->myItemsOnly) {
             $whereArray = $this->buildWhere();
         }
 
@@ -155,8 +155,8 @@ 
         $this->lvs->multiSelect = false;
 		$this->lvs->quickViewLinks = false;
         // columns
-    foreach($this->columns as $name => $val) {
-                if(!empty($val['default']) && $val['default']) {
+    foreach ($this->columns as $name => $val) {
+                if (!empty($val['default']) && $val['default']) {
                     $displayColumns[strtoupper($name)] = $val;
                     $displayColumns[strtoupper($name)]['label'] = trim($displayColumns[strtoupper($name)]['label'], ':');
                 }
@@ -173,39 +173,39 @@ 
 
 
         // Get the real module list
-        if (empty($this->selectedCategories)){
+        if (empty($this->selectedCategories)) {
             $mod_list = $this->categories;
         } else {
-            $mod_list = array_flip($this->selectedCategories);//27949, here the key of $this->selectedCategories is not module name, the value is module name, so array_flip it.
+            $mod_list = array_flip($this->selectedCategories); //27949, here the key of $this->selectedCategories is not module name, the value is module name, so array_flip it.
         }
 
         $external_modules = array();
         $admin_modules = array();
         $owner_modules = array();
         $regular_modules = array();
-        foreach($mod_list as $module => $ignore) {
+        foreach ($mod_list as $module => $ignore) {
 			// Handle the UserFeed differently
-			if ( $module == 'UserFeed') {
+			if ($module == 'UserFeed') {
 				$regular_modules[] = 'UserFeed';
 				continue;
 			}
-            if($module == 'Facebook'){
+            if ($module == 'Facebook') {
                 $regular_modules[] = "Facebook";
                 continue;
             }
-            if($module == 'Twitter'){
+            if ($module == 'Twitter') {
                 $regular_modules[] = 'Twitter';
                 continue;
             }
 
-            if ( in_array($module,$this->externalAPIList) ) {
+            if (in_array($module, $this->externalAPIList)) {
                 $external_modules[] = $module;
             }
-			if (ACLAction::getUserAccessLevel($current_user->id,$module,'view') <= ACL_ALLOW_NONE ) {
+			if (ACLAction::getUserAccessLevel($current_user->id, $module, 'view') <= ACL_ALLOW_NONE) {
 				// Not enough access to view any records, don't add it to any lists
 				continue;
 			}
-			if ( ACLAction::getUserAccessLevel($current_user->id,$module,'view') == ACL_ALLOW_OWNER ) {
+			if (ACLAction::getUserAccessLevel($current_user->id, $module, 'view') == ACL_ALLOW_OWNER) {
 				$owner_modules[] = $module;
             } else {
                 $regular_modules[] = $module;
@@ -215,41 +215,41 @@ 
 
 
 
-        if(!empty($this->displayTpl))
+        if (!empty($this->displayTpl))
         {
         	//MFH BUG #14296
             $where = '';
-            if(!empty($whereArray)){
-                $where = '(' . implode(') AND (', $whereArray) . ')';
+            if (!empty($whereArray)) {
+                $where = '('.implode(') AND (', $whereArray).')';
 
             }
 
             $additional_where = '';
 
 
-			$module_limiter = " sugarfeed.related_module in ('" . implode("','", $regular_modules) . "')";
+			$module_limiter = " sugarfeed.related_module in ('".implode("','", $regular_modules)."')";
 
-			if( is_admin($GLOBALS['current_user'] ) )
+			if (is_admin($GLOBALS['current_user']))
             {
                 $all_modules = array_merge($regular_modules, $owner_modules, $admin_modules);
-                $module_limiter = " sugarfeed.related_module in ('" . implode("','", $all_modules) . "')";
+                $module_limiter = " sugarfeed.related_module in ('".implode("','", $all_modules)."')";
             }
-            else if ( count($owner_modules) > 0
+            else if (count($owner_modules) > 0
 				) {
                 $module_limiter = " ((sugarfeed.related_module IN ('".implode("','", $regular_modules)."') "
 					.") ";
-				if ( count($owner_modules) > 0 ) {
+				if (count($owner_modules) > 0) {
 					$module_limiter .= "OR (sugarfeed.related_module IN('".implode("','", $owner_modules)."') AND sugarfeed.assigned_user_id = '".$current_user->id."' "
 						.") ";
 				}
 				$module_limiter .= ")";
             }
-			if(!empty($where)) { $where .= ' AND '; }
+			if (!empty($where)) { $where .= ' AND '; }
 
 
 			$where .= $module_limiter;
 
-            $this->lvs->setup($this->seedBean, $this->displayTpl, $where , $lvsParams, 0, $this->displayRows,
+            $this->lvs->setup($this->seedBean, $this->displayTpl, $where, $lvsParams, 0, $this->displayRows,
                               array('name',
                                     'description',
                                     'date_entered',
@@ -266,35 +266,35 @@ 
                                     'link_url',
                                     'link_type'));
 
-            foreach($this->lvs->data['data'] as $row => $data) {
+            foreach ($this->lvs->data['data'] as $row => $data) {
 
-                    $this->lvs->data['data'][$row]['NAME'] = str_replace("{this.CREATED_BY}",get_assigned_user_name($this->lvs->data['data'][$row]['CREATED_BY']),$data['NAME']);
+                    $this->lvs->data['data'][$row]['NAME'] = str_replace("{this.CREATED_BY}", get_assigned_user_name($this->lvs->data['data'][$row]['CREATED_BY']), $data['NAME']);
 
                     //Translate the SugarFeeds labels if necessary.
-                    preg_match('/\{([^\^ }]+)\.([^\}]+)\}/', $this->lvs->data['data'][$row]['NAME'] ,$modStringMatches );
-                    if(count($modStringMatches) == 3 && $modStringMatches[1] == 'SugarFeed' && !empty($data['RELATED_MODULE']) )
+                    preg_match('/\{([^\^ }]+)\.([^\}]+)\}/', $this->lvs->data['data'][$row]['NAME'], $modStringMatches);
+                    if (count($modStringMatches) == 3 && $modStringMatches[1] == 'SugarFeed' && !empty($data['RELATED_MODULE']))
                     {
                         $modKey = $modStringMatches[2];
                         $modString = translate($modKey, $modStringMatches[1]);
-                        if( strpos($modString, '{0}') === FALSE || !isset($GLOBALS['app_list_strings']['moduleListSingular'][$data['RELATED_MODULE']]) )
+                        if (strpos($modString, '{0}') === FALSE || !isset($GLOBALS['app_list_strings']['moduleListSingular'][$data['RELATED_MODULE']]))
                             continue;
 
                         $modStringSingular = $GLOBALS['app_list_strings']['moduleListSingular'][$data['RELATED_MODULE']];
-                        $modString = string_format($modString, array($modStringSingular) );
-                        $this->lvs->data['data'][$row]['NAME'] = preg_replace('/' . $modStringMatches[0] . '/', strtolower($modString), $this->lvs->data['data'][$row]['NAME']);
+                        $modString = string_format($modString, array($modStringSingular));
+                        $this->lvs->data['data'][$row]['NAME'] = preg_replace('/'.$modStringMatches[0].'/', strtolower($modString), $this->lvs->data['data'][$row]['NAME']);
                     }
                 //if social then unless the user is the assigned user it wont show. IJD1986
-                if(($data['RELATED_MODULE'] == "facebook" || $data['RELATED_MODULE'] == "twitter" ) && $data['ASSIGNED_USER_ID'] != $current_user->id){
+                if (($data['RELATED_MODULE'] == "facebook" || $data['RELATED_MODULE'] == "twitter") && $data['ASSIGNED_USER_ID'] != $current_user->id) {
                     unset($this->lvs->data['data'][$row]);
                 }
             }
 
             // assign a baseURL w/ the action set as DisplayDashlet
-            foreach($this->lvs->data['pageData']['urls'] as $type => $url) {
+            foreach ($this->lvs->data['pageData']['urls'] as $type => $url) {
             	// awu Replacing action=DisplayDashlet with action=DynamicAction&DynamicAction=DisplayDashlet
                 $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet';
-                if($type != 'orderBy')
-                    $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet&sugar_body_only=1&id=' . $this->id;
+                if ($type != 'orderBy')
+                    $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet&sugar_body_only=1&id='.$this->id;
             }
 
             $this->lvs->ss->assign('dashletId', $this->id);
@@ -309,27 +309,27 @@ 
 
         $fetchRecordCount = $this->displayRows + $this->lvs->data['pageData']['offsets']['current'];
 
-        foreach ( $external_modules as $apiName ) {
+        foreach ($external_modules as $apiName) {
             $api = ExternalAPIFactory::loadAPI($apiName);
-            if ( $api !== FALSE ) {
+            if ($api !== FALSE) {
                 // FIXME: Actually calculate the oldest sugar feed we can see, once we get an API that supports this sort of filter.
-                $reply = $api->getLatestUpdates(0,$fetchRecordCount);
-                if ( $reply['success'] && count($reply['messages']) > 0 ) {
+                $reply = $api->getLatestUpdates(0, $fetchRecordCount);
+                if ($reply['success'] && count($reply['messages']) > 0) {
                     array_splice($resortQueue, count($resortQueue), 0, $reply['messages']);
-                } else if ( !$reply['success'] ) {
+                } else if (!$reply['success']) {
                     $feedErrors[] = $reply['errorMessage'];
                 }
             }
         }
 
-        if ( count($feedErrors) > 0 ) {
-            $this->lvs->ss->assign('feedErrors',$feedErrors);
+        if (count($feedErrors) > 0) {
+            $this->lvs->ss->assign('feedErrors', $feedErrors);
         }
 
         // If we need to resort, get to work!
-        foreach ( $this->lvs->data['data'] as $normalMessage ) {
-            list($user_date,$user_time) = explode(' ',$normalMessage['DATE_ENTERED']);
-            list($db_date,$db_time) = $td->to_db_date_time($user_date,$user_time);
+        foreach ($this->lvs->data['data'] as $normalMessage) {
+            list($user_date, $user_time) = explode(' ', $normalMessage['DATE_ENTERED']);
+            list($db_date, $db_time) = $td->to_db_date_time($user_date, $user_time);
 
             $unix_timestamp = strtotime($db_date.' '.$db_time);
 
@@ -339,31 +339,31 @@ 
             $resortQueue[] = $normalMessage;
         }
 
-        usort($resortQueue,create_function('$a,$b','return $a["sort_key"]<$b["sort_key"];'));
+        usort($resortQueue, create_function('$a,$b', 'return $a["sort_key"]<$b["sort_key"];'));
 
         // Trim it down to the necessary number of records
         $numRecords = count($resortQueue);
         $numRecords = $numRecords - $this->lvs->data['pageData']['offsets']['current'];
-        $numRecords = min($this->displayRows,$numRecords);
+        $numRecords = min($this->displayRows, $numRecords);
 
         $this->lvs->data['data'] = $resortQueue;
     }
 
 	  function deleteUserFeed() {
-    	if(!empty($_REQUEST['record'])) {
+    	if (!empty($_REQUEST['record'])) {
 			$feed = new SugarFeed();
 			$feed->retrieve($_REQUEST['record']);
-			if(is_admin($GLOBALS['current_user']) || $feed->created_by == $GLOBALS['current_user']->id){
+			if (is_admin($GLOBALS['current_user']) || $feed->created_by == $GLOBALS['current_user']->id) {
             	$feed->mark_deleted($_REQUEST['record']);
 
 			}
         }
     }
 	 function pushUserFeed() {
-    	if(!empty($_REQUEST['text']) || (!empty($_REQUEST['link_url']) && !empty($_REQUEST['link_type']))) {
+    	if (!empty($_REQUEST['text']) || (!empty($_REQUEST['link_url']) && !empty($_REQUEST['link_type']))) {
 			$text = htmlspecialchars($_REQUEST['text']);
 			//allow for bold and italic user tags
-			$text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i','<$1>', $text);
+			$text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i', '<$1>', $text);
             SugarFeed::pushFeed($text, 'UserFeed', $GLOBALS['current_user']->id,
 								$GLOBALS['current_user']->id,
                                 $_REQUEST['link_type'], $_REQUEST['link_url']
@@ -373,10 +373,10 @@ 
     }
 
 	 function pushUserFeedReply( ) {
-         if(!empty($_REQUEST['text'])&&!empty($_REQUEST['parentFeed'])) {
+         if (!empty($_REQUEST['text']) && !empty($_REQUEST['parentFeed'])) {
 			$text = htmlspecialchars($_REQUEST['text']);
 			//allow for bold and italic user tags
-			$text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i','<$1>', $text);
+			$text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i', '<$1>', $text);
             SugarFeed::pushFeed($text, 'SugarFeed', $_REQUEST['parentFeed'],
 								$GLOBALS['current_user']->id,
                                 '', ''
@@ -397,22 +397,22 @@ 
         $ss->assign('clearLBL', $app_strings['LBL_CLEAR_BUTTON_LABEL']);
         $ss->assign('title', $this->title);
 		$ss->assign('categories', $this->categories);
-        if ( empty($this->selectedCategories) ) {
+        if (empty($this->selectedCategories)) {
             $this->selectedCategories['ALL'] = 'ALL';
         }
 		$ss->assign('selectedCategories', $this->selectedCategories);
         $ss->assign('rows', $this->displayRows);
         $externalApis = array();
-        foreach ( $this->externalAPIList as $apiObj => $apiName ) {
+        foreach ($this->externalAPIList as $apiObj => $apiName) {
             //only show external APis that the user has not created
-            if ( ! EAPM::getLoginInfo($apiName) ) {
+            if (!EAPM::getLoginInfo($apiName)) {
                 $externalApis[] = $apiObj;
             }
         }
         $ss->assign('externalApiList', JSON::encode($externalApis));
         $ss->assign('authenticateLBL', translate('LBL_AUTHENTICATE', 'SugarFeed'));
         $ss->assign('id', $this->id);
-        if($this->isAutoRefreshable()) {
+        if ($this->isAutoRefreshable()) {
        		$ss->assign('isRefreshable', true);
 			$ss->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
 			$ss->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
@@ -432,18 +432,18 @@ 
         $options = array();
         $options['title'] = $req['title'];
 		$rows = intval($_REQUEST['rows']);
-        if($rows <= 0) {
+        if ($rows <= 0) {
             $rows = 15;
         }
-		if($rows > 100){
+		if ($rows > 100) {
 			$rows = 100;
 		}
-        if ( isset($req['autoRefresh']) )
+        if (isset($req['autoRefresh']))
             $options['autoRefresh'] = $req['autoRefresh'];
         $options['rows'] = $rows;
 		$options['categories'] = $req['categories'];
-		foreach($options['categories'] as $cat){
-			if($cat == 'ALL'){
+		foreach ($options['categories'] as $cat) {
+			if ($cat == 'ALL') {
 				unset($options['categories']);
 			}
 		}
@@ -479,14 +479,14 @@ 
 	 *
 	 * @return the fully rendered dashlet
 	 */
-	function display(){
+	function display() {
 
 		$listview = parent::display();
 		$GLOBALS['current_sugarfeed'] = $this;
 		$listview = preg_replace_callback('/\{([^\^ }]+)\.([^\}]+)\}/', create_function(
             '$matches',
             'if($matches[1] == "this"){$var = $matches[2]; return $GLOBALS[\'current_sugarfeed\']->$var;}else{return translate($matches[2], $matches[1]);}'
-        ),$listview);
+        ), $listview);
 
 
         //grab each token and store the module for later processing
@@ -498,10 +498,10 @@ 
 
         //process each module for the singular version so we can populate the alt tag on the image
         $altStrings = array();
-        foreach($alt_modules[1] as $alt){
+        foreach ($alt_modules[1] as $alt) {
             //create the alt string and replace the alt token
-            $altString = 'alt="'.translate('LBL_VIEW','SugarFeed').' '.$GLOBALS['app_list_strings']['moduleListSingular'][$alt].'"';
-            $listview = preg_replace('/REPLACE_ALT/', $altString, $listview,1);
+            $altString = 'alt="'.translate('LBL_VIEW', 'SugarFeed').' '.$GLOBALS['app_list_strings']['moduleListSingular'][$alt].'"';
+            $listview = preg_replace('/REPLACE_ALT/', $altString, $listview, 1);
         }
 
 
@@ -516,8 +516,8 @@ 
 	 * @return the title and the user post form
 	 * @param $text Object
 	 */
-	function getHeader($text='') {
-		return parent::getHeader($text) . $this->getPostForm().$this->getDisabledWarning().$this->sugarFeedDisplayScript().'<div class="sugarFeedDashlet"><div id="contentScroller'.$this->idjs.'">';
+	function getHeader($text = '') {
+		return parent::getHeader($text).$this->getPostForm().$this->getDisabledWarning().$this->sugarFeedDisplayScript().'<div class="sugarFeedDashlet"><div id="contentScroller'.$this->idjs.'">';
 	}
 
 
@@ -525,11 +525,11 @@ 
 	 *
 	 * @return a warning message if the sugar feed system is not enabled currently
 	 */
-	function getDisabledWarning(){
+	function getDisabledWarning() {
         /* Check to see if the sugar feed system is enabled */
-        if ( ! $this->shouldDisplay() ) {
+        if (!$this->shouldDisplay()) {
             // The Sugar Feeds are disabled, populate the warning message
-            return translate('LBL_DASHLET_DISABLED','SugarFeed');
+            return translate('LBL_DASHLET_DISABLED', 'SugarFeed');
         } else {
             return '';
         }
@@ -539,17 +539,17 @@ 
 	 *
 	 * @return the form for users posting custom messages to the feed stream
 	 */
-	function getPostForm(){
+	function getPostForm() {
         global $current_user;
 
-        if ( (!empty($this->selectedCategories) && !in_array('UserFeed',$this->selectedCategories))
+        if ((!empty($this->selectedCategories) && !in_array('UserFeed', $this->selectedCategories))
 			) {
             // The user feed system isn't enabled, don't let them post notes
             return '';
         }
 		$user_name = ucfirst($GLOBALS['current_user']->user_name);
-		$moreimg = SugarThemeRegistry::current()->getImage('advanced_search' , 'onclick="toggleDisplay(\'more_' . $this->id . '\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"',null,null,'.gif',translate('LBL_SHOW_MORE_OPTIONS','SugarFeed'));
-		$lessimg = SugarThemeRegistry::current()->getImage('basic_search' , 'onclick="toggleDisplay(\'more_' . $this->id . '\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"',null,null,'.gif',translate('LBL_HIDE_OPTIONS','SugarFeed'));
+		$moreimg = SugarThemeRegistry::current()->getImage('advanced_search', 'onclick="toggleDisplay(\'more_'.$this->id.'\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"', null, null, '.gif', translate('LBL_SHOW_MORE_OPTIONS', 'SugarFeed'));
+		$lessimg = SugarThemeRegistry::current()->getImage('basic_search', 'onclick="toggleDisplay(\'more_'.$this->id.'\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"', null, null, '.gif', translate('LBL_HIDE_OPTIONS', 'SugarFeed'));
 		$ss = new Sugar_Smarty();
 		$ss->assign('LBL_TO', translate('LBL_TO', 'SugarFeed'));
 		$ss->assign('LBL_POST', translate('LBL_POST', 'SugarFeed'));
@@ -560,9 +560,9 @@ 
 		$ss->assign('less_img', $lessimg);
 
         include_once("include/social/get_feed_data.php");
-        $ss->assign('facebook', $html );
+        $ss->assign('facebook', $html);
 
-        if($current_user->getPreference('use_real_names') == 'on'){
+        if ($current_user->getPreference('use_real_names') == 'on') {
             $ss->assign('user_name', $current_user->full_name);
         }
         else {
@@ -570,8 +570,8 @@ 
         }
         $linkTypesIn = SugarFeed::getLinkTypes();
         $linkTypes = array();
-        foreach ( $linkTypesIn as $key => $value ) {
-            $linkTypes[$key] = translate('LBL_LINK_TYPE_'.$value,'SugarFeed');
+        foreach ($linkTypesIn as $key => $value) {
+            $linkTypes[$key] = translate('LBL_LINK_TYPE_'.$value, 'SugarFeed');
         }
 		$ss->assign('link_types', $linkTypes);
 
@@ -586,16 +586,16 @@ 
         $admin = new Administration();
         $admin->retrieveSettings();
 
-        if ( !isset($admin->settings['sugarfeed_enabled']) || $admin->settings['sugarfeed_enabled'] != '1' ) {
+        if (!isset($admin->settings['sugarfeed_enabled']) || $admin->settings['sugarfeed_enabled'] != '1') {
             return false;
         } else {
             return true;
         }
     }
 
-    function check_enabled($type){
+    function check_enabled($type) {
         global $db;
-        $query = "SELECT * FROM config where name = 'module_" .$type . "' and value =  1;";
+        $query = "SELECT * FROM config where name = 'module_".$type."' and value =  1;";
         $results = $db->query($query);
 
         while ($row = $db->fetchByAssoc($results)) {

Braces +28 added lines, -18 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.
@@ -92,10 +94,18 @@ 
         }
 
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'SugarFeed');
-		if(!empty($def['rows']))$this->displayRows = $def['rows'];
-		if(!empty($def['categories']))$this->selectedCategories = $def['categories'];
-		if(!empty($def['userfeed_created'])) $this->userfeed_created = $def['userfeed_created'];
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_HOMEPAGE_TITLE', 'SugarFeed');
+        }
+		if(!empty($def['rows'])) {
+		    $this->displayRows = $def['rows'];
+		}
+		if(!empty($def['categories'])) {
+		    $this->selectedCategories = $def['categories'];
+		}
+		if(!empty($def['userfeed_created'])) {
+		    $this->userfeed_created = $def['userfeed_created'];
+		}
         $this->searchFields = $dashletData['SugarFeedDashlet']['searchFields'];
         $this->columns = $dashletData['SugarFeedDashlet']['columns'];
 
@@ -115,7 +125,7 @@ 
 		if(count($this->categories) < $catCount){
 			if(!empty($this->selectedCategories)){
 				ACLController::filterModuleList($this->selectedCategories, true);
-			}else{
+			} else{
 				$this->selectedCategories = array_keys($this->categories);
 				unset($this->selectedCategories[0]);
 			}
@@ -130,8 +140,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($id, $def);
@@ -233,8 +242,7 @@ 
             {
                 $all_modules = array_merge($regular_modules, $owner_modules, $admin_modules);
                 $module_limiter = " sugarfeed.related_module in ('" . implode("','", $all_modules) . "')";
-            }
-            else if ( count($owner_modules) > 0
+            } else if ( count($owner_modules) > 0
 				) {
                 $module_limiter = " ((sugarfeed.related_module IN ('".implode("','", $regular_modules)."') "
 					.") ";
@@ -276,8 +284,9 @@ 
                     {
                         $modKey = $modStringMatches[2];
                         $modString = translate($modKey, $modStringMatches[1]);
-                        if( strpos($modString, '{0}') === FALSE || !isset($GLOBALS['app_list_strings']['moduleListSingular'][$data['RELATED_MODULE']]) )
-                            continue;
+                        if( strpos($modString, '{0}') === FALSE || !isset($GLOBALS['app_list_strings']['moduleListSingular'][$data['RELATED_MODULE']]) ) {
+                                                    continue;
+                        }
 
                         $modStringSingular = $GLOBALS['app_list_strings']['moduleListSingular'][$data['RELATED_MODULE']];
                         $modString = string_format($modString, array($modStringSingular) );
@@ -293,8 +302,9 @@ 
             foreach($this->lvs->data['pageData']['urls'] as $type => $url) {
             	// awu Replacing action=DisplayDashlet with action=DynamicAction&DynamicAction=DisplayDashlet
                 $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet';
-                if($type != 'orderBy')
-                    $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet&sugar_body_only=1&id=' . $this->id;
+                if($type != 'orderBy') {
+                                    $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet&sugar_body_only=1&id=' . $this->id;
+                }
             }
 
             $this->lvs->ss->assign('dashletId', $this->id);
@@ -438,8 +448,9 @@ 
 		if($rows > 100){
 			$rows = 100;
 		}
-        if ( isset($req['autoRefresh']) )
-            $options['autoRefresh'] = $req['autoRefresh'];
+        if ( isset($req['autoRefresh']) ) {
+                    $options['autoRefresh'] = $req['autoRefresh'];
+        }
         $options['rows'] = $rows;
 		$options['categories'] = $req['categories'];
 		foreach($options['categories'] as $cat){
@@ -564,8 +575,7 @@ 
 
         if($current_user->getPreference('use_real_names') == 'on'){
             $ss->assign('user_name', $current_user->full_name);
-        }
-        else {
+        } else {
             $ss->assign('user_name', $user_name);
         }
         $linkTypesIn = SugarFeed::getLinkTypes();