adamjakab / SuiteCRM

modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php

Indentation +2 added lines, -2 removed lines

@@ -43,6 +43,6 @@
 
 
 $dashletStrings['CampaignROIChartDashlet'] = array('LBL_TITLE'       => 'Campaign ROI',
-                                                     'LBL_DESCRIPTION' => 'ROI Chart',
-                                                     'LBL_REFRESH'     => 'Refresh Chart');
+                                                        'LBL_DESCRIPTION' => 'ROI Chart',
+                                                        'LBL_REFRESH'     => 'Refresh Chart');
 ?>
\ No newline at end of file

modules/Administration/SupportPortal.php

Indentation +141 added lines, -141 removed lines

@@ -52,18 +52,18 @@ 
 global $currentModule;
 
 switch ($_REQUEST['view']) {
-	case "support_portal":
-		if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
-		$GLOBALS['log']->info("Administration SupportPortal");
+    case "support_portal":
+        if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+        $GLOBALS['log']->info("Administration SupportPortal");
 
-		$iframe_url = add_http("www.sugarcrm.com/network/redirect.php?tmpl=network");
+        $iframe_url = add_http("www.sugarcrm.com/network/redirect.php?tmpl=network");
         
         echo getClassicModuleTitle(
             "Administration", 
             array(
                 "<a href='index.php?module=Administration&action=index'>".translate('LBL_MODULE_NAME','Administration')."</a>",
-               $mod_strings['LBL_SUPPORT_TITLE'],
-               ), 
+                $mod_strings['LBL_SUPPORT_TITLE'],
+                ), 
             false
             );
         
@@ -72,157 +72,157 @@ 
         $sugar_smarty->assign('langHeader', get_language_header());
         echo $sugar_smarty->fetch('modules/Administration/SupportPortal.tpl');
 
-		break;
-	default:
-
-		$send_version = isset($_REQUEST['version']) ? $_REQUEST['version'] : "";
-		$send_edition = isset($_REQUEST['edition']) ? $_REQUEST['edition'] : "";
-		$send_lang = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : "";
-		$send_module = isset($_REQUEST['help_module']) ? $_REQUEST['help_module'] : "";
-		$send_action = isset($_REQUEST['help_action']) ? $_REQUEST['help_action'] : "";
-		$send_key = isset($_REQUEST['key']) ? $_REQUEST['key'] : "";
-		$send_anchor = '';
-		// awu: Fixes the ProjectTasks pluralization issue -- must fix in later versions.
-		if ($send_module == 'ProjectTasks')
-			$send_module = 'ProjectTask';
+        break;
+    default:
+
+        $send_version = isset($_REQUEST['version']) ? $_REQUEST['version'] : "";
+        $send_edition = isset($_REQUEST['edition']) ? $_REQUEST['edition'] : "";
+        $send_lang = isset($_REQUEST['lang']) ? $_REQUEST['lang'] : "";
+        $send_module = isset($_REQUEST['help_module']) ? $_REQUEST['help_module'] : "";
+        $send_action = isset($_REQUEST['help_action']) ? $_REQUEST['help_action'] : "";
+        $send_key = isset($_REQUEST['key']) ? $_REQUEST['key'] : "";
+        $send_anchor = '';
+        // awu: Fixes the ProjectTasks pluralization issue -- must fix in later versions.
+        if ($send_module == 'ProjectTasks')
+            $send_module = 'ProjectTask';
         if ($send_module == 'ProductCatalog')
                 $send_module = 'ProductTemplates';
         if ($send_module == 'TargetLists')
                 $send_module = 'ProspectLists';
         if ($send_module == 'Targets')
                 $send_module = 'Prospects';                            
