adamjakab / SuiteCRM

modules/UpgradeWizard/preflightJson.php

Indentation +21 added lines, -21 removed lines

@@ -46,40 +46,40 @@
  * *******************************************************************************/
 
 if(ob_get_level() < 1)
-	ob_start();
+    ob_start();
 ob_implicit_flush(1);
 
 // load the generated persistence file if found
 $persistence = array();
 if(file_exists($persist = sugar_cached('/modules/UpgradeWizard/_persistence.php'))) {
-	require_once $persist;
+    require_once $persist;
 }
 require_once('modules/UpgradeWizard/uw_utils.php');
 require_once('include/utils/zip_utils.php');
 
 switch($_REQUEST['preflightStep']) {
-	case 'find_upgrade_files':
-		logThis('preflightJson finding upgrade files');
-		ob_end_flush();
-		$persistence['upgrade_files'] = preflightCheckJsonFindUpgradeFiles();
-	break;
+    case 'find_upgrade_files':
+        logThis('preflightJson finding upgrade files');
+        ob_end_flush();
+        $persistence['upgrade_files'] = preflightCheckJsonFindUpgradeFiles();
+    break;
 
-	case 'diff_upgrade_files':
-		logThis('preflightJson diffing upgrade files');
-		ob_end_flush();
-		$persistence = preflightCheckJsonDiffFiles();
-	break;
+    case 'diff_upgrade_files':
+        logThis('preflightJson diffing upgrade files');
+        ob_end_flush();
+        $persistence = preflightCheckJsonDiffFiles();
+    break;
 
-	case 'get_diff_results':
-		logThis('preflightJson getting diff results for display');
-		ob_end_flush();
-		$persistence = preflightCheckJsonGetDiff();
-	break;
+    case 'get_diff_results':
+        logThis('preflightJson getting diff results for display');
+        ob_end_flush();
+        $persistence = preflightCheckJsonGetDiff();
+    break;
 
-	case 'get_diff_errors':
-		logThis('preflightJson getting diff errors (if any)');
-		preflightCheckJsonGetDiffErrors();
-	break;
+    case 'get_diff_errors':
+        logThis('preflightJson getting diff errors (if any)');
+        preflightCheckJsonGetDiffErrors();
+    break;
 }
 
 write_array_to_file('persistence', $persistence, $persist);

modules/UpgradeWizard/UploadFileCheck.php

Indentation +11 added lines, -11 removed lines

@@ -38,10 +38,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- //Request object must have these property values:
- //		Module: module name, this module should have a file called TreeData.php
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
+    //Request object must have these property values:
+    //		Module: module name, this module should have a file called TreeData.php
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
 
 require_once('include/JSON.php');
 require_once('include/upload_file.php');
@@ -50,9 +50,9 @@ 
 
 $json = getJSONobj();
 $file_name = $json->decode(html_entity_decode($_REQUEST['file_name']));
- if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){
-	$file_name = $file_name['jsonObject'];
-  }
+    if(isset($file_name['jsonObject']) && $file_name['jsonObject'] != null){
+    $file_name = $file_name['jsonObject'];
+    }
 
 $filesize = '';
 if(file_exists($file_name)){
@@ -73,10 +73,10 @@ 
 //$uploadSizeIni = substr(ini_get("upload_max_filesize"), 0, strlen( ini_get("upload_max_filesize")) - 1);
 //$GLOBALS['log']->fatal('Upload php setting Size '.return_bytes(ini_get("upload_max_filesize")));
 if($filesize != null){
-	if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){
-		$response=$filesize;
-		//$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>";
-	}
+    if(($filesize > return_bytes(ini_get("upload_max_filesize"))) || ($filesize > return_bytes(ini_get("post_max_size")))){
+        $response=$filesize;
+        //$response= "<script>alert('File size is bigger than the max_upload-size setting in php.ini. Upgrade attempt will fail. Increase the upload_max_size in php.ini to greater than ')</script>";
+    }
 }
 
 if (!empty($response)) {

modules/UpgradeWizard/upgradeTimeCounter.php

Indentation +7 added lines, -7 removed lines

@@ -72,18 +72,18 @@
  }
 */
 
