adamjakab / SuiteCRM

modules/Campaigns/views/view.detail.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -54,7 +54,7 @@ 
 
 class CampaignsViewDetail extends ViewDetail {
 
- 	function __construct(){
+ 	function __construct() {
 
         parent::__construct();
         //turn off normal display of subpanels
@@ -65,9 +65,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function CampaignsViewDetail(){
+    function CampaignsViewDetail() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -78,9 +78,9 @@ 
 
 
 
-    function preDisplay(){
+    function preDisplay() {
         global $mod_strings;
-        if (isset($this->bean->campaign_type) && strtolower($this->bean->campaign_type) == 'newsletter'){
+        if (isset($this->bean->campaign_type) && strtolower($this->bean->campaign_type) == 'newsletter') {
             $mod_strings['LBL_MODULE_NAME'] = $mod_strings['LBL_NEWSLETTERS'];
         }
         parent::preDisplay();
@@ -92,7 +92,7 @@ 
  	    global $app_list_strings;
  	    $this->ss->assign('APP_LIST', $app_list_strings);
 
-        if (isset($_REQUEST['mode']) && $_REQUEST['mode']=='set_target'){
+        if (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'set_target') {
             require_once('modules/Campaigns/utils.php');
             //call function to create campaign logs
             $mess = track_campaign_prospects($this->bean);
@@ -102,11 +102,11 @@ 
             window.setTimeout('ajax_C_LOG_Status.hideStatus()', 1500);
             window.setTimeout(\"ajax_C_LOG_Status.showStatus('".$mess."')\",2000);
             window.setTimeout('ajax_C_LOG_Status.hideStatus()', 5000); ";
-            $this->ss->assign("MSG_SCRIPT",$confirm_msg);
+            $this->ss->assign("MSG_SCRIPT", $confirm_msg);
 
         }
 
-	    if (($this->bean->campaign_type == 'Email') || ($this->bean->campaign_type == 'NewsLetter' )) {
+	    if (($this->bean->campaign_type == 'Email') || ($this->bean->campaign_type == 'NewsLetter')) {
 	    	$this->ss->assign("ADD_BUTTON_STATE", "submit");
 	        $this->ss->assign("TARGET_BUTTON_STATE", "hidden");
 	    } else {
@@ -116,16 +116,16 @@ 
 	    }
 
 	    $currency = new Currency();
-	    if(isset($this->bean->currency_id) && !empty($this->bean->currency_id))
+	    if (isset($this->bean->currency_id) && !empty($this->bean->currency_id))
 	    {
 	    	$currency->retrieve($this->bean->currency_id);
-	    	if( $currency->deleted != 1){
-	    		$this->ss->assign('CURRENCY', $currency->iso4217 .' '.$currency->symbol);
-	    	}else {
-	    	    $this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
+	    	if ($currency->deleted != 1) {
+	    		$this->ss->assign('CURRENCY', $currency->iso4217.' '.$currency->symbol);
+	    	} else {
+	    	    $this->ss->assign('CURRENCY', $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
 	    	}
-	    }else{
-	    	$this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
+	    } else {
+	    	$this->ss->assign('CURRENCY', $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
 	    }
 
         parent::display();
@@ -136,11 +136,11 @@ 
         require_once('include/SubPanel/SubPanelTiles.php');
         $subpanel = new SubPanelTiles($this->bean, $this->module);
         //get available list of subpanels
-        $alltabs=$subpanel->subpanel_definitions->get_available_tabs();
+        $alltabs = $subpanel->subpanel_definitions->get_available_tabs();
         if (!empty($alltabs)) {
             //iterate through list, and filter out all but 3 subpanels
             foreach ($alltabs as $key=>$name) {
-                if ($name != 'prospectlists' && $name!='emailmarketing' && $name != 'tracked_urls'
+                if ($name != 'prospectlists' && $name != 'emailmarketing' && $name != 'tracked_urls'
                 /* BEGIN - SECURITY GROUPS */
                 	&& $name != 'securitygroups'
                 /* END - SECURITY GROUPS */
@@ -150,7 +150,7 @@ 
                 }
             }
             //only show email marketing subpanel for email/newsletter campaigns
-            if ($this->bean->campaign_type != 'Email' && $this->bean->campaign_type != 'NewsLetter' ) {
+            if ($this->bean->campaign_type != 'Email' && $this->bean->campaign_type != 'NewsLetter') {
                 //exclude emailmarketing subpanel if not on an email or newsletter campaign
                 $subpanel->subpanel_definitions->exclude_tab('emailmarketing');
                 // Bug #49893  - 20120120 - Captivea (ybi) - Remove trackers subpanels if not on an email/newsletter campaign (useless subpannl)

Braces +6 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -69,8 +71,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,10 @@ 
 	    	$currency->retrieve($this->bean->currency_id);
 	    	if( $currency->deleted != 1){
 	    		$this->ss->assign('CURRENCY', $currency->iso4217 .' '.$currency->symbol);
-	    	}else {
+	    	} else {
 	    	    $this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
 	    	}
-	    }else{
+	    } else{
 	    	$this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
 	    }
 

modules/Campaigns/views/view.classic.php

Spacing +11 added lines, -11 removed lines

@@ -51,9 +51,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function CampaignsViewClassic(){
+    function CampaignsViewClassic() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -70,11 +70,11 @@ 
 	{
  		// Call SugarController::getActionFilename to handle case sensitive file names
  		$file = SugarController::getActionFilename($this->action);
- 		if(file_exists('custom/modules/' . $this->module . '/'. $file . '.php')){
-			$this->includeClassicFile('custom/modules/'. $this->module . '/'. $file . '.php');
+ 		if (file_exists('custom/modules/'.$this->module.'/'.$file.'.php')) {
+			$this->includeClassicFile('custom/modules/'.$this->module.'/'.$file.'.php');
 			return true;
-		}elseif(file_exists('modules/' . $this->module . '/'. $file . '.php')){
-			$this->includeClassicFile('modules/'. $this->module . '/'. $file . '.php');
+		}elseif (file_exists('modules/'.$this->module.'/'.$file.'.php')) {
+			$this->includeClassicFile('modules/'.$this->module.'/'.$file.'.php');
 			return true;
 		}
 		return false;
@@ -87,10 +87,10 @@ 
 	{
     	$params = array();
     	$params[] = $this->_getModuleTitleListParam($browserTitle);
-    	if (isset($this->action)){
-    		switch($_REQUEST['action']){
+    	if (isset($this->action)) {
+    		switch ($_REQUEST['action']) {
     				case 'WizardHome':
-				    	if(!empty($this->bean->id))
+				    	if (!empty($this->bean->id))
 				    	{
 				    		$params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->name."</a>";
 				    	}
@@ -100,7 +100,7 @@ 
     					$params[] = $GLOBALS['mod_strings']['LBL_LEAD_FORM_WIZARD'];
     					break;
     				case 'WizardNewsletter':
-				    	if(!empty($this->bean->id))
+				    	if (!empty($this->bean->id))
 				    	{
 				    		$params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$GLOBALS['mod_strings']['LBL_NEWSLETTER_TITLE']."</a>";
 				    	}
@@ -113,7 +113,7 @@ 
     					$params[] = $GLOBALS['mod_strings']['LBL_EMAIL_SETUP_WIZARD_TITLE'];
     					break;
     				case 'TrackDetailView':
-    					if(!empty($this->bean->id))
+    					if (!empty($this->bean->id))
     					{
 	    					$params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->name."</a>";
     					}

Braces +2 added lines, -3 removed lines

@@ -55,8 +55,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();
@@ -73,7 +72,7 @@ 
  		if(file_exists('custom/modules/' . $this->module . '/'. $file . '.php')){
 			$this->includeClassicFile('custom/modules/'. $this->module . '/'. $file . '.php');
 			return true;
-		}elseif(file_exists('modules/' . $this->module . '/'. $file . '.php')){
+		} elseif(file_exists('modules/' . $this->module . '/'. $file . '.php')){
 			$this->includeClassicFile('modules/'. $this->module . '/'. $file . '.php');
 			return true;
 		}

modules/UpgradeWizard/SugarMerge/SugarMerge.php

Indentation +163 added lines, -163 removed lines

@@ -58,27 +58,27 @@ 
  *
  */
 class SugarMerge {
-	private $mergeMapping = array();
-	private $new_path = '';
-	private $custom_path = 'custom';
-	private $original_path = '';
-	private $merged = array();
-	private $fp = NULL;
-
-	function __construct($new_path='', $original_path='', $custom_path='custom') {
-
-		$this->new_path = empty($new_path) || preg_match('/[\/]$/', $new_path) ? $new_path : $new_path . '/';
-		$this->original_path = empty($original_path) || preg_match('/[\/]$/', $original_path) ? $original_path : $original_path . '/';
-		$this->custom_path = empty($custom_path) || preg_match('/[\/]$/', $custom_path) ? $custom_path : $custom_path . '/';
-
-		$this->mergeMapping = array(
-			'editviewdefs.php'=> new EditViewMerge(),
-			'detailviewdefs.php'=>new DetailViewMerge(),
-			'listviewdefs.php'=>new ListViewMerge(),
-			'searchdefs.php'=>new SearchMerge(),
-			'quickcreatedefs.php'=>new QuickCreateMerge(),
-		);
-	}
+    private $mergeMapping = array();
+    private $new_path = '';
+    private $custom_path = 'custom';
+    private $original_path = '';
+    private $merged = array();
+    private $fp = NULL;
+
+    function __construct($new_path='', $original_path='', $custom_path='custom') {
+
+        $this->new_path = empty($new_path) || preg_match('/[\/]$/', $new_path) ? $new_path : $new_path . '/';
+        $this->original_path = empty($original_path) || preg_match('/[\/]$/', $original_path) ? $original_path : $original_path . '/';
+        $this->custom_path = empty($custom_path) || preg_match('/[\/]$/', $custom_path) ? $custom_path : $custom_path . '/';
+
+        $this->mergeMapping = array(
+            'editviewdefs.php'=> new EditViewMerge(),
+            'detailviewdefs.php'=>new DetailViewMerge(),
+            'listviewdefs.php'=>new ListViewMerge(),
+            'searchdefs.php'=>new SearchMerge(),
+            'quickcreatedefs.php'=>new QuickCreateMerge(),
+        );
+    }
 
     /**
      * @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
@@ -95,34 +95,34 @@ 
     }
 
 
-	function setLogFilePointer($fp){
-		$this->fp = $fp;
-	}
+    function setLogFilePointer($fp){
+        $this->fp = $fp;
+    }
 
 
 
-	/**
-	 * This will run through all the modules that may need merging and determine if there is anything to merge
-	 * if $merge is set to true it will perform the merge
-	 * if $merge and $save are set to true it will perform the merge and save the results in the custom directory
-	 *
-	 * @param BOOLEAN|ARRAY $merge - do we wish to perform the merge if false it will just return a list of files that can be merged.  If an array is passed, only those modules present in the array will be merged.
-	 * @param BOOLEAN $save - do we wish to save the merged files to true - $merge must be true for this to apply - otherwise it will simulate merging so you can view the log files of the merge
-	 * @param BOOLEAN $logHistory - do we wish to create history entries for any of the merges
-	 * @return ARRAY - an associative array of module names to files that were either merged or have the potential to be merged depeneding if $merge and $save  are set to true
-	 */
-	function mergeAll($merge=true, $save=true, $logHistory=true){
-		$this->merged = array();
-		$searchDirectory = $this->custom_path;
-		if(!preg_match('/[\/]modules$/si', $searchDirectory)) {
-		   $searchDirectory .= preg_match('/[\/]$/', $this->custom_path) ? 'modules' : '/modules';
-		}
+    /**
+     * This will run through all the modules that may need merging and determine if there is anything to merge
+     * if $merge is set to true it will perform the merge
+     * if $merge and $save are set to true it will perform the merge and save the results in the custom directory
+     *
+     * @param BOOLEAN|ARRAY $merge - do we wish to perform the merge if false it will just return a list of files that can be merged.  If an array is passed, only those modules present in the array will be merged.
+     * @param BOOLEAN $save - do we wish to save the merged files to true - $merge must be true for this to apply - otherwise it will simulate merging so you can view the log files of the merge
+     * @param BOOLEAN $logHistory - do we wish to create history entries for any of the merges
+     * @return ARRAY - an associative array of module names to files that were either merged or have the potential to be merged depeneding if $merge and $save  are set to true
+     */
+    function mergeAll($merge=true, $save=true, $logHistory=true){
+        $this->merged = array();
+        $searchDirectory = $this->custom_path;
+        if(!preg_match('/[\/]modules$/si', $searchDirectory)) {
+            $searchDirectory .= preg_match('/[\/]$/', $this->custom_path) ? 'modules' : '/modules';
+        }
 
-		if(file_exists($searchDirectory)){
-			$dir = dir($searchDirectory);
-			while($e = $dir->read()){
-				if(substr($e , 0, 1) != '.') {
-					if(is_dir("{$searchDirectory}/{$e}/metadata")){
+        if(file_exists($searchDirectory)){
+            $dir = dir($searchDirectory);
+            while($e = $dir->read()){
+                if(substr($e , 0, 1) != '.') {
+                    if(is_dir("{$searchDirectory}/{$e}/metadata")){
 
                         //lets make sure that the directory matches the case of the module before we pass it in
                         global $moduleList;
@@ -130,132 +130,132 @@ 
                         $checkModList =  array_combine ($moduleList,$moduleList);
                         $checkModList = array_change_key_case($checkModList);
 
-  						//now lets compare with the current directory.  This accounts for cases in which the directory was created in lowercase
+                            //now lets compare with the current directory.  This accounts for cases in which the directory was created in lowercase
                         if(!empty($checkModList[strtolower($e)])){
                             //directory was lowercase, let's use the right module value
-							$e = $checkModList[strtolower($e)];
+                            $e = $checkModList[strtolower($e)];
                         }
 
-					    if( is_array($merge) )
-					    {
-					        if ( in_array($e,$merge) )
-					        	$this->merged[$e] = $this->mergeModule($e, TRUE, $save,$logHistory );
-					        else
-					        {
-					            $GLOBALS['log']->debug("SugarMerge is skipping $e module as filter array passed in but module not specified for merge.");
-					            continue;
-					        }
-					    }
-					    else
-						  $this->merged[$e] = $this->mergeModule($e, $merge, $save,$logHistory );
-					}
-				}
-			}
-		}
-		return $this->merged;
-	}
-
-
-
-
-	/**
-	 * This will merge any files that need merging for a given module
-	 * if $merge is set to true it will perform the merge
-	 * if $merge and $save are set to true it will perform the merge and save the results in the custom directory
-	 *
-	 * @param STRING $module - the name of the module to merge files for
-	 * @param BOOLEAN $merge - do we wish to perform the merge if false it will just return a list of files that can be merged
-	 * @param BOOLEAN $save - do we wish to save the merged files to true - $merge must be true for this to apply - otherwise it will simulate merging so you can view the log files of the merge
-	 * @param BOOLEAN $logHistory - do we wish to create history entries for any of the merges
-	 * @return ARRAY - an associative array of files that were either merged or have the potential to be merged depeneding if $merge and $save  are set to true
-	 */
-	function mergeModule($module, $merge = true, $save=true,$logHistory=true){
-		$merged = array();
-		$path = $this->original_path . 'modules/' . $module . '/metadata/';
-		$custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
-		$new_path = $this->new_path . 'modules/' . $module . '/metadata/';
-		foreach($this->mergeMapping as $file=>&$object){
-			if(file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
-				if($merge){
-					$merged[$file] = $this->mergeFile($module, $file, $save, $logHistory);
-				}else{
-					$merged[$file] = true;
-				}
-			}
-		}
-
-		return $merged;
-
-	}
-
-	/**
-	 * This function will merge a single file for a module
-	 *
-	 * @param STRING $module - name of the module
-	 * @param STRING $file - name of the file
-	 * @param STRING $save - should the merged file be saved to the custom directory
-	 * @return BOOLEAN - success or failure of the merge
-	 */
-	function mergeFile($module, $file, $save=true,$logHistory=true){
-		$path = $this->original_path . 'modules/' . $module . '/metadata/';
-		$custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
-		$new_path = $this->new_path . 'modules/' . $module . '/metadata/';
-		if($this->fp) $this->mergeMapping[$file]->setLogFilePointer($this->fp);
-		if(isset($this->mergeMapping[$file]) && file_exists("{$path}{$file}") && file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
-		    //Create a log entry of the custom file before it is merged
-		    if($logHistory && $save)
-		          $this->createHistoryLog($module, "{$custom_path}{$file}",$file);
+                        if( is_array($merge) )
+                        {
+                            if ( in_array($e,$merge) )
+                                $this->merged[$e] = $this->mergeModule($e, TRUE, $save,$logHistory );
+                            else
+                            {
+                                $GLOBALS['log']->debug("SugarMerge is skipping $e module as filter array passed in but module not specified for merge.");
+                                continue;
+                            }
+                        }
+                        else
+                            $this->merged[$e] = $this->mergeModule($e, $merge, $save,$logHistory );
+                    }
+                }
+            }
+        }
+        return $this->merged;
+    }
+
+
+
+
+    /**
+     * This will merge any files that need merging for a given module
+     * if $merge is set to true it will perform the merge
+     * if $merge and $save are set to true it will perform the merge and save the results in the custom directory
+     *
+     * @param STRING $module - the name of the module to merge files for
+     * @param BOOLEAN $merge - do we wish to perform the merge if false it will just return a list of files that can be merged
+     * @param BOOLEAN $save - do we wish to save the merged files to true - $merge must be true for this to apply - otherwise it will simulate merging so you can view the log files of the merge
+     * @param BOOLEAN $logHistory - do we wish to create history entries for any of the merges
+     * @return ARRAY - an associative array of files that were either merged or have the potential to be merged depeneding if $merge and $save  are set to true
+     */
+    function mergeModule($module, $merge = true, $save=true,$logHistory=true){
+        $merged = array();
+        $path = $this->original_path . 'modules/' . $module . '/metadata/';
+        $custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
+        $new_path = $this->new_path . 'modules/' . $module . '/metadata/';
+        foreach($this->mergeMapping as $file=>&$object){
+            if(file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
+                if($merge){
+                    $merged[$file] = $this->mergeFile($module, $file, $save, $logHistory);
+                }else{
+                    $merged[$file] = true;
+                }
+            }
+        }
+
+        return $merged;
+
+    }
+
+    /**
+     * This function will merge a single file for a module
+     *
+     * @param STRING $module - name of the module
+     * @param STRING $file - name of the file
+     * @param STRING $save - should the merged file be saved to the custom directory
+     * @return BOOLEAN - success or failure of the merge
+     */
+    function mergeFile($module, $file, $save=true,$logHistory=true){
+        $path = $this->original_path . 'modules/' . $module . '/metadata/';
+        $custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
+        $new_path = $this->new_path . 'modules/' . $module . '/metadata/';
+        if($this->fp) $this->mergeMapping[$file]->setLogFilePointer($this->fp);
+        if(isset($this->mergeMapping[$file]) && file_exists("{$path}{$file}") && file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
+            //Create a log entry of the custom file before it is merged
+            if($logHistory && $save)
+                    $this->createHistoryLog($module, "{$custom_path}{$file}",$file);
             $this->mergeMapping[$file]->sugarMerge = $this;
-		    return $this->mergeMapping[$file]->merge($module, "{$path}{$file}", "{$new_path}{$file}", "{$custom_path}{$file}", $save);
-		}
-		return false;
+            return $this->mergeMapping[$file]->merge($module, "{$path}{$file}", "{$new_path}{$file}", "{$custom_path}{$file}", $save);
+        }
+        return false;
 
-	}
+    }
+
+    /**
+     * Create a history copy of the custom file that will be merged so that it can be access through
+     * studio if admins wish to revert at a later date.
+     *
+     * @param STRING $module - name of the module
+     * @param STRING $file - name of the file
+     * @param STRING $customFile - Path to the custom file that will be merged
+     */
+    protected function createHistoryLog($module,$customFile,$file)
+    {
+        $historyPath = 'custom/' . MB_HISTORYMETADATALOCATION . "/modules/$module/metadata/$file";
+        $history = new History($historyPath);
+        $timeStamp = $history->append($customFile);
+        $GLOBALS['log']->debug("Created history file after merge with new file: " . $historyPath .'_'.$timeStamp);
+    }
 
     /**
-	 * Create a history copy of the custom file that will be merged so that it can be access through
-	 * studio if admins wish to revert at a later date.
-	 *
-	 * @param STRING $module - name of the module
-	 * @param STRING $file - name of the file
-	 * @param STRING $customFile - Path to the custom file that will be merged
-	 */
-	protected function createHistoryLog($module,$customFile,$file)
-	{
-	    $historyPath = 'custom/' . MB_HISTORYMETADATALOCATION . "/modules/$module/metadata/$file";
-	    $history = new History($historyPath);
-	    $timeStamp = $history->append($customFile);
-	    $GLOBALS['log']->debug("Created history file after merge with new file: " . $historyPath .'_'.$timeStamp);
-	}
-
-	/**
-	 * Return the custom modules path
-	 *
-	 * @return STRING directory where custom module files are located
-	 */
-	function getCustomPath() {
-		return $this->custom_path;
-	}
-
-
-	/**
-	 * Return the new upgrade modules path
-	 *
-	 * @return STRING directory where new module files are located
-	 */
-	function getNewPath() {
-		return $this->new_path;
-	}
-
-
-	/**
-	 * Return the original modules path
-	 *
-	 * @return STRING directory where new module files are located
-	 */
-	function getOriginalPath() {
-		return $this->original_path;
-	}
+     * Return the custom modules path
+     *
+     * @return STRING directory where custom module files are located
+     */
+    function getCustomPath() {
+        return $this->custom_path;
+    }
+
+
+    /**
+     * Return the new upgrade modules path
+     *
+     * @return STRING directory where new module files are located
+     */
+    function getNewPath() {
+        return $this->new_path;
+    }
+
+
+    /**
+     * Return the original modules path
+     *
+     * @return STRING directory where new module files are located
+     */
+    function getOriginalPath() {
+        return $this->original_path;
+    }
 
 }
 ?>
\ No newline at end of file

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,11 +65,11 @@ 
 	private $merged = array();
 	private $fp = NULL;
 
-	function __construct($new_path='', $original_path='', $custom_path='custom') {
+	function __construct($new_path = '', $original_path = '', $custom_path = 'custom') {
 
-		$this->new_path = empty($new_path) || preg_match('/[\/]$/', $new_path) ? $new_path : $new_path . '/';
-		$this->original_path = empty($original_path) || preg_match('/[\/]$/', $original_path) ? $original_path : $original_path . '/';
-		$this->custom_path = empty($custom_path) || preg_match('/[\/]$/', $custom_path) ? $custom_path : $custom_path . '/';
+		$this->new_path = empty($new_path) || preg_match('/[\/]$/', $new_path) ? $new_path : $new_path.'/';
+		$this->original_path = empty($original_path) || preg_match('/[\/]$/', $original_path) ? $original_path : $original_path.'/';
+		$this->custom_path = empty($custom_path) || preg_match('/[\/]$/', $custom_path) ? $custom_path : $custom_path.'/';
 
 		$this->mergeMapping = array(
 			'editviewdefs.php'=> new EditViewMerge(),
@@ -83,9 +83,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SugarMerge($new_path='', $original_path='', $custom_path='custom'){
+    function SugarMerge($new_path = '', $original_path = '', $custom_path = 'custom') {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -95,7 +95,7 @@ 
     }
 
 
-	function setLogFilePointer($fp){
+	function setLogFilePointer($fp) {
 		$this->fp = $fp;
 	}
 
@@ -111,35 +111,35 @@ 
 	 * @param BOOLEAN $logHistory - do we wish to create history entries for any of the merges
 	 * @return ARRAY - an associative array of module names to files that were either merged or have the potential to be merged depeneding if $merge and $save  are set to true
 	 */
-	function mergeAll($merge=true, $save=true, $logHistory=true){
+	function mergeAll($merge = true, $save = true, $logHistory = true) {
 		$this->merged = array();
 		$searchDirectory = $this->custom_path;
-		if(!preg_match('/[\/]modules$/si', $searchDirectory)) {
+		if (!preg_match('/[\/]modules$/si', $searchDirectory)) {
 		   $searchDirectory .= preg_match('/[\/]$/', $this->custom_path) ? 'modules' : '/modules';
 		}
 
-		if(file_exists($searchDirectory)){
+		if (file_exists($searchDirectory)) {
 			$dir = dir($searchDirectory);
-			while($e = $dir->read()){
-				if(substr($e , 0, 1) != '.') {
-					if(is_dir("{$searchDirectory}/{$e}/metadata")){
+			while ($e = $dir->read()) {
+				if (substr($e, 0, 1) != '.') {
+					if (is_dir("{$searchDirectory}/{$e}/metadata")) {
 
                         //lets make sure that the directory matches the case of the module before we pass it in
                         global $moduleList;
                         //lets populate an array with the available modules, and make the key's lowercase
-                        $checkModList =  array_combine ($moduleList,$moduleList);
+                        $checkModList = array_combine($moduleList, $moduleList);
                         $checkModList = array_change_key_case($checkModList);
 
   						//now lets compare with the current directory.  This accounts for cases in which the directory was created in lowercase
-                        if(!empty($checkModList[strtolower($e)])){
+                        if (!empty($checkModList[strtolower($e)])) {
                             //directory was lowercase, let's use the right module value
 							$e = $checkModList[strtolower($e)];
                         }
 
-					    if( is_array($merge) )
+					    if (is_array($merge))
 					    {
-					        if ( in_array($e,$merge) )
-					        	$this->merged[$e] = $this->mergeModule($e, TRUE, $save,$logHistory );
+					        if (in_array($e, $merge))
+					        	$this->merged[$e] = $this->mergeModule($e, TRUE, $save, $logHistory);
 					        else
 					        {
 					            $GLOBALS['log']->debug("SugarMerge is skipping $e module as filter array passed in but module not specified for merge.");
@@ -147,7 +147,7 @@ 
 					        }
 					    }
 					    else
-						  $this->merged[$e] = $this->mergeModule($e, $merge, $save,$logHistory );
+						  $this->merged[$e] = $this->mergeModule($e, $merge, $save, $logHistory);
 					}
 				}
 			}
@@ -169,16 +169,16 @@ 
 	 * @param BOOLEAN $logHistory - do we wish to create history entries for any of the merges
 	 * @return ARRAY - an associative array of files that were either merged or have the potential to be merged depeneding if $merge and $save  are set to true
 	 */
-	function mergeModule($module, $merge = true, $save=true,$logHistory=true){
+	function mergeModule($module, $merge = true, $save = true, $logHistory = true) {
 		$merged = array();
-		$path = $this->original_path . 'modules/' . $module . '/metadata/';
-		$custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
-		$new_path = $this->new_path . 'modules/' . $module . '/metadata/';
-		foreach($this->mergeMapping as $file=>&$object){
-			if(file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
-				if($merge){
+		$path = $this->original_path.'modules/'.$module.'/metadata/';
+		$custom_path = $this->custom_path.'modules/'.$module.'/metadata/';
+		$new_path = $this->new_path.'modules/'.$module.'/metadata/';
+		foreach ($this->mergeMapping as $file=>&$object) {
+			if (file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")) {
+				if ($merge) {
 					$merged[$file] = $this->mergeFile($module, $file, $save, $logHistory);
-				}else{
+				} else {
 					$merged[$file] = true;
 				}
 			}
@@ -196,15 +196,15 @@ 
 	 * @param STRING $save - should the merged file be saved to the custom directory
 	 * @return BOOLEAN - success or failure of the merge
 	 */
-	function mergeFile($module, $file, $save=true,$logHistory=true){
-		$path = $this->original_path . 'modules/' . $module . '/metadata/';
-		$custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
-		$new_path = $this->new_path . 'modules/' . $module . '/metadata/';
-		if($this->fp) $this->mergeMapping[$file]->setLogFilePointer($this->fp);
-		if(isset($this->mergeMapping[$file]) && file_exists("{$path}{$file}") && file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
+	function mergeFile($module, $file, $save = true, $logHistory = true) {
+		$path = $this->original_path.'modules/'.$module.'/metadata/';
+		$custom_path = $this->custom_path.'modules/'.$module.'/metadata/';
+		$new_path = $this->new_path.'modules/'.$module.'/metadata/';
+		if ($this->fp) $this->mergeMapping[$file]->setLogFilePointer($this->fp);
+		if (isset($this->mergeMapping[$file]) && file_exists("{$path}{$file}") && file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")) {
 		    //Create a log entry of the custom file before it is merged
-		    if($logHistory && $save)
-		          $this->createHistoryLog($module, "{$custom_path}{$file}",$file);
+		    if ($logHistory && $save)
+		          $this->createHistoryLog($module, "{$custom_path}{$file}", $file);
             $this->mergeMapping[$file]->sugarMerge = $this;
 		    return $this->mergeMapping[$file]->merge($module, "{$path}{$file}", "{$new_path}{$file}", "{$custom_path}{$file}", $save);
 		}
@@ -220,12 +220,12 @@ 
 	 * @param STRING $file - name of the file
 	 * @param STRING $customFile - Path to the custom file that will be merged
 	 */
-	protected function createHistoryLog($module,$customFile,$file)
+	protected function createHistoryLog($module, $customFile, $file)
 	{
-	    $historyPath = 'custom/' . MB_HISTORYMETADATALOCATION . "/modules/$module/metadata/$file";
+	    $historyPath = 'custom/'.MB_HISTORYMETADATALOCATION."/modules/$module/metadata/$file";
 	    $history = new History($historyPath);
 	    $timeStamp = $history->append($customFile);
-	    $GLOBALS['log']->debug("Created history file after merge with new file: " . $historyPath .'_'.$timeStamp);
+	    $GLOBALS['log']->debug("Created history file after merge with new file: ".$historyPath.'_'.$timeStamp);
 	}
 
 	/**

Braces +16 added lines, -12 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.
@@ -87,8 +89,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($new_path, $original_path, $custom_path);
@@ -138,16 +139,16 @@ 
 
 					    if( is_array($merge) )
 					    {
-					        if ( in_array($e,$merge) )
-					        	$this->merged[$e] = $this->mergeModule($e, TRUE, $save,$logHistory );
-					        else
+					        if ( in_array($e,$merge) ) {
+					        					        	$this->merged[$e] = $this->mergeModule($e, TRUE, $save,$logHistory );
+					        } else
 					        {
 					            $GLOBALS['log']->debug("SugarMerge is skipping $e module as filter array passed in but module not specified for merge.");
 					            continue;
 					        }
+					    } else {
+					    						  $this->merged[$e] = $this->mergeModule($e, $merge, $save,$logHistory );
 					    }
-					    else
-						  $this->merged[$e] = $this->mergeModule($e, $merge, $save,$logHistory );
 					}
 				}
 			}
@@ -178,7 +179,7 @@ 
 			if(file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
 				if($merge){
 					$merged[$file] = $this->mergeFile($module, $file, $save, $logHistory);
-				}else{
+				} else{
 					$merged[$file] = true;
 				}
 			}
@@ -200,11 +201,14 @@ 
 		$path = $this->original_path . 'modules/' . $module . '/metadata/';
 		$custom_path = $this->custom_path . 'modules/' . $module . '/metadata/';
 		$new_path = $this->new_path . 'modules/' . $module . '/metadata/';
-		if($this->fp) $this->mergeMapping[$file]->setLogFilePointer($this->fp);
+		if($this->fp) {
+		    $this->mergeMapping[$file]->setLogFilePointer($this->fp);
+		}
 		if(isset($this->mergeMapping[$file]) && file_exists("{$path}{$file}") && file_exists("{$custom_path}{$file}") && file_exists("{$new_path}{$file}")){
 		    //Create a log entry of the custom file before it is merged
-		    if($logHistory && $save)
-		          $this->createHistoryLog($module, "{$custom_path}{$file}",$file);
+		    if($logHistory && $save) {
+		    		          $this->createHistoryLog($module, "{$custom_path}{$file}",$file);
+		    }
             $this->mergeMapping[$file]->sugarMerge = $this;
 		    return $this->mergeMapping[$file]->merge($module, "{$path}{$file}", "{$new_path}{$file}", "{$custom_path}{$file}", $save);
 		}

modules/UpgradeWizard/uw_utils.php

Indentation +2716 added lines, -2716 removed lines

@@ -92,7 +92,7 @@ 
         return UploadFile::realpath($path);
     }
     if(substr($path, 0, 9) == "upload://") {
-    	$path = rtrim($GLOBALS['sugar_config']['upload_dir'], "/\\")."/".substr($path, 9);
+        $path = rtrim($GLOBALS['sugar_config']['upload_dir'], "/\\")."/".substr($path, 9);
     }
     return $path;
 }
@@ -108,49 +108,49 @@ 
  * @return array errors
  */
 function commitMakeBackupFiles($rest_dir, $install_file, $unzip_dir, $zip_from_dir, $errors, $path='') {
-	global $mod_strings;
-	// create restore file directory
-	sugar_mkdir($rest_dir, 0775, true);
+    global $mod_strings;
+    // create restore file directory
+    sugar_mkdir($rest_dir, 0775, true);
 
     if(file_exists($rest_dir) && is_dir($rest_dir)){
-		logThis('backing up files to be overwritten...', $path);
-		$newFiles = findAllFiles(clean_path($unzip_dir . '/' . $zip_from_dir), array());
-
-		// keep this around for canceling
-		$_SESSION['uw_restore_dir'] = getUploadRelativeName($rest_dir);
-
-		foreach ($newFiles as $file) {
-			if (strpos($file, 'md5'))
-				continue;
-
-			// get name of current file to place in restore directory
-			$cleanFile = str_replace(clean_path($unzip_dir . '/' . $zip_from_dir), '', $file);
-
-			// make sure the directory exists
-			$cleanDir = $rest_dir . '/' . dirname($cleanFile);
-			sugar_mkdir($cleanDir, 0775, true);
-			$oldFile = clean_path(getcwd() . '/' . $cleanFile);
-
-			// only copy restore files for replacements - ignore new files from patch
-			if (is_file($oldFile)) {
-				if (is_writable($rest_dir)) {
-					logThis('Backing up file: ' . $oldFile, $path);
-					if (!copy($oldFile, $rest_dir . '/' . $cleanFile)) {
-						logThis('*** ERROR: could not backup file: ' . $oldFile, $path);
-						$errors[] = "{$mod_strings['LBL_UW_BACKUP']}::{$mod_strings['ERR_UW_FILE_NOT_COPIED']}: {$oldFile}";
-					} else {
-						$backupFilesExist = true;
-					}
-
-				} else {
-					logThis('*** ERROR: directory not writable: ' . $rest_dir, $path);
-					$errors[] = "{$mod_strings['LBL_UW_BACKUP']}::{$mod_strings['ERR_UW_DIR_NOT_WRITABLE']}: {$oldFile}";
-				}
-			}
-		}
+        logThis('backing up files to be overwritten...', $path);
+        $newFiles = findAllFiles(clean_path($unzip_dir . '/' . $zip_from_dir), array());
+
+        // keep this around for canceling
+        $_SESSION['uw_restore_dir'] = getUploadRelativeName($rest_dir);
+
+        foreach ($newFiles as $file) {
+            if (strpos($file, 'md5'))
+                continue;
+
+            // get name of current file to place in restore directory
+            $cleanFile = str_replace(clean_path($unzip_dir . '/' . $zip_from_dir), '', $file);
+
+            // make sure the directory exists
+            $cleanDir = $rest_dir . '/' . dirname($cleanFile);
+            sugar_mkdir($cleanDir, 0775, true);
+            $oldFile = clean_path(getcwd() . '/' . $cleanFile);
+
+            // only copy restore files for replacements - ignore new files from patch
+            if (is_file($oldFile)) {
+                if (is_writable($rest_dir)) {
+                    logThis('Backing up file: ' . $oldFile, $path);
+                    if (!copy($oldFile, $rest_dir . '/' . $cleanFile)) {
+                        logThis('*** ERROR: could not backup file: ' . $oldFile, $path);
+                        $errors[] = "{$mod_strings['LBL_UW_BACKUP']}::{$mod_strings['ERR_UW_FILE_NOT_COPIED']}: {$oldFile}";
+                    } else {
+                        $backupFilesExist = true;
+                    }
+
+                } else {
+                    logThis('*** ERROR: directory not writable: ' . $rest_dir, $path);
+                    $errors[] = "{$mod_strings['LBL_UW_BACKUP']}::{$mod_strings['ERR_UW_DIR_NOT_WRITABLE']}: {$oldFile}";
+                }
+            }
+        }
     }
-	logThis('file backup done.', $path);
-	return $errors;
+    logThis('file backup done.', $path);
+    return $errors;
 }
 
 /**
@@ -165,82 +165,82 @@ 
 
 
 function commitCopyNewFiles($unzip_dir, $zip_from_dir, $path='') {
-	logThis('Starting file copy process...', $path);
-	global $sugar_version;
-	$backwardModules='';
-
-    	$modules = getAllModules();
-			$backwardModules = array();
-			foreach($modules as $mod){
-				if(is_dir(clean_path(getcwd().'/modules/'.$mod.'/.500'))){
-					$files = array();
-			    	$files= findAllFiles(clean_path(getcwd().'/modules/'.$mod.'/.500'),$files);
-			    	if(sizeof($files) >0){
-			    		//backward compatibility is on
-						$backwardModules[] = $mod;
-			    	}
-			   }
-			}
-
-	$newFiles = findAllFiles(clean_path($unzip_dir . '/' . $zip_from_dir), array());
-	$zipPath = clean_path($unzip_dir . '/' . $zip_from_dir);
-
-	// handle special do-not-overwrite conditions
-	$doNotOverwrite = array();
-	$doNotOverwrite[] = '__stub';
-	if(isset($_REQUEST['overwrite_files_serial'])) {
-		$doNotOverwrite = explode('::', $_REQUEST['overwrite_files_serial']);
-	}
+    logThis('Starting file copy process...', $path);
+    global $sugar_version;
+    $backwardModules='';
+
+        $modules = getAllModules();
+            $backwardModules = array();
+            foreach($modules as $mod){
+                if(is_dir(clean_path(getcwd().'/modules/'.$mod.'/.500'))){
+                    $files = array();
+                    $files= findAllFiles(clean_path(getcwd().'/modules/'.$mod.'/.500'),$files);
+                    if(sizeof($files) >0){
+                        //backward compatibility is on
+                        $backwardModules[] = $mod;
+                    }
+                }
+            }
 
-	$copiedFiles = array();
-	$skippedFiles = array();
-
-	foreach($newFiles as $file) {
-		$cleanFile = str_replace($zipPath, '', $file);
-		$srcFile = $zipPath . $cleanFile;
-		$targetFile = clean_path(getcwd() . '/' . $cleanFile);
-		if($backwardModules != null && sizeof($backwardModules) >0){
-			foreach($backwardModules as $mod){
-				$splitPath = explode('/',trim($cleanFile));
-				if('modules' == trim($splitPath[1]) && $mod == trim($splitPath[2])){
-					$cleanFile = str_replace('/modules/'.$mod, '/modules/'.$mod.'/.500', $cleanFile);
-					$targetFile = clean_path(getcwd() . '/' . $cleanFile);
-				}
-			}
-		}
-		if(!is_dir(dirname($targetFile))) {
-			mkdir_recursive(dirname($targetFile)); // make sure the directory exists
-		}
+    $newFiles = findAllFiles(clean_path($unzip_dir . '/' . $zip_from_dir), array());
+    $zipPath = clean_path($unzip_dir . '/' . $zip_from_dir);
 
-		if((!file_exists($targetFile)) || /* brand new file */
-			(!in_array($targetFile, $doNotOverwrite)) /* manual diff file */
-			) {
-			// handle sugar_version.php
-			if(strpos($targetFile, 'sugar_version.php') !== false && !preg_match('/\/portal\/sugar_version\.php$/i', $targetFile)) {
-				logThis('Skipping "sugar_version.php" - file copy will occur at end of successful upgrade', $path);
-				$_SESSION['sugar_version_file'] = $srcFile;
-				continue;
-			}
-
-			//logThis('Copying file to destination: ' . $targetFile, $path);
-
-			if(!copy($srcFile, $targetFile)) {
-				logThis('*** ERROR: could not copy file: ' . $targetFile, $path);
-			} else {
-				$copiedFiles[] = $targetFile;
-			}
-		} else {
-			//logThis('Skipping file: ' . $targetFile, $path);
-			$skippedFiles[] = $targetFile;
-		}
-	}
-	logThis('File copy done.', $path);
+    // handle special do-not-overwrite conditions
+    $doNotOverwrite = array();
+    $doNotOverwrite[] = '__stub';
+    if(isset($_REQUEST['overwrite_files_serial'])) {
+        $doNotOverwrite = explode('::', $_REQUEST['overwrite_files_serial']);
+    }
+
+    $copiedFiles = array();
+    $skippedFiles = array();
+
+    foreach($newFiles as $file) {
+        $cleanFile = str_replace($zipPath, '', $file);
+        $srcFile = $zipPath . $cleanFile;
+        $targetFile = clean_path(getcwd() . '/' . $cleanFile);
+        if($backwardModules != null && sizeof($backwardModules) >0){
+            foreach($backwardModules as $mod){
+                $splitPath = explode('/',trim($cleanFile));
+                if('modules' == trim($splitPath[1]) && $mod == trim($splitPath[2])){
+                    $cleanFile = str_replace('/modules/'.$mod, '/modules/'.$mod.'/.500', $cleanFile);
+                    $targetFile = clean_path(getcwd() . '/' . $cleanFile);
+                }
+            }
+        }
+        if(!is_dir(dirname($targetFile))) {
+            mkdir_recursive(dirname($targetFile)); // make sure the directory exists
+        }
+
+        if((!file_exists($targetFile)) || /* brand new file */
+            (!in_array($targetFile, $doNotOverwrite)) /* manual diff file */
+            ) {
+            // handle sugar_version.php
+            if(strpos($targetFile, 'sugar_version.php') !== false && !preg_match('/\/portal\/sugar_version\.php$/i', $targetFile)) {
+                logThis('Skipping "sugar_version.php" - file copy will occur at end of successful upgrade', $path);
+                $_SESSION['sugar_version_file'] = $srcFile;
+                continue;
+            }
+
+            //logThis('Copying file to destination: ' . $targetFile, $path);
+
+            if(!copy($srcFile, $targetFile)) {
+                logThis('*** ERROR: could not copy file: ' . $targetFile, $path);
+            } else {
+                $copiedFiles[] = $targetFile;
+            }
+        } else {
+            //logThis('Skipping file: ' . $targetFile, $path);
+            $skippedFiles[] = $targetFile;
+        }
+    }
+    logThis('File copy done.', $path);
 
-	$ret = array();
-	$ret['copiedFiles'] = $copiedFiles;
-	$ret['skippedFiles'] = $skippedFiles;
+    $ret = array();
+    $ret['copiedFiles'] = $copiedFiles;
+    $ret['skippedFiles'] = $skippedFiles;
 
-	return $ret;
+    return $ret;
 }
 
 
@@ -252,31 +252,31 @@ 
 
 
 function removeFileFromPath($file,$path, $deleteNot=array()){
-		$removed = 0;
-		$cur = $path . '/' . $file;
-		if(file_exists($cur)){
-			$del = true;
-			foreach($deleteNot as $dn){
-				if($cur == $dn){
-					$del = false;
-				}
-			}
-			if($del){
-				unlink($cur);
-				$removed++;
-			}
-		}
-		if(!file_exists($path))return $removed;
-		$d = dir($path);
-		while(false !== ($e = $d->read())){  // Fixed bug. !== is required to literally match the type and value of false, so that a filename that could evaluate and cast to false, ie "false" or "0", still allows the while loop to continue.  From example at http://www.php.net/manual/en/function.dir.php
-			$next = $path . '/'. $e;
-			if(substr($e, 0, 1) != '.' && is_dir($next)){
-				$removed += removeFileFromPath($file, $next, $deleteNot);
-			}
-		}
-		$d->close();  // from example at http://www.php.net/manual/en/function.dir.php
-		return $removed;
-	}
+        $removed = 0;
+        $cur = $path . '/' . $file;
+        if(file_exists($cur)){
+            $del = true;
+            foreach($deleteNot as $dn){
+                if($cur == $dn){
+                    $del = false;
+                }
+            }
+            if($del){
+                unlink($cur);
+                $removed++;
+            }
+        }
+        if(!file_exists($path))return $removed;
+        $d = dir($path);
+        while(false !== ($e = $d->read())){  // Fixed bug. !== is required to literally match the type and value of false, so that a filename that could evaluate and cast to false, ie "false" or "0", still allows the while loop to continue.  From example at http://www.php.net/manual/en/function.dir.php
+            $next = $path . '/'. $e;
+            if(substr($e, 0, 1) != '.' && is_dir($next)){
+                $removed += removeFileFromPath($file, $next, $deleteNot);
+            }
+        }
+        $d->close();  // from example at http://www.php.net/manual/en/function.dir.php
+        return $removed;
+    }
 
 /**
  * This function copies/overwrites between directories
@@ -287,32 +287,32 @@ 
  */
 
 function copyRecursiveBetweenDirectories($from,$to){
-	if(file_exists($from)){
-		$modifiedFiles = array();
-		$modifiedFiles = findAllFiles(clean_path($from), $modifiedFiles);
-	 	$cwd = clean_path(getcwd());
-		foreach($modifiedFiles as $file) {
-			$srcFile = clean_path($file);
+    if(file_exists($from)){
+        $modifiedFiles = array();
+        $modifiedFiles = findAllFiles(clean_path($from), $modifiedFiles);
+            $cwd = clean_path(getcwd());
+        foreach($modifiedFiles as $file) {
+            $srcFile = clean_path($file);
             if (strpos($srcFile,".svn") === false) {
-	    		$targetFile = str_replace($from, $to, $srcFile);
-
-				if(!is_dir(dirname($targetFile))) {
-					mkdir_recursive(dirname($targetFile)); // make sure the directory exists
-				}
-
-					// handle sugar_version.php
-					if(strpos($targetFile, 'sugar_version.php') !== false && !preg_match('/\/portal\/sugar_version\.php$/i', $targetFile)) {
-						logThis('Skipping "sugar_version.php" - file copy will occur at end of successful upgrade', $targetFile);
-						$_SESSION['sugar_version_file'] = $srcFile;
-						continue;
-					}
-
-					if(!copy($srcFile, $targetFile)) {
-						logThis("*** ERROR: could not copy file $srcFile to $targetFile");
-					}
-            	}
-		 }
-	}
+                $targetFile = str_replace($from, $to, $srcFile);
+
+                if(!is_dir(dirname($targetFile))) {
+                    mkdir_recursive(dirname($targetFile)); // make sure the directory exists
+                }
+
+                    // handle sugar_version.php
+                    if(strpos($targetFile, 'sugar_version.php') !== false && !preg_match('/\/portal\/sugar_version\.php$/i', $targetFile)) {
+                        logThis('Skipping "sugar_version.php" - file copy will occur at end of successful upgrade', $targetFile);
+                        $_SESSION['sugar_version_file'] = $srcFile;
+                        continue;
+                    }
+
+                    if(!copy($srcFile, $targetFile)) {
+                        logThis("*** ERROR: could not copy file $srcFile to $targetFile");
+                    }
+                }
+            }
+    }
 }
 
 function deleteDirectory($dirname,$only_empty=false) {
@@ -352,50 +352,50 @@ 
  */
 
 function deleteAndOverWriteSelectedFiles($unzip_dir, $zip_from_dir,$delete_dirs){
-	if($delete_dirs != null){
-		foreach($delete_dirs as $del_dir){
-			deleteDirectory($del_dir);
-			$newFiles = findAllFiles(clean_path($unzip_dir . '/' . $zip_from_dir.'/'.$del_dir), array());
-			$zipPath = clean_path($unzip_dir . '/' . $zip_from_dir.'/'.$del_dir);
-			$copiedFiles = array();
-			$skippedFiles = array();
-
-			foreach($newFiles as $file) {
-				$cleanFile = str_replace($zipPath, '', $file);
-				$srcFile = $zipPath . $cleanFile;
-				$targetFile = clean_path(getcwd() . '/' . $cleanFile);
-
-				if(!is_dir(dirname($targetFile))) {
-					mkdir_recursive(dirname($targetFile)); // make sure the directory exists
-				}
-
-				if(!file_exists($targetFile)){
-					// handle sugar_version.php
-					if(strpos($targetFile, 'sugar_version.php') !== false) {
-						logThis('Skipping sugar_version.php - file copy will occur at end of successful upgrade');
-						$_SESSION['sugar_version_file'] = $srcFile;
-						continue;
-					}
-
-					//logThis('Copying file to destination: ' . $targetFile);
-
-					if(!copy($srcFile, $targetFile)) {
-						logThis('*** ERROR: could not copy file: ' . $targetFile);
-					} else {
-						$copiedFiles[] = $targetFile;
-					}
-				} else {
-					//logThis('Skipping file: ' . $targetFile);
-					$skippedFiles[] = $targetFile;
-				}
-			  }
-		}
-	}
-	$ret = array();
-	$ret['copiedFiles'] = $copiedFiles;
-	$ret['skippedFiles'] = $skippedFiles;
+    if($delete_dirs != null){
+        foreach($delete_dirs as $del_dir){
+            deleteDirectory($del_dir);
+            $newFiles = findAllFiles(clean_path($unzip_dir . '/' . $zip_from_dir.'/'.$del_dir), array());
+            $zipPath = clean_path($unzip_dir . '/' . $zip_from_dir.'/'.$del_dir);
+            $copiedFiles = array();
+            $skippedFiles = array();
+
+            foreach($newFiles as $file) {
+                $cleanFile = str_replace($zipPath, '', $file);
+                $srcFile = $zipPath . $cleanFile;
+                $targetFile = clean_path(getcwd() . '/' . $cleanFile);
+
+                if(!is_dir(dirname($targetFile))) {
+                    mkdir_recursive(dirname($targetFile)); // make sure the directory exists
+                }
+
+                if(!file_exists($targetFile)){
+                    // handle sugar_version.php
+                    if(strpos($targetFile, 'sugar_version.php') !== false) {
+                        logThis('Skipping sugar_version.php - file copy will occur at end of successful upgrade');
+                        $_SESSION['sugar_version_file'] = $srcFile;
+                        continue;
+                    }
+
+                    //logThis('Copying file to destination: ' . $targetFile);
+
+                    if(!copy($srcFile, $targetFile)) {
+                        logThis('*** ERROR: could not copy file: ' . $targetFile);
+                    } else {
+                        $copiedFiles[] = $targetFile;
+                    }
+                } else {
+                    //logThis('Skipping file: ' . $targetFile);
+                    $skippedFiles[] = $targetFile;
+                }
+                }
+        }
+    }
+    $ret = array();
+    $ret['copiedFiles'] = $copiedFiles;
+    $ret['skippedFiles'] = $skippedFiles;
 
-	return $ret;
+    return $ret;
 }
 
 //Default is empty the directory. For removing set it to false
@@ -407,78 +407,78 @@ 
 
 function recursive_empty_or_remove_directory($directory, $exclude_dirs=null,$exclude_files=null,$empty=TRUE)
 {
-	// if the path has a slash at the end we remove it here
-	if(substr($directory,-1) == '/')
-	{
-		$directory = substr($directory,0,-1);
-	}
+    // if the path has a slash at the end we remove it here
+    if(substr($directory,-1) == '/')
+    {
+        $directory = substr($directory,0,-1);
+    }
 
-	// if the path is not valid or is not a directory ...
-	if(!file_exists($directory) || !is_dir($directory))
-	{
-		// ... we return false and exit the function
-		return FALSE;
-
-	// ... if the path is not readable
-	}elseif(!is_readable($directory))
-	{
-		// ... we return false and exit the function
-		return FALSE;
-
-	// ... else if the path is readable
-	}else{
-
-		// we open the directory
-		$handle = opendir($directory);
-
-		// and scan through the items inside
-		while (FALSE !== ($item = readdir($handle)))
-		{
-			// if the filepointer is not the current directory
-			// or the parent directory
-			if($item != '.' && $item != '..')
-			{
-				// we build the new path to delete
-				$path = $directory.'/'.$item;
-
-				// if the new path is a directory
-				//add another check if the dir is in the list to exclude delete
-				if(is_dir($path) && $exclude_dirs != null && in_array($path,$exclude_dirs)){
-				    //do nothing
-				}
-				else if(is_dir($path))
-				{
-					// we call this function with the new path
-					recursive_empty_or_remove_directory($path);
-				}
-				// if the new path is a file
-				else{
-					// we remove the file
-					if($exclude_files != null && in_array($path,$exclude_files)){
-                           //do nothing
-					}
-					else{
-						unlink($path);
-				    }
-				}
-			}
-		}
-		// close the directory
-		closedir($handle);
-
-		// if the option to empty is not set to true
-		if($empty == FALSE)
-		{
-			// try to delete the now empty directory
-			if(!rmdir($directory))
-			{
-				// return false if not possible
-				return FALSE;
-			}
-		}
-		// return success
-		return TRUE;
-	}
+    // if the path is not valid or is not a directory ...
+    if(!file_exists($directory) || !is_dir($directory))
+    {
+        // ... we return false and exit the function
+        return FALSE;
+
+    // ... if the path is not readable
+    }elseif(!is_readable($directory))
+    {
+        // ... we return false and exit the function
+        return FALSE;
+
+    // ... else if the path is readable
+    }else{
+
+        // we open the directory
+        $handle = opendir($directory);
+
+        // and scan through the items inside
+        while (FALSE !== ($item = readdir($handle)))
+        {
+            // if the filepointer is not the current directory
+            // or the parent directory
+            if($item != '.' && $item != '..')
+            {
+                // we build the new path to delete
+                $path = $directory.'/'.$item;
+
+                // if the new path is a directory
+                //add another check if the dir is in the list to exclude delete
+                if(is_dir($path) && $exclude_dirs != null && in_array($path,$exclude_dirs)){
+                    //do nothing
+                }
+                else if(is_dir($path))
+                {
+                    // we call this function with the new path
+                    recursive_empty_or_remove_directory($path);
+                }
+                // if the new path is a file
+                else{
+                    // we remove the file
+                    if($exclude_files != null && in_array($path,$exclude_files)){
+                            //do nothing
+                    }
+                    else{
+                        unlink($path);
+                    }
+                }
+            }
+        }
+        // close the directory
+        closedir($handle);
+
+        // if the option to empty is not set to true
+        if($empty == FALSE)
+        {
+            // try to delete the now empty directory
+            if(!rmdir($directory))
+            {
+                // return false if not possible
+                return FALSE;
+            }
+        }
+        // return success
+        return TRUE;
+    }
 }
 // ------------------------------------------------------------
 
@@ -487,80 +487,80 @@ 
 
 function getAllCustomizedModules() {
 
-		require_once('files.md5');
-
-	    $return_array = array();
-	    $modules = getAllModules();
-	    foreach($modules as $mod) {
-	    	   //find all files in each module if the files have been modified
-	    	   //as compared to the base version then add the module to the
-	    	   //customized modules array
-	    	   $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
-               foreach($modFiles as $file){
-             	  $fileContents = file_get_contents($file);
-             	   $file = str_replace(clean_path(getcwd()),'',$file);
-               	  if($md5_string['./' . $file]){
-	               	  if(md5($fileContents) != $md5_string['./' . $file]) {
-	               	     //A file has been customized in the module. Put the module into the
-	               	     // customized modules array.
-	               	     echo 'Changed File'.$file;
-	               	  	  $return_array[$mod];
-	               	  	  break;
-	               	  }
-               	  }
-               	  else{
-               	  	// This is a new file in user's version and indicates that module has been
-               	  	//customized. Put the module in the customized array.
-                       echo 'New File'.$file;
-                       $return_array[$mod];
-                       break;
-               	  }
-               }
-	    } //foreach
-
-		return $return_array;
-	}
+        require_once('files.md5');
+
+        $return_array = array();
+        $modules = getAllModules();
+        foreach($modules as $mod) {
+                //find all files in each module if the files have been modified
+                //as compared to the base version then add the module to the
+                //customized modules array
+                $modFiles = findAllFiles(clean_path(getcwd())."/modules/$mod", array());
+                foreach($modFiles as $file){
+                    $fileContents = file_get_contents($file);
+                    $file = str_replace(clean_path(getcwd()),'',$file);
+                        if($md5_string['./' . $file]){
+                            if(md5($fileContents) != $md5_string['./' . $file]) {
+                            //A file has been customized in the module. Put the module into the
+                            // customized modules array.
+                            echo 'Changed File'.$file;
+                                $return_array[$mod];
+                                break;
+                            }
+                        }
+                        else{
+                            // This is a new file in user's version and indicates that module has been
+                            //customized. Put the module in the customized array.
+                        echo 'New File'.$file;
+                        $return_array[$mod];
+                        break;
+                        }
+                }
+        } //foreach
+
+        return $return_array;
+    }
 
     /**
      * Array of all Modules in the version bein upgraded
      * This method returns an Array of all modules
      * @return $modules Array of modules.
      */
-	function getAllModules() {
-		$modules = array();
-		$d = dir('modules');
-		while($e = $d->read()){
-			if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
-			$modules[] = $e;
-		}
-		return $modules;
-	}
+    function getAllModules() {
+        $modules = array();
+        $d = dir('modules');
+        while($e = $d->read()){
+            if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
+            $modules[] = $e;
+        }
+        return $modules;
+    }
 
 //Remove files with the smae md5
 
 function removeMd5MatchingFiles($deleteNot=array()){
 
-	$md5_string = array();
-	if(file_exists(clean_path(getcwd().'/files.md5'))){
-		require(clean_path(getcwd().'/files.md5'));
-	}
+    $md5_string = array();
+    if(file_exists(clean_path(getcwd().'/files.md5'))){
+        require(clean_path(getcwd().'/files.md5'));
+    }
     $modulesAll = getAllModules();
-     foreach($modulesAll as $mod){
-	      $allModFiles = array();
-	      if(is_dir('modules/'.$mod)){
-	      $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
-	       foreach($allModFiles as $file){
-	           	if(file_exists($file) && !in_array(basename($file),$deleteNot)){
-		       		 if(isset($md5_string['./'.$file])) {
-		                  $fileContents = file_get_contents($file);
-		               	  if(md5($fileContents) == $md5_string['./'.$file]) {
-		               	  	unlink($file);
-		               	  }
-		              }
-	            }
-           }
-	   }
-   }
+        foreach($modulesAll as $mod){
+            $allModFiles = array();
+            if(is_dir('modules/'.$mod)){
+            $allModFiles = findAllFiles('modules/'.$mod,$allModFiles);
+            foreach($allModFiles as $file){
+                    if(file_exists($file) && !in_array(basename($file),$deleteNot)){
+                        if(isset($md5_string['./'.$file])) {
+                            $fileContents = file_get_contents($file);
+                                if(md5($fileContents) == $md5_string['./'.$file]) {
+                                    unlink($file);
+                                }
+                        }
+                }
+            }
+        }
+    }
 }
 
 /**
@@ -569,128 +569,128 @@ 
  * @param string path Optional full path to alternate upgradeWizard log.
  */
 function commitHandleReminders($skippedFiles, $path='') {
-	global $mod_strings;
-	global $current_user;
+    global $mod_strings;
+    global $current_user;
 
-	if(empty($mod_strings))
-		$mod_strings = return_module_language('en_us', 'UpgradeWizard');
+    if(empty($mod_strings))
+        $mod_strings = return_module_language('en_us', 'UpgradeWizard');
 
-	if(empty($current_user->id)) {
-		$current_user->getSystemUser();
-	}
+    if(empty($current_user->id)) {
+        $current_user->getSystemUser();
+    }
 
-	if(count($skippedFiles) > 0) {
-		$desc = $mod_strings['LBL_UW_COMMIT_ADD_TASK_OVERVIEW'] . "\n\n";
-		$desc .= $mod_strings['LBL_UW_COMMIT_ADD_TASK_DESC_1'];
-		$desc .= $_SESSION['uw_restore_dir'] . "\n\n";
-		$desc .= $mod_strings['LBL_UW_COMMIT_ADD_TASK_DESC_2'] . "\n\n";
+    if(count($skippedFiles) > 0) {
+        $desc = $mod_strings['LBL_UW_COMMIT_ADD_TASK_OVERVIEW'] . "\n\n";
+        $desc .= $mod_strings['LBL_UW_COMMIT_ADD_TASK_DESC_1'];
+        $desc .= $_SESSION['uw_restore_dir'] . "\n\n";
+        $desc .= $mod_strings['LBL_UW_COMMIT_ADD_TASK_DESC_2'] . "\n\n";
 
-		foreach($skippedFiles as $file) {
-			$desc .= $file . "\n";
-		}
+        foreach($skippedFiles as $file) {
+            $desc .= $file . "\n";
+        }
 
-		//MFH #13468
-		/// Not using new TimeDate stuff here because it needs to be compatible with 6.0
-		$nowDate = gmdate('Y-m-d');
-		$nowTime = gmdate('H:i:s');
-		$nowDateTime = $nowDate . ' ' . $nowTime;
-
-		if($_REQUEST['addTaskReminder'] == 'remind') {
-			logThis('Adding Task for admin for manual merge.', $path);
-
-			$task = new Task();
-			$task->name = $mod_strings['LBL_UW_COMMIT_ADD_TASK_NAME'];
-			$task->description = $desc;
-			$task->date_due = $nowDate;
-			$task->time_due = $nowTime;
-			$task->priority = 'High';
-			$task->status = 'Not Started';
-			$task->assigned_user_id = $current_user->id;
-			$task->created_by = $current_user->id;
-			$task->date_entered = $nowDateTime;
-			$task->date_modified = $nowDateTime;
-			$task->save();
-		}
+        //MFH #13468
+        /// Not using new TimeDate stuff here because it needs to be compatible with 6.0
+        $nowDate = gmdate('Y-m-d');
+        $nowTime = gmdate('H:i:s');
+        $nowDateTime = $nowDate . ' ' . $nowTime;
+
+        if($_REQUEST['addTaskReminder'] == 'remind') {
+            logThis('Adding Task for admin for manual merge.', $path);
+
+            $task = new Task();
+            $task->name = $mod_strings['LBL_UW_COMMIT_ADD_TASK_NAME'];
+            $task->description = $desc;
+            $task->date_due = $nowDate;
+            $task->time_due = $nowTime;
+            $task->priority = 'High';
+            $task->status = 'Not Started';
+            $task->assigned_user_id = $current_user->id;
+            $task->created_by = $current_user->id;
+            $task->date_entered = $nowDateTime;
+            $task->date_modified = $nowDateTime;
+            $task->save();
+        }
 
-		if($_REQUEST['addEmailReminder'] == 'remind') {
-			logThis('Sending Reminder for admin for manual merge.', $path);
-
-			$email = new Email();
-			$email->assigned_user_id = $current_user->id;
-			$email->name = $mod_strings['LBL_UW_COMMIT_ADD_TASK_NAME'];
-			$email->description = $desc;
-			$email->description_html = nl2br($desc);
-			$email->from_name = $current_user->full_name;
-			$email->from_addr = $current_user->email1;
-			$email->to_addrs_arr = $email->parse_addrs($current_user->email1, '', '', '');
-			$email->cc_addrs_arr = array();
-			$email->bcc_addrs_arr = array();
-			$email->date_entered = $nowDateTime;
-			$email->date_modified = $nowDateTime;
-			$email->send();
-			$email->save();
-		}
-	}
+        if($_REQUEST['addEmailReminder'] == 'remind') {
+            logThis('Sending Reminder for admin for manual merge.', $path);
+
+            $email = new Email();
+            $email->assigned_user_id = $current_user->id;
+            $email->name = $mod_strings['LBL_UW_COMMIT_ADD_TASK_NAME'];
+            $email->description = $desc;
+            $email->description_html = nl2br($desc);
+            $email->from_name = $current_user->full_name;
+            $email->from_addr = $current_user->email1;
+            $email->to_addrs_arr = $email->parse_addrs($current_user->email1, '', '', '');
+            $email->cc_addrs_arr = array();
+            $email->bcc_addrs_arr = array();
+            $email->date_entered = $nowDateTime;
+            $email->date_modified = $nowDateTime;
+            $email->send();
+            $email->save();
+        }
+    }
 }
 
 function deleteCache(){
-	//Clean modules from cache
-	$cachedir = sugar_cached('modules');
-	if(is_dir($cachedir)){
-		$allModFiles = array();
-		$allModFiles = findAllFiles($cachedir,$allModFiles, true);
-		foreach($allModFiles as $file) {
-	       	if(file_exists($file)) {
-	       		if(is_dir($file)) {
-				  rmdir_recursive($file);
-	       		} else {
-	       		  unlink($file);
-               }
-	       	}
-	    }
+    //Clean modules from cache
+    $cachedir = sugar_cached('modules');
+    if(is_dir($cachedir)){
+        $allModFiles = array();
+        $allModFiles = findAllFiles($cachedir,$allModFiles, true);
+        foreach($allModFiles as $file) {
+                if(file_exists($file)) {
+                    if(is_dir($file)) {
+                    rmdir_recursive($file);
+                    } else {
+                        unlink($file);
+                }
+                }
+        }
 
-	}
+    }
 
-	//Clean jsLanguage from cache
-	$cachedir = sugar_cached('jsLanguage');
-	if(is_dir($cachedir)){
-		$allModFiles = array();
-		$allModFiles = findAllFiles($cachedir,$allModFiles);
-	   foreach($allModFiles as $file){
-		   	if(file_exists($file)){
-				unlink($file);
-		   	}
-		}
-	}
-	//Clean smarty from cache
-	$cachedir = sugar_cached('smarty');
-	if(is_dir($cachedir)){
-		$allModFiles = array();
-		$allModFiles = findAllFiles($cachedir,$allModFiles);
-	   foreach($allModFiles as $file){
-	       	if(file_exists($file)){
-				unlink($file);
-	       	}
-	   }
-	}
-	//Rebuild dashlets cache
-	require_once('include/Dashlets/DashletCacheBuilder.php');
-	$dc = new DashletCacheBuilder();
+    //Clean jsLanguage from cache
+    $cachedir = sugar_cached('jsLanguage');
+    if(is_dir($cachedir)){
+        $allModFiles = array();
+        $allModFiles = findAllFiles($cachedir,$allModFiles);
+        foreach($allModFiles as $file){
+                if(file_exists($file)){
+                unlink($file);
+                }
+        }
+    }
+    //Clean smarty from cache
+    $cachedir = sugar_cached('smarty');
+    if(is_dir($cachedir)){
+        $allModFiles = array();
+        $allModFiles = findAllFiles($cachedir,$allModFiles);
+        foreach($allModFiles as $file){
+                if(file_exists($file)){
+                unlink($file);
+                }
+        }
+    }
+    //Rebuild dashlets cache
+    require_once('include/Dashlets/DashletCacheBuilder.php');
+    $dc = new DashletCacheBuilder();
     $dc->buildCache();
 }
 
 function deleteChance(){
-	//Clean folder from cache
-	if(is_dir('include/SugarObjects/templates/chance')){
-		rmdir_recursive('include/SugarObjects/templates/chance');
-	 }
-	if(is_dir('include/SugarObjects/templates/chance')){
-		if(!isset($_SESSION['chance'])){
-			$_SESSION['chance'] = '';
-		}
-		$_SESSION['chance'] = 'include/SugarObjects/templates/chance';
-		//rename('include/SugarObjects/templates/chance','include/SugarObjects/templates/chance_removeit');
-	}
+    //Clean folder from cache
+    if(is_dir('include/SugarObjects/templates/chance')){
+        rmdir_recursive('include/SugarObjects/templates/chance');
+        }
+    if(is_dir('include/SugarObjects/templates/chance')){
+        if(!isset($_SESSION['chance'])){
+            $_SESSION['chance'] = '';
+        }
+        $_SESSION['chance'] = 'include/SugarObjects/templates/chance';
+        //rename('include/SugarObjects/templates/chance','include/SugarObjects/templates/chance_removeit');
+    }
 }
 
 
@@ -704,17 +704,17 @@ 
 function upgradeUWFiles($file) {
     $cacheUploadUpgradesTemp = mk_temp_dir(sugar_cached("upgrades/temp"));
 
-	unzip($file, $cacheUploadUpgradesTemp);
+    unzip($file, $cacheUploadUpgradesTemp);
 
-	if(!file_exists("$cacheUploadUpgradesTemp/manifest.php")) {
-		logThis("*** ERROR: no manifest file detected while bootstraping upgrade wizard files!");
-		return;
-	} else {
-		include("$cacheUploadUpgradesTemp/manifest.php");
-	}
+    if(!file_exists("$cacheUploadUpgradesTemp/manifest.php")) {
+        logThis("*** ERROR: no manifest file detected while bootstraping upgrade wizard files!");
+        return;
+    } else {
+        include("$cacheUploadUpgradesTemp/manifest.php");
+    }
 
-	$allFiles = array();
-	$from_dir = "{$cacheUploadUpgradesTemp}/{$manifest['copy_files']['from_dir']}";
+    $allFiles = array();
+    $from_dir = "{$cacheUploadUpgradesTemp}/{$manifest['copy_files']['from_dir']}";
 
     // Localization
     if(file_exists("$from_dir/include/Localization/Localization.php")) {
@@ -773,25 +773,25 @@ 
  */
 function upgradeUWFilesCopy($allFiles, $from_dir)
 {
-   foreach($allFiles as $file)
-   {
-       if(is_array($file))
-       {
-           upgradeUWFilesCopy($file, $from_dir);
-       } else {
-           $destFile = str_replace($from_dir."/", "", $file);
-           if(!is_dir(dirname($destFile))) {
-              mkdir_recursive(dirname($destFile)); // make sure the directory exists
-           }
-
-           if(stristr($file,'uw_main.tpl'))
-              logThis('Skipping "'.$file.'" - file copy will during commit step.');
-           else {
-              logThis('updating UpgradeWizard code: '.$destFile);
-              copy_recursive($file, $destFile);
-           }
-       }
-   }
+    foreach($allFiles as $file)
+    {
+        if(is_array($file))
+        {
+            upgradeUWFilesCopy($file, $from_dir);
+        } else {
+            $destFile = str_replace($from_dir."/", "", $file);
+            if(!is_dir(dirname($destFile))) {
+                mkdir_recursive(dirname($destFile)); // make sure the directory exists
+            }
+
+            if(stristr($file,'uw_main.tpl'))
+                logThis('Skipping "'.$file.'" - file copy will during commit step.');
+            else {
+                logThis('updating UpgradeWizard code: '.$destFile);
+                copy_recursive($file, $destFile);
+            }
+        }
+    }
 }
 
 
@@ -800,22 +800,22 @@ 
  * gets valid patch file names that exist in upload/upgrade/patch/
  */
 function getValidPatchName($returnFull = true) {
-	global $base_upgrade_dir;
-	global $mod_strings;
-	global $uh;
-	global $sugar_version;
+    global $base_upgrade_dir;
+    global $mod_strings;
+    global $uh;
+    global $sugar_version;
     global $sugar_config;
     $uh = new UpgradeHistory();
     list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
     $return = array();
 
-	// scan for new files (that are not installed)
-	logThis('finding new files for upgrade');
-	$upgrade_content = '';
-	$upgrade_contents = findAllFiles($base_upgrade_dir, array(), false, 'zip');
-	//other variations of zip file i.e. ZIP, zIp,zIP,Zip,ZIp,ZiP
-	$ready = "<ul>\n";
-	$ready .= "
+    // scan for new files (that are not installed)
+    logThis('finding new files for upgrade');
+    $upgrade_content = '';
+    $upgrade_contents = findAllFiles($base_upgrade_dir, array(), false, 'zip');
+    //other variations of zip file i.e. ZIP, zIp,zIP,Zip,ZIp,ZiP
+    $ready = "<ul>\n";
+    $ready .= "
 		<table>
 			<tr>
 				<td></td>
@@ -838,79 +838,79 @@ 
 					<b>{$mod_strings['LBL_ML_DESCRIPTION']}</b>
 				</td>
 			</tr>";
-	$disabled = '';
-
-	// assume old patches are there.
-	$upgradeToVersion = array(); // fill with valid patches - we will only use the latest qualified found patch
-
-	// cn: bug 10609 - notices for uninitialized variables
-	$icon = '';
-	$name = '';
-	$type = '';
-	$version = '';
-	$published_date = '';
-	$uninstallable = '';
-	$description = '';
-	$disabled = '';
-
-	foreach($upgrade_contents as $upgrade_content) {
-		if(!preg_match("#.*\.zip\$#i", $upgrade_content)) {
-			continue;
-		}
+    $disabled = '';
+
+    // assume old patches are there.
+    $upgradeToVersion = array(); // fill with valid patches - we will only use the latest qualified found patch
+
+    // cn: bug 10609 - notices for uninitialized variables
+    $icon = '';
+    $name = '';
+    $type = '';
+    $version = '';
+    $published_date = '';
+    $uninstallable = '';
+    $description = '';
+    $disabled = '';
+
+    foreach($upgrade_contents as $upgrade_content) {
+        if(!preg_match("#.*\.zip\$#i", $upgrade_content)) {
+            continue;
+        }
 
-		$the_base = basename($upgrade_content);
-		$the_md5 = md5_file($upgrade_content);
+        $the_base = basename($upgrade_content);
+        $the_md5 = md5_file($upgrade_content);
 
-		$md5_matches = $uh->findByMd5($the_md5);
+        $md5_matches = $uh->findByMd5($the_md5);
 
-		/* If a patch is in the /patch dir AND has no record in the upgrade_history table we assume that it's the one we want.
+        /* If a patch is in the /patch dir AND has no record in the upgrade_history table we assume that it's the one we want.
 		 * Edge-case: manual upgrade with a FTP of a patch; UH table has no entry for it.  Assume nothing. :( */
-		if(0 == sizeof($md5_matches)) {
-			$target_manifest = remove_file_extension( $upgrade_content ) . '-manifest.php';
-			require_once($target_manifest);
-
-			if(empty($manifest['version'])) {
-				logThis("*** Potential error: patch found with no version [ {$upgrade_content} ]");
-				continue;
-			}
-			if(!isset($manifest['type']) || $manifest['type'] != 'patch') {
-				logThis("*** Potential error: patch found with either no 'type' or non-patch type [ {$upgrade_content} ]");
-				continue;
-			}
-
-			$upgradeToVersion[$manifest['version']] = urlencode($upgrade_content);
-
-			$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 = getUITextForType( $manifest['type'] );
-			$manifest_type = $manifest['type'];
-
-			if(empty($manifest['icon'])) {
-				$icon = getImageForType( $manifest['type'] );
-			} else {
-				$path_parts = pathinfo( $manifest['icon'] );
-				$icon = "<!--not_in_theme!--><img src=\"" . remove_file_extension( $upgrade_content ) . "-icon." . $path_parts['extension'] . "\">";
-			}
-	    }
-	}
+        if(0 == sizeof($md5_matches)) {
+            $target_manifest = remove_file_extension( $upgrade_content ) . '-manifest.php';
+            require_once($target_manifest);
+
+            if(empty($manifest['version'])) {
+                logThis("*** Potential error: patch found with no version [ {$upgrade_content} ]");
+                continue;
+            }
+            if(!isset($manifest['type']) || $manifest['type'] != 'patch') {
+                logThis("*** Potential error: patch found with either no 'type' or non-patch type [ {$upgrade_content} ]");
+                continue;
+            }
+
+            $upgradeToVersion[$manifest['version']] = urlencode($upgrade_content);
+
+            $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 = getUITextForType( $manifest['type'] );
+            $manifest_type = $manifest['type'];
+
+            if(empty($manifest['icon'])) {
+                $icon = getImageForType( $manifest['type'] );
+            } else {
+                $path_parts = pathinfo( $manifest['icon'] );
+                $icon = "<!--not_in_theme!--><img src=\"" . remove_file_extension( $upgrade_content ) . "-icon." . $path_parts['extension'] . "\">";
+            }
+        }
+    }
 
-	// cn: bug 10488 use the NEWEST upgrade/patch available when running upgrade wizard.
-	ksort($upgradeToVersion);
-	$upgradeToVersion = array_values($upgradeToVersion);
-	$newest = array_pop($upgradeToVersion);
-	$_SESSION['install_file'] = urldecode($newest); // in-case it was there from a prior.
-	logThis("*** UW using [ {$_SESSION['install_file']} ] as source for patch files.");
+    // cn: bug 10488 use the NEWEST upgrade/patch available when running upgrade wizard.
+    ksort($upgradeToVersion);
+    $upgradeToVersion = array_values($upgradeToVersion);
+    $newest = array_pop($upgradeToVersion);
+    $_SESSION['install_file'] = urldecode($newest); // in-case it was there from a prior.
+    logThis("*** UW using [ {$_SESSION['install_file']} ] as source for patch files.");
 
-	$cleanUpgradeContent = urlencode($_SESSION['install_file']);
+    $cleanUpgradeContent = urlencode($_SESSION['install_file']);
 
-	// cn: 10606 - cannot upload a patch file since this returned always.
-	if(!empty($cleanUpgradeContent)) {
-		$ready .= "<tr><td>$icon</td><td>$name</td><td>$type</td><td>$version</td><td>$published_date</td><td>$uninstallable</td><td>$description</td>\n";
-		$ready .=<<<eoq
+    // cn: 10606 - cannot upload a patch file since this returned always.
+    if(!empty($cleanUpgradeContent)) {
+        $ready .= "<tr><td>$icon</td><td>$name</td><td>$type</td><td>$version</td><td>$published_date</td><td>$uninstallable</td><td>$description</td>\n";
+        $ready .=<<<eoq
 	        <td>
 				<form action="index.php" method="post">
 					<input type="hidden" name="module" value="UpgradeWizard">
@@ -922,23 +922,23 @@ 
 				</form>
 			</td></table>
 eoq;
-		$disabled = "DISABLED";
-	}
+        $disabled = "DISABLED";
+    }
 
 
 
-	if(empty($cleanUpgradeContent)){
-	    $ready .= "<tr><td colspan='7'><i>None</i></td>\n";
-		$ready .= "</table>\n";
-	}
-	$ready .= "<br></ul>\n";
+    if(empty($cleanUpgradeContent)){
+        $ready .= "<tr><td colspan='7'><i>None</i></td>\n";
+        $ready .= "</table>\n";
+    }
+    $ready .= "<br></ul>\n";
 
-	$return['ready'] = $ready;
-	$return['disabled'] = $disabled;
+    $return['ready'] = $ready;
+    $return['disabled'] = $disabled;
 
-	if($returnFull) {
-		return $return;
-	}
+    if($returnFull) {
+        return $return;
+    }
 }
 
 
@@ -947,36 +947,36 @@ 
  * @return bool true on success
  */
 function updateVersions($version) {
-	global $db;
-	global $sugar_config;
-	global $path;
-
-	logThis('At updateVersions()... updating config table and sugar_version.php.', $path);
-
-	// handle file copy
-	if(isset($_SESSION['sugar_version_file']) && !empty($_SESSION['sugar_version_file'])) {
-		if(!copy($_SESSION['sugar_version_file'], clean_path(getcwd().'/sugar_version.php'))) {
-			logThis('*** ERROR: sugar_version.php could not be copied to destination! Cannot complete upgrade', $path);
-			return false;
-		} else {
-			logThis('sugar_version.php successfully updated!', $path);
-		}
-	} else {
-		logThis('*** ERROR: no sugar_version.php file location found! - cannot complete upgrade...', $path);
-		return false;
-	}
+    global $db;
+    global $sugar_config;
+    global $path;
+
+    logThis('At updateVersions()... updating config table and sugar_version.php.', $path);
+
+    // handle file copy
+    if(isset($_SESSION['sugar_version_file']) && !empty($_SESSION['sugar_version_file'])) {
+        if(!copy($_SESSION['sugar_version_file'], clean_path(getcwd().'/sugar_version.php'))) {
+            logThis('*** ERROR: sugar_version.php could not be copied to destination! Cannot complete upgrade', $path);
+            return false;
+        } else {
+            logThis('sugar_version.php successfully updated!', $path);
+        }
+    } else {
+        logThis('*** ERROR: no sugar_version.php file location found! - cannot complete upgrade...', $path);
+        return false;
+    }
 
-	$q1 = "DELETE FROM config WHERE category = 'info' AND name = 'sugar_version'";
-	$q2 = "INSERT INTO config (category, name, value) VALUES ('info', 'sugar_version', '{$version}')";
+    $q1 = "DELETE FROM config WHERE category = 'info' AND name = 'sugar_version'";
+    $q2 = "INSERT INTO config (category, name, value) VALUES ('info', 'sugar_version', '{$version}')";
 
-	logThis('Deleting old DB version info from config table.', $path);
-	$db->query($q1);
+    logThis('Deleting old DB version info from config table.', $path);
+    $db->query($q1);
 
-	logThis('Inserting updated version info into config table.', $path);
-	$db->query($q2);
+    logThis('Inserting updated version info into config table.', $path);
+    $db->query($q2);
 
-	logThis('updateVersions() complete.', $path);
-	return true;
+    logThis('updateVersions() complete.', $path);
+    return true;
 }
 
 
@@ -988,11 +988,11 @@ 
  * @return array mod_strings
  */
 function getModuleLanguagePack($lang, $module) {
-	$mod_strings = array();
+    $mod_strings = array();
 
-	if(!empty($lang) && !empty($module)) {
-		$langPack = clean_path(getcwd().'/'.$module.'/language/'.$lang.'.lang.php');
-		$langPackEn = clean_path(getcwd().'/'.$module.'/language/en_us.lang.php');
+    if(!empty($lang) && !empty($module)) {
+        $langPack = clean_path(getcwd().'/'.$module.'/language/'.$lang.'.lang.php');
+        $langPackEn = clean_path(getcwd().'/'.$module.'/language/en_us.lang.php');
 
         if (file_exists($langPack))
         {
@@ -1002,47 +1002,47 @@ 
         {
             include($langPackEn);
         }
-	}
+    }
 
-	return $mod_strings;
+    return $mod_strings;
 }
 /**
  * checks system compliance for 4.5+ codebase
  * @return array Mixed values
  */
 function checkSystemCompliance() {
-	global $sugar_config;
-	global $current_language;
-	global $db;
-	global $mod_strings;
+    global $sugar_config;
+    global $current_language;
+    global $db;
+    global $mod_strings;
     global $app_strings;
 
-	if(!defined('SUGARCRM_MIN_MEM')) {
-		define('SUGARCRM_MIN_MEM', 40);
-	}
+    if(!defined('SUGARCRM_MIN_MEM')) {
+        define('SUGARCRM_MIN_MEM', 40);
+    }
 
-	$installer_mod_strings = getModuleLanguagePack($current_language, './install');
-	$ret = array();
-	$ret['error_found'] = false;
-
-	// PHP version
-	$php_version = constant('PHP_VERSION');
-	$check_php_version_result = check_php_version($php_version);
-
-	switch($check_php_version_result) {
-		case -1:
-			$ret['phpVersion'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_PHP_INVALID_VER']} {$php_version} )</span></b>";
-			$ret['error_found'] = true;
-			break;
-		case 0:
-			$ret['phpVersion'] = "<b><span class=go>{$installer_mod_strings['ERR_CHECKSYS_PHP_UNSUPPORTED']} {$php_version} )</span></b>";
-			break;
-		case 1:
-			$ret['phpVersion'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_PHP_OK']} {$php_version} )</span></b>";
-			break;
-	}
+    $installer_mod_strings = getModuleLanguagePack($current_language, './install');
+    $ret = array();
+    $ret['error_found'] = false;
+
+    // PHP version
+    $php_version = constant('PHP_VERSION');
+    $check_php_version_result = check_php_version($php_version);
 
-	// database and connect
+    switch($check_php_version_result) {
+        case -1:
+            $ret['phpVersion'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_PHP_INVALID_VER']} {$php_version} )</span></b>";
+            $ret['error_found'] = true;
+            break;
+        case 0:
+            $ret['phpVersion'] = "<b><span class=go>{$installer_mod_strings['ERR_CHECKSYS_PHP_UNSUPPORTED']} {$php_version} )</span></b>";
+            break;
+        case 1:
+            $ret['phpVersion'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_PHP_OK']} {$php_version} )</span></b>";
+            break;
+    }
+
+    // database and connect
     $canInstall = $db->canInstall();
     if ($canInstall !== true)
     {
@@ -1057,75 +1057,75 @@ 
         }
     }
 
-	// XML Parsing
-	if(function_exists('xml_parser_create')) {
-		$ret['xmlStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
-	} else {
-		$ret['xmlStatus'] = "<b><span class=stop>{$installer_mod_strings['LBL_CHECKSYS_NOT_AVAILABLE']}</span></b>";
-		$ret['error_found'] = true;
-	}
+    // XML Parsing
+    if(function_exists('xml_parser_create')) {
+        $ret['xmlStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    } else {
+        $ret['xmlStatus'] = "<b><span class=stop>{$installer_mod_strings['LBL_CHECKSYS_NOT_AVAILABLE']}</span></b>";
+        $ret['error_found'] = true;
+    }
 
-	// cURL
-	if(function_exists('curl_init')) {
-		$ret['curlStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
-	} else {
-		$ret['curlStatus'] = "<b><span class=go>{$installer_mod_strings['ERR_CHECKSYS_CURL']}</span></b>";
-		$ret['error_found'] = false;
-	}
+    // cURL
+    if(function_exists('curl_init')) {
+        $ret['curlStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    } else {
+        $ret['curlStatus'] = "<b><span class=go>{$installer_mod_strings['ERR_CHECKSYS_CURL']}</span></b>";
+        $ret['error_found'] = false;
+    }
 
-	// mbstrings
-	if(function_exists('mb_strlen')) {
-		$ret['mbstringStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
-	} else {
-		$ret['mbstringStatus'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_MBSTRING']}</span></b>";
-		$ret['error_found'] = true;
-	}
+    // mbstrings
+    if(function_exists('mb_strlen')) {
+        $ret['mbstringStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    } else {
+        $ret['mbstringStatus'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_MBSTRING']}</span></b>";
+        $ret['error_found'] = true;
+    }
 
-	// imap
-	if(function_exists('imap_open')) {
-		$ret['imapStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
-	} else {
-		$ret['imapStatus'] = "<b><span class=go>{$installer_mod_strings['ERR_CHECKSYS_IMAP']}</span></b>";
-		$ret['error_found'] = false;
-	}
+    // imap
+    if(function_exists('imap_open')) {
+        $ret['imapStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    } else {
+        $ret['imapStatus'] = "<b><span class=go>{$installer_mod_strings['ERR_CHECKSYS_IMAP']}</span></b>";
+        $ret['error_found'] = false;
+    }
 
 
-	// safe mode
-	if('1' == ini_get('safe_mode')) {
-		$ret['safeModeStatus'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_SAFE_MODE']}</span></b>";
-		$ret['error_found'] = true;
-	} else {
-		$ret['safeModeStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
-	}
+    // safe mode
+    if('1' == ini_get('safe_mode')) {
+        $ret['safeModeStatus'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_SAFE_MODE']}</span></b>";
+        $ret['error_found'] = true;
+    } else {
+        $ret['safeModeStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    }
 
 
-	// call time pass by ref
+    // call time pass by ref
     if('1' == ini_get('allow_call_time_pass_reference')) {
-		$ret['callTimeStatus'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_CALL_TIME']}</span></b>";
-		//continue upgrading
-	} else {
-		$ret['callTimeStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
-	}
+        $ret['callTimeStatus'] = "<b><span class=stop>{$installer_mod_strings['ERR_CHECKSYS_CALL_TIME']}</span></b>";
+        //continue upgrading
+    } else {
+        $ret['callTimeStatus'] = "<b><span class=go>{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    }
 
-	// memory limit
-	$ret['memory_msg']     = "";
-	$memory_limit   = "-1";//ini_get('memory_limit');
-	$sugarMinMem = constant('SUGARCRM_MIN_MEM');
-	// logic based on: http://us2.php.net/manual/en/ini.core.php#ini.memory-limit
-	if( $memory_limit == "" ){          // memory_limit disabled at compile time, no memory limit
-	    $ret['memory_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_MEM_OK']}</span></b>";
-	} elseif( $memory_limit == "-1" ){   // memory_limit enabled, but set to unlimited
-	    $ret['memory_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_MEM_UNLIMITED']}</span></b>";
-	} else {
-	    rtrim($memory_limit, 'M');
-	    $memory_limit_int = (int) $memory_limit;
-	    if( $memory_limit_int < constant('SUGARCRM_MIN_MEM') ){
-	        $ret['memory_msg'] = "<b><span class=\"stop\">{$installer_mod_strings['ERR_CHECKSYS_MEM_LIMIT_1']}" . constant('SUGARCRM_MIN_MEM') . "{$installer_mod_strings['ERR_CHECKSYS_MEM_LIMIT_2']}</span></b>";
-			$ret['error_found'] = true;
-	    } else {
-			$ret['memory_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_OK']} ({$memory_limit})</span></b>";
-	    }
-	}
+    // memory limit
+    $ret['memory_msg']     = "";
+    $memory_limit   = "-1";//ini_get('memory_limit');
+    $sugarMinMem = constant('SUGARCRM_MIN_MEM');
+    // logic based on: http://us2.php.net/manual/en/ini.core.php#ini.memory-limit
+    if( $memory_limit == "" ){          // memory_limit disabled at compile time, no memory limit
+        $ret['memory_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_MEM_OK']}</span></b>";
+    } elseif( $memory_limit == "-1" ){   // memory_limit enabled, but set to unlimited
+        $ret['memory_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_MEM_UNLIMITED']}</span></b>";
+    } else {
+        rtrim($memory_limit, 'M');
+        $memory_limit_int = (int) $memory_limit;
+        if( $memory_limit_int < constant('SUGARCRM_MIN_MEM') ){
+            $ret['memory_msg'] = "<b><span class=\"stop\">{$installer_mod_strings['ERR_CHECKSYS_MEM_LIMIT_1']}" . constant('SUGARCRM_MIN_MEM') . "{$installer_mod_strings['ERR_CHECKSYS_MEM_LIMIT_2']}</span></b>";
+            $ret['error_found'] = true;
+        } else {
+            $ret['memory_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_OK']} ({$memory_limit})</span></b>";
+        }
+    }
         // zip support
     if (!class_exists("ZipArchive"))
     {
@@ -1161,7 +1161,7 @@ 
         $ret['error_found'] = true;
     }
 
-	/* mbstring.func_overload
+    /* mbstring.func_overload
 	$ret['mbstring.func_overload'] = '';
 	$mb = ini_get('mbstring.func_overload');
 
@@ -1170,7 +1170,7 @@ 
 		$ret['error_found'] = true;
 	}
 	*/
-	return $ret;
+    return $ret;
 }
 
 
@@ -1178,141 +1178,141 @@ 
  * is a file that we blow away automagically
  */
 function isAutoOverwriteFile($file) {
-	$overwriteDirs = array(
-		'./sugar_version.php',
-		'./modules/UpgradeWizard/uw_main.tpl',
-	);
-	$file = trim('.'.str_replace(clean_path(getcwd()), '', $file));
-
-	if(in_array($file, $overwriteDirs)) {
-		return true;
-	}
+    $overwriteDirs = array(
+        './sugar_version.php',
+        './modules/UpgradeWizard/uw_main.tpl',
+    );
+    $file = trim('.'.str_replace(clean_path(getcwd()), '', $file));
+
+    if(in_array($file, $overwriteDirs)) {
+        return true;
+    }
 
-	$fileExtension = substr(strrchr($file, "."), 1);
-	if($fileExtension == 'tpl' || $fileExtension == 'html') {
-		return false;
-	}
+    $fileExtension = substr(strrchr($file, "."), 1);
+    if($fileExtension == 'tpl' || $fileExtension == 'html') {
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 /**
  * flatfile logger
  */
 function logThis($entry, $path='') {
-	global $mod_strings;
-	if(file_exists('include/utils/sugar_file_utils.php')){
-		require_once('include/utils/sugar_file_utils.php');
-	}
-		$log = empty($path) ? clean_path(getcwd().'/upgradeWizard.log') : clean_path($path);
-
-		// create if not exists
-		if(!file_exists($log)) {
-			if(function_exists('sugar_fopen')){
-				$fp = @sugar_fopen($log, 'w+'); // attempts to create file
-		     }
-		     else{
-				$fp = fopen($log, 'w+'); // attempts to create file
-		     }
-			if(!is_resource($fp)) {
-				$GLOBALS['log']->fatal('UpgradeWizard could not create the upgradeWizard.log file');
-				die($mod_strings['ERR_UW_LOG_FILE_UNWRITABLE']);
-			}
-		} else {
-			if(function_exists('sugar_fopen')){
-				$fp = @sugar_fopen($log, 'a+'); // write pointer at end of file
-		     }
-		     else{
-				$fp = @fopen($log, 'a+'); // write pointer at end of file
-		     }
-
-			if(!is_resource($fp)) {
-				$GLOBALS['log']->fatal('UpgradeWizard could not open/lock upgradeWizard.log file');
-				die($mod_strings['ERR_UW_LOG_FILE_UNWRITABLE']);
-			}
-		}
+    global $mod_strings;
+    if(file_exists('include/utils/sugar_file_utils.php')){
+        require_once('include/utils/sugar_file_utils.php');
+    }
+        $log = empty($path) ? clean_path(getcwd().'/upgradeWizard.log') : clean_path($path);
+
+        // create if not exists
+        if(!file_exists($log)) {
+            if(function_exists('sugar_fopen')){
+                $fp = @sugar_fopen($log, 'w+'); // attempts to create file
+                }
+                else{
+                $fp = fopen($log, 'w+'); // attempts to create file
+                }
+            if(!is_resource($fp)) {
+                $GLOBALS['log']->fatal('UpgradeWizard could not create the upgradeWizard.log file');
+                die($mod_strings['ERR_UW_LOG_FILE_UNWRITABLE']);
+            }
+        } else {
+            if(function_exists('sugar_fopen')){
+                $fp = @sugar_fopen($log, 'a+'); // write pointer at end of file
+                }
+                else{
+                $fp = @fopen($log, 'a+'); // write pointer at end of file
+                }
 
-		$line = date('r').' [UpgradeWizard] - '.$entry."\n";
+            if(!is_resource($fp)) {
+                $GLOBALS['log']->fatal('UpgradeWizard could not open/lock upgradeWizard.log file');
+                die($mod_strings['ERR_UW_LOG_FILE_UNWRITABLE']);
+            }
+        }
 
-		if(@fwrite($fp, $line) === false) {
-			$GLOBALS['log']->fatal('UpgradeWizard could not write to upgradeWizard.log: '.$entry);
-			die($mod_strings['ERR_UW_LOG_FILE_UNWRITABLE']);
-		}
+        $line = date('r').' [UpgradeWizard] - '.$entry."\n";
 
-		if(is_resource($fp)) {
-			fclose($fp);
-		}
+        if(@fwrite($fp, $line) === false) {
+            $GLOBALS['log']->fatal('UpgradeWizard could not write to upgradeWizard.log: '.$entry);
+            die($mod_strings['ERR_UW_LOG_FILE_UNWRITABLE']);
+        }
+
+        if(is_resource($fp)) {
+            fclose($fp);
+        }
 }
 
 /**
-	*  @params : none
-	*  @author: nsingh
-	*  @desc This function is to be used in the upgrade process to preserve changes/customaizations made to pre 5.1 quickcreate layout.
-	*  Prior to 5.1 we have been using editviewdefs as the base for quickcreatedefs. If a custom field was added to edit view layout, it
-	*  was automatically picked up by the quick create. [Addresses Bug 21469]
-	*  This function will check if customizations were made, and will create quickcreatedefs.php in the /cutom/working/$module_name directory.
-	**/
+ *  @params : none
+ *  @author: nsingh
+ *  @desc This function is to be used in the upgrade process to preserve changes/customaizations made to pre 5.1 quickcreate layout.
+ *  Prior to 5.1 we have been using editviewdefs as the base for quickcreatedefs. If a custom field was added to edit view layout, it
+ *  was automatically picked up by the quick create. [Addresses Bug 21469]
+ *  This function will check if customizations were made, and will create quickcreatedefs.php in the /cutom/working/$module_name directory.
+ **/
 function updateQuickCreateDefs(){
-	$d = dir('modules');
-	$studio_modules = array();
-
-	while($e = $d->read()){ //collect all studio modules.
-		if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
-		if(file_exists('modules/' . $e . '/metadata/studio.php'))
-		{
-			array_push($studio_modules, $e);
-		}
-	}
+    $d = dir('modules');
+    $studio_modules = array();
 
-	foreach( $studio_modules as $modname ){ //for each studio enabled module
-		//Check !exists modules/$modname/metadata/quickcreatedefs.php &&
-		//exists custom/$modname/editviewdefs.php (module was customized) &&
-		//!exists custom/$modname/quickcreateviewdefs.php
-
-		$editviewdefs = "custom/working/modules/".$modname."/metadata/editviewdefs.php";
-		$quickcreatedefs = "custom/working/modules/".$modname."/metadata/quickcreatedefs.php";
-
-		if ( !file_exists("modules/".$modname."/metadata/quickcreatedefs.php") &&
-			 file_exists($editviewdefs) &&
-			 !file_exists($quickcreatedefs) ){
-				//clone editviewdef and save it in custom/working/modules/metadata
-				$GLOBALS['log']->debug("Copying editviewdefs.php as quickcreatedefs.php for the $modname module in custom/working/modules/$modname/metadata!");
-				if(copy( $editviewdefs, $quickcreatedefs)){
-					if(file_exists($quickcreatedefs) && is_readable($quickcreatedefs)){
-						$file = file($quickcreatedefs);
-						//replace 'EditView' with 'QuickCreate'
-						$fp = fopen($quickcreatedefs,'w');
-						foreach($file as &$line){
-							if(preg_match('/^\s*\'EditView\'\s*=>\s*$/', $line) > 0){
-								$line = "'QuickCreate' =>\n";
-							}
-							fwrite($fp, $line);
-						}
-						//write back.
-						fclose($fp);
-					}
-					else{
-						$GLOBALS['log']->debug("Failed to replace 'EditView' with QuickCreate because $quickcreatedefs is either not readable or does not exist.");
-					}
-				}else{
-					$GLOBALS['log']->debug("Failed to copy $editviewdefs to $quickcreatedefs!");
-				}
-		}
-	}
+    while($e = $d->read()){ //collect all studio modules.
+        if(substr($e, 0, 1) == '.' || !is_dir('modules/' . $e))continue;
+        if(file_exists('modules/' . $e . '/metadata/studio.php'))
+        {
+            array_push($studio_modules, $e);
+        }
+    }
+
+    foreach( $studio_modules as $modname ){ //for each studio enabled module
+        //Check !exists modules/$modname/metadata/quickcreatedefs.php &&
+        //exists custom/$modname/editviewdefs.php (module was customized) &&
+        //!exists custom/$modname/quickcreateviewdefs.php
+
+        $editviewdefs = "custom/working/modules/".$modname."/metadata/editviewdefs.php";
+        $quickcreatedefs = "custom/working/modules/".$modname."/metadata/quickcreatedefs.php";
+
+        if ( !file_exists("modules/".$modname."/metadata/quickcreatedefs.php") &&
+             file_exists($editviewdefs) &&
+             !file_exists($quickcreatedefs) ){
+                //clone editviewdef and save it in custom/working/modules/metadata
+                $GLOBALS['log']->debug("Copying editviewdefs.php as quickcreatedefs.php for the $modname module in custom/working/modules/$modname/metadata!");
+                if(copy( $editviewdefs, $quickcreatedefs)){
+                    if(file_exists($quickcreatedefs) && is_readable($quickcreatedefs)){
+                        $file = file($quickcreatedefs);
+                        //replace 'EditView' with 'QuickCreate'
+                        $fp = fopen($quickcreatedefs,'w');
+                        foreach($file as &$line){
+                            if(preg_match('/^\s*\'EditView\'\s*=>\s*$/', $line) > 0){
+                                $line = "'QuickCreate' =>\n";
+                            }
+                            fwrite($fp, $line);
+                        }
+                        //write back.
+                        fclose($fp);
+                    }
+                    else{
+                        $GLOBALS['log']->debug("Failed to replace 'EditView' with QuickCreate because $quickcreatedefs is either not readable or does not exist.");
+                    }
+                }else{
+                    $GLOBALS['log']->debug("Failed to copy $editviewdefs to $quickcreatedefs!");
+                }
+        }
+    }
 }
 
 /**
  * test perms for CREATE queries
  */
 function testPermsCreate($db, $out) {
-	logThis('Checking CREATE TABLE permissions...');
-	global $mod_strings;
+    logThis('Checking CREATE TABLE permissions...');
+    global $mod_strings;
 
-	if(!$db->checkPrivilege("CREATE TABLE")) {
+    if(!$db->checkPrivilege("CREATE TABLE")) {
         logThis('cannot CREATE TABLE!');
-		$out['db']['dbNoCreate'] = true;
-		$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_CREATE']}</span></td></tr>";
-	}
+        $out['db']['dbNoCreate'] = true;
+        $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_CREATE']}</span></td></tr>";
+    }
     return $out;
 }
 
@@ -1320,13 +1320,13 @@ 
  * test perms for INSERT
  */
 function testPermsInsert($db, $out, $skip=false) {
-	logThis('Checking INSERT INTO permissions...');
-	global $mod_strings;
+    logThis('Checking INSERT INTO permissions...');
+    global $mod_strings;
 
-	if(!$db->checkPrivilege("INSERT")) {
-		logThis('cannot INSERT INTO!');
-		$out['db']['dbNoInsert'] = true;
-		$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_INSERT']}</span></td></tr>";
+    if(!$db->checkPrivilege("INSERT")) {
+        logThis('cannot INSERT INTO!');
+        $out['db']['dbNoInsert'] = true;
+        $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_INSERT']}</span></td></tr>";
     }
     return $out;
 }
@@ -1336,12 +1336,12 @@ 
  * test perms for UPDATE TABLE
  */
 function testPermsUpdate($db, $out, $skip=false) {
-	logThis('Checking UPDATE TABLE permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("UPDATE")) {
-					logThis('cannot UPDATE TABLE!');
-					$out['db']['dbNoUpdate'] = true;
-					$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_UPDATE']}</span></td></tr>";
+    logThis('Checking UPDATE TABLE permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("UPDATE")) {
+                    logThis('cannot UPDATE TABLE!');
+                    $out['db']['dbNoUpdate'] = true;
+                    $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_UPDATE']}</span></td></tr>";
     }
     return $out;
 }
@@ -1351,12 +1351,12 @@ 
  * test perms for SELECT
  */
 function testPermsSelect($db, $out, $skip=false) {
-	logThis('Checking SELECT permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("SELECT")) {
-				logThis('cannot SELECT!');
-				$out['db']['dbNoSelect'] = true;
-				$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_SELECT']}</span></td></tr>";
+    logThis('Checking SELECT permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("SELECT")) {
+                logThis('cannot SELECT!');
+                $out['db']['dbNoSelect'] = true;
+                $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_SELECT']}</span></td></tr>";
     }
     return $out;
 }
@@ -1365,12 +1365,12 @@ 
  * test perms for DELETE
  */
 function testPermsDelete($db, $out, $skip=false) {
-	logThis('Checking DELETE FROM permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("DELETE")) {
-				logThis('cannot DELETE FROM!');
-				$out['db']['dbNoDelete'] = true;
-				$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_DELETE']}</span></td></tr>";
+    logThis('Checking DELETE FROM permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("DELETE")) {
+                logThis('cannot DELETE FROM!');
+                $out['db']['dbNoDelete'] = true;
+                $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_DELETE']}</span></td></tr>";
     }
     return $out;
 }
@@ -1380,12 +1380,12 @@ 
  * test perms for ALTER TABLE ADD COLUMN
  */
 function testPermsAlterTableAdd($db, $out, $skip=false) {
-	logThis('Checking ALTER TABLE ADD COLUMN permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("ADD COLUMN")) {
-				logThis('cannot ADD COLUMN!');
-				$out['db']['dbNoAddColumn'] = true;
-				$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_ADD_COLUMN']}</span></td></tr>";
+    logThis('Checking ALTER TABLE ADD COLUMN permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("ADD COLUMN")) {
+                logThis('cannot ADD COLUMN!');
+                $out['db']['dbNoAddColumn'] = true;
+                $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_ADD_COLUMN']}</span></td></tr>";
     }
     return $out;
 }
@@ -1394,12 +1394,12 @@ 
  * test perms for ALTER TABLE ADD COLUMN
  */
 function testPermsAlterTableChange($db, $out, $skip=false) {
-	logThis('Checking ALTER TABLE CHANGE COLUMN permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("CHANGE COLUMN")) {
-				logThis('cannot CHANGE COLUMN!');
-				$out['db']['dbNoChangeColumn'] = true;
-				$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_CHANGE_COLUMN']}</span></td></tr>";
+    logThis('Checking ALTER TABLE CHANGE COLUMN permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("CHANGE COLUMN")) {
+                logThis('cannot CHANGE COLUMN!');
+                $out['db']['dbNoChangeColumn'] = true;
+                $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_CHANGE_COLUMN']}</span></td></tr>";
     }
     return $out;
 }
@@ -1408,12 +1408,12 @@ 
  * test perms for ALTER TABLE DROP COLUMN
  */
 function testPermsAlterTableDrop($db, $out, $skip=false) {
-	logThis('Checking ALTER TABLE DROP COLUMN permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("DROP COLUMN")) {
-				logThis('cannot DROP COLUMN!');
-				$out['db']['dbNoDropColumn'] = true;
-				$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_DROP_COLUMN']}</span></td></tr>";
+    logThis('Checking ALTER TABLE DROP COLUMN permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("DROP COLUMN")) {
+                logThis('cannot DROP COLUMN!');
+                $out['db']['dbNoDropColumn'] = true;
+                $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_DROP_COLUMN']}</span></td></tr>";
     }
     return $out;
 }
@@ -1423,21 +1423,21 @@ 
  * test perms for DROP TABLE
  */
 function testPermsDropTable($db, $out, $skip=false) {
-	logThis('Checking DROP TABLE permissions...');
-	global $mod_strings;
-	if(!$db->checkPrivilege("DROP TABLE")) {
-				logThis('cannot DROP TABLE!');
-				$out['db']['dbNoDropTable'] = true;
-				$out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_DROP_TABLE']}</span></td></tr>";
+    logThis('Checking DROP TABLE permissions...');
+    global $mod_strings;
+    if(!$db->checkPrivilege("DROP TABLE")) {
+                logThis('cannot DROP TABLE!');
+                $out['db']['dbNoDropTable'] = true;
+                $out['dbOut'] .= "<tr><td align='left'><span class='error'>{$mod_strings['LBL_UW_DB_NO_DROP_TABLE']}</span></td></tr>";
     }
     return $out;
 }
 
 function getFormattedError($error, $query) {
-	$error = "<div><b>".$error;
-	$error .= "</b>::{$query}</div>";
+    $error = "<div><b>".$error;
+    $error .= "</b>::{$query}</div>";
 
-	return $error;
+    return $error;
 }
 
 /**
@@ -1446,25 +1446,25 @@ 
  * @return string table The table
  */
 function getTableFromQuery($query) {
-	$standardQueries = array('ALTER TABLE', 'DROP TABLE', 'CREATE TABLE', 'INSERT INTO', 'UPDATE', 'DELETE FROM');
-	$query = preg_replace("/[^A-Za-z0-9\_\s]/", "", $query);
-	$query = trim(str_replace($standardQueries, '', $query));
+    $standardQueries = array('ALTER TABLE', 'DROP TABLE', 'CREATE TABLE', 'INSERT INTO', 'UPDATE', 'DELETE FROM');
+    $query = preg_replace("/[^A-Za-z0-9\_\s]/", "", $query);
+    $query = trim(str_replace($standardQueries, '', $query));
 
-	$firstSpc = strpos($query, " ");
-	$end = ($firstSpc > 0) ? $firstSpc : strlen($query);
-	$table = substr($query, 0, $end);
+    $firstSpc = strpos($query, " ");
+    $end = ($firstSpc > 0) ? $firstSpc : strlen($query);
+    $table = substr($query, 0, $end);
 
-	return $table;
+    return $table;
 }
 
 //prelicense check
 
 function preLicenseCheck() {
-	require_once('modules/UpgradeWizard/uw_files.php');
+    require_once('modules/UpgradeWizard/uw_files.php');
 
-	global $sugar_config;
-	global $mod_strings;
-	global $sugar_version;
+    global $sugar_config;
+    global $mod_strings;
+    global $sugar_version;
 
     if (empty($sugar_version))
     {
@@ -1472,36 +1472,36 @@ 
     }
 
 if(!isset($_SESSION['unzip_dir']) || empty($_SESSION['unzip_dir'])) {
-		logThis('unzipping files in upgrade archive...');
-		$errors					= array();
-		list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
-		$unzip_dir = '';
-		//also come up with mechanism to read from upgrade-progress file
-		if(!isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !is_file($_SESSION['install_file'])) {
-			if (file_exists(clean_path($base_tmp_upgrade_dir)) && $handle = opendir(clean_path($base_tmp_upgrade_dir))) {
-		    		while (false !== ($file = readdir($handle))) {
-		    		if($file !="." && $file !="..")	{
-					 if(is_file($base_tmp_upgrade_dir."/".$file."/manifest.php")){
-					 	require_once($base_tmp_upgrade_dir."/".$file."/manifest.php");
-					 	$package_name= $manifest['copy_files']['from_dir'];
-					 	if(file_exists($base_tmp_upgrade_dir."/".$file."/".$package_name) && file_exists($base_tmp_upgrade_dir."/".$file."/scripts") && file_exists($base_tmp_upgrade_dir."/".$file."/manifest.php")){
-					 		$unzip_dir = $base_tmp_upgrade_dir."/".$file;
-					 		if(file_exists("$base_upgrade_dir/patch/".$package_name.'.zip')){
-					 			$_SESSION['install_file'] = $package_name.".zip";
-					 			break;
-					 		}
-						}
-					  }
-		    		}
-		    	}
-			}
-		}
+        logThis('unzipping files in upgrade archive...');
+        $errors					= array();
+        list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
+        $unzip_dir = '';
+        //also come up with mechanism to read from upgrade-progress file
+        if(!isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !is_file($_SESSION['install_file'])) {
+            if (file_exists(clean_path($base_tmp_upgrade_dir)) && $handle = opendir(clean_path($base_tmp_upgrade_dir))) {
+                    while (false !== ($file = readdir($handle))) {
+                    if($file !="." && $file !="..")	{
+                        if(is_file($base_tmp_upgrade_dir."/".$file."/manifest.php")){
+                            require_once($base_tmp_upgrade_dir."/".$file."/manifest.php");
+                            $package_name= $manifest['copy_files']['from_dir'];
+                            if(file_exists($base_tmp_upgrade_dir."/".$file."/".$package_name) && file_exists($base_tmp_upgrade_dir."/".$file."/scripts") && file_exists($base_tmp_upgrade_dir."/".$file."/manifest.php")){
+                                $unzip_dir = $base_tmp_upgrade_dir."/".$file;
+                                if(file_exists("$base_upgrade_dir/patch/".$package_name.'.zip')){
+                                    $_SESSION['install_file'] = $package_name.".zip";
+                                    break;
+                                }
+                        }
+                        }
+                    }
+                }
+            }
+        }
         if(empty($_SESSION['install_file'])){
-        	unlinkUWTempFiles();
-        	resetUwSession();
-        	echo 'Upload File not found so redirecting to Upgrade Start ';
-        	$redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
-        	echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
+            unlinkUWTempFiles();
+            resetUwSession();
+            echo 'Upload File not found so redirecting to Upgrade Start ';
+            $redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
+            echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
 $upgrade_directories_not_found =<<<eoq
 	<table cellpadding="3" cellspacing="0" border="0">
 		<tr>
@@ -1512,66 +1512,66 @@ 
 	</table>
 eoq;
 $uwMain = $upgrade_directories_not_found;
-				return '';
+                return '';
         }
-		$install_file			= "$base_upgrade_dir/patch/".basename(urldecode( $_SESSION['install_file'] ));
-		$show_files				= true;
-		if(empty($unzip_dir)){
-			$unzip_dir				= mk_temp_dir( $base_tmp_upgrade_dir );
-		}
-		$zip_from_dir			= ".";
-		$zip_to_dir				= ".";
-		$zip_force_copy			= array();
+        $install_file			= "$base_upgrade_dir/patch/".basename(urldecode( $_SESSION['install_file'] ));
+        $show_files				= true;
+        if(empty($unzip_dir)){
+            $unzip_dir				= mk_temp_dir( $base_tmp_upgrade_dir );
+        }
+        $zip_from_dir			= ".";
+        $zip_to_dir				= ".";
+        $zip_force_copy			= array();
 
-		if(!$unzip_dir){
-			logThis('Could not create a temporary directory using mk_temp_dir( $base_tmp_upgrade_dir )');
-			die($mod_strings['ERR_UW_NO_CREATE_TMP_DIR']);
-		}
+        if(!$unzip_dir){
+            logThis('Could not create a temporary directory using mk_temp_dir( $base_tmp_upgrade_dir )');
+            die($mod_strings['ERR_UW_NO_CREATE_TMP_DIR']);
+        }
 
-		//double check whether unzipped .
-		if(file_exists($unzip_dir ."/scripts") && file_exists($unzip_dir."/manifest.php")){
-        	//already unzipped
-		}
-		else{
-			unzip( $install_file, $unzip_dir );
-		}
+        //double check whether unzipped .
+        if(file_exists($unzip_dir ."/scripts") && file_exists($unzip_dir."/manifest.php")){
+            //already unzipped
+        }
+        else{
+            unzip( $install_file, $unzip_dir );
+        }
 
-		// assumption -- already validated manifest.php at time of upload
-		require_once( "$unzip_dir/manifest.php" );
+        // assumption -- already validated manifest.php at time of upload
+        require_once( "$unzip_dir/manifest.php" );
 
-		if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
-		    $zip_from_dir   = $manifest['copy_files']['from_dir'];
-		}
-		if( isset( $manifest['copy_files']['to_dir'] ) && $manifest['copy_files']['to_dir'] != "" ){
-		    $zip_to_dir     = $manifest['copy_files']['to_dir'];
-		}
-		if( isset( $manifest['copy_files']['force_copy'] ) && $manifest['copy_files']['force_copy'] != "" ){
-		    $zip_force_copy     = $manifest['copy_files']['force_copy'];
-		}
-		if( isset( $manifest['version'] ) ){
-		    $version    = $manifest['version'];
-		}
-		if( !is_writable( "config.php" ) ){
-			return $mod_strings['ERR_UW_CONFIG'];
-		}
+        if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
+            $zip_from_dir   = $manifest['copy_files']['from_dir'];
+        }
+        if( isset( $manifest['copy_files']['to_dir'] ) && $manifest['copy_files']['to_dir'] != "" ){
+            $zip_to_dir     = $manifest['copy_files']['to_dir'];
+        }
+        if( isset( $manifest['copy_files']['force_copy'] ) && $manifest['copy_files']['force_copy'] != "" ){
+            $zip_force_copy     = $manifest['copy_files']['force_copy'];
+        }
+        if( isset( $manifest['version'] ) ){
+            $version    = $manifest['version'];
+        }
+        if( !is_writable( "config.php" ) ){
+            return $mod_strings['ERR_UW_CONFIG'];
+        }
 
-		$_SESSION['unzip_dir'] = clean_path($unzip_dir);
-		$_SESSION['zip_from_dir'] = clean_path($zip_from_dir);
-		logThis('unzip done.');
-	} else {
-		$unzip_dir = $_SESSION['unzip_dir'];
-		$zip_from_dir = $_SESSION['zip_from_dir'];
-	}
+        $_SESSION['unzip_dir'] = clean_path($unzip_dir);
+        $_SESSION['zip_from_dir'] = clean_path($zip_from_dir);
+        logThis('unzip done.');
+    } else {
+        $unzip_dir = $_SESSION['unzip_dir'];
+        $zip_from_dir = $_SESSION['zip_from_dir'];
+    }
 
     //check if $_SESSION['unzip_dir'] and $_SESSION['zip_from_dir'] exist
-	if(!isset($_SESSION['unzip_dir']) || !file_exists($_SESSION['unzip_dir'])
-		|| !isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !file_exists($_SESSION['install_file'])){
-		    //redirect to start
-	    unlinkUWTempFiles();
-		resetUwSession();
-		echo 'Upload File not found so redirecting to Upgrade Start ';
-		$redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
-		echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
+    if(!isset($_SESSION['unzip_dir']) || !file_exists($_SESSION['unzip_dir'])
+        || !isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !file_exists($_SESSION['install_file'])){
+            //redirect to start
+        unlinkUWTempFiles();
+        resetUwSession();
+        echo 'Upload File not found so redirecting to Upgrade Start ';
+        $redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
+        echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
 $upgrade_directories_not_found =<<<eoq
 	<table cellpadding="3" cellspacing="0" border="0">
 		<tr>
@@ -1582,77 +1582,77 @@ 
 	</table>
 eoq;
 $uwMain = $upgrade_directories_not_found;
-				return '';
-	}
+                return '';
+    }
 
     logThis ('is SugarConfig there '.file_exists(clean_path($unzip_dir.'/'.$zip_from_dir."/include/SugarObjects/SugarConfig.php")));
-	if(file_exists(clean_path($unzip_dir.'/'.$zip_from_dir."/include/SugarObjects/SugarConfig.php"))) {
-		$file = clean_path($unzip_dir.'/'.$zip_from_dir."/include/SugarObjects/SugarConfig.php");
-		$destFile = str_replace(clean_path($unzip_dir.'/'.$zip_from_dir), $cwd, $file);
-		if(!is_dir(dirname($destFile))) {
-			mkdir_recursive(dirname($destFile)); // make sure the directory exists
-		}
+    if(file_exists(clean_path($unzip_dir.'/'.$zip_from_dir."/include/SugarObjects/SugarConfig.php"))) {
+        $file = clean_path($unzip_dir.'/'.$zip_from_dir."/include/SugarObjects/SugarConfig.php");
+        $destFile = str_replace(clean_path($unzip_dir.'/'.$zip_from_dir), $cwd, $file);
+        if(!is_dir(dirname($destFile))) {
+            mkdir_recursive(dirname($destFile)); // make sure the directory exists
+        }
         copy($file,$destFile);
         //also copy include utils array utils
         $file = clean_path($unzip_dir.'/'.$zip_from_dir."/include/utils/array_utils.php");
-		$destFile = str_replace(clean_path($unzip_dir.'/'.$zip_from_dir), $cwd, $file);
-		if(!is_dir(dirname($destFile))) {
-			mkdir_recursive(dirname($destFile)); // make sure the directory exists
-		}
+        $destFile = str_replace(clean_path($unzip_dir.'/'.$zip_from_dir), $cwd, $file);
+        if(!is_dir(dirname($destFile))) {
+            mkdir_recursive(dirname($destFile)); // make sure the directory exists
+        }
         copy($file,$destFile);
-	}
+    }
 }
 
 
 function preflightCheck() {
-	require_once('modules/UpgradeWizard/uw_files.php');
+    require_once('modules/UpgradeWizard/uw_files.php');
 
-	global $sugar_config;
-	global $mod_strings;
-	global $sugar_version;
+    global $sugar_config;
+    global $mod_strings;
+    global $sugar_version;
 
     if (empty($sugar_version))
     {
         require('sugar_version.php');
     }
 
-	unset($_SESSION['rebuild_relationships']);
-	unset($_SESSION['rebuild_extensions']);
-
-	// don't bother if are rechecking
-	$manualDiff			= array();
-	if(!isset($_SESSION['unzip_dir']) || empty($_SESSION['unzip_dir'])) {
-		logThis('unzipping files in upgrade archive...');
-		$errors					= array();
-		list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
-		$unzip_dir = '';
-		//Following is if User logged out unexpectedly and then logged into UpgradeWizard again.
-		//also come up with mechanism to read from upgrade-progress file.
-		if(!isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !is_file($_SESSION['install_file'])) {
-			if (file_exists($base_tmp_upgrade_dir) && $handle = opendir($base_tmp_upgrade_dir)) {
-		    	while (false !== ($file = readdir($handle))) {
-		    		if($file !="." && $file !="..")	{
-					 if(is_file($base_tmp_upgrade_dir."/".$file."/manifest.php")){
-					 	require_once($base_tmp_upgrade_dir."/".$file."/manifest.php");
-					 	$package_name= $manifest['copy_files']['from_dir'];
-					 	if(file_exists($base_tmp_upgrade_dir."/".$file."/".$package_name) && file_exists($base_tmp_upgrade_dir."/".$file."/scripts") && file_exists($base_tmp_upgrade_dir."/".$file."/manifest.php")){
-					 		$unzip_dir = $base_tmp_upgrade_dir."/".$file;
-					 		if(file_exists("$base_upgrade_dir/patch/".$package_name.'.zip')){
-					 			$_SESSION['install_file'] = $package_name.".zip";
-					 			break;
-					 		}
-						}
-					  }
-		    		}
-		    	}
-			}
-		}
+    unset($_SESSION['rebuild_relationships']);
+    unset($_SESSION['rebuild_extensions']);
+
+    // don't bother if are rechecking
+    $manualDiff			= array();
+    if(!isset($_SESSION['unzip_dir']) || empty($_SESSION['unzip_dir'])) {
+        logThis('unzipping files in upgrade archive...');
+        $errors					= array();
+        list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
+        $unzip_dir = '';
+        //Following is if User logged out unexpectedly and then logged into UpgradeWizard again.
+        //also come up with mechanism to read from upgrade-progress file.
+        if(!isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !is_file($_SESSION['install_file'])) {
+            if (file_exists($base_tmp_upgrade_dir) && $handle = opendir($base_tmp_upgrade_dir)) {
+                while (false !== ($file = readdir($handle))) {
+                    if($file !="." && $file !="..")	{
+                        if(is_file($base_tmp_upgrade_dir."/".$file."/manifest.php")){
+                            require_once($base_tmp_upgrade_dir."/".$file."/manifest.php");
+                            $package_name= $manifest['copy_files']['from_dir'];
+                            if(file_exists($base_tmp_upgrade_dir."/".$file."/".$package_name) && file_exists($base_tmp_upgrade_dir."/".$file."/scripts") && file_exists($base_tmp_upgrade_dir."/".$file."/manifest.php")){
+                                $unzip_dir = $base_tmp_upgrade_dir."/".$file;
+                                if(file_exists("$base_upgrade_dir/patch/".$package_name.'.zip')){
+                                    $_SESSION['install_file'] = $package_name.".zip";
+                                    break;
+                                }
+                        }
+                        }
+                    }
+                }
+            }
+        }
         if(empty($_SESSION['install_file'])){
-        	unlinkUWTempFiles();
-        	resetUwSession();
-        	echo 'Upload File not found so redirecting to Upgrade Start ';
-        	$redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
-        	echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
+            unlinkUWTempFiles();
+            resetUwSession();
+            echo 'Upload File not found so redirecting to Upgrade Start ';
+            $redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
+            echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
 $upgrade_directories_not_found =<<<eoq
 	<table cellpadding="3" cellspacing="0" border="0">
 		<tr>
@@ -1663,67 +1663,67 @@ 
 	</table>
 eoq;
 $uwMain = $upgrade_directories_not_found;
-				return '';
+                return '';
 
         }
-		$install_file			= "$base_upgrade_dir/patch/".basename(urldecode( $_SESSION['install_file'] ));
-		$show_files				= true;
-		if(empty($unzip_dir)){
-			$unzip_dir				= mk_temp_dir( $base_tmp_upgrade_dir );
-		}
-		$zip_from_dir			= ".";
-		$zip_to_dir				= ".";
-		$zip_force_copy			= array();
+        $install_file			= "$base_upgrade_dir/patch/".basename(urldecode( $_SESSION['install_file'] ));
+        $show_files				= true;
+        if(empty($unzip_dir)){
+            $unzip_dir				= mk_temp_dir( $base_tmp_upgrade_dir );
+        }
+        $zip_from_dir			= ".";
+        $zip_to_dir				= ".";
+        $zip_force_copy			= array();
 
-		if(!$unzip_dir){
-			logThis('Could not create a temporary directory using mk_temp_dir( $base_tmp_upgrade_dir )');
-			die($mod_strings['ERR_UW_NO_CREATE_TMP_DIR']);
-		}
+        if(!$unzip_dir){
+            logThis('Could not create a temporary directory using mk_temp_dir( $base_tmp_upgrade_dir )');
+            die($mod_strings['ERR_UW_NO_CREATE_TMP_DIR']);
+        }
 
-		//double check whether unzipped .
-		if(file_exists($unzip_dir ."/scripts") && file_exists($unzip_dir."/manifest.php")){
-        	//already unzipped
-		}
-		else{
-			unzip( $install_file, $unzip_dir );
-		}
+        //double check whether unzipped .
+        if(file_exists($unzip_dir ."/scripts") && file_exists($unzip_dir."/manifest.php")){
+            //already unzipped
+        }
+        else{
+            unzip( $install_file, $unzip_dir );
+        }
 
-		// assumption -- already validated manifest.php at time of upload
-		require_once( "$unzip_dir/manifest.php" );
+        // assumption -- already validated manifest.php at time of upload
+        require_once( "$unzip_dir/manifest.php" );
 
-		if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
-		    $zip_from_dir   = $manifest['copy_files']['from_dir'];
-		}
-		if( isset( $manifest['copy_files']['to_dir'] ) && $manifest['copy_files']['to_dir'] != "" ){
-		    $zip_to_dir     = $manifest['copy_files']['to_dir'];
-		}
-		if( isset( $manifest['copy_files']['force_copy'] ) && $manifest['copy_files']['force_copy'] != "" ){
-		    $zip_force_copy     = $manifest['copy_files']['force_copy'];
-		}
-		if( isset( $manifest['version'] ) ){
-		    $version    = $manifest['version'];
-		}
-		if( !is_writable( "config.php" ) ){
-			return $mod_strings['ERR_UW_CONFIG'];
-		}
+        if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
+            $zip_from_dir   = $manifest['copy_files']['from_dir'];
+        }
+        if( isset( $manifest['copy_files']['to_dir'] ) && $manifest['copy_files']['to_dir'] != "" ){
+            $zip_to_dir     = $manifest['copy_files']['to_dir'];
+        }
+        if( isset( $manifest['copy_files']['force_copy'] ) && $manifest['copy_files']['force_copy'] != "" ){
+            $zip_force_copy     = $manifest['copy_files']['force_copy'];
+        }
+        if( isset( $manifest['version'] ) ){
+            $version    = $manifest['version'];
+        }
+        if( !is_writable( "config.php" ) ){
+            return $mod_strings['ERR_UW_CONFIG'];
+        }
 
-		$_SESSION['unzip_dir'] = clean_path($unzip_dir);
-		$_SESSION['zip_from_dir'] = clean_path($zip_from_dir);
+        $_SESSION['unzip_dir'] = clean_path($unzip_dir);
+        $_SESSION['zip_from_dir'] = clean_path($zip_from_dir);
 
-	 //logThis('unzip done.');
-	} else {
-		$unzip_dir = $_SESSION['unzip_dir'];
-		$zip_from_dir = $_SESSION['zip_from_dir'];
-	}
-	//check if $_SESSION['unzip_dir'] and $_SESSION['zip_from_dir'] exist
-	if(!isset($_SESSION['unzip_dir']) || !file_exists($_SESSION['unzip_dir'])
-		|| !isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !file_exists($_SESSION['install_file'])){
-		    //redirect to start
-	    unlinkUWTempFiles();
-		resetUwSession();
-		echo 'Upload File not found so redirecting to Upgrade Start ';
-		$redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
-		echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
+        //logThis('unzip done.');
+    } else {
+        $unzip_dir = $_SESSION['unzip_dir'];
+        $zip_from_dir = $_SESSION['zip_from_dir'];
+    }
+    //check if $_SESSION['unzip_dir'] and $_SESSION['zip_from_dir'] exist
+    if(!isset($_SESSION['unzip_dir']) || !file_exists($_SESSION['unzip_dir'])
+        || !isset($_SESSION['install_file']) || empty($_SESSION['install_file']) || !file_exists($_SESSION['install_file'])){
+            //redirect to start
+        unlinkUWTempFiles();
+        resetUwSession();
+        echo 'Upload File not found so redirecting to Upgrade Start ';
+        $redirect_new_wizard = $sugar_config['site_url' ].'/index.php?module=UpgradeWizard&action=index';
+        echo '<form name="redirect" action="' .$redirect_new_wizard. '"  method="POST">';
 $upgrade_directories_not_found =<<<eoq
 	<table cellpadding="3" cellspacing="0" border="0">
 		<tr>
@@ -1734,208 +1734,208 @@ 
 	</table>
 eoq;
 $uwMain = $upgrade_directories_not_found;
-				return '';
-	}
-	//copy minimum required files
-	fileCopy('include/utils/sugar_file_utils.php');
+                return '';
+    }
+    //copy minimum required files
+    fileCopy('include/utils/sugar_file_utils.php');
 
-	$upgradeFiles = findAllFiles(clean_path("$unzip_dir/$zip_from_dir"), array());
-	$cache_html_files= array();
+    $upgradeFiles = findAllFiles(clean_path("$unzip_dir/$zip_from_dir"), array());
+    $cache_html_files= array();
 
-	// get md5 sums
-	$md5_string = array();
-	if(file_exists(clean_path(getcwd().'/files.md5'))){
-		require(clean_path(getcwd().'/files.md5'));
-	}
+    // get md5 sums
+    $md5_string = array();
+    if(file_exists(clean_path(getcwd().'/files.md5'))){
+        require(clean_path(getcwd().'/files.md5'));
+    }
 
-	// file preflight checks
-	logThis('verifying md5 checksums for files...');
-	foreach($upgradeFiles as $file) {
-		if(in_array(str_replace(clean_path("$unzip_dir/$zip_from_dir") . "/", '', $file), $uw_files))
-			continue; // skip already loaded files
+    // file preflight checks
+    logThis('verifying md5 checksums for files...');
+    foreach($upgradeFiles as $file) {
+        if(in_array(str_replace(clean_path("$unzip_dir/$zip_from_dir") . "/", '', $file), $uw_files))
+            continue; // skip already loaded files
 
-		if(strpos($file, '.md5'))
-			continue; // skip md5 file
+        if(strpos($file, '.md5'))
+            continue; // skip md5 file
 
-		// normalize file paths
-		$file = clean_path($file);
+        // normalize file paths
+        $file = clean_path($file);
 
-		// check that we can move/delete the upgraded file
-		if(!is_writable($file)) {
-			$errors[] = $mod_strings['ERR_UW_FILE_NOT_WRITABLE'].": ".$file;
-		}
-		// check that destination files are writable
-		$destFile = getcwd().str_replace(clean_path($unzip_dir.'/'.$zip_from_dir), '', $file);
+        // check that we can move/delete the upgraded file
+        if(!is_writable($file)) {
+            $errors[] = $mod_strings['ERR_UW_FILE_NOT_WRITABLE'].": ".$file;
+        }
+        // check that destination files are writable
+        $destFile = getcwd().str_replace(clean_path($unzip_dir.'/'.$zip_from_dir), '', $file);
 
-		if(is_file($destFile)) { // of course it needs to exist first...
-			if(!is_writable($destFile)) {
-				$errors[] = $mod_strings['ERR_UW_FILE_NOT_WRITABLE'].": ".$destFile;
-			}
-		}
+        if(is_file($destFile)) { // of course it needs to exist first...
+            if(!is_writable($destFile)) {
+                $errors[] = $mod_strings['ERR_UW_FILE_NOT_WRITABLE'].": ".$destFile;
+            }
+        }
 
-		///////////////////////////////////////////////////////////////////////
-		////	DIFFS
-		// compare md5s and build up a manual merge list
-		$targetFile = clean_path(".".str_replace(getcwd(),'',$destFile));
-		$targetMd5 = '0';
-		if(is_file($destFile)) {
-			if(strpos($targetFile, '.php')) {
-				// handle PHP files that were hit with the security regex
-				$fp = '';
-				if(function_exists('sugar_fopen')){
-					$fp = sugar_fopen($destFile, 'r');
-				}
-				else{
-					$fp = fopen($destFile, 'r');
-				}
-				$filesize = filesize($destFile);
-				if($filesize > 0) {
-					$fileContents = stream_get_contents($fp);
-					$targetMd5 = md5($fileContents);
-				}
-			} else {
-				$targetMd5 = md5_file($destFile);
-			}
-		}
+        ///////////////////////////////////////////////////////////////////////
+        ////	DIFFS
+        // compare md5s and build up a manual merge list
+        $targetFile = clean_path(".".str_replace(getcwd(),'',$destFile));
+        $targetMd5 = '0';
+        if(is_file($destFile)) {
+            if(strpos($targetFile, '.php')) {
+                // handle PHP files that were hit with the security regex
+                $fp = '';
+                if(function_exists('sugar_fopen')){
+                    $fp = sugar_fopen($destFile, 'r');
+                }
+                else{
+                    $fp = fopen($destFile, 'r');
+                }
+                $filesize = filesize($destFile);
+                if($filesize > 0) {
+                    $fileContents = stream_get_contents($fp);
+                    $targetMd5 = md5($fileContents);
+                }
+            } else {
+                $targetMd5 = md5_file($destFile);
+            }
+        }
 
-		if(isset($md5_string[$targetFile]) && $md5_string[$targetFile] != $targetMd5) {
-			logThis('found a file with a differing md5: ['.$targetFile.']');
-			$manualDiff[] = $destFile;
-		}
-		////	END DIFFS
-		///////////////////////////////////////////////////////////////////////
-	}
-	logThis('md5 verification done.');
-	$errors['manual'] = $manualDiff;
+        if(isset($md5_string[$targetFile]) && $md5_string[$targetFile] != $targetMd5) {
+            logThis('found a file with a differing md5: ['.$targetFile.']');
+            $manualDiff[] = $destFile;
+        }
+        ////	END DIFFS
+        ///////////////////////////////////////////////////////////////////////
+    }
+    logThis('md5 verification done.');
+    $errors['manual'] = $manualDiff;
 
-	return $errors;
+    return $errors;
 }
 
 function fileCopy($file_path){
-	if(file_exists(clean_path($_SESSION['unzip_dir'].'/'.$_SESSION['zip_from_dir'].'/'.$file_path))) {
-		$file = clean_path($_SESSION['unzip_dir'].'/'.$_SESSION['zip_from_dir'].'/'.$file_path);
-		$destFile = str_replace(clean_path($_SESSION['unzip_dir'].'/'.$_SESSION['zip_from_dir']),  clean_path(getcwd()), $file);
-	if(!is_dir(dirname($destFile))) {
-		mkdir_recursive(dirname($destFile)); // make sure the directory exists
-		}
-		copy_recursive($file,$destFile);
-	}
+    if(file_exists(clean_path($_SESSION['unzip_dir'].'/'.$_SESSION['zip_from_dir'].'/'.$file_path))) {
+        $file = clean_path($_SESSION['unzip_dir'].'/'.$_SESSION['zip_from_dir'].'/'.$file_path);
+        $destFile = str_replace(clean_path($_SESSION['unzip_dir'].'/'.$_SESSION['zip_from_dir']),  clean_path(getcwd()), $file);
+    if(!is_dir(dirname($destFile))) {
+        mkdir_recursive(dirname($destFile)); // make sure the directory exists
+        }
+        copy_recursive($file,$destFile);
+    }
 }
 function getChecklist($steps, $step) {
-	global $mod_strings;
-
-	$skip = array('start', 'cancel', 'uninstall','end');
-	$j=0;
-	$i=1;
-	$ret  = '<table cellpadding="3" cellspacing="4" border="0">';
-	$ret .= '<tr><th colspan="3" align="left">'.$mod_strings['LBL_UW_CHECKLIST'].':</th></tr>';
-	foreach($steps['desc'] as $k => $desc) {
-		if(in_array($steps['files'][$j], $skip)) {
-			$j++;
-			continue;
-		}
+    global $mod_strings;
 
-		//$status = "<span class='error'>{$mod_strings['LBL_UW_INCOMPLETE']}</span>";
-		$desc_mod_pre = '';
-		$desc_mod_post = '';
-		/*
+    $skip = array('start', 'cancel', 'uninstall','end');
+    $j=0;
+    $i=1;
+    $ret  = '<table cellpadding="3" cellspacing="4" border="0">';
+    $ret .= '<tr><th colspan="3" align="left">'.$mod_strings['LBL_UW_CHECKLIST'].':</th></tr>';
+    foreach($steps['desc'] as $k => $desc) {
+        if(in_array($steps['files'][$j], $skip)) {
+            $j++;
+            continue;
+        }
+
+        //$status = "<span class='error'>{$mod_strings['LBL_UW_INCOMPLETE']}</span>";
+        $desc_mod_pre = '';
+        $desc_mod_post = '';
+        /*
 		if(isset($_SESSION['step'][$steps['files'][$k]]) && $_SESSION['step'][$steps['files'][$k]] == 'success') {
 			//$status = $mod_strings['LBL_UW_COMPLETE'];
 		}
 		*/
 
-		if($k == $_REQUEST['step']) {
-			//$status = $mod_strings['LBL_UW_IN_PROGRESS'];
-			$desc_mod_pre = "<font color=blue><i>";
-			$desc_mod_post = "</i></font>";
-		}
+        if($k == $_REQUEST['step']) {
+            //$status = $mod_strings['LBL_UW_IN_PROGRESS'];
+            $desc_mod_pre = "<font color=blue><i>";
+            $desc_mod_post = "</i></font>";
+        }
 
-		$ret .= "<tr><td>&nbsp;</td><td><b>{$i}: {$desc_mod_pre}{$desc}{$desc_mod_post}</b></td>";
-		$ret .= "<td id={$steps['files'][$j]}><i></i></td></tr>";
-		$i++;
-		$j++;
-	}
-	$ret .= "</table>";
-	return $ret;
+        $ret .= "<tr><td>&nbsp;</td><td><b>{$i}: {$desc_mod_pre}{$desc}{$desc_mod_post}</b></td>";
+        $ret .= "<td id={$steps['files'][$j]}><i></i></td></tr>";
+        $i++;
+        $j++;
+    }
+    $ret .= "</table>";
+    return $ret;
 }
 
 function prepSystemForUpgrade() {
-	global $sugar_config;
-	global $sugar_flavor;
-	global $mod_strings;
+    global $sugar_config;
+    global $sugar_flavor;
+    global $mod_strings;
     global $current_language;
-	global $subdirs;
-	global $base_upgrade_dir;
-	global $base_tmp_upgrade_dir;
+    global $subdirs;
+    global $base_upgrade_dir;
+    global $base_tmp_upgrade_dir;
     list($p_base_upgrade_dir, $p_base_tmp_upgrade_dir) = getUWDirs();
-	///////////////////////////////////////////////////////////////////////////////
-	////	Make sure variables exist
-	if(empty($base_upgrade_dir)){
-		$base_upgrade_dir       = $p_base_upgrade_dir;
-	}
-	if(empty($base_tmp_upgrade_dir)){
-		$base_tmp_upgrade_dir   = $p_base_tmp_upgrade_dir;
-	}
-	sugar_mkdir($base_tmp_upgrade_dir, 0775, true);
-	if(!isset($subdirs) || empty($subdirs)){
-		$subdirs = array('full', 'langpack', 'module', 'patch', 'theme');
-	}
+    ///////////////////////////////////////////////////////////////////////////////
+    ////	Make sure variables exist
+    if(empty($base_upgrade_dir)){
+        $base_upgrade_dir       = $p_base_upgrade_dir;
+    }
+    if(empty($base_tmp_upgrade_dir)){
+        $base_tmp_upgrade_dir   = $p_base_tmp_upgrade_dir;
+    }
+    sugar_mkdir($base_tmp_upgrade_dir, 0775, true);
+    if(!isset($subdirs) || empty($subdirs)){
+        $subdirs = array('full', 'langpack', 'module', 'patch', 'theme');
+    }
 
     $upgrade_progress_dir = $base_tmp_upgrade_dir;
     $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
     if(file_exists($upgrade_progress_file)){
-    	if(function_exists('get_upgrade_progress') && function_exists('didThisStepRunBefore')){
-    		if(didThisStepRunBefore('end')){
-    			include($upgrade_progress_file);
-    			unset($upgrade_config);
-    			unlink($upgrade_progress_file);
-    		}
-    	}
+        if(function_exists('get_upgrade_progress') && function_exists('didThisStepRunBefore')){
+            if(didThisStepRunBefore('end')){
+                include($upgrade_progress_file);
+                unset($upgrade_config);
+                unlink($upgrade_progress_file);
+            }
+        }
     }
 
     // increase the cuttoff time to 1 hour
-	ini_set("max_execution_time", "3600");
+    ini_set("max_execution_time", "3600");
 
     // make sure dirs exist
-	if($subdirs != null){
-		foreach($subdirs as $subdir) {
-		    sugar_mkdir("$base_upgrade_dir/$subdir", 0775, true);
-		}
-	}
-	// array of special scripts that are executed during (un)installation-- key is type of script, value is filename
-	if(!defined('SUGARCRM_PRE_INSTALL_FILE')) {
-		define('SUGARCRM_PRE_INSTALL_FILE', 'scripts/pre_install.php');
-		define('SUGARCRM_POST_INSTALL_FILE', 'scripts/post_install.php');
-		define('SUGARCRM_PRE_UNINSTALL_FILE', 'scripts/pre_uninstall.php');
-		define('SUGARCRM_POST_UNINSTALL_FILE', 'scripts/post_uninstall.php');
-	}
+    if($subdirs != null){
+        foreach($subdirs as $subdir) {
+            sugar_mkdir("$base_upgrade_dir/$subdir", 0775, true);
+        }
+    }
+    // array of special scripts that are executed during (un)installation-- key is type of script, value is filename
+    if(!defined('SUGARCRM_PRE_INSTALL_FILE')) {
+        define('SUGARCRM_PRE_INSTALL_FILE', 'scripts/pre_install.php');
+        define('SUGARCRM_POST_INSTALL_FILE', 'scripts/post_install.php');
+        define('SUGARCRM_PRE_UNINSTALL_FILE', 'scripts/pre_uninstall.php');
+        define('SUGARCRM_POST_UNINSTALL_FILE', 'scripts/post_uninstall.php');
+    }
 
-	$script_files = array(
-		"pre-install" => constant('SUGARCRM_PRE_INSTALL_FILE'),
-		"post-install" => constant('SUGARCRM_POST_INSTALL_FILE'),
-		"pre-uninstall" => constant('SUGARCRM_PRE_UNINSTALL_FILE'),
-		"post-uninstall" => constant('SUGARCRM_POST_UNINSTALL_FILE'),
-	);
+    $script_files = array(
+        "pre-install" => constant('SUGARCRM_PRE_INSTALL_FILE'),
+        "post-install" => constant('SUGARCRM_POST_INSTALL_FILE'),
+        "pre-uninstall" => constant('SUGARCRM_PRE_UNINSTALL_FILE'),
+        "post-uninstall" => constant('SUGARCRM_POST_UNINSTALL_FILE'),
+    );
 
-	// check that the upload limit is set to 6M or greater
-	define('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES', 6 * 1024 * 1024);  // 6 Megabytes
-	$upload_max_filesize = ini_get('upload_max_filesize');
-	$upload_max_filesize_bytes = return_bytes($upload_max_filesize);
+    // check that the upload limit is set to 6M or greater
+    define('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES', 6 * 1024 * 1024);  // 6 Megabytes
+    $upload_max_filesize = ini_get('upload_max_filesize');
+    $upload_max_filesize_bytes = return_bytes($upload_max_filesize);
 
-	if($upload_max_filesize_bytes < constant('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES')) {
-		$GLOBALS['log']->debug("detected upload_max_filesize: $upload_max_filesize");
+    if($upload_max_filesize_bytes < constant('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES')) {
+        $GLOBALS['log']->debug("detected upload_max_filesize: $upload_max_filesize");
         $admin_strings = return_module_language($current_language, 'Administration');
-		echo '<p class="error">'.$admin_strings['MSG_INCREASE_UPLOAD_MAX_FILESIZE'].' '.get_cfg_var('cfg_file_path')."</p>\n";
-	}
+        echo '<p class="error">'.$admin_strings['MSG_INCREASE_UPLOAD_MAX_FILESIZE'].' '.get_cfg_var('cfg_file_path')."</p>\n";
+    }
 }
 
 if ( !function_exists('extractFile') ) {
 function extractFile($zip_file, $file_in_zip) {
     global $base_tmp_upgrade_dir;
 
-	// strip cwd
-	$absolute_base_tmp_upgrade_dir = clean_path($base_tmp_upgrade_dir);
-	$relative_base_tmp_upgrade_dir = clean_path(str_replace(clean_path(getcwd()), '', $absolute_base_tmp_upgrade_dir));
+    // strip cwd
+    $absolute_base_tmp_upgrade_dir = clean_path($base_tmp_upgrade_dir);
+    $relative_base_tmp_upgrade_dir = clean_path(str_replace(clean_path(getcwd()), '', $absolute_base_tmp_upgrade_dir));
 
     // mk_temp_dir expects relative pathing
     $my_zip_dir = mk_temp_dir($relative_base_tmp_upgrade_dir);
@@ -1948,7 +1948,7 @@ 
 
 if ( !function_exists('extractManifest') ) {
 function extractManifest($zip_file) {
-	logThis('extracting manifest.');
+    logThis('extracting manifest.');
     return(extractFile($zip_file, "manifest.php"));
 }
 }
@@ -1957,7 +1957,7 @@ 
 function getInstallType($type_string) {
     // detect file type
     global $subdirs;
-	$subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
+    $subdirs = array('full', 'langpack', 'module', 'patch', 'theme', 'temp');
     foreach($subdirs as $subdir) {
         if(preg_match("#/$subdir/#", $type_string)) {
             return($subdir);
@@ -2030,15 +2030,15 @@ 
  * @return string Error message, blank on success
  */
 function validate_manifest($manifest) {
-	logThis('validating manifest.php file');
+    logThis('validating manifest.php file');
     // takes a manifest.php manifest array and validates contents
     global $subdirs;
     global $sugar_version;
-	global $sugar_config;
+    global $sugar_config;
     global $sugar_flavor;
-	global $mod_strings;
+    global $mod_strings;
 
-	include_once('suitecrm_version.php');
+    include_once('suitecrm_version.php');
 
     if(!isset($manifest['type'])) {
         return $mod_strings['ERROR_MANIFEST_TYPE'];
@@ -2047,95 +2047,95 @@ 
     $type = $manifest['type'];
 
     if(getInstallType("/$type/") == "") {
-		return $mod_strings['ERROR_PACKAGE_TYPE']. ": '" . $type . "'.";
-    }
-
-	if(isset($manifest['acceptable_php_versions'])) {
-		$version_ok = false;
-		$matches_empty = true;
-		if(isset($manifest['acceptable_php_versions']['exact_matches'])) {
-			$matches_empty = false;
-			foreach($manifest['acceptable_php_versions']['exact_matches'] as $match) {
-				if($match == PHP_VERSION) {
-					$version_ok = true;
-				}
-			}
-		}
-		if(!$version_ok && isset($manifest['acceptable_php_versions']['regex_matches'])) {
-			$matches_empty = false;
-			foreach($manifest['acceptable_php_versions']['regex_matches'] as $match) {
-				if(preg_match("/$match/", PHP_VERSION)) {
-					$version_ok = true;
-				}
-			}
-		}
+        return $mod_strings['ERROR_PACKAGE_TYPE']. ": '" . $type . "'.";
+    }
 
-		if(!$matches_empty && !$version_ok) {
-			return $mod_strings['ERROR_PHP_VERSION_INCOMPATIBLE']."<br />".
-			$mod_strings['ERR_UW_PHP_VERSION'].PHP_VERSION;
-		}
-	}
+    if(isset($manifest['acceptable_php_versions'])) {
+        $version_ok = false;
+        $matches_empty = true;
+        if(isset($manifest['acceptable_php_versions']['exact_matches'])) {
+            $matches_empty = false;
+            foreach($manifest['acceptable_php_versions']['exact_matches'] as $match) {
+                if($match == PHP_VERSION) {
+                    $version_ok = true;
+                }
+            }
+        }
+        if(!$version_ok && isset($manifest['acceptable_php_versions']['regex_matches'])) {
+            $matches_empty = false;
+            foreach($manifest['acceptable_php_versions']['regex_matches'] as $match) {
+                if(preg_match("/$match/", PHP_VERSION)) {
+                    $version_ok = true;
+                }
+            }
+        }
 
+        if(!$matches_empty && !$version_ok) {
+            return $mod_strings['ERROR_PHP_VERSION_INCOMPATIBLE']."<br />".
+            $mod_strings['ERR_UW_PHP_VERSION'].PHP_VERSION;
+        }
+    }
 
-	if(!isset($manifest['acceptable_suitecrm_versions'])) {
-		// If sugarcrm version set 'acceptable_sugar_versions', and acceptable_suitecrm_versions not set check on sugar version.
-		if (isset($manifest['acceptable_sugar_versions'])) {
-			$version_ok = false;
-			$matches_empty = true;
-			if (isset($manifest['acceptable_sugar_versions']['exact_matches'])) {
-				$matches_empty = false;
-				foreach ($manifest['acceptable_sugar_versions']['exact_matches'] as $match) {
-					if ($match == $sugar_version) {
-						$version_ok = true;
-					}
-				}
-			}
-			if (!$version_ok && isset($manifest['acceptable_sugar_versions']['regex_matches'])) {
-				$matches_empty = false;
-				foreach ($manifest['acceptable_sugar_versions']['regex_matches'] as $match) {
-					if (preg_match("/$match/", $sugar_version)) {
-						$version_ok = true;
-					}
-				}
-			}
-
-			if (!$matches_empty && !$version_ok) {
-				return $mod_strings['ERROR_VERSION_INCOMPATIBLE'] . "<br />" .
-				$mod_strings['ERR_UW_VERSION'] . $sugar_version;
-			}
-		}
-		else {
-			// if neither set reject
-			return $mod_strings['ERROR_NO_VERSION_SET'];
-		}
-	}
-	else {
-		// If sugarcrm version set 'acceptable_sugar_versions', and acceptable_suitecrm_versions set check only on suitecrm version
-		// If sugarcrm version not set 'acceptable_sugar_versions', and acceptable_suitecrm_versions set check only on suitecrm version
-		$version_ok = false;
-		$matches_empty = true;
-		if (isset($manifest['acceptable_suitecrm_versions']['exact_matches'])) {
-			$matches_empty = false;
-			foreach ($manifest['acceptable_suitecrm_versions']['exact_matches'] as $match) {
-				if ($match == $suitecrm_version) {
-					$version_ok = true;
-				}
-			}
-		}
-		if (!$version_ok && isset($manifest['acceptable_suitecrm_versions']['regex_matches'])) {
-			$matches_empty = false;
-			foreach ($manifest['acceptable_suitecrm_versions']['regex_matches'] as $match) {
-				if (preg_match("/$match/", $suitecrm_version)) {
-					$version_ok = true;
-				}
-			}
-		}
 
-		if (!$matches_empty && !$version_ok) {
-			return $mod_strings['ERROR_SUITECRM_VERSION_INCOMPATIBLE'] . "<br />" .
-			$mod_strings['ERR_UW_SUITECRM_VERSION'] . $suitecrm_version;
-		}
-	}
+    if(!isset($manifest['acceptable_suitecrm_versions'])) {
+        // If sugarcrm version set 'acceptable_sugar_versions', and acceptable_suitecrm_versions not set check on sugar version.
+        if (isset($manifest['acceptable_sugar_versions'])) {
+            $version_ok = false;
+            $matches_empty = true;
+            if (isset($manifest['acceptable_sugar_versions']['exact_matches'])) {
+                $matches_empty = false;
+                foreach ($manifest['acceptable_sugar_versions']['exact_matches'] as $match) {
+                    if ($match == $sugar_version) {
+                        $version_ok = true;
+                    }
+                }
+            }
+            if (!$version_ok && isset($manifest['acceptable_sugar_versions']['regex_matches'])) {
+                $matches_empty = false;
+                foreach ($manifest['acceptable_sugar_versions']['regex_matches'] as $match) {
+                    if (preg_match("/$match/", $sugar_version)) {
+                        $version_ok = true;
+                    }
+                }
+            }
+
+            if (!$matches_empty && !$version_ok) {
+                return $mod_strings['ERROR_VERSION_INCOMPATIBLE'] . "<br />" .
+                $mod_strings['ERR_UW_VERSION'] . $sugar_version;
+            }
+        }
+        else {
+            // if neither set reject
+            return $mod_strings['ERROR_NO_VERSION_SET'];
+        }
+    }
+    else {
+        // If sugarcrm version set 'acceptable_sugar_versions', and acceptable_suitecrm_versions set check only on suitecrm version
+        // If sugarcrm version not set 'acceptable_sugar_versions', and acceptable_suitecrm_versions set check only on suitecrm version
+        $version_ok = false;
+        $matches_empty = true;
+        if (isset($manifest['acceptable_suitecrm_versions']['exact_matches'])) {
+            $matches_empty = false;
+            foreach ($manifest['acceptable_suitecrm_versions']['exact_matches'] as $match) {
+                if ($match == $suitecrm_version) {
+                    $version_ok = true;
+                }
+            }
+        }
+        if (!$version_ok && isset($manifest['acceptable_suitecrm_versions']['regex_matches'])) {
+            $matches_empty = false;
+            foreach ($manifest['acceptable_suitecrm_versions']['regex_matches'] as $match) {
+                if (preg_match("/$match/", $suitecrm_version)) {
+                    $version_ok = true;
+                }
+            }
+        }
+
+        if (!$matches_empty && !$version_ok) {
+            return $mod_strings['ERROR_SUITECRM_VERSION_INCOMPATIBLE'] . "<br />" .
+            $mod_strings['ERR_UW_SUITECRM_VERSION'] . $suitecrm_version;
+        }
+    }
 
     if(isset($manifest['acceptable_sugar_flavors']) && sizeof($manifest['acceptable_sugar_flavors']) > 0) {
         $flavor_ok = false;
@@ -2157,7 +2157,7 @@ 
 }
 
 function unlinkUploadFiles() {
-	return;
+    return;
 //	logThis('at unlinkUploadFiles()');
 //
 //	if(isset($_SESSION['install_file']) && !empty($_SESSION['install_file'])) {
@@ -2174,37 +2174,37 @@ 
  * deletes files created by unzipping a package
  */
 function unlinkUWTempFiles() {
-	global $sugar_config;
-	global $path;
+    global $sugar_config;
+    global $path;
 
-	logThis('at unlinkUWTempFiles()');
-	$tempDir='';
-	list($upgDir, $tempDir) = getUWDirs();
+    logThis('at unlinkUWTempFiles()');
+    $tempDir='';
+    list($upgDir, $tempDir) = getUWDirs();
 
     if(file_exists($tempDir) && is_dir($tempDir)){
-		$files = findAllFiles($tempDir, array(), false);
-		rsort($files);
-		foreach($files as $file) {
-			if(!is_dir($file)) {
-				//logThis('unlinking ['.$file.']', $path);
-				@unlink($file);
-			}
-		}
-		// now do dirs
-		$files = findAllFiles($tempDir, array(), true);
-		foreach($files as $dir) {
-			if(is_dir($dir)) {
-				//logThis('removing dir ['.$dir.']', $path);
-				@rmdir($dir);
-			}
-		}
-		$cacheFile = sugar_cached("modules/UpgradeWizard/_persistence.php");
-		if(is_file($cacheFile)) {
-			logThis("Unlinking Upgrade cache file: '_persistence.php'", $path);
-			@unlink($cacheFile);
-		}
-	}
-	logThis("finished!");
+        $files = findAllFiles($tempDir, array(), false);
+        rsort($files);
+        foreach($files as $file) {
+            if(!is_dir($file)) {
+                //logThis('unlinking ['.$file.']', $path);
+                @unlink($file);
+            }
+        }
+        // now do dirs
+        $files = findAllFiles($tempDir, array(), true);
+        foreach($files as $dir) {
+            if(is_dir($dir)) {
+                //logThis('removing dir ['.$dir.']', $path);
+                @rmdir($dir);
+            }
+        }
+        $cacheFile = sugar_cached("modules/UpgradeWizard/_persistence.php");
+        if(is_file($cacheFile)) {
+            logThis("Unlinking Upgrade cache file: '_persistence.php'", $path);
+            @unlink($cacheFile);
+        }
+    }
+    logThis("finished!");
 }
 
 /**
@@ -2215,44 +2215,44 @@ 
  * returned collection
  */
 function uwFindAllFiles($dir, $theArray, $includeDirs=false, $skipDirs=array(), $echo=false) {
-	// check skips
+    // check skips
     if (whetherNeedToSkipDir($dir, $skipDirs))
-	{
-	    return $theArray;
-	}
+    {
+        return $theArray;
+    }
 
     if (!is_dir($dir)) { return $theArray; }   // Bug # 46035, just checking for valid dir
-	$d = dir($dir);
+    $d = dir($dir);
     if ($d === false)  { return $theArray; }   // Bug # 46035, more checking
 
-	while($f = $d->read()) {
-	                                // bug 40793 Skip Directories array in upgradeWizard does not function correctly
-	    if($f == "." || $f == ".." || whetherNeedToSkipDir("$dir/$f", $skipDirs)) { // skip *nix self/parent
-	        continue;
-	    }
+    while($f = $d->read()) {
+                                    // bug 40793 Skip Directories array in upgradeWizard does not function correctly
+        if($f == "." || $f == ".." || whetherNeedToSkipDir("$dir/$f", $skipDirs)) { // skip *nix self/parent
+            continue;
+        }
 
-		// for AJAX length count
-    	if($echo) {
-	    	echo '.';
-	    	ob_flush();
-    	}
+        // for AJAX length count
+        if($echo) {
+            echo '.';
+            ob_flush();
+        }
 
-	    if(is_dir("$dir/$f")) {
-			if($includeDirs) { // add the directory if flagged
-				$theArray[] = clean_path("$dir/$f");
-			}
+        if(is_dir("$dir/$f")) {
+            if($includeDirs) { // add the directory if flagged
+                $theArray[] = clean_path("$dir/$f");
+            }
 
-			// recurse in
-	        $theArray = uwFindAllFiles("$dir/$f/", $theArray, $includeDirs, $skipDirs, $echo);
-	    } else {
-	        $theArray[] = clean_path("$dir/$f");
-	    }
+            // recurse in
+            $theArray = uwFindAllFiles("$dir/$f/", $theArray, $includeDirs, $skipDirs, $echo);
+        } else {
+            $theArray[] = clean_path("$dir/$f");
+        }
 
 
-	}
-	rsort($theArray);
-	$d->close();
-	return $theArray;
+    }
+    rsort($theArray);
+    $d->close();
+    return $theArray;
 }
 
 
@@ -2261,46 +2261,46 @@ 
  * unset's UW's Session Vars
  */
 function resetUwSession() {
-	logThis('resetting $_SESSION');
-
-	if(isset($_SESSION['committed']))
-		unset($_SESSION['committed']);
-	if(isset($_SESSION['sugar_version_file']))
-		unset($_SESSION['sugar_version_file']);
-	if(isset($_SESSION['upgrade_complete']))
-		unset($_SESSION['upgrade_complete']);
-	if(isset($_SESSION['allTables']))
-		unset($_SESSION['allTables']);
-	if(isset($_SESSION['alterCustomTableQueries']))
-		unset($_SESSION['alterCustomTableQueries']);
-	if(isset($_SESSION['skip_zip_upload']))
-		unset($_SESSION['skip_zip_upload']);
-	if(isset($_SESSION['install_file']))
-		unset($_SESSION['install_file']);
-	if(isset($_SESSION['unzip_dir']))
-		unset($_SESSION['unzip_dir']);
-	if(isset($_SESSION['zip_from_dir']))
-		unset($_SESSION['zip_from_dir']);
-	if(isset($_SESSION['overwrite_files']))
-		unset($_SESSION['overwrite_files']);
-	if(isset($_SESSION['schema_change']))
-		unset($_SESSION['schema_change']);
-	if(isset($_SESSION['uw_restore_dir']))
-		unset($_SESSION['uw_restore_dir']);
-	if(isset($_SESSION['step']))
-		unset($_SESSION['step']);
-	if(isset($_SESSION['files']))
-		unset($_SESSION['files']);
-	if(isset($_SESSION['Upgraded451Wizard'])){
-		unset($_SESSION['Upgraded451Wizard']);
-	}
-	if(isset($_SESSION['Initial_451to500_Step'])){
-		unset($_SESSION['Initial_451to500_Step']);
-	}
-	if(isset($_SESSION['license_shown']))
-		unset($_SESSION['license_shown']);
+    logThis('resetting $_SESSION');
+
+    if(isset($_SESSION['committed']))
+        unset($_SESSION['committed']);
+    if(isset($_SESSION['sugar_version_file']))
+        unset($_SESSION['sugar_version_file']);
+    if(isset($_SESSION['upgrade_complete']))
+        unset($_SESSION['upgrade_complete']);
+    if(isset($_SESSION['allTables']))
+        unset($_SESSION['allTables']);
+    if(isset($_SESSION['alterCustomTableQueries']))
+        unset($_SESSION['alterCustomTableQueries']);
+    if(isset($_SESSION['skip_zip_upload']))
+        unset($_SESSION['skip_zip_upload']);
+    if(isset($_SESSION['install_file']))
+        unset($_SESSION['install_file']);
+    if(isset($_SESSION['unzip_dir']))
+        unset($_SESSION['unzip_dir']);
+    if(isset($_SESSION['zip_from_dir']))
+        unset($_SESSION['zip_from_dir']);
+    if(isset($_SESSION['overwrite_files']))
+        unset($_SESSION['overwrite_files']);
+    if(isset($_SESSION['schema_change']))
+        unset($_SESSION['schema_change']);
+    if(isset($_SESSION['uw_restore_dir']))
+        unset($_SESSION['uw_restore_dir']);
+    if(isset($_SESSION['step']))
+        unset($_SESSION['step']);
+    if(isset($_SESSION['files']))
+        unset($_SESSION['files']);
+    if(isset($_SESSION['Upgraded451Wizard'])){
+        unset($_SESSION['Upgraded451Wizard']);
+    }
+    if(isset($_SESSION['Initial_451to500_Step'])){
+        unset($_SESSION['Initial_451to500_Step']);
+    }
+    if(isset($_SESSION['license_shown']))
+        unset($_SESSION['license_shown']);
     if(isset($_SESSION['sugarMergeRunResults']))
-		unset($_SESSION['sugarMergeRunResults']);
+        unset($_SESSION['sugarMergeRunResults']);
 }
 
 /**
@@ -2309,72 +2309,72 @@ 
  */
 function UWrebuild() {
 	
-	$GLOBALS['log']->deprecated('UWrebuild is deprecated');
+    $GLOBALS['log']->deprecated('UWrebuild is deprecated');
 }
 
 function getCustomTables() {
-	global $db;
+    global $db;
 
     return $db->tablesLike('%_cstm');
 }
 
 function alterCustomTables($customTables)
 {
-	return array();
+    return array();
 }
 
 function getAllTables() {
-	global $db;
+    global $db;
     return $db->getTablesArray();
 }
 
 function printAlterTableSql($tables)
 {
-	$alterTableSql = '';
+    $alterTableSql = '';
 
-	foreach($tables as $table)
-		$alterTableSql .= "ALTER TABLE " . $table . " CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;" . "\n";
+    foreach($tables as $table)
+        $alterTableSql .= "ALTER TABLE " . $table . " CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;" . "\n";
 
-	return $alterTableSql;
+    return $alterTableSql;
 }
 
 function executeConvertTablesSql($tables)
 {
-	global $db;
+    global $db;
 
-	foreach($tables as $table){
-		$query = "ALTER TABLE " . $table . " CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci";
-		if(!empty($table)){
-			logThis("Sending query: ".$query);
+    foreach($tables as $table){
+        $query = "ALTER TABLE " . $table . " CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci";
+        if(!empty($table)){
+            logThis("Sending query: ".$query);
             $db->query($query);//, true, "An error has occured while performing db query.  See log file for details.<br>");
-         }
-	}
-	return true;
+            }
+    }
+    return true;
 }
 
 function testThis() {
-	$files = uwFindAllFiles(getcwd().'/test', array());
+    $files = uwFindAllFiles(getcwd().'/test', array());
 
-	$out = "<table cellpadding='1' cellspacing='0' border='0'>\n";
+    $out = "<table cellpadding='1' cellspacing='0' border='0'>\n";
 
-	$priorPath = '';
-	foreach($files as $file) {
-		$relativeFile = clean_path(str_replace(getcwd().'/test', '', $file));
-		$relativeFile = ($relativeFile{0} == '/') ? substr($relativeFile, 1, strlen($relativeFile)) : $relativeFile;
+    $priorPath = '';
+    foreach($files as $file) {
+        $relativeFile = clean_path(str_replace(getcwd().'/test', '', $file));
+        $relativeFile = ($relativeFile{0} == '/') ? substr($relativeFile, 1, strlen($relativeFile)) : $relativeFile;
 
-		$relativePath = dirname($relativeFile);
+        $relativePath = dirname($relativeFile);
 
-		if($relativePath == $priorPath) { // same dir, new file
-			$out .= "<tr><td>".basename($relativeFile)."</td></tr>";
-			$priorPath = $relativePath;
-		} else { // new dir
+        if($relativePath == $priorPath) { // same dir, new file
+            $out .= "<tr><td>".basename($relativeFile)."</td></tr>";
+            $priorPath = $relativePath;
+        } else { // new dir
 
-		}
-	}
+        }
+    }
 
-	$out .= "</table>";
+    $out .= "</table>";
 
-	echo $out;
+    echo $out;
 }
 
 
@@ -2382,35 +2382,35 @@ 
 
 function testThis2($dir, $id=0, $hide=false) {
     global $mod_strings;
-	$path = $dir;
-	$dh = opendir($dir);
-	rewinddir($dh);
-
-	$doHide = ($hide) ? 'none' : '';
-	$out = "<div id='{$id}' style='display:{$doHide};'>";
-	$out .= "<table cellpadding='1' cellspacing='0' style='border:0px solid #ccc'>\n";
-
-	while($file = readdir($dh)) {
-		if($file == '.' || $file == '..' || $file == 'CVS' || $file == '.cvsignore')
-			continue;
-
-		if(is_dir($path.'/'.$file)) {
-			$file = $path.'/'.$file;
-			$newI = create_guid();
-			$out .= "<tr><td valign='top'><a href='javascript:toggleNwFiles(\"{$newI}\");'>".SugarThemeRegistry::current()->getImage("Workflow", "", null, null, ".gif", $mod_strings['LBL_WORKFLOW'])."</a></td>\n";
-			$out .= "<td valign='top'><b><a href='javascript:toggleNwFiles(\"{$newI}\");'>".basename($file)."</a></b></td></tr>";
-			$out .= "<tr><td></td><td valign='top'>".testThis2($file, $newI, true)."</td></tr>";
-		} else {
-			$out .= "<tr><td valign='top'>&nbsp;</td>\n";
-			$out .= "<td valign='top'>".basename($file)."</td></tr>";
-		}
-	}
+    $path = $dir;
+    $dh = opendir($dir);
+    rewinddir($dh);
+
+    $doHide = ($hide) ? 'none' : '';
+    $out = "<div id='{$id}' style='display:{$doHide};'>";
+    $out .= "<table cellpadding='1' cellspacing='0' style='border:0px solid #ccc'>\n";
+
+    while($file = readdir($dh)) {
+        if($file == '.' || $file == '..' || $file == 'CVS' || $file == '.cvsignore')
+            continue;
+
+        if(is_dir($path.'/'.$file)) {
+            $file = $path.'/'.$file;
+            $newI = create_guid();
+            $out .= "<tr><td valign='top'><a href='javascript:toggleNwFiles(\"{$newI}\");'>".SugarThemeRegistry::current()->getImage("Workflow", "", null, null, ".gif", $mod_strings['LBL_WORKFLOW'])."</a></td>\n";
+            $out .= "<td valign='top'><b><a href='javascript:toggleNwFiles(\"{$newI}\");'>".basename($file)."</a></b></td></tr>";
+            $out .= "<tr><td></td><td valign='top'>".testThis2($file, $newI, true)."</td></tr>";
+        } else {
+            $out .= "<tr><td valign='top'>&nbsp;</td>\n";
+            $out .= "<td valign='top'>".basename($file)."</td></tr>";
+        }
+    }
 
-	$out .= "</tr></table>";
-	$out .= "</div>";
+    $out .= "</tr></table>";
+    $out .= "</div>";
 
-	closedir($dh);
-	return $out;
+    closedir($dh);
+    return $out;
 }
 
 
@@ -2418,66 +2418,66 @@ 
 
 
 function testThis3(&$files, $id, $hide, $previousPath = '') {
-	if(!is_array($files) || empty($files))
-		return '';
+    if(!is_array($files) || empty($files))
+        return '';
 
-	$out = '';
+    $out = '';
 
     global $mod_strings;
-	// expecting full path here
-	foreach($files as $k => $file) {
-		$file = str_replace(getcwd(), '', $file);
-		$path = dirname($file);
-		$fileName = basename($file);
-
-		if($fileName == 'CVS' || $fileName == '.cvsignore')
-			continue;
-
-		if($path == $previousPath) { // same directory
-			// new row for each file
-			$out .= "<tr><td valign='top' align='left'>&nbsp;</td>";
-			$out .= "<td valign='top' align='left'>{$fileName}</td></tr>";
-		} else { // new directory
-			$newI = $k;
-			$out .= "<tr><td valign='top'><a href='javascript:toggleNwFiles(\"{$newI}\");'>".SugarThemeRegistry::current()->getImage("Workflow", "", null, null, ".gif", $mod_strings['LBL_WORKFLOW'])."</a></td>\n";
-			$out .= "<td valign='top'><b><a href='javascript:toggleNwFiles(\"{$newI}\");'>".$fileName."</a></b></td></tr>";
-			$recurse = testThis3($files, $newI, true, $previousPath);
-			$out .= "<tr><td></td><td valign='top'>".$recurse."</td></tr>";
-		}
+    // expecting full path here
+    foreach($files as $k => $file) {
+        $file = str_replace(getcwd(), '', $file);
+        $path = dirname($file);
+        $fileName = basename($file);
+
+        if($fileName == 'CVS' || $fileName == '.cvsignore')
+            continue;
+
+        if($path == $previousPath) { // same directory
+            // new row for each file
+            $out .= "<tr><td valign='top' align='left'>&nbsp;</td>";
+            $out .= "<td valign='top' align='left'>{$fileName}</td></tr>";
+        } else { // new directory
+            $newI = $k;
+            $out .= "<tr><td valign='top'><a href='javascript:toggleNwFiles(\"{$newI}\");'>".SugarThemeRegistry::current()->getImage("Workflow", "", null, null, ".gif", $mod_strings['LBL_WORKFLOW'])."</a></td>\n";
+            $out .= "<td valign='top'><b><a href='javascript:toggleNwFiles(\"{$newI}\");'>".$fileName."</a></b></td></tr>";
+            $recurse = testThis3($files, $newI, true, $previousPath);
+            $out .= "<tr><td></td><td valign='top'>".$recurse."</td></tr>";
+        }
 
-		$previousPath = $path;
-	}
-	$display = ($hide) ? 'none' : '';
-	$ret = <<<eoq
+        $previousPath = $path;
+    }
+    $display = ($hide) ? 'none' : '';
+    $ret = <<<eoq
 	<div id="{$id}" style="display:{$display}">
 	<table cellpadding='1' cellspacing='0' border='0' style='border:1px solid #ccc'>
 		{$out}
 	</table>
 	</div>
 eoq;
-	return $ret;
+    return $ret;
 }
 
 
 function testThis4($filePath, $fileNodes=array(), $fileName='') {
-	$path = dirname($filePath);
-	$file = basename($filePath);
+    $path = dirname($filePath);
+    $file = basename($filePath);
 
-	$exFile = explode('/', $path);
+    $exFile = explode('/', $path);
 
-	foreach($exFile as $pathSegment) {
-		if(is_array($fileNodes[$pathSegment])) { // path already processed
+    foreach($exFile as $pathSegment) {
+        if(is_array($fileNodes[$pathSegment])) { // path already processed
 
-		} else { // newly found path
-			$fileNodes[$pathSegment] = array();
-		}
+        } else { // newly found path
+            $fileNodes[$pathSegment] = array();
+        }
 
-		if($fileName != '') {
-			$fileNodes[$pathSegment][] = $fileName;
-		}
-	}
+        if($fileName != '') {
+            $fileNodes[$pathSegment][] = $fileName;
+        }
+    }
 
-	return $fileNodes;
+    return $fileNodes;
 }
 
 
@@ -2490,18 +2490,18 @@ 
  * @return array files Array of files with absolute paths
  */
 function getFilesForPermsCheck() {
-	global $sugar_config;
-
-	logThis('Got JSON call to find all files...');
-	$filesNotWritable = array();
-	$filesNWPerms = array();
-
-	// add directories here that should be skipped when doing file permissions checks (cache/upload is the nasty one)
-	$skipDirs = array(
-		$sugar_config['upload_dir'],
-	);
-	$files = uwFindAllFiles(".", array(), true, $skipDirs, true);
-	return $files;
+    global $sugar_config;
+
+    logThis('Got JSON call to find all files...');
+    $filesNotWritable = array();
+    $filesNWPerms = array();
+
+    // add directories here that should be skipped when doing file permissions checks (cache/upload is the nasty one)
+    $skipDirs = array(
+        $sugar_config['upload_dir'],
+    );
+    $files = uwFindAllFiles(".", array(), true, $skipDirs, true);
+    return $files;
 }
 
 /**
@@ -2510,10 +2510,10 @@ 
  * @return string result of check
  */
 function checkFiles($files, $echo=false) {
-	global $mod_strings;
-	$filesNotWritable = array();
-	$i=0;
-	$filesOut = "
+    global $mod_strings;
+    $filesNotWritable = array();
+    $i=0;
+    $filesOut = "
 		<a href='javascript:void(0); toggleNwFiles(\"filesNw\");'>{$mod_strings['LBL_UW_SHOW_NW_FILES']}</a>
 		<div id='filesNw' style='display:none;'>
 		<table cellpadding='3' cellspacing='0' border='0'>
@@ -2524,15 +2524,15 @@ 
 			<th align='left'>{$mod_strings['LBL_UW_FILE_GROUP']}</th>
 		</tr>";
 
-	$isWindows = is_windows();
-	foreach($files as $file) {
+    $isWindows = is_windows();
+    foreach($files as $file) {
 
-		if($isWindows) {
-			if(!is_writable_windows($file)) {
-				logThis('WINDOWS: File ['.$file.'] not readable - saving for display');
-				// don't warn yet - we're going to use this to check against replacement files
-	// aw: commented out; it's a hack to allow upgrade wizard to continue on windows... will fix later
-				/*$filesNotWritable[$i] = $file;
+        if($isWindows) {
+            if(!is_writable_windows($file)) {
+                logThis('WINDOWS: File ['.$file.'] not readable - saving for display');
+                // don't warn yet - we're going to use this to check against replacement files
+    // aw: commented out; it's a hack to allow upgrade wizard to continue on windows... will fix later
+                /*$filesNotWritable[$i] = $file;
 				$filesNWPerms[$i] = substr(sprintf('%o',fileperms($file)), -4);
 				$filesOut .= "<tr>".
 								"<td><span class='error'>{$file}</span></td>".
@@ -2540,57 +2540,57 @@ 
 								"<td>".$mod_strings['ERR_UW_CANNOT_DETERMINE_USER']."</td>".
 								"<td>".$mod_strings['ERR_UW_CANNOT_DETERMINE_GROUP']."</td>".
 							  "</tr>";*/
-			}
-		} else {
-			if(!is_writable($file)) {
-				logThis('File ['.$file.'] not writable - saving for display');
-				// don't warn yet - we're going to use this to check against replacement files
-				$filesNotWritable[$i] = $file;
-				$filesNWPerms[$i] = substr(sprintf('%o',fileperms($file)), -4);
-				$owner = posix_getpwuid(fileowner($file));
-				$group = posix_getgrgid(filegroup($file));
-				$filesOut .= "<tr>".
-								"<td><span class='error'>{$file}</span></td>".
-								"<td>{$filesNWPerms[$i]}</td>".
-								"<td>".$owner['name']."</td>".
-								"<td>".$group['name']."</td>".
-							  "</tr>";
-			}
-		}
-		$i++;
-	}
+            }
+        } else {
+            if(!is_writable($file)) {
+                logThis('File ['.$file.'] not writable - saving for display');
+                // don't warn yet - we're going to use this to check against replacement files
+                $filesNotWritable[$i] = $file;
+                $filesNWPerms[$i] = substr(sprintf('%o',fileperms($file)), -4);
+                $owner = posix_getpwuid(fileowner($file));
+                $group = posix_getgrgid(filegroup($file));
+                $filesOut .= "<tr>".
+                                "<td><span class='error'>{$file}</span></td>".
+                                "<td>{$filesNWPerms[$i]}</td>".
+                                "<td>".$owner['name']."</td>".
+                                "<td>".$group['name']."</td>".
+                                "</tr>";
+            }
+        }
+        $i++;
+    }
 
-	$filesOut .= '</table></div>';
-	// not a stop error
-	$errors['files']['filesNotWritable'] = (count($filesNotWritable) > 0) ? true : false;
-	if(count($filesNotWritable) < 1) {
-		$filesOut = "{$mod_strings['LBL_UW_FILE_NO_ERRORS']}";
-	}
+    $filesOut .= '</table></div>';
+    // not a stop error
+    $errors['files']['filesNotWritable'] = (count($filesNotWritable) > 0) ? true : false;
+    if(count($filesNotWritable) < 1) {
+        $filesOut = "{$mod_strings['LBL_UW_FILE_NO_ERRORS']}";
+    }
 
-	return $filesOut;
+    return $filesOut;
 }
 
 function deletePackageOnCancel(){
-	global $mod_strings;
-	global $sugar_config;
-	list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
-	logThis('running delete');
+    global $mod_strings;
+    global $sugar_config;
+    list($base_upgrade_dir, $base_tmp_upgrade_dir) = getUWDirs();
+    logThis('running delete');
     if(!isset($_SESSION['install_file']) || ($_SESSION['install_file'] == "")) {
-    	logThis('ERROR: trying to delete non-existent file: ['.$_REQUEST['install_file'].']');
+        logThis('ERROR: trying to delete non-existent file: ['.$_REQUEST['install_file'].']');
         $error = $mod_strings['ERR_UW_NO_FILE_UPLOADED'];
     }
     // delete file in upgrades/patch
     $delete_me = "$base_upgrade_dir/patch/".basename(urldecode( $_REQUEST['install_file'] ));
     if(@unlink($delete_me)) {
-    	//logThis('unlinking: '.$delete_me);
+        //logThis('unlinking: '.$delete_me);
         $out = basename($delete_me).$mod_strings['LBL_UW_FILE_DELETED'];
     } else {
-    	logThis('ERROR: could not delete ['.$delete_me.']');
-		$error = $mod_strings['ERR_UW_FILE_NOT_DELETED'].$delete_me;
+        logThis('ERROR: could not delete ['.$delete_me.']');
+        $error = $mod_strings['ERR_UW_FILE_NOT_DELETED'].$delete_me;
     }
 
     if(!empty($error)) {
-		$out = "<b><span class='error'>{$error}</span></b><br />";
+        $out = "<b><span class='error'>{$error}</span></b><br />";
     }
 }
 
@@ -2609,465 +2609,465 @@ 
 
 function parseAndExecuteSqlFile($sqlScript,$forStepQuery='',$resumeFromQuery='')
 {
-	global $sugar_config;
-	$alterTableSchema = '';
-	$sqlErrors = array();
-	if(!isset($_SESSION['sqlSkippedQueries'])){
-		$_SESSION['sqlSkippedQueries'] = array();
-	}
-	$db = DBManagerFactory::getInstance();
-	$disable_keys = ($db->dbType == "mysql"); // have to use old way for now for upgrades
-	if(strpos($resumeFromQuery,",") != false){
-		$resumeFromQuery = explode(",",$resumeFromQuery);
-	}
-	if(file_exists($sqlScript)) {
-		$fp = fopen($sqlScript, 'r');
-		$contents = stream_get_contents($fp);
-		$anyScriptChanges =$contents;
-		$resumeAfterFound = false;
-		if(rewind($fp)) {
-			$completeLine = '';
-			$count = 0;
-			while($line = fgets($fp)) {
-				if(strpos($line, '--') === false) {
-					$completeLine .= " ".trim($line);
-					if(strpos($line, ';') !== false) {
-						$query = '';
-						$query = str_replace(';','',$completeLine);
-						//if resume from query is not null then find out from where
-						//it should start executing the query.
-
-						if($query != null && $resumeFromQuery != null){
-							if(!$resumeAfterFound){
-								if(strpos($query,",") != false){
-									$queArray = explode(",",$query);
-									for($i=0;$i<sizeof($resumeFromQuery);$i++){
-										if(strcasecmp(trim($resumeFromQuery[$i]),trim($queArray[$i]))==0){
-											$resumeAfterFound = true;
-										} else {
-											$resumeAfterFound = false;
-											break;
-										}
-									}//for
-
-								}
-								elseif(strcasecmp(trim($resumeFromQuery),trim($query))==0){
-									$resumeAfterFound = true;
-								}
-							}
-							if($resumeAfterFound){
-								$count++;
-							}
-							// if $count=1 means it is just found so skip the query. Run the next one
-							if($query != null && $resumeAfterFound && $count >1){
-    							$tableName = getAlterTable($query);
-								if($disable_keys)
-								{
-									handleExecuteSqlKeys($db, $tableName, true);
-								}
-								$db->query($query);
-								if($db->checkError()){
-									//put in the array to use later on
-									$_SESSION['sqlSkippedQueries'][] = $query;
-								}
-								if($disable_keys)
-								{
-									handleExecuteSqlKeys($db, $tableName, false);
-								}
-								$progQuery[$forStepQuery]=$query;
-								post_install_progress($progQuery,$action='set');
-							}//if
-						}
-						elseif($query != null){
-							$tableName = getAlterTable($query);
-							if($disable_keys)
-							{
-								handleExecuteSqlKeys($db, $tableName, true);
-							}
-							$db->query($query);
-							if($disable_keys)
-							{
-								handleExecuteSqlKeys($db, $tableName, false);
-							}
-							$progQuery[$forStepQuery]=$query;
-							post_install_progress($progQuery,$action='set');
-							if($db->checkError()){
-								//put in the array to use later on
-								$_SESSION['sqlSkippedQueries'][] = $query;
-							}
-						}
-						$completeLine = '';
-					}
-				}
-			}//while
-		}
-	}
+    global $sugar_config;
+    $alterTableSchema = '';
+    $sqlErrors = array();
+    if(!isset($_SESSION['sqlSkippedQueries'])){
+        $_SESSION['sqlSkippedQueries'] = array();
+    }
+    $db = DBManagerFactory::getInstance();
+    $disable_keys = ($db->dbType == "mysql"); // have to use old way for now for upgrades
+    if(strpos($resumeFromQuery,",") != false){
+        $resumeFromQuery = explode(",",$resumeFromQuery);
+    }
+    if(file_exists($sqlScript)) {
+        $fp = fopen($sqlScript, 'r');
+        $contents = stream_get_contents($fp);
+        $anyScriptChanges =$contents;
+        $resumeAfterFound = false;
+        if(rewind($fp)) {
+            $completeLine = '';
+            $count = 0;
+            while($line = fgets($fp)) {
+                if(strpos($line, '--') === false) {
+                    $completeLine .= " ".trim($line);
+                    if(strpos($line, ';') !== false) {
+                        $query = '';
+                        $query = str_replace(';','',$completeLine);
+                        //if resume from query is not null then find out from where
+                        //it should start executing the query.
+
+                        if($query != null && $resumeFromQuery != null){
+                            if(!$resumeAfterFound){
+                                if(strpos($query,",") != false){
+                                    $queArray = explode(",",$query);
+                                    for($i=0;$i<sizeof($resumeFromQuery);$i++){
+                                        if(strcasecmp(trim($resumeFromQuery[$i]),trim($queArray[$i]))==0){
+                                            $resumeAfterFound = true;
+                                        } else {
+                                            $resumeAfterFound = false;
+                                            break;
+                                        }
+                                    }//for
+
+                                }
+                                elseif(strcasecmp(trim($resumeFromQuery),trim($query))==0){
+                                    $resumeAfterFound = true;
+                                }
+                            }
+                            if($resumeAfterFound){
+                                $count++;
+                            }
+                            // if $count=1 means it is just found so skip the query. Run the next one
+                            if($query != null && $resumeAfterFound && $count >1){
+                                $tableName = getAlterTable($query);
+                                if($disable_keys)
+                                {
+                                    handleExecuteSqlKeys($db, $tableName, true);
+                                }
+                                $db->query($query);
+                                if($db->checkError()){
+                                    //put in the array to use later on
+                                    $_SESSION['sqlSkippedQueries'][] = $query;
+                                }
+                                if($disable_keys)
+                                {
+                                    handleExecuteSqlKeys($db, $tableName, false);
+                                }
+                                $progQuery[$forStepQuery]=$query;
+                                post_install_progress($progQuery,$action='set');
+                            }//if
+                        }
+                        elseif($query != null){
+                            $tableName = getAlterTable($query);
+                            if($disable_keys)
+                            {
+                                handleExecuteSqlKeys($db, $tableName, true);
+                            }
+                            $db->query($query);
+                            if($disable_keys)
+                            {
+                                handleExecuteSqlKeys($db, $tableName, false);
+                            }
+                            $progQuery[$forStepQuery]=$query;
+                            post_install_progress($progQuery,$action='set');
+                            if($db->checkError()){
+                                //put in the array to use later on
+                                $_SESSION['sqlSkippedQueries'][] = $query;
+                            }
+                        }
+                        $completeLine = '';
+                    }
+                }
+            }//while
+        }
+    }
 }
 
 
 function getAlterTable($query){
-	$query = strtolower($query);
-	if (preg_match('/^\s*alter\s+table\s+/', $query)) {
-		$sqlArray = explode(" ", $query);
-		$key = array_search('table', $sqlArray);
-		return $sqlArray[($key+1)];
-	}else {
-		return '';
-	}
+    $query = strtolower($query);
+    if (preg_match('/^\s*alter\s+table\s+/', $query)) {
+        $sqlArray = explode(" ", $query);
+        $key = array_search('table', $sqlArray);
+        return $sqlArray[($key+1)];
+    }else {
+        return '';
+    }
 }
 
 function set_upgrade_vars(){
-	logThis('setting session variables...');
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	if(!is_dir($upgrade_progress_dir)){
-		mkdir_recursive($upgrade_progress_dir);
-	}
-	$upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
-	if(file_exists($upgrade_progress_file)){
-		include($upgrade_progress_file);
-	}
-	else{
-		fopen($upgrade_progress_file, 'w+');
-	}
-	if(!isset($upgrade_config) || $upgrade_config == null){
-		$upgrade_config = array();
-		$upgrade_config[1]['upgrade_vars']=array();
-	}
+    logThis('setting session variables...');
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    if(!is_dir($upgrade_progress_dir)){
+        mkdir_recursive($upgrade_progress_dir);
+    }
+    $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
+    if(file_exists($upgrade_progress_file)){
+        include($upgrade_progress_file);
+    }
+    else{
+        fopen($upgrade_progress_file, 'w+');
+    }
+    if(!isset($upgrade_config) || $upgrade_config == null){
+        $upgrade_config = array();
+        $upgrade_config[1]['upgrade_vars']=array();
+    }
     if(isset($upgrade_config[1]) && isset($upgrade_config[1]['upgrade_vars']) && !is_array($upgrade_config[1]['upgrade_vars'])){
-    	$upgrade_config[1]['upgrade_vars'] = array();
+        $upgrade_config[1]['upgrade_vars'] = array();
     }
 
-	if(!isset($upgrade_vars) || $upgrade_vars == NULL){
-		$upgrade_vars = array();
-	}
-	if(isset($_SESSION['unzip_dir']) && !empty($_SESSION['unzip_dir']) && file_exists($_SESSION['unzip_dir'])){
-		$upgrade_vars['unzip_dir']=$_SESSION['unzip_dir'];
-	}
-	if(isset($_SESSION['install_file']) && !empty($_SESSION['install_file']) && file_exists($_SESSION['install_file'])){
-		$upgrade_vars['install_file']=$_SESSION['install_file'];
-	}
-	if(isset($_SESSION['Upgraded451Wizard']) && !empty($_SESSION['Upgraded451Wizard'])){
-		$upgrade_vars['Upgraded451Wizard']=$_SESSION['Upgraded451Wizard'];
-	}
-	if(isset($_SESSION['license_shown']) && !empty($_SESSION['license_shown'])){
-		$upgrade_vars['license_shown']=$_SESSION['license_shown'];
-	}
-	if(isset($_SESSION['Initial_451to500_Step']) && !empty($_SESSION['Initial_451to500_Step'])){
-		$upgrade_vars['Initial_451to500_Step']=$_SESSION['Initial_451to500_Step'];
-	}
-	if(isset($_SESSION['zip_from_dir']) && !empty($_SESSION['zip_from_dir'])){
-		$upgrade_vars['zip_from_dir']=$_SESSION['zip_from_dir'];
-	}
-	//place into the upgrade_config array and rewrite config array only if new values are being inserted
-	if(isset($upgrade_vars) && $upgrade_vars != null && sizeof($upgrade_vars) > 0){
-		foreach($upgrade_vars as $key=>$val){
-			if($key != null && $val != null){
-				$upgrade_config[1]['upgrade_vars'][$key]=$upgrade_vars[$key];
-			}
-		}
-		ksort($upgrade_config);
-		if(is_writable($upgrade_progress_file) && write_array_to_file( "upgrade_config", $upgrade_config,
-			$upgrade_progress_file)) {
-		       //writing to the file
-		}
+    if(!isset($upgrade_vars) || $upgrade_vars == NULL){
+        $upgrade_vars = array();
+    }
+    if(isset($_SESSION['unzip_dir']) && !empty($_SESSION['unzip_dir']) && file_exists($_SESSION['unzip_dir'])){
+        $upgrade_vars['unzip_dir']=$_SESSION['unzip_dir'];
+    }
+    if(isset($_SESSION['install_file']) && !empty($_SESSION['install_file']) && file_exists($_SESSION['install_file'])){
+        $upgrade_vars['install_file']=$_SESSION['install_file'];
+    }
+    if(isset($_SESSION['Upgraded451Wizard']) && !empty($_SESSION['Upgraded451Wizard'])){
+        $upgrade_vars['Upgraded451Wizard']=$_SESSION['Upgraded451Wizard'];
+    }
+    if(isset($_SESSION['license_shown']) && !empty($_SESSION['license_shown'])){
+        $upgrade_vars['license_shown']=$_SESSION['license_shown'];
+    }
+    if(isset($_SESSION['Initial_451to500_Step']) && !empty($_SESSION['Initial_451to500_Step'])){
+        $upgrade_vars['Initial_451to500_Step']=$_SESSION['Initial_451to500_Step'];
+    }
+    if(isset($_SESSION['zip_from_dir']) && !empty($_SESSION['zip_from_dir'])){
+        $upgrade_vars['zip_from_dir']=$_SESSION['zip_from_dir'];
+    }
+    //place into the upgrade_config array and rewrite config array only if new values are being inserted
+    if(isset($upgrade_vars) && $upgrade_vars != null && sizeof($upgrade_vars) > 0){
+        foreach($upgrade_vars as $key=>$val){
+            if($key != null && $val != null){
+                $upgrade_config[1]['upgrade_vars'][$key]=$upgrade_vars[$key];
+            }
+        }
+        ksort($upgrade_config);
+        if(is_writable($upgrade_progress_file) && write_array_to_file( "upgrade_config", $upgrade_config,
+            $upgrade_progress_file)) {
+                //writing to the file
+        }
     }
 }
 
 function initialize_session_vars(){
-  $upgrade_progress_dir = sugar_cached('upgrades/temp');
-  $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
-  if(file_exists($upgrade_progress_file)){
-  	include($upgrade_progress_file);
-  	if(isset($upgrade_config) && $upgrade_config != null && is_array($upgrade_config) && sizeof($upgrade_config) >0){
-	  	$currVarsArray=$upgrade_config[1]['upgrade_vars'];
-	  	//print_r($currVarsArray);
-	  	if(isset($currVarsArray) && $currVarsArray != null && is_array($currVarsArray) && sizeof($currVarsArray)>0){
-	  		foreach($currVarsArray as $key=>$val){
-	  			if($key != null && $val !=null){
-		  			//set session variables
-		  			$_SESSION[$key]=$val;
-		  			//set varibales
-					'$'.$key=$val;
-	  			}
-	  		}
-	  	}
-  	}
-  }
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
+    if(file_exists($upgrade_progress_file)){
+        include($upgrade_progress_file);
+        if(isset($upgrade_config) && $upgrade_config != null && is_array($upgrade_config) && sizeof($upgrade_config) >0){
+            $currVarsArray=$upgrade_config[1]['upgrade_vars'];
+            //print_r($currVarsArray);
+            if(isset($currVarsArray) && $currVarsArray != null && is_array($currVarsArray) && sizeof($currVarsArray)>0){
+                foreach($currVarsArray as $key=>$val){
+                    if($key != null && $val !=null){
+                        //set session variables
+                        $_SESSION[$key]=$val;
+                        //set varibales
+                    '$'.$key=$val;
+                    }
+                }
+            }
+        }
+    }
 }
 //track the upgrade progress on each step
 //track the upgrade progress on each step
 function set_upgrade_progress($currStep,$currState,$currStepSub='',$currStepSubState=''){
 
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	if(!is_dir($upgrade_progress_dir)){
-		mkdir_recursive($upgrade_progress_dir);
-	}
-	$upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
-	if(file_exists($upgrade_progress_file)){
-		include($upgrade_progress_file);
-	}
-	else{
-		if(function_exists('sugar_fopen')){
-			sugar_fopen($upgrade_progress_file, 'w+');
-		}
-		else{
-			fopen($upgrade_progress_file, 'w+');
-		}
-	}
-	if(!isset($upgrade_config) || $upgrade_config == null){
-		$upgrade_config = array();
-		$upgrade_config[1]['upgrade_vars']=array();
-	}
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    if(!is_dir($upgrade_progress_dir)){
+        mkdir_recursive($upgrade_progress_dir);
+    }
+    $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
+    if(file_exists($upgrade_progress_file)){
+        include($upgrade_progress_file);
+    }
+    else{
+        if(function_exists('sugar_fopen')){
+            sugar_fopen($upgrade_progress_file, 'w+');
+        }
+        else{
+            fopen($upgrade_progress_file, 'w+');
+        }
+    }
+    if(!isset($upgrade_config) || $upgrade_config == null){
+        $upgrade_config = array();
+        $upgrade_config[1]['upgrade_vars']=array();
+    }
     if(!is_array($upgrade_config[1]['upgrade_vars'])){
-    	$upgrade_config[1]['upgrade_vars'] = array();
-    }
-   	if($currStep != null && $currState != null){
-		if(sizeof($upgrade_config) > 0){
-			if($currStepSub != null && $currStepSubState !=null){
-				//check if new status to be set or update
-				//get the latest in array. since it has sub components prepare an array
-				if(!empty($upgrade_config[sizeof($upgrade_config)][$currStep]) && is_array($upgrade_config[sizeof($upgrade_config)][$currStep])){
-					$latestStepSub = currSubStep($upgrade_config[sizeof($upgrade_config)][$currStep]);
-					if($latestStepSub == $currStepSub){
-						$upgrade_config[sizeof($upgrade_config)][$currStep][$latestStepSub]=$currStepSubState;
-						$upgrade_config[sizeof($upgrade_config)][$currStep][$currStep] = $currState;
-					}
-					else{
-						$upgrade_config[sizeof($upgrade_config)][$currStep][$currStepSub]=$currStepSubState;
-						$upgrade_config[sizeof($upgrade_config)][$currStep][$currStep] = $currState;
-					}
-				}
-				else{
-					$currArray = array();
-					$currArray[$currStep] = $currState;
-					$currArray[$currStepSub] = $currStepSubState;
-					$upgrade_config[sizeof($upgrade_config)+1][$currStep] = $currArray;
-				}
-			}
-          else{
-				//get the current upgrade progress
-				$latestStep = get_upgrade_progress();
-				//set the upgrade progress
-				if($latestStep == $currStep){
-					//update the current step with new progress status
-					$upgrade_config[sizeof($upgrade_config)][$latestStep]=$currState;
-				}
-				else{
-					//it's a new step
-					$upgrade_config[sizeof($upgrade_config)+1][$currStep]=$currState;
-				}
-	            // now check if there elements within array substeps
-          }
-		}
-		else{
-			//set the upgrade progress  (just starting)
-			$upgrade_config[sizeof($upgrade_config)+1][$currStep]= $currState;
-		}
+        $upgrade_config[1]['upgrade_vars'] = array();
+    }
+        if($currStep != null && $currState != null){
+        if(sizeof($upgrade_config) > 0){
+            if($currStepSub != null && $currStepSubState !=null){
+                //check if new status to be set or update
+                //get the latest in array. since it has sub components prepare an array
+                if(!empty($upgrade_config[sizeof($upgrade_config)][$currStep]) && is_array($upgrade_config[sizeof($upgrade_config)][$currStep])){
+                    $latestStepSub = currSubStep($upgrade_config[sizeof($upgrade_config)][$currStep]);
+                    if($latestStepSub == $currStepSub){
+                        $upgrade_config[sizeof($upgrade_config)][$currStep][$latestStepSub]=$currStepSubState;
+                        $upgrade_config[sizeof($upgrade_config)][$currStep][$currStep] = $currState;
+                    }
+                    else{
+                        $upgrade_config[sizeof($upgrade_config)][$currStep][$currStepSub]=$currStepSubState;
+                        $upgrade_config[sizeof($upgrade_config)][$currStep][$currStep] = $currState;
+                    }
+                }
+                else{
+                    $currArray = array();
+                    $currArray[$currStep] = $currState;
+                    $currArray[$currStepSub] = $currStepSubState;
+                    $upgrade_config[sizeof($upgrade_config)+1][$currStep] = $currArray;
+                }
+            }
+            else{
+                //get the current upgrade progress
+                $latestStep = get_upgrade_progress();
+                //set the upgrade progress
+                if($latestStep == $currStep){
+                    //update the current step with new progress status
+                    $upgrade_config[sizeof($upgrade_config)][$latestStep]=$currState;
+                }
+                else{
+                    //it's a new step
+                    $upgrade_config[sizeof($upgrade_config)+1][$currStep]=$currState;
+                }
+                // now check if there elements within array substeps
+            }
+        }
+        else{
+            //set the upgrade progress  (just starting)
+            $upgrade_config[sizeof($upgrade_config)+1][$currStep]= $currState;
+        }
 
-		if(is_writable($upgrade_progress_file) && write_array_to_file( "upgrade_config", $upgrade_config,
-		$upgrade_progress_file)) {
-	       //writing to the file
-		}
+        if(is_writable($upgrade_progress_file) && write_array_to_file( "upgrade_config", $upgrade_config,
+        $upgrade_progress_file)) {
+            //writing to the file
+        }
 
-   	}
+        }
 }
 
 function get_upgrade_progress(){
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	$upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
-	$currState = '';
-
-	if(file_exists($upgrade_progress_file)){
-		include($upgrade_progress_file);
-		if(!isset($upgrade_config) || $upgrade_config == null){
-			$upgrade_config = array();
-		}
-		if($upgrade_config != null && sizeof($upgrade_config) >1){
-			$currArr = $upgrade_config[sizeof($upgrade_config)];
-			if(is_array($currArr)){
-			   foreach($currArr as $key=>$val){
-					$currState = $key;
-				}
-			}
-		}
-	}
-	return $currState;
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
+    $currState = '';
+
+    if(file_exists($upgrade_progress_file)){
+        include($upgrade_progress_file);
+        if(!isset($upgrade_config) || $upgrade_config == null){
+            $upgrade_config = array();
+        }
+        if($upgrade_config != null && sizeof($upgrade_config) >1){
+            $currArr = $upgrade_config[sizeof($upgrade_config)];
+            if(is_array($currArr)){
+                foreach($currArr as $key=>$val){
+                    $currState = $key;
+                }
+            }
+        }
+    }
+    return $currState;
 }
 function currSubStep($currStep){
-	$currSubStep = '';
-	if(is_array($currStep)){
-       foreach($currStep as $key=>$val){
-		    if($key != null){
-			$currState = $key;
-		  	}
-	   }
-	}
-	return $currState;
+    $currSubStep = '';
+    if(is_array($currStep)){
+        foreach($currStep as $key=>$val){
+            if($key != null){
+            $currState = $key;
+                }
+        }
+    }
+    return $currState;
 }
 function currUpgradeState($currState){
-	$currState = '';
-	if(is_array($currState)){
-       foreach($currState as $key=>$val){
-			if(is_array($val)){
-			  	foreach($val as $k=>$v){
-			  		if($k != null){
-						$currState = $k;
-			  		}
-			  	}
-			}
-			else{
-				$currState = $key;
-			}
-		}
-	}
-	return $currState;
+    $currState = '';
+    if(is_array($currState)){
+        foreach($currState as $key=>$val){
+            if(is_array($val)){
+                    foreach($val as $k=>$v){
+                        if($k != null){
+                        $currState = $k;
+                        }
+                    }
+            }
+            else{
+                $currState = $key;
+            }
+        }
+    }
+    return $currState;
 }
 
 function didThisStepRunBefore($step,$SubStep=''){
-	if($step == null) return;
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	$upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
-	$currState = '';
-	$stepRan = false;
-	if(file_exists($upgrade_progress_file)){
-		include($upgrade_progress_file);
-		if(isset($upgrade_config) && $upgrade_config != null && is_array($upgrade_config) && sizeof($upgrade_config) >0){
-			for($i=1;$i<=sizeof($upgrade_config);$i++){
-			  if(is_array($upgrade_config[$i])){
-					foreach($upgrade_config[$i] as $key=>$val){
-						if($key==$step){
-							if(is_array($upgrade_config[$i][$step])){
-								//now process
-								foreach ($upgrade_config[$i][$step] as $k=>$v){
-									if(is_array($v)){
-										foreach($v as $k1=>$v1){
-											if($SubStep != null){
-												if($SubStep ==$k1 && $v1=='done'){
-													$stepRan = true;
-													break;
-												}
-											}
-										}//foreach
-									}
-									elseif($SubStep !=null){
-										if($SubStep==$k && $v=='done'){
-											$stepRan = true;
-											break;
-										}
-									}
-									elseif($step==$k && $v=='done'){
-										$stepRan = true;
-										break;
-									}
-								}//foreach
-							}
-							elseif($val=='done'){
-								$stepRan = true;
-							}
-						}
-					}//foreach
-				}
-		 	}//for
-	   	}
-	}
-	return $stepRan;
+    if($step == null) return;
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
+    $currState = '';
+    $stepRan = false;
+    if(file_exists($upgrade_progress_file)){
+        include($upgrade_progress_file);
+        if(isset($upgrade_config) && $upgrade_config != null && is_array($upgrade_config) && sizeof($upgrade_config) >0){
+            for($i=1;$i<=sizeof($upgrade_config);$i++){
+                if(is_array($upgrade_config[$i])){
+                    foreach($upgrade_config[$i] as $key=>$val){
+                        if($key==$step){
+                            if(is_array($upgrade_config[$i][$step])){
+                                //now process
+                                foreach ($upgrade_config[$i][$step] as $k=>$v){
+                                    if(is_array($v)){
+                                        foreach($v as $k1=>$v1){
+                                            if($SubStep != null){
+                                                if($SubStep ==$k1 && $v1=='done'){
+                                                    $stepRan = true;
+                                                    break;
+                                                }
+                                            }
+                                        }//foreach
+                                    }
+                                    elseif($SubStep !=null){
+                                        if($SubStep==$k && $v=='done'){
+                                            $stepRan = true;
+                                            break;
+                                        }
+                                    }
+                                    elseif($step==$k && $v=='done'){
+                                        $stepRan = true;
+                                        break;
+                                    }
+                                }//foreach
+                            }
+                            elseif($val=='done'){
+                                $stepRan = true;
+                            }
+                        }
+                    }//foreach
+                }
+                }//for
+            }
+    }
+    return $stepRan;
 }
 
 
 
 //get and set post install status
 function post_install_progress($progArray='',$action=''){
-	$upgrade_progress_dir = sugar_cached('upgrades/temp');
-	$upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
+    $upgrade_progress_dir = sugar_cached('upgrades/temp');
+    $upgrade_progress_file = $upgrade_progress_dir.'/upgrade_progress.php';
     if($action=='' || $action=='get'){
-		//get the state of post install
+        //get the state of post install
         $currProg = array();
-		if(file_exists($upgrade_progress_file)){
-			include($upgrade_progress_file);
-			if(is_array($upgrade_config[sizeof($upgrade_config)]['commit']['post_install']) && sizeof($upgrade_config[sizeof($upgrade_config)]['commit']['post_install'])>0){
-				foreach($upgrade_config[sizeof($upgrade_config)]['commit']['post_install'] as $k=>$v){
-					$currProg[$k]=$v;
-				}
-			}
-		}
-		return $currProg;
-	}
-	elseif($action=='set'){
-		if(!is_dir($upgrade_progress_dir)){
-			mkdir($upgrade_progress_dir);
-		}
-		if(file_exists($upgrade_progress_file)){
-			include($upgrade_progress_file);
-		}
-		else{
-			fopen($upgrade_progress_file, 'w+');
-		}
-		if(!is_array($upgrade_config[sizeof($upgrade_config)]['commit']['post_install'])){
-			$upgrade_config[sizeof($upgrade_config)]['commit']['post_install']=array();
-			$upgrade_config[sizeof($upgrade_config)]['commit']['post_install']['post_install'] = 'in_progress';
-		}
-		if($progArray != null && is_array($progArray)){
-			foreach($progArray as $key=>$val){
-				$upgrade_config[sizeof($upgrade_config)]['commit']['post_install'][$key]=$val;
-			}
-		}
-		if(is_writable($upgrade_progress_file) && write_array_to_file( "upgrade_config", $upgrade_config,
-		$upgrade_progress_file)) {
-	       //writing to the file
-		}
-	}
+        if(file_exists($upgrade_progress_file)){
+            include($upgrade_progress_file);
+            if(is_array($upgrade_config[sizeof($upgrade_config)]['commit']['post_install']) && sizeof($upgrade_config[sizeof($upgrade_config)]['commit']['post_install'])>0){
+                foreach($upgrade_config[sizeof($upgrade_config)]['commit']['post_install'] as $k=>$v){
+                    $currProg[$k]=$v;
+                }
+            }
+        }
+        return $currProg;
+    }
+    elseif($action=='set'){
+        if(!is_dir($upgrade_progress_dir)){
+            mkdir($upgrade_progress_dir);
+        }
+        if(file_exists($upgrade_progress_file)){
+            include($upgrade_progress_file);
+        }
+        else{
+            fopen($upgrade_progress_file, 'w+');
+        }
+        if(!is_array($upgrade_config[sizeof($upgrade_config)]['commit']['post_install'])){
+            $upgrade_config[sizeof($upgrade_config)]['commit']['post_install']=array();
+            $upgrade_config[sizeof($upgrade_config)]['commit']['post_install']['post_install'] = 'in_progress';
+        }
+        if($progArray != null && is_array($progArray)){
+            foreach($progArray as $key=>$val){
+                $upgrade_config[sizeof($upgrade_config)]['commit']['post_install'][$key]=$val;
+            }
+        }
+        if(is_writable($upgrade_progress_file) && write_array_to_file( "upgrade_config", $upgrade_config,
+        $upgrade_progress_file)) {
+            //writing to the file
+        }
+    }
 }
 
 function repairDBForUpgrade($execute=false,$path=''){
 
-	global $current_user, $beanFiles;
-	global $dictionary;
-	set_time_limit(3600);
+    global $current_user, $beanFiles;
+    global $dictionary;
+    set_time_limit(3600);
 
-	$db = &DBManagerFactory::getInstance();
-	$sql = '';
-	VardefManager::clearVardef();
-	require_once('include/ListView/ListView.php');
-	foreach ($beanFiles as $bean => $file) {
-		require_once ($file);
-		$focus = new $bean ();
-		$sql .= $db->repairTable($focus, $execute);
+    $db = &DBManagerFactory::getInstance();
+    $sql = '';
+    VardefManager::clearVardef();
+    require_once('include/ListView/ListView.php');
+    foreach ($beanFiles as $bean => $file) {
+        require_once ($file);
+        $focus = new $bean ();
+        $sql .= $db->repairTable($focus, $execute);
 
-	}
-	//echo $sql;
-	$olddictionary = $dictionary;
-	unset ($dictionary);
-	include ('modules/TableDictionary.php');
-	foreach ($dictionary as $meta) {
-		$tablename = $meta['table'];
-		$fielddefs = $meta['fields'];
-		$indices = $meta['indices'];
-		$sql .= $db->repairTableParams($tablename, $fielddefs, $indices, $execute);
-	}
-	 $qry_str = "";
-	  foreach (explode("\n", $sql) as $line) {
-		  if (!empty ($line) && substr($line, -2) != "*/") {
-		  	$line .= ";";
-		  }
-	  	  $qry_str .= $line . "\n";
-	   }
-	  $sql = str_replace(
-	  array(
-	  	"\n",
-		'&#039;',
-	   ),
-	  array(
-	  	'',
-		"'",
-	  ),
-	  preg_replace('#(/\*.+?\*/\n*)#', '', $qry_str)
-	  );
-	 logThis("*******START EXECUTING DB UPGRADE QUERIES***************",$path);
-	 	logThis($sql,$path);
-	 logThis("*******END EXECUTING DB UPGRADE QUERIES****************",$path);
-	 if(!$execute){
-	 	return $sql;
-	 }
+    }
+    //echo $sql;
+    $olddictionary = $dictionary;
+    unset ($dictionary);
+    include ('modules/TableDictionary.php');
+    foreach ($dictionary as $meta) {
+        $tablename = $meta['table'];
+        $fielddefs = $meta['fields'];
+        $indices = $meta['indices'];
+        $sql .= $db->repairTableParams($tablename, $fielddefs, $indices, $execute);
+    }
+        $qry_str = "";
+        foreach (explode("\n", $sql) as $line) {
+            if (!empty ($line) && substr($line, -2) != "*/") {
+                $line .= ";";
+            }
+            $qry_str .= $line . "\n";
+        }
+        $sql = str_replace(
+        array(
+            "\n",
+        '&#039;',
+        ),
+        array(
+            '',
+        "'",
+        ),
+        preg_replace('#(/\*.+?\*/\n*)#', '', $qry_str)
+        );
+        logThis("*******START EXECUTING DB UPGRADE QUERIES***************",$path);
+            logThis($sql,$path);
+        logThis("*******END EXECUTING DB UPGRADE QUERIES****************",$path);
+        if(!$execute){
+            return $sql;
+        }
 }
 
 
@@ -3105,9 +3105,9 @@ 
         $localization->createInvalidLocaleNameFormatUpgradeNotice();
     }
 
-   	$db = &DBManagerFactory::getInstance();
+        $db = &DBManagerFactory::getInstance();
     $result = $db->query("SELECT id FROM users where deleted = '0'");
-   	while($row = $db->fetchByAssoc($result))
+        while($row = $db->fetchByAssoc($result))
     {
         $current_user = new User();
         $current_user->retrieve($row['id']);
@@ -3123,9 +3123,9 @@ 
 
         $changed = false;
         if(!$current_user->getPreference('calendar_publish_key')) {
-        	// set publish key if not set already
-        	$current_user->setPreference('calendar_publish_key', create_guid());
-        	$changed = true;
+            // set publish key if not set already
+            $current_user->setPreference('calendar_publish_key', create_guid());
+            $changed = true;
         }
 
 
@@ -3135,7 +3135,7 @@ 
             $current_user->savePreferencesToDB();
         }
 
-	} //while
+    } //while
 }
 
 
@@ -3173,75 +3173,75 @@ 
 function add_custom_modules_favorites_search(){
     $module_directories = scandir('modules');
 
-	foreach($module_directories as $module_dir){
-		if($module_dir == '.' || $module_dir == '..' || !is_dir("modules/{$module_dir}")){
-			continue;
-		}
+    foreach($module_directories as $module_dir){
+        if($module_dir == '.' || $module_dir == '..' || !is_dir("modules/{$module_dir}")){
+            continue;
+        }
+
+        $matches = array();
+        preg_match('/^[a-z0-9]{1,5}_[a-z0-9_]+$/i' , $module_dir, $matches);
+
+        // Make sure the module was created by module builder
+        if(empty($matches)){
+            continue;
+        }
 
-		$matches = array();
-		preg_match('/^[a-z0-9]{1,5}_[a-z0-9_]+$/i' , $module_dir, $matches);
+        $full_module_dir = "modules/{$module_dir}/";
+        $read_searchdefs_from = "{$full_module_dir}/metadata/searchdefs.php";
+        $read_SearchFields_from = "{$full_module_dir}/metadata/SearchFields.php";
+        $read_custom_SearchFields_from = "custom/{$full_module_dir}/metadata/SearchFields.php";
 
-		// Make sure the module was created by module builder
-		if(empty($matches)){
-			continue;
-		}
+        // Studio can possibly override this file, so we check for a custom version of it
+        if(file_exists("custom/{$full_module_dir}/metadata/searchdefs.php")){
+            $read_searchdefs_from = "custom/{$full_module_dir}/metadata/searchdefs.php";
+        }
 
-		$full_module_dir = "modules/{$module_dir}/";
-		$read_searchdefs_from = "{$full_module_dir}/metadata/searchdefs.php";
-		$read_SearchFields_from = "{$full_module_dir}/metadata/SearchFields.php";
-		$read_custom_SearchFields_from = "custom/{$full_module_dir}/metadata/SearchFields.php";
+        if(file_exists($read_searchdefs_from) && file_exists($read_SearchFields_from)){
+            $found_sf1 = false;
+            $found_sf2 = false;
+            require($read_searchdefs_from);
+            foreach($searchdefs[$module_dir]['layout']['basic_search'] as $sf_array){
+                if(isset($sf_array['name']) && $sf_array['name'] == 'favorites_only'){
+                    $found_sf1 = true;
+                }
+            }
 
-		// Studio can possibly override this file, so we check for a custom version of it
-		if(file_exists("custom/{$full_module_dir}/metadata/searchdefs.php")){
-			$read_searchdefs_from = "custom/{$full_module_dir}/metadata/searchdefs.php";
-		}
+            require($read_SearchFields_from);
+            if(isset($searchFields[$module_dir]['favorites_only'])){
+                $found_sf2 = true;
+            }
 
-		if(file_exists($read_searchdefs_from) && file_exists($read_SearchFields_from)){
-			$found_sf1 = false;
-			$found_sf2 = false;
-			require($read_searchdefs_from);
-			foreach($searchdefs[$module_dir]['layout']['basic_search'] as $sf_array){
-				if(isset($sf_array['name']) && $sf_array['name'] == 'favorites_only'){
-					$found_sf1 = true;
-				}
-			}
-
-			require($read_SearchFields_from);
-			if(isset($searchFields[$module_dir]['favorites_only'])){
-				$found_sf2 = true;
-			}
-
-			if(!$found_sf1 && !$found_sf2){
-				$searchdefs[$module_dir]['layout']['basic_search']['favorites_only'] = array('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',);
-				$searchdefs[$module_dir]['layout']['advanced_search']['favorites_only'] = array('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',);
-				$searchFields[$module_dir]['favorites_only'] = array(
-					'query_type'=>'format',
-					'operator' => 'subquery',
-					'subquery' => 'SELECT sugarfavorites.record_id FROM sugarfavorites
+            if(!$found_sf1 && !$found_sf2){
+                $searchdefs[$module_dir]['layout']['basic_search']['favorites_only'] = array('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',);
+                $searchdefs[$module_dir]['layout']['advanced_search']['favorites_only'] = array('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',);
+                $searchFields[$module_dir]['favorites_only'] = array(
+                    'query_type'=>'format',
+                    'operator' => 'subquery',
+                    'subquery' => 'SELECT sugarfavorites.record_id FROM sugarfavorites
 								WHERE sugarfavorites.deleted=0
 									and sugarfavorites.module = \''.$module_dir.'\'
 									and sugarfavorites.assigned_user_id = \'{0}\'',
-					'db_field'=>array('id')
-				);
-
-				if(!is_dir("custom/{$full_module_dir}/metadata")){
-					mkdir_recursive("custom/{$full_module_dir}/metadata");
-				}
-				$success_sf1 = write_array_to_file('searchdefs', $searchdefs, "custom/{$full_module_dir}/metadata/searchdefs.php");
-				$success_sf2 = write_array_to_file('searchFields', $searchFields, "{$full_module_dir}/metadata/SearchFields.php");
-
-				if(!$success_sf1){
-					logThis("add_custom_modules_favorites_search failed for searchdefs.php for {$module_dir}");
-				}
-				if(!$success_sf2){
-					logThis("add_custom_modules_favorites_search failed for SearchFields.php for {$module_dir}");
-				}
-				if($success_sf1 && $success_sf2){
-					logThis("add_custom_modules_favorites_search successfully updated searchdefs and searchFields for {$module_dir}");
-				}
-			}
-		}
-	}
+                    'db_field'=>array('id')
+                );
+
+                if(!is_dir("custom/{$full_module_dir}/metadata")){
+                    mkdir_recursive("custom/{$full_module_dir}/metadata");
+                }
+                $success_sf1 = write_array_to_file('searchdefs', $searchdefs, "custom/{$full_module_dir}/metadata/searchdefs.php");
+                $success_sf2 = write_array_to_file('searchFields', $searchFields, "{$full_module_dir}/metadata/SearchFields.php");
+
+                if(!$success_sf1){
+                    logThis("add_custom_modules_favorites_search failed for searchdefs.php for {$module_dir}");
+                }
+                if(!$success_sf2){
+                    logThis("add_custom_modules_favorites_search failed for SearchFields.php for {$module_dir}");
+                }
+                if($success_sf1 && $success_sf2){
+                    logThis("add_custom_modules_favorites_search successfully updated searchdefs and searchFields for {$module_dir}");
+                }
+            }
+        }
+    }
 }
 
 
@@ -3256,36 +3256,36 @@ 
  */
 function upgradeModulesForTeamsets($filter=array()) {
     require('include/modules.php');
-	foreach($beanList as $moduleName=>$beanName) {
-		    if(!empty($filter) && array_search($moduleName, $filter) === false) {
-		       continue;
-		    }
-	        if($moduleName == 'TeamMemberships' || $moduleName == 'ForecastOpportunities'){
+    foreach($beanList as $moduleName=>$beanName) {
+            if(!empty($filter) && array_search($moduleName, $filter) === false) {
+                continue;
+            }
+            if($moduleName == 'TeamMemberships' || $moduleName == 'ForecastOpportunities'){
+                continue;
+            }
+            $bean = loadBean($moduleName);
+            if(empty($bean) ||
+               empty($bean->table_name)) {
                 continue;
             }
-			$bean = loadBean($moduleName);
-			if(empty($bean) ||
-			   empty($bean->table_name)) {
-			   continue;
-			}
 
-			$FieldArray = $GLOBALS['db']->helper->get_columns($bean->table_name);
-			if(!isset($FieldArray['team_id'])) {
-			   continue;
-			}
+            $FieldArray = $GLOBALS['db']->helper->get_columns($bean->table_name);
+            if(!isset($FieldArray['team_id'])) {
+                continue;
+            }
 
-			upgradeTeamColumn($bean, 'team_id');
+            upgradeTeamColumn($bean, 'team_id');
 
-	} //foreach
+    } //foreach
 
     //Upgrade users table
-	$bean = loadBean('Users');
-   	upgradeTeamColumn($bean, 'default_team');
-	$result = $GLOBALS['db']->query("SELECT id FROM teams where deleted=0");
-	while($row = $GLOBALS['db']->fetchByAssoc($result)) {
-	      $teamset = new TeamSet();
-	      $teamset->addTeams($row['id']);
-	}
+    $bean = loadBean('Users');
+        upgradeTeamColumn($bean, 'default_team');
+    $result = $GLOBALS['db']->query("SELECT id FROM teams where deleted=0");
+    while($row = $GLOBALS['db']->fetchByAssoc($result)) {
+            $teamset = new TeamSet();
+            $teamset->addTeams($row['id']);
+    }
 }
 
 
@@ -3298,87 +3298,87 @@ 
  * @param $column_name The name of the column containing the default team_set_id value
  */
 function upgradeTeamColumn($bean, $column_name) {
-	//first let's check to ensure that the team_set_id field is defined, if not it could be the case that this is an older
-	//module that does not use the SugarObjects
-	if(empty($bean->field_defs['team_set_id']) && $bean->module_dir != 'Trackers'){
-
-		//at this point we could assume that since we have a team_id defined and not a team_set_id that we need to
-		//add that field and the corresponding relationships
-		$object = $bean->object_name;
-		$module = $bean->module_dir;
-		$object_name = $object;
-		$_object_name = strtolower($object_name);
-
-		if(!empty($GLOBALS['dictionary'][$object]['table'])){
-			$table_name = $GLOBALS['dictionary'][$object]['table'];
-		}else{
-			$table_name = strtolower($module);
-		}
+    //first let's check to ensure that the team_set_id field is defined, if not it could be the case that this is an older
+    //module that does not use the SugarObjects
+    if(empty($bean->field_defs['team_set_id']) && $bean->module_dir != 'Trackers'){
+
+        //at this point we could assume that since we have a team_id defined and not a team_set_id that we need to
+        //add that field and the corresponding relationships
+        $object = $bean->object_name;
+        $module = $bean->module_dir;
+        $object_name = $object;
+        $_object_name = strtolower($object_name);
+
+        if(!empty($GLOBALS['dictionary'][$object]['table'])){
+            $table_name = $GLOBALS['dictionary'][$object]['table'];
+        }else{
+            $table_name = strtolower($module);
+        }
 
-		$path = 'include/SugarObjects/implements/team_security/vardefs.php';
-		require($path);
-		//go through each entry in the vardefs from team_security and unset anything that is already set in the core module
-		//this will ensure we have the proper ordering.
-		$fieldDiff = array_diff_assoc($vardefs['fields'], $GLOBALS['dictionary'][$bean->object_name]['fields']);
-
-		$file = 'custom/Extension/modules/' . $bean->module_dir. '/Ext/Vardefs/teams.php';
-		$contents = "<?php\n";
-		if(!empty($fieldDiff)){
-			foreach($fieldDiff as $key => $val){
-				$contents .= "\n\$GLOBALS['dictionary']['". $object . "']['fields']['". $key . "']=" . var_export_helper($val) . ";";
-			}
-		}
-		$relationshipDiff = array_diff_assoc($vardefs['relationships'], $GLOBALS['dictionary'][$bean->object_name]['relationships']);
-		if(!empty($relationshipDiff)){
-			foreach($relationshipDiff as $key => $val){
-				$contents .= "\n\$GLOBALS['dictionary']['". $object . "']['relationships']['". $key . "']=" . var_export_helper($val) . ";";
-			}
-		}
-		$indexDiff = array_diff_assoc($vardefs['indices'], $GLOBALS['dictionary'][$bean->object_name]['indices']);
-		if(!empty($indexDiff)){
-			foreach($indexDiff as $key => $val){
-					$contents .= "\n\$GLOBALS['dictionary']['". $object . "']['indices']['". $key . "']=" . var_export_helper($val) . ";";
-			}
-		}
-		if( $fh = @sugar_fopen( $file, 'wt' ) )
-	    {
-	        fputs( $fh, $contents);
-	        fclose( $fh );
-	    }
-
-
-		//we have written out the teams.php into custom/Extension/modules/{$module_dir}/Ext/Vardefs/teams.php'
-		//now let's merge back into vardefs.ext.php
-		require_once('ModuleInstall/ModuleInstaller.php');
-		$mi = new ModuleInstaller();
-		$mi->merge_files('Ext/Vardefs/', 'vardefs.ext.php');
-		VardefManager::loadVardef($bean->module_dir, $bean->object_name, true);
-		$bean->field_defs = $GLOBALS['dictionary'][$bean->object_name]['fields'];
-	}
+        $path = 'include/SugarObjects/implements/team_security/vardefs.php';
+        require($path);
+        //go through each entry in the vardefs from team_security and unset anything that is already set in the core module
+        //this will ensure we have the proper ordering.
+        $fieldDiff = array_diff_assoc($vardefs['fields'], $GLOBALS['dictionary'][$bean->object_name]['fields']);
+
+        $file = 'custom/Extension/modules/' . $bean->module_dir. '/Ext/Vardefs/teams.php';
+        $contents = "<?php\n";
+        if(!empty($fieldDiff)){
+            foreach($fieldDiff as $key => $val){
+                $contents .= "\n\$GLOBALS['dictionary']['". $object . "']['fields']['". $key . "']=" . var_export_helper($val) . ";";
+            }
+        }
+        $relationshipDiff = array_diff_assoc($vardefs['relationships'], $GLOBALS['dictionary'][$bean->object_name]['relationships']);
+        if(!empty($relationshipDiff)){
+            foreach($relationshipDiff as $key => $val){
+                $contents .= "\n\$GLOBALS['dictionary']['". $object . "']['relationships']['". $key . "']=" . var_export_helper($val) . ";";
+            }
+        }
+        $indexDiff = array_diff_assoc($vardefs['indices'], $GLOBALS['dictionary'][$bean->object_name]['indices']);
+        if(!empty($indexDiff)){
+            foreach($indexDiff as $key => $val){
+                    $contents .= "\n\$GLOBALS['dictionary']['". $object . "']['indices']['". $key . "']=" . var_export_helper($val) . ";";
+            }
+        }
+        if( $fh = @sugar_fopen( $file, 'wt' ) )
+        {
+            fputs( $fh, $contents);
+            fclose( $fh );
+        }
 
-	if(isset($bean->field_defs['team_set_id'])) {
-		//Create the team_set_id column
-		$FieldArray = $GLOBALS['db']->helper->get_columns($bean->table_name);
-		if(!isset($FieldArray['team_set_id'])) {
-			$GLOBALS['db']->addColumn($bean->table_name, $bean->field_defs['team_set_id']);
-		}
-		$indexArray =  $GLOBALS['db']->helper->get_indices($bean->table_name);
+
+        //we have written out the teams.php into custom/Extension/modules/{$module_dir}/Ext/Vardefs/teams.php'
+        //now let's merge back into vardefs.ext.php
+        require_once('ModuleInstall/ModuleInstaller.php');
+        $mi = new ModuleInstaller();
+        $mi->merge_files('Ext/Vardefs/', 'vardefs.ext.php');
+        VardefManager::loadVardef($bean->module_dir, $bean->object_name, true);
+        $bean->field_defs = $GLOBALS['dictionary'][$bean->object_name]['fields'];
+    }
+
+    if(isset($bean->field_defs['team_set_id'])) {
+        //Create the team_set_id column
+        $FieldArray = $GLOBALS['db']->helper->get_columns($bean->table_name);
+        if(!isset($FieldArray['team_set_id'])) {
+            $GLOBALS['db']->addColumn($bean->table_name, $bean->field_defs['team_set_id']);
+        }
+        $indexArray =  $GLOBALS['db']->helper->get_indices($bean->table_name);
 
         $indexName = getValidDBName('idx_'.strtolower($bean->table_name).'_tmst_id', true, 34);
         $indexDef = array(
-					 array(
-						'name' => $indexName,
-						'type' => 'index',
-						'fields' => array('team_set_id')
-					 )
-				   );
-		if(!isset($indexArray[$indexName])) {
-			$GLOBALS['db']->addIndexes($bean->table_name, $indexDef);
-		}
+                        array(
+                        'name' => $indexName,
+                        'type' => 'index',
+                        'fields' => array('team_set_id')
+                        )
+                    );
+        if(!isset($indexArray[$indexName])) {
+            $GLOBALS['db']->addIndexes($bean->table_name, $indexDef);
+        }
 
-		//Update the table's team_set_id column to have the same values as team_id
-	    $GLOBALS['db']->query("UPDATE {$bean->table_name} SET team_set_id = {$column_name}");
-	}
+        //Update the table's team_set_id column to have the same values as team_id
+        $GLOBALS['db']->query("UPDATE {$bean->table_name} SET team_set_id = {$column_name}");
+    }
 }
 
 /**
@@ -3406,43 +3406,43 @@ 
     $result = $GLOBALS['db']->query("SELECT id, user_name, first_name, last_name FROM users where deleted=0");
 
     while($row = $GLOBALS['db']->fetchByAssoc($result)) {
-    	$results2 = $GLOBALS['db']->query("SELECT id FROM teams WHERE name = '({$row['user_name']})'");
-    	$assoc = '';
-  		if(!$assoc = $GLOBALS['db']->fetchByAssoc($results2)) {
-  			//if team does not exist, then lets create the team for this user
-  			$team = new Team();
-			$user = new User();
-  			$user->retrieve($row['id']);
-			$team->new_user_created($user);
-			$team_id = $team->id;
-  		}else{
-  			$team_id =$assoc['id'];
-  		}
-
-  			//upgrade the team
-  			$name = is_null($row['first_name'])?'':$row['first_name'];
-			$name_2 = is_null($row['last_name'])?'':$row['last_name'];
-			$associated_user_id = $row['id'];
-
-			//Bug 32914
-			//Ensure team->name is not empty by using team->name_2 if available
-			if(empty($name) && !empty($name_2)) {
-			   $name = $name_2;
-			   $name_2 = '';
-			}
-
-			$query = "UPDATE teams SET name = '{$name}', name_2 = '{$name_2}', associated_user_id = '{$associated_user_id}' WHERE id = '{$team_id}'";
-			$GLOBALS['db']->query($query);
+        $results2 = $GLOBALS['db']->query("SELECT id FROM teams WHERE name = '({$row['user_name']})'");
+        $assoc = '';
+            if(!$assoc = $GLOBALS['db']->fetchByAssoc($results2)) {
+                //if team does not exist, then lets create the team for this user
+                $team = new Team();
+            $user = new User();
+                $user->retrieve($row['id']);
+            $team->new_user_created($user);
+            $team_id = $team->id;
+            }else{
+                $team_id =$assoc['id'];
+            }
+
+                //upgrade the team
+                $name = is_null($row['first_name'])?'':$row['first_name'];
+            $name_2 = is_null($row['last_name'])?'':$row['last_name'];
+            $associated_user_id = $row['id'];
+
+            //Bug 32914
+            //Ensure team->name is not empty by using team->name_2 if available
+            if(empty($name) && !empty($name_2)) {
+                $name = $name_2;
+                $name_2 = '';
+            }
+
+            $query = "UPDATE teams SET name = '{$name}', name_2 = '{$name_2}', associated_user_id = '{$associated_user_id}' WHERE id = '{$team_id}'";
+            $GLOBALS['db']->query($query);
     } //while
 
     //Update the team_set_id and default_team columns
     $ce_to_pro_or_ent = (isset($_SESSION['upgrade_from_flavor']) && ($_SESSION['upgrade_from_flavor'] == 'SugarCE to SugarPro' || $_SESSION['upgrade_from_flavor'] == 'SugarCE to SugarEnt' || $_SESSION['upgrade_from_flavor'] == 'SugarCE to SugarCorp' || $_SESSION['upgrade_from_flavor'] == 'SugarCE to SugarUlt'));
 
     //Update team_set_id
-	if($ce_to_pro_or_ent) {
-	   $GLOBALS['db']->query("update users set team_set_id = (select teams.id from teams where teams.associated_user_id = users.id)");
-	   $GLOBALS['db']->query("update users set default_team = (select teams.id from teams where teams.associated_user_id = users.id)");
-	}
+    if($ce_to_pro_or_ent) {
+        $GLOBALS['db']->query("update users set team_set_id = (select teams.id from teams where teams.associated_user_id = users.id)");
+        $GLOBALS['db']->query("update users set default_team = (select teams.id from teams where teams.associated_user_id = users.id)");
+    }
 
 }
 
@@ -3480,15 +3480,15 @@ 
 
             if(!empty($newModuleList))
             {
-	            //grab the existing system tabs
-	            $tabs = $newTB->get_system_tabs();
+                //grab the existing system tabs
+                $tabs = $newTB->get_system_tabs();
 
-	            //add the new tabs to the array
-	            foreach($newModuleList as $nm ){
-	              $tabs[$nm] = $nm;
-	            }
+                //add the new tabs to the array
+                foreach($newModuleList as $nm ){
+                    $tabs[$nm] = $nm;
+                }
 
-	            $newTB->set_system_tabs($tabs);
+                $newTB->set_system_tabs($tabs);
             }
             logThis('module tabs updated',$path);
         }
@@ -3504,242 +3504,242 @@ 
      * have been affected.
      *
      */
-	function fix_dropdown_list() {
+    function fix_dropdown_list() {
         if(file_exists('custom/include/language')) {
-           $files = array();
-           $affected_modules = array();
-           $affected_keys = array();
-
-           getFiles($files, 'custom/include/language', '/\.php$/i');
-           foreach($files as $file) {
-
-              if(file_exists($file . '.bak')) {
-              	 $bak_mod_time = filemtime($file . '.bak');
-              	 $php_mod_time = filemtime($file);
-              	 //We're saying if the .php file was modified 30 seconds no more than php.bak file then we
-              	 //run these additional cleanup checks
-              	 if($php_mod_time - $bak_mod_time < 30) {
-
-              	 	$app_list_strings = array();
-              	 	$GLOBALS['app_list_strings'] = array();
-              	 	require($file . '.bak');
-              	 	$bak_app_list_strings = array_merge($app_list_strings, $GLOBALS['app_list_strings']);
-
-              	 	$app_list_strings = array();
-              	 	$GLOBALS['app_list_strings'] = array();
-              	 	require($file);
-              	 	$php_app_list_strings = array_merge($app_list_strings, $GLOBALS['app_list_strings']);
-
-              	 	//Get the file contents
-              	 	$contents = file_get_contents($file);
-
-              	 	//Now simulate a fix for the file before we compare w/ the .php file
-              	 	//we also append to the $contents
-              	 	foreach($bak_app_list_strings as $key=>$entry) {
-						   if(preg_match('/([^A-Za-z_])/', $key, $matches) && is_array($entry)) {
-						   	  $new_key = preg_replace('/[^A-Za-z_]/', '_', $key);
-						   	  $bak_app_list_strings[$new_key] = $bak_app_list_strings[$key];
-						   	  unset($bak_app_list_strings[$key]);
-						   	  //Now if the entry doesn't exists in the .php file, then add to contents
-						   	  if(!isset($php_app_list_strings[$new_key])) {
-						   	  	 $contents .= "\n\$GLOBALS['app_list_strings']['{$new_key}'] = " . var_export_helper($bak_app_list_strings[$new_key]) . ";";
-						   	  }
-						   } //if
-              	 	} //foreach
-
-              	 	//Now load the .php file to do the comparison
-              	 	foreach($php_app_list_strings as $key=>$entry) {
-              	 		if(isset($bak_app_list_strings[$key])) {
-              	 			$diff = array_diff($bak_app_list_strings[$key], $entry);
-              	 			if(!empty($diff)) {
-              	 			   //There is a difference, so copy the $bak_app_list_strings version into the .php file
-              	 			   $contents .= "\n\$GLOBALS['app_list_strings']['{$key}'] = " . var_export_helper($bak_app_list_strings[$key]) . ";";
-              	 			} //if
-              	 		} //if
-              	 	} //foreach
-
-              	 	//Now write out the file contents
-              	 	//Create backup just in case
-              	 	copy($file, $file . '.php_bak');
- 					$fp = @sugar_fopen($file, 'w');
-	                if($fp) {
-		               fwrite($fp, $contents);
-		               fclose($fp);
-	                } else {
-	                   $GLOBALS['log']->error("Unable to update file contents in fix_dropdown_list for {$file}");
-	                } //if-else
-              	 }
-              }
-
-              unset($GLOBALS['app_strings']);
-              unset($GLOBALS['app_list_strings']);
-              $app_list_strings = array();
-           	  require($file);
-           	  $touched = false;
-           	  $contents = file_get_contents($file);
-           	  if ( !isset($GLOBALS['app_list_strings']) ) {
-           	      $GLOBALS['app_list_strings'] = $app_list_strings;
-           	  }
-           	  else {
-           	      $GLOBALS['app_list_strings'] = array_merge($app_list_strings, $GLOBALS['app_list_strings']);
-           	  }
-
-           	  if(isset($GLOBALS['app_list_strings']) && is_array($GLOBALS['app_list_strings'])) {
-           	  	 foreach($GLOBALS['app_list_strings'] as $key=>$entry) {
-           	  	 	if(preg_match('/([^A-Za-z_])/', $key, $matches) && is_array($entry)) {
-           	  	 	   $result = $GLOBALS['db']->query("SELECT custom_module FROM fields_meta_data WHERE ext1 = '{$key}'");
-           	  	 	   if(!empty($result)) {
-           	  	 	   	  while($row = $GLOBALS['db']->fetchByAssoc($result)) {
-           	  	 	   	  	    $custom_module = $row['custom_module'];
-           	  	 	   	  	    if(!empty($GLOBALS['beanList'][$custom_module])) {
-           	  	 	   	           $affected_modules[$custom_module] = $GLOBALS['beanList'][$custom_module];
-           	  	 	   	  	    }
-           	  	 	   	  } //while
-           	  	 	   }
-
-           	  	 	   //Replace all invalid characters with '_' character
-	           	  	   $new_key = preg_replace('/[^A-Za-z_]/', '_', $key);
-	           	  	   $affected_keys[$key] = $new_key;
-
-           	  	 	   $GLOBALS['app_list_strings'][$new_key] = $GLOBALS['app_list_strings'][$key];
-           	  	 	   unset($GLOBALS['app_list_strings'][$key]);
-
-           	  	 	   $pattern_match = "/(\[\s*\'{$key}\'\s*\])/";
-           	  	 	   $new_key = "['{$new_key}']";
-           	  	 	   $out = preg_replace($pattern_match, $new_key, $contents);
-           	  	 	   $contents = $out;
-           	  	 	   $touched = true;
-           	  	 	} //if
-           	  	 } //foreach
-
-                 //This is a check for g => h instances where the file contents were incorrectly written
-                 //and also fixes the scenario where via a UI upgrade, the app_list_strings were incorrectly
-                 //merged with app_list_strings variables declared elsewhere
-           	  	 if(!$touched) {
-           	  	 	   if(preg_match('/\$GLOBALS\s*\[\s*[\"|\']app_list_strings[\"|\']\s*\]\s*=\s*array\s*\(/', $contents)) {
-           	  	 	   	  //Now also remove all the non-custom labels that were added
-           	  	 	   	  if(preg_match('/language\/([^\.]+)\.lang\.php$/', $file, $matches)) {
-           	  	 	   	        $language = $matches[1];
-
-           	  	 	   	        $app_list_strings = array();
-
-           	  	                if(file_exists("include/language/$language.lang.php")) {
-								   include("include/language/$language.lang.php");
-								}
-								if(file_exists("include/language/$language.lang.override.php")) {
-								   $app_list_strings =  _mergeCustomAppListStrings("include/language/$language.lang.override.php" , $app_list_strings) ;
-								}
-								if(file_exists("custom/application/Ext/Language/$language.ext.lang.php")) {
-								   $app_list_strings =  _mergeCustomAppListStrings("custom/application/Ext/Language/$language.ext.lang.php" , $app_list_strings) ;
-								}
-								if(file_exists("custom/application/Ext/Language/$language.lang.ext.php")) {
-								   $app_list_strings =  _mergeCustomAppListStrings("custom/application/Ext/Language/$language.lang.ext.php" , $app_list_strings) ;
-								}
-
-								$all_non_custom_include_language_strings = $app_strings;
-								$all_non_custom_include_language_list_strings = $app_list_strings;
-
-								$unset_keys = array();
-								if(!empty($GLOBALS['app_list_strings'])) {
-									foreach($GLOBALS['app_list_strings'] as $key=>$value) {
-										$diff = array();
-										if(isset($all_non_custom_include_language_list_strings[$key])) {
-											$diff = array_diff($all_non_custom_include_language_list_strings[$key], $GLOBALS['app_list_strings'][$key]);
-										}
-
-										if(!empty($all_non_custom_include_language_list_strings[$key]) && empty($diff)) {
-											$unset_keys[] = $key;
-										}
-									}
-								}
-
-								foreach($unset_keys as $key) {
-									unset($GLOBALS['app_list_strings'][$key]);
-								}
-
-								if(!empty($GLOBALS['app_strings'])) {
-	           	  	 	   	  		foreach($GLOBALS['app_strings'] as $key=>$value) {
-										if(!empty($all_non_custom_include_language_strings[$key])) {
-										   unset($GLOBALS['app_strings'][$key]);
-										}
-	           	  	 	   	  		}
-								}
-           	  	 	   	  } //if(preg_match...)
-
-			              $out = "<?php \n";
-			              if(!empty($GLOBALS['app_strings'])) {
-				             foreach($GLOBALS['app_strings'] as $key=>$entry) {
-				                     $out .= "\n\$GLOBALS['app_strings']['$key']=" . var_export_helper($entry) . ";";
-				             }
-			              }
-
-						  foreach($GLOBALS['app_list_strings'] as $key=>$entry) {
-								  $out .= "\n\$GLOBALS['app_list_strings']['$key']=" . var_export_helper($entry) . ";";
-						  } //foreach
-
-						  $touched = true;
-           	  	 	   } //if(preg_match...)
-           	  	 } //if(!$touched)
-
-           	  	 if($touched) {
-	           	  	 //Create a backup just in case
-			         copy($file, $file . '.bak');
-	             	 $fp = @sugar_fopen($file, 'w');
-	                 if($fp) {
-		               fwrite($fp, $out);
-		               fclose($fp);
-	                 } else {
-	                   //If we can't update the file, just return
-	                   $GLOBALS['log']->error("Unable to update file contents in fix_dropdown_list.");
-	                   return;
-	                 }
-           	  	 } //if($touched)
-           	  } //if
-
-           } //foreach($files)
-
-           //Update db entries (the order matters here... need to process database changes first)
-           if(!empty($affected_keys)) {
-           	  foreach($affected_keys as $old_key=>$new_key) {
-           	  	 	  $GLOBALS['db']->query("UPDATE fields_meta_data SET ext1 = '{$new_key}' WHERE ext1 = '{$old_key}'");
-           	  }
-           }
-
-           //Update vardef files for affected modules
-           if(!empty($affected_modules)) {
-           	  foreach($affected_modules as $module=>$object) {
-           	  	  VardefManager::refreshVardefs($module, $object);
-           	  }
-           }
+            $files = array();
+            $affected_modules = array();
+            $affected_keys = array();
+
+            getFiles($files, 'custom/include/language', '/\.php$/i');
+            foreach($files as $file) {
+
+                if(file_exists($file . '.bak')) {
+                    $bak_mod_time = filemtime($file . '.bak');
+                    $php_mod_time = filemtime($file);
+                    //We're saying if the .php file was modified 30 seconds no more than php.bak file then we
+                    //run these additional cleanup checks
+                    if($php_mod_time - $bak_mod_time < 30) {
+
+                        $app_list_strings = array();
+                        $GLOBALS['app_list_strings'] = array();
+                        require($file . '.bak');
+                        $bak_app_list_strings = array_merge($app_list_strings, $GLOBALS['app_list_strings']);
+
+                        $app_list_strings = array();
+                        $GLOBALS['app_list_strings'] = array();
+                        require($file);
+                        $php_app_list_strings = array_merge($app_list_strings, $GLOBALS['app_list_strings']);
+
+                        //Get the file contents
+                        $contents = file_get_contents($file);
+
+                        //Now simulate a fix for the file before we compare w/ the .php file
+                        //we also append to the $contents
+                        foreach($bak_app_list_strings as $key=>$entry) {
+                            if(preg_match('/([^A-Za-z_])/', $key, $matches) && is_array($entry)) {
+                                    $new_key = preg_replace('/[^A-Za-z_]/', '_', $key);
+                                    $bak_app_list_strings[$new_key] = $bak_app_list_strings[$key];
+                                    unset($bak_app_list_strings[$key]);
+                                    //Now if the entry doesn't exists in the .php file, then add to contents
+                                    if(!isset($php_app_list_strings[$new_key])) {
+                                        $contents .= "\n\$GLOBALS['app_list_strings']['{$new_key}'] = " . var_export_helper($bak_app_list_strings[$new_key]) . ";";
+                                    }
+                            } //if
+                        } //foreach
+
+                        //Now load the .php file to do the comparison
+                        foreach($php_app_list_strings as $key=>$entry) {
+                            if(isset($bak_app_list_strings[$key])) {
+                                $diff = array_diff($bak_app_list_strings[$key], $entry);
+                                if(!empty($diff)) {
+                                    //There is a difference, so copy the $bak_app_list_strings version into the .php file
+                                    $contents .= "\n\$GLOBALS['app_list_strings']['{$key}'] = " . var_export_helper($bak_app_list_strings[$key]) . ";";
+                                } //if
+                            } //if
+                        } //foreach
+
+                        //Now write out the file contents
+                        //Create backup just in case
+                        copy($file, $file . '.php_bak');
+                        $fp = @sugar_fopen($file, 'w');
+                    if($fp) {
+                        fwrite($fp, $contents);
+                        fclose($fp);
+                    } else {
+                        $GLOBALS['log']->error("Unable to update file contents in fix_dropdown_list for {$file}");
+                    } //if-else
+                    }
+                }
+
+                unset($GLOBALS['app_strings']);
+                unset($GLOBALS['app_list_strings']);
+                $app_list_strings = array();
+                    require($file);
+                    $touched = false;
+                    $contents = file_get_contents($file);
+                    if ( !isset($GLOBALS['app_list_strings']) ) {
+                        $GLOBALS['app_list_strings'] = $app_list_strings;
+                    }
+                    else {
+                        $GLOBALS['app_list_strings'] = array_merge($app_list_strings, $GLOBALS['app_list_strings']);
+                    }
+
+                    if(isset($GLOBALS['app_list_strings']) && is_array($GLOBALS['app_list_strings'])) {
+                        foreach($GLOBALS['app_list_strings'] as $key=>$entry) {
+                            if(preg_match('/([^A-Za-z_])/', $key, $matches) && is_array($entry)) {
+                                $result = $GLOBALS['db']->query("SELECT custom_module FROM fields_meta_data WHERE ext1 = '{$key}'");
+                                if(!empty($result)) {
+                                    while($row = $GLOBALS['db']->fetchByAssoc($result)) {
+                                            $custom_module = $row['custom_module'];
+                                            if(!empty($GLOBALS['beanList'][$custom_module])) {
+                                            $affected_modules[$custom_module] = $GLOBALS['beanList'][$custom_module];
+                                            }
+                                    } //while
+                                }
+
+                                //Replace all invalid characters with '_' character
+                            $new_key = preg_replace('/[^A-Za-z_]/', '_', $key);
+                            $affected_keys[$key] = $new_key;
+
+                                $GLOBALS['app_list_strings'][$new_key] = $GLOBALS['app_list_strings'][$key];
+                                unset($GLOBALS['app_list_strings'][$key]);
+
+                                $pattern_match = "/(\[\s*\'{$key}\'\s*\])/";
+                                $new_key = "['{$new_key}']";
+                                $out = preg_replace($pattern_match, $new_key, $contents);
+                                $contents = $out;
+                                $touched = true;
+                            } //if
+                        } //foreach
+
+                    //This is a check for g => h instances where the file contents were incorrectly written
+                    //and also fixes the scenario where via a UI upgrade, the app_list_strings were incorrectly
+                    //merged with app_list_strings variables declared elsewhere
+                        if(!$touched) {
+                                if(preg_match('/\$GLOBALS\s*\[\s*[\"|\']app_list_strings[\"|\']\s*\]\s*=\s*array\s*\(/', $contents)) {
+                                    //Now also remove all the non-custom labels that were added
+                                    if(preg_match('/language\/([^\.]+)\.lang\.php$/', $file, $matches)) {
+                                            $language = $matches[1];
+
+                                            $app_list_strings = array();
+
+                                        if(file_exists("include/language/$language.lang.php")) {
+                                    include("include/language/$language.lang.php");
+                                }
+                                if(file_exists("include/language/$language.lang.override.php")) {
+                                    $app_list_strings =  _mergeCustomAppListStrings("include/language/$language.lang.override.php" , $app_list_strings) ;
+                                }
+                                if(file_exists("custom/application/Ext/Language/$language.ext.lang.php")) {
+                                    $app_list_strings =  _mergeCustomAppListStrings("custom/application/Ext/Language/$language.ext.lang.php" , $app_list_strings) ;
+                                }
+                                if(file_exists("custom/application/Ext/Language/$language.lang.ext.php")) {
+                                    $app_list_strings =  _mergeCustomAppListStrings("custom/application/Ext/Language/$language.lang.ext.php" , $app_list_strings) ;
+                                }
+
+                                $all_non_custom_include_language_strings = $app_strings;
+                                $all_non_custom_include_language_list_strings = $app_list_strings;
+
+                                $unset_keys = array();
+                                if(!empty($GLOBALS['app_list_strings'])) {
+                                    foreach($GLOBALS['app_list_strings'] as $key=>$value) {
+                                        $diff = array();
+                                        if(isset($all_non_custom_include_language_list_strings[$key])) {
+                                            $diff = array_diff($all_non_custom_include_language_list_strings[$key], $GLOBALS['app_list_strings'][$key]);
+                                        }
+
+                                        if(!empty($all_non_custom_include_language_list_strings[$key]) && empty($diff)) {
+                                            $unset_keys[] = $key;
+                                        }
+                                    }
+                                }
+
+                                foreach($unset_keys as $key) {
+                                    unset($GLOBALS['app_list_strings'][$key]);
+                                }
+
+                                if(!empty($GLOBALS['app_strings'])) {
+                                                foreach($GLOBALS['app_strings'] as $key=>$value) {
+                                        if(!empty($all_non_custom_include_language_strings[$key])) {
+                                            unset($GLOBALS['app_strings'][$key]);
+                                        }
+                                                }
+                                }
+                                    } //if(preg_match...)
+
+                            $out = "<?php \n";
+                            if(!empty($GLOBALS['app_strings'])) {
+                                foreach($GLOBALS['app_strings'] as $key=>$entry) {
+                                        $out .= "\n\$GLOBALS['app_strings']['$key']=" . var_export_helper($entry) . ";";
+                                }
+                            }
+
+                            foreach($GLOBALS['app_list_strings'] as $key=>$entry) {
+                                    $out .= "\n\$GLOBALS['app_list_strings']['$key']=" . var_export_helper($entry) . ";";
+                            } //foreach
+
+                            $touched = true;
+                                } //if(preg_match...)
+                        } //if(!$touched)
+
+                        if($touched) {
+                            //Create a backup just in case
+                        copy($file, $file . '.bak');
+                        $fp = @sugar_fopen($file, 'w');
+                        if($fp) {
+                        fwrite($fp, $out);
+                        fclose($fp);
+                        } else {
+                        //If we can't update the file, just return
+                        $GLOBALS['log']->error("Unable to update file contents in fix_dropdown_list.");
+                        return;
+                        }
+                        } //if($touched)
+                    } //if
+
+            } //foreach($files)
+
+            //Update db entries (the order matters here... need to process database changes first)
+            if(!empty($affected_keys)) {
+                    foreach($affected_keys as $old_key=>$new_key) {
+                            $GLOBALS['db']->query("UPDATE fields_meta_data SET ext1 = '{$new_key}' WHERE ext1 = '{$old_key}'");
+                    }
+            }
+
+            //Update vardef files for affected modules
+            if(!empty($affected_modules)) {
+                    foreach($affected_modules as $module=>$object) {
+                        VardefManager::refreshVardefs($module, $object);
+                    }
+            }
         }
-	}
+    }
 
 
-	function update_iframe_dashlets(){
-		require_once(sugar_cached('dashlets/dashlets.php'));
-
-		$db = DBManagerFactory::getInstance();
-		$query = "SELECT id, contents, assigned_user_id FROM user_preferences WHERE deleted = 0 AND category = 'Home'";
-		$result = $db->query($query, true, "Unable to update new default dashlets! ");
-		while ($row = $db->fetchByAssoc($result)) {
-			$content = unserialize(base64_decode($row['contents']));
-			$assigned_user_id = $row['assigned_user_id'];
-			$record_id = $row['id'];
-
-			$current_user = new User();
-			$current_user->retrieve($row['assigned_user_id']);
-
-			if(!empty($content['dashlets']) && !empty($content['pages'])){
-				$originalDashlets = $content['dashlets'];
-				foreach($originalDashlets as $key => $ds){
-				    if(!empty($ds['options']['url']) && stristr($ds['options']['url'],'https://www.sugarcrm.com/crm/product/gopro')){
-						unset($originalDashlets[$key]);
-					}
-				}
-				$current_user->setPreference('dashlets', $originalDashlets, 0, 'Home');
-			}
-		}
-	}
+    function update_iframe_dashlets(){
+        require_once(sugar_cached('dashlets/dashlets.php'));
+
+        $db = DBManagerFactory::getInstance();
+        $query = "SELECT id, contents, assigned_user_id FROM user_preferences WHERE deleted = 0 AND category = 'Home'";
+        $result = $db->query($query, true, "Unable to update new default dashlets! ");
+        while ($row = $db->fetchByAssoc($result)) {
+            $content = unserialize(base64_decode($row['contents']));
+            $assigned_user_id = $row['assigned_user_id'];
+            $record_id = $row['id'];
+
+            $current_user = new User();
+            $current_user->retrieve($row['assigned_user_id']);
+
+            if(!empty($content['dashlets']) && !empty($content['pages'])){
+                $originalDashlets = $content['dashlets'];
+                foreach($originalDashlets as $key => $ds){
+                    if(!empty($ds['options']['url']) && stristr($ds['options']['url'],'https://www.sugarcrm.com/crm/product/gopro')){
+                        unset($originalDashlets[$key]);
+                    }
+                }
+                $current_user->setPreference('dashlets', $originalDashlets, 0, 'Home');
+            }
+        }
+    }
 
 
     /**
@@ -3748,22 +3748,22 @@ 
      * This method attempts to convert date type image to text on Microsoft SQL Server.
      * This method could NOT be used in any other type of datebases.
      */
-	function convertImageToText($table_name,$column_name){
-		$set_lang = "SET LANGUAGE us_english";
-		$GLOBALS['db']->query($set_lang);
-	    if($GLOBALS['db']->lastError()){
+    function convertImageToText($table_name,$column_name){
+        $set_lang = "SET LANGUAGE us_english";
+        $GLOBALS['db']->query($set_lang);
+        if($GLOBALS['db']->lastError()){
             logThis('An error occurred when performing this query-->'.$set_lang);
         }
-       $q="SELECT data_type
+        $q="SELECT data_type
         FROM INFORMATION_SCHEMA.Tables T JOIN INFORMATION_SCHEMA.Columns C
         ON T.TABLE_NAME = C.TABLE_NAME where T.TABLE_NAME = '$table_name' and C.COLUMN_NAME = '$column_name'";
-       $res= $GLOBALS['db']->query($q);
-       if($GLOBALS['db']->lastError()){
+        $res= $GLOBALS['db']->query($q);
+        if($GLOBALS['db']->lastError()){
             logThis('An error occurred when performing this query-->'.$q);
         }
-       $row= $GLOBALS['db']->fetchByAssoc($res);
+        $row= $GLOBALS['db']->fetchByAssoc($res);
 
-     if(trim(strtolower($row['data_type'])) == 'image'){
+        if(trim(strtolower($row['data_type'])) == 'image'){
         $addContent_temp = "alter table {$table_name} add {$column_name}_temp text null";
         $GLOBALS['db']->query($addContent_temp);
         if($GLOBALS['db']->lastError()){
@@ -3772,7 +3772,7 @@ 
         $qN = "select count=datalength({$column_name}), id, {$column_name} from {$table_name}";
         $result = $GLOBALS['db']->query($qN);
         while($row = $GLOBALS['db']->fetchByAssoc($result)){
-           if($row['count'] >8000){
+            if($row['count'] >8000){
                 $contentLength = $row['count'];
                 $start = 1;
                 $next=8000;
@@ -3795,15 +3795,15 @@ 
                 if($GLOBALS['db']->lastError()){
                     logThis('An error occurred when performing this query-->'.$addContentDataText);
                 }
-           }
-           else{
+            }
+            else{
                 $addContentDataText="update {$table_name} set {$column_name}_temp =
                 convert(varchar(max), convert(varbinary(8000), {$column_name})) where id= '{$row['id']}'";
                 $GLOBALS['db']->query($addContentDataText);
                 if($GLOBALS['db']->lastError()){
                     logThis('An error occurred when performing this query-->'.$addContentDataText);
                 }
-           }
+            }
         }
         //drop the contents now and change contents_temp to contents
         $dropColumn = "alter table {$table_name} drop column {$column_name}";
@@ -3816,66 +3816,66 @@ 
         if($GLOBALS['db']->lastError()){
             logThis('An error occurred when performing this query-->'.$changeColumnName);
         }
-     }
+        }
     }
 
-	 /**
-     * clearHelpFiles
-     * This method attempts to delete all English inline help files.
-     * This method was introduced by 5.5.0RC2.
-     */
+        /**
+         * clearHelpFiles
+         * This method attempts to delete all English inline help files.
+         * This method was introduced by 5.5.0RC2.
+         */
     function clearHelpFiles(){
-		$modulePath = clean_path(getcwd() . '/modules');
-		$allHelpFiles = array();
-		getFiles($allHelpFiles, $modulePath, "/en_us.help.*/");
-
-		foreach( $allHelpFiles as $the_file ){
-	        if( is_file( $the_file ) ){
-	            unlink( $the_file );
-	            logThis("Deleted file: $the_file");
-	        }
-	    }
-	}
+        $modulePath = clean_path(getcwd() . '/modules');
+        $allHelpFiles = array();
+        getFiles($allHelpFiles, $modulePath, "/en_us.help.*/");
+
+        foreach( $allHelpFiles as $the_file ){
+            if( is_file( $the_file ) ){
+                unlink( $the_file );
+                logThis("Deleted file: $the_file");
+            }
+        }
+    }
 
 
 
-	/**
-	 * upgradeDateTimeFields
-	 *
-	 * This method came from bug: 39757 where the date_end field is a date field and not a datetime field
-	 * which prevents you from performing timezone offset calculations once the data has been saved.
-	 *
-	 * @param path String location to log file, empty by default
-	 */
-	function upgradeDateTimeFields($path)
-	{
-		//bug: 39757
-		global $db;
-		$meetingsSql = "UPDATE meetings SET date_end = ".$db->convert("date_start", 'add_time', array('duration_hours', 'duration_minutes'));
-		$callsSql = "UPDATE calls SET date_end = ".$db->convert("date_start", 'add_time', array('duration_hours', 'duration_minutes'));
-    	logThis('upgradeDateTimeFields Meetings SQL:' . $meetingsSql, $path);
-		$db->query($meetingsSql);
-
-		logThis('upgradeDateTimeFields Calls SQL:' . $callsSql, $path);
-		$db->query($callsSql);
-	}
+    /**
+     * upgradeDateTimeFields
+     *
+     * This method came from bug: 39757 where the date_end field is a date field and not a datetime field
+     * which prevents you from performing timezone offset calculations once the data has been saved.
+     *
+     * @param path String location to log file, empty by default
+     */
+    function upgradeDateTimeFields($path)
+    {
+        //bug: 39757
+        global $db;
+        $meetingsSql = "UPDATE meetings SET date_end = ".$db->convert("date_start", 'add_time', array('duration_hours', 'duration_minutes'));
+        $callsSql = "UPDATE calls SET date_end = ".$db->convert("date_start", 'add_time', array('duration_hours', 'duration_minutes'));
+        logThis('upgradeDateTimeFields Meetings SQL:' . $meetingsSql, $path);
+        $db->query($meetingsSql);
+
+        logThis('upgradeDateTimeFields Calls SQL:' . $callsSql, $path);
+        $db->query($callsSql);
+    }
 
-	/**
-	 * upgradeDocumentTypeFields
-	 *
-	 */
-	function upgradeDocumentTypeFields($path){
-		//bug: 39757
-		global $db;
-
-		$documentsSql = "UPDATE documents SET doc_type = 'Sugar' WHERE doc_type IS NULL";
-		$meetingsSql = "UPDATE meetings SET type = 'Sugar' WHERE type IS NULL";
-
-		logThis('upgradeDocumentTypeFields Documents SQL:' . $documentsSql, $path);
-		$db->query($documentsSql);
-		logThis('upgradeDocumentTypeFields Meetings SQL:' . $meetingsSql, $path);
-		$db->query($meetingsSql);
-	}
+    /**
+     * upgradeDocumentTypeFields
+     *
+     */
+    function upgradeDocumentTypeFields($path){
+        //bug: 39757
+        global $db;
+
+        $documentsSql = "UPDATE documents SET doc_type = 'Sugar' WHERE doc_type IS NULL";
+        $meetingsSql = "UPDATE meetings SET type = 'Sugar' WHERE type IS NULL";
+
+        logThis('upgradeDocumentTypeFields Documents SQL:' . $documentsSql, $path);
+        $db->query($documentsSql);
+        logThis('upgradeDocumentTypeFields Meetings SQL:' . $meetingsSql, $path);
+        $db->query($meetingsSql);
+    }
 
 
 /**
@@ -3893,131 +3893,131 @@ 
  */
 function merge_config_si_settings($write_to_upgrade_log=false, $config_location='', $config_si_location='', $path='')
 {
-	if(!empty($config_location) && !file_exists($config_location))
-	{
-		if($write_to_upgrade_log)
-		{
-	       logThis('config.php file specified in ' . $config_si_location . ' could not be found.  Skip merging', $path);
-		}
-	    return false;
-	} else if(empty($config_location)) {
-		global $argv;
-		//We are assuming this is from the silentUpgrade scripts so argv[3] will point to SugarCRM install location
-		if(isset($argv[3]) && is_dir($argv[3]))
-		{
-			$config_location = $argv[3] . DIRECTORY_SEPARATOR . 'config.php';
-		}
-	}
+    if(!empty($config_location) && !file_exists($config_location))
+    {
+        if($write_to_upgrade_log)
+        {
+            logThis('config.php file specified in ' . $config_si_location . ' could not be found.  Skip merging', $path);
+        }
+        return false;
+    } else if(empty($config_location)) {
+        global $argv;
+        //We are assuming this is from the silentUpgrade scripts so argv[3] will point to SugarCRM install location
+        if(isset($argv[3]) && is_dir($argv[3]))
+        {
+            $config_location = $argv[3] . DIRECTORY_SEPARATOR . 'config.php';
+        }
+    }
 
-	//If config_location is still empty or if the file cannot be found, skip merging
-	if(empty($config_location) || !file_exists($config_location))
-	{
-	   if($write_to_upgrade_log)
-	   {
-	   	  logThis('config.php file at (' . $config_location . ') could not be found.  Skip merging.', $path);
-	   }
-	   return false;
-	} else {
-	   if($write_to_upgrade_log)
-	   {
-	      logThis('Loading config.php file at (' . $config_location . ') for merging.', $path);
-	   }
-
-	   include($config_location);
-	   if(empty($sugar_config))
-	   {
-	   	  if($write_to_upgrade_log)
-		  {
-	   	     logThis('config.php contents are empty.  Skip merging.', $path);
-		  }
-	   	  return false;
-	   }
-	}
+    //If config_location is still empty or if the file cannot be found, skip merging
+    if(empty($config_location) || !file_exists($config_location))
+    {
+        if($write_to_upgrade_log)
+        {
+                logThis('config.php file at (' . $config_location . ') could not be found.  Skip merging.', $path);
+        }
+        return false;
+    } else {
+        if($write_to_upgrade_log)
+        {
+            logThis('Loading config.php file at (' . $config_location . ') for merging.', $path);
+        }
 
-	if(!empty($config_si_location) && !file_exists($config_si_location))
-	{
-		if($write_to_upgrade_log)
-		{
-	       logThis('config_si.php file specified in ' . $config_si_location . ' could not be found.  Skip merging', $path);
-		}
-	    return false;
-	} else if(empty($config_si_location)) {
-		if(isset($argv[0]) && is_file($argv[0]))
-		{
-			$php_file = $argv[0];
-			$p_info = pathinfo($php_file);
-			$php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ?  $p_info['dirname'] . DIRECTORY_SEPARATOR : '';
-			$config_si_location = $php_dir . 'config_si.php';
-		}
-	}
+        include($config_location);
+        if(empty($sugar_config))
+        {
+                if($write_to_upgrade_log)
+            {
+                logThis('config.php contents are empty.  Skip merging.', $path);
+            }
+                return false;
+        }
+    }
 
-	//If config_si_location is still empty or if the file cannot be found, skip merging
-	if(empty($config_si_location) || !file_exists($config_si_location))
-	{
-	   if($write_to_upgrade_log)
-	   {
-	      logThis('config_si.php file at (' . $config_si_location . ') could not be found.  Skip merging.', $path);
-	   }
-	   return false;
-	} else {
-	   if($write_to_upgrade_log)
-	   {
-	      logThis('Loading config_si.php file at (' . $config_si_location . ') for merging.', $path);
-	   }
-
-	   include($config_si_location);
-	   if(empty($sugar_config_si))
-	   {
-	      if($write_to_upgrade_log)
-		  {
-	   	     logThis('config_si.php contents are empty.  Skip merging.', $path);
-		  }
-	   	  return false;
-	   }
-	}
+    if(!empty($config_si_location) && !file_exists($config_si_location))
+    {
+        if($write_to_upgrade_log)
+        {
+            logThis('config_si.php file specified in ' . $config_si_location . ' could not be found.  Skip merging', $path);
+        }
+        return false;
+    } else if(empty($config_si_location)) {
+        if(isset($argv[0]) && is_file($argv[0]))
+        {
+            $php_file = $argv[0];
+            $p_info = pathinfo($php_file);
+            $php_dir = (isset($p_info['dirname']) && $p_info['dirname'] != '.') ?  $p_info['dirname'] . DIRECTORY_SEPARATOR : '';
+            $config_si_location = $php_dir . 'config_si.php';
+        }
+    }
 
-	//Now perform the merge operation
-	$modified = false;
-	foreach($sugar_config_si as $key=>$value)
-	{
-		if(!preg_match('/^setup_/', $key) && !isset($sugar_config[$key]))
-		{
-		   if($write_to_upgrade_log)
-		   {
-		      logThis('Merge key (' . $key . ') with value (' . $value . ')', $path);
-		   }
-		   $sugar_config[$key] = $value;
-		   $modified = true;
-		}
-	}
+    //If config_si_location is still empty or if the file cannot be found, skip merging
+    if(empty($config_si_location) || !file_exists($config_si_location))
+    {
+        if($write_to_upgrade_log)
+        {
+            logThis('config_si.php file at (' . $config_si_location . ') could not be found.  Skip merging.', $path);
+        }
+        return false;
+    } else {
+        if($write_to_upgrade_log)
+        {
+            logThis('Loading config_si.php file at (' . $config_si_location . ') for merging.', $path);
+        }
 
-	if($modified)
-	{
-		if($write_to_upgrade_log)
-		{
-	       logThis('Update config.php file with new values', $path);
-		}
+        include($config_si_location);
+        if(empty($sugar_config_si))
+        {
+            if($write_to_upgrade_log)
+            {
+                logThis('config_si.php contents are empty.  Skip merging.', $path);
+            }
+                return false;
+        }
+    }
 
-	    if(!write_array_to_file("sugar_config", $sugar_config, $config_location)) {
-	       if($write_to_upgrade_log)
-		   {
-	    	  logThis('*** ERROR: could not write to config.php', $path);
-		   }
-		   return false;
-		}
-	} else {
-	   if($write_to_upgrade_log)
-	   {
-	      logThis('config.php values are in sync with config_si.php values.  Skipped merging.', $path);
-	   }
-	   return false;
-	}
+    //Now perform the merge operation
+    $modified = false;
+    foreach($sugar_config_si as $key=>$value)
+    {
+        if(!preg_match('/^setup_/', $key) && !isset($sugar_config[$key]))
+        {
+            if($write_to_upgrade_log)
+            {
+                logThis('Merge key (' . $key . ') with value (' . $value . ')', $path);
+            }
+            $sugar_config[$key] = $value;
+            $modified = true;
+        }
+    }
 
-	if($write_to_upgrade_log)
-	{
-	   logThis('End merge_config_si_settings', $path);
-	}
-	return true;
+    if($modified)
+    {
+        if($write_to_upgrade_log)
+        {
+            logThis('Update config.php file with new values', $path);
+        }
+
+        if(!write_array_to_file("sugar_config", $sugar_config, $config_location)) {
+            if($write_to_upgrade_log)
+            {
+                logThis('*** ERROR: could not write to config.php', $path);
+            }
+            return false;
+        }
+    } else {
+        if($write_to_upgrade_log)
+        {
+            logThis('config.php values are in sync with config_si.php values.  Skipped merging.', $path);
+        }
+        return false;
+    }
+
+    if($write_to_upgrade_log)
+    {
+        logThis('End merge_config_si_settings', $path);
+    }
+    return true;
 }
 
 
@@ -4032,7 +4032,7 @@ 
     remove_linkedin_config();
 
     if(!ConnectorUtils::updateMetaDataFiles()) {
-       $GLOBALS['log']->fatal('Cannot update metadata files for connectors');
+        $GLOBALS['log']->fatal('Cannot update metadata files for connectors');
     }
 
     //Delete the custom connectors.php file if it exists so that it may be properly rebuilt
@@ -4275,10 +4275,10 @@ 
  */
 function add_unified_search_to_custom_modules_vardefs()
 {
-	if(file_exists($cachefile = sugar_cached('modules/unified_search_modules.php')))
-	{
-	   unlink($cachefile);
-	}
+    if(file_exists($cachefile = sugar_cached('modules/unified_search_modules.php')))
+    {
+        unlink($cachefile);
+    }
 
 }
 
@@ -4287,51 +4287,51 @@ 
  */
 function upgradeSugarCache($file)
 {
-	global $sugar_config;
-	$cacheUploadUpgradesTemp = mk_temp_dir(sugar_cached('upgrades/temp'));
+    global $sugar_config;
+    $cacheUploadUpgradesTemp = mk_temp_dir(sugar_cached('upgrades/temp'));
 
-	unzip($file, $cacheUploadUpgradesTemp);
+    unzip($file, $cacheUploadUpgradesTemp);
 
-	if(!file_exists(clean_path("{$cacheUploadUpgradesTemp}/manifest.php"))) {
-		logThis("*** ERROR: no manifest file detected while bootstraping upgrade wizard files!");
-		return;
-	} else {
-		include(clean_path("{$cacheUploadUpgradesTemp}/manifest.php"));
-	}
+    if(!file_exists(clean_path("{$cacheUploadUpgradesTemp}/manifest.php"))) {
+        logThis("*** ERROR: no manifest file detected while bootstraping upgrade wizard files!");
+        return;
+    } else {
+        include(clean_path("{$cacheUploadUpgradesTemp}/manifest.php"));
+    }
 
-	$from_dir = "{$cacheUploadUpgradesTemp}/{$manifest['copy_files']['from_dir']}";
-	$allFiles = array();
-	if(file_exists("$from_dir/include/SugarCache")) {
-		$allFiles = findAllFiles("$from_dir/include/SugarCache", $allFiles);
-	}
-	if(file_exists("$from_dir/include/database")) {
-		$allFiles = findAllFiles("$from_dir/include/database", $allFiles);
-	}
-	if(file_exists("$from_dir/include/utils/external_cache.php")) {
-		$allFiles[] = "$from_dir/include/utils/external_cache.php";
-	}
-	if(file_exists("$from_dir/include/utils/sugar_file_utils.php")) {
-		$allFiles[] = "$from_dir/include/utils/sugar_file_utils.php";
-	}
-	if(file_exists("$from_dir/include/utils/sugar_file_utils.php")) {
-		$allFiles[] = "$from_dir/include/utils/sugar_file_utils.php";
-	}
-	if(file_exists("$from_dir/include/utils/autoloader.php")) {
-		$allFiles[] = "$from_dir/include/utils/autoloader.php";
-	}
+    $from_dir = "{$cacheUploadUpgradesTemp}/{$manifest['copy_files']['from_dir']}";
+    $allFiles = array();
+    if(file_exists("$from_dir/include/SugarCache")) {
+        $allFiles = findAllFiles("$from_dir/include/SugarCache", $allFiles);
+    }
+    if(file_exists("$from_dir/include/database")) {
+        $allFiles = findAllFiles("$from_dir/include/database", $allFiles);
+    }
+    if(file_exists("$from_dir/include/utils/external_cache.php")) {
+        $allFiles[] = "$from_dir/include/utils/external_cache.php";
+    }
+    if(file_exists("$from_dir/include/utils/sugar_file_utils.php")) {
+        $allFiles[] = "$from_dir/include/utils/sugar_file_utils.php";
+    }
+    if(file_exists("$from_dir/include/utils/sugar_file_utils.php")) {
+        $allFiles[] = "$from_dir/include/utils/sugar_file_utils.php";
+    }
+    if(file_exists("$from_dir/include/utils/autoloader.php")) {
+        $allFiles[] = "$from_dir/include/utils/autoloader.php";
+    }
 
-	foreach($allFiles as $k => $file) {
-		$destFile = str_replace($from_dir."/", "", $file);
-       if(!is_dir(dirname($destFile))) {
-			mkdir_recursive(dirname($destFile)); // make sure the directory exists
-		}
-		if ( stristr($file,'uw_main.tpl') )
+    foreach($allFiles as $k => $file) {
+        $destFile = str_replace($from_dir."/", "", $file);
+        if(!is_dir(dirname($destFile))) {
+            mkdir_recursive(dirname($destFile)); // make sure the directory exists
+        }
+        if ( stristr($file,'uw_main.tpl') )
             logThis('Skipping "'.$file.'" - file copy will during commit step.');
         else {
             logThis('updating UpgradeWizard code: '.$destFile);
             copy_recursive($file, $destFile);
         }
-	}
+    }
 }
 
 /**
@@ -4342,10 +4342,10 @@ 
  */
 function unlinkUpgradeFiles($version)
 {
-	if(!isset($version))
-	{
-	   return;
-	}
+    if(!isset($version))
+    {
+        return;
+    }
 
     //First check if we even have the scripts_for_patch/files_to_remove directory
     require_once('modules/UpgradeWizard/UpgradeRemoval.php');
@@ -4362,18 +4362,18 @@ 
 
     if(isset($_SESSION['unzip_dir']) && file_exists($_SESSION['unzip_dir'].'/scripts/files_to_remove'))
     {
-       $files_to_remove = glob($_SESSION['unzip_dir'].'/scripts/files_to_remove/*.php');
-
-       foreach($files_to_remove as $script)
-       {
-       		if(preg_match('/UpgradeRemoval(\d+)x\.php/', $script, $matches))
-       		{
-       	   	   $upgradeClass = 'UpgradeRemoval' . $matches[1] . 'x';
-       	   	   require_once($_SESSION['unzip_dir'].'/scripts/files_to_remove/' . $upgradeClass . '.php');
-               if (class_exists($upgradeClass) == false)
-               {
-                   continue;
-               }
+        $files_to_remove = glob($_SESSION['unzip_dir'].'/scripts/files_to_remove/*.php');
+
+        foreach($files_to_remove as $script)
+        {
+                if(preg_match('/UpgradeRemoval(\d+)x\.php/', $script, $matches))
+                {
+                        $upgradeClass = 'UpgradeRemoval' . $matches[1] . 'x';
+                        require_once($_SESSION['unzip_dir'].'/scripts/files_to_remove/' . $upgradeClass . '.php');
+                if (class_exists($upgradeClass) == false)
+                {
+                    continue;
+                }
 
                 //Check to make sure we should load and run this UpgradeRemoval instance
                 $upgradeInstance = new $upgradeClass();
@@ -4384,45 +4384,45 @@ 
                     $files = $upgradeInstance->getFilesToRemove($version);
                     foreach($files as $file)
                     {
-                       logThis($file);
+                        logThis($file);
                     }
                     $upgradeInstance->processFilesToRemove($files);
                 }
-       	    }
-       }
+                }
+        }
     }
 
     //Check if we have a custom directory
     if(file_exists('custom/scripts/files_to_remove'))
     {
-       //Now find
-       $files_to_remove = glob('custom/scripts/files_to_remove/*.php');
-
-       foreach($files_to_remove as $script)
-       {
-       	   if(preg_match('/\/files_to_remove\/(.*?)\.php$/', $script, $matches))
-       	   {
-       	   	   require_once($script);
-       	   	   $upgradeClass  = $matches[1];
-
-       	   	   if(!class_exists($upgradeClass))
-       	   	   {
-       	   	   	  continue;
-       	   	   }
-
-       	   	   $upgradeInstance = new $upgradeClass();
-       	   	   if($upgradeInstance instanceof UpgradeRemoval)
-       	   	   {
-       	   	   	  	  logThis('Running Custom UpgradeRemoval instance ' . $upgradeClass);
-	       	   	   	  $files = $upgradeInstance->getFilesToRemove($version);
-	       	   	   	  foreach($files as $file)
-	       	   	   	  {
-	       	   	   	  	 logThis($file);
-	       	   	   	  }
-	       	   	   	  $upgradeInstance->processFilesToRemove($files);
-       	   	   }
-       	   }
-       }
+        //Now find
+        $files_to_remove = glob('custom/scripts/files_to_remove/*.php');
+
+        foreach($files_to_remove as $script)
+        {
+                if(preg_match('/\/files_to_remove\/(.*?)\.php$/', $script, $matches))
+                {
+                        require_once($script);
+                        $upgradeClass  = $matches[1];
+
+                        if(!class_exists($upgradeClass))
+                        {
+                            continue;
+                        }
+
+                        $upgradeInstance = new $upgradeClass();
+                        if($upgradeInstance instanceof UpgradeRemoval)
+                        {
+                                    logThis('Running Custom UpgradeRemoval instance ' . $upgradeClass);
+                                $files = $upgradeInstance->getFilesToRemove($version);
+                                foreach($files as $file)
+                                {
+                                    logThis($file);
+                                }
+                                $upgradeInstance->processFilesToRemove($files);
+                        }
+                }
+        }
     }
 
 }
@@ -4436,7 +4436,7 @@ 
      * @param string $ensureUnique
      * @return string Valid column name trimmed to right length and with invalid characters removed
      */
-     function getValidDBName ($name, $ensureUnique = false, $maxLen = 30)
+        function getValidDBName ($name, $ensureUnique = false, $maxLen = 30)
     {
         // first strip any invalid characters - all but alphanumerics and -
         $name = preg_replace ( '/[^\w-]+/i', '', $name ) ;
@@ -4485,10 +4485,10 @@ 
 function whetherNeedToSkipDir($dir, $skipDirs)
 {
     foreach($skipDirs as $skipMe) {
-		if(strpos( clean_path($dir), $skipMe ) !== false) {
-			return true;
-		}
-	}
+        if(strpos( clean_path($dir), $skipMe ) !== false) {
+            return true;
+        }
+    }
     return false;
 }
 
@@ -4523,21 +4523,21 @@ 
         closedir($dh);
     }
 
-     // add all theme custom image directories
+        // add all theme custom image directories
     $custom_themes_dir = "custom/themes";
     if (is_dir($custom_themes_dir)) {
-         if($dh = opendir($custom_themes_dir))
-         {
-             while (($dir = readdir($dh)) !== false)
-             {
-                 //Since the custom theme directories don't require an images directory
-                 // we check for it implicitly
-                 if ($dir != "." && $dir != ".." && is_dir('custom/themes/'.$dir."/images")) {
-                     $sb->addDirectory($dir, "custom/themes/{$dir}/images");
-                 }
-             }
-             closedir($dh);
-         }
+            if($dh = opendir($custom_themes_dir))
+            {
+                while (($dir = readdir($dh)) !== false)
+                {
+                    //Since the custom theme directories don't require an images directory
+                    // we check for it implicitly
+                    if ($dir != "." && $dir != ".." && is_dir('custom/themes/'.$dir."/images")) {
+                        $sb->addDirectory($dir, "custom/themes/{$dir}/images");
+                    }
+                }
+                closedir($dh);
+            }
     }
 
     // generate the sprite goodies
@@ -4558,40 +4558,40 @@ 
  */
 function repairSearchFields($globString='modules/*/metadata/SearchFields.php', $path='')
 {
-	if(!empty($path))
-	{
-		logThis('Begin repairSearchFields', $path);
-	}
+    if(!empty($path))
+    {
+        logThis('Begin repairSearchFields', $path);
+    }
 
-	require_once('include/dir_inc.php');
-	require_once('modules/DynamicFields/templates/Fields/TemplateRange.php');
-	require('include/modules.php');
-
-	global $beanList;
-	$searchFieldsFiles = glob($globString);
-
-	foreach($searchFieldsFiles as $file)
-	{
-		if(preg_match('/modules\/(.*?)\/metadata\/SearchFields\.php/', $file, $matches) && isset($beanList[$matches[1]]))
-		{
-			$module = $matches[1];
-			$beanName = $beanList[$module];
-			VardefManager::loadVardef($module, $beanName);
-			if(isset($GLOBALS['dictionary'][$beanName]['fields']))
-			{
-				if(!empty($path))
-				{
-					logThis('Calling TemplateRange::repairCustomSearchFields for module ' . $module, $path);
-				}
-				TemplateRange::repairCustomSearchFields($GLOBALS['dictionary'][$beanName]['fields'], $module);
-			}
-		}
-	}
+    require_once('include/dir_inc.php');
+    require_once('modules/DynamicFields/templates/Fields/TemplateRange.php');
+    require('include/modules.php');
 
-	if(!empty($path))
-	{
-		logThis('End repairSearchFields', $path);
-	}
+    global $beanList;
+    $searchFieldsFiles = glob($globString);
+
+    foreach($searchFieldsFiles as $file)
+    {
+        if(preg_match('/modules\/(.*?)\/metadata\/SearchFields\.php/', $file, $matches) && isset($beanList[$matches[1]]))
+        {
+            $module = $matches[1];
+            $beanName = $beanList[$module];
+            VardefManager::loadVardef($module, $beanName);
+            if(isset($GLOBALS['dictionary'][$beanName]['fields']))
+            {
+                if(!empty($path))
+                {
+                    logThis('Calling TemplateRange::repairCustomSearchFields for module ' . $module, $path);
+                }
+                TemplateRange::repairCustomSearchFields($GLOBALS['dictionary'][$beanName]['fields'], $module);
+            }
+        }
+    }
+
+    if(!empty($path))
+    {
+        logThis('End repairSearchFields', $path);
+    }
 }
 
 /**

modules/ProjectTask/views/view.list.php

Spacing +52 added lines, -52 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -50,8 +50,8 @@ 
 
 require_once('include/MVC/View/views/view.list.php');
 
-class ProjectTaskViewList extends ViewList{
- 	function __construct(){
+class ProjectTaskViewList extends ViewList {
+ 	function __construct() {
  		parent::__construct();
 
  	}
@@ -59,9 +59,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ProjectTaskViewList(){
+    function ProjectTaskViewList() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -71,48 +71,48 @@ 
     }
 
 
- 	function display(){
- 		if(!$this->bean->ACLAccess('list')){
+ 	function display() {
+ 		if (!$this->bean->ACLAccess('list')) {
  			ACLController::displayNoAccess();
  			return;
  		}
         $module = $GLOBALS['module'];
  	    $metadataFile = null;
         $foundViewDefs = false;
-        if(file_exists('custom/modules/' . $module. '/metadata/listviewdefs.php')){
-            $metadataFile = 'custom/modules/' . $module . '/metadata/listviewdefs.php';
+        if (file_exists('custom/modules/'.$module.'/metadata/listviewdefs.php')) {
+            $metadataFile = 'custom/modules/'.$module.'/metadata/listviewdefs.php';
             $foundViewDefs = true;
-        }else{
-            if(file_exists('custom/modules/'.$module.'/metadata/metafiles.php')){
+        } else {
+            if (file_exists('custom/modules/'.$module.'/metadata/metafiles.php')) {
                 require_once('custom/modules/'.$module.'/metadata/metafiles.php');
-                if(!empty($metafiles[$module]['listviewdefs'])){
+                if (!empty($metafiles[$module]['listviewdefs'])) {
                     $metadataFile = $metafiles[$module]['listviewdefs'];
                     $foundViewDefs = true;
                 }
-            }elseif(file_exists('modules/'.$module.'/metadata/metafiles.php')){
+            }elseif (file_exists('modules/'.$module.'/metadata/metafiles.php')) {
                 require_once('modules/'.$module.'/metadata/metafiles.php');
-                if(!empty($metafiles[$module]['listviewdefs'])){
+                if (!empty($metafiles[$module]['listviewdefs'])) {
                     $metadataFile = $metafiles[$module]['listviewdefs'];
                     $foundViewDefs = true;
                 }
             }
         }
-        if(!$foundViewDefs && file_exists('modules/'.$module.'/metadata/listviewdefs.php')){
+        if (!$foundViewDefs && file_exists('modules/'.$module.'/metadata/listviewdefs.php')) {
                 $metadataFile = 'modules/'.$module.'/metadata/listviewdefs.php';
         }
         require_once($metadataFile);
 
 		$seed = $this->bean;
-        if(!empty($this->bean->object_name) && isset($_REQUEST[$module.'2_'.strtoupper($this->bean->object_name).'_offset'])) {//if you click the pagination button, it will populate the search criteria here
-            if(!empty($_REQUEST['current_query_by_page'])) {//The code support multi browser tabs pagination
+        if (!empty($this->bean->object_name) && isset($_REQUEST[$module.'2_'.strtoupper($this->bean->object_name).'_offset'])) {//if you click the pagination button, it will populate the search criteria here
+            if (!empty($_REQUEST['current_query_by_page'])) {//The code support multi browser tabs pagination
                 $blockVariables = array('mass', 'uid', 'massupdate', 'delete', 'merge', 'selectCount', 'request_data', 'current_query_by_page', $module.'2_'.strtoupper($this->bean->object_name).'_ORDER_BY');
-		        if(isset($_REQUEST['lvso'])){
+		        if (isset($_REQUEST['lvso'])) {
 		        	$blockVariables[] = 'lvso';
 		        }
 
                 $current_query_by_page = sugar_unserialize(base64_decode($_REQUEST['current_query_by_page']));
-                foreach($current_query_by_page as $search_key=>$search_value) {
-                    if($search_key != $module.'2_'.strtoupper($this->bean->object_name).'_offset' && !in_array($search_key, $blockVariables)) {
+                foreach ($current_query_by_page as $search_key=>$search_value) {
+                    if ($search_key != $module.'2_'.strtoupper($this->bean->object_name).'_offset' && !in_array($search_key, $blockVariables)) {
                         if (!is_array($search_value)) {
                             $_REQUEST[$search_key] = $GLOBALS['db']->quote($search_value);
                         }
@@ -127,13 +127,13 @@ 
             }
         }
 
-        if(!empty($_REQUEST['saved_search_select']) && $_REQUEST['saved_search_select']!='_none') {
-            if(empty($_REQUEST['button']) && (empty($_REQUEST['clear_query']) || $_REQUEST['clear_query']!='true')) {
+        if (!empty($_REQUEST['saved_search_select']) && $_REQUEST['saved_search_select'] != '_none') {
+            if (empty($_REQUEST['button']) && (empty($_REQUEST['clear_query']) || $_REQUEST['clear_query'] != 'true')) {
                 $this->saved_search = loadBean('SavedSearch');
                 $this->saved_search->retrieveSavedSearch($_REQUEST['saved_search_select']);
                 $this->saved_search->populateRequest();
             }
-            elseif(!empty($_REQUEST['button'])) { // click the search button, after retrieving from saved_search
+            elseif (!empty($_REQUEST['button'])) { // click the search button, after retrieving from saved_search
                 $_SESSION['LastSavedView'][$_REQUEST['module']] = '';
                 unset($_REQUEST['saved_search_select']);
                 unset($_REQUEST['saved_search_select_name']);
@@ -142,25 +142,25 @@ 
 
 		$lv = new ListViewSmarty();
 		$displayColumns = array();
-		if(!empty($_REQUEST['displayColumns'])) {
-		    foreach(explode('|', $_REQUEST['displayColumns']) as $num => $col) {
-		        if(!empty($listViewDefs[$module][$col]))
+		if (!empty($_REQUEST['displayColumns'])) {
+		    foreach (explode('|', $_REQUEST['displayColumns']) as $num => $col) {
+		        if (!empty($listViewDefs[$module][$col]))
 		            $displayColumns[$col] = $listViewDefs[$module][$col];
 		    }
 		}
 		else {
-		    foreach($listViewDefs[$module] as $col => $params) {
-		        if(!empty($params['default']) && $params['default'])
+		    foreach ($listViewDefs[$module] as $col => $params) {
+		        if (!empty($params['default']) && $params['default'])
 		            $displayColumns[$col] = $params;
 		    }
 		}
 
-        $params = array( 'massupdate' => true, 'export' => true);
+        $params = array('massupdate' => true, 'export' => true);
 
-		if(!empty($_REQUEST['orderBy'])) {
+		if (!empty($_REQUEST['orderBy'])) {
 		    $params['orderBy'] = $_REQUEST['orderBy'];
 		    $params['overrideOrder'] = true;
-		    if(!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
+		    if (!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
 		}
 		$lv->displayColumns = $displayColumns;
 
@@ -169,33 +169,33 @@ 
 
 		$searchForm = null;
 	 	$storeQuery = new StoreQuery();
-		if(!isset($_REQUEST['query'])){
+		if (!isset($_REQUEST['query'])) {
 			$storeQuery->loadQuery($this->module);
 			$storeQuery->populateRequest();
-		}else{
+		} else {
 			$storeQuery->saveFromRequest($this->module);
 		}
 
 		//search
 		$view = 'basic_search';
-		if(!empty($_REQUEST['search_form_view']))
+		if (!empty($_REQUEST['search_form_view']))
 			$view = $_REQUEST['search_form_view'];
 		$headers = true;
-		if(!empty($_REQUEST['search_form_only']) && $_REQUEST['search_form_only'])
+		if (!empty($_REQUEST['search_form_only']) && $_REQUEST['search_form_only'])
 			$headers = false;
-		elseif(!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') {
-        	if(isset($_REQUEST['searchFormTab']) && $_REQUEST['searchFormTab'] == 'advanced_search') {
+		elseif (!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') {
+        	if (isset($_REQUEST['searchFormTab']) && $_REQUEST['searchFormTab'] == 'advanced_search') {
 				$view = 'advanced_search';
-			}else {
+			} else {
 				$view = 'basic_search';
 			}
 		}
 
 		$use_old_search = true;
-		if(file_exists('modules/'.$this->module.'/SearchForm.html')){
+		if (file_exists('modules/'.$this->module.'/SearchForm.html')) {
 			require_once('include/SearchForm/SearchForm.php');
 			$searchForm = new SearchForm($this->module, $this->seed);
-		}else{
+		} else {
 			$use_old_search = false;
 			require_once('include/SearchForm/SearchForm2.php');
 
@@ -214,9 +214,9 @@ 
 			}
 
 
-			if(!empty($metafiles[$this->module]['searchfields']))
+			if (!empty($metafiles[$this->module]['searchfields']))
                 require($metafiles[$this->module]['searchfields']);
-			elseif(file_exists('modules/'.$this->module.'/metadata/SearchFields.php'))
+			elseif (file_exists('modules/'.$this->module.'/metadata/SearchFields.php'))
                 require('modules/'.$this->module.'/metadata/SearchFields.php');
 
 
@@ -225,27 +225,27 @@ 
 			$searchForm->lv = $lv;
 		}
 
-		if(isset($this->options['show_title']) && $this->options['show_title']) {
+		if (isset($this->options['show_title']) && $this->options['show_title']) {
 			$moduleName = isset($this->seed->module_dir) ? $this->seed->module_dir : $GLOBALS['mod_strings']['LBL_MODULE_NAME'];
 			echo getClassicModuleTitle($moduleName, array($GLOBALS['mod_strings']['LBL_MODULE_TITLE']), FALSE);
 		}
 
 		$where = '';
-		if(isset($_REQUEST['query']))
+		if (isset($_REQUEST['query']))
 		{
 			// we have a query
-	    	if(!empty($_SERVER['HTTP_REFERER']) && preg_match('/action=EditView/', $_SERVER['HTTP_REFERER'])) { // from EditView cancel
+	    	if (!empty($_SERVER['HTTP_REFERER']) && preg_match('/action=EditView/', $_SERVER['HTTP_REFERER'])) { // from EditView cancel
 	       		$searchForm->populateFromArray($storeQuery->query);
 	    	}
 	    	else {
                 $searchForm->populateFromRequest();
 	    	}
 			$where_clauses = $searchForm->generateSearchWhere(true, $this->seed->module_dir);
-			if (count($where_clauses) > 0 )$where = '('. implode(' ) AND ( ', $where_clauses) . ')';
+			if (count($where_clauses) > 0)$where = '('.implode(' ) AND ( ', $where_clauses).')';
 			$GLOBALS['log']->info("List View Where Clause: $where");
 		}
-		if($use_old_search){
-			switch($view) {
+		if ($use_old_search) {
+			switch ($view) {
 				case 'basic_search':
 			    	$searchForm->setup();
 			        $searchForm->displayBasic($headers);
@@ -258,19 +258,19 @@ 
 			     	echo $searchForm->displaySavedViews($listViewDefs, $lv, $headers);
 			       break;
 			}
-		}else{
+		} else {
 			echo $searchForm->display($headers);
 		}
-		if(!$headers)
+		if (!$headers)
 			return;
          /*
          * Bug 50575 - related search columns not inluded in query in a proper way
          */
          $lv->searchColumns = $searchForm->searchColumns;
 
-		if(empty($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] == false){
+		if (empty($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] == false) {
             //Bug 58841 - mass update form was not displayed for non-admin users that should have access
-            if(ACLController::checkAccess($module, 'massupdate') || ACLController::checkAccess($module, 'export'))
+            if (ACLController::checkAccess($module, 'massupdate') || ACLController::checkAccess($module, 'export'))
             {
                 $lv->setup($seed, 'include/ListView/ListViewGeneric.tpl', $where, $params);
             }

Braces +43 added lines, -40 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
@@ -63,8 +65,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();
@@ -82,14 +83,14 @@ 
         if(file_exists('custom/modules/' . $module. '/metadata/listviewdefs.php')){
             $metadataFile = 'custom/modules/' . $module . '/metadata/listviewdefs.php';
             $foundViewDefs = true;
-        }else{
+        } else{
             if(file_exists('custom/modules/'.$module.'/metadata/metafiles.php')){
                 require_once('custom/modules/'.$module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$module]['listviewdefs'])){
                     $metadataFile = $metafiles[$module]['listviewdefs'];
                     $foundViewDefs = true;
                 }
-            }elseif(file_exists('modules/'.$module.'/metadata/metafiles.php')){
+            } elseif(file_exists('modules/'.$module.'/metadata/metafiles.php')){
                 require_once('modules/'.$module.'/metadata/metafiles.php');
                 if(!empty($metafiles[$module]['listviewdefs'])){
                     $metadataFile = $metafiles[$module]['listviewdefs'];
@@ -115,8 +116,7 @@ 
                     if($search_key != $module.'2_'.strtoupper($this->bean->object_name).'_offset' && !in_array($search_key, $blockVariables)) {
                         if (!is_array($search_value)) {
                             $_REQUEST[$search_key] = $GLOBALS['db']->quote($search_value);
-                        }
-                        else {
+                        } else {
                             foreach ($search_value as $key=>&$val) {
                                 $val = $GLOBALS['db']->quote($val);
                             }
@@ -132,8 +132,7 @@ 
                 $this->saved_search = loadBean('SavedSearch');
                 $this->saved_search->retrieveSavedSearch($_REQUEST['saved_search_select']);
                 $this->saved_search->populateRequest();
-            }
-            elseif(!empty($_REQUEST['button'])) { // click the search button, after retrieving from saved_search
+            } elseif(!empty($_REQUEST['button'])) { // click the search button, after retrieving from saved_search
                 $_SESSION['LastSavedView'][$_REQUEST['module']] = '';
                 unset($_REQUEST['saved_search_select']);
                 unset($_REQUEST['saved_search_select_name']);
@@ -144,14 +143,15 @@ 
 		$displayColumns = array();
 		if(!empty($_REQUEST['displayColumns'])) {
 		    foreach(explode('|', $_REQUEST['displayColumns']) as $num => $col) {
-		        if(!empty($listViewDefs[$module][$col]))
-		            $displayColumns[$col] = $listViewDefs[$module][$col];
+		        if(!empty($listViewDefs[$module][$col])) {
+		        		            $displayColumns[$col] = $listViewDefs[$module][$col];
+		        }
 		    }
-		}
-		else {
+		} else {
 		    foreach($listViewDefs[$module] as $col => $params) {
-		        if(!empty($params['default']) && $params['default'])
-		            $displayColumns[$col] = $params;
+		        if(!empty($params['default']) && $params['default']) {
+		        		            $displayColumns[$col] = $params;
+		        }
 		    }
 		}
 
@@ -160,7 +160,9 @@ 
 		if(!empty($_REQUEST['orderBy'])) {
 		    $params['orderBy'] = $_REQUEST['orderBy'];
 		    $params['overrideOrder'] = true;
-		    if(!empty($_REQUEST['sortOrder'])) $params['sortOrder'] = $_REQUEST['sortOrder'];
+		    if(!empty($_REQUEST['sortOrder'])) {
+		        $params['sortOrder'] = $_REQUEST['sortOrder'];
+		    }
 		}
 		$lv->displayColumns = $displayColumns;
 
@@ -172,21 +174,22 @@ 
 		if(!isset($_REQUEST['query'])){
 			$storeQuery->loadQuery($this->module);
 			$storeQuery->populateRequest();
-		}else{
+		} else{
 			$storeQuery->saveFromRequest($this->module);
 		}
 
 		//search
 		$view = 'basic_search';
-		if(!empty($_REQUEST['search_form_view']))
-			$view = $_REQUEST['search_form_view'];
+		if(!empty($_REQUEST['search_form_view'])) {
+					$view = $_REQUEST['search_form_view'];
+		}
 		$headers = true;
-		if(!empty($_REQUEST['search_form_only']) && $_REQUEST['search_form_only'])
-			$headers = false;
-		elseif(!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') {
+		if(!empty($_REQUEST['search_form_only']) && $_REQUEST['search_form_only']) {
+					$headers = false;
+		} elseif(!isset($_REQUEST['search_form']) || $_REQUEST['search_form'] != 'false') {
         	if(isset($_REQUEST['searchFormTab']) && $_REQUEST['searchFormTab'] == 'advanced_search') {
 				$view = 'advanced_search';
-			}else {
+			} else {
 				$view = 'basic_search';
 			}
 		}
@@ -195,7 +198,7 @@ 
 		if(file_exists('modules/'.$this->module.'/SearchForm.html')){
 			require_once('include/SearchForm/SearchForm.php');
 			$searchForm = new SearchForm($this->module, $this->seed);
-		}else{
+		} else{
 			$use_old_search = false;
 			require_once('include/SearchForm/SearchForm2.php');
 
@@ -203,21 +206,20 @@ 
 			if (file_exists('custom/modules/'.$this->module.'/metadata/searchdefs.php'))
 			{
 			    require_once('custom/modules/'.$this->module.'/metadata/searchdefs.php');
-			}
-			elseif (!empty($metafiles[$this->module]['searchdefs']))
+			} elseif (!empty($metafiles[$this->module]['searchdefs']))
 			{
 				require_once($metafiles[$this->module]['searchdefs']);
-			}
-			elseif (file_exists('modules/'.$this->module.'/metadata/searchdefs.php'))
+			} elseif (file_exists('modules/'.$this->module.'/metadata/searchdefs.php'))
 			{
 			    require_once('modules/'.$this->module.'/metadata/searchdefs.php');
 			}
 
 
-			if(!empty($metafiles[$this->module]['searchfields']))
-                require($metafiles[$this->module]['searchfields']);
-			elseif(file_exists('modules/'.$this->module.'/metadata/SearchFields.php'))
-                require('modules/'.$this->module.'/metadata/SearchFields.php');
+			if(!empty($metafiles[$this->module]['searchfields'])) {
+			                require($metafiles[$this->module]['searchfields']);
+			} elseif(file_exists('modules/'.$this->module.'/metadata/SearchFields.php')) {
+			                require('modules/'.$this->module.'/metadata/SearchFields.php');
+			}
 
 
 			$searchForm = new SearchForm($this->seed, $this->module, $this->action);
@@ -236,12 +238,13 @@ 
 			// we have a query
 	    	if(!empty($_SERVER['HTTP_REFERER']) && preg_match('/action=EditView/', $_SERVER['HTTP_REFERER'])) { // from EditView cancel
 	       		$searchForm->populateFromArray($storeQuery->query);
-	    	}
-	    	else {
+	    	} else {
                 $searchForm->populateFromRequest();
 	    	}
 			$where_clauses = $searchForm->generateSearchWhere(true, $this->seed->module_dir);
-			if (count($where_clauses) > 0 )$where = '('. implode(' ) AND ( ', $where_clauses) . ')';
+			if (count($where_clauses) > 0 ) {
+			    $where = '('. implode(' ) AND ( ', $where_clauses) . ')';
+			}
 			$GLOBALS['log']->info("List View Where Clause: $where");
 		}
 		if($use_old_search){
@@ -258,11 +261,12 @@ 
 			     	echo $searchForm->displaySavedViews($listViewDefs, $lv, $headers);
 			       break;
 			}
-		}else{
+		} else{
 			echo $searchForm->display($headers);
 		}
-		if(!$headers)
-			return;
+		if(!$headers) {
+					return;
+		}
          /*
          * Bug 50575 - related search columns not inluded in query in a proper way
          */
@@ -273,8 +277,7 @@ 
             if(ACLController::checkAccess($module, 'massupdate') || ACLController::checkAccess($module, 'export'))
             {
                 $lv->setup($seed, 'include/ListView/ListViewGeneric.tpl', $where, $params);
-            }
-            else
+            } else
             {
                 $lv->setup($seed, 'include/ListView/ListViewNoMassUpdate.tpl', $where, $params);
             }

modules/ProjectTask/Dashlets/MyProjectTaskDashlet/MyProjectTaskDashlet.php

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,7 +52,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_PROJECT_TASKS', 'ProjectTask');
+        if (empty($def['title'])) $this->title = translate('LBL_LIST_MY_PROJECT_TASKS', 'ProjectTask');
 
         $this->searchFields = $dashletData['MyProjectTaskDashlet']['searchFields'];
         $this->columns = $dashletData['MyProjectTaskDashlet']['columns'];
@@ -63,9 +63,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MyProjectTaskDashlet($id, $def = null){
+    function MyProjectTaskDashlet($id, $def = null) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -79,7 +79,7 @@ 
     {
         $resultArray = parent::buildWhere();
 
-        $resultArray[] = $this->seedBean->table_name . '.' . "percent_complete != 100";
+        $resultArray[] = $this->seedBean->table_name.'.'."percent_complete != 100";
 
         return $resultArray;
     }

Braces +7 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,7 +54,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_PROJECT_TASKS', 'ProjectTask');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_LIST_MY_PROJECT_TASKS', 'ProjectTask');
+        }
 
         $this->searchFields = $dashletData['MyProjectTaskDashlet']['searchFields'];
         $this->columns = $dashletData['MyProjectTaskDashlet']['columns'];
@@ -67,8 +71,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($id, $def);

modules/ProjectTask/ProjectTask.php

Spacing +77 added lines, -77 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -99,7 +99,7 @@ 
 	/*
 	 *
 	 */
-    public function __construct($init=true)
+    public function __construct($init = true)
 	{
 		parent::__construct();
 		if ($init) {
@@ -107,7 +107,7 @@ 
 			$this->utilization = 100;
 
 			global $current_user;
-			if(empty($current_user))
+			if (empty($current_user))
 			{
 				$this->assigned_user_id = 1;
 				$admin_user = new User();
@@ -126,9 +126,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function ProjectTask($init=true){
+    public function ProjectTask($init = true) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -154,7 +154,7 @@ 
         }
 
         $id = parent::save($check_notify);
-        if($this->_skipParentUpdate == false)
+        if ($this->_skipParentUpdate == false)
         {
             $this->updateStatistic();
         }
@@ -212,9 +212,9 @@ 
 		$return_value = '';
 
 		$query  = "SELECT name, assigned_user_id FROM {$this->table_name} WHERE id='{$depends_on_id}'";
-		$result = $this->db->query($query,true," Error filling in additional detail fields: ");
+		$result = $this->db->query($query, true, " Error filling in additional detail fields: ");
 		$row = $this->db->fetchByAssoc($result);
-		if($row != null)
+		if ($row != null)
 		{
 			$this->depends_on_name_owner = $row['assigned_user_id'];
 			$this->depends_on_name_mod = 'ProjectTask';
@@ -229,9 +229,9 @@ 
         $return_value = '';
 
         $query  = "SELECT name, assigned_user_id FROM project WHERE id='{$project_id}'";
-        $result = $this->db->query($query,true," Error filling in additional detail fields: ");
+        $result = $this->db->query($query, true, " Error filling in additional detail fields: ");
         $row = $this->db->fetchByAssoc($result);
-        if($row != null)
+        if ($row != null)
         {
             //$this->parent_name_owner = $row['assigned_user_id'];
             //$this->parent_name_mod = 'Project';
@@ -248,9 +248,9 @@ 
 		$return_value = '';
 
 		$query  = "SELECT name, assigned_user_id FROM project WHERE id='{$parent_id}'";
-		$result = $this->db->query($query,true," Error filling in additional detail fields: ");
+		$result = $this->db->query($query, true, " Error filling in additional detail fields: ");
 		$row = $this->db->fetchByAssoc($result);
-		if($row != null)
+		if ($row != null)
 		{
 			$this->parent_name_owner = $row['assigned_user_id'];
 			$this->parent_name_mod = 'Project';
@@ -263,26 +263,26 @@ 
 	/*
 	 *
 	 */
-	function build_generic_where_clause ($the_query_string)
+	function build_generic_where_clause($the_query_string)
 	{
 		$where_clauses = array();
 		$the_query_string = $GLOBALS['db']->quote($the_query_string);
 		array_push($where_clauses, "project_task.name like '$the_query_string%'");
 
 		$the_where = "";
-		foreach($where_clauses as $clause)
+		foreach ($where_clauses as $clause)
 		{
-			if($the_where != "") $the_where .= " or ";
+			if ($the_where != "") $the_where .= " or ";
 			$the_where .= $clause;
 		}
 
 		return $the_where;
 	}
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		global $action, $currentModule, $focus, $current_module_strings, $app_list_strings, $timedate, $locale;
 		$today = $timedate->handle_offset(date($GLOBALS['timedate']->get_db_date_time_format(), time()), $timedate->dbDayFormat, true);
-		$task_fields =$this->get_list_view_array();
+		$task_fields = $this->get_list_view_array();
 		//$date_due = $timedate->to_db_date($task_fields['DATE_DUE'],false);
         if (isset($this->parent_type))
 			$task_fields['PARENT_MODULE'] = $this->parent_type;
@@ -301,11 +301,11 @@ 
 		}
         */
 
-        if ( !isset($task_fields["FIRST_NAME"]) )
+        if (!isset($task_fields["FIRST_NAME"]))
             $task_fields["FIRST_NAME"] = '';
-        if ( !isset($task_fields["LAST_NAME"]) )
+        if (!isset($task_fields["LAST_NAME"]))
             $task_fields["LAST_NAME"] = '';
-		$task_fields['CONTACT_NAME']= $locale->getLocaleFormattedName($task_fields["FIRST_NAME"],$task_fields["LAST_NAME"]);
+		$task_fields['CONTACT_NAME'] = $locale->getLocaleFormattedName($task_fields["FIRST_NAME"], $task_fields["LAST_NAME"]);
 		$task_fields['TITLE'] = '';
 		if (!empty($task_fields['CONTACT_NAME'])) {
 			$task_fields['TITLE'] .= $current_module_strings['LBL_LIST_CONTACT'].": ".$task_fields['CONTACT_NAME'];
@@ -314,28 +314,28 @@ 
 		return $task_fields;
 	}
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
 	}
-	function listviewACLHelper(){
+	function listviewACLHelper() {
 		$array_assign = parent::listviewACLHelper();
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)){
+		if (!empty($this->parent_name)) {
 
-			if(!empty($this->parent_name_owner)){
+			if (!empty($this->parent_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->parent_name_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+			else if (!empty($this->parent_type) && !empty($this->parent_id)) {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean($this->parent_type, $this->parent_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -347,59 +347,59 @@ 
 			/**
 			if(ACLController::checkAccess('Project', 'view', $is_owner)){
 			*/
-			if(ACLController::checkAccess('Project', 'view', $is_owner, 'module', $in_group)){
+			if (ACLController::checkAccess('Project', 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['PARENT'] = 'a';
-			}else{
+			} else {
 				$array_assign['PARENT'] = 'span';
 			}
 		$is_owner = false;
-		if(!empty($this->depends_on_name)){
+		if (!empty($this->depends_on_name)) {
 
-			if(!empty($this->depends_on_name_owner)){
+			if (!empty($this->depends_on_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->depends_on_name_owner;
 			}
 		}
-			if( ACLController::checkAccess('ProjectTask', 'view', $is_owner)){
+			if (ACLController::checkAccess('ProjectTask', 'view', $is_owner)) {
 				$array_assign['PARENT_TASK'] = 'a';
-			}else{
+			} else {
 				$array_assign['PARENT_TASK'] = 'span';
 			}
 
 		return $array_assign;
 	}
 
-    function create_export_query($order_by, $where, $relate_link_join='')
+    function create_export_query($order_by, $where, $relate_link_join = '')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
 		$query = "SELECT
 				project_task.*,
                 users.user_name as assigned_user_name ";
-        $query .=  $custom_join['select'];
+        $query .= $custom_join['select'];
 
         $query .= " FROM project_task LEFT JOIN project ON project_task.project_id=project.id AND project.deleted=0 ";
 
-        $query .=  $custom_join['join'];
+        $query .= $custom_join['join'];
         $query .= " LEFT JOIN users
                    	ON project_task.assigned_user_id=users.id ";
 
         $where_auto = " project_task.deleted=0 ";
 
-        if($where != "")
+        if ($where != "")
         	$query .= "where ($where) AND ".$where_auto;
         else
             $query .= "where ".$where_auto;
 
-        if(!empty($order_by)){
+        if (!empty($order_by)) {
            	//check to see if order by variable already has table name by looking for dot "."
            	$table_defined_already = strpos($order_by, ".");
 
-	        if($table_defined_already === false){
+	        if ($table_defined_already === false) {
 	        	//table not defined yet, define accounts to avoid "ambigous column" SQL error
 	        	$query .= " ORDER BY $order_by";
-	        }else{
+	        } else {
 	        	//table already defined, just add it to end of query
 	            $query .= " ORDER BY $order_by";
 	        }
@@ -429,7 +429,7 @@ 
             {
                 $subProjectTasks = $parentProjectTask->getAllSubProjectTasks();
                 $tasks = array();
-                foreach($subProjectTasks as &$task)
+                foreach ($subProjectTasks as &$task)
                 {
                     array_push($tasks, $task->toArray(true));
                 }
@@ -477,7 +477,7 @@ 
         $cumulativePercentage = 0;
         if ($totalHours != 0)
         {
-            $cumulativePercentage = round(($cumulativeDone/$totalHours) * 100);
+            $cumulativePercentage = round(($cumulativeDone / $totalHours) * 100);
         }
         return $cumulativePercentage;
     }
@@ -489,7 +489,7 @@ 
     function getProjectTaskParent()
     {
 
-        $projectTaskParent=false;
+        $projectTaskParent = false;
 
         if (!empty($this->parent_task_id) && !empty($this->project_id))
         {
@@ -520,25 +520,25 @@ 
 
             $result = $this->db->query($query, true, "Error retrieving child project tasks");
 
-            $projectTasks=array();
-            while($row = $this->db->fetchByAssoc($result))
+            $projectTasks = array();
+            while ($row = $this->db->fetchByAssoc($result))
             {
                 $projectTasks[$row['id']]['project_task_id'] = $row['project_task_id'];
                 $projectTasks[$row['id']]['parent_task_id'] = $row['parent_task_id'];
             }
 
             $potentialParentTaskIds[$this->project_task_id] = $this->project_task_id;
-            $actualParentTaskIds=array();
-            $subProjectTasks=array();
+            $actualParentTaskIds = array();
+            $subProjectTasks = array();
 
-            $startProjectTasksCount=0;
-            $endProjectTasksCount=0;
+            $startProjectTasksCount = 0;
+            $endProjectTasksCount = 0;
 
             //get all child tasks
             $run = true;
             while ($run)
             {
-                $count=0;
+                $count = 0;
 
                 foreach ($projectTasks as $id=>$values)
                 {
@@ -547,8 +547,8 @@ 
                         $potentialParentTaskIds[$values['project_task_id']] = $values['project_task_id'];
                         $actualParentTaskIds[$values['parent_task_id']] = $values['parent_task_id'];
 
-                        $subProjectTasks[$id]=$values;
-                        $count=$count+1;
+                        $subProjectTasks[$id] = $values;
+                        $count = $count + 1;
                     }
                 }
 
@@ -564,10 +564,10 @@ 
                 }
             }
 
-            foreach($subProjectTasks as $id=>$values)
+            foreach ($subProjectTasks as $id=>$values)
             {
                 //ignore tasks that are parents
-                if(!in_array($values['project_task_id'], $actualParentTaskIds))
+                if (!in_array($values['project_task_id'], $actualParentTaskIds))
                 {
                     $projectTaskBean = BeanFactory::getBean('ProjectTask', $id);
                     array_push($projectTasksBeans, $projectTaskBean);
@@ -589,16 +589,16 @@ 
 	 * @param $project_id integer value of the project_id associated with this ProjectTask instance
 	 * @return total integer value of the count of project tasks, 0 if none found
 	 */
-    private function getNumberOfTasksInProject($project_id='')
+    private function getNumberOfTasksInProject($project_id = '')
     {
-    	if(!empty($project_id))
+    	if (!empty($project_id))
     	{
 	        $query = "SELECT count(project_task_id) AS total FROM project_task WHERE project_id = '{$project_id}'";
 	        $result = $this->db->query($query, true);
-	        if($result)
+	        if ($result)
 	        {
 		        $row = $this->db->fetchByAssoc($result);
-		        if(!empty($row['total']))
+		        if (!empty($row['total']))
 		        {
 		           return $row['total'];
 		        }
@@ -634,19 +634,19 @@ 
         $query = $this->create_new_list_query('', "project_id = {$db->quoted($this->project_id)}");
         $this->disable_row_level_security = false;
         $res = $db->query($query);
-        while($row = $db->fetchByAssoc($res))
+        while ($row = $db->fetchByAssoc($res))
         {
             array_push($list, $row);
         }
         // fill in $tree
-        foreach($list as $k => &$v)
+        foreach ($list as $k => &$v)
         {
-            if(isset($v['project_task_id']) && $v['project_task_id'] != '')
+            if (isset($v['project_task_id']) && $v['project_task_id'] != '')
             {
                 $tree[$v['project_task_id']] = $v['parent_task_id'];
-                if(isset($v['parent_task_id']) && $v['parent_task_id'])
+                if (isset($v['parent_task_id']) && $v['parent_task_id'])
                 {
-                    if(!isset($nodes[$v['parent_task_id']]))
+                    if (!isset($nodes[$v['parent_task_id']]))
                     {
                         $nodes[$v['parent_task_id']] = 1;
                     }
@@ -655,13 +655,13 @@ 
         }
         unset($v);
         // fill in $nodes array
-        foreach($nodes as $k => &$v)
+        foreach ($nodes as $k => &$v)
         {
             $run = true;
             $i = $k;
-            while($run)
+            while ($run)
             {
-                if(isset($tree[$i]) &&  $tree[$i]!= '')
+                if (isset($tree[$i]) && $tree[$i] != '')
                 {
                     $i = $tree[$i];
                     $v++;
@@ -675,24 +675,24 @@ 
         arsort($nodes);
         unset($v);
         // calculating of percentages and comparing calculated value with database one
-        foreach($nodes as $k => &$v)
+        foreach ($nodes as $k => &$v)
         {
             $currRow = null;
             $currChildren = array();
             $run = true;
             $tmp = array();
             $i = $k;
-            while($run)
+            while ($run)
             {
-                foreach($list as $id => &$taskRow)
+                foreach ($list as $id => &$taskRow)
                 {
-                    if($taskRow['project_task_id'] == $i && $currRow === null)
+                    if ($taskRow['project_task_id'] == $i && $currRow === null)
                     {
                         $currRow = $id;
                     }
-                    if($taskRow['parent_task_id'] == $i)
+                    if ($taskRow['parent_task_id'] == $i)
                     {
-                        if(!in_array($taskRow['project_task_id'], array_keys($nodes)))
+                        if (!in_array($taskRow['project_task_id'], array_keys($nodes)))
                         {
                             array_push($currChildren, $taskRow);
                         }
@@ -703,7 +703,7 @@ 
                     }
                 }
                 unset($taskRow);
-                if(count($tmp) == 0)
+                if (count($tmp) == 0)
                 {
                     $run = false;
                 }
@@ -713,7 +713,7 @@ 
                 }
             }
             $subres = $this->_calculateCompletePercent($currChildren);
-            if($subres != $list[$currRow]['percent_complete'])
+            if ($subres != $list[$currRow]['percent_complete'])
             {
                 $list[$currRow]['percent_complete'] = $subres;
                 array_push($changed, $currRow);
@@ -721,7 +721,7 @@ 
         }
         unset($v);
         // updating data in database for changed tasks
-        foreach($changed as $k => &$v)
+        foreach ($changed as $k => &$v)
         {
             $task = BeanFactory::getBean('ProjectTask');
             $task->populateFromRow($list[$v]);
@@ -734,7 +734,7 @@ 
 function getUtilizationDropdown($focus, $field, $value, $view) {
 	global $app_list_strings;
 
-	if($view == 'EditView') {
+	if ($view == 'EditView') {
 		global $app_list_strings;
         $html = '<select name="'.$field.'">';
         $html .= get_select_options_with_id($app_list_strings['project_task_utilization_options'], $value);

Braces +30 added lines, -29 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.
@@ -113,8 +115,7 @@ 
 				$admin_user = new User();
 				$admin_user->retrieve($this->assigned_user_id);
 				$this->assigned_user_name = $admin_user->user_name;
-			}
-			else
+			} else
 			{
 				$this->assigned_user_id = $current_user->id;
 				$this->assigned_user_name = $current_user->user_name;
@@ -130,8 +131,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($init);
@@ -272,7 +272,9 @@ 
 		$the_where = "";
 		foreach($where_clauses as $clause)
 		{
-			if($the_where != "") $the_where .= " or ";
+			if($the_where != "") {
+			    $the_where .= " or ";
+			}
 			$the_where .= $clause;
 		}
 
@@ -284,8 +286,9 @@ 
 		$today = $timedate->handle_offset(date($GLOBALS['timedate']->get_db_date_time_format(), time()), $timedate->dbDayFormat, true);
 		$task_fields =$this->get_list_view_array();
 		//$date_due = $timedate->to_db_date($task_fields['DATE_DUE'],false);
-        if (isset($this->parent_type))
-			$task_fields['PARENT_MODULE'] = $this->parent_type;
+        if (isset($this->parent_type)) {
+        			$task_fields['PARENT_MODULE'] = $this->parent_type;
+        }
 
 		/*
         if ($this->status != "Completed" && $this->status != "Deferred" ) {
@@ -301,10 +304,12 @@ 
 		}
         */
 
-        if ( !isset($task_fields["FIRST_NAME"]) )
-            $task_fields["FIRST_NAME"] = '';
-        if ( !isset($task_fields["LAST_NAME"]) )
-            $task_fields["LAST_NAME"] = '';
+        if ( !isset($task_fields["FIRST_NAME"]) ) {
+                    $task_fields["FIRST_NAME"] = '';
+        }
+        if ( !isset($task_fields["LAST_NAME"]) ) {
+                    $task_fields["LAST_NAME"] = '';
+        }
 		$task_fields['CONTACT_NAME']= $locale->getLocaleFormattedName($task_fields["FIRST_NAME"],$task_fields["LAST_NAME"]);
 		$task_fields['TITLE'] = '';
 		if (!empty($task_fields['CONTACT_NAME'])) {
@@ -350,7 +355,7 @@ 
 			if(ACLController::checkAccess('Project', 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['PARENT'] = 'a';
-			}else{
+			} else{
 				$array_assign['PARENT'] = 'span';
 			}
 		$is_owner = false;
@@ -363,7 +368,7 @@ 
 		}
 			if( ACLController::checkAccess('ProjectTask', 'view', $is_owner)){
 				$array_assign['PARENT_TASK'] = 'a';
-			}else{
+			} else{
 				$array_assign['PARENT_TASK'] = 'span';
 			}
 
@@ -387,10 +392,11 @@ 
 
         $where_auto = " project_task.deleted=0 ";
 
-        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;
+        }
 
         if(!empty($order_by)){
            	//check to see if order by variable already has table name by looking for dot "."
@@ -399,7 +405,7 @@ 
 	        if($table_defined_already === false){
 	        	//table not defined yet, define accounts to avoid "ambigous column" SQL error
 	        	$query .= " ORDER BY $order_by";
-	        }else{
+	        } else{
 	        	//table already defined, just add it to end of query
 	            $query .= " ORDER BY $order_by";
 	        }
@@ -466,8 +472,7 @@ 
             {
                 $totalHours += $value['duration'];
                 $cumulativeDone += $value['duration'] * ($value['percent_complete'] / 100);
-            }
-            else
+            } else
             {
                 $totalHours += ($value['duration'] * 8);
                 $cumulativeDone += ($value['duration'] * 8) * ($value['percent_complete'] / 100);
@@ -557,8 +562,7 @@ 
                 if ($startProjectTasksCount == $endProjectTasksCount)
                 {
                     $run = false;
-                }
-                else
+                } else
                 {
                     $startProjectTasksCount = $endProjectTasksCount;
                 }
@@ -665,8 +669,7 @@ 
                 {
                     $i = $tree[$i];
                     $v++;
-                }
-                else
+                } else
                 {
                     $run = false;
                 }
@@ -695,8 +698,7 @@ 
                         if(!in_array($taskRow['project_task_id'], array_keys($nodes)))
                         {
                             array_push($currChildren, $taskRow);
-                        }
-                        else
+                        } else
                         {
                             array_push($tmp, $taskRow['project_task_id']);
                         }
@@ -706,8 +708,7 @@ 
                 if(count($tmp) == 0)
                 {
                     $run = false;
-                }
-                else
+                } else
                 {
                     $i = array_shift($tmp);
                 }

modules/CampaignLog/CampaignLog.php

Spacing +44 added lines, -44 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -71,9 +71,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function CampaignLog(){
+    public function CampaignLog() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -83,11 +83,11 @@ 
     }
 
 
-    function get_list_view_data(){
+    function get_list_view_data() {
         global $locale;
         $temp_array = $this->get_list_view_array();
         //make sure that both items in array are set to some value, else return null
-        if(!(isset($temp_array['TARGET_TYPE']) && $temp_array['TARGET_TYPE']!= '') || !(isset($temp_array['TARGET_ID']) && $temp_array['TARGET_ID']!= ''))
+        if (!(isset($temp_array['TARGET_TYPE']) && $temp_array['TARGET_TYPE'] != '') || !(isset($temp_array['TARGET_ID']) && $temp_array['TARGET_ID'] != ''))
         {   //needed values to construct query are empty/null, so return null
             $GLOBALS['log']->debug("CampaignLog.php:get_list_view_data: temp_array['TARGET_TYPE'] and/or temp_array['TARGET_ID'] are empty, return null");
             $emptyArr = array();
@@ -96,28 +96,28 @@ 
 
         $table = strtolower($temp_array['TARGET_TYPE']);
 
-        if($temp_array['TARGET_TYPE']=='Accounts'){
+        if ($temp_array['TARGET_TYPE'] == 'Accounts') {
             $query = "select name from $table where id = ".$this->db->quoted($temp_array['TARGET_ID']);
-        }else{
-            $query = "select first_name, last_name, ".$this->db->concat($table, array('first_name', 'last_name'))." name from $table" .
+        } else {
+            $query = "select first_name, last_name, ".$this->db->concat($table, array('first_name', 'last_name'))." name from $table".
                 " where id = ".$this->db->quoted($temp_array['TARGET_ID']);
         }
-        $result=$this->db->query($query);
-        $row=$this->db->fetchByAssoc($result);
+        $result = $this->db->query($query);
+        $row = $this->db->fetchByAssoc($result);
 
         if ($row) {
-            if($temp_array['TARGET_TYPE']=='Accounts'){
-                $temp_array['RECIPIENT_NAME']=$row['name'];
-            }else{
+            if ($temp_array['TARGET_TYPE'] == 'Accounts') {
+                $temp_array['RECIPIENT_NAME'] = $row['name'];
+            } else {
                 $full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '');
-                $temp_array['RECIPIENT_NAME']=$full_name;
+                $temp_array['RECIPIENT_NAME'] = $full_name;
             }
         }
-        $temp_array['RECIPIENT_EMAIL']=$this->retrieve_email_address($temp_array['TARGET_ID']);
+        $temp_array['RECIPIENT_EMAIL'] = $this->retrieve_email_address($temp_array['TARGET_ID']);
 
-        $query = 'select name from email_marketing where id = \'' . $temp_array['MARKETING_ID'] . '\'';
-        $result=$this->db->query($query);
-        $row=$this->db->fetchByAssoc($result);
+        $query = 'select name from email_marketing where id = \''.$temp_array['MARKETING_ID'].'\'';
+        $result = $this->db->query($query);
+        $row = $this->db->fetchByAssoc($result);
 
         if ($row)
         {
@@ -127,21 +127,21 @@ 
         return $temp_array;
     }
 
-    function retrieve_email_address($trgt_id = ''){
+    function retrieve_email_address($trgt_id = '') {
         $return_str = '';
-        if(!empty($trgt_id)){
+        if (!empty($trgt_id)) {
             $qry  = " select eabr.primary_address, ea.email_address";
             $qry .= " from email_addresses ea ";
             $qry .= " Left Join email_addr_bean_rel eabr on eabr.email_address_id = ea.id ";
             $qry .= " where eabr.bean_id = '{$trgt_id}' ";
             $qry .= " and ea.deleted = 0 ";
-            $qry .= " and eabr.deleted = 0" ;
+            $qry .= " and eabr.deleted = 0";
             $qry .= " order by primary_address desc ";
 
-            $result=$this->db->query($qry);
-            $row=$this->db->fetchByAssoc($result);
+            $result = $this->db->query($qry);
+            $row = $this->db->fetchByAssoc($result);
 
-            if (!empty($row['email_address'])){
+            if (!empty($row['email_address'])) {
                 $return_str = $row['email_address'];
             }
         }
@@ -154,51 +154,51 @@ 
     //this function is called statically by the campaign_log subpanel.
     static function get_related_name($related_id, $related_type) {
         global $locale;
-        $db= DBManagerFactory::getInstance();
+        $db = DBManagerFactory::getInstance();
         if ($related_type == 'Emails') {
-            $query="SELECT name from emails where id='$related_id'";
-            $result=$db->query($query);
-            $row=$db->fetchByAssoc($result);
+            $query = "SELECT name from emails where id='$related_id'";
+            $result = $db->query($query);
+            $row = $db->fetchByAssoc($result);
             if ($row != null) {
                 return $row['name'];
             }
         }
         if ($related_type == 'Contacts') {
-            $query="SELECT first_name, last_name from contacts where id='$related_id'";
-            $result=$db->query($query);
-            $row=$db->fetchByAssoc($result);
+            $query = "SELECT first_name, last_name from contacts where id='$related_id'";
+            $result = $db->query($query);
+            $row = $db->fetchByAssoc($result);
             if ($row != null) {
                 return $full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
             }
         }
         if ($related_type == 'Leads') {
-            $query="SELECT first_name, last_name from leads where id='$related_id'";
-            $result=$db->query($query);
-            $row=$db->fetchByAssoc($result);
+            $query = "SELECT first_name, last_name from leads where id='$related_id'";
+            $result = $db->query($query);
+            $row = $db->fetchByAssoc($result);
             if ($row != null) {
                 return $full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
             }
         }
         if ($related_type == 'Prospects') {
-            $query="SELECT first_name, last_name from prospects where id='$related_id'";
-            $result=$db->query($query);
-            $row=$db->fetchByAssoc($result);
+            $query = "SELECT first_name, last_name from prospects where id='$related_id'";
+            $result = $db->query($query);
+            $row = $db->fetchByAssoc($result);
             if ($row != null) {
                 return $full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
             }
         }
         if ($related_type == 'CampaignTrackers') {
-            $query="SELECT tracker_url from campaign_trkrs where id='$related_id'";
-            $result=$db->query($query);
-            $row=$db->fetchByAssoc($result);
+            $query = "SELECT tracker_url from campaign_trkrs where id='$related_id'";
+            $result = $db->query($query);
+            $row = $db->fetchByAssoc($result);
             if ($row != null) {
-                return $row['tracker_url'] ;
+                return $row['tracker_url'];
             }
         }
         if ($related_type == 'Accounts') {
-            $query="SELECT name from accounts where id='$related_id'";
-            $result=$db->query($query);
-            $row=$db->fetchByAssoc($result);
+            $query = "SELECT name from accounts where id='$related_id'";
+            $result = $db->query($query);
+            $row = $db->fetchByAssoc($result);
             if ($row != null) {
                 return $row['name'];
             }

Braces +6 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -75,8 +77,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();
@@ -98,7 +99,7 @@ 
 
         if($temp_array['TARGET_TYPE']=='Accounts'){
             $query = "select name from $table where id = ".$this->db->quoted($temp_array['TARGET_ID']);
-        }else{
+        } else{
             $query = "select first_name, last_name, ".$this->db->concat($table, array('first_name', 'last_name'))." name from $table" .
                 " where id = ".$this->db->quoted($temp_array['TARGET_ID']);
         }
@@ -108,7 +109,7 @@ 
         if ($row) {
             if($temp_array['TARGET_TYPE']=='Accounts'){
                 $temp_array['RECIPIENT_NAME']=$row['name'];
-            }else{
+            } else{
                 $full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name'], '');
                 $temp_array['RECIPIENT_NAME']=$full_name;
             }

modules/CampaignLog/Popup_picker.php

Indentation +114 added lines, -114 removed lines

@@ -55,12 +55,12 @@ 
 {
 
 
-	/*
+    /*
 	 *
 	 */
-	function __construct()
-	{
-	}
+    function __construct()
+    {
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -77,117 +77,117 @@ 
     }
 
 
-	/*
-	 *
-	 */
-	function _get_where_clause()
-	{
-		$where = '';
-		if(isset($_REQUEST['query']))
-		{
-			$where_clauses = array();
-			append_where_clause($where_clauses, "target_id", "campaign_log.target_id");
-			//append_where_clause($where_clauses, "last_name", "prospects.last_name");
-
-			$where = generate_where_statement($where_clauses);
-			if (!empty($where))
-				$where.=" AND ";
-			$where .=" activity_type='targeted'";
-
-		}
-
-		return $where;
-	}
-
-	/**
+    /*
 	 *
 	 */
-	function process_page()
-	{
-		global $theme;
-		global $mod_strings;
-		global $app_strings;
-		global $app_list_strings;
-		global $currentModule;
-		global $sugar_version, $sugar_config;
-
-		$output_html = '';
-		$where = '';
-
-		$where = $this->_get_where_clause();
-
-
-
-		$first_name = empty($_REQUEST['first_name']) ? '' : $_REQUEST['first_name'];
-		$last_name = empty($_REQUEST['last_name']) ? '' : $_REQUEST['last_name'];
-
-		$request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
-		$hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
-
-		$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
-		//START:FOR MULTI-SELECT
-		$multi_select=false;
-		if (!empty($_REQUEST['mode']) && strtoupper($_REQUEST['mode']) == 'MULTISELECT') {
-			$multi_select=true;
-			$button .= "<input type='button' name='button' class='button' onclick=\"send_back_selected('Prospects',document.MassUpdate,'mass[]','" .$app_strings['ERR_NOTHING_SELECTED']."');\" title='"
-				.$app_strings['LBL_SELECT_BUTTON_TITLE']."' value='  "
-				.$app_strings['LBL_SELECT_BUTTON_LABEL']."  ' />\n";
-		}
-		//END:FOR MULTI-SELECT
-		if(!$hide_clear_button)
-		{
-			$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
-				.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
-				.$app_strings['LBL_CLEAR_BUTTON_LABEL']."  ' />\n";
-		}
-		$button .= "<input type='submit' name='button' class='button' onclick=\"window.close();\" title='"
-			.$app_strings['LBL_CANCEL_BUTTON_TITLE']."' accesskey='"
-			.$app_strings['LBL_CANCEL_BUTTON_KEY']."' value='  "
-			.$app_strings['LBL_CANCEL_BUTTON_LABEL']."  ' />\n";
-		$button .= "</form>\n";
-
-		$form = new XTemplate('modules/CampaignLog/Popup_picker.html');
-		$form->assign('MOD', $mod_strings);
-		$form->assign('APP', $app_strings);
-		$form->assign('THEME', $theme);
-		$form->assign('MODULE_NAME', $currentModule);
-		$form->assign('request_data', $request_data);
-
-
-		ob_start();
-		insert_popup_header($theme);
-		$output_html .= ob_get_contents();
-		ob_end_clean();
-
-		//$output_html .= get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], '', false);
-
-		$form->parse('main.SearchHeader');
-		$output_html .= $form->text('main.SearchHeader');
-
-		// Reset the sections that are already in the page so that they do not print again later.
-		$form->reset('main.SearchHeader');
-
-		// create the listview
-		$seed_bean = new CampaignLog();
-		$ListView = new ListView();
-		$ListView->show_export_button = false;
-		$ListView->process_for_popups = true;
-		$ListView->setXTemplate($form);
-		$ListView->multi_select_popup=$multi_select;  //FOR MULTI-SELECT
-		if ($multi_select) $ListView->xTemplate->assign("TAG_TYPE","SPAN"); else  $ListView->xTemplate->assign("TAG_TYPE","A");//FOR MULTI-SELECT
-		//$ListView->setHeaderTitle($mod_strings['LBL_LIST_FORM_TITLE']); //FOR MULTI-SELECT
-		//$ListView->setHeaderText($button); //FOR MULTI-SELECT
-		$ListView->setQuery($where, '', 'campaign_name1', 'CAMPAIGNLOG');
-		$ListView->setModStrings($mod_strings);
-
-		ob_start();
-		$output_html .= get_form_header($mod_strings['LBL_LIST_FORM_TITLE'], $button, false); //FOR MULTI-SELECT
-		$ListView->processListView($seed_bean, 'main', 'CAMPAIGNLOG');
-		$output_html .= ob_get_contents();
-		ob_end_clean();
-
-		$output_html .= insert_popup_footer();
-		return $output_html;
-	}
+    function _get_where_clause()
+    {
+        $where = '';
+        if(isset($_REQUEST['query']))
+        {
+            $where_clauses = array();
+            append_where_clause($where_clauses, "target_id", "campaign_log.target_id");
+            //append_where_clause($where_clauses, "last_name", "prospects.last_name");
+
+            $where = generate_where_statement($where_clauses);
+            if (!empty($where))
+                $where.=" AND ";
+            $where .=" activity_type='targeted'";
+
+        }
+
+        return $where;
+    }
+
+    /**
+     *
+     */
+    function process_page()
+    {
+        global $theme;
+        global $mod_strings;
+        global $app_strings;
+        global $app_list_strings;
+        global $currentModule;
+        global $sugar_version, $sugar_config;
+
+        $output_html = '';
+        $where = '';
+
+        $where = $this->_get_where_clause();
+
+
+
+        $first_name = empty($_REQUEST['first_name']) ? '' : $_REQUEST['first_name'];
+        $last_name = empty($_REQUEST['last_name']) ? '' : $_REQUEST['last_name'];
+
+        $request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
+        $hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
+
+        $button  = "<form action='index.php' method='post' name='form' id='form'>\n";
+        //START:FOR MULTI-SELECT
+        $multi_select=false;
+        if (!empty($_REQUEST['mode']) && strtoupper($_REQUEST['mode']) == 'MULTISELECT') {
+            $multi_select=true;
+            $button .= "<input type='button' name='button' class='button' onclick=\"send_back_selected('Prospects',document.MassUpdate,'mass[]','" .$app_strings['ERR_NOTHING_SELECTED']."');\" title='"
+                .$app_strings['LBL_SELECT_BUTTON_TITLE']."' value='  "
+                .$app_strings['LBL_SELECT_BUTTON_LABEL']."  ' />\n";
+        }
+        //END:FOR MULTI-SELECT
+        if(!$hide_clear_button)
+        {
+            $button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
+                .$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
+                .$app_strings['LBL_CLEAR_BUTTON_LABEL']."  ' />\n";
+        }
+        $button .= "<input type='submit' name='button' class='button' onclick=\"window.close();\" title='"
+            .$app_strings['LBL_CANCEL_BUTTON_TITLE']."' accesskey='"
+            .$app_strings['LBL_CANCEL_BUTTON_KEY']."' value='  "
+            .$app_strings['LBL_CANCEL_BUTTON_LABEL']."  ' />\n";
+        $button .= "</form>\n";
+
+        $form = new XTemplate('modules/CampaignLog/Popup_picker.html');
+        $form->assign('MOD', $mod_strings);
+        $form->assign('APP', $app_strings);
+        $form->assign('THEME', $theme);
+        $form->assign('MODULE_NAME', $currentModule);
+        $form->assign('request_data', $request_data);
+
+
+        ob_start();
+        insert_popup_header($theme);
+        $output_html .= ob_get_contents();
+        ob_end_clean();
+
+        //$output_html .= get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], '', false);
+
+        $form->parse('main.SearchHeader');
+        $output_html .= $form->text('main.SearchHeader');
+
+        // Reset the sections that are already in the page so that they do not print again later.
+        $form->reset('main.SearchHeader');
+
+        // create the listview
+        $seed_bean = new CampaignLog();
+        $ListView = new ListView();
+        $ListView->show_export_button = false;
+        $ListView->process_for_popups = true;
+        $ListView->setXTemplate($form);
+        $ListView->multi_select_popup=$multi_select;  //FOR MULTI-SELECT
+        if ($multi_select) $ListView->xTemplate->assign("TAG_TYPE","SPAN"); else  $ListView->xTemplate->assign("TAG_TYPE","A");//FOR MULTI-SELECT
+        //$ListView->setHeaderTitle($mod_strings['LBL_LIST_FORM_TITLE']); //FOR MULTI-SELECT
+        //$ListView->setHeaderText($button); //FOR MULTI-SELECT
+        $ListView->setQuery($where, '', 'campaign_name1', 'CAMPAIGNLOG');
+        $ListView->setModStrings($mod_strings);
+
+        ob_start();
+        $output_html .= get_form_header($mod_strings['LBL_LIST_FORM_TITLE'], $button, false); //FOR MULTI-SELECT
+        $ListView->processListView($seed_bean, 'main', 'CAMPAIGNLOG');
+        $output_html .= ob_get_contents();
+        ob_end_clean();
+
+        $output_html .= insert_popup_footer();
+        return $output_html;
+    }
 } // end of class Popup_Picker
 ?>
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,9 +65,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function Popup_Picker(){
+    function Popup_Picker() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -83,7 +83,7 @@ 
 	function _get_where_clause()
 	{
 		$where = '';
-		if(isset($_REQUEST['query']))
+		if (isset($_REQUEST['query']))
 		{
 			$where_clauses = array();
 			append_where_clause($where_clauses, "target_id", "campaign_log.target_id");
@@ -91,8 +91,8 @@ 
 
 			$where = generate_where_statement($where_clauses);
 			if (!empty($where))
-				$where.=" AND ";
-			$where .=" activity_type='targeted'";
+				$where .= " AND ";
+			$where .= " activity_type='targeted'";
 
 		}
 
@@ -124,17 +124,17 @@ 
 		$request_data = empty($_REQUEST['request_data']) ? '' : $_REQUEST['request_data'];
 		$hide_clear_button = empty($_REQUEST['hide_clear_button']) ? false : true;
 
-		$button  = "<form action='index.php' method='post' name='form' id='form'>\n";
+		$button = "<form action='index.php' method='post' name='form' id='form'>\n";
 		//START:FOR MULTI-SELECT
-		$multi_select=false;
+		$multi_select = false;
 		if (!empty($_REQUEST['mode']) && strtoupper($_REQUEST['mode']) == 'MULTISELECT') {
-			$multi_select=true;
-			$button .= "<input type='button' name='button' class='button' onclick=\"send_back_selected('Prospects',document.MassUpdate,'mass[]','" .$app_strings['ERR_NOTHING_SELECTED']."');\" title='"
+			$multi_select = true;
+			$button .= "<input type='button' name='button' class='button' onclick=\"send_back_selected('Prospects',document.MassUpdate,'mass[]','".$app_strings['ERR_NOTHING_SELECTED']."');\" title='"
 				.$app_strings['LBL_SELECT_BUTTON_TITLE']."' value='  "
 				.$app_strings['LBL_SELECT_BUTTON_LABEL']."  ' />\n";
 		}
 		//END:FOR MULTI-SELECT
-		if(!$hide_clear_button)
+		if (!$hide_clear_button)
 		{
 			$button .= "<input type='button' name='button' class='button' onclick=\"send_back('','');\" title='"
 				.$app_strings['LBL_CLEAR_BUTTON_TITLE']."' value='  "
@@ -173,8 +173,8 @@ 
 		$ListView->show_export_button = false;
 		$ListView->process_for_popups = true;
 		$ListView->setXTemplate($form);
-		$ListView->multi_select_popup=$multi_select;  //FOR MULTI-SELECT
-		if ($multi_select) $ListView->xTemplate->assign("TAG_TYPE","SPAN"); else  $ListView->xTemplate->assign("TAG_TYPE","A");//FOR MULTI-SELECT
+		$ListView->multi_select_popup = $multi_select; //FOR MULTI-SELECT
+		if ($multi_select) $ListView->xTemplate->assign("TAG_TYPE", "SPAN"); else  $ListView->xTemplate->assign("TAG_TYPE", "A"); //FOR MULTI-SELECT
 		//$ListView->setHeaderTitle($mod_strings['LBL_LIST_FORM_TITLE']); //FOR MULTI-SELECT
 		//$ListView->setHeaderText($button); //FOR MULTI-SELECT
 		$ListView->setQuery($where, '', 'campaign_name1', 'CAMPAIGNLOG');

Braces +13 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -69,8 +71,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();
@@ -90,8 +91,9 @@ 
 			//append_where_clause($where_clauses, "last_name", "prospects.last_name");
 
 			$where = generate_where_statement($where_clauses);
-			if (!empty($where))
-				$where.=" AND ";
+			if (!empty($where)) {
+							$where.=" AND ";
+			}
 			$where .=" activity_type='targeted'";
 
 		}
@@ -174,7 +176,12 @@ 
 		$ListView->process_for_popups = true;
 		$ListView->setXTemplate($form);
 		$ListView->multi_select_popup=$multi_select;  //FOR MULTI-SELECT
-		if ($multi_select) $ListView->xTemplate->assign("TAG_TYPE","SPAN"); else  $ListView->xTemplate->assign("TAG_TYPE","A");//FOR MULTI-SELECT
+		if ($multi_select) {
+		    $ListView->xTemplate->assign("TAG_TYPE","SPAN");
+		} else {
+		    $ListView->xTemplate->assign("TAG_TYPE","A");
+		}
+		//FOR MULTI-SELECT
 		//$ListView->setHeaderTitle($mod_strings['LBL_LIST_FORM_TITLE']); //FOR MULTI-SELECT
 		//$ListView->setHeaderText($button); //FOR MULTI-SELECT
 		$ListView->setQuery($where, '', 'campaign_name1', 'CAMPAIGNLOG');