adamjakab / SuiteCRM

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

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

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();

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;

modules/Administration/RebuildConfig.php

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     // is not merged (bug #54403)
     $clean_config = loadCleanConfig();
     if ( rebuildConfigFile($clean_config, $sugar_version) ) {
-    	$config_check = $mod_strings['MSG_CONFIG_FILE_REBUILD_SUCCESS'];
+        $config_check = $mod_strings['MSG_CONFIG_FILE_REBUILD_SUCCESS'];
         $disable_config_rebuild = 'disabled="disabled"';
     }
     else {

modules/Administration/UpgradeWizard.php

Indentation +93 added lines, -93 removed lines

@@ -46,9 +46,9 @@ 
 $uh = new UpgradeHistory();
 
 function unlinkTempFiles() {
-	global $sugar_config;
-	@unlink($_FILES['upgrade_zip']['tmp_name']);
-	@unlink("upload://".$_FILES['upgrade_zip']['name']);
+    global $sugar_config;
+    @unlink($_FILES['upgrade_zip']['tmp_name']);
+    @unlink("upload://".$_FILES['upgrade_zip']['name']);
 }
 
 $base_upgrade_dir       = "upload://upgrades";
@@ -63,15 +63,15 @@ 
 
 // get labels and text that are specific to either Module Loader or Upgrade Wizard
 if( $view == "module") {
-	$uploaddLabel = $mod_strings['LBL_UW_UPLOAD_MODULE'];
-	$descItemsQueued = $mod_strings['LBL_UW_DESC_MODULES_QUEUED'];
-	$descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
+    $uploaddLabel = $mod_strings['LBL_UW_UPLOAD_MODULE'];
+    $descItemsQueued = $mod_strings['LBL_UW_DESC_MODULES_QUEUED'];
+    $descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
 }
 else {
 
-	$uploaddLabel = $mod_strings['LBL_UPLOAD_UPGRADE'];
-	$descItemsQueued = $mod_strings['DESC_FILES_QUEUED'];
-	$descItemsInstalled = $mod_strings['DESC_FILES_INSTALLED'];
+    $uploaddLabel = $mod_strings['LBL_UPLOAD_UPGRADE'];
+    $descItemsQueued = $mod_strings['DESC_FILES_QUEUED'];
+    $descItemsInstalled = $mod_strings['DESC_FILES_INSTALLED'];
 }
 
 //
@@ -84,9 +84,9 @@ 
 $upload_max_filesize_bytes = return_bytes($upload_max_filesize);
 if($upload_max_filesize_bytes < constant('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES'))
 {
-	$GLOBALS['log']->debug("detected upload_max_filesize: $upload_max_filesize");
-	print('<p class="error">' . $mod_strings['MSG_INCREASE_UPLOAD_MAX_FILESIZE'] . ' '
-		. get_cfg_var('cfg_file_path') . "</p>\n");
+    $GLOBALS['log']->debug("detected upload_max_filesize: $upload_max_filesize");
+    print('<p class="error">' . $mod_strings['MSG_INCREASE_UPLOAD_MAX_FILESIZE'] . ' '
+        . get_cfg_var('cfg_file_path') . "</p>\n");
 }
 
 //
@@ -105,10 +105,10 @@ 
             $perform = true;
             $base_filename = urldecode($tempFile);
         } elseif(!empty($_REQUEST['load_module_from_dir'])) {
-        	//copy file to proper location then call performSetup
-        	copy($_REQUEST['load_module_from_dir'].'/'.$_REQUEST['upgrade_zip_escaped'], "upload://".$_REQUEST['upgrade_zip_escaped']);
+            //copy file to proper location then call performSetup
+            copy($_REQUEST['load_module_from_dir'].'/'.$_REQUEST['upgrade_zip_escaped'], "upload://".$_REQUEST['upgrade_zip_escaped']);
 
-        	$perform = true;
+            $perform = true;
             $base_filename = urldecode( $_REQUEST['upgrade_zip_escaped'] );
         } else {
             if( empty( $_FILES['upgrade_zip']['tmp_name'] ) ){
@@ -119,72 +119,72 @@ 
                     strtolower(pathinfo($upload->get_stored_file_name(), PATHINFO_EXTENSION)) != 'zip' ||
                     !$upload->final_move($upload->get_stored_file_name())
                     ) {
-    			    unlinkTempFiles();
+                    unlinkTempFiles();
                     sugar_die("Invalid Package");
-            	} else {
-    			     $tempFile = "upload://".$upload->get_stored_file_name();
-                     $perform = true;
-                     $base_filename = urldecode( $_REQUEST['upgrade_zip_escaped'] );
-    		    }
+                } else {
+                        $tempFile = "upload://".$upload->get_stored_file_name();
+                        $perform = true;
+                        $base_filename = urldecode( $_REQUEST['upgrade_zip_escaped'] );
+                }
             }
         }
         if($perform) {
             $manifest_file = extractManifest( $tempFile );
-			if(is_file($manifest_file))
-			{
-    			//SCAN THE MANIFEST FILE TO MAKE SURE NO COPIES OR ANYTHING ARE HAPPENING IN IT
-	    		$ms = new ModuleScanner();
-	    		$ms->lockConfig();
-		    	$fileIssues = $ms->scanFile($manifest_file);
-    			if(!empty($fileIssues)){
-    				echo '<h2>' . $mod_strings['ML_MANIFEST_ISSUE'] . '</h2><br>';
-    				$ms->displayIssues();
-    				die();
-    			}
-    			list($manifest, $installdefs) = MSLoadManifest($manifest_file);
-    			if($ms->checkConfig($manifest_file)) {
-    				echo '<h2>' . $mod_strings['ML_MANIFEST_ISSUE'] . '</h2><br>';
-    				$ms->displayIssues();
-    				die();
-    			}
-    			validate_manifest( $manifest );
-
-			    $upgrade_zip_type = $manifest['type'];
-
-    			// exclude the bad permutations
-    			if( $view == "module" )	{
-    				if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack") {
-    					unlinkTempFiles();
-    					 die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
-    				}
-    			} elseif( $view == "default" ) {
-    				if($upgrade_zip_type != "patch" ) {
-    					unlinkTempFiles();
-    					die($mod_strings['ERR_UW_ONLY_PATCHES']);
-    				}
-    			}
-
-    			$base_filename = pathinfo($tempFile, PATHINFO_BASENAME);
-
-    			mkdir_recursive( "$base_upgrade_dir/$upgrade_zip_type" );
-	    		$target_path = "$base_upgrade_dir/$upgrade_zip_type/$base_filename";
-			    $target_manifest = remove_file_extension( $target_path ) . "-manifest.php";
-
-    			if( isset($manifest['icon']) && $manifest['icon'] != "" ){
-	    			 $icon_location = extractFile( $tempFile ,$manifest['icon'] );
-    				 copy($icon_location, remove_file_extension( $target_path )."-icon.".pathinfo($icon_location, PATHINFO_EXTENSION));
-	    		}
-
-				if(rename( $tempFile , $target_path )) {
-					 copy( $manifest_file, $target_manifest );
-					$GLOBALS['ML_STATUS_MESSAGE'] = $base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'];
+            if(is_file($manifest_file))
+            {
+                //SCAN THE MANIFEST FILE TO MAKE SURE NO COPIES OR ANYTHING ARE HAPPENING IN IT
+                $ms = new ModuleScanner();
+                $ms->lockConfig();
+                $fileIssues = $ms->scanFile($manifest_file);
+                if(!empty($fileIssues)){
+                    echo '<h2>' . $mod_strings['ML_MANIFEST_ISSUE'] . '</h2><br>';
+                    $ms->displayIssues();
+                    die();
+                }
+                list($manifest, $installdefs) = MSLoadManifest($manifest_file);
+                if($ms->checkConfig($manifest_file)) {
+                    echo '<h2>' . $mod_strings['ML_MANIFEST_ISSUE'] . '</h2><br>';
+                    $ms->displayIssues();
+                    die();
+                }
+                validate_manifest( $manifest );
+
+                $upgrade_zip_type = $manifest['type'];
+
+                // exclude the bad permutations
+                if( $view == "module" )	{
+                    if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack") {
+                        unlinkTempFiles();
+                            die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    }
+                } elseif( $view == "default" ) {
+                    if($upgrade_zip_type != "patch" ) {
+                        unlinkTempFiles();
+                        die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    }
+                }
+
+                $base_filename = pathinfo($tempFile, PATHINFO_BASENAME);
+
+                mkdir_recursive( "$base_upgrade_dir/$upgrade_zip_type" );
+                $target_path = "$base_upgrade_dir/$upgrade_zip_type/$base_filename";
+                $target_manifest = remove_file_extension( $target_path ) . "-manifest.php";
+
+                if( isset($manifest['icon']) && $manifest['icon'] != "" ){
+                        $icon_location = extractFile( $tempFile ,$manifest['icon'] );
+                        copy($icon_location, remove_file_extension( $target_path )."-icon.".pathinfo($icon_location, PATHINFO_EXTENSION));
+                }
+
+                if(rename( $tempFile , $target_path )) {
+                        copy( $manifest_file, $target_manifest );
+                    $GLOBALS['ML_STATUS_MESSAGE'] = $base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'];
                 } else{
-					 $GLOBALS['ML_STATUS_MESSAGE'] = $mod_strings['ERR_UW_UPLOAD_ERROR'];
-				}
-			} else {
-				unlinkTempFiles();
-				die($mod_strings['ERR_UW_NO_MANIFEST']);
-			}
+                        $GLOBALS['ML_STATUS_MESSAGE'] = $mod_strings['ERR_UW_UPLOAD_ERROR'];
+                }
+            } else {
+                unlinkTempFiles();
+                die($mod_strings['ERR_UW_NO_MANIFEST']);
+            }
         }
     } else if( $run == $mod_strings['LBL_UW_BTN_DELETE_PACKAGE'] ){
         if(!empty ($_REQUEST['install_file']) ){
@@ -199,36 +199,36 @@ 
         strpos($checkFile, "..") !== false || !file_exists($checkFile)) {
             die("<span class='error'>File is not a zipped archive.</span>");
         }
-		if(unlink($delete_me)) { // successful deletion?
-			echo "Package $delete_me has been removed.<br>";
-		} else {
-			die("Problem removing package $delete_me.");
-		}
+        if(unlink($delete_me)) { // successful deletion?
+            echo "Package $delete_me has been removed.<br>";
+        } else {
+            die("Problem removing package $delete_me.");
+        }
     }
 }
 
 if( $view == "module") {
-	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_LOADER_TITLE']), false) );
+    print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_LOADER_TITLE']), false) );
 }
 else {
-	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_UPGRADE_WIZARD_TITLE']), false) );
+    print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_UPGRADE_WIZARD_TITLE']), false) );
 }
 
 // upload link
 if(!empty($GLOBALS['sugar_config']['use_common_ml_dir']) && $GLOBALS['sugar_config']['use_common_ml_dir'] && !empty($GLOBALS['sugar_config']['common_ml_dir'])){
-	//rrs
-	$form = '<form name="move_form" action="index.php?module=Administration&view=module&action=UpgradeWizard" method="post"  ><input type=hidden name="run" value="upload" /><input type=hidden name="load_module_from_dir" id="load_module_from_dir" value="'.$GLOBALS['sugar_config']['common_ml_dir'].'" /><input type=hidden name="upgrade_zip_escaped" value="" />';
-	$form .= '<br>'.$mod_strings['LBL_MODULE_UPLOAD_DISABLE_HELP_TEXT'].'</br>';
-	$form .='<table width="100%" class="edit view"><tr><th align="left">'.$mod_strings['LBL_ML_NAME'].'</th><th align="left">'.$mod_strings['LBL_ML_ACTION'].'</th></tr>';
-	if ($handle = opendir($GLOBALS['sugar_config']['common_ml_dir'])) {
-		while (false !== ($filename = readdir($handle))) {
-	        if($filename == '.' || $filename == '..' || !preg_match("#.*\.zip\$#", $filename)) {
+    //rrs
+    $form = '<form name="move_form" action="index.php?module=Administration&view=module&action=UpgradeWizard" method="post"  ><input type=hidden name="run" value="upload" /><input type=hidden name="load_module_from_dir" id="load_module_from_dir" value="'.$GLOBALS['sugar_config']['common_ml_dir'].'" /><input type=hidden name="upgrade_zip_escaped" value="" />';
+    $form .= '<br>'.$mod_strings['LBL_MODULE_UPLOAD_DISABLE_HELP_TEXT'].'</br>';
+    $form .='<table width="100%" class="edit view"><tr><th align="left">'.$mod_strings['LBL_ML_NAME'].'</th><th align="left">'.$mod_strings['LBL_ML_ACTION'].'</th></tr>';
+    if ($handle = opendir($GLOBALS['sugar_config']['common_ml_dir'])) {
+        while (false !== ($filename = readdir($handle))) {
+            if($filename == '.' || $filename == '..' || !preg_match("#.*\.zip\$#", $filename)) {
                 continue;
             }
-	        $form .= '<tr><td>'.$filename.'</td><td><input type=button class="button" value="'.$mod_strings['LBL_UW_BTN_UPLOAD'].'" onClick="document.move_form.upgrade_zip_escaped.value = escape( \''.$filename.'\');document.move_form.submit();" /></td></tr>';
-	    }
-	}
-	$form .= '</table></form>';
+            $form .= '<tr><td>'.$filename.'</td><td><input type=button class="button" value="'.$mod_strings['LBL_UW_BTN_UPLOAD'].'" onClick="document.move_form.upgrade_zip_escaped.value = escape( \''.$filename.'\');document.move_form.submit();" /></td></tr>';
+        }
+    }
+    $form .= '</table></form>';
 //rrs
 
 }else{

modules/Administration/RebuildFulltextIndices.php

Indentation +27 added lines, -27 removed lines

@@ -41,42 +41,42 @@
 global $current_user;
 
 if(!is_admin($current_user)){
-	die('Unauthorized Access. Aborting.');
+    die('Unauthorized Access. Aborting.');
 }
 
 //find  modules that have a full-text index and rebuild it.
 global $beanFiles;
 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 definitions.. 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') {
-			if (isset($definition['db']) and $definition['db'] != $GLOBALS['db']->dbType) {
-				continue;
-			}
+    //clean vardef definitions.. 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') {
+            if (isset($definition['db']) and $definition['db'] != $GLOBALS['db']->dbType) {
+                continue;
+            }
 
-			echo "Rebuilding Index {$definition['name']} <BR/>";
-			$GLOBALS['db']->query('alter index ' .$definition['name'] . " REBUILD");
-		}
+            echo "Rebuilding Index {$definition['name']} <BR/>";
+            $GLOBALS['db']->query('alter index ' .$definition['name'] . " REBUILD");
+        }
 