-		// FG - Bug 39819 - Check for custom help files
-		$helpPath = 'modules/'.$send_module.'/language/'.$send_lang.'.help.'.$send_action.'.html';
-		if (sugar_is_file("custom/" . $helpPath)) {
-		    $helpPath = 'custom/' . $helpPath;
-		}
-		$sugar_smarty = new Sugar_Smarty();
-
-		//go to the support portal if the file is not found.
-		// FG - Bug 39820 - Devs can write help files also in english, so skip check for language not equals "en_us" !
-		if (file_exists($helpPath))
-		{
-			$sugar_smarty->assign('helpFileExists', TRUE);
-			$sugar_smarty->assign('MOD', $mod_strings);
-			$sugar_smarty->assign('modulename', $send_module);
-			$sugar_smarty->assign('helpPath', $helpPath);
-			$sugar_smarty->assign('currentURL', getCurrentURL());
-			$sugar_smarty->assign('title', $mod_strings['LBL_SUGARCRM_HELP'] . " - " . $send_module);
-			$sugar_smarty->assign('styleSheet', SugarThemeRegistry::current()->getCSS());
-			$sugar_smarty->assign('table', "<table class='tabForm'><tr><td>");
-			$sugar_smarty->assign('endtable', "</td></tr></table>");
-			$sugar_smarty->assign('charset', $app_strings['LBL_CHARSET']);
+        // FG - Bug 39819 - Check for custom help files
+        $helpPath = 'modules/'.$send_module.'/language/'.$send_lang.'.help.'.$send_action.'.html';
+        if (sugar_is_file("custom/" . $helpPath)) {
+            $helpPath = 'custom/' . $helpPath;
+        }
+        $sugar_smarty = new Sugar_Smarty();
+
+        //go to the support portal if the file is not found.
+        // FG - Bug 39820 - Devs can write help files also in english, so skip check for language not equals "en_us" !
+        if (file_exists($helpPath))
+        {
+            $sugar_smarty->assign('helpFileExists', TRUE);
+            $sugar_smarty->assign('MOD', $mod_strings);
+            $sugar_smarty->assign('modulename', $send_module);
+            $sugar_smarty->assign('helpPath', $helpPath);
+            $sugar_smarty->assign('currentURL', getCurrentURL());
+            $sugar_smarty->assign('title', $mod_strings['LBL_SUGARCRM_HELP'] . " - " . $send_module);
+            $sugar_smarty->assign('styleSheet', SugarThemeRegistry::current()->getCSS());
+            $sugar_smarty->assign('table', "<table class='tabForm'><tr><td>");
+            $sugar_smarty->assign('endtable', "</td></tr></table>");
+            $sugar_smarty->assign('charset', $app_strings['LBL_CHARSET']);
             $sugar_smarty->assign('langHeader', get_language_header());
-			echo $sugar_smarty->fetch('modules/Administration/SupportPortal.tpl');			
+            echo $sugar_smarty->fetch('modules/Administration/SupportPortal.tpl');			
 			
-		} else {
-			if(empty($send_module)){
-				$send_module = 'toc';
-			}
+        } else {
+            if(empty($send_module)){
+                $send_module = 'toc';
+            }
 			
-			$dev_status = 'GA';
-			//If there is an alphabetic portion between the decimal prefix and integer suffix, then use the
-			//value there as the dev_status value
-			$dev_status = getVersionStatus($GLOBALS['sugar_version']);
-			$send_version = getMajorMinorVersion($GLOBALS['sugar_version']);
-			$editionMap = array('ENT' => 'Enterprise', 'PRO' => 'Professional', 'CE' => 'Community_Edition');
-			if(!empty($editionMap[$send_edition])){
-				$send_edition = $editionMap[$send_edition];
-			}
+            $dev_status = 'GA';
+            //If there is an alphabetic portion between the decimal prefix and integer suffix, then use the
+            //value there as the dev_status value
+            $dev_status = getVersionStatus($GLOBALS['sugar_version']);
+            $send_version = getMajorMinorVersion($GLOBALS['sugar_version']);
+            $editionMap = array('ENT' => 'Enterprise', 'PRO' => 'Professional', 'CE' => 'Community_Edition');
+            if(!empty($editionMap[$send_edition])){
+                $send_edition = $editionMap[$send_edition];
+            }
 			
-			//map certain modules
-			$sendModuleMap = array(
-								'administration' => array(
-													array('name' => 'Administration', 'action' => 'supportportal', 'anchor' => '1910574'),
-													array('name' => 'Administration', 'action' => 'updater', 'anchor' => '1910574'),
-													array('name' => 'Administration', 'action' => 'licensesettings', 'anchor' => '1910574'),
-													array('name' => 'Administration', 'action' => 'diagnostic', 'anchor' => '1111949'),
-													array('name' => 'Administration', 'action' => 'listviewofflineclient', 'anchor' => '1111949'),
-													array('name' => 'Administration', 'action' => 'backups', 'anchor' => '1111949'),
-													array('name' => 'Administration', 'action' => 'upgrade', 'anchor' => '1111949'),
-													array('name' => 'Administration', 'action' => 'locale', 'anchor' => '1111949'),
-													array('name' => 'Administration', 'action' => 'themesettings', 'anchor' => '1111949'),
-													array('name' => 'Administration', 'action' => 'passwordmanager', 'anchor' => '1446494'),
-													array('name' => 'Administration', 'action' => 'upgradewizard', 'anchor' => '1168410'),
-													array('name' => 'Administration', 'action' => 'configuretabs', 'anchor' => '1168410'),
-													array('name' => 'Administration', 'action' => 'configuresubpanels', 'anchor' => '1168410'),
-													array('name' => 'Administration', 'action' => 'wizard', 'anchor' => '1168410'),
-												),
-								'calls' => array(array('name' => 'Activities')), 
-								'tasks' => array(array('name' => 'Activities')), 
-								'meetings' => array(array('name' => 'Activities')), 
-								'notes' => array(array('name' => 'Activities')),
-								'calendar' => array(array('name' => 'Activities')),
-								'configurator' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'upgradewizard' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'schedulers' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'sugarfeed' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'connectors' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'trackers' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'currencies' => array(array('name' => 'Administration', 'anchor' => '1878359')),
-								'aclroles' => array(array('name' => 'Administration', 'anchor' => '1916499')),
-								'roles' => array(array('name' => 'Administration', 'anchor' => '1916499')),
-								'teams' => array(array('name' => 'Administration', 'anchor' => '1916499')),
-								'users' => array(array('name' => 'Administration', 'anchor' => '1916499'), array('name' => 'Administration', 'action' => 'detailview', 'anchor' => '1916518')),
-								'modulebuilder' => array(array('name' => 'Administration', 'anchor' => '1168410')),
-								'studio' => array(array('name' => 'Administration', 'anchor' => '1168410')),
-								'workflow' => array(array('name' => 'Administration', 'anchor' => '1168410')),
-								'producttemplates' => array(array('name' => 'Administration', 'anchor' => '1957376')),
-								'productcategories' => array(array('name' => 'Administration', 'anchor' => '1957376')),
-								'producttypes' => array(array('name' => 'Administration', 'anchor' => '1957376')),
-								'manufacturers' => array(array('name' => 'Administration', 'anchor' => '1957376')),
-								'shippers' => array(array('name' => 'Administration', 'anchor' => '1957376')),
-								'taxrates' => array(array('name' => 'Administration', 'anchor' => '1957376')),
-								'releases' => array(array('name' => 'Administration', 'anchor' => '1868932')),
-								'timeperiods' => array(array('name' => 'Administration', 'anchor' => '1957639')),
-								'contracttypes' => array(array('name' => 'Administration', 'anchor' => '1957677')),
-								'contracttype' => array(array('name' => 'Administration', 'anchor' => '1957677')),
-								'emailman' => array(array('name' => 'Administration', 'anchor' => '1445484')),
-								'inboundemail' => array(array('name' => 'Administration', 'anchor' => '1445484')),
-								'emailtemplates' => array(array('name' => 'Emails')),
-								'prospects' => array(array('name' => 'Campaigns')),
-								'prospectlists' => array(array('name' => 'Campaigns')),
-								'reportmaker' => array(array('name' => 'Reports')),
-								'customqueries' => array(array('name' => 'Reports')),
-								'quotas' => array(array('name' => 'Forecasts')),
-								'projecttask' => array(array('name' => 'Projects')),
-								'project' => array(array('name' => 'Projects'), array('name' => 'Dashboard', 'action' => 'dashboard'), ),
-								'projecttemplate' => array(array('name' => 'Projects')),
-								'datasets' => array(array('name' => 'Reports')),
-								'dataformat' => array(array('name' => 'Reports')),
-								'employees' => array(array('name' => 'Administration', 'anchor' => '1957677')),
-								'kbdocuments' => array(array('name' => 'Administration', 'action' => 'kbadminview', 'anchor' => '1957677')),
-							 );
+            //map certain modules
+            $sendModuleMap = array(
+                                'administration' => array(
+                                                    array('name' => 'Administration', 'action' => 'supportportal', 'anchor' => '1910574'),
+                                                    array('name' => 'Administration', 'action' => 'updater', 'anchor' => '1910574'),
+                                                    array('name' => 'Administration', 'action' => 'licensesettings', 'anchor' => '1910574'),
+                                                    array('name' => 'Administration', 'action' => 'diagnostic', 'anchor' => '1111949'),
+                                                    array('name' => 'Administration', 'action' => 'listviewofflineclient', 'anchor' => '1111949'),
+                                                    array('name' => 'Administration', 'action' => 'backups', 'anchor' => '1111949'),
+                                                    array('name' => 'Administration', 'action' => 'upgrade', 'anchor' => '1111949'),
+                                                    array('name' => 'Administration', 'action' => 'locale', 'anchor' => '1111949'),
+                                                    array('name' => 'Administration', 'action' => 'themesettings', 'anchor' => '1111949'),
+                                                    array('name' => 'Administration', 'action' => 'passwordmanager', 'anchor' => '1446494'),
+                                                    array('name' => 'Administration', 'action' => 'upgradewizard', 'anchor' => '1168410'),
+                                                    array('name' => 'Administration', 'action' => 'configuretabs', 'anchor' => '1168410'),
+                                                    array('name' => 'Administration', 'action' => 'configuresubpanels', 'anchor' => '1168410'),
+                                                    array('name' => 'Administration', 'action' => 'wizard', 'anchor' => '1168410'),
+                                                ),
+                                'calls' => array(array('name' => 'Activities')), 
+                                'tasks' => array(array('name' => 'Activities')), 
+                                'meetings' => array(array('name' => 'Activities')), 
+                                'notes' => array(array('name' => 'Activities')),
+                                'calendar' => array(array('name' => 'Activities')),
+                                'configurator' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'upgradewizard' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'schedulers' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'sugarfeed' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'connectors' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'trackers' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'currencies' => array(array('name' => 'Administration', 'anchor' => '1878359')),
+                                'aclroles' => array(array('name' => 'Administration', 'anchor' => '1916499')),
+                                'roles' => array(array('name' => 'Administration', 'anchor' => '1916499')),
+                                'teams' => array(array('name' => 'Administration', 'anchor' => '1916499')),
+                                'users' => array(array('name' => 'Administration', 'anchor' => '1916499'), array('name' => 'Administration', 'action' => 'detailview', 'anchor' => '1916518')),
+                                'modulebuilder' => array(array('name' => 'Administration', 'anchor' => '1168410')),
+                                'studio' => array(array('name' => 'Administration', 'anchor' => '1168410')),
+                                'workflow' => array(array('name' => 'Administration', 'anchor' => '1168410')),
+                                'producttemplates' => array(array('name' => 'Administration', 'anchor' => '1957376')),
+                                'productcategories' => array(array('name' => 'Administration', 'anchor' => '1957376')),
+                                'producttypes' => array(array('name' => 'Administration', 'anchor' => '1957376')),
+                                'manufacturers' => array(array('name' => 'Administration', 'anchor' => '1957376')),
+                                'shippers' => array(array('name' => 'Administration', 'anchor' => '1957376')),
+                                'taxrates' => array(array('name' => 'Administration', 'anchor' => '1957376')),
+                                'releases' => array(array('name' => 'Administration', 'anchor' => '1868932')),
+                                'timeperiods' => array(array('name' => 'Administration', 'anchor' => '1957639')),
+                                'contracttypes' => array(array('name' => 'Administration', 'anchor' => '1957677')),
+                                'contracttype' => array(array('name' => 'Administration', 'anchor' => '1957677')),
+                                'emailman' => array(array('name' => 'Administration', 'anchor' => '1445484')),
+                                'inboundemail' => array(array('name' => 'Administration', 'anchor' => '1445484')),
+                                'emailtemplates' => array(array('name' => 'Emails')),
+                                'prospects' => array(array('name' => 'Campaigns')),
+                                'prospectlists' => array(array('name' => 'Campaigns')),
+                                'reportmaker' => array(array('name' => 'Reports')),
+                                'customqueries' => array(array('name' => 'Reports')),
+                                'quotas' => array(array('name' => 'Forecasts')),
+                                'projecttask' => array(array('name' => 'Projects')),
+                                'project' => array(array('name' => 'Projects'), array('name' => 'Dashboard', 'action' => 'dashboard'), ),
+                                'projecttemplate' => array(array('name' => 'Projects')),
+                                'datasets' => array(array('name' => 'Reports')),
+                                'dataformat' => array(array('name' => 'Reports')),
+                                'employees' => array(array('name' => 'Administration', 'anchor' => '1957677')),
+                                'kbdocuments' => array(array('name' => 'Administration', 'action' => 'kbadminview', 'anchor' => '1957677')),
+                                );
 							 
-			if(!empty($sendModuleMap[strtolower($send_module)])){
-				$mappings = $sendModuleMap[strtolower($send_module)];
+            if(!empty($sendModuleMap[strtolower($send_module)])){
+                $mappings = $sendModuleMap[strtolower($send_module)];
 				
-				foreach($mappings as $map){
-					if(!empty($map['action'])){
-						if($map['action'] == strtolower($send_action)){
-							$send_module = $map['name'];
-							if(!empty($map['anchor'])){
-								$send_anchor = $map['anchor'];
-							}
-						}
-					}else{
-						$send_module = $map['name'];
-						if(!empty($map['anchor'])){
-								$send_anchor = $map['anchor'];
-						}
-					}
-				}
-				//$send_module = $sendModuleMap[strtolower($send_module)];
-			}
+                foreach($mappings as $map){
+                    if(!empty($map['action'])){
+                        if($map['action'] == strtolower($send_action)){
+                            $send_module = $map['name'];
+                            if(!empty($map['anchor'])){
+                                $send_anchor = $map['anchor'];
+                            }
+                        }
+                    }else{
+                        $send_module = $map['name'];
+                        if(!empty($map['anchor'])){
+                                $send_anchor = $map['anchor'];
+                        }
+                    }
+                }
+                //$send_module = $sendModuleMap[strtolower($send_module)];
+            }
 
 
             $iframe_url = get_help_url($send_edition, $send_version, $send_lang, $send_module, $send_action, $dev_status, $send_key, $send_anchor);
 			
-			header("Location: {$iframe_url}");
+            header("Location: {$iframe_url}");
 			
-			//$sugar_smarty->assign('helpFileExists', FALSE);
-			//$sugar_smarty->assign('iframeURL', $iframe_url);
-		}
-		break;
+            //$sugar_smarty->assign('helpFileExists', FALSE);
+            //$sugar_smarty->assign('iframeURL', $iframe_url);
+        }
+        break;
 
 }

