adamjakab / SuiteCRM

modules/Administration/repairSelectModule.php

Indentation +44 added lines, -44 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,41 +40,41 @@ 
  ********************************************************************************/
 
 		
-		global $mod_strings;
-		global $current_language;
-		$smarty = new Sugar_Smarty();
-			$temp_bean_list = $beanList;
-			asort($temp_bean_list);
-			$values= array_values($temp_bean_list);
-			$output= array_keys($temp_bean_list);  
-			$output_local = array();
-			if($current_language != 'en_us') {
-				foreach($output as $temp_out) {
-					$output_local[] = translate($temp_out);
-				}
-			} else {
-				$output_local = $output;
-			}
-			//sort($output);
-			//sort($values);
-			$values=array_merge(array($mod_strings['LBL_ALL_MODULES']), $values);
-			$output= array_merge(array($mod_strings['LBL_ALL_MODULES']),$output_local);
-			$checkbox_values=array(
-									 'clearTpls',
-									 'clearJsFiles',
-									 'clearVardefs', 
-									 'clearJsLangFiles',
-									 'clearDashlets',
-									 'clearSugarFeedCache',
-									 'clearThemeCache',
-									 'rebuildAuditTables',
-									 'rebuildExtensions',
-									 'clearLangFiles',
-                                     'clearSearchCache',
-			                         'clearPDFFontCache',
-			                         //'repairDatabase'
-									 );
-			$checkbox_output = array(   $mod_strings['LBL_QR_CBOX_CLEARTPL'], 
+        global $mod_strings;
+        global $current_language;
+        $smarty = new Sugar_Smarty();
+            $temp_bean_list = $beanList;
+            asort($temp_bean_list);
+            $values= array_values($temp_bean_list);
+            $output= array_keys($temp_bean_list);  
+            $output_local = array();
+            if($current_language != 'en_us') {
+                foreach($output as $temp_out) {
+                    $output_local[] = translate($temp_out);
+                }
+            } else {
+                $output_local = $output;
+            }
+            //sort($output);
+            //sort($values);
+            $values=array_merge(array($mod_strings['LBL_ALL_MODULES']), $values);
+            $output= array_merge(array($mod_strings['LBL_ALL_MODULES']),$output_local);
+            $checkbox_values=array(
+                                        'clearTpls',
+                                        'clearJsFiles',
+                                        'clearVardefs', 
+                                        'clearJsLangFiles',
+                                        'clearDashlets',
+                                        'clearSugarFeedCache',
+                                        'clearThemeCache',
+                                        'rebuildAuditTables',
+                                        'rebuildExtensions',
+                                        'clearLangFiles',
+                                        'clearSearchCache',
+                                        'clearPDFFontCache',
+                                        //'repairDatabase'
+                                        );
+            $checkbox_output = array(   $mod_strings['LBL_QR_CBOX_CLEARTPL'], 
                                         $mod_strings['LBL_QR_CBOX_CLEARJS'],
                                         $mod_strings['LBL_QR_CBOX_CLEARVARDEFS'],
                                         $mod_strings['LBL_QR_CBOX_CLEARJSLANG'],
@@ -87,14 +87,14 @@ 
                                         $mod_strings['LBL_QR_CBOX_CLEARSEARCH'],
                                         $mod_strings['LBL_QR_CBOX_CLEARPDFFONT'],
                                         //$mod_strings['LBL_QR_CBOX_DATAB'],
-									 );
-			$smarty->assign('checkbox_values', $checkbox_values);
-			$smarty->assign('values', $values);
-			$smarty->assign('output', $output);
-			$smarty->assign('MOD', $mod_strings);
-			$smarty->assign('checkbox_output', $checkbox_output);
-			$smarty->assign('checkbox_values', $checkbox_values);
-			$smarty->display("modules/Administration/templates/QuickRepairAndRebuild.tpl");			
+                                        );
+            $smarty->assign('checkbox_values', $checkbox_values);
+            $smarty->assign('values', $values);
+            $smarty->assign('output', $output);
+            $smarty->assign('MOD', $mod_strings);
+            $smarty->assign('checkbox_output', $checkbox_output);
+            $smarty->assign('checkbox_values', $checkbox_values);
+            $smarty->display("modules/Administration/templates/QuickRepairAndRebuild.tpl");			
 			
 			
 ?>

Spacing +8 added lines, -8 removed lines

@@ -45,11 +45,11 @@ 
 		$smarty = new Sugar_Smarty();
 			$temp_bean_list = $beanList;
 			asort($temp_bean_list);
-			$values= array_values($temp_bean_list);
-			$output= array_keys($temp_bean_list);  
+			$values = array_values($temp_bean_list);
+			$output = array_keys($temp_bean_list);  
 			$output_local = array();
