adamjakab / SuiteCRM

ModuleInstall/PackageManager/PackageController.php

Braces +13 added lines, -11 removed lines

@@ -57,8 +57,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();
@@ -124,8 +123,9 @@ 
           	$type_str = '';
           	foreach($types as $type){
           		$type_str .= "'".$type."'";
-          		if($index < $count)
-          			$type_str .= ",";
+          		if($index < $count) {
+          		          			$type_str .= ",";
+          		}
           		$index++;
           	}
 
@@ -310,18 +310,20 @@ 
             }
             if(isset($_REQUEST['terms_checked'])) {
                 $terms_checked = $_REQUEST['terms_checked'];
-                if($terms_checked == 'on')
-                	$terms_checked = true;
+                if($terms_checked == 'on') {
+                                	$terms_checked = true;
+                }
             }
 
             if(!empty($username) && !empty($password)){
                 $password = md5($password);
                 $result = PackageManager::authenticate($username, $password, $servername, $terms_checked);
-                if(!is_array($result) && $result == true)
-                    $status  = 'success';
-                else
-                    $status  = $result['faultstring'];
-            }else{
+                if(!is_array($result) && $result == true) {
+                                    $status  = 'success';
+                } else {
+                                    $status  = $result['faultstring'];
+                }
+            } else{
                 $status  = 'failed';
             }
 

ModuleInstall/PackageManager/PackageManager.php

Indentation +281 added lines, -281 removed lines

@@ -89,7 +89,7 @@ 
             $name_value_list = PackageManager::fromNameValueList($name_value_list);
             return $name_value_list['description'];
         }else {
-           return '';
+            return '';
         }
     }
 
@@ -97,10 +97,10 @@ 
      * Obtain a list of category/packages/releases for use within the module loader
      */
     function getModuleLoaderCategoryPackages($category_id = ''){
-    	$filter = array();
-    	$filter = array('type' => "'module', 'theme', 'langpack'");
-    	$filter = PackageManager::toNameValueList($filter);
-    	return PackageManager::getCategoryPackages($category_id, $filter);
+        $filter = array();
+        $filter = array('type' => "'module', 'theme', 'langpack'");
+        $filter = PackageManager::toNameValueList($filter);
+        return PackageManager::getCategoryPackages($category_id, $filter);
     }
 
     /**
@@ -108,41 +108,41 @@ 
      * @return category_packages
      */
     function getCategoryPackages($category_id = '', $filter = array()){
-         $results = PackageManagerComm::getCategoryPackages($category_id, $filter);
-         PackageManagerComm::errorCheck();
-         $nodes = array();
+            $results = PackageManagerComm::getCategoryPackages($category_id, $filter);
+            PackageManagerComm::errorCheck();
+            $nodes = array();
 
         $nodes[$category_id]['packages'] = array();
         if(!empty($results['categories'])){
-	         foreach($results['categories'] as $category){
-	            $mycat = PackageManager::fromNameValueList($category);
-	            $nodes[$mycat['id']] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
-	            $nodes[$mycat['id']]['packages'] = array();
-	         }
-        }
-         if(!empty($results['packages'])){
-	        $uh = new UpgradeHistory();
-	         foreach($results['packages'] as $package){
-	            $mypack = PackageManager::fromNameValueList($package);
-	            $nodes[$mypack['category_id']]['packages'][$mypack['id']] = array('id' => $mypack['id'], 'label' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id'], 'type' => 'package');
-	            $releases = PackageManager::getReleases($category_id, $mypack['id'], $filter);
-	            $arr_releases = array();
-	            $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'] = array();
-	            if(!empty($releases['packages'])){
-		            foreach($releases['packages'] as $release){
-		                 $myrelease = PackageManager::fromNameValueList($release);
-		                 //check to see if we already this one installed
-		                 $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
-		                 $enable = false;
-		                 if($result == true || is_array($result))
-		                	 $enable = true;
-		                 $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
-		           	}
-	            }
-	            //array_push($nodes[$mypack['category_id']]['packages'], $package_arr);
-	         }
-         }
-         $GLOBALS['log']->debug("NODES". var_export($nodes, true));
+                foreach($results['categories'] as $category){
+                $mycat = PackageManager::fromNameValueList($category);
+                $nodes[$mycat['id']] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
+                $nodes[$mycat['id']]['packages'] = array();
+                }
+        }
+            if(!empty($results['packages'])){
+            $uh = new UpgradeHistory();
+                foreach($results['packages'] as $package){
+                $mypack = PackageManager::fromNameValueList($package);
+                $nodes[$mypack['category_id']]['packages'][$mypack['id']] = array('id' => $mypack['id'], 'label' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id'], 'type' => 'package');
+                $releases = PackageManager::getReleases($category_id, $mypack['id'], $filter);
+                $arr_releases = array();
+                $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'] = array();
+                if(!empty($releases['packages'])){
+                    foreach($releases['packages'] as $release){
+                            $myrelease = PackageManager::fromNameValueList($release);
+                            //check to see if we already this one installed
+                            $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
+                            $enable = false;
+                            if($result == true || is_array($result))
+                                $enable = true;
+                            $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
+                        }
+                }
+                //array_push($nodes[$mypack['category_id']]['packages'], $package_arr);
+                }
+            }
+            $GLOBALS['log']->debug("NODES". var_export($nodes, true));
         return $nodes;
     }
 
@@ -157,10 +157,10 @@ 
         $results = PackageManagerComm::getCategories($category_id, $filter);
         PackageManagerComm::errorCheck();
         if(!empty($results['categories'])){
-	        foreach($results['categories'] as $category){
-	            $mycat = PackageManager::fromNameValueList($category);
-	            $nodes[] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
-	        }
+            foreach($results['categories'] as $category){
+                $mycat = PackageManager::fromNameValueList($category);
+                $nodes[] = array('id' => $mycat['id'], 'label' => $mycat['name'], 'description' => $mycat['description'], 'type' => 'cat', 'parent' => $mycat['parent_id']);
+            }
         }
         return $nodes;
     }