modules/Administration/DiagnosticRun.php

Indentation +250 added lines, -250 removed lines

@@ -69,12 +69,12 @@ 
 global $db;
 if(empty($db)) {
 
-	$db = DBManagerFactory::getInstance();
+    $db = DBManagerFactory::getInstance();
 }
 
 global $current_user;
 if(!is_admin($current_user)){
-	die($mod_strings['LBL_DIAGNOSTIC_ACCESS']);
+    die($mod_strings['LBL_DIAGNOSTIC_ACCESS']);
 }
 global $sugar_config;
 global $beanFiles;
@@ -132,11 +132,11 @@ 
 
     $currentitems++;
     if($currentitems == $totalitems)
-      update_progress_bar("diagnostic", 100, 100);
+        update_progress_bar("diagnostic", 100, 100);
     else
     {
-      $progress_bar_percent += ($itemweight / $GLOBALS['totalweight'] * 100);
-      update_progress_bar("diagnostic", $progress_bar_percent, 100);
+        $progress_bar_percent += ($itemweight / $GLOBALS['totalweight'] * 100);
+        update_progress_bar("diagnostic", $progress_bar_percent, 100);
     }
 }
 
@@ -158,7 +158,7 @@ 
 
     $contents .= "<tr colspan=\"$cols\">$header</tr><tr>";
     foreach($keys as $key) {
-       $contents .= "<th class=\"tabDetailViewDL\"><b>$key</b></th>";
+        $contents .= "<th class=\"tabDetailViewDL\"><b>$key</b></th>";
     }
     $contents .= "</tr>";
     foreach($values as $field) {
@@ -180,7 +180,7 @@ 
 // returns a string containing (in html) the dump of all rows
 function getFullTableDump($tableName){
 
-	global $db;
+    global $db;
 
     $cols = $db->get_columns($tableName);
     $indexes = $db->get_indices($tableName);
@@ -192,7 +192,7 @@ 
 
     $def_count = count($cols);
 
-	$td_result = $db->query("select * from ".$tableName);
+    $td_result = $db->query("select * from ".$tableName);
     if(!$td_result) {
         return $db->lastError();
     }
@@ -204,124 +204,124 @@ 
     }
     $returnString .= "</tr>";
     $row_counter = 1;
-	while($row = $db->fetchByAssoc($td_result))
-	{
-		$row = array_values($row);
-		$returnString .= "<tr>";
-		$returnString .= "<td class=\"tabDetailViewDL\">".$row_counter."</td>";
-		for($counter = 0; $counter < $def_count; $counter++) {
+    while($row = $db->fetchByAssoc($td_result))
+    {
+        $row = array_values($row);
+        $returnString .= "<tr>";
+        $returnString .= "<td class=\"tabDetailViewDL\">".$row_counter."</td>";
+        for($counter = 0; $counter < $def_count; $counter++) {
             $replace_val = false;
-			//perform this check when counter is set to two, which means it is on the 'value' column
-			if($counter == 2) {
-				//if the previous "name" column value was set to smtppass, set replace_val to true
-				if(strcmp($row[$counter - 1], "smtppass") == 0  )
-					$replace_val = true;
-
-				//if the previous "name" column value was set to smtppass,
-				//and the "category" value set to ldap, set replace_val to true
-				if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0)
-					$replace_val = true;
-
-				//if the previous "name" column value was set to password,
-				//and the "category" value set to proxy, set replace_val to true
-				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
-					$replace_val = true;
-			}
-
-			if($replace_val) {
-					$returnString .= "<td class=\"tabDetailViewDF\">********</td>";
+            //perform this check when counter is set to two, which means it is on the 'value' column
+            if($counter == 2) {
+                //if the previous "name" column value was set to smtppass, set replace_val to true
+                if(strcmp($row[$counter - 1], "smtppass") == 0  )
+                    $replace_val = true;
+
+                //if the previous "name" column value was set to smtppass,
+                //and the "category" value set to ldap, set replace_val to true
+                if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0)
+                    $replace_val = true;
+
+                //if the previous "name" column value was set to password,
+                //and the "category" value set to proxy, set replace_val to true
+                if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
+                    $replace_val = true;
+            }
+
+            if($replace_val) {
+                    $returnString .= "<td class=\"tabDetailViewDF\">********</td>";
             } else {
-					$returnString .= "<td class=\"tabDetailViewDF\">".($row[$counter] == "" ? "&nbsp;" : $row[$counter])."</td>";
-			}
-	    }
+                    $returnString .= "<td class=\"tabDetailViewDF\">".($row[$counter] == "" ? "&nbsp;" : $row[$counter])."</td>";
+            }
+        }
         $row_counter++;
         $returnString .= "</tr>";
     }
-	$returnString .= "</table>";
+    $returnString .= "</table>";
 
-	return $returnString;
+    return $returnString;
 }
 
 // Deletes the directory recursively
 function deleteDir($dir)
 {
-   if (substr($dir, strlen($dir)-1, 1) != '/')
-       $dir .= '/';
-
-   if ($handle = opendir($dir))
-   {
-       while ($obj = readdir($handle))
-       {
-           if ($obj != '.' && $obj != '..')
-           {
-               if (is_dir($dir.$obj))
-               {
-                   if (!deleteDir($dir.$obj))
-                       return false;
-               }
-               elseif (is_file($dir.$obj))
-               {
-                   if (!unlink($dir.$obj))
-                       return false;
-               }
-           }
-       }
-
-       closedir($handle);
-
-       if (!@rmdir($dir))
-           return false;
-       return true;
-   }
-   return false;
+    if (substr($dir, strlen($dir)-1, 1) != '/')
+        $dir .= '/';
+
+    if ($handle = opendir($dir))
+    {
+        while ($obj = readdir($handle))
+        {
+            if ($obj != '.' && $obj != '..')
+            {
+                if (is_dir($dir.$obj))
+                {
+                    if (!deleteDir($dir.$obj))
+                        return false;
+                }
+                elseif (is_file($dir.$obj))
+                {
+                    if (!unlink($dir.$obj))
+                        return false;
+                }
+            }
+        }
+
+        closedir($handle);
+
+        if (!@rmdir($dir))
+            return false;
+        return true;
+    }
+    return false;
 }
 
 
 function prepareDiag()
 {
-	global $getDumpsFrom;
-	global $cacheDir;
-	global $curdatetime;
-	global $progress_bar_percent;
-	global $skip_md5_diff;
-	global $sod_guid;
-	global $mod_strings;
-
-	echo getClassicModuleTitle(
+    global $getDumpsFrom;
+    global $cacheDir;
+    global $curdatetime;
+    global $progress_bar_percent;
+    global $skip_md5_diff;
+    global $sod_guid;
+    global $mod_strings;
+
+    echo getClassicModuleTitle(
         "Administration",
         array(
             "<a href='index.php?module=Administration&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>",
-           translate('LBL_DIAGNOSTIC_TITLE')
-           ),
+            translate('LBL_DIAGNOSTIC_TITLE')
+            ),
         false
         );
-	echo "<BR>";
-	echo $mod_strings['LBL_DIAGNOSTIC_EXECUTING'];
-	echo "<BR>";
+    echo "<BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_EXECUTING'];
+    echo "<BR>";
 
 
-	//determine if files.md5 exists or not
-	if(file_exists('files.md5'))
-		$skip_md5_diff = false;
-	else
-		$skip_md5_diff = true;
+    //determine if files.md5 exists or not
+    if(file_exists('files.md5'))
+        $skip_md5_diff = false;
+    else
+        $skip_md5_diff = true;
 
-	// array of all tables that we need to pull rows from below
-	$getDumpsFrom = array('config' => 'config',
-	                      'fields_meta_data' => 'fields_meta_data',
-	                      'upgrade_history' => 'upgrade_history',
-	                      'versions' => 'versions',
-	                      );
+    // array of all tables that we need to pull rows from below
+    $getDumpsFrom = array('config' => 'config',
+                            'fields_meta_data' => 'fields_meta_data',
+                            'upgrade_history' => 'upgrade_history',
+                            'versions' => 'versions',
+                            );
 
 
-	//Creates the diagnostic directory in the cache directory
+    //Creates the diagnostic directory in the cache directory
     $cacheDir = create_cache_directory("diagnostic/");
     $cacheDir = create_cache_directory("diagnostic/".$sod_guid);
     $cacheDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/");
 
-	display_progress_bar("diagnostic", $progress_bar_percent, 100);
+    display_progress_bar("diagnostic", $progress_bar_percent, 100);
 
-	ob_flush();
+    ob_flush();
 }
 
 function executesugarlog()