-	}
+    }
 }
 ?>

modules/Administration/repairDatabase.php

Indentation +106 added lines, -106 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.
@@ -47,78 +47,78 @@ 
 $db = DBManagerFactory::getInstance();
 
 if (is_admin($current_user) || isset ($from_sync_client) || is_admin_for_any_module($current_user)) {
-	isset($_REQUEST['execute'])? $execute=$_REQUEST['execute'] : $execute= false;
-	$export = false;
-
-	if (sizeof($_POST) && isset ($_POST['raction'])) {
-		if (isset ($_POST['raction']) && strtolower($_POST['raction']) == "export") {
-			//jc - output buffering is being used. if we do not clean the output buffer
-			//the contents of the buffer up to the length of the repair statement(s)
-			//will be saved in the file...
-			ob_clean();
-
-			header("Content-Disposition: attachment; filename=repairSugarDB.sql");
-			header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
-			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . TimeDate::httpTime());
-			header("Cache-Control: post-check=0, pre-check=0", false);
-			header("Content-Length: " . strlen($_POST['sql']));
-
-		    //jc:7347 - for whatever reason, html_entity_decode is choking on converting
-		    //the html entity &#039; to a single quote, so we will use str_replace
-		    //instead
-		    $sql = str_replace('&#039;',"'", $_POST['sql']);
-		    //echo html_entity_decode($_POST['sql']);
-		    echo $sql;
-		}
-		elseif (isset ($_POST['raction']) && strtolower($_POST['raction']) == "execute") {
-			$sql = str_replace(
-				array(
-					"\n",
-					'&#039;',
-				),
-				array(
-					'',
-					"'",
-				),
-				preg_replace('#(/\*.+?\*/\n*)#', '', $_POST['sql'])
-			);
-			foreach (explode(";", $sql) as $stmt) {
-				$stmt = trim($stmt);
-
-				if (!empty ($stmt)) {
-					$db->query($stmt,true,'Executing repair query: ');
-				}
-			}
-
-			echo "<h3>{$mod_strings['LBL_REPAIR_DATABASE_SYNCED']}</h3>";
-		}
-	} else {
-
-		if (!$export && empty ($_REQUEST['repair_silent'])) {
-			if ( empty($hideModuleMenu) )
-		        echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
-			echo "<h1 id=\"rdloading\">{$mod_strings['LBL_REPAIR_DATABASE_PROCESSING']}</h1>";
-			ob_flush();
-		}
-
-		$sql = '';
-
-		VardefManager::clearVardef();
-		$repairedTables = array();
-
-		foreach ($beanFiles as $bean => $file) {
-			if(file_exists($file)){
-				require_once ($file);
-				unset($GLOBALS['dictionary'][$bean]);
-				$focus = new $bean ();
-				if (($focus instanceOf SugarBean) && !isset($repairedTables[$focus->table_name])) {
-				    $sql .= $db->repairTable($focus, $execute);
-				    $repairedTables[$focus->table_name] = true;
-				}
+    isset($_REQUEST['execute'])? $execute=$_REQUEST['execute'] : $execute= false;
+    $export = false;
+
+    if (sizeof($_POST) && isset ($_POST['raction'])) {
+        if (isset ($_POST['raction']) && strtolower($_POST['raction']) == "export") {
+            //jc - output buffering is being used. if we do not clean the output buffer
+            //the contents of the buffer up to the length of the repair statement(s)
+            //will be saved in the file...
+            ob_clean();
+
+            header("Content-Disposition: attachment; filename=repairSugarDB.sql");
+            header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
+            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+            header("Last-Modified: " . TimeDate::httpTime());
+            header("Cache-Control: post-check=0, pre-check=0", false);
+            header("Content-Length: " . strlen($_POST['sql']));
+
+            //jc:7347 - for whatever reason, html_entity_decode is choking on converting
+            //the html entity &#039; to a single quote, so we will use str_replace
+            //instead
+            $sql = str_replace('&#039;',"'", $_POST['sql']);
+            //echo html_entity_decode($_POST['sql']);
+            echo $sql;
+        }
+        elseif (isset ($_POST['raction']) && strtolower($_POST['raction']) == "execute") {
+            $sql = str_replace(
+                array(
+                    "\n",
+                    '&#039;',
+                ),
+                array(
+                    '',
+                    "'",
+                ),
+                preg_replace('#(/\*.+?\*/\n*)#', '', $_POST['sql'])
+            );
+            foreach (explode(";", $sql) as $stmt) {
+                $stmt = trim($stmt);
+
+                if (!empty ($stmt)) {
+                    $db->query($stmt,true,'Executing repair query: ');
+                }
+            }
+
+            echo "<h3>{$mod_strings['LBL_REPAIR_DATABASE_SYNCED']}</h3>";
+        }
+    } else {
+
+        if (!$export && empty ($_REQUEST['repair_silent'])) {
+            if ( empty($hideModuleMenu) )
+                echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
+            echo "<h1 id=\"rdloading\">{$mod_strings['LBL_REPAIR_DATABASE_PROCESSING']}</h1>";
+            ob_flush();
+        }
+
+        $sql = '';
+
+        VardefManager::clearVardef();
+        $repairedTables = array();
+
+        foreach ($beanFiles as $bean => $file) {
+            if(file_exists($file)){
+                require_once ($file);
+                unset($GLOBALS['dictionary'][$bean]);
+                $focus = new $bean ();
+                if (($focus instanceOf SugarBean) && !isset($repairedTables[$focus->table_name])) {
+                    $sql .= $db->repairTable($focus, $execute);
+                    $repairedTables[$focus->table_name] = true;
+                }
                 //Repair Custom Fields
                 if (($focus instanceOf SugarBean) && $focus->hasCustomFields() && !isset($repairedTables[$focus->table_name . '_cstm'])) {
-				    $df = new DynamicField($focus->module_dir);
+                    $df = new DynamicField($focus->module_dir);
                     //Need to check if the method exists as during upgrade an old version of Dynamic Fields may be loaded.
                     if (method_exists($df, "repairCustomFields"))
                     {
@@ -126,56 +126,56 @@ 
                         $sql .= $df->repairCustomFields($execute);
                         $repairedTables[$focus->table_name . '_cstm'] = true;
                     }
-				}
-			}
-		}
+                }
+            }
+        }
 
-		$olddictionary = $dictionary;
+        $olddictionary = $dictionary;
 
-		unset ($dictionary);
-		include ('modules/TableDictionary.php');
+        unset ($dictionary);
+        include ('modules/TableDictionary.php');
 
-		foreach ($dictionary as $meta) {
+        foreach ($dictionary as $meta) {
 
-			if ( !isset($meta['table']) || isset($repairedTables[$meta['table']]))
+            if ( !isset($meta['table']) || isset($repairedTables[$meta['table']]))
                 continue;
             
             $tablename = $meta['table'];
-			$fielddefs = $meta['fields'];
-			$indices = $meta['indices'];
-			$engine = isset($meta['engine'])?$meta['engine']:null;
-			$sql .= $db->repairTableParams($tablename, $fielddefs, $indices, $execute, $engine);
-			$repairedTables[$tablename] = true;
-		}
+            $fielddefs = $meta['fields'];
+            $indices = $meta['indices'];
+            $engine = isset($meta['engine'])?$meta['engine']:null;
+            $sql .= $db->repairTableParams($tablename, $fielddefs, $indices, $execute, $engine);
+            $repairedTables[$tablename] = true;
+        }
 
-		$dictionary = $olddictionary;
+        $dictionary = $olddictionary;
 
 
 
-		if (empty ($_REQUEST['repair_silent'])) {
-			echo "<script type=\"text/javascript\">document.getElementById('rdloading').style.display = \"none\";</script>";
+        if (empty ($_REQUEST['repair_silent'])) {
+            echo "<script type=\"text/javascript\">document.getElementById('rdloading').style.display = \"none\";</script>";
 
-			if (isset ($sql) && !empty ($sql)) {
+            if (isset ($sql) && !empty ($sql)) {
 
-				$qry_str = "";
-				foreach (explode("\n", $sql) as $line) {
-					if (!empty ($line) && substr($line, -2) != "*/") {
-						$line .= ";";
-					}
+                $qry_str = "";
+                foreach (explode("\n", $sql) as $line) {
+                    if (!empty ($line) && substr($line, -2) != "*/") {
+                        $line .= ";";
+                    }
 
-					$qry_str .= $line . "\n";
-				}
+                    $qry_str .= $line . "\n";
+                }
 
-	            $ss = new Sugar_Smarty();
-	            $ss->assign('MOD', $GLOBALS['mod_strings']);
-	            $ss->assign('qry_str', $qry_str);
-	            echo $ss->fetch('modules/Administration/templates/RepairDatabase.tpl');
-			} else {
-				echo "<h3>{$mod_strings['LBL_REPAIR_DATABASE_SYNCED']}</h3>";
-			}
-		}
-	}
+                $ss = new Sugar_Smarty();
+                $ss->assign('MOD', $GLOBALS['mod_strings']);
+                $ss->assign('qry_str', $qry_str);
+                echo $ss->fetch('modules/Administration/templates/RepairDatabase.tpl');
+            } else {
+                echo "<h3>{$mod_strings['LBL_REPAIR_DATABASE_SYNCED']}</h3>";
+            }
+        }
+    }
 
 } else {
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
\ No newline at end of file

modules/Administration/UpgradeFields.php

Indentation +58 added lines, -58 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.
@@ -44,7 +44,7 @@ 
 global $db;
 
 if (!isset ($db)) {
-	$db = DBManagerFactory:: getInstance();
+    $db = DBManagerFactory:: getInstance();
 }
 
 $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
@@ -53,82 +53,82 @@ 
  * 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'];
+    $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 = true;
+    echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
 }
 
 foreach ($modules as $the_module => $fields) {
-	$class_name = $beanList[$the_module];
-	echo "<br><br>Scanning $the_module <br>";
+    $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();
+    }
 