- $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
- $response = $_SESSION['totalUpgradeTime'];
+    $_SESSION['totalUpgradeTime'] = $_SESSION['totalUpgradeTime']+$_REQUEST['upgradeStepTime'];
+    $response = $_SESSION['totalUpgradeTime'];
 
 $GLOBALS['log']->fatal('TOTAL TIME .....'.$_SESSION['totalUpgradeTime']);
- //$uptime = $uptime+$_REQUEST['upgradeStepTime'];
- $GLOBALS['log']->fatal($response);
+    //$uptime = $uptime+$_REQUEST['upgradeStepTime'];
+    $GLOBALS['log']->fatal($response);
 
 
- if (!empty($response)) {
+    if (!empty($response)) {
     $json = getJSONobj();
-	print $json->encode($response);
- }
+    print $json->encode($response);
+    }
 
 sugar_cleanup();
 exit();

modules/UpgradeWizard/UpgradeRemoval.php

Indentation +35 added lines, -35 removed lines

@@ -68,7 +68,7 @@ 
  */
 public function getFilesToRemove($version)
 {
-	return array();
+    return array();
 }
 
 /**
@@ -79,31 +79,31 @@ 
  */
 public function processFilesToRemove($files=array())
 {
-	if(empty($files) || !is_array($files))
-	{
-		return;
-	}	
+    if(empty($files) || !is_array($files))
+    {
+        return;
+    }	
 	
-	require_once('include/dir_inc.php');
+    require_once('include/dir_inc.php');
 	
-	if(!file_exists('custom/backup'))
-	{
-	   mkdir_recursive('custom/backup');
-	}
+    if(!file_exists('custom/backup'))
+    {
+        mkdir_recursive('custom/backup');
+    }
 	
-	foreach($files as $file)
-	{		
-		if(file_exists($file))
-		{
-			$this->backup($file);   
-			if(is_dir($file))
-			{
-			  rmdir_recursive($file);	
-			} else {
-			  unlink($file);
-			}
-	    }
-	}
+    foreach($files as $file)
+    {		
+        if(file_exists($file))
+        {
+            $this->backup($file);   
+            if(is_dir($file))
+            {
+                rmdir_recursive($file);	
+            } else {
+                unlink($file);
+            }
+        }
+    }
 }
 
 
@@ -115,20 +115,20 @@ 
  */
 protected function backup($file)
 {
-	$basename = basename($file);
-	$basepath = str_replace($basename, '', $file);
+    $basename = basename($file);
+    $basepath = str_replace($basename, '', $file);
 
-	if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
-	{
-	   mkdir_recursive('custom/backup/' . $basepath);
-	}
+    if(!empty($basepath) && !file_exists('custom/backup/' . $basepath))
+    {
+        mkdir_recursive('custom/backup/' . $basepath);
+    }
 	
-	if(is_dir($file))
-	{
-    	copy_recursive($file, 'custom/backup/' . $file);	
-	} else {
-		copy($file, 'custom/backup/' . $file);
-	}
+    if(is_dir($file))
+    {
+        copy_recursive($file, 'custom/backup/' . $file);	
+    } else {
+        copy($file, 'custom/backup/' . $file);
+    }
 }
 
 }

modules/UpgradeWizard/populateColumns.php

Indentation +21 added lines, -21 removed lines

@@ -38,10 +38,10 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- //Request object must have these property values:
- //		Module: module name, this module should have a file called TreeData.php
- //		Function: name of the function to be called in TreeData.php, the function will be called statically.
- //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
+    //Request object must have these property values:
+    //		Module: module name, this module should have a file called TreeData.php
+    //		Function: name of the function to be called in TreeData.php, the function will be called statically.
+    //		PARAM prefixed properties: array of these property/values will be passed to the function as parameter.
 
 require_once('include/JSON.php');
 require_once('include/entryPoint.php');