@@ -329,10 +329,10 @@ 
     //BEGIN COPY SUGARCRM.LOG
     //Copies the Sugarcrm log to our diagnostic directory
     global $cacheDir;
-	require_once('include/SugarLogger/SugarLogger.php');
-	$logger = new SugarLogger();
+    require_once('include/SugarLogger/SugarLogger.php');
+    $logger = new SugarLogger();
     if(!copy($logger->getLogFileNameWithPath(), $cacheDir.'/'.$logger->getLogFileName())) {
-      echo "Couldn't copy suitecrm.log to cacheDir.<br>";
+        echo "Couldn't copy suitecrm.log to cacheDir.<br>";
     }
     //END COPY SUGARCRM.LOG
 
@@ -353,7 +353,7 @@ 
 
     $handle = sugar_fopen($cacheDir."phpinfo.html", "w");
     if(fwrite($handle, $phpinfo) === FALSE){
-      echo "Cannot write to file ".$cacheDir."phpinfo.html<br>";
+        echo "Cannot write to file ".$cacheDir."phpinfo.html<br>";
     }
     fclose($handle);
     //END GETPHPINFO
@@ -393,7 +393,7 @@ 
 
     //create directory for table definitions
     if($getschema)
-      $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
+        $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
 
     //make sure they checked the box to get basic info
     if($getinfo)
@@ -483,36 +483,36 @@ 
         foreach($all_tables as $tablename){
             $cols = $db->get_columns($tablename);
             $indexes = $db->get_indices($tablename);
-			//setting up table header for each file
+            //setting up table header for each file
             $contents .= array_as_table("{$db->dbName} $tablename Definitions:", $cols);
             $contents .= array_as_table("{$db->dbName} $tablename Keys:", $indexes);
-			$contents .= "<BR><BR>";
-		}
+            $contents .= "<BR><BR>";
+        }
 
         file_put_contents($tablesSchemaDir."{$db->dbName}TablesSchema.html", $contents);
-		//END GET ALL TABLES SCHEMAS
-		//BEGIN UPDATING PROGRESS BAR
-		sodUpdateProgressBar(SQL_SCHEMA_WEIGHT);
-		//END UPDATING PROGRESS BAR
+        //END GET ALL TABLES SCHEMAS
+        //BEGIN UPDATING PROGRESS BAR
+        sodUpdateProgressBar(SQL_SCHEMA_WEIGHT);
+        //END UPDATING PROGRESS BAR
     }
 
     if($getdumps)
     {
-		//BEGIN GET TABLEDUMPS
-		$tableDumpsDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableDumps/");
+        //BEGIN GET TABLEDUMPS
+        $tableDumpsDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableDumps/");
 
 
-		foreach ($getDumpsFrom as $table)
-		{
-			//calling function defined above to get the string for dump
-			$contents = $style .getFullTableDump($table);
+        foreach ($getDumpsFrom as $table)
+        {
+            //calling function defined above to get the string for dump
+            $contents = $style .getFullTableDump($table);
             file_put_contents($tableDumpsDir.$table.".html", $contents);
-		}
-		//END GET TABLEDUMPS
-		//BEGIN UPDATING PROGRESS BAR
-		sodUpdateProgressBar(SQL_DUMPS_WEIGHT);
-		//END UPDATING PROGRESS BAR
-	}
+        }
+        //END GET TABLEDUMPS
+        //BEGIN UPDATING PROGRESS BAR
+        sodUpdateProgressBar(SQL_DUMPS_WEIGHT);
+        //END UPDATING PROGRESS BAR
+    }
     //END GET DB INFO
 }
 
@@ -542,27 +542,27 @@ 
     echo "</font>";
     echo "<BR><BR>";
 