-	$table = $db->getTableDescription($mod->table_name."_cstm");
-	foreach($table as $row) {
-		$col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
-		$the_field = $mod->custom_fields->getField($col);
-		$type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
-		if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
-			$type.='(' . $row['data_precision'];
-			if (!empty($row['data_scale'])) {
-				$type.=',' . $row['data_scale'];
-			}
-			$type.=')';
-		} elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
-			$type.='(' . $row['data_length'] . ')';
-		}
-		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') {
-				$db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
+    $table = $db->getTableDescription($mod->table_name."_cstm");
+    foreach($table as $row) {
+        $col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
+        $the_field = $mod->custom_fields->getField($col);
+        $type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
+        if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
+            $type.='(' . $row['data_precision'];
+            if (!empty($row['data_scale'])) {
+                $type.=',' . $row['data_scale'];
+            }
+            $type.=')';
+        } elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
+            $type.='(' . $row['data_length'] . ')';
+        }
+        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') {
+                $db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
 
-				$type = strtolower(str_replace(' ' , '', $type));
-				if (strcmp($db_data_type,$type) != 0) {
+                $type = strtolower(str_replace(' ' , '', $type));
+                if (strcmp($db_data_type,$type) != 0) {
 
-					echo "Fixing Column Type for $col changing $type to ".$db_data_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 ".$db_data_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)
-			$mod->custom_fields->add_existing_custom_field($field);
-	}
+    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)
+            $mod->custom_fields->add_existing_custom_field($field);
+    }
 
 }
 
 DynamicField :: deleteCache();
 echo '<br>Done<br>';
 if ($simulate) {
-	echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';
+    echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';
 }
 ?>
\ No newline at end of file