@@ -52,25 +52,25 @@ 
 
 $json = getJSONobj();
 $selectedTable = $json->decode(html_entity_decode($_REQUEST['selectedTable']));
- if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
-	$selectedTable = $selectedTable['jsonObject'];
-  }
+    if(isset($tagArticleIds['jsonObject']) && $tagArticleIds['jsonObject'] != null){
+    $selectedTable = $selectedTable['jsonObject'];
+    }
 $GLOBALS['log']->fatal('************ comes here *********');
 //$GLOBALS['log']->fatal($_REQUEST['selectedTable']);
 function tableColumns($table_name){
-	$GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
-	global $sugar_config;
-	global $setup_db_database_name;
+    $GLOBALS['log']->fatal('********TABLE PASSED******* '.$table_name);
+    global $sugar_config;
+    global $setup_db_database_name;
     global $setup_db_host_name;
     global $setup_db_host_instance;
     global $setup_db_admin_user_name;
     global $setup_db_admin_password;
     
-	//$db = &DBManagerFactory::getInstance('information_schema');
+    //$db = &DBManagerFactory::getInstance('information_schema');
 
-	$db_name= $sugar_config['dbconfig']['db_name'];
-	$setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
-  	$setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
+    $db_name= $sugar_config['dbconfig']['db_name'];
+    $setup_db_host_name = $sugar_config['dbconfig']['db_host_name'];
+        $setup_db_admin_user_name = $sugar_config['dbconfig']['db_user_name'];
     $setup_db_host_instance = $sugar_config['dbconfig']['db_host_instance'];
     $setup_db_admin_password = $sugar_config['dbconfig']['db_password'];
 
@@ -78,27 +78,27 @@ 
     mysql_select_db('information_schema');
 
     $qu="SELECT column_name FROM information_schema.columns WHERE table_schema = '".$db_name."' AND table_name = '".$table_name."'";
-	$ct =mysql_query($qu,$link);
+    $ct =mysql_query($qu,$link);
     //$cols= '';
     $colsDrop = array();
     while($row = mysql_fetch_assoc($ct)){
-    	 $colsDrop[] =$row['column_name'];
+            $colsDrop[] =$row['column_name'];
     }
     return $colsDrop;
 }
 
 $colsDrop = tableColumns($_REQUEST['selectedTable']);
 if($colsDrop != null){
-	$colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
-	foreach($colsDrop as $col){
-		$colsDropDown .="<option value={$col}>{$col}</option>";
-	}
+    $colsDropDown = "<option value=".$_REQUEST['selectedTable']." Columns>".$_REQUEST['selectedTable']." Columns</option>";
+    foreach($colsDrop as $col){
+        $colsDropDown .="<option value={$col}>{$col}</option>";
+    }
 }
 //$response = "<script>document.getElementById('select_column').innerHTML=$colsDropDown</script>";
 $response = $colsDropDown;
 
 if (!empty($response)) {
-	echo $response;
+    echo $response;
 }
 sugar_cleanup();
 exit();

modules/UpgradeWizard/silentUpgrade.php

Indentation +36 added lines, -36 removed lines