@@ -173,17 +173,17 @@ 
         //$xml = '';
         //$xml .= '<packages>';
         if(!empty($results['packages'])){
-	        foreach($results['packages'] as $package){
-	            $mypack = PackageManager::fromNameValueList($package);
-	            $packages[$mypack['id']] = array('package_id' => $mypack['id'], 'name' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id']);
-	            $releases = PackageManager::getReleases($category_id, $mypack['id']);
-	            $arr_releases = array();
-	            foreach($releases['packages'] as $release){
-	                 $myrelease = PackageManager::fromNameValueList($release);
-	                 $arr_releases[$myrelease['id']]  = array('release_id' => $myrelease['id'], 'version' => $myrelease['version'], 'description' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id']);
-	            }
-	            $packages[$mypack['id']]['releases'] = $arr_releases;
-	        }
+            foreach($results['packages'] as $package){
+                $mypack = PackageManager::fromNameValueList($package);
+                $packages[$mypack['id']] = array('package_id' => $mypack['id'], 'name' => $mypack['name'], 'description' => $mypack['description'], 'category_id' => $mypack['category_id']);
+                $releases = PackageManager::getReleases($category_id, $mypack['id']);
+                $arr_releases = array();
+                foreach($releases['packages'] as $release){
+                        $myrelease = PackageManager::fromNameValueList($release);
+                        $arr_releases[$myrelease['id']]  = array('release_id' => $myrelease['id'], 'version' => $myrelease['version'], 'description' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id']);
+                }
+                $packages[$mypack['id']]['releases'] = $arr_releases;
+            }
         }
         return $packages;
     }
@@ -208,10 +208,10 @@ 
         if(!empty($release_id)){
             $filename = PackageManagerComm::addDownload($category_id, $package_id, $release_id);
             if($filename){
-	            $GLOBALS['log']->debug('RESULT: '.$filename);
-	            PackageManagerComm::errorCheck();
-	           	$filepath = PackageManagerComm::performDownload($filename);
-	           	return $filepath;
+                $GLOBALS['log']->debug('RESULT: '.$filename);
+                PackageManagerComm::errorCheck();
+                    $filepath = PackageManagerComm::performDownload($filename);
+                    return $filepath;
             }
         }else{
             return null;
@@ -232,20 +232,20 @@ 
         PackageManagerComm::clearSession();
         $result = PackageManagerComm::login($terms_checked);
         if(is_array($result))
-        	return $result;
-       	else
-        	return true;
+            return $result;
+            else
+            return true;
     }
 
     function setCredentials($username, $password, $systemname){
 
         $admin = new Administration();
         $admin->retrieveSettings();
-         $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_USERNAME, $username);
-         $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_PASSWORD, $password);
-         if(!empty($systemname)){
-         	$admin->saveSetting('system', 'name', $systemname);
-         }
+            $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_USERNAME, $username);
+            $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_PASSWORD, $password);
+            if(!empty($systemname)){
+                $admin->saveSetting('system', 'name', $systemname);
+            }
     }
 
     static function getCredentials(){
@@ -255,21 +255,21 @@ 
         $credentials = array();
         $credentials['username'] = '';
         $credentials['password'] = '';
-		$credentials['system_name'] = '';
+        $credentials['system_name'] = '';
         if(!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])){
-           $credentials['username'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME];
+            $credentials['username'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME];
         }
         if(!empty($admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_USERNAME])){
-           $credentials['password'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_PASSWORD];
+            $credentials['password'] = $admin->settings[CREDENTIAL_CATEGORY.'_'.CREDENTIAL_PASSWORD];
         }
         if(!empty($admin->settings['system_name'])){
-           $credentials['system_name'] = $admin->settings['system_name'];
+            $credentials['system_name'] = $admin->settings['system_name'];
         }
         return $credentials;
     }
 
     function getTermsAndConditions(){
-    	return PackageManagerComm::getTermsAndConditions();
+        return PackageManagerComm::getTermsAndConditions();
 
     }
 