-			if($current_language != 'en_us') {
-				foreach($output as $temp_out) {
+			if ($current_language != 'en_us') {
+				foreach ($output as $temp_out) {
 					$output_local[] = translate($temp_out);
 				}
 			} else {
@@ -57,9 +57,9 @@ 
 			}
 			//sort($output);
 			//sort($values);
-			$values=array_merge(array($mod_strings['LBL_ALL_MODULES']), $values);
-			$output= array_merge(array($mod_strings['LBL_ALL_MODULES']),$output_local);
-			$checkbox_values=array(
+			$values = array_merge(array($mod_strings['LBL_ALL_MODULES']), $values);
+			$output = array_merge(array($mod_strings['LBL_ALL_MODULES']), $output_local);
+			$checkbox_values = array(
 									 'clearTpls',
 									 'clearJsFiles',
 									 'clearVardefs', 
@@ -74,7 +74,7 @@ 
 			                         'clearPDFFontCache',
 			                         //'repairDatabase'
 									 );
-			$checkbox_output = array(   $mod_strings['LBL_QR_CBOX_CLEARTPL'], 
+			$checkbox_output = array($mod_strings['LBL_QR_CBOX_CLEARTPL'], 
                                         $mod_strings['LBL_QR_CBOX_CLEARJS'],
                                         $mod_strings['LBL_QR_CBOX_CLEARVARDEFS'],
                                         $mod_strings['LBL_QR_CBOX_CLEARJSLANG'],

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry) {
 	die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/undoupdateclass.php

Indentation +10 added lines, -10 removed lines

@@ -42,16 +42,16 @@
 require("include/modules.php");
 foreach ($beanFiles as $Classname => $filename){ 
     // Find the name of the file generated by the updateclass script
-	$pos=strrpos($filename,"/");
-	$Newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
+    $pos=strrpos($filename,"/");
+    $Newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
     //delete the new SugarBean that extends CoreBean and replace it by the old one undoing all the changes
-	if (file_exists($Newfilename)){
-		unlink($filename);
-		$handle = file_get_contents($Newfilename);
-		$data = preg_replace("/class SugarCore".$Classname."/", 'class '.$Classname, $handle);
-		$data1 = preg_replace("/function SugarCore".$Classname."/", 'function '.$Classname, $data);
-		file_put_contents($Newfilename,$data1);
-		rename($Newfilename,$filename);
-	}
+    if (file_exists($Newfilename)){
+        unlink($filename);
+        $handle = file_get_contents($Newfilename);
+        $data = preg_replace("/class SugarCore".$Classname."/", 'class '.$Classname, $handle);
+        $data1 = preg_replace("/function SugarCore".$Classname."/", 'function '.$Classname, $data);
+        file_put_contents($Newfilename,$data1);
+        rename($Newfilename,$filename);
+    }
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,18 +40,18 @@ 
  ********************************************************************************/
 
 require("include/modules.php");
-foreach ($beanFiles as $Classname => $filename){ 
+foreach ($beanFiles as $Classname => $filename) { 
     // Find the name of the file generated by the updateclass script
-	$pos=strrpos($filename,"/");
-	$Newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
+	$pos = strrpos($filename, "/");
+	$Newfilename = substr_replace($filename, 'SugarCore.', $pos + 1, 0);
     //delete the new SugarBean that extends CoreBean and replace it by the old one undoing all the changes
-	if (file_exists($Newfilename)){
+	if (file_exists($Newfilename)) {
 		unlink($filename);
 		$handle = file_get_contents($Newfilename);
 		$data = preg_replace("/class SugarCore".$Classname."/", 'class '.$Classname, $handle);
 		$data1 = preg_replace("/function SugarCore".$Classname."/", 'function '.$Classname, $data);
-		file_put_contents($Newfilename,$data1);
-		rename($Newfilename,$filename);
+		file_put_contents($Newfilename, $data1);
+		rename($Newfilename, $filename);
 	}
 }
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/repairUniSearch.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,14 +43,14 @@ 
 
 global $sugar_config, $mod_strings;
 
-$search_dir=sugar_cached('');
+$search_dir = sugar_cached('');
 
-$src_file = $search_dir . 'modules/unified_search_modules.php';
-if(file_exists($src_file)) {
-    print( $mod_strings['LBL_CLEAR_UNIFIED_SEARCH_CACHE_DELETING1'] . "<br>" );
-    print( $mod_strings['LBL_CLEAR_UNIFIED_SEARCH_CACHE_DELETING2'] . " $src_file<BR>" ) ;
-    unlink( "$src_file" );
+$src_file = $search_dir.'modules/unified_search_modules.php';
+if (file_exists($src_file)) {
+    print($mod_strings['LBL_CLEAR_UNIFIED_SEARCH_CACHE_DELETING1']."<br>");
+    print($mod_strings['LBL_CLEAR_UNIFIED_SEARCH_CACHE_DELETING2']." $src_file<BR>");
+    unlink("$src_file");
 }
 
-echo "\n--- " . $mod_strings['LBL_DONE'] . "---<br />\n";
+echo "\n--- ".$mod_strings['LBL_DONE']."---<br />\n";
 ?>
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/Development.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,14 +52,14 @@ 
 
 ?>
 <p>
-<table cellspacing="<?php echo $gridline;?>" class="other view">
+<table cellspacing="<?php echo $gridline; ?>" class="other view">
 <tr>
-	<td scope="row"><?php echo SugarThemeRegistry::current()->getImage('ImportCustomFields','align="absmiddle" border="0"',null,null,'.gif',$mod_strings['LBL_IMPORT_CUSTOM_FIELDS_TITLE']); ?>&nbsp;<a href="./index.php?module=Administration&action=ImportCustomFieldStructure" class="tabDetailViewDL2Link"><?php echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_TITLE']; ?></a></td>
-	<td> <?php echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS'] ; ?> </td>
+	<td scope="row"><?php echo SugarThemeRegistry::current()->getImage('ImportCustomFields', 'align="absmiddle" border="0"', null, null, '.gif', $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_TITLE']); ?>&nbsp;<a href="./index.php?module=Administration&action=ImportCustomFieldStructure" class="tabDetailViewDL2Link"><?php echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_TITLE']; ?></a></td>
+	<td> <?php echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS']; ?> </td>
 </tr>
 <tr>
-	<td scope="row"><?php echo SugarThemeRegistry::current()->getImage('ExportCustomFields','align="absmiddle" border="0"',null,null,'.gif',$mod_strings['LBL_EXPORT_CUSTOM_FIELDS_TITLE']); ?>&nbsp;<a href="./index.php?module=Administration&action=ExportCustomFieldStructure" class="tabDetailViewDL2Link"><?php echo $mod_strings['LBL_EXPORT_CUSTOM_FIELDS_TITLE']; ?></a></td>
-	<td> <?php echo $mod_strings['LBL_EXPORT_CUSTOM_FIELDS'] ; ?> </td>
+	<td scope="row"><?php echo SugarThemeRegistry::current()->getImage('ExportCustomFields', 'align="absmiddle" border="0"', null, null, '.gif', $mod_strings['LBL_EXPORT_CUSTOM_FIELDS_TITLE']); ?>&nbsp;<a href="./index.php?module=Administration&action=ExportCustomFieldStructure" class="tabDetailViewDL2Link"><?php echo $mod_strings['LBL_EXPORT_CUSTOM_FIELDS_TITLE']; ?></a></td>
+	<td> <?php echo $mod_strings['LBL_EXPORT_CUSTOM_FIELDS']; ?> </td>
 </tr>
 
 </table></p>

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/RebuildExpressionPlugins.php

Indentation +1 added lines, -1 removed lines

@@ -40,5 +40,5 @@
 global $current_user;
 
 if(is_admin($current_user)){
-	require_once("include/Expressions/updatecache.php");
+    require_once("include/Expressions/updatecache.php");
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+<?php if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,6 +39,6 @@ 
 
 global $current_user;
 
-if(is_admin($current_user)){
+if (is_admin($current_user)) {
 	require_once("include/Expressions/updatecache.php");
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+<?php if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Administration/RepairIndex.php

Indentation +149 added lines, -149 removed lines

@@ -42,58 +42,58 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 ////	LOCAL UTILITY
 function compare($table_name, $db_indexes, $var_indexes) {
-	global $add_index, $drop_index, $change_index;
-	if(empty($change_index))$change_index = array();
-	foreach ($var_indexes as $var_i_name=>$var_i_def) {
-		//find corresponding db index with same name
-		//else by columns in the index.
-		$sel_db_index = null;
-		$var_fields_string ='';
-		if(count($var_i_def['fields'])>0)
-			$var_fields_string = implode('',$var_i_def['fields']);
-		$field_list_match = false;
-		if(isset($db_indexes[$var_i_name])) {
-			$sel_db_index = $db_indexes[$var_i_name];
-			$db_fields_string = implode('', $db_indexes[$var_i_name]['fields']);
-			if(strcasecmp($var_fields_string, $db_fields_string)==0) {
-				$field_list_match=true;
-			}
-		} else {
-			//search by column list.
-			foreach ($db_indexes as $db_i_name=>$db_i_def) {
-				$db_fields_string=implode('',$db_i_def['fields']);
-				if(strcasecmp($var_fields_string , $db_fields_string)==0) {
-					$sel_db_index=$db_indexes[$db_i_name];
-					$field_list_match=true;
-					break;
-				}
-			}
-		}
+    global $add_index, $drop_index, $change_index;
+    if(empty($change_index))$change_index = array();
+    foreach ($var_indexes as $var_i_name=>$var_i_def) {
+        //find corresponding db index with same name
+        //else by columns in the index.
+        $sel_db_index = null;
+        $var_fields_string ='';
+        if(count($var_i_def['fields'])>0)
+            $var_fields_string = implode('',$var_i_def['fields']);
+        $field_list_match = false;
+        if(isset($db_indexes[$var_i_name])) {
+            $sel_db_index = $db_indexes[$var_i_name];
+            $db_fields_string = implode('', $db_indexes[$var_i_name]['fields']);
+            if(strcasecmp($var_fields_string, $db_fields_string)==0) {
+                $field_list_match=true;
+            }
+        } else {
+            //search by column list.
+            foreach ($db_indexes as $db_i_name=>$db_i_def) {
+                $db_fields_string=implode('',$db_i_def['fields']);
+                if(strcasecmp($var_fields_string , $db_fields_string)==0) {
+                    $sel_db_index=$db_indexes[$db_i_name];
+                    $field_list_match=true;
+                    break;
+                }
+            }
+        }
 
-		//no matching index in database.
-		if(empty($sel_db_index)) {
-			$add_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$var_i_def);
-			continue;
-		}
-		if(!$field_list_match) {
-			//drop the db index and create new index based on vardef
-			$drop_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$sel_db_index,true);
-			$add_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$var_i_def);
-			continue;
-		}
-		//check for name match.
-		//it should not occur for indexes of type primary or unique.
-		if( $var_i_def['type'] != 'primary' and $var_i_def['type'] != 'unique' and $var_i_def['name'] != $sel_db_index['name']) {
-			//rename index.
-			$rename=$GLOBALS['db']->renameIndexDefs($sel_db_index,$var_i_def,$table_name);
-			if(is_array($rename)) {
-				$change_index=array_merge($change_index,$rename);
-			} else {
-				$change_index[]=$rename;
-			}
-			continue;
-		}
-	}
+        //no matching index in database.
+        if(empty($sel_db_index)) {
+            $add_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$var_i_def);
+            continue;
+        }
+        if(!$field_list_match) {
+            //drop the db index and create new index based on vardef
+            $drop_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$sel_db_index,true);
+            $add_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$var_i_def);
+            continue;
+        }
+        //check for name match.
+        //it should not occur for indexes of type primary or unique.
+        if( $var_i_def['type'] != 'primary' and $var_i_def['type'] != 'unique' and $var_i_def['name'] != $sel_db_index['name']) {
+            //rename index.
+            $rename=$GLOBALS['db']->renameIndexDefs($sel_db_index,$var_i_def,$table_name);
+            if(is_array($rename)) {
+                $change_index=array_merge($change_index,$rename);
+            } else {
+                $change_index[]=$rename;
+            }
+            continue;
+        }
+    }
 }
 ////	END LOCAL UTILITY
 ///////////////////////////////////////////////////////////////////////////////
@@ -124,38 +124,38 @@ 
 (function_exists('logThis')) ? logThis("found ".count($dictionary)." Dictionary entries to process") : "";
 
 foreach ($beanFiles as $beanname=>$beanpath) {
-	require_once($beanpath);
-	$focus= new $beanname();
+    require_once($beanpath);
+    $focus= new $beanname();
 
-	//skips beans based on same tables. user, employee and group are an example.
-	if(empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
-		continue;
-	} else {
-		$processed_tables[$focus->table_name]=$focus->table_name;
-	}
+    //skips beans based on same tables. user, employee and group are an example.
+    if(empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
+        continue;
+    } else {
+        $processed_tables[$focus->table_name]=$focus->table_name;
+    }
 
-	if(!empty($dictionary[$focus->object_name]['indices'])) {
-		$indices=$dictionary[$focus->object_name]['indices'];
-	} else {
-		$indices=array();
-	}
+    if(!empty($dictionary[$focus->object_name]['indices'])) {
+        $indices=$dictionary[$focus->object_name]['indices'];
+    } else {
+        $indices=array();
+    }
 
-	//clean vardef defintions.. removed indexes not value for this dbtype.
-	//set index name as the key.
-	$var_indices=array();
-	foreach ($indices as $definition) {
-		//database helpers do not know how to handle full text indices
-		if ($definition['type']=='fulltext') {
-			continue;
-		}
+    //clean vardef defintions.. removed indexes not value for this dbtype.
+    //set index name as the key.
+    $var_indices=array();
+    foreach ($indices as $definition) {
+        //database helpers do not know how to handle full text indices
+        if ($definition['type']=='fulltext') {
+            continue;
+        }
 
-		if(empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
-			$var_indices[$definition['name']] = $definition;
-		}
-	}
+        if(empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
+            $var_indices[$definition['name']] = $definition;
+        }
+    }
 
-	$db_indices=$focus->db->get_indices($focus->table_name);
-	compare($focus->table_name,$db_indices,$var_indices);
+    $db_indices=$focus->db->get_indices($focus->table_name);
+    compare($focus->table_name,$db_indices,$var_indices);
 }
 ////	END PROCESS MODULE BEANS
 ///////////////////////////////////////////////////////////////////////////////
@@ -165,24 +165,24 @@ 
 ////	PROCESS RELATIONSHIP METADATA - run thru many to many relationship files too...
 include('modules/TableDictionary.php');
 foreach ($dictionary as $rel=>$rel_def) {
-	if(!empty($rel_def['indices'])) {
-		$indices=$rel_def['indices'];
-	} else {
-		$indices=array();
-	}
+    if(!empty($rel_def['indices'])) {
+        $indices=$rel_def['indices'];
+    } else {
+        $indices=array();
+    }
 
-	//clean vardef defintions.. removed indexes not value for this dbtype.
-	//set index name as the key.
-	$var_indices=array();
-	foreach ($indices as $definition) {
-		if(empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
-			$var_indices[$definition['name']] = $definition;
-		}
-	}
+    //clean vardef defintions.. removed indexes not value for this dbtype.
+    //set index name as the key.
+    $var_indices=array();
+    foreach ($indices as $definition) {
+        if(empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
+            $var_indices[$definition['name']] = $definition;
+        }
+    }
 
-	$db_indices=$focus->db->get_indices($rel_def['table']);
+    $db_indices=$focus->db->get_indices($rel_def['table']);
 
-	compare($rel_def['table'],$db_indices,$var_indices);
+    compare($rel_def['table'],$db_indices,$var_indices);
 }
 ////	END PROCESS RELATIONSHIP METADATA
 ///////////////////////////////////////////////////////////////////////////////
@@ -193,64 +193,64 @@ 
 (function_exists('logThis')) ? logThis("RepairIndex: we have ".count($change_index)." indices to CHANGE.") : "";
 
 if((count($drop_index) > 0 or count($add_index) > 0 or count($change_index) > 0)) {
-	if(!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
-		echo ($_REQUEST['silent']) ? "" : "<BR><BR><BR>";
-		echo ($_REQUEST['silent']) ? "" : "<a href='index.php?module=Administration&action=RepairIndex&mode=execute'>Execute Script</a>";
-	}
+    if(!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
+        echo ($_REQUEST['silent']) ? "" : "<BR><BR><BR>";
+        echo ($_REQUEST['silent']) ? "" : "<a href='index.php?module=Administration&action=RepairIndex&mode=execute'>Execute Script</a>";
+    }
 
-	$focus = new Account();
-	if(count($drop_index) > 0) {
-		if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
-			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_DROPPING'];
-			foreach ($drop_index as $statement) {
-				echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
-				(function_exists('logThis')) ? logThis("RepairIndex: {$statement}") : "";
-				$focus->db->query($statement);
-			}
-		} else {
-			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_DROP'];
-			foreach ($drop_index as $statement) {
-				echo ($_REQUEST['silent']) ? "" : "<BR>".$statement.";";
-			}
-		}
-	}
+    $focus = new Account();
+    if(count($drop_index) > 0) {
+        if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
+            echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_DROPPING'];
+            foreach ($drop_index as $statement) {
+                echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
+                (function_exists('logThis')) ? logThis("RepairIndex: {$statement}") : "";
+                $focus->db->query($statement);
+            }
+        } else {
+            echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_DROP'];
+            foreach ($drop_index as $statement) {
+                echo ($_REQUEST['silent']) ? "" : "<BR>".$statement.";";
+            }
+        }
+    }
 
-	if(count($add_index) > 0) {
-		if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
-			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ADDING'];
-			foreach ($add_index as $statement) {
-				echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
-				(function_exists('logThis')) ? logThis("RepairIndex: {$statement}") : "";
-				$focus->db->query($statement);
-			}
-		} else {
-			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ADD'];
-			foreach ($add_index as $statement) {
-				echo ($_REQUEST['silent']) ? "" : "<BR>".$statement.";";
-			}
-		}
-	}
-	if(count($change_index) > 0) {
-		if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
-			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ALTERING'];
-			foreach ($change_index as $statement) {
-				echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
-				(function_exists('logThis')) ? logThis("RepairIndex: {$statement}") : "";
-				$focus->db->query($statement);
-			}
-		} else {
-			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ALTER'];
-			foreach ($change_index as $statement) {
-				echo ($_REQUEST['silent']) ? "" : "<BR>".$statement.";";
-			}
-		}
-	}
+    if(count($add_index) > 0) {
+        if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
+            echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ADDING'];
+            foreach ($add_index as $statement) {
+                echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
+                (function_exists('logThis')) ? logThis("RepairIndex: {$statement}") : "";
+                $focus->db->query($statement);
+            }
+        } else {
+            echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ADD'];
+            foreach ($add_index as $statement) {
+                echo ($_REQUEST['silent']) ? "" : "<BR>".$statement.";";
+            }
+        }
+    }
+    if(count($change_index) > 0) {
+        if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
+            echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ALTERING'];
+            foreach ($change_index as $statement) {
+                echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
+                (function_exists('logThis')) ? logThis("RepairIndex: {$statement}") : "";
+                $focus->db->query($statement);
+            }
+        } else {
+            echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ALTER'];
+            foreach ($change_index as $statement) {
+                echo ($_REQUEST['silent']) ? "" : "<BR>".$statement.";";
+            }
+        }
+    }
 
-	if(!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
-		echo ($_REQUEST['silent']) ? "" : "<BR><BR><BR>";
-		echo ($_REQUEST['silent']) ? "" : "<a href='index.php?module=Administration&action=RepairIndex&mode=execute'>Execute Script</a>";
-	}
+    if(!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
+        echo ($_REQUEST['silent']) ? "" : "<BR><BR><BR>";
+        echo ($_REQUEST['silent']) ? "" : "<a href='index.php?module=Administration&action=RepairIndex&mode=execute'>Execute Script</a>";
+    }
 } else {
-	(function_exists('logThis')) ? logThis("RepairIndex: Index definitions are in sync.") : "";
-	echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_SYNC'];
+    (function_exists('logThis')) ? logThis("RepairIndex: Index definitions are in sync.") : "";
+    echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_SYNC'];
 }