@@ -35,29 +35,29 @@ 
  ********************************************************************************/
 
 function build_argument_string($arguments=array()) {
-   if(!is_array($arguments)) {
-   	  return '';
-   }
+    if(!is_array($arguments)) {
+            return '';
+    }
 
-   $argument_string = '';
-   $count = 0;
-   foreach($arguments as $arg) {
-   	   if($count != 0)
-   	   {
-   	   	  //If current directory or parent directory is specified, substitute with full path
-   	   	  if($arg == '.')
-   	   	  {
-   	   	  	 $arg = getcwd();
-   	   	  } else if ($arg == '..') {
-   	   	  	 $dir = getcwd();
-			 $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
-   	   	  }
-          $argument_string .= ' ' . escapeshellarg($arg);
-   	   }
-   	   $count++;
-   }
+    $argument_string = '';
+    $count = 0;
+    foreach($arguments as $arg) {
+            if($count != 0)
+            {
+                //If current directory or parent directory is specified, substitute with full path
+                if($arg == '.')
+                {
+                        $arg = getcwd();
+                } else if ($arg == '..') {
+                        $dir = getcwd();
+                $arg = substr($dir, 0, strrpos($dir, DIRECTORY_SEPARATOR));
+                }
+            $argument_string .= ' ' . escapeshellarg($arg);
+            }
+            $count++;
+    }
 
-   return $argument_string;
+    return $argument_string;
 }
 
 //Bug 52872. Dies if the request does not come from CLI.
@@ -75,8 +75,8 @@ 
                 $run_dce_upgrade = true;
                 //set the php path if found
                 if(is_file($argv[7].'dce_config.php')){
-                   include($argv[7].'dce_config.php');
-                   $php_path = $dce_config['client_php_path'].'/';
+                    include($argv[7].'dce_config.php');
+                    $php_path = $dce_config['client_php_path'].'/';
                 }
 }
 
@@ -92,25 +92,25 @@ 
 $has_error = $output == 0 ? false : true;
 
 if(!$has_error) {
-	if($run_dce_upgrade) {
-		$step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
-		passthru($step2, $output);
-	} else {
-		$step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
-		passthru($step2, $output);
-	}
+    if($run_dce_upgrade) {
+        $step2 = $php_path."php -f {$php_dir}silentUpgrade_dce_step1.php " . build_argument_string($argv);
+        passthru($step2, $output);
+    } else {
+        $step2 = "php -f {$php_dir}silentUpgrade_step2.php " . build_argument_string($argv);
+        passthru($step2, $output);
+    }
 }
 
 if($run_dce_upgrade) {
-	$has_error = $output == 0 ? false : true;
-	if(!$has_error) {
-	   $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
-	   passthru($step3, $output);
-	}
+    $has_error = $output == 0 ? false : true;
+    if(!$has_error) {
+        $step3 = $php_path."php -f {$php_dir}silentUpgrade_dce_step2.php " . build_argument_string($argv);
+        passthru($step3, $output);
+    }
 }
 
 if($output != 0) {
-   echo "***************         silentupgrade failed         ***************: $output\n";
+    echo "***************         silentupgrade failed         ***************: $output\n";
 }
 exit($output);
 ?>

modules/AOR_Reports/vardefs.php

Indentation +56 added lines, -56 removed lines

@@ -38,45 +38,45 @@ 
  ********************************************************************************/
 
 $dictionary['AOR_Report'] = array(
-	'table'=>'aor_reports',
-	'audited'=>true,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-	  'report_module' => 
-	  array (
-		'required' => true,
-		'name' => 'report_module',
-		'vname' => 'LBL_REPORT_MODULE',
-		'type' => 'enum',
-		'massupdate' => 0,
-		'default' => '',
-		'no_default' => false,
-		'comments' => '',
-		'help' => '',
-		'importable' => 'true',
-		'duplicate_merge' => 'disabled',
-		'duplicate_merge_dom_value' => '0',
-		'audited' => true,
-		'reportable' => true,
-		'unified_search' => false,
-		'merge_filter' => 'disabled',
-		'len' => 100,
-		'size' => '20',
-		'options' => 'aor_moduleList',
-		'studio' => 'visible',
-		'dependency' => false,
-	  ),
+    'table'=>'aor_reports',
+    'audited'=>true,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+        'report_module' => 
+        array (
+        'required' => true,
+        'name' => 'report_module',
+        'vname' => 'LBL_REPORT_MODULE',
+        'type' => 'enum',
+        'massupdate' => 0,
+        'default' => '',
+        'no_default' => false,
+        'comments' => '',
+        'help' => '',
+        'importable' => 'true',
+        'duplicate_merge' => 'disabled',
+        'duplicate_merge_dom_value' => '0',
+        'audited' => true,
+        'reportable' => true,
+        'unified_search' => false,
+        'merge_filter' => 'disabled',
+        'len' => 100,
+        'size' => '20',
+        'options' => 'aor_moduleList',
+        'studio' => 'visible',
+        'dependency' => false,
+        ),
 
-	'graphs_per_row' =>
-	array (
-		'required' => true,
-		'name' => 'graphs_per_row',
-		'vname' => 'LBL_GRAPHS_PER_ROW',
-		'type' => 'int',
-		'massupdate' => 0,
-		'default' => 2,
-		'no_default' => false,
-	),
+    'graphs_per_row' =>
+    array (
+        'required' => true,
+        'name' => 'graphs_per_row',
+        'vname' => 'LBL_GRAPHS_PER_ROW',
+        'type' => 'int',
+        'massupdate' => 0,
+        'default' => 2,
+        'no_default' => false,
+    ),
 
     'field_lines' =>
     array (
@@ -118,8 +118,8 @@ 
             'include' => 'modules/AOR_Conditions/conditionLines.php'
         ),
     ),