@@ -282,7 +282,7 @@ 
      * @return documents
      */
     function getDocumentation($package_id, $release_id){
-    	 if(!empty($release_id) || !empty($package_id)){
+            if(!empty($release_id) || !empty($package_id)){
             $documents = PackageManagerComm::getDocumentation($package_id, $release_id);
             return $documents;
         }else{
@@ -295,33 +295,33 @@ 
      * The depot will then send back a list of modules that need to be updated
      */
     function checkForUpdates(){
-    	$lists = $this->buildInstalledReleases(array('module'), true);
-		$updates = array();
-		if(!empty($lists)){
-			$updates = PackageManagerComm::checkForUpdates($lists);
-		}//fi
-		return $updates;
+        $lists = $this->buildInstalledReleases(array('module'), true);
+        $updates = array();
+        if(!empty($lists)){
+            $updates = PackageManagerComm::checkForUpdates($lists);
+        }//fi
+        return $updates;
     }
 
-     ////////////////////////////////////////////////////////
-     /////////// HELPER FUNCTIONS
+        ////////////////////////////////////////////////////////
+        /////////// HELPER FUNCTIONS
     function toNameValueList($array){
-		$list = array();
-		foreach($array as $name=>$value){
-			$list[] = array('name'=>$name, 'value'=>$value);
-		}
-		return $list;
-	}
-
-	function toNameValueLists($arrays){
-		$lists = array();
-		foreach($arrays as $array){
-			$lists[] = PackageManager::toNameValueList($array);
-		}
-		return $lists;
-	}
-
-     function fromNameValueList($nvl){
+        $list = array();
+        foreach($array as $name=>$value){
+            $list[] = array('name'=>$name, 'value'=>$value);
+        }
+        return $list;
+    }
+
+    function toNameValueLists($arrays){
+        $lists = array();
+        foreach($arrays as $array){
+            $lists[] = PackageManager::toNameValueList($array);
+        }
+        return $lists;
+    }
+
+        function fromNameValueList($nvl){
         $array = array();
         foreach($nvl as $list){
             $array[$list['name']] = $list['value'];
@@ -330,19 +330,19 @@ 
     }
 
     function buildInstalledReleases($types = array('module')){
-    	//1) get list of installed modules
-		$installeds = $this->getInstalled($types);
-		$releases = array();
-		foreach($installeds as $installed){
-			$releases[] = array('name' => $installed->name, 'id_name' => $installed->id_name, 'version' => $installed->version, 'filename' => $installed->filename, 'type' => $installed->type);
-		}
+        //1) get list of installed modules
+        $installeds = $this->getInstalled($types);
+        $releases = array();
+        foreach($installeds as $installed){
+            $releases[] = array('name' => $installed->name, 'id_name' => $installed->id_name, 'version' => $installed->version, 'filename' => $installed->filename, 'type' => $installed->type);
+        }
 
-		$lists = array();
-		$name_value_list = array();
-		if(!empty($releases)){
-			$lists = $this->toNameValueLists($releases);
-		}//fi
-		return $lists;
+        $lists = array();
+        $name_value_list = array();
+        if(!empty($releases)){
+            $lists = $this->toNameValueLists($releases);
+        }//fi
+        return $lists;
     }
 
     function buildPackageXML($package, $releases = array()){
@@ -351,19 +351,19 @@ 
         $xml .= '<name>'.$package['name'].'</name>';
         $xml .= '<description>'.$package['description'].'</description>';
         if(!empty($releases)){
-             $xml .= '<releases>';
-             foreach($releases['packages'] as $release){
-
-                 $myrelease = PackageManager::fromNameValueList($release);
-                 $xml .= '<release>';
-                 $xml .= '<release_id>'.$myrelease['id'].'</release_id>';
-                 $xml .= '<version>'.$myrelease['version'].'</version>';
-                 $xml .= '<description>'.$myrelease['description'].'</description>';
-                 $xml .= '<package_id>'.$package['id'].'</package_id>';
-                 $xml .= '<category_id>'.$package['category_id'].'</category_id>';
-                 $xml .= '</release>';
-             }
-             $xml .= '</releases>';
+                $xml .= '<releases>';
+                foreach($releases['packages'] as $release){
+
+                    $myrelease = PackageManager::fromNameValueList($release);
+                    $xml .= '<release>';
+                    $xml .= '<release_id>'.$myrelease['id'].'</release_id>';
+                    $xml .= '<version>'.$myrelease['version'].'</version>';
+                    $xml .= '<description>'.$myrelease['description'].'</description>';
+                    $xml .= '<package_id>'.$package['id'].'</package_id>';
+                    $xml .= '<category_id>'.$package['category_id'].'</category_id>';
+                    $xml .= '</release>';
+                }
+                $xml .= '</releases>';
         }
         $xml .= '</package>';
         return $xml;
@@ -444,7 +444,7 @@ 
             }
         }
 
-     if( isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0 ){
+        if( isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0 ){
             $flavor_ok = false;
             foreach( $manifest['acceptable_sugar_flavors'] as $match ){
                 if( $match == $sugar_flavor ){
@@ -479,7 +479,7 @@ 
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $manifest_file = $this->extractManifest( $base_filename,$base_tmp_upgrade_dir);
-         $GLOBALS['log']->debug("Manifest: ".$manifest_file);
+            $GLOBALS['log']->debug("Manifest: ".$manifest_file);
         if($view == 'module')
             $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
         if(is_file($manifest_file)){
@@ -521,7 +521,7 @@ 
                     $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
             }else{
                 if($display_messages)
-                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                    $messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
             }
         }//fi
         else{
@@ -553,9 +553,9 @@ 
         $mi = new ModuleInstaller();
         $mi->silent = $silent;
         $mod_strings = return_module_language($current_language, "Administration");
-             $GLOBALS['log']->debug("ABOUT TO INSTALL: ".$file);
+                $GLOBALS['log']->debug("ABOUT TO INSTALL: ".$file);
         if(preg_match("#.*\.zip\$#", $file)) {
-             $GLOBALS['log']->debug("1: ".$file);
+                $GLOBALS['log']->debug("1: ".$file);
             // handle manifest.php
             $target_manifest = remove_file_extension( $file ) . '-manifest.php';
             include($target_manifest);
@@ -565,18 +565,18 @@ 
             unzip($file, $unzip_dir );
             $GLOBALS['log']->debug("3: ".$unzip_dir);
             $id_name = $installdefs['id'];
-			$version = $manifest['version'];
-			$uh = new UpgradeHistory();
-			$previous_install = array();
-    		if(!empty($id_name) & !empty($version))
-    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
-    		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
-    		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
+            $version = $manifest['version'];
+            $uh = new UpgradeHistory();
+            $previous_install = array();
+            if(!empty($id_name) & !empty($version))
+                $previous_install = $uh->determineIfUpgrade($id_name, $version);
+            $previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
+            $previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 
             if(!empty($previous_version)){
-            	$mi->install($unzip_dir, true, $previous_version);
+                $mi->install($unzip_dir, true, $previous_version);
             }else{
-            	$mi->install($unzip_dir);
+                $mi->install($unzip_dir);
             }
             $GLOBALS['log']->debug("INSTALLED: ".$file);
             $new_upgrade = new UpgradeHistory();
@@ -589,11 +589,11 @@ 
             $new_upgrade->name          = $manifest['name'];
             $new_upgrade->description   = $manifest['description'];
             $new_upgrade->id_name		= $id_name;
-			$serial_manifest = array();
-			$serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
-			$serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
-			$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
-			$new_upgrade->manifest		= base64_encode(serialize($serial_manifest));
+            $serial_manifest = array();
+            $serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
+            $serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
+            $serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
+            $new_upgrade->manifest		= base64_encode(serialize($serial_manifest));
             //$new_upgrade->unique_key    = (isset($manifest['unique_key'])) ? $manifest['unique_key'] : '';
             $new_upgrade->save();
                     //unlink($file);
@@ -601,16 +601,16 @@ 
     }
 
     function performUninstall($name){
-    	$uh = new UpgradeHistory();
-    	$uh->name = $name;
-    	$uh->id_name = $name;
-    	$found = $uh->checkForExisting($uh);
-    	if($found != null){
-    		global $sugar_config;
-	        global $mod_strings;
-	        global $current_language;
-	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
-	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
+        $uh = new UpgradeHistory();
+        $uh->name = $name;
+        $uh->id_name = $name;
+        $found = $uh->checkForExisting($uh);
+        if($found != null){
+            global $sugar_config;
+            global $mod_strings;
+            global $current_language;
+            $base_upgrade_dir       = $this->upload_dir.'/upgrades';
+            $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
             if(is_file($found->filename)){
                 if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
                 $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
@@ -625,7 +625,7 @@ 
                 //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
                 $found->delete();
             }
-    	}
+        }
     }
 
     function getUITextForType( $type ){
@@ -686,10 +686,10 @@ 
         $content_values = array_values($uContent);
         $alreadyProcessed = array();
         foreach($content_values as $val){
-        	if(empty($alreadyProcessed[$val])){
-        		$upgrade_contents[] = $val;
-        		$alreadyProcessed[$val] = true;
-        	}
+            if(empty($alreadyProcessed[$val])){
+                $upgrade_contents[] = $val;
+                $alreadyProcessed[$val] = true;
+            }
         }
 
         $upgrades_available = 0;
@@ -703,35 +703,35 @@ 
             $the_base = basename($upgrade_content);
             $the_md5 = md5_file($upgrade_content);
             $md5_matches = $uh->findByMd5($the_md5);
-    		$file_install = $upgrade_content;
+            $file_install = $upgrade_content;
             if(empty($md5_matches))
             {
                 $target_manifest = remove_file_extension( $upgrade_content ) . '-manifest.php';
                 if(file_exists($target_manifest)) {
-	                require_once($target_manifest);
-
-	                $name = empty($manifest['name']) ? $upgrade_content : $manifest['name'];
-	                $version = empty($manifest['version']) ? '' : $manifest['version'];
-	                $published_date = empty($manifest['published_date']) ? '' : $manifest['published_date'];
-	                $icon = '';
-	                $description = empty($manifest['description']) ? 'None' : $manifest['description'];
-	                $uninstallable = empty($manifest['is_uninstallable']) ? 'No' : 'Yes';
-	                $type = $this->getUITextForType( $manifest['type'] );
-	                $manifest_type = $manifest['type'];
-	                $dependencies = array();
-	                if( isset( $manifest['dependencies']) ){
-	    				$dependencies    = $manifest['dependencies'];
-					}
+                    require_once($target_manifest);
+
+                    $name = empty($manifest['name']) ? $upgrade_content : $manifest['name'];
+                    $version = empty($manifest['version']) ? '' : $manifest['version'];
+                    $published_date = empty($manifest['published_date']) ? '' : $manifest['published_date'];
+                    $icon = '';
+                    $description = empty($manifest['description']) ? 'None' : $manifest['description'];
+                    $uninstallable = empty($manifest['is_uninstallable']) ? 'No' : 'Yes';
+                    $type = $this->getUITextForType( $manifest['type'] );
+                    $manifest_type = $manifest['type'];
+                    $dependencies = array();
+                    if( isset( $manifest['dependencies']) ){
+                        $dependencies    = $manifest['dependencies'];
+                    }
                 }
 
-				//check dependencies first
-				if(!empty($dependencies)) {
-					$uh = new UpgradeHistory();
-					$not_found = $uh->checkDependencies($dependencies);
-					if(!empty($not_found) && count($not_found) > 0){
-							$file_install = 'errors_'.$mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]";
-					}
-				}
+                //check dependencies first
+                if(!empty($dependencies)) {
+                    $uh = new UpgradeHistory();
+                    $not_found = $uh->checkDependencies($dependencies);
+                    if(!empty($not_found) && count($not_found) > 0){
+                            $file_install = 'errors_'.$mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]";
+                    }
+                }
 
                 if($view == 'default' && $manifest_type != 'patch') {
                     continue;
@@ -752,8 +752,8 @@ 
                 $upgrades_available++;
 
                 $packages[] = array('name' => $name, 'version' => $version, 'published_date' => $published_date,
-                	'description' => $description, 'uninstallable' =>$uninstallable, 'type' => $type,
-                	'file' => fileToHash($upgrade_content), 'file_install' => fileToHash($upgrade_content), 'unFile' => fileToHash($upgrade_content));
+                    'description' => $description, 'uninstallable' =>$uninstallable, 'type' => $type,
+                    'file' => fileToHash($upgrade_content), 'file_install' => fileToHash($upgrade_content), 'unFile' => fileToHash($upgrade_content));
             }//fi
         }//rof
         return $packages;
@@ -781,112 +781,112 @@ 
      * @return an array of installed upgrade_history objects
      */
     function getInstalled($types = array('module')){
-    	$uh = new UpgradeHistory();
-    	$in = "";
-    	for($i = 0; $i < count($types); $i++){
-    		$in .= "'".$types[$i]."'";
-    		if(($i+1) < count($types)){
-    			$in .= ",";
-    		}
-    	}
-    	$query = "SELECT * FROM ".$uh->table_name."	 WHERE type IN (".$in.")";
-    	return $uh->getList($query);
+        $uh = new UpgradeHistory();
+        $in = "";
+        for($i = 0; $i < count($types); $i++){
+            $in .= "'".$types[$i]."'";
+            if(($i+1) < count($types)){
+                $in .= ",";
+            }
+        }
+        $query = "SELECT * FROM ".$uh->table_name."	 WHERE type IN (".$in.")";
+        return $uh->getList($query);
     }
 
     function getinstalledPackages($types = array('module', 'langpack')){
-    	global $sugar_config;
-    	$installeds = $this->getInstalled($types);
-    	$packages = array();
-    	$upgrades_installed = 0;
-    	$uh = new UpgradeHistory();
+        global $sugar_config;
+        $installeds = $this->getInstalled($types);
+        $packages = array();
+        $upgrades_installed = 0;
+        $uh = new UpgradeHistory();
         $base_upgrade_dir       = $this->upload_dir.'/upgrades';
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-    	foreach($installeds as $installed)
-		{
-			$populate = false;
-			$filename = from_html($installed->filename);
-			$date_entered = $installed->date_entered;
-			$type = $installed->type;
-			$version = $installed->version;
-			$uninstallable = false;
-			$link = "";
-			$description = $installed->description;
-			$name = $installed->name;
-			$enabled = true;
-			$enabled_string = 'ENABLED';
-			//if the name is empty then we should try to pull from manifest and populate upgrade_history_table
-			if(empty($name)){
-				$populate = true;
-			}
-			$upgrades_installed++;
-			switch($type)
-			{
-				case "theme":
-				case "langpack":
-				case "module":
-				case "patch":
-					if($populate){
-						$manifest_file = $this->extractManifest($filename, $base_tmp_upgrade_dir);
-						require_once($manifest_file);
-						$GLOBALS['log']->info("Filling in upgrade_history table");
-						$populate = false;
-						if( isset( $manifest['name'] ) ){
-    						$name = $manifest['name'];
-    						$installed->name = $name;
-						}
-						if( isset( $manifest['description'] ) ){
-						    $description = $manifest['description'];
-						    $installed->description = $description;
-						}
-						if(isset($installdefs) && isset( $installdefs['id'] ) ){
-						    $id_name  = $installdefs['id'];
-						    $installed->id_name = $id_name;
-						}
-
-						$serial_manifest = array();
-						$serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
-						$serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
-						$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
-						$installed->manifest = base64_encode(serialize($serial_manifest));
-						$installed->save();
-					}else{
-						$serial_manifest = unserialize(base64_decode($installed->manifest));
-						$manifest = $serial_manifest['manifest'];
-					}
-					if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
-						&& is_file($filename) && !empty($manifest['is_uninstallable']))
-					{
-						$uninstallable = true;
-					}
-					$enabled = $installed->enabled;
-					if(!$enabled)
-						$enabled_string = 'DISABLED';
-					$file_uninstall = $filename;
-					if(!$uninstallable){
-						$file_uninstall = 'UNINSTALLABLE';
-						$enabled_string = 'UNINSTALLABLE';
-					} else {
-						$file_uninstall = fileToHash( $file_uninstall );
-					}
-
-				$packages[] = array(
-				    'name' => $name,
-				    'version' => $version,
-				    'type' => $type,
-				    'published_date' => $date_entered,
-				    'description' => $description,
-				    'uninstallable' =>$uninstallable,
-				    'file_install' =>  $file_uninstall ,
-				    'file' =>  fileToHash($filename),
-				    'enabled' => $enabled_string
-				);
-				break;
-				default:
-				break;
-			}
-
-		}//rof
-		return $packages;
-    }
- }
+        foreach($installeds as $installed)
+        {
+            $populate = false;
+            $filename = from_html($installed->filename);
+            $date_entered = $installed->date_entered;
+            $type = $installed->type;
+            $version = $installed->version;
+            $uninstallable = false;
+            $link = "";
+            $description = $installed->description;
+            $name = $installed->name;
+            $enabled = true;
+            $enabled_string = 'ENABLED';
+            //if the name is empty then we should try to pull from manifest and populate upgrade_history_table
+            if(empty($name)){
+                $populate = true;
+            }
+            $upgrades_installed++;
+            switch($type)
+            {
+                case "theme":
+                case "langpack":
+                case "module":
+                case "patch":
+                    if($populate){
+                        $manifest_file = $this->extractManifest($filename, $base_tmp_upgrade_dir);
+                        require_once($manifest_file);
+                        $GLOBALS['log']->info("Filling in upgrade_history table");
+                        $populate = false;
+                        if( isset( $manifest['name'] ) ){
+                            $name = $manifest['name'];
+                            $installed->name = $name;
+                        }
+                        if( isset( $manifest['description'] ) ){
+                            $description = $manifest['description'];
+                            $installed->description = $description;
+                        }
+                        if(isset($installdefs) && isset( $installdefs['id'] ) ){
+                            $id_name  = $installdefs['id'];
+                            $installed->id_name = $id_name;
+                        }
+
+                        $serial_manifest = array();
+                        $serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
+                        $serial_manifest['installdefs'] = (isset($installdefs) ? $installdefs : '');
+                        $serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
+                        $installed->manifest = base64_encode(serialize($serial_manifest));
+                        $installed->save();
+                    }else{
+                        $serial_manifest = unserialize(base64_decode($installed->manifest));
+                        $manifest = $serial_manifest['manifest'];
+                    }
+                    if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
+                        && is_file($filename) && !empty($manifest['is_uninstallable']))
+                    {
+                        $uninstallable = true;
+                    }
+                    $enabled = $installed->enabled;
+                    if(!$enabled)
+                        $enabled_string = 'DISABLED';
+                    $file_uninstall = $filename;
+                    if(!$uninstallable){
+                        $file_uninstall = 'UNINSTALLABLE';
+                        $enabled_string = 'UNINSTALLABLE';
+                    } else {
+                        $file_uninstall = fileToHash( $file_uninstall );
+                    }
+
+                $packages[] = array(
+                    'name' => $name,
+                    'version' => $version,
+                    'type' => $type,
+                    'published_date' => $date_entered,
+                    'description' => $description,
+                    'uninstallable' =>$uninstallable,
+                    'file_install' =>  $file_uninstall ,
+                    'file' =>  fileToHash($filename),
+                    'enabled' => $enabled_string
+                );
+                break;
+                default:
+                break;
+            }
+
+        }//rof
+        return $packages;
+    }
+    }
 ?>