\ No newline at end of file

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,53 +43,53 @@ 
 ////	LOCAL UTILITY
 function compare($table_name, $db_indexes, $var_indexes) {
 	global $add_index, $drop_index, $change_index;
-	if(empty($change_index))$change_index = array();
+	if (empty($change_index))$change_index = array();
 	foreach ($var_indexes as $var_i_name=>$var_i_def) {
 		//find corresponding db index with same name
 		//else by columns in the index.
 		$sel_db_index = null;
-		$var_fields_string ='';
-		if(count($var_i_def['fields'])>0)
-			$var_fields_string = implode('',$var_i_def['fields']);
+		$var_fields_string = '';
+		if (count($var_i_def['fields']) > 0)
+			$var_fields_string = implode('', $var_i_def['fields']);
 		$field_list_match = false;
-		if(isset($db_indexes[$var_i_name])) {
+		if (isset($db_indexes[$var_i_name])) {
 			$sel_db_index = $db_indexes[$var_i_name];
 			$db_fields_string = implode('', $db_indexes[$var_i_name]['fields']);
-			if(strcasecmp($var_fields_string, $db_fields_string)==0) {
-				$field_list_match=true;
+			if (strcasecmp($var_fields_string, $db_fields_string) == 0) {
+				$field_list_match = true;
 			}
 		} else {
 			//search by column list.
 			foreach ($db_indexes as $db_i_name=>$db_i_def) {
-				$db_fields_string=implode('',$db_i_def['fields']);
-				if(strcasecmp($var_fields_string , $db_fields_string)==0) {
-					$sel_db_index=$db_indexes[$db_i_name];
-					$field_list_match=true;
+				$db_fields_string = implode('', $db_i_def['fields']);
+				if (strcasecmp($var_fields_string, $db_fields_string) == 0) {
+					$sel_db_index = $db_indexes[$db_i_name];
+					$field_list_match = true;
 					break;
 				}
 			}
 		}
 
 		//no matching index in database.
-		if(empty($sel_db_index)) {
-			$add_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$var_i_def);
+		if (empty($sel_db_index)) {
+			$add_index[] = $GLOBALS['db']->add_drop_constraint($table_name, $var_i_def);
 			continue;
 		}
-		if(!$field_list_match) {
+		if (!$field_list_match) {
 			//drop the db index and create new index based on vardef
-			$drop_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$sel_db_index,true);
-			$add_index[]=$GLOBALS['db']->add_drop_constraint($table_name,$var_i_def);
+			$drop_index[] = $GLOBALS['db']->add_drop_constraint($table_name, $sel_db_index, true);
+			$add_index[] = $GLOBALS['db']->add_drop_constraint($table_name, $var_i_def);
 			continue;
 		}
 		//check for name match.
 		//it should not occur for indexes of type primary or unique.
-		if( $var_i_def['type'] != 'primary' and $var_i_def['type'] != 'unique' and $var_i_def['name'] != $sel_db_index['name']) {
+		if ($var_i_def['type'] != 'primary' and $var_i_def['type'] != 'unique' and $var_i_def['name'] != $sel_db_index['name']) {
 			//rename index.
-			$rename=$GLOBALS['db']->renameIndexDefs($sel_db_index,$var_i_def,$table_name);
-			if(is_array($rename)) {
-				$change_index=array_merge($change_index,$rename);
+			$rename = $GLOBALS['db']->renameIndexDefs($sel_db_index, $var_i_def, $table_name);
+			if (is_array($rename)) {
+				$change_index = array_merge($change_index, $rename);
 			} else {
-				$change_index[]=$rename;
+				$change_index[] = $rename;
 			}
 			continue;
 		}
@@ -101,22 +101,22 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	PROCESS
-if(!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 set_time_limit(3600);
 /**
  * Note: $_REQUEST['silent'] is set from ModuleInstaller::repair_indices();
  */
-if(!isset($_REQUEST['silent'])) $_REQUEST['silent'] = false;
+if (!isset($_REQUEST['silent'])) $_REQUEST['silent'] = false;
 
-$add_index=array();
-$drop_index=array();
-$change_index=array();
+$add_index = array();
+$drop_index = array();
+$change_index = array();
 
-global $current_user, $beanFiles, $dictionary, $sugar_config, $mod_strings;;
+global $current_user, $beanFiles, $dictionary, $sugar_config, $mod_strings; ;
 include_once ('include/database/DBManager.php');
 
 $db = &DBManagerFactory::getInstance();
-$processed_tables=array();
+$processed_tables = array();
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	PROCESS MODULE BEANS
@@ -125,37 +125,37 @@ 
 
 foreach ($beanFiles as $beanname=>$beanpath) {
 	require_once($beanpath);
-	$focus= new $beanname();
+	$focus = new $beanname();
 
 	//skips beans based on same tables. user, employee and group are an example.
-	if(empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
+	if (empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
 		continue;
 	} else {
-		$processed_tables[$focus->table_name]=$focus->table_name;
+		$processed_tables[$focus->table_name] = $focus->table_name;
 	}
 
-	if(!empty($dictionary[$focus->object_name]['indices'])) {
-		$indices=$dictionary[$focus->object_name]['indices'];
+	if (!empty($dictionary[$focus->object_name]['indices'])) {
+		$indices = $dictionary[$focus->object_name]['indices'];
 	} else {
-		$indices=array();
+		$indices = array();
 	}
 
 	//clean vardef defintions.. removed indexes not value for this dbtype.
 	//set index name as the key.
-	$var_indices=array();
+	$var_indices = array();
 	foreach ($indices as $definition) {
 		//database helpers do not know how to handle full text indices
-		if ($definition['type']=='fulltext') {
+		if ($definition['type'] == 'fulltext') {
 			continue;
 		}
 
-		if(empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
+		if (empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
 			$var_indices[$definition['name']] = $definition;
 		}
 	}
 
-	$db_indices=$focus->db->get_indices($focus->table_name);
-	compare($focus->table_name,$db_indices,$var_indices);
+	$db_indices = $focus->db->get_indices($focus->table_name);
+	compare($focus->table_name, $db_indices, $var_indices);
 }
 ////	END PROCESS MODULE BEANS
 ///////////////////////////////////////////////////////////////////////////////
@@ -165,24 +165,24 @@ 
 ////	PROCESS RELATIONSHIP METADATA - run thru many to many relationship files too...
 include('modules/TableDictionary.php');
 foreach ($dictionary as $rel=>$rel_def) {
-	if(!empty($rel_def['indices'])) {
-		$indices=$rel_def['indices'];
+	if (!empty($rel_def['indices'])) {
+		$indices = $rel_def['indices'];
 	} else {
-		$indices=array();
+		$indices = array();
 	}
 
 	//clean vardef defintions.. removed indexes not value for this dbtype.
 	//set index name as the key.
-	$var_indices=array();
+	$var_indices = array();
 	foreach ($indices as $definition) {
-		if(empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
+		if (empty($definition['db']) or $definition['db'] == $focus->db->dbType) {
 			$var_indices[$definition['name']] = $definition;
 		}
 	}
 
-	$db_indices=$focus->db->get_indices($rel_def['table']);
+	$db_indices = $focus->db->get_indices($rel_def['table']);
 
-	compare($rel_def['table'],$db_indices,$var_indices);
+	compare($rel_def['table'], $db_indices, $var_indices);
 }
 ////	END PROCESS RELATIONSHIP METADATA
 ///////////////////////////////////////////////////////////////////////////////
@@ -192,15 +192,15 @@ 
 (function_exists('logThis')) ? logThis("RepairIndex: we have ".count($add_index)." indices to ADD.") : "";
 (function_exists('logThis')) ? logThis("RepairIndex: we have ".count($change_index)." indices to CHANGE.") : "";
 
-if((count($drop_index) > 0 or count($add_index) > 0 or count($change_index) > 0)) {
-	if(!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
+if ((count($drop_index) > 0 or count($add_index) > 0 or count($change_index) > 0)) {
+	if (!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
 		echo ($_REQUEST['silent']) ? "" : "<BR><BR><BR>";
 		echo ($_REQUEST['silent']) ? "" : "<a href='index.php?module=Administration&action=RepairIndex&mode=execute'>Execute Script</a>";
 	}
 
 	$focus = new Account();
-	if(count($drop_index) > 0) {
-		if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
+	if (count($drop_index) > 0) {
+		if (isset($_REQUEST['mode']) and $_REQUEST['mode'] == 'execute') {
 			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_DROPPING'];
 			foreach ($drop_index as $statement) {
 				echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
@@ -215,8 +215,8 @@ 
 		}
 	}
 
-	if(count($add_index) > 0) {
-		if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
+	if (count($add_index) > 0) {
+		if (isset($_REQUEST['mode']) and $_REQUEST['mode'] == 'execute') {
 			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ADDING'];
 			foreach ($add_index as $statement) {
 				echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
@@ -230,8 +230,8 @@ 
 			}
 		}
 	}
-	if(count($change_index) > 0) {
-		if(isset($_REQUEST['mode']) and $_REQUEST['mode']=='execute') {
+	if (count($change_index) > 0) {
+		if (isset($_REQUEST['mode']) and $_REQUEST['mode'] == 'execute') {
 			echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_ALTERING'];
 			foreach ($change_index as $statement) {
 				echo ($_REQUEST['silent']) ? "" : $mod_strings['LBL_REPAIR_INDEX_EXECUTING'].$statement;
@@ -246,7 +246,7 @@ 
 		}
 	}
 
-	if(!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
+	if (!isset($_REQUEST['mode']) or $_REQUEST['mode'] != 'execute') {
 		echo ($_REQUEST['silent']) ? "" : "<BR><BR><BR>";
 		echo ($_REQUEST['silent']) ? "" : "<a href='index.php?module=Administration&action=RepairIndex&mode=execute'>Execute Script</a>";
 	}

Braces +15 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -43,14 +45,17 @@ 
 ////	LOCAL UTILITY
 function compare($table_name, $db_indexes, $var_indexes) {
 	global $add_index, $drop_index, $change_index;
-	if(empty($change_index))$change_index = array();
+	if(empty($change_index)) {
+	    $change_index = array();
+	}
 	foreach ($var_indexes as $var_i_name=>$var_i_def) {
 		//find corresponding db index with same name
 		//else by columns in the index.
 		$sel_db_index = null;
 		$var_fields_string ='';
-		if(count($var_i_def['fields'])>0)
-			$var_fields_string = implode('',$var_i_def['fields']);
+		if(count($var_i_def['fields'])>0) {
+					$var_fields_string = implode('',$var_i_def['fields']);
+		}
 		$field_list_match = false;
 		if(isset($db_indexes[$var_i_name])) {
 			$sel_db_index = $db_indexes[$var_i_name];
@@ -101,12 +106,16 @@ 
 
 ///////////////////////////////////////////////////////////////////////////////
 ////	PROCESS
-if(!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if(!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 set_time_limit(3600);
 /**
  * Note: $_REQUEST['silent'] is set from ModuleInstaller::repair_indices();
  */
-if(!isset($_REQUEST['silent'])) $_REQUEST['silent'] = false;
+if(!isset($_REQUEST['silent'])) {
+    $_REQUEST['silent'] = false;
+}
 
 $add_index=array();
 $drop_index=array();

modules/Administration/PasswordManager.php

Indentation +58 added lines, -58 removed lines

@@ -51,17 +51,17 @@ 
     sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
 }
 function clearPasswordSettings() {
-	    $_POST['passwordsetting_SystemGeneratedPasswordON'] = '';
-	    $_POST['passwordsetting_generatepasswordtmpl'] = '';
-	    $_POST['passwordsetting_lostpasswordtmpl'] = '';
-	    $_POST['passwordsetting_forgotpasswordON'] = '0';
-	    $_POST['passwordsetting_linkexpiration'] = '1';
-	    $_POST['passwordsetting_linkexpirationtime'] = '30';
-	    $_POST['passwordsetting_linkexpirationtype'] = '1';
-	    $_POST['passwordsetting_systexpiration'] = '0';
-	    $_POST['passwordsetting_systexpirationtime'] = '';
-	    $_POST['passwordsetting_systexpirationtype'] = '0';
-	    $_POST['passwordsetting_systexpirationlogin'] = '';
+        $_POST['passwordsetting_SystemGeneratedPasswordON'] = '';
+        $_POST['passwordsetting_generatepasswordtmpl'] = '';
+        $_POST['passwordsetting_lostpasswordtmpl'] = '';
+        $_POST['passwordsetting_forgotpasswordON'] = '0';
+        $_POST['passwordsetting_linkexpiration'] = '1';
+        $_POST['passwordsetting_linkexpirationtime'] = '30';
+        $_POST['passwordsetting_linkexpirationtype'] = '1';
+        $_POST['passwordsetting_systexpiration'] = '0';
+        $_POST['passwordsetting_systexpirationtime'] = '';
+        $_POST['passwordsetting_systexpirationtype'] = '0';
+        $_POST['passwordsetting_systexpirationlogin'] = '';
 
 }
 require_once('modules/Administration/Forms.php');
@@ -69,8 +69,8 @@ 
         "Administration", 
         array(
             "<a href='index.php?module=Administration&action=index'>".translate('LBL_MODULE_NAME','Administration')."</a>",
-           $mod_strings['LBL_MANAGE_PASSWORD_TITLE'],
-           ), 
+            $mod_strings['LBL_MANAGE_PASSWORD_TITLE'],
+            ), 
         false
         );
 require_once('modules/Configurator/Configurator.php');
@@ -81,30 +81,30 @@ 
 $valid_public_key= true;
 if(!empty($_POST['saveConfig'])){
     if ($_POST['captcha_on'] == '1'){
-		$handle = @fopen("http://www.google.com/recaptcha/api/challenge?k=".$_POST['captcha_public_key']."&cachestop=35235354", "r");
-		$buffer ='';
-		if ($handle) {
-		    while (!feof($handle)) {
-		        $buffer .= fgets($handle, 4096);
-		    }
-		    fclose($handle);
-		}
-		$valid_public_key= substr($buffer, 1, 4) == 'var '? true : false;
-	}
-	if ($valid_public_key){
-		if (isset($_REQUEST['system_ldap_enabled']) && $_REQUEST['system_ldap_enabled'] == 'on') {
-			$_POST['system_ldap_enabled'] = 1;
-			clearPasswordSettings();
-		} 
-		else 
-			$_POST['system_ldap_enabled'] = 0;
+        $handle = @fopen("http://www.google.com/recaptcha/api/challenge?k=".$_POST['captcha_public_key']."&cachestop=35235354", "r");
+        $buffer ='';
+        if ($handle) {
+            while (!feof($handle)) {
+                $buffer .= fgets($handle, 4096);
+            }
+            fclose($handle);
+        }
+        $valid_public_key= substr($buffer, 1, 4) == 'var '? true : false;
+    }
+    if ($valid_public_key){
+        if (isset($_REQUEST['system_ldap_enabled']) && $_REQUEST['system_ldap_enabled'] == 'on') {
+            $_POST['system_ldap_enabled'] = 1;
+            clearPasswordSettings();
+        } 
+        else 
+            $_POST['system_ldap_enabled'] = 0;
 
 
         if(isset($_REQUEST['authenticationClass']))
         {
-	        $configurator->useAuthenticationClass = true;
+            $configurator->useAuthenticationClass = true;
         } else {
-	        $configurator->useAuthenticationClass = false;
+            $configurator->useAuthenticationClass = false;
             $_POST['authenticationClass'] = '';
         }
 
@@ -114,25 +114,25 @@ 
             $_POST['ldap_group_attr_req_dn'] = 0;
         }
 
-		if (isset($_REQUEST['ldap_group_checkbox']) && $_REQUEST['ldap_group_checkbox'] == 'on') 
-			$_POST['ldap_group'] = 1;
-		else
-			$_POST['ldap_group'] = 0;
+        if (isset($_REQUEST['ldap_group_checkbox']) && $_REQUEST['ldap_group_checkbox'] == 'on') 
+            $_POST['ldap_group'] = 1;
+        else
+            $_POST['ldap_group'] = 0;
 			
-		if (isset($_REQUEST['ldap_authentication_checkbox']) && $_REQUEST['ldap_authentication_checkbox'] == 'on') 
-			$_POST['ldap_authentication'] = 1;
-		else
-		    $_POST['ldap_authentication'] = 0;
+        if (isset($_REQUEST['ldap_authentication_checkbox']) && $_REQUEST['ldap_authentication_checkbox'] == 'on') 
+            $_POST['ldap_authentication'] = 1;
+        else
+            $_POST['ldap_authentication'] = 0;
 		
-		if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  )
-		    $_POST['passwordsetting_lockoutexpiration'] = 2;
+        if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  )
+            $_POST['passwordsetting_lockoutexpiration'] = 2;
 
-		$configurator->saveConfig();
+        $configurator->saveConfig();
 		
-		$focus->saveConfig();
+        $focus->saveConfig();
 		
-		header('Location: index.php?module=Administration&action=index');
-	}
+        header('Location: index.php?module=Administration&action=index');
+    }
 }
 
 $focus->retrieveSettings();
@@ -165,21 +165,21 @@ 
 
 
 if(!function_exists('mcrypt_cbc')){
-	$sugar_smarty->assign("LDAP_ENC_KEY_READONLY", 'readonly');
-	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LDAP_ENC_KEY_NO_FUNC_DESC']);
+    $sugar_smarty->assign("LDAP_ENC_KEY_READONLY", 'readonly');
+    $sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LDAP_ENC_KEY_NO_FUNC_DESC']);
 }else{
-	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LBL_LDAP_ENC_KEY_DESC']);
+    $sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LBL_LDAP_ENC_KEY_DESC']);
 }
 $sugar_smarty->assign("settings", $focus->settings);
 
 if ($valid_public_key){
-	if(!empty($focus->settings['captcha_on'])){
-		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
-	}else{
-		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'none');
-	}
+    if(!empty($focus->settings['captcha_on'])){
+        $sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
+    }else{
+        $sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'none');
+    }
 }else{
-	$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
+    $sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
 }
 
 $sugar_smarty->assign("VALID_PUBLIC_KEY", $valid_public_key);
@@ -193,10 +193,10 @@ 
 $mail = new SugarPHPMailer();
 $mail->setMailerForSystem();
 if($mail->Mailer == 'smtp' && $mail->Host ==''){
-	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '1');
-	}
+    $sugar_smarty->assign("SMTP_SERVER_NOT_SET", '1');
+    }
 else
-	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '0');
+    $sugar_smarty->assign("SMTP_SERVER_NOT_SET", '0');
 	
 $focus = new InboundEmail();
 $focus->checkImap();

Spacing +24 added lines, -24 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +47,7 @@ 
  ********************************************************************************/
 
 
-if(!is_admin($current_user)){
+if (!is_admin($current_user)) {
     sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
 }
 function clearPasswordSettings() {
@@ -68,7 +68,7 @@ 
 echo getClassicModuleTitle(
         "Administration", 
         array(
-            "<a href='index.php?module=Administration&action=index'>".translate('LBL_MODULE_NAME','Administration')."</a>",
+            "<a href='index.php?module=Administration&action=index'>".translate('LBL_MODULE_NAME', 'Administration')."</a>",
            $mod_strings['LBL_MANAGE_PASSWORD_TITLE'],
            ), 
         false
@@ -78,20 +78,20 @@ 
 $sugarConfig = SugarConfig::getInstance();
 $focus = new Administration();
 $configurator->parseLoggerSettings();
-$valid_public_key= true;
-if(!empty($_POST['saveConfig'])){
-    if ($_POST['captcha_on'] == '1'){
+$valid_public_key = true;
+if (!empty($_POST['saveConfig'])) {
+    if ($_POST['captcha_on'] == '1') {
 		$handle = @fopen("http://www.google.com/recaptcha/api/challenge?k=".$_POST['captcha_public_key']."&cachestop=35235354", "r");
-		$buffer ='';
+		$buffer = '';
 		if ($handle) {
 		    while (!feof($handle)) {
 		        $buffer .= fgets($handle, 4096);
 		    }
 		    fclose($handle);
 		}
-		$valid_public_key= substr($buffer, 1, 4) == 'var '? true : false;
+		$valid_public_key = substr($buffer, 1, 4) == 'var ' ? true : false;
 	}
-	if ($valid_public_key){
+	if ($valid_public_key) {
 		if (isset($_REQUEST['system_ldap_enabled']) && $_REQUEST['system_ldap_enabled'] == 'on') {
 			$_POST['system_ldap_enabled'] = 1;
 			clearPasswordSettings();
@@ -100,7 +100,7 @@ 
 			$_POST['system_ldap_enabled'] = 0;
 
 
-        if(isset($_REQUEST['authenticationClass']))
+        if (isset($_REQUEST['authenticationClass']))
         {
 	        $configurator->useAuthenticationClass = true;
         } else {
@@ -124,7 +124,7 @@ 
 		else
 		    $_POST['ldap_authentication'] = 0;
 		
-		if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  )
+		if (isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime']))
 		    $_POST['passwordsetting_lockoutexpiration'] = 2;
 
 		$configurator->saveConfig();
@@ -142,9 +142,9 @@ 
 $sugar_smarty = new Sugar_Smarty();
 
 // if no IMAP libraries available, disable Save/Test Settings
-if(!function_exists('imap_open')) $sugar_smarty->assign('IE_DISABLED', 'DISABLED');
+if (!function_exists('imap_open')) $sugar_smarty->assign('IE_DISABLED', 'DISABLED');
 
-$config_strings=return_module_language($GLOBALS['current_language'],'Configurator');
+$config_strings = return_module_language($GLOBALS['current_language'], 'Configurator');
 $sugar_smarty->assign('CONF', $config_strings);
 $sugar_smarty->assign('MOD', $mod_strings);
 $sugar_smarty->assign('APP', $app_strings);
@@ -164,21 +164,21 @@ 
 //}
 
 
-if(!function_exists('mcrypt_cbc')){
+if (!function_exists('mcrypt_cbc')) {
 	$sugar_smarty->assign("LDAP_ENC_KEY_READONLY", 'readonly');
 	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LDAP_ENC_KEY_NO_FUNC_DESC']);
-}else{
+} else {
 	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LBL_LDAP_ENC_KEY_DESC']);
 }
 $sugar_smarty->assign("settings", $focus->settings);
 
-if ($valid_public_key){
-	if(!empty($focus->settings['captcha_on'])){
+if ($valid_public_key) {
+	if (!empty($focus->settings['captcha_on'])) {
 		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
-	}else{
+	} else {
 		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'none');
 	}
-}else{
+} else {
 	$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
 }
 
@@ -186,13 +186,13 @@ 
 
 	
 
-$res=$GLOBALS['sugar_config']['passwordsetting'];
+$res = $GLOBALS['sugar_config']['passwordsetting'];
 
 
 require_once('include/SugarPHPMailer.php');   
 $mail = new SugarPHPMailer();
 $mail->setMailerForSystem();
-if($mail->Mailer == 'smtp' && $mail->Host ==''){
+if ($mail->Mailer == 'smtp' && $mail->Host == '') {
 	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '1');
 	}
 else
@@ -201,10 +201,10 @@ 
 $focus = new InboundEmail();
 $focus->checkImap();
 $storedOptions = unserialize(base64_decode($focus->stored_options));	
-$email_templates_arr = get_bean_select_array(true, 'EmailTemplate','name', '','name',true);
+$email_templates_arr = get_bean_select_array(true, 'EmailTemplate', 'name', '', 'name', true);
 $create_case_email_template = (isset($storedOptions['create_case_email_template'])) ? $storedOptions['create_case_email_template'] : "";
-$TMPL_DRPDWN_LOST =get_select_options_with_id($email_templates_arr, $res['lostpasswordtmpl']); 
-$TMPL_DRPDWN_GENERATE =get_select_options_with_id($email_templates_arr, $res['generatepasswordtmpl']);
+$TMPL_DRPDWN_LOST = get_select_options_with_id($email_templates_arr, $res['lostpasswordtmpl']); 
+$TMPL_DRPDWN_GENERATE = get_select_options_with_id($email_templates_arr, $res['generatepasswordtmpl']);
 
 $sugar_smarty->assign("TMPL_DRPDWN_LOST", $TMPL_DRPDWN_LOST);
 $sugar_smarty->assign("TMPL_DRPDWN_GENERATE", $TMPL_DRPDWN_GENERATE);

Braces +27 added lines, -20 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -95,9 +97,9 @@ 
 		if (isset($_REQUEST['system_ldap_enabled']) && $_REQUEST['system_ldap_enabled'] == 'on') {
 			$_POST['system_ldap_enabled'] = 1;
 			clearPasswordSettings();
-		} 
-		else 
-			$_POST['system_ldap_enabled'] = 0;
+		} else {
+					$_POST['system_ldap_enabled'] = 0;
+		}
 
 
         if(isset($_REQUEST['authenticationClass']))
@@ -114,18 +116,21 @@ 
             $_POST['ldap_group_attr_req_dn'] = 0;
         }
 
-		if (isset($_REQUEST['ldap_group_checkbox']) && $_REQUEST['ldap_group_checkbox'] == 'on') 
-			$_POST['ldap_group'] = 1;
-		else
-			$_POST['ldap_group'] = 0;
+		if (isset($_REQUEST['ldap_group_checkbox']) && $_REQUEST['ldap_group_checkbox'] == 'on') {
+					$_POST['ldap_group'] = 1;
+		} else {
+					$_POST['ldap_group'] = 0;
+		}
 			
-		if (isset($_REQUEST['ldap_authentication_checkbox']) && $_REQUEST['ldap_authentication_checkbox'] == 'on') 
-			$_POST['ldap_authentication'] = 1;
-		else
-		    $_POST['ldap_authentication'] = 0;
+		if (isset($_REQUEST['ldap_authentication_checkbox']) && $_REQUEST['ldap_authentication_checkbox'] == 'on') {
+					$_POST['ldap_authentication'] = 1;
+		} else {
+				    $_POST['ldap_authentication'] = 0;
+		}
 		
-		if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  )
-		    $_POST['passwordsetting_lockoutexpiration'] = 2;
+		if( isset($_REQUEST['passwordsetting_lockoutexpirationtime']) && is_numeric($_REQUEST['passwordsetting_lockoutexpirationtime'])  ) {
+				    $_POST['passwordsetting_lockoutexpiration'] = 2;
+		}
 
 		$configurator->saveConfig();
 		
@@ -142,7 +147,9 @@ 
 $sugar_smarty = new Sugar_Smarty();
 
 // if no IMAP libraries available, disable Save/Test Settings
-if(!function_exists('imap_open')) $sugar_smarty->assign('IE_DISABLED', 'DISABLED');
+if(!function_exists('imap_open')) {
+    $sugar_smarty->assign('IE_DISABLED', 'DISABLED');
+}
 
 $config_strings=return_module_language($GLOBALS['current_language'],'Configurator');
 $sugar_smarty->assign('CONF', $config_strings);
@@ -167,7 +174,7 @@ 
 if(!function_exists('mcrypt_cbc')){
 	$sugar_smarty->assign("LDAP_ENC_KEY_READONLY", 'readonly');
 	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LDAP_ENC_KEY_NO_FUNC_DESC']);
-}else{
+} else{
 	$sugar_smarty->assign("LDAP_ENC_KEY_DESC", $config_strings['LBL_LDAP_ENC_KEY_DESC']);
 }
 $sugar_smarty->assign("settings", $focus->settings);
@@ -175,10 +182,10 @@ 
 if ($valid_public_key){
 	if(!empty($focus->settings['captcha_on'])){
 		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
-	}else{
+	} else{
 		$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'none');
 	}
-}else{
+} else{
 	$sugar_smarty->assign("CAPTCHA_CONFIG_DISPLAY", 'inline');
 }
 
@@ -194,9 +201,9 @@ 
 $mail->setMailerForSystem();
 if($mail->Mailer == 'smtp' && $mail->Host ==''){
 	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '1');
-	}
-else
+	} else {
 	$sugar_smarty->assign("SMTP_SERVER_NOT_SET", '0');
+}
 	
 $focus = new InboundEmail();
 $focus->checkImap();

modules/Administration/UpgradeHistory.php

Indentation +4 added lines, -4 removed lines

@@ -127,9 +127,9 @@ 
     function determineIfUpgrade($id_name, $version){
         $query = "SELECT id, version FROM " . $this->table_name . " WHERE id_name = '$id_name' ORDER BY date_entered DESC";
         $result = $this->db->query($query);
-         if(empty($result)){
+            if(empty($result)){
             return null;
-         }else{
+            }else{
             $temp_version = 0;
             $id = '';
             while($row = $this->db->fetchByAssoc($result))
@@ -143,7 +143,7 @@ 
                 return array('id' => $id, 'version' => $temp_version);
             else
                 return null;
-         }
+            }
     }
 
     function getAll()
@@ -254,7 +254,7 @@ 
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
         }
         else if($left[0] < $right[0]){
-           return true;
+            return true;
         }
         else
             return false;

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -64,12 +64,12 @@ 
     var $tracker_visibility = false;
     var $table_name = "upgrade_history";
     var $object_name = "UpgradeHistory";
-    var $column_fields = Array( "id", "filename", "md5sum", "type", "version", "status", "date_entered" );
+    var $column_fields = Array("id", "filename", "md5sum", "type", "version", "status", "date_entered");
     var $disable_custom_fields = true;
 
     function delete()
     {
-        $this->db->query( "delete from " . $this->table_name . " where id = " . $this->db->quoted($this->id));
+        $this->db->query("delete from ".$this->table_name." where id = ".$this->db->quoted($this->id));
     }
 
     public function __construct()
@@ -81,9 +81,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function UpgradeHistory(){
+    public function UpgradeHistory() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -93,8 +93,8 @@ 
     }
 
 
-    function getAllOrderBy($orderBy){
-        $query = "SELECT id FROM " . $this->table_name . " ORDER BY ".$orderBy;
+    function getAllOrderBy($orderBy) {
+        $query = "SELECT id FROM ".$this->table_name." ORDER BY ".$orderBy;
         return $this->getList($query);
     }
     /**
@@ -103,33 +103,33 @@ 
      * @param id      the id of the item you are comparing to
      * @return upgrade_history object if found, null otherwise
      */
-    function checkForExisting($patch_to_check){
+    function checkForExisting($patch_to_check) {
         $uh = new UpgradeHistory();
-        if($patch_to_check != null){
+        if ($patch_to_check != null) {
 
-            if(empty($patch_to_check->id_name)){
+            if (empty($patch_to_check->id_name)) {
                 $where = " WHERE name = '$patch_to_check->name' ";
-            }else{
+            } else {
                 $where = " WHERE id_name = '$patch_to_check->id_name' ";
             }
 
-            if(!empty($patch_to_check->id)){
+            if (!empty($patch_to_check->id)) {
                 $where .= "  AND id != '$patch_to_check->id'  ";
-            }else{
+            } else {
                 $where .= "  AND id is not null  ";
             }
 
-            $query = "SELECT id FROM " . $this->table_name . " ". $where;
+            $query = "SELECT id FROM ".$this->table_name." ".$where;
 
             $result = $uh->db->query($query);
-            if(empty($result)){
+            if (empty($result)) {
                 return null;
             }
             $row = $uh->db->fetchByAssoc($result);
-            if(empty($row)){
+            if (empty($row)) {
                 return null;
             }
-            if(!empty($row['id'])){
+            if (!empty($row['id'])) {
                 return $uh->retrieve($row['id']);
             }
         }
@@ -139,22 +139,22 @@ 
     /**
      * Check if this is an upgrade, if it is then return the latest version before this installation
      */
-    function determineIfUpgrade($id_name, $version){
-        $query = "SELECT id, version FROM " . $this->table_name . " WHERE id_name = '$id_name' ORDER BY date_entered DESC";
+    function determineIfUpgrade($id_name, $version) {
+        $query = "SELECT id, version FROM ".$this->table_name." WHERE id_name = '$id_name' ORDER BY date_entered DESC";
         $result = $this->db->query($query);
-         if(empty($result)){
+         if (empty($result)) {
             return null;
-         }else{
+         } else {
             $temp_version = 0;
             $id = '';
-            while($row = $this->db->fetchByAssoc($result))
+            while ($row = $this->db->fetchByAssoc($result))
             {
-                if(!$this->is_right_version_greater(explode('.', $row['version']), explode('.', $temp_version))){
+                if (!$this->is_right_version_greater(explode('.', $row['version']), explode('.', $temp_version))) {
                     $temp_version = $row['version'];
                     $id = $row['id'];
                 }
             }//end while
-            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
+            if ($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
                 return array('id' => $id, 'version' => $temp_version);
             else
                 return null;
@@ -163,38 +163,38 @@ 
 
     function getAll()
     {
-        $query = "SELECT id FROM " . $this->table_name . " ORDER BY date_entered desc";
+        $query = "SELECT id FROM ".$this->table_name." ORDER BY date_entered desc";
         return $this->getList($query);
     }
 
-    function getList($query){
-        return( parent::build_related_list( $query, $this ) );
+    function getList($query) {
+        return(parent::build_related_list($query, $this));
     }
 
-    function findByMd5( $var_md5 )
+    function findByMd5($var_md5)
     {
-        $query = "SELECT id FROM " . $this->table_name . " where md5sum = '$var_md5'";
-        return( parent::build_related_list( $query, $this ) );
+        $query = "SELECT id FROM ".$this->table_name." where md5sum = '$var_md5'";
+        return(parent::build_related_list($query, $this));
     }
 
     function UninstallAvailable($patch_list, $patch_to_check)
     {
         //before we even go through the list, let us try to see if we find a match.
         $history_object = $this->checkForExisting($patch_to_check);
-        if($history_object != null){
-            if((!empty($history_object->id_name) && !empty($patch_to_check->id_name) && strcmp($history_object->id_name,  $patch_to_check->id_name) == 0) || strcmp($history_object->name,  $patch_to_check->name) == 0){
+        if ($history_object != null) {
+            if ((!empty($history_object->id_name) && !empty($patch_to_check->id_name) && strcmp($history_object->id_name, $patch_to_check->id_name) == 0) || strcmp($history_object->name, $patch_to_check->name) == 0) {
                 //we have found a match
                 //if the patch_to_check version is greater than the found version
                 return ($this->is_right_version_greater(explode('.', $history_object->version), explode('.', $patch_to_check->version)));
-            }else{
+            } else {
                 return true;
             }
         }
         //we will only go through this loop if we have not found another UpgradeHistory object
         //with a matching unique_key in the database
-        foreach($patch_list as $more_recent_patch)
+        foreach ($patch_list as $more_recent_patch)
         {
-            if($more_recent_patch->id == $patch_to_check->id)
+            if ($more_recent_patch->id == $patch_to_check->id)
                 break;
 
             //we will only resort to checking the files if we cannot find the unique_keys
@@ -217,31 +217,31 @@ 
 
     function foundConflict($check_path, $recent_path)
     {
-        if(is_file($check_path))
+        if (is_file($check_path))
         {
-            if(file_exists($recent_path))
+            if (file_exists($recent_path))
                 return true;
             else
                 return false;
         }
-        elseif(is_dir($check_path))
+        elseif (is_dir($check_path))
         {
             $status = false;
 
-            $d = dir( $check_path );
-            while( $f = $d->read() )
+            $d = dir($check_path);
+            while ($f = $d->read())
             {
-                if( $f == "." || $f == ".." )
+                if ($f == "." || $f == "..")
                     continue;
 
                 $status = $this->foundConflict("$check_path/$f", "$recent_path/$f");
 
-                if($status)
+                if ($status)
                     break;
             }
 
             $d->close();
-            return( $status );
+            return($status);
         }
 
         return false;
@@ -256,19 +256,19 @@ 
      * return               true if the right version is greater or they are equal
      *                      false if the left version is greater
      */
-    function is_right_version_greater($left, $right, $equals_is_greater = true){
-        if(count($left) == 0 && count($right) == 0){
+    function is_right_version_greater($left, $right, $equals_is_greater = true) {
+        if (count($left) == 0 && count($right) == 0) {
             return $equals_is_greater;
         }
-        else if(count($left) == 0 || count($right) == 0){
+        else if (count($left) == 0 || count($right) == 0) {
             return true;
         }
-        else if($left[0] == $right[0]){
+        else if ($left[0] == $right[0]) {
             array_shift($left);
             array_shift($right);
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
         }
-        else if($left[0] < $right[0]){
+        else if ($left[0] < $right[0]) {
            return true;
         }
         else
@@ -283,28 +283,28 @@ 
      *
      * @return not_found	an array of id_names that were not found to be installed on the system
      */
-    function checkDependencies($dependencies = array()){
+    function checkDependencies($dependencies = array()) {
         $not_found = array();
-        foreach($dependencies as $dependent){
+        foreach ($dependencies as $dependent) {
             $found = false;
             $query = "SELECT id FROM $this->table_name WHERE id_name = '".$dependent['id_name']."'";
             $matches = $this->getList($query);
-            if(0 != sizeof($matches)){
-                foreach($matches as $match){
-                    if($this->is_right_version_greater(explode('.', $match->version), explode('.', $dependent['version']))){
+            if (0 != sizeof($matches)) {
+                foreach ($matches as $match) {
+                    if ($this->is_right_version_greater(explode('.', $match->version), explode('.', $dependent['version']))) {
                         $found = true;
                         break;
                     }//fi
                 }//rof
             }//fi
-            if(!$found){
+            if (!$found) {
                 $not_found[] = $dependent['id_name'];
             }//fi
         }//rof
         return $not_found;
     }
-    function retrieve($id = -1, $encode=true,$deleted=true) {
-        return parent::retrieve($id,$encode,false);  //ignore the deleted filter. the table does not have the deleted column in it.
+    function retrieve($id = -1, $encode = true, $deleted = true) {
+        return parent::retrieve($id, $encode, false); //ignore the deleted filter. the table does not have the deleted column in it.
     }
 
 }

Braces +33 added lines, -31 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -85,8 +87,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -109,13 +110,13 @@ 
 
             if(empty($patch_to_check->id_name)){
                 $where = " WHERE name = '$patch_to_check->name' ";
-            }else{
+            } else{
                 $where = " WHERE id_name = '$patch_to_check->id_name' ";
             }
 
             if(!empty($patch_to_check->id)){
                 $where .= "  AND id != '$patch_to_check->id'  ";
-            }else{
+            } else{
                 $where .= "  AND id is not null  ";
             }
 
@@ -144,7 +145,7 @@ 
         $result = $this->db->query($query);
          if(empty($result)){
             return null;
-         }else{
+         } else{
             $temp_version = 0;
             $id = '';
             while($row = $this->db->fetchByAssoc($result))
@@ -154,10 +155,11 @@ 
                     $id = $row['id'];
                 }
             }//end while
-            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false))
-                return array('id' => $id, 'version' => $temp_version);
-            else
-                return null;
+            if($this->is_right_version_greater(explode('.', $temp_version), explode('.', $version), false)) {
+                            return array('id' => $id, 'version' => $temp_version);
+            } else {
+                            return null;
+            }
          }
     }
 
@@ -186,7 +188,7 @@ 
                 //we have found a match
                 //if the patch_to_check version is greater than the found version
                 return ($this->is_right_version_greater(explode('.', $history_object->version), explode('.', $patch_to_check->version)));
-            }else{
+            } else{
                 return true;
             }
         }
@@ -194,8 +196,9 @@ 
         //with a matching unique_key in the database
         foreach($patch_list as $more_recent_patch)
         {
-            if($more_recent_patch->id == $patch_to_check->id)
-                break;
+            if($more_recent_patch->id == $patch_to_check->id) {
+                            break;
+            }
 
             //we will only resort to checking the files if we cannot find the unique_keys
             //or the unique_keys do not match
@@ -219,25 +222,27 @@ 
     {
         if(is_file($check_path))
         {
-            if(file_exists($recent_path))
-                return true;
-            else
-                return false;
-        }
-        elseif(is_dir($check_path))
+            if(file_exists($recent_path)) {
+                            return true;
+            } else {
+                            return false;
+            }
+        } elseif(is_dir($check_path))
         {
             $status = false;
 
             $d = dir( $check_path );
             while( $f = $d->read() )
             {
-                if( $f == "." || $f == ".." )
-                    continue;
+                if( $f == "." || $f == ".." ) {
+                                    continue;
+                }
 
                 $status = $this->foundConflict("$check_path/$f", "$recent_path/$f");
 
-                if($status)
-                    break;
+                if($status) {
+                                    break;
+                }
             }
 
             $d->close();
@@ -259,20 +264,17 @@ 
     function is_right_version_greater($left, $right, $equals_is_greater = true){
         if(count($left) == 0 && count($right) == 0){
             return $equals_is_greater;
-        }
-        else if(count($left) == 0 || count($right) == 0){
+        } else if(count($left) == 0 || count($right) == 0){
             return true;
-        }
-        else if($left[0] == $right[0]){
+        } else if($left[0] == $right[0]){
             array_shift($left);
             array_shift($right);
             return $this->is_right_version_greater($left, $right, $equals_is_greater);
-        }
-        else if($left[0] < $right[0]){
+        } else if($left[0] < $right[0]){
            return true;
+        } else {
+                    return false;
         }
-        else
-            return false;
     }
 
     /**

modules/Administration/RepairUploadFolder.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -77,17 +77,17 @@ 
     if (!is_guid($node->getFilename())) {
         continue;
     }
-    $stat['total'] ++;
+    $stat['total']++;
 
     $row = false;
     foreach ($validBeans as $bean) {
         $filter = array('deleted');
         $where = array();
         foreach ($bean->getFilesFields() as $fieldName) {
-            $where[] = $fieldName . '=' . $db->quoted($node->getFilename());
+            $where[] = $fieldName.'='.$db->quoted($node->getFilename());
             $filter[] = $fieldName;
         }
-        $where = '(' . implode(' OR ', $where) . ')';
+        $where = '('.implode(' OR ', $where).')';
 
         $row = $db->fetchOne($bean->create_new_list_query('', $where, $filter, array(), 0));
         if (!empty($row)) {
@@ -100,13 +100,13 @@ 
     }
 
     if ($row == false) {
-        if (unlink('upload://' . $node->getFilename())) {
-            $stat['removed'] ++;
+        if (unlink('upload://'.$node->getFilename())) {
+            $stat['removed']++;
         }
     } elseif ($row['deleted'] == 1) {
         $bean->populateFromRow($row);
         if ($bean->deleteFiles()) {
-            $stat['removed'] ++;
+            $stat['removed']++;
         }
     }
 
@@ -119,5 +119,5 @@ 
 }
 echo '</pre>';
 
-echo $mod_strings['LBL_TOTAL_FILES'] . ': ' . $stat['total'] . '<br>';
-echo $mod_strings['LBL_REMOVED_FILES'] . ': ' . $stat['removed'] . '<br>';
+echo $mod_strings['LBL_TOTAL_FILES'].': '.$stat['total'].'<br>';
+echo $mod_strings['LBL_REMOVED_FILES'].': '.$stat['removed'].'<br>';

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.