-	foreach ($beanList as $beanz)
-	{
-		if(!isset($beanFiles[$beanz]))
-		{
-			echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
-		}
-		else
-		{
-			if(file_exists($beanFiles[$beanz]))
-				echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
-			else
-				echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
-		}
-	}
-
-	$content = ob_get_contents();
-	ob_clean();
-
-	$handle = sugar_fopen($cacheDir."beanFiles.html", "w");
-	if(fwrite($handle, $content) === FALSE){
-    	echo "Cannot write to file ".$cacheDir."beanFiles.html<br>";
+    foreach ($beanList as $beanz)
+    {
+        if(!isset($beanFiles[$beanz]))
+        {
+            echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
+        }
+        else
+        {
+            if(file_exists($beanFiles[$beanz]))
+                echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
+            else
+                echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
+        }
+    }
+
+    $content = ob_get_contents();
+    ob_clean();
+
+    $handle = sugar_fopen($cacheDir."beanFiles.html", "w");
+    if(fwrite($handle, $content) === FALSE){
+        echo "Cannot write to file ".$cacheDir."beanFiles.html<br>";
     }
     fclose($handle);
     //END CHECK BEANLIST FILES ARE AVAILABLE
@@ -585,38 +585,38 @@ 
 
 function executemd5($filesmd5, $md5calculated)
 {
-	//BEGIN ALL MD5 CHECKS
-	global $curdatetime;
-	global $skip_md5_diff;
-	global $sod_guid;
-	if(file_exists('files.md5'))
+    //BEGIN ALL MD5 CHECKS
+    global $curdatetime;
+    global $skip_md5_diff;
+    global $sod_guid;
+    if(file_exists('files.md5'))
         include( 'files.md5');
-	//create dir for md5s
-	$md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
+    //create dir for md5s
+    $md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
 
-	//skip this if the files.md5 didn't exist
-	if(!$skip_md5_diff)
-	{
-		//make sure the files.md5
-		if($filesmd5)
-			if(!copy('files.md5', $md5_directory."files.md5"))
-				echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
-	}
+    //skip this if the files.md5 didn't exist
+    if(!$skip_md5_diff)
+    {
+        //make sure the files.md5
+        if($filesmd5)
+            if(!copy('files.md5', $md5_directory."files.md5"))
+                echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
+    }
 
-	$md5_string_calculated = generateMD5array('./');
+    $md5_string_calculated = generateMD5array('./');
 
-	if($md5calculated)
-		write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
+    if($md5calculated)
+        write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
 
 
-	//if the files.md5 didn't exist, we can't do this
-	if(!$skip_md5_diff)
-	{
-		$md5_string_diff = array_diff($md5_string_calculated, $md5_string);
+    //if the files.md5 didn't exist, we can't do this
+    if(!$skip_md5_diff)
+    {
+        $md5_string_diff = array_diff($md5_string_calculated, $md5_string);
 
-		write_array_to_file('md5_string_diff', $md5_string_diff, $md5_directory."md5_array_diff.php");
-	}
-	//END ALL MD5 CHECKS
+        write_array_to_file('md5_string_diff', $md5_string_diff, $md5_directory."md5_array_diff.php");
+    }
+    //END ALL MD5 CHECKS
     //BEGIN UPDATING PROGRESS BAR
     sodUpdateProgressBar(MD5_WEIGHT);
     //END UPDATING PROGRESS BAR
@@ -639,14 +639,14 @@ 
 
     ob_start();
     foreach ( $beanList as $beanz ) {
-      // echo "Module: ".$beanz."<br>";
-
-	$path_parts = pathinfo( $beanFiles[ $beanz ] );
-	$vardefFileName = $path_parts[ 'dirname' ]."/vardefs.php";
-	  if( file_exists( $vardefFileName )) {
-	    // echo "<br>".$vardefFileName."<br>";
-      }
-      include_once( $vardefFileName );
+        // echo "Module: ".$beanz."<br>";
+
+    $path_parts = pathinfo( $beanFiles[ $beanz ] );
+    $vardefFileName = $path_parts[ 'dirname' ]."/vardefs.php";
+        if( file_exists( $vardefFileName )) {
+        // echo "<br>".$vardefFileName."<br>";
+        }
+        include_once( $vardefFileName );
     }
 
     echo "<html lang='en'>";
@@ -659,22 +659,22 @@ 
 
     $tables = array();
     foreach($dictionary as $vardef) {
-	$tables[] = $vardef['table'];
-	$fields[$vardef['table']] = $vardef['fields'];
-	$comments[$vardef['table']] = $vardef['comment'];
+    $tables[] = $vardef['table'];
+    $fields[$vardef['table']] = $vardef['fields'];
+    $comments[$vardef['table']] = $vardef['comment'];
     }
 
     asort($tables);
 
     foreach($tables as $t) {
-	$name = $t;
-	if ( $name == "does_not_exist" )
-	  continue;
-	$comment = $comments[$t];
-	echo "<h2>Table: $t</h2>
+    $name = $t;
+    if ( $name == "does_not_exist" )
+        continue;
+    $comment = $comments[$t];
+    echo "<h2>Table: $t</h2>
 		<p><i>{$comment}</i></p>";
-	echo "<table border=\"0\" cellpadding=\"3\" class=\"tabDetailView\">";
-	echo '<TR BGCOLOR="#DFDFDF">
+    echo "<table border=\"0\" cellpadding=\"3\" class=\"tabDetailView\">";
+    echo '<TR BGCOLOR="#DFDFDF">
 		<TD NOWRAP ALIGN=left class=\"tabDetailViewDL\">Column</TD>
 		<TD NOWRAP class=\"tabDetailViewDL\">Type</TD>
 		<TD NOWRAP class=\"tabDetailViewDL\">Length</TD>
@@ -682,36 +682,36 @@ 
 		<TD NOWRAP class=\"tabDetailViewDL\">Comment</TD>
 	</TR>';
 
-	ksort( $fields[ $t ] );
-
-	foreach($fields[$t] as $k => $v) {
-	  // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
-	  if ( isset( $v[ 'source' ] ))
-	    continue;
-	  $columnname = $v[ 'name' ];
-	  $columntype = $v[ 'type' ];
-	  $columndbtype = $v[ 'dbType' ];
-	  $columnlen = $v[ 'len' ];
-	  $columncomment = $v[ 'comment' ];
-	  $columnrequired = $v[ 'required' ];
-
-	  if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
-	  if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
-	  if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
-	  if ( empty( $columnrequired ) || ( $columnrequired == false ))
-	    $columndisplayrequired = 'no';
-	  else
-	    $columndisplayrequired = 'yes';
-
-	  echo '<TR BGCOLOR="#FFFFFF" ALIGN=left>
+    ksort( $fields[ $t ] );
+
+    foreach($fields[$t] as $k => $v) {
+        // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
+        if ( isset( $v[ 'source' ] ))
+        continue;
+        $columnname = $v[ 'name' ];
+        $columntype = $v[ 'type' ];
+        $columndbtype = $v[ 'dbType' ];
+        $columnlen = $v[ 'len' ];
+        $columncomment = $v[ 'comment' ];
+        $columnrequired = $v[ 'required' ];
+
+        if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
+        if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
+        if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
+        if ( empty( $columnrequired ) || ( $columnrequired == false ))
+        $columndisplayrequired = 'no';
+        else
+        $columndisplayrequired = 'yes';
+
+        echo '<TR BGCOLOR="#FFFFFF" ALIGN=left>
 			<TD ALIGN=left class=\"tabDetailViewDF\">'.$columnname.'</TD>
 	  		<TD NOWRAP class=\"tabDetailViewDF\">'.$columntype.'</TD>
 			<TD NOWRAP class=\"tabDetailViewDF\">'.$columnlen.'</TD>
 			<TD NOWRAP class=\"tabDetailViewDF"\">'.$columndisplayrequired.'</TD>
 			<TD WRAP class=\"tabDetailViewDF\">'.$columncomment.'</TD></TR>';
-	}
+    }
 
-	echo "</table></p>";
+    echo "</table></p>";
     }
 
     echo "</body></html>";
@@ -721,7 +721,7 @@ 
 
     $handle = sugar_fopen($cacheDir."vardefschema.html", "w");
     if(fwrite($handle, $vardefFormattedOutput) === FALSE){
-      echo "Cannot write to file ".$cacheDir."vardefschema.html<br>";
+        echo "Cannot write to file ".$cacheDir."vardefschema.html<br>";
     }
     fclose($handle);
     sodUpdateProgressBar(VARDEFS_WEIGHT);
@@ -729,23 +729,23 @@ 
 }
 
 function finishDiag(){
-	//BEGIN ZIP ALL FILES AND EXTRACT IN CACHE ROOT
-	global $cacheDir;
-	global $curdatetime;
-	global $sod_guid;
-	global $mod_strings;
-
-	chdir($cacheDir);
-	zip_dir(".", "../diagnostic".$curdatetime.".zip");
-	//END ZIP ALL FILES AND EXTRACT IN CACHE ROOT
-	chdir(RETURN_FROM_DIAG_DIR);
-
-	deleteDir($cacheDir);
+    //BEGIN ZIP ALL FILES AND EXTRACT IN CACHE ROOT
+    global $cacheDir;
+    global $curdatetime;
+    global $sod_guid;
+    global $mod_strings;
+
+    chdir($cacheDir);
+    zip_dir(".", "../diagnostic".$curdatetime.".zip");
+    //END ZIP ALL FILES AND EXTRACT IN CACHE ROOT
+    chdir(RETURN_FROM_DIAG_DIR);
+
+    deleteDir($cacheDir);
 	
 	
-	print "<a href=\"index.php?module=Administration&action=DiagnosticDownload&guid=$sod_guid&time=$curdatetime&to_pdf=1\">".$mod_strings['LBL_DIAGNOSTIC_DOWNLOADLINK']."</a><BR>";
+    print "<a href=\"index.php?module=Administration&action=DiagnosticDownload&guid=$sod_guid&time=$curdatetime&to_pdf=1\">".$mod_strings['LBL_DIAGNOSTIC_DOWNLOADLINK']."</a><BR>";
 
-	print "<a href=\"index.php?module=Administration&action=DiagnosticDelete&file=diagnostic".$curdatetime."&guid=".$sod_guid."\">".$mod_strings['LBL_DIAGNOSTIC_DELETELINK']."</a><br>";
+    print "<a href=\"index.php?module=Administration&action=DiagnosticDelete&file=diagnostic".$curdatetime."&guid=".$sod_guid."\">".$mod_strings['LBL_DIAGNOSTIC_DELETELINK']."</a><br>";
 
 }
 
@@ -786,55 +786,55 @@ 
 
 if($doconfigphp)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETCONFPHP']."<BR>";
-  executeconfigphp();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETCONFPHP']."<BR>";
+    executeconfigphp();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($docustom_dir)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETCUSTDIR']."<BR>";
-  executecustom_dir();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETCUSTDIR']."<BR>";
+    executecustom_dir();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dophpinfo)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETPHPINFO']."<BR>";
-  executephpinfo();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETPHPINFO']."<BR>";
+    executephpinfo();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($domysql_info || $domysql_dumps || $domysql_schema)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETTING'].
-                 ($domysql_info ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLINFO'] : " ").
-                 ($domysql_dumps ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTD'] : " ").
-                 ($domysql_schema ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTS'] : "...").
-                 "<BR>";
-  execute_sql($domysql_info, $domysql_dumps, $domysql_schema);
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETTING'].
+                    ($domysql_info ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLINFO'] : " ").
+                    ($domysql_dumps ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTD'] : " ").
+                    ($domysql_schema ? "... ".$mod_strings['LBL_DIAGNOSTIC_GETMYSQLTS'] : "...").
+                    "<BR>";
+    execute_sql($domysql_info, $domysql_dumps, $domysql_schema);
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($domd5)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETMD5INFO']."<BR>";
-  executemd5($domd5filesmd5, $domd5calculated);
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETMD5INFO']."<BR>";
+    executemd5($domd5filesmd5, $domd5calculated);
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dobeanlistbeanfiles)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETBEANFILES']."<BR>";
-  executebeanlistbeanfiles();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETBEANFILES']."<BR>";
+    executebeanlistbeanfiles();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dosugarlog)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_GETSUGARLOG']."<BR>";
-  executesugarlog();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_GETSUGARLOG']."<BR>";
+    executesugarlog();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 if($dovardefs)
 {
-  echo $mod_strings['LBL_DIAGNOSTIC_VARDEFS']."<BR>";
-  executevardefs();
-  echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
+    echo $mod_strings['LBL_DIAGNOSTIC_VARDEFS']."<BR>";
+    executevardefs();
+    echo $mod_strings['LBL_DIAGNOSTIC_DONE']."<BR><BR>";
 }
 
 //finish up the last steps

modules/Administration/RepairSeedUsers.php

Indentation +23 added lines, -23 removed lines

@@ -42,27 +42,27 @@ 
 
 if(is_admin($current_user)){
     if(count($_POST)){
-    	if(!empty($_POST['activate'])){
+        if(!empty($_POST['activate'])){
 
-    		$status = '';
-    		if($_POST['activate'] == 'false'){
-    			$status = 'Inactive';
-    		}else{
-    			$status = 'Active';
-    		}
-    	}
-    	$query = "UPDATE users SET status = '$status' WHERE id LIKE 'seed%'";
-   		$GLOBALS['db']->query($query);
+            $status = '';
+            if($_POST['activate'] == 'false'){
+                $status = 'Inactive';
+            }else{
+                $status = 'Active';
+            }
+        }
+        $query = "UPDATE users SET status = '$status' WHERE id LIKE 'seed%'";
+            $GLOBALS['db']->query($query);
     }
-    	$query = "SELECT status FROM users WHERE id LIKE 'seed%'";
-    	$result = $GLOBALS['db']->query($query);
-		$row = $GLOBALS['db']->fetchByAssoc($result);
-		if(!empty($row['status'])){
-			$activate = 'false';
-			if($row['status'] == 'Inactive'){
-				$activate = 'true';
-			}
-			?>
+        $query = "SELECT status FROM users WHERE id LIKE 'seed%'";
+        $result = $GLOBALS['db']->query($query);
+        $row = $GLOBALS['db']->fetchByAssoc($result);
+        if(!empty($row['status'])){
+            $activate = 'false';
+            if($row['status'] == 'Inactive'){
+                $activate = 'true';
+            }
+            ?>
 				<p>
 				<form name="RepairSeedUsers" method="post" action="index.php">
 				<input type="hidden" name="module" value="Administration">
@@ -80,11 +80,11 @@ 
 				</p>
 			<?php
 
-		}else{
-			echo 'No seed Users';
-		}
+        }else{
+            echo 'No seed Users';
+        }
 }
 else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

modules/Administration/RebuildSchedulers.php

Indentation +3 added lines, -3 removed lines

@@ -42,9 +42,9 @@
 
 if(isset($_REQUEST['perform_rebuild']) && $_REQUEST['perform_rebuild'] == 'true') {
 	
-	require_once('install/install_utils.php');
-	$focus = new Scheduler();
-	$focus->rebuildDefaultSchedulers();
+    require_once('install/install_utils.php');
+    $focus = new Scheduler();
+    $focus->rebuildDefaultSchedulers();
 	
 $admin_mod_strings = return_module_language($current_language, 'Administration');	
 ?>

modules/Administration/updater_utils.php

Indentation +211 added lines, -211 removed lines

@@ -44,18 +44,18 @@ 
 require_once('include/utils/encryption_utils.php');
 
 function getSystemInfo($send_usage_info=true){
-	global $sugar_config;
-	global $db, $administration, $timedate;
-	$info=array();
-	$info = getBaseSystemInfo($send_usage_info);
+    global $sugar_config;
+    global $db, $administration, $timedate;
+    $info=array();
+    $info = getBaseSystemInfo($send_usage_info);
     if($send_usage_info){
-		$info['application_key']=$sugar_config['unique_key'];
-		$info['php_version']=phpversion();
-		if(isset($_SERVER['SERVER_SOFTWARE'])) {
-			$info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
-		} // if
+        $info['application_key']=$sugar_config['unique_key'];
+        $info['php_version']=phpversion();
+        if(isset($_SERVER['SERVER_SOFTWARE'])) {
+            $info['server_software'] = $_SERVER['SERVER_SOFTWARE'];
+        } // if
 
-		//get user count.
+        //get user count.
 
                 $query = "SELECT count(*) as total from users WHERE " . User::getLicensedUsersWhere();
                 $result = $db->getOne($query, false, 'fetching active users count');
@@ -63,58 +63,58 @@ 
                     $info['users'] = $result;
                 }
 
-		if(empty($administration)){
+        if(empty($administration)){
 
-			$administration = new Administration();
-		}
-		$administration->retrieveSettings('system');
-		$info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
+            $administration = new Administration();
+        }
+        $administration->retrieveSettings('system');
+        $info['system_name'] = (!empty($administration->settings['system_name']))?substr($administration->settings['system_name'], 0 ,255):'';
 
 
-		$result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
-		if($result !== false) {
-			$info['admin_users'] = $result;
-		}
+        $result=$db->getOne("select count(*) count from users where status='Active' and deleted=0 and is_admin='1'", false, 'fetching admin count');
+        if($result !== false) {
+            $info['admin_users'] = $result;
+        }
 
 
-		$result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
-		if($result !== false) {
-			$info['registered_users'] = $result;
-		}
+        $result=$db->getOne("select count(*) count from users", false, 'fetching all users count');
+        if($result !== false) {
+            $info['registered_users'] = $result;
+        }
 
-		$lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
-		if( !$send_usage_info) {
-			$info['users_active_30_days'] = -1;
-		} else {
-			$info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
-		}
+        $lastMonth = $db->convert("'". $timedate->getNow()->modify("-30 days")->asDb(false) . "'", 'datetime');
+        if( !$send_usage_info) {
+            $info['users_active_30_days'] = -1;
+        } else {
+            $info['users_active_30_days'] = $db->getOne("SELECT count( DISTINCT users.id ) user_count FROM tracker, users WHERE users.id = tracker.user_id AND  tracker.date_modified >= $lastMonth", false, 'fetching last 30 users count');
+        }
 
 
 
 
-		if(!$send_usage_info){
-			$info['latest_tracker_id'] = -1;
-		}else{
-			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
-		}
+        if(!$send_usage_info){
+            $info['latest_tracker_id'] = -1;
+        }else{
+            $id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
+            if ( $id !== false )
+                $info['latest_tracker_id'] = $id;
+        }
 
-		$info['db_type']=$sugar_config['dbconfig']['db_type'];
-		$info['db_version']=$db->version();
-	}
-	if(file_exists('distro.php')){
-		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
-	}
-	$info['os'] = php_uname('s');
-	$info['os_version'] = php_uname('r');
-	$info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
-	$info['timezone'] = date('e');
-	if($info['timezone'] == 'e'){
-		$info['timezone'] = date('T');
-	}
-	return $info;
+        $info['db_type']=$sugar_config['dbconfig']['db_type'];
+        $info['db_version']=$db->version();
+    }
+    if(file_exists('distro.php')){
+        include('distro.php');
+        if(!empty($distro_name))$info['distro_name'] = $distro_name;
+    }
+    $info['os'] = php_uname('s');
+    $info['os_version'] = php_uname('r');
+    $info['timezone_u'] = $GLOBALS['current_user']->getPreference('timezone');
+    $info['timezone'] = date('e');
+    if($info['timezone'] == 'e'){
+        $info['timezone'] = date('T');
+    }
+    return $info;
 
 }
 
@@ -137,28 +137,28 @@ 
 }
 
 function check_now($send_usage_info=true, $get_request_data=false, $response_data = false, $from_install=false ) {
-	global $sugar_config, $timedate;
-	global $db, $license;
+    global $sugar_config, $timedate;
+    global $db, $license;
     include('sugar_version.php');
 
 
-	$return_array=array();
+    $return_array=array();
     if(!$from_install && empty($license))loadLicense(true);
 
-	if(!$response_data){
+    if(!$response_data){
 
         if($from_install){
-    		$info = getBaseSystemInfo(false);
+            $info = getBaseSystemInfo(false);
 
         }else{
             $info = getSystemInfo($send_usage_info);
         }
 
-		require_once('include/nusoap/nusoap.php');
+        require_once('include/nusoap/nusoap.php');
 
-		$GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
-		$sclient = new nusoapclient('https://updates.sugarcrm.com/heartbeat/soap.php', false, false, false, false, false, 15, 15);
-		$ping = $sclient->call('sugarPing', array());
+        $GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
+        $sclient = new nusoapclient('https://updates.sugarcrm.com/heartbeat/soap.php', false, false, false, false, false, 15, 15);
+        $ping = $sclient->call('sugarPing', array());
         if (empty($ping) || $sclient->getError()) {
             if (!$get_request_data) {
                 return array(
@@ -171,92 +171,92 @@ 
         }
 
 
-			$key = '4829482749329';
-
-
-
-		$encoded = sugarEncode($key, serialize($info));
-
-		if($get_request_data){
-			$request_data = array('key'=>$key, 'data'=>$encoded);
-			return serialize($request_data);
-		}
-		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
-
-	}else{
-		$encodedResult = 	$response_data['data'];
-		$key = $response_data['key'];
-
-	}
-
-	if($response_data || !$sclient->getError()){
-		$serializedResultData = sugarDecode($key,$encodedResult);
-		$resultData = unserialize($serializedResultData);
-		if($response_data && empty($resultData))
-		{
-			$resultData = array();
-			$resultData['validation'] = 'invalid validation key';
-		}
-	}else
-	{
-		$resultData = array();
-		$resultData['versions'] = array();
-
-	}
-
-	if($response_data || !$sclient->getError() )
-	{
-		if(!empty($resultData['msg'])){
-			if(!empty($resultData['msg']['admin'])){
-				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
-				$license->saveSetting('license', 'msg_admin','');
-			}
-			if(!empty($resultData['msg']['all'])){
-				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
-				$license->saveSetting('license', 'msg_all','');
-			}
-		}else{
-			$license->saveSetting('license', 'msg_admin','');
-			$license->saveSetting('license', 'msg_all','');
-		}
-		$license->saveSetting('license', 'last_validation', 'success');
-		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
-	{
-		$resultData = array();
-		$resultData['versions'] = array();
-
-		$license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
-		$license->saveSetting('license', 'last_validation', 'no_connection');
-
-		if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
-			$license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
-
-			$license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
-		}
-		$_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
-
-	}
-	if(!empty($resultData['versions'])){
-
-		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
-		$resultData['versions'] = array();
-		$license->saveSetting('license', 'latest_versions','')	;
-	}
-
-	if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
+            $key = '4829482749329';
+
+
+
+        $encoded = sugarEncode($key, serialize($info));
+
+        if($get_request_data){
+            $request_data = array('key'=>$key, 'data'=>$encoded);
+            return serialize($request_data);
+        }
+        $encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
+
+    }else{
+        $encodedResult = 	$response_data['data'];
+        $key = $response_data['key'];
+
+    }
+
+    if($response_data || !$sclient->getError()){
+        $serializedResultData = sugarDecode($key,$encodedResult);
+        $resultData = unserialize($serializedResultData);
+        if($response_data && empty($resultData))
+        {
+            $resultData = array();
+            $resultData['validation'] = 'invalid validation key';
+        }
+    }else
+    {
+        $resultData = array();
+        $resultData['versions'] = array();
+
+    }
+
+    if($response_data || !$sclient->getError() )
+    {
+        if(!empty($resultData['msg'])){
+            if(!empty($resultData['msg']['admin'])){
+                $license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
+            }else{
+                $license->saveSetting('license', 'msg_admin','');
+            }
+            if(!empty($resultData['msg']['all'])){
+                $license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
+            }else{
+                $license->saveSetting('license', 'msg_all','');
+            }
+        }else{
+            $license->saveSetting('license', 'msg_admin','');
+            $license->saveSetting('license', 'msg_all','');
+        }
+        $license->saveSetting('license', 'last_validation', 'success');
+        unset($_SESSION['COULD_NOT_CONNECT']);
+    }
+    else
+    {
+        $resultData = array();
+        $resultData['versions'] = array();
+
+        $license->saveSetting('license', 'last_connection_fail', TimeDate::getInstance()->nowDb());
+        $license->saveSetting('license', 'last_validation', 'no_connection');
+
+        if( empty($license->settings['license_last_validation_success']) && empty($license->settings['license_last_validation_fail']) && empty($license->settings['license_vk_end_date'])){
+            $license->saveSetting('license', 'vk_end_date', TimeDate::getInstance()->nowDb());
+
+            $license->saveSetting('license', 'validation_key', base64_encode(serialize(array('verified'=>false))));
+        }
+        $_SESSION['COULD_NOT_CONNECT'] =TimeDate::getInstance()->nowDb();
+
+    }
+    if(!empty($resultData['versions'])){
+
+        $license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
+    }else{
+        $resultData['versions'] = array();
+        $license->saveSetting('license', 'latest_versions','')	;
+    }
+
+    if(sizeof($resultData) == 1 && !empty($resultData['versions'][0]['version'])
         && compareVersions($sugar_version, $resultData['versions'][0]['version']))
-	{
-		$resultData['versions'][0]['version'] = $sugar_version;
-		$resultData['versions'][0]['description'] = "You have the latest version.";
-	}
+    {
+        $resultData['versions'][0]['version'] = $sugar_version;
+        $resultData['versions'][0]['description'] = "You have the latest version.";
+    }
 
 
-	return $resultData['versions'];
+    return $resultData['versions'];
 }
 /*
  * returns true if $ver1 > $ver2
@@ -268,126 +268,126 @@ 
 function set_CheckUpdates_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','CheckUpdates',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','CheckUpdates',$value);
 }
 /* return's value for the 'CheckUpdates' config setting
 * if the setting does not exist one gets created with a default value of automatic.
 */
 function get_CheckUpdates_config_setting() {
 
-	$checkupdates='automatic';
+    $checkupdates='automatic';
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update',true);
-	if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
-		$admin->saveSetting('Update','CheckUpdates','automatic');
-	} else {
-		$checkupdates=$admin->settings['Update_CheckUpdates'];
-	}
-	return $checkupdates;
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update',true);
+    if (empty($admin->settings) or empty($admin->settings['Update_CheckUpdates'])) {
+        $admin->saveSetting('Update','CheckUpdates','automatic');
+    } else {
+        $checkupdates=$admin->settings['Update_CheckUpdates'];
+    }
+    return $checkupdates;
 }
 
 function set_last_check_version_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_version',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','last_check_version',$value);
 }
 function get_last_check_version_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