Braces +48 added lines, -36 removed lines

@@ -67,8 +67,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();
@@ -88,7 +87,7 @@ 
         if(!empty($name_value_list)){
             $name_value_list = PackageManager::fromNameValueList($name_value_list);
             return $name_value_list['description'];
-        }else {
+        } else {
            return '';
         }
     }
@@ -134,8 +133,9 @@ 
 		                 //check to see if we already this one installed
 		                 $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
 		                 $enable = false;
-		                 if($result == true || is_array($result))
-		                	 $enable = true;
+		                 if($result == true || is_array($result)) {
+		                 		                	 $enable = true;
+		                 }
 		                 $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
 		           	}
 	            }
@@ -213,7 +213,7 @@ 
 	           	$filepath = PackageManagerComm::performDownload($filename);
 	           	return $filepath;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -231,10 +231,11 @@ 
         PackageManager::setCredentials($username, $password, $systemname);
         PackageManagerComm::clearSession();
         $result = PackageManagerComm::login($terms_checked);
-        if(is_array($result))
-        	return $result;
-       	else
-        	return true;
+        if(is_array($result)) {
+                	return $result;
+        } else {
+       	        	return true;
+       	}
     }
 
     function setCredentials($username, $password, $systemname){
@@ -285,7 +286,7 @@ 
     	 if(!empty($release_id) || !empty($package_id)){
             $documents = PackageManagerComm::getDocumentation($package_id, $release_id);
             return $documents;
-        }else{
+        } else{
             return null;
         }
     }
