Release 6.2.0

Author: John Mertic

HandleAjaxCall.php

@@ -1,7 +1,7 @@
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under

ModuleInstall/ModuleInstaller.php

@@ -1,7 +1,7 @@
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -224,10 +224,13 @@ function install($base_dir, $is_upgrade = false, $previous_version = ''){
 				$rac = new RepairAndClear();
 				$rac->repairAndClearAll($selectedActions, $installed_modules,true, false);
 				$this->rebuild_relationships();
-				$this->log('<br><b>' . translate('LBL_MI_COMPLETE') . '</b>');
-
 				UpdateSystemTabs('Add',$tab_modules);
-
+				
+				//clear the unified_search_module.php file 
+	            require_once('modules/Home/UnifiedSearchAdvanced.php');
+	            UnifiedSearchAdvanced::unlinkUnifiedSearchModulesFile(); 
+	            				
+				$this->log('<br><b>' . translate('LBL_MI_COMPLETE') . '</b>');
 		}else{
 			die("No \$installdefs Defined In $this->base_dir/manifest.php");
 		}
@@ -337,7 +340,9 @@ function uninstall_new_files($cp, $backup_path){
 				//if it's not a sugar file then we remove it otherwise we can't restor it
 				if(!$this->ms->sugarFileExists($to)){
 					$GLOBALS['log']->debug('ModuleInstaller[uninstall_new_file] deleting file ' . $to);
-					unlink($to);
+					if(file_exists($to)) {
+					    unlink($to);
+					}
 				}else{
 					$GLOBALS['log']->fatal('ModuleInstaller[uninstall_new_file] Could not remove file ' . $to . ' as no backup file was found to restore to');
 				}
@@ -1261,6 +1266,10 @@ function uninstall($base_dir){
 
 				UpdateSystemTabs('Restore',$installed_modules);
 
+	            //clear the unified_search_module.php file 
+	            require_once('modules/Home/UnifiedSearchAdvanced.php');
+	            UnifiedSearchAdvanced::unlinkUnifiedSearchModulesFile();     				
+				
 				$this->log('<br><b>' . translate('LBL_MI_COMPLETE') . '</b>');
 				if(!$this->silent){
 					update_progress_bar('install', $total_steps, $total_steps);
@@ -1289,6 +1298,7 @@ function rebuild_vardefs(){
 			$this->merge_files('Ext/Vardefs/', 'vardefs.ext.php');
 			sugar_cache_reset();
 	}
+
 	function rebuild_layoutdefs(){
             $this->log(translate('LBL_MI_REBUILDING') . " Layoutdefs...");
 			$this->merge_files('Ext/Layoutdefs/', 'layoutdefs.ext.php');
@@ -1302,12 +1312,12 @@ function rebuild_menus(){
 
 	function rebuild_dashletcontainers(){
             $this->log(translate('LBL_MI_REBUILDING') . " DC Actions...");
-			$this->merge_files('Ext/DashletContainer/Containers', 'dcactions.ext.php');
+			$this->merge_files('Ext/DashletContainer/Containers/', 'dcactions.ext.php');
 	}
 
 	function rebuild_modules(){
             $this->log(translate('LBL_MI_REBUILDING') . " Modules...");
-			$this->merge_files('Ext/Include', 'modules.ext.php', '', true);
+			$this->merge_files('Ext/Include/', 'modules.ext.php', '', true);
 	}
 
 	function rebuild_administration(){
@@ -1400,18 +1410,14 @@ function merge_files($path, $name, $filter = '', $application = false){
 						     if (substr($entry, 0, 9) == '_override') {
 						    	$override[] = $entry;
 						    } else {
-							    $fp = sugar_fopen($module_install . '/' . $entry, 'r');
-							    $file = fread($fp , filesize($module_install . '/' . $entry));
+							    $file = file_get_contents($module_install . '/' . $entry);
 							    $GLOBALS['log']->debug(get_class($this)."->merge_files(): found {$module_install}{$entry}") ;
-							    fclose($fp);
 							    $extension .= "\n". str_replace(array('<?php', '?>', '<?PHP', '<?'), array('','', '' ,'') , $file);
 						    }
 						}
 					}
 					foreach ($override as $entry) {
-						$fp = sugar_fopen($module_install . '/' . $entry, 'r');
-                        $file = fread($fp , filesize($module_install . '/' . $entry));
-                        fclose($fp);
+                        $file = file_get_contents($module_install . '/' . $entry);
                         $extension .= "\n". str_replace(array('<?php', '?>', '<?PHP', '<?'), array('','', '' ,'') , $file);
 					}
 				}
@@ -1446,9 +1452,7 @@ function merge_files($path, $name, $filter = '', $application = false){
 								if((empty($filter) || substr_count($entry, $filter) > 0) && is_file($module_install.'/'.$entry)
 								  && $entry != '.' && $entry != '..' && strtolower(substr($entry, -4)) == ".php")
 								{
-									$fp = sugar_fopen($module_install . '/' . $entry, 'r');
-									$file = fread($fp , filesize($module_install . '/' . $entry));
-									fclose($fp);
+									$file = file_get_contents($module_install . '/' . $entry);
 									$extension .= "\n". str_replace(array('<?php', '?>', '<?PHP', '<?'), array('','', '' ,'') , $file);
 								}
 						}
@@ -1624,6 +1628,7 @@ private function dir_get_files($path, $base_path){
 private function dir_file_count($path){
 	//if its a file then it has at least 1 file in the directory
 	if(is_file($path)) return 1;
+	if(!is_dir($path)) return 0;
 	$d = dir($path);
 	$count = 0;
 	while ($e = $d->read()){
@@ -1992,7 +1997,7 @@ function disable_relationships($action = 'disable'){
                         $path ='custom/Extension/' . $relationship['module']. '/Ext/Layoutdefs';
                     }
 				}
-                
+
 				if(!empty($relationship['module_layoutdefs']) && file_exists($path . '/'. $this->id_name . '.php')){
 					mkdir_recursive($path . '/'.DISABLED_PATH, true);
 					rename( $path . '/'. $this->id_name . '.php', $path . '/'.DISABLED_PATH.'/'. $this->id_name . '.php');

ModuleInstall/ModuleScanner.php

@@ -1,7 +1,7 @@
 <?php 
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -281,7 +281,8 @@ public function scanFile($file){
 	 */
 	public function sugarFileExists($path){
 		static $md5 = array();
-		if(empty($md5)){
+		if(empty($md5) && file_exists('files.md5'))
+		{
 			include('files.md5');
 			$md5 = $md5_string;
 		}

ModuleInstall/PackageManager/ListViewPackages.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under

ModuleInstall/PackageManager/PackageController.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under

ModuleInstall/PackageManager/PackageManager.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -233,7 +233,7 @@ function authenticate($username, $password, $systemname='', $terms_checked = tru
     }
 
     function setCredentials($username, $password, $systemname){
-         
+
         $admin = new Administration();
         $admin->retrieveSettings();
          $admin->saveSetting(CREDENTIAL_CATEGORY, CREDENTIAL_USERNAME, $username);
@@ -244,7 +244,7 @@ function setCredentials($username, $password, $systemname){
     }
 
     function getCredentials(){
-         
+
         $admin = new Administration();
         $admin->retrieveSettings(CREDENTIAL_CATEGORY, true);
         $credentials = array();
@@ -619,7 +619,7 @@ function getUITextForType( $type ){
     }
 
     function getImageForType( $type ){
-        
+
         $icon = "";
         switch( $type ){
             case "full":
@@ -664,7 +664,7 @@ function getPackagesInStaging($view = 'module'){
         		$alreadyProcessed["$val"] = true;
         	}
         }
-        
+
         $upgrades_available = 0;
         $packages = array();
         $mod_strings = return_module_language($current_language, "Administration");
@@ -703,7 +703,7 @@ function getPackagesInStaging($view = 'module'){
 
 				//check dependencies first
 				if(!empty($dependencies)){
-					
+
 					$uh = new UpgradeHistory();
 					$not_found = $uh->checkDependencies($dependencies);
 					if(!empty($not_found) && count($not_found) > 0){
@@ -736,7 +736,7 @@ function getPackagesInStaging($view = 'module'){
 		        $c = count($fileS);
 		        $fileName = (isset($fileS[$c-1]) && !empty($fileS[$c-1])) ? $fileS[$c-1] : $fileS[$c-2];
 		        $upload_file = $sugar_config['upload_dir'].$fileName;
-        
+
                 $upgrade_content = urlencode($upgrade_content);
                 $upload_content = urlencode($upload_file);
                 $packages[] = array('name' => $name, 'version' => $version, 'published_date' => $published_date, 'description' => $description, 'uninstallable' =>$uninstallable, 'type' => $type, 'file_install' => fileToHash($file_install), 'file' => fileToHash($upgrade_content), 'upload_file' => $upload_content);
@@ -751,9 +751,7 @@ function getLicenseFromFile($file){
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $license_file = $this->extractFile($file, 'LICENSE.txt', $base_tmp_upgrade_dir);
         if(is_file($license_file)){
-             $fh = sugar_fopen($license_file, 'r');
-            $contents = fread($fh, filesize($license_file));
-            fclose($fh);
+            $contents = file_get_contents($license_file);
             return $contents;
         }else{
             return null;
@@ -856,15 +854,15 @@ function getinstalledPackages($types = array('module', 'langpack')){
 					} 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 , 
+				    'name' => $name,
+				    'version' => $version,
+				    'type' => $type,
+				    'published_date' => $date_entered,
+				    'description' => $description,
+				    'uninstallable' =>$uninstallable,
+				    'file_install' =>  $file_uninstall ,
 				    'file' =>  fileToHash($filename),
 				    'enabled' => $enabled_string
 				);

ModuleInstall/PackageManager/PackageManagerComm.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under

ModuleInstall/PackageManager/PackageManagerDisplay.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under
@@ -324,9 +324,7 @@ function buildTreeView($div_id, $isAlive = true){
     function getLicenseDisplay($license_file, $form_action, $next_step, $zipFile, $type, $manifest, $modify_field){
     	global $current_language;
         $mod_strings = return_module_language($current_language, "Administration");
-        $fh = sugar_fopen($license_file, 'r');
-        $contents = fread($fh, filesize($license_file));
-        fclose($fh);
+        $contents = sugar_file_get_contents($license_file);
         $div_id = urlencode($zipFile);
         $display = "<form name='delete{$zipFile}' action='{$form_action}' method='POST'>";
         $display .= "<input type='hidden' name='current_step' value='{$next_step}'>";

ModuleInstall/PackageManager/PackageManagerDownloader.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under

ModuleInstall/PackageManager/metadata/listviewdefs.php

@@ -1,6 +1,6 @@
 <?php
 /*********************************************************************************
- * SugarCRM is a customer relationship management program developed by
+ * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2011 SugarCRM Inc.
  * 
  * This program is free software; you can redistribute it and/or modify it under