-	if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
-		return null;
-	} else {
-		return $admin->settings['Update_last_check_version'];
-	}
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update');
+    if (empty($admin->settings) or empty($admin->settings['Update_last_check_version'])) {
+        return null;
+    } else {
+        return $admin->settings['Update_last_check_version'];
+    }
 }
 
 
 function set_last_check_date_config_setting($value) {
 
 
-	$admin=new Administration();
-	$admin->saveSetting('Update','last_check_date',$value);
+    $admin=new Administration();
+    $admin->saveSetting('Update','last_check_date',$value);
 }
 function get_last_check_date_config_setting() {
 
 
 
-	$admin=new Administration();
-	$admin=$admin->retrieveSettings('Update');
-	if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
-		return 0;
-	} else {
-		return $admin->settings['Update_last_check_date'];
-	}
+    $admin=new Administration();
+    $admin=$admin->retrieveSettings('Update');
+    if (empty($admin->settings) or empty($admin->settings['Update_last_check_date'])) {
+        return 0;
+    } else {
+        return $admin->settings['Update_last_check_date'];
+    }
 }
 
 function set_sugarbeat($value) {
-	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
-	$sugar_config[$_SUGARBEAT] = $value;
-	write_array_to_file( "sugar_config", $sugar_config, "config.php" );
+    global $sugar_config;
+    $_SUGARBEAT="sugarbeet";
+    $sugar_config[$_SUGARBEAT] = $value;
+    write_array_to_file( "sugar_config", $sugar_config, "config.php" );
 }
 function get_sugarbeat() {
 
 
-	global $sugar_config;
-	$_SUGARBEAT="sugarbeet";
+    global $sugar_config;
+    $_SUGARBEAT="sugarbeet";
 
-	if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
-	return false;
-	}
-	return true;
+    if (isset($sugar_config[$_SUGARBEAT]) && $sugar_config[$_SUGARBEAT] == false) {
+    return false;
+    }
+    return true;
 
 }
 
 
 
 function shouldCheckSugar(){
-	global $license, $timedate;
-	if(
+    global $license, $timedate;
+    if(
 
-	get_CheckUpdates_config_setting() == 'automatic' ){
-		return true;
-	}
+    get_CheckUpdates_config_setting() == 'automatic' ){
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 
 
 function loadLicense($firstLogin=false){
 
-	$GLOBALS['license']=new Administration();
-	$GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
+    $GLOBALS['license']=new Administration();
+    $GLOBALS['license']=$GLOBALS['license']->retrieveSettings('license', $firstLogin);
 
 }
 
 function loginLicense(){
-	global $current_user, $license;
-	loadLicense(true);
+    global $current_user, $license;
+    loadLicense(true);
 
 
-	if (shouldCheckSugar()) {
+    if (shouldCheckSugar()) {
 
 
-		$last_check_date=get_last_check_date_config_setting();
-		$current_date_time=time();
-		$time_period=3*23*3600 ;
-		if (($current_date_time - $last_check_date) > $time_period
-		) {
-			$version = check_now(get_sugarbeat());
+        $last_check_date=get_last_check_date_config_setting();
+        $current_date_time=time();
+        $time_period=3*23*3600 ;
+        if (($current_date_time - $last_check_date) > $time_period
+        ) {
+            $version = check_now(get_sugarbeat());
 
-			unset($_SESSION['license_seats_needed']);
-			loadLicense();
-			set_last_check_date_config_setting("$current_date_time");
-			include('sugar_version.php');
+            unset($_SESSION['license_seats_needed']);
+            loadLicense();
+            set_last_check_date_config_setting("$current_date_time");
+            include('sugar_version.php');
 
             $newVersion = '';
             if (!empty($version) && count($version) == 1)
@@ -396,14 +396,14 @@ 
             }
 
             if (version_compare($newVersion, $sugar_version, '>') && is_admin($current_user))
-			{
-				//set session variables.
-				$_SESSION['available_version']=$version[0]['version'];
-				$_SESSION['available_version_description']=$version[0]['description'];
-				set_last_check_version_config_setting($version[0]['version']);
-			}
-		}
-	}
+            {
+                //set session variables.
+                $_SESSION['available_version']=$version[0]['version'];
+                $_SESSION['available_version_description']=$version[0]['description'];
+                set_last_check_version_config_setting($version[0]['version']);
+            }
+        }
+    }
 
 
 }

modules/Administration/DiagnosticDownload.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
 if(!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
 {
-	die('Did not receive a filename to download');
+    die('Did not receive a filename to download');
 }
 $time = str_replace(array('.', '/', '\\'), '', $_REQUEST['time']);
 $guid = str_replace(array('.', '/', '\\'), '', $_REQUEST['guid']);

modules/Administration/expandDatabase.php

Indentation +76 added lines, -76 removed lines

@@ -40,38 +40,38 @@ 
 
 $db = DBManagerFactory::getInstance();
 if(!$db->supports('fix:expandDatabase')) {
-	echo "<BR>";
-	echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
-	echo "<BR>";
-	sugar_die('');
+    echo "<BR>";
+    echo "<p>".$mod_strings['ERR_NOT_IMPLEMENTED']."</p>";
+    echo "<BR>";
+    sugar_die('');
 }
 global $current_user,$beanFiles;
 
 set_time_limit(3600);
 if(is_admin($current_user) || isset($from_sync_client)){
 
-	$execute = false;
-	$export = false;
-
-
-	if(isset($_REQUEST['do_action'])){
-		switch($_REQUEST['do_action']){
-			case 'display':
-				break;
-			case 'execute':
-				$execute = true;
-				break;
-			case 'export':
-				header('Location: index.php?module=Administration&action=expandDatabase&do_action=do_export&to_pdf=true');
-				die();
-			case 'do_export':
-				$export = true;
-				break;
-		}
-
-		if(!$export && empty($_REQUEST['repair_silent'])){
-			echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
-		}
+    $execute = false;
+    $export = false;
+
+
+    if(isset($_REQUEST['do_action'])){
+        switch($_REQUEST['do_action']){
+            case 'display':
+                break;
+            case 'execute':
+                $execute = true;
+                break;
+            case 'export':
+                header('Location: index.php?module=Administration&action=expandDatabase&do_action=do_export&to_pdf=true');
+                die();
+            case 'do_export':
+                $export = true;
+                break;
+        }
+
+        if(!$export && empty($_REQUEST['repair_silent'])){
+            echo getClassicModuleTitle($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'], array($mod_strings['LBL_EXPAND_DATABASE_COLUMNS'],$_REQUEST['do_action']), true);
+        }
 
         $alter_queries = array();
         $restore_quries = array();
@@ -88,60 +88,60 @@ 
         $theRestoreQueries = '';
         $alter_queries = array();
         while ($row = $db->fetchByAssoc($result)) {
-   	      $length = (int)$row['length'];
-   	      if($length < 255) {
-   	         $newLength = ($length * 3 < 255) ? $length * 3 : 255;
-   	         $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
-             $theAlterQueries .= $sql . "\n";
-             $alter_queries[] = $sql;
-
-             $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
-             $theRestoreQueries .= $sql2 . "\n";
-          }
+                $length = (int)$row['length'];
+                if($length < 255) {
+                $newLength = ($length * 3 < 255) ? $length * 3 : 255;
+                $sql = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $newLength . ')';
+                $theAlterQueries .= $sql . "\n";
+                $alter_queries[] = $sql;
+
+                $sql2 = 'ALTER TABLE ' . $row['table_name'] . ' ALTER COLUMN ' . $row['column_name'] . ' ' . $row['type'] . ' (' . $length . ')';
+                $theRestoreQueries .= $sql2 . "\n";
+            }
         } //while
 
         //If there are no ALTER queries to run, echo message
         if(count($alter_queries) == 0) {
-           echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
+            echo $mod_strings['ERR_NO_COLUMNS_TO_EXPAND'];
         } else {
 
-	        // Create a backup file to restore columns to original length
-	        if($execute) {
-	           $fh = sugar_fopen('restoreExpand.sql', 'w');
-	           if(-1 == fwrite($fh, $theRestoreQueries)) {
-	           	  $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
-	           	  echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
-	           } else {
-	           	  $GLOBALS['log']->info($mod_strings['LBL_CREATE_RESOTRE_FILE']);
-	           	  echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
-	           }
-
-	           foreach($alter_queries as $key=>$value) {
-	           	       $db->query($value);
-	           }
-	        }
-
-			if($export) {
-		   		header("Content-Disposition: attachment; filename=expandSugarDB.sql");
-				header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
-				header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-				header( "Last-Modified: " . TimeDate::httpTime() );
-				header( "Cache-Control: post-check=0, pre-check=0", false );
-				header("Content-Length: ".strlen($theAlterQueries));
-		   		echo $theAlterQueries;
-		   		die();
-			} else {
-				if(empty($_REQUEST['repair_silent'])) {
-					echo nl2br($theAlterQueries);
-				}
-			}
+            // Create a backup file to restore columns to original length
+            if($execute) {
+                $fh = sugar_fopen('restoreExpand.sql', 'w');
+                if(-1 == fwrite($fh, $theRestoreQueries)) {
+                        $GLOBALS['log']->error($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
+                        echo($mod_strings['ERR_CANNOT_CREATE_RESTORE_FILE']);
+                } else {
+                        $GLOBALS['log']->info($mod_strings['LBL_CREATE_RESOTRE_FILE']);
+                        echo($mod_strings['LBL_CREATE_RESOTRE_FILE']);
+                }
+
+                foreach($alter_queries as $key=>$value) {
+                            $db->query($value);
+                }
+            }
+
+            if($export) {
+                    header("Content-Disposition: attachment; filename=expandSugarDB.sql");
+                header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
+                header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
+                header( "Last-Modified: " . TimeDate::httpTime() );
+                header( "Cache-Control: post-check=0, pre-check=0", false );
+                header("Content-Length: ".strlen($theAlterQueries));
+                    echo $theAlterQueries;
+                    die();
+            } else {
+                if(empty($_REQUEST['repair_silent'])) {
+                    echo nl2br($theAlterQueries);
+                }
+            }
 
         } //if-else
-	} // end do_action
+    } // end do_action
 
-	if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
-		if(!file_exists('restoreExpand.sql')) {
-		        echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
+    if(empty($_REQUEST['repair_silent']) && empty($_REQUEST['do_action'])) {
+        if(!file_exists('restoreExpand.sql')) {
+                echo "	<b>{$mod_strings['LBL_REPAIR_ACTION']}</b><br>
 				<form name='repairdb'>
 					<input type='hidden' name='action' value='expandDatabase'>
 					<input type='hidden' name='module' value='Administration'>
@@ -153,12 +153,12 @@ 
 					</select><input type='submit' class='button' value='".$mod_strings['LBL_GO']."'>
 				</form><br><br>
 				".$mod_strings['LBL_EXPAND_DATABASE_TEXT'];
-		} else {
-			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
-		} //if-else
-	} //if
+        } else {
+                echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
+        } //if-else
+    } //if
 }else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 
 

modules/Administration/RebuildAudit.php

Indentation +12 added lines, -12 removed lines

@@ -44,18 +44,18 @@
 echo $mod_strings['LBL_REBUILD_AUDIT_SEARCH'] . ' <BR>';
 foreach ($beanFiles as $bean => $file)
 {
-	if(strlen($file) > 0 && file_exists($file)) {
-		require_once($file);
-	    $focus = new $bean();
-		if ($focus->is_AuditEnabled()) {
-			if (!$focus->db->tableExists($focus->get_audit_table_name())) {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
-				$focus->create_audit_table();
-			} else {
-				printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
-			}
-		}
-	}
+    if(strlen($file) > 0 && file_exists($file)) {
+        require_once($file);
+        $focus = new $bean();
+        if ($focus->is_AuditEnabled()) {
+            if (!$focus->db->tableExists($focus->get_audit_table_name())) {
+                printf($mod_strings['LBL_REBUILD_AUDIT_SEARCH'],$focus->get_audit_table_name(), $focus->object_name);
+                $focus->create_audit_table();
+            } else {
+                printf($mod_strings['LBL_REBUILD_AUDIT_SKIP'],$focus->object_name);	
+            }
+        }
+    }
 }
 echo $mod_strings['LBL_DONE'];
 ?>
\ No newline at end of file