@@ -480,8 +481,9 @@ 
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $manifest_file = $this->extractManifest( $base_filename,$base_tmp_upgrade_dir);
          $GLOBALS['log']->debug("Manifest: ".$manifest_file);
-        if($view == 'module')
-            $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
+        if($view == 'module') {
+                    $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
+        }
         if(is_file($manifest_file)){
             $GLOBALS['log']->debug("VALIDATING MANIFEST". $manifest_file);
             require_once( $manifest_file );
@@ -492,14 +494,16 @@ 
             if( $view == "module" ){
                 if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack"){
                     $this->unlinkTempFiles();
-                    if($display_messages)
-                        die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    if($display_messages) {
+                                            die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    }
                 }
-            }elseif( $view == "default" ){
+            } elseif( $view == "default" ){
                 if($upgrade_zip_type != "patch" ){
                     $this->unlinkTempFiles();
-                    if($display_messages)
-                        die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    if($display_messages) {
+                                            die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    }
                 }
             }
 
@@ -517,20 +521,24 @@ 
 
             if( copy( $tempFile , $target_path ) ){
                 copy( $manifest_file, $target_manifest );
-                if($display_messages)
-                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
-            }else{
-                if($display_messages)
-                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                if($display_messages) {
+                                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
+                }
+            } else{
+                if($display_messages) {
+                                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                }
             }
         }//fi
         else{
             $this->unlinkTempFiles();
-            if($display_messages)
-                die($mod_strings['ERR_UW_NO_MANIFEST']);
+            if($display_messages) {
+                            die($mod_strings['ERR_UW_NO_MANIFEST']);
+            }
+        }
+        if(isset($messages)) {
+                    return $messages;
         }
