adamjakab / SuiteCRM

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',
+    ),
     ),
-  ),
                                                     
 ),
                         

modules/AOR_Reports/metadata/metafiles.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
  * @author SalesAgility <info@salesagility.com>
  */
  
- $metafiles['AOR_Reports'] = array(
-	'detailviewdefs'  => 	'modules/AOR_Reports/metadata/detailviewdefs.php', 	
-	'editviewdefs'    => 	'modules/AOR_Reports/metadata/editviewdefs.php',
- 	'listviewdefs'    => 	'modules/AOR_Reports/metadata/listviewdefs.php',
- 	'searchdefs'      =>    'modules/AOR_Reports/metadata/searchdefs.php',
- 	'popupdefs'	      =>    'modules/AOR_Reports/metadata/popupdefs.php',
- 	'searchfields'	  =>    'modules/AOR_Reports/metadata/SearchFields.php',
- );
+    $metafiles['AOR_Reports'] = array(
+    'detailviewdefs'  => 	'modules/AOR_Reports/metadata/detailviewdefs.php', 	
+    'editviewdefs'    => 	'modules/AOR_Reports/metadata/editviewdefs.php',
+        'listviewdefs'    => 	'modules/AOR_Reports/metadata/listviewdefs.php',
+        'searchdefs'      =>    'modules/AOR_Reports/metadata/searchdefs.php',
+        'popupdefs'	      =>    'modules/AOR_Reports/metadata/popupdefs.php',
+        'searchfields'	  =>    'modules/AOR_Reports/metadata/SearchFields.php',
+    );
 ?>

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.php

Indentation +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     var $onlyCharts;
 
     function AORReportsDashlet($id, $def = array()) {
-		global $current_user, $app_strings;
+        global $current_user, $app_strings;
 
         parent::Dashlet($id);
         $this->isConfigurable = true;
@@ -68,7 +68,7 @@ 
         }
     }
 
-	function process() {
+    function process() {
     }
 
     public function displayOptions() {

modules/AOR_Reports/Dashlets/AORReportsDashlet/AORReportsDashlet.meta.php

Indentation +3 added lines, -3 removed lines

@@ -3,6 +3,6 @@
 global $app_strings;
 
 $dashletMeta['AORReportsDashlet'] = array('module'		=> 'AOR_Reports',
-										  'title'       => translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports'),
-                                          'description' => 'Displays Reports',
-                                          'category'    => 'Module Views');
+                                            'title'       => translate('LBL_AOR_REPORTS_DASHLET', 'AOR_Reports'),
+                                            'description' => 'Displays Reports',
+                                            'category'    => 'Module Views');

modules/DynamicFields/UpgradeFields.php

Indentation +74 added lines, -74 removed lines

@@ -40,95 +40,95 @@ 
 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
- global $db;
- if(!isset($db)){
- 	$db = DBManagerFactory::getInstance();
- }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
- $modules = array();
- /*
+    global $db;
+    if(!isset($db)){
+        $db = DBManagerFactory::getInstance();
+    }
+    $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+    $modules = array();
+    /*
   * get the real field_meta_data
   */
- while($row = $db->fetchByAssoc($result)){
- 	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
- 		$modules[$the_modules] = array();	
- 	}
- 	$modules[$the_modules][$row['name']] = $row['name'];
- }
+    while($row = $db->fetchByAssoc($result)){
+        $the_modules = $row['custom_module'];
+        if(!isset($modules[$the_modules])){
+            $modules[$the_modules] = array();	
+        }
+        $modules[$the_modules][$row['name']] = $row['name'];
+    }
  	
- $simulate = false;
- if(!isset($_REQUEST['run'])){
- 	$simulate = true;
- 	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
- }	
+    $simulate = false;
+    if(!isset($_REQUEST['run'])){
+        $simulate = true;
+        echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
+    }	
 
- foreach($modules as $the_module=>$fields){
-         if(isset($beanList[$the_module]))
-         {
- 	$class_name = $beanList[$the_module];
- 	echo "<br><br>Scanning $the_module <br>";
+    foreach($modules as $the_module=>$fields){
+            if(isset($beanList[$the_module]))
+            {
+        $class_name = $beanList[$the_module];
+        echo "<br><br>Scanning $the_module <br>";
 		
-		require_once($beanFiles[$class_name]);
-		$mod = new $class_name();
-		if(!$db->tableExists($mod->table_name . "_cstm")){
-			$mod->custom_fields = new DynamicField();
-			$mod->custom_fields->setup($mod);
-		$mod->custom_fields->createCustomTable();
-		}
+        require_once($beanFiles[$class_name]);
+        $mod = new $class_name();
+        if(!$db->tableExists($mod->table_name . "_cstm")){
+            $mod->custom_fields = new DynamicField();
+            $mod->custom_fields->setup($mod);
+        $mod->custom_fields->createCustomTable();
+        }
 
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
+        $result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
 		
-		while($row = $db->fetchByAssoc($result)){
+        while($row = $db->fetchByAssoc($result)){
 			
 			
-			$col = $row['Field'];
-			$type = $row['Type'];
-			$fieldDef = $mod->getFieldDefinition($col);
-			$the_field = get_widget($fieldDef['type']);
-			$the_field->set($fieldDef);
+            $col = $row['Field'];
+            $type = $row['Type'];
+            $fieldDef = $mod->getFieldDefinition($col);
+            $the_field = get_widget($fieldDef['type']);
+            $the_field->set($fieldDef);
 				
-				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
-					unset($fields[$col]);
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
-					if($col != 'id_c'){
-					if(trim($the_field->get_db_type()) != trim($type)){
+                if(!isset($fields[$col]) && $col != 'id_c'){
+                    if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+                    unset($fields[$col]);
+                    echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
+                }	else{
+                    if($col != 'id_c'){
+                    if(trim($the_field->get_db_type()) != trim($type)){
 						
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
-					}
-					}
+                    echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
+                    if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+                    }
+                    }
 					
-					unset($fields[$col]);
-				}
+                    unset($fields[$col]);
+                }
 			
-		}
+        }
 			
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
-			foreach($fields as $field){
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
-				if(!$simulate){
-					$the_field = $mod->getFieldDefinition($field);
-					$field = get_widget($the_field['type']);
-					$field->set($the_field);
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
-					echo $query;
-            		if(!empty($query)){
-                		$mod->db->query($query);
-            		}
-				}
-			}
-         }
-	}
+            echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
+            foreach($fields as $field){
+                echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
+                if(!$simulate){
+                    $the_field = $mod->getFieldDefinition($field);
+                    $field = get_widget($the_field['type']);
+                    $field->set($the_field);
+                    $query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
+                    echo $query;
+                    if(!empty($query)){
+                        $mod->db->query($query);
+                    }
+                }
+            }
+            }
+    }
 	
 	
-	DynamicField::deleteCache();	
-	echo '<br>Done<br>';
-	if($simulate){
-		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
-	}
+    DynamicField::deleteCache();	
+    echo '<br>Done<br>';
+    if($simulate){
+        echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
+    }
 		
 		
  
@@ -137,4 +137,4 @@ 
  
  
  
- ?>
\ No newline at end of file
+    ?>
\ No newline at end of file

modules/Relationships/field_arrays.php

Indentation +32 added lines, -32 removed lines

@@ -46,39 +46,39 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['Relationship'] = array ('column_fields' => Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
         'list_fields' =>  Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
     'required_fields' =>   array("relationship_name"=>1),
 );
 ?>
\ No newline at end of file