-  'aor_fields' =>
-  array (
+    'aor_fields' =>
+    array (
     'name' => 'aor_fields',
     'type' => 'link',
     'relationship' => 'aor_reports_aor_fields',
@@ -127,26 +127,26 @@ 
     'bean_name'=>'AOR_Field',
     'source'=>'non-db',
     'id_name' => 'aor_report_id',
-  ),
-  'aor_conditions' =>
-  array (
-     'name' => 'aor_conditions',
-     'type' => 'link',
-     'relationship' => 'aor_reports_aor_conditions',
-     'module'=>'AOR_Conditions',
-     'bean_name'=>'AOR_Condition',
-     'source'=>'non-db',
-  ),
-  'aor_charts' =>
-      array (
+    ),
+    'aor_conditions' =>
+    array (
+        'name' => 'aor_conditions',
+        'type' => 'link',
+        'relationship' => 'aor_reports_aor_conditions',
+        'module'=>'AOR_Conditions',
+        'bean_name'=>'AOR_Condition',
+        'source'=>'non-db',
+    ),
+    'aor_charts' =>
+        array (
         'name' => 'aor_charts',
         'type' => 'link',
         'relationship' => 'aor_charts_aor_reports',
         'source' => 'non-db',
         'id_name' => 'aor_report_id',
         'vname' => 'LBL_AOR_CHARTS',
-      ),
-  'aor_scheduled_reports' =>
+        ),
+    'aor_scheduled_reports' =>
     array (
         'name' => 'aor_scheduled_reports',
         'type' => 'link',
@@ -188,8 +188,8 @@ 
         'relationship_type'=>'one-to-many',
     ),
 ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

modules/AOR_Reports/metadata/SearchFields.php

Indentation +13 added lines, -13 removed lines

@@ -24,18 +24,18 @@
  */
 
 $searchFields['AOR_Reports'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
-		'assigned_user_id'=> array('query_type'=>'default'),
+    array (
+        'name' => array( 'query_type'=>'default'),
+        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
+        'assigned_user_id'=> array('query_type'=>'default'),
 	    
-		//Range Search Support 
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 		
-	);
+        //Range Search Support 
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 		
+    );
 ?>

modules/AOR_Reports/metadata/quickcreatedefs.php

Indentation +6 added lines, -6 removed lines

@@ -31,15 +31,15 @@
                                             ),
                                             
                                             
- 'panels' =>array (
-  'default' => 
-  array (
+    'panels' =>array (
+    'default' => 
+    array (
     
     array (
-      'name',
-      'assigned_user_name',
+        'name',
+        'assigned_user_name',
+    ),
     ),
-  ),
                                                     
 ),