-        if(isset($messages))
-            return $messages;
     }
 
     function unlinkTempFiles() {
@@ -568,14 +576,15 @@ 
 			$version = $manifest['version'];
 			$uh = new UpgradeHistory();
 			$previous_install = array();
-    		if(!empty($id_name) & !empty($version))
-    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
+    		if(!empty($id_name) & !empty($version)) {
+    		    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
+    		}
     		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
     		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 
             if(!empty($previous_version)){
             	$mi->install($unzip_dir, true, $previous_version);
-            }else{
+            } else{
             	$mi->install($unzip_dir);
             }
             $GLOBALS['log']->debug("INSTALLED: ".$file);
@@ -612,7 +621,9 @@ 
 	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
 	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
             if(is_file($found->filename)){
-                if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
+                if(!isset($GLOBALS['mi_remove_tables'])) {
+                    $GLOBALS['mi_remove_tables'] = true;
+                }
                 $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
                 unzip($found->filename, $unzip_dir );
                 $mi = new ModuleInstaller();
@@ -621,7 +632,7 @@ 
                 $found->delete();
                 unlink(remove_file_extension( $found->filename ) . '-manifest.php');
                 unlink($found->filename);
-            }else{
+            } else{
                 //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
                 $found->delete();
             }
@@ -767,7 +778,7 @@ 
         if(is_file($license_file)){
             $contents = file_get_contents($license_file);
             return $contents;
-        }else{
+        } else{
             return null;
         }
     }
@@ -849,7 +860,7 @@ 
 						$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
 						$installed->manifest = base64_encode(serialize($serial_manifest));
 						$installed->save();
-					}else{
+					} else{
 						$serial_manifest = unserialize(base64_decode($installed->manifest));
 						$manifest = $serial_manifest['manifest'];
 					}
@@ -859,8 +870,9 @@ 
 						$uninstallable = true;
 					}
 					$enabled = $installed->enabled;
-					if(!$enabled)
-						$enabled_string = 'DISABLED';
+					if(!$enabled) {
+											$enabled_string = 'DISABLED';
+					}
 					$file_uninstall = $filename;
 					if(!$uninstallable){
 						$file_uninstall = 'UNINSTALLABLE';

modules/DynamicFields/DynamicField.php

Braces +85 added lines, -61 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (! defined ( 'sugarEntry' ) || ! sugarEntry)
+if (! defined ( 'sugarEntry' ) || ! sugarEntry) {
     die ( 'Not A Valid Entry Point' ) ;
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -58,8 +59,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($module);
@@ -117,9 +117,12 @@ 
     */
     function buildCache($module = false, $saveCache=true) {
         //We can't build the cache while installing as the required database tables may not exist.
-        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db']))
+        if (!empty($GLOBALS['installing']) && $GLOBALS['installing'] == true|| empty($GLOBALS['db'])) {
+                    return false;
+        }
+        if($module == '../data') {
             return false;
-        if($module == '../data')return false;
+        }
 
         static $results = array ( ) ;
 
@@ -127,8 +130,7 @@ 
         if (! empty ( $module )) {
             $where .= " custom_module='$module' AND ";
             unset( $results[ $module ] ) ; // clear out any old results for the module as $results is declared static
-        }
-        else
+        } else
         {
             $results = array ( ) ; // clear out results - if we remove a module we don't want to have its old vardefs hanging around
         }
@@ -152,10 +154,12 @@ 
             $vardef = $field->get_field_def ();
             $vardef ['id'] = $row ['id'];
             $vardef ['custom_module'] = $row ['custom_module'];
-            if (empty ( $vardef ['source'] ))
-                $vardef ['source'] = 'custom_fields';
-            if (empty ( $results [$row ['custom_module']] ))
-                $results [$row ['custom_module']] = array ( );
+            if (empty ( $vardef ['source'] )) {
+                            $vardef ['source'] = 'custom_fields';
+            }
+            if (empty ( $results [$row ['custom_module']] )) {
+                            $results [$row ['custom_module']] = array ( );
+            }
             $results [$row ['custom_module']] [$row ['name']] = $vardef;
         }
         if (empty ( $module )) {
@@ -165,7 +169,7 @@ 
         } else {
             if (! empty ( $results [$module] )) {
                 $this->saveToVardef ( $module, $results [$module], $saveCache);
-            }else{
+            } else{
                 $this->saveToVardef ( $module, false, $saveCache);
             }
         }
@@ -210,7 +214,9 @@ 
                 //if the vardef isn't loaded let's try loading it.
                 VardefManager::refreshVardefs($module,$object, null, false);
                 //if it's still not loaded we really don't have anything useful to cache
-                if(empty($GLOBALS['dictionary'][$object]['fields']))return;
+                if(empty($GLOBALS['dictionary'][$object]['fields'])) {
+                    return;
+                }
             }
             if (!isset($GLOBALS['dictionary'][$object]['custom_fields'])) {
                 $GLOBALS['dictionary'][$object]['custom_fields'] = false;
@@ -280,8 +286,7 @@ 
         if (empty($expandedList) )
         {
             $select = ",{$this->bean->table_name}_cstm.*" ;
-        }
-        else
+        } else
         {
             $select = '';
             $isList = is_array($expandedList);
@@ -290,8 +295,9 @@ 
                 if (!empty($field['source']) && $field['source'] == 'custom_fields' && (!$isList || !empty($expandedList[$name]))){
                     // assumption: that the column name in _cstm is the same as the field name. Currently true.
                     // however, two types of dynamic fields do not have columns in the custom table - html fields (they're readonly) and flex relates (parent_name doesn't exist)
-                    if ( $field['type'] != 'html' && $name != 'parent_name')
-                        $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    if ( $field['type'] != 'html' && $name != 'parent_name') {
+                                            $select .= ",{$this->bean->table_name}_cstm.{$name}" ;
+                    }
                 }
             }
         }
@@ -346,8 +352,7 @@ 
             else if(!empty($rel_mod->field_defs['name']['source']) && $rel_mod->field_defs['name']['source'] == "non-db" && !empty($field_def['rname']))
             {
                 $name_field = "$joinTableAlias." . $field_def['rname'];
-            }
-            else
+            } else
             {
                 $name_field = "$joinTableAlias.name";
             }
@@ -369,12 +374,16 @@ 
    function fill_relationships(){
         global $beanList, $beanFiles;
         if(!empty($this->bean->relDepth)) {
-            if($this->bean->relDepth > 1)return;
-        }else{
+            if($this->bean->relDepth > 1) {
+                return;
+            }
+        } else{
             $this->bean->relDepth = 0;
         }
         foreach($this->bean->field_defs as $field){
-            if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
+            if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                continue;
+            }
             if($field['type'] == 'relate'){
                 $related_module =$field['ext2'];
                 $name = $field['name'];
@@ -413,8 +422,12 @@ 
             $first = true;
             foreach($this->bean->field_defs as $name=>$field){
 
-                if(empty($field['source']) || $field['source'] != 'custom_fields')continue;
-                if($field['type'] == 'html' || $field['type'] == 'parent')continue;
+                if(empty($field['source']) || $field['source'] != 'custom_fields') {
+                    continue;
+                }
+                if($field['type'] == 'html' || $field['type'] == 'parent') {
+                    continue;
+                }
                 if(isset($this->bean->$name)){
                     $quote = "'";
 
@@ -423,16 +436,17 @@ 
                         if(!isset($this->bean->$name) || !is_numeric($this->bean->$name) ){
                             if($field['required']){
                                 $this->bean->$name = 0;
-                            }else{
+                            } else{
                                 $this->bean->$name = 'NULL';
                             }
                         }
                     }
                     if ( $field['type'] == 'bool' ) {
-                        if ( $this->bean->$name === FALSE )
-                            $this->bean->$name = '0';
-                        elseif ( $this->bean->$name === TRUE )
-                            $this->bean->$name = '1';
+                        if ( $this->bean->$name === FALSE ) {
+                                                    $this->bean->$name = '0';
+                        } elseif ( $this->bean->$name === TRUE ) {
+                                                    $this->bean->$name = '1';
+                        }
                     }
 
                     $val = $this->bean->$name;
@@ -445,7 +459,7 @@ 
                         if($first){
                             $query .= " $name=$quote".$GLOBALS['db']->quote($val)."$quote";
 
-                        }else{
+                        } else{
                             $query .= " ,$name=$quote".$GLOBALS['db']->quote($val)."$quote";
                         }
                     }
@@ -464,7 +478,7 @@ 
             if(!$first){
                 if(!$isUpdate){
                     $GLOBALS['db']->query($queryInsert);
-                }else{
+                } else{
                     $checkquery = "SELECT id_c FROM {$this->bean->table_name}_cstm WHERE id_c = '{$this->bean->id}'";
                     if ( $GLOBALS['db']->getOne($checkquery) ) {
                         $result = $GLOBALS['db']->query($query);
@@ -499,8 +513,9 @@ 
 
         $GLOBALS['db']->query("DELETE FROM fields_meta_data WHERE id='" . $this->module . $widget->name . "'");
         $sql = $widget->get_db_delete_alter_table( $this->bean->table_name . "_cstm" ) ;
-        if (! empty( $sql ) )
-            $GLOBALS['db']->query( $sql );
+        if (! empty( $sql ) ) {
+                    $GLOBALS['db']->query( $sql );
+        }
 
         $this->removeVardefExtension($widget);
         VardefManager::clearVardef();
@@ -518,19 +533,21 @@ 
         $name = $this->getDBName($name);
         $vardefs = $GLOBALS['dictionary'][$this->bean->object_name]['fields'];
         if(!empty($vardefs)){
-            if(empty($type) && empty($name))
-                return false;
-            else if(empty($type))
-                return !empty($vardefs[$name]);
-            else if(empty($name)){
+            if(empty($type) && empty($name)) {
+                            return false;
+            } else if(empty($type)) {
+                            return !empty($vardefs[$name]);
+            } else if(empty($name)){
                 foreach($vardefs as $def){
-                    if(!empty($def['type']) && $def['type'] == $type)
-                        return true;
+                    if(!empty($def['type']) && $def['type'] == $type) {
+                                            return true;
+                    }
                 }
                 return false;
-            }else
-                return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
-        }else{
+            } else {
+                            return (!empty($vardefs[$name]) && ($vardefs[$name]['type'] == $type));
+            }
+        } else{
             return false;
         }
     }
@@ -553,7 +570,7 @@ 
         $label = strtoupper( $field->label );
         if(!empty($id)){
             $is_update = true;
-        }else{
+        } else{
             $db_name = $this->getDBName($field->name);
             $field->name = $db_name;
         }
@@ -564,8 +581,10 @@ 
         $fmd->vname = $label;
         $fmd->type = $field->type;
         $fmd->help = $field->help;
-        if (!empty($field->len))
-            $fmd->len = $field->len; // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
+        if (!empty($field->len)) {
+                    $fmd->len = $field->len;
+        }
+        // tyoung bug 15407 - was being set to $field->size so changes weren't being saved
         $fmd->required = ($field->required ? 1 : 0);
         $fmd->default_value = $field->default;
         $fmd->ext1 = $field->ext1;
@@ -605,7 +624,7 @@ 
 	                	$GLOBALS['db']->query($query, true, "Cannot set default");
 	            	}
                 }
-            }else{
+            } else{
                 $query = $field->get_db_modify_alter_table($this->bean->table_name . '_cstm');
                 if(!empty($query)){
                 	$GLOBALS['db']->query($query, true, "Cannot modify field");
@@ -685,16 +704,16 @@ 
 
         $out .= "\n ?>";
 
-        if (!file_exists($this->base_path))
-            mkdir_recursive($this->base_path);
+        if (!file_exists($this->base_path)) {
+                    mkdir_recursive($this->base_path);
+        }
 
         if( $fh = @sugar_fopen( $file_loc, 'w' ) )
         {
             fputs( $fh, $out);
             fclose( $fh );
             return true ;
-        }
-        else
+        } else
         {
             return false ;
         }
@@ -815,8 +834,9 @@ 
     	$out = "";
         if($this->bean->hasCustomFields()){
 	        foreach($this->bean->field_defs as $name=>$data){
-	        	if(empty($data['source']) || $data['source'] != 'custom_fields')
-                    continue;
+	        	if(empty($data['source']) || $data['source'] != 'custom_fields') {
+	        	                    continue;
+	        	}
 	            $out .= $this->add_existing_custom_field($data, $execute);
 	        }
     	}
@@ -831,8 +851,9 @@ 
         $query = "/*MISSING IN DATABASE - {$data['name']} -  ROW*/\n"
                 . $field->get_db_add_alter_table($this->bean->table_name . '_cstm');
         $out = $query . "\n";
-        if ($execute)
-            $GLOBALS['db']->query($query);
+        if ($execute) {
+                    $GLOBALS['db']->query($query);
+        }
 
         return $out;
     }
@@ -841,16 +862,18 @@ 
     {
         $out = $this->createCustomTable($execute);
         //If the table didn't exist, createCustomTable will have returned all the SQL to create and populate it
-        if (!empty($out))
-            return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    return "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
         //Otherwise make sure all the custom fields defined in the vardefs exist in the custom table.
         //We aren't checking for data types, just that the column exists.
         $db = $GLOBALS['db'];
         $tablename = $this->bean->table_name."_cstm";
         $compareFieldDefs = $db->get_columns($tablename);
         foreach($this->bean->field_defs as $name=>$data){
-            if(empty($data['source']) || $data['source'] != 'custom_fields')
-                continue;
+            if(empty($data['source']) || $data['source'] != 'custom_fields') {
+                            continue;
+            }
             /**
              * @bug 43471
              * @issue 43471
@@ -864,8 +887,9 @@ 
             }
             $out .= $this->add_existing_custom_field($data, $execute);
         }
-        if (!empty($out))
-            $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        if (!empty($out)) {
+                    $out = "/*Checking Custom Fields for module : {$this->module} */\n$out";
+        }
 
         return $out;
     }

modules/DynamicFields/FieldsMetaData.php

Indentation +74 added lines, -74 removed lines

@@ -51,75 +51,75 @@ 
 
 
 class FieldsMetaData extends SugarBean {
-	// database table columns
-	var $id;
-	var $name;
-	var $vname;
-  	var $custom_module;
-  	var $type;
-  	var $len;
-  	var $required;
-  	var $default_value;
-  	var $deleted;
-  	var $ext1;
-  	var $ext2;
-  	var $ext3;
-	var $audited;
-	var $inline_edit;
+    // database table columns
+    var $id;
+    var $name;
+    var $vname;
+        var $custom_module;
+        var $type;
+        var $len;
+        var $required;
+        var $default_value;
+        var $deleted;
+        var $ext1;
+        var $ext2;
+        var $ext3;
+    var $audited;
+    var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
-
-	var $table_name = 'fields_meta_data';
-	var $object_name = 'FieldsMetaData';
-	var $module_dir = 'DynamicFields';
-	var $column_fields = array(
-		'id',
-		'name',
-		'vname',
-		'custom_module',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'deleted',
-		'ext1',
-		'ext2',
-		'ext3',
-		'audited',
-		'inline_edit',
-		'massupdate',
+    var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+
+    var $table_name = 'fields_meta_data';
+    var $object_name = 'FieldsMetaData';
+    var $module_dir = 'DynamicFields';
+    var $column_fields = array(
+        'id',
+        'name',
+        'vname',
+        'custom_module',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'deleted',
+        'ext1',
+        'ext2',
+        'ext3',
+        'audited',
+        'inline_edit',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
-
-	var $list_fields = array(
-		'id',
-		'name',
-		'vname',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'audited',
+    );
+
+    var $list_fields = array(
+        'id',
+        'name',
+        'vname',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'audited',
         'inline_edit',
-		'massupdate',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
+    );
 
-	var $field_name_map;
-	var $new_schema = true;
+    var $field_name_map;
+    var $new_schema = true;
 
-	//////////////////////////////////////////////////////////////////
-	// METHODS
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
+    // METHODS
+    //////////////////////////////////////////////////////////////////
 
     public function __construct()
-	{
-		parent::__construct();
-		$this->disable_row_level_security = true;
-	}
+    {
+        parent::__construct();
+        $this->disable_row_level_security = true;
+    }
 
     /**
      * @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
@@ -136,25 +136,25 @@ 
     }
 
 
-	function mark_deleted($id)
-	{
-		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
-		$this->mark_relationships_deleted($id);
+    function mark_deleted($id)
+    {
+        $query = "DELETE FROM $this->table_name WHERE  id='$id'";
+        $this->db->query($query, true,"Error deleting record: ");
+        $this->mark_relationships_deleted($id);
 
-	}
+    }
 
-	function get_list_view_data(){
-	    $data = parent::get_list_view_data();
-	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
-	    return $data;
-	}
+    function get_list_view_data(){
+        $data = parent::get_list_view_data();
+        $data['VNAME'] = translate($this->vname, $this->custom_module);
+        $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+        return $data;
+    }
 
 
-	function get_summary_text()
-	{
-		return $this->name;
-	}
+    function get_summary_text()
+    {
+        return $this->name;
+    }
 }
 ?>

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/Administration/Administration.php

Braces +16 added lines, -13 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.
@@ -83,8 +85,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -121,10 +122,11 @@ 
         }
 
         while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
-                $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
-            else
-                $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password') {
+                            $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
+            } else {
+                            $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            }
             $this->settings[$row['category']] = true;
         }
         $this->settings[$category] = true;
@@ -135,8 +137,9 @@ 
             $oe->getSystemMailerSettings();
 
             foreach ($oe->field_defs as $def) {
-                if (strpos($def, "mail_") !== false)
-                    $this->settings[$def] = $oe->$def;
+                if (strpos($def, "mail_") !== false) {
+                                    $this->settings[$def] = $oe->$def;
+                }
             }
         }
 
@@ -180,13 +183,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
-            $value = $this->encrpyt_before_save($value);
+        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password') {
+                    $value = $this->encrpyt_before_save($value);
+        }
 
         if( $row_count == 0){
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
-        }
-        else{
+        } else{
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');

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

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/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;
             }
         }
     }

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

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