adamjakab / SuiteCRM

modules/Administration/DiagnosticDelete.php

Indentation +17 added lines, -17 removed lines

@@ -51,15 +51,15 @@ 
         "Administration",
         array(
             "<a href='index.php?module=Administration&action=index'>{$mod_strings['LBL_MODULE_NAME']}</a>",
-           translate('LBL_DIAGNOSTIC_TITLE')
-           ),
+            translate('LBL_DIAGNOSTIC_TITLE')
+            ),
         true
         );
 
 
 if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
-	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
+    echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
 }
 else
 {
@@ -67,21 +67,21 @@ 
     clean_string($_REQUEST['guid'], "ALPHANUM");
     clean_string($_REQUEST['file'], "FILE");
 
-	//Making sure someone doesn't pass a variable name as a false reference
-	//  to delete a file
-	if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
-	{
-		die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
-	}
+    //Making sure someone doesn't pass a variable name as a false reference
+    //  to delete a file
+    if(strcmp(substr($_REQUEST['file'], 0, 10), "diagnostic") != 0)
+    {
+        die($mod_strings['LBL_DIAGNOSTIC_DELETE_DIE']);
+    }
 
-	if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
-	{
-  	  unlink($cachedfile);
-  	  rmdir(dirname($cachedfile));
-	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
-	}
-	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+    if(file_exists($cachedfile = sugar_cached("diagnostic/".$_REQUEST['guid']."/".$_REQUEST['file'].".zip")))
+    {
+        unlink($cachedfile);
+        rmdir(dirname($cachedfile));
+        echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
+    }
+    else
+        echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
 }
 
 print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";

modules/Administration/RebuildRelationship.php

Indentation +3 added lines, -3 removed lines

@@ -79,10 +79,10 @@
 // do the same for custom relationships (true in the last parameter to SugarBean::createRelationshipMeta) - that is, relationships defined in the custom/modules/<modulename>/Ext/vardefs/ area
 foreach ( $GLOBALS['beanFiles'] as $bean => $file )
 {
-	//skip this file if it does not exist
-	if(!file_exists($file)) continue;
+    //skip this file if it does not exist
+    if(!file_exists($file)) continue;
 
-	if (! class_exists ( $bean ))
+    if (! class_exists ( $bean ))
     {
         require ($file) ;
     }

modules/Administration/RepairJSFile.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     echo'<div id="msgDiv"></div>';        
 
     //echo out script that will make an ajax call to process the files via callJSRepair.php
-     echo "<script>
+        echo "<script>
         var ajxProgress;
         var showMSG = 'true';
         //when called, this function will make ajax call to rebuild/repair js files

modules/Administration/RepairFieldCasing.php

Indentation +59 added lines, -59 removed lines

@@ -52,50 +52,50 @@ 
     $query = "SELECT * FROM fields_meta_data";
     $result = $GLOBALS['db']->query($query);
     while($row = $GLOBALS['db']->fetchByAssoc($result)) {
-    	  $name = $row['name'];
-    	  $id = $row['id'];
-    	  $module_entries[$row['custom_module']] = true;
-
-    	  //Only run database SQL where the name or id casing does is not lowercased
-    	  if($name != strtolower($row['name'])) {
-    	  	 $database_entries[$row['custom_module']][$name] = $row;
-    	  }
+            $name = $row['name'];
+            $id = $row['id'];
+            $module_entries[$row['custom_module']] = true;
+
+            //Only run database SQL where the name or id casing does is not lowercased
+            if($name != strtolower($row['name'])) {
+                $database_entries[$row['custom_module']][$name] = $row;
+            }
     }
 
     //If we have database entries to process
     if(!empty($database_entries)) {
 
-       foreach($database_entries as $module=>$entries) {
-       	   $table_name = strtolower($module) . '_cstm';
+        foreach($database_entries as $module=>$entries) {
+                $table_name = strtolower($module) . '_cstm';
 
-           foreach($entries as $original_col_name=>$entry) {
-               echo '<br>'. string_format($mod_strings['LBL_REPAIR_FIELD_CASING_SQL_FIELD_META_DATA'], array($entry['name']));
-           	   $update_sql = "UPDATE fields_meta_data SET id = '" . $entry['custom_module'] . strtolower($entry['name']) . "', name = '" . strtolower($entry['name']) . "' WHERE id = '" . $entry['id'] . "'";
-           	   $GLOBALS['db']->query($update_sql);
+            foreach($entries as $original_col_name=>$entry) {
+                echo '<br>'. string_format($mod_strings['LBL_REPAIR_FIELD_CASING_SQL_FIELD_META_DATA'], array($entry['name']));
+                    $update_sql = "UPDATE fields_meta_data SET id = '" . $entry['custom_module'] . strtolower($entry['name']) . "', name = '" . strtolower($entry['name']) . "' WHERE id = '" . $entry['id'] . "'";
+                    $GLOBALS['db']->query($update_sql);
 
-           	   echo '<br>'. string_format($mod_strings['LBL_REPAIR_FIELD_CASING_SQL_CUSTOM_TABLE'], array($entry['name'], $table_name));
+                    echo '<br>'. string_format($mod_strings['LBL_REPAIR_FIELD_CASING_SQL_CUSTOM_TABLE'], array($entry['name'], $table_name));
 
-      		   $GLOBALS['db']->query($GLOBALS['db']->renameColumnSQL($table_name, $entry['name'], strtolower($entry['name'])));
-           }
-       }
+                    $GLOBALS['db']->query($GLOBALS['db']->renameColumnSQL($table_name, $entry['name'], strtolower($entry['name'])));
+            }
+        }
     }
 
     //If we have metadata files to alter
     if(!empty($module_entries)) {
-	    $modules = array_keys($module_entries);
-	    $views = array('basic_search', 'advanced_search', 'detailview', 'editview', 'quickcreate');
-	    $class_names = array();
+        $modules = array_keys($module_entries);
+        $views = array('basic_search', 'advanced_search', 'detailview', 'editview', 'quickcreate');
+        $class_names = array();
 
         require_once ('include/TemplateHandler/TemplateHandler.php') ;
-	    require_once('modules/ModuleBuilder/parsers/ParserFactory.php');
+        require_once('modules/ModuleBuilder/parsers/ParserFactory.php');
 
-	    foreach($modules as $module) {
-	       if(isset($GLOBALS['beanList'][$module])) {
-	       	  $class_names[] = $GLOBALS['beanList'][$module];
-	       }
+        foreach($modules as $module) {
+            if(isset($GLOBALS['beanList'][$module])) {
+                    $class_names[] = $GLOBALS['beanList'][$module];
+            }
 
-	       $repairClass->module_list[] = $module;
-	       foreach($views as $view) {
+            $repairClass->module_list[] = $module;
+            foreach($views as $view) {
                 try{
                     $parser = ParserFactory::getParser($view, $module);
                 }
@@ -103,37 +103,37 @@ 
                     $GLOBALS['log']->fatal("Caught exception in RepairFieldCasing script: ".$e->getMessage());
                     continue;
                 }
-	       		if(isset($parser->_viewdefs['panels'])) {
-	       		   foreach($parser->_viewdefs['panels'] as $panel_id=>$panel) {
-	       		   	  foreach($panel as $row_id=>$row) {
-	       		   	  	 foreach($row as $entry_id=>$entry) {
-	       		   	  	 	if(is_array($entry) && isset($entry['name'])) {
-	       		   	  	 	   $parser->_viewdefs['panels'][$panel_id][$row_id][$entry_id]['name'] = strtolower($entry['name']);
-	       		   	  	 	}
-	       		   	  	 }
-	       		   	  }
-	       		   }
-	       		} else {
-	       		  //For basic_search and advanced_search views, just process the fields
-       		   	  foreach($parser->_viewdefs as $entry_id=>$entry) {
-       		   	  	 if(is_array($entry) && isset($entry['name'])) {
-       		   	  	 	$parser->_viewdefs[$entry_id]['name'] = strtolower($entry['name']);
-       		   	  	 }
-       		   	  }
-	       		}
-
-	       		//Save the changes
-	       		$parser->handleSave(false);
-	       } //foreach
-
-	       //Now clear the cache of the .tpl files
-	       TemplateHandler::clearCache($module);
-
-
-	    } //foreach
-
-	    echo '<br>'.$mod_strings['LBL_CLEAR_VARDEFS_DATA_CACHE_TITLE'];
-	    require_once('modules/Administration/QuickRepairAndRebuild.php');
+                    if(isset($parser->_viewdefs['panels'])) {
+                        foreach($parser->_viewdefs['panels'] as $panel_id=>$panel) {
+                            foreach($panel as $row_id=>$row) {
+                                    foreach($row as $entry_id=>$entry) {
+                                        if(is_array($entry) && isset($entry['name'])) {
+                                        $parser->_viewdefs['panels'][$panel_id][$row_id][$entry_id]['name'] = strtolower($entry['name']);
+                                        }
+                                    }
+                            }
+                        }
+                    } else {
+                        //For basic_search and advanced_search views, just process the fields
+                        foreach($parser->_viewdefs as $entry_id=>$entry) {
+                                if(is_array($entry) && isset($entry['name'])) {
+                                    $parser->_viewdefs[$entry_id]['name'] = strtolower($entry['name']);
+                                }
+                        }
+                    }
+
+                    //Save the changes
+                    $parser->handleSave(false);
+            } //foreach
+
+            //Now clear the cache of the .tpl files
+            TemplateHandler::clearCache($module);
+
+
+        } //foreach
+
+        echo '<br>'.$mod_strings['LBL_CLEAR_VARDEFS_DATA_CACHE_TITLE'];
+        require_once('modules/Administration/QuickRepairAndRebuild.php');
         $repair = new RepairAndClear();
         $repair->show_output = false;
         $repair->module_list = array($class_names);

modules/Administration/UpgradeAccess.php

Indentation +19 added lines, -19 removed lines

@@ -74,7 +74,7 @@ 
     $skip = false;
     while($line = fgets($fp)){
 
-    	if(preg_match('/\s*#\s*BEGIN\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = true;
+        if(preg_match('/\s*#\s*BEGIN\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = true;
         if(!$skip)$contents .= $line;
         if(preg_match('/\s*#\s*END\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = false;
     }
@@ -106,25 +106,25 @@ 
 eoq;
 
 if(file_exists($uploadHta) && filesize($uploadHta)) {
-	// file exists, parse to make sure it is current
-	if(is_writable($uploadHta)) {
-		$oldHtaccess = file_get_contents($uploadHta);
-		// use a different regex boundary b/c .htaccess uses the typicals
-		if(strstr($oldHtaccess, $denyAll) === false) {
-		    $oldHtaccess .= "\n";
-			$oldHtaccess .= $denyAll;
-		}
-		if(!file_put_contents($uploadHta, $oldHtaccess)) {
-		    $htaccess_failed = true;
-		}
-	} else {
-		$htaccess_failed = true;
-	}
+    // file exists, parse to make sure it is current
+    if(is_writable($uploadHta)) {
+        $oldHtaccess = file_get_contents($uploadHta);
+        // use a different regex boundary b/c .htaccess uses the typicals
+        if(strstr($oldHtaccess, $denyAll) === false) {
+            $oldHtaccess .= "\n";
+            $oldHtaccess .= $denyAll;
+        }
+        if(!file_put_contents($uploadHta, $oldHtaccess)) {
+            $htaccess_failed = true;
+        }
+    } else {
+        $htaccess_failed = true;
+    }
 } else {
-	// no .htaccess yet, create a fill
-	if(!file_put_contents($uploadHta, $denyAll)) {
-		$htaccess_failed = true;
-	}
+    // no .htaccess yet, create a fill
+    if(!file_put_contents($uploadHta, $denyAll)) {
+        $htaccess_failed = true;
+    }
 }
 
 include('modules/Versions/ExpectedVersions.php');

modules/Administration/UpgradeWizard_prepare.php

Indentation +212 added lines, -212 removed lines

@@ -92,22 +92,22 @@ 
 
 unzip( $install_file, $unzip_dir );
 if($install_type == 'module' && $mode != 'Uninstall'){
-   if(file_exists($license_file)){
+    if(file_exists($license_file)){
         $require_license = true;
-   }
+    }
 }
 
 //Scan the unzip dir for unsafe files
 if (((defined('MODULE_INSTALLER_PACKAGE_SCAN') && MODULE_INSTALLER_PACKAGE_SCAN)
     || !empty($GLOBALS['sugar_config']['moduleInstaller']['packageScan'])) && $install_type != 'patch') {
-	require_once('ModuleInstall/ModuleScanner.php');
-	$ms = new ModuleScanner();
-	$ms->scanPackage($unzip_dir);
-	if($ms->hasIssues()){
-	    rmdir_recursive($unzip_dir);
-		$ms->displayIssues();
-		sugar_cleanup(true);
-	}
+    require_once('ModuleInstall/ModuleScanner.php');
+    $ms = new ModuleScanner();
+    $ms->scanPackage($unzip_dir);
+    if($ms->hasIssues()){
+        rmdir_recursive($unzip_dir);
+        $ms->displayIssues();
+        sugar_cleanup(true);
+    }
 }
 
 // assumption -- already validated manifest.php at time of upload
@@ -150,72 +150,72 @@ 
 }
 
 if($remove_tables != 'prompt'){
-	$hidden_fields .= "<input type=hidden name=\"remove_tables\" value='".$remove_tables."'>";
+    $hidden_fields .= "<input type=hidden name=\"remove_tables\" value='".$remove_tables."'>";
 }
 if(file_exists($readme_file) || !empty($manifest['readme'])){
         $found_readme = true;
-   }
+    }
 $uh = new UpgradeHistory();
 //check dependencies first
 if(!empty($dependencies)){
-	$not_found = $uh->checkDependencies($dependencies);
-	if(!empty($not_found) && count($not_found) > 0){
-			die( $mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]");
-	}//fi
+    $not_found = $uh->checkDependencies($dependencies);
+    if(!empty($not_found) && count($not_found) > 0){
+            die( $mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]");
+    }//fi
 }
 switch( $install_type ){
-	case "full":
-	case "patch":
-		if( !is_writable( "config.php" ) ){
-			die( $mod_strings['ERR_UW_CONFIG'] );
-		}
-		break;
-	case "theme":
-		break;
-	case "langpack":
-		// find name of language pack: find single file in include/language/xx_xx.lang.php
-		$d = dir( "$unzip_dir/$zip_from_dir/include/language" );
-		while( $f = $d->read() ){
-			if( $f == "." || $f == ".." ){
-				continue;
-			}
-			else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
-				$new_lang_name = $match[1];
-			}
-		}
-		if( $new_lang_name == "" ){
-			die( $mod_strings['ERR_UW_NO_LANGPACK'].$install_file );
-		}
-		$hidden_fields .= "<input type=hidden name=\"new_lang_name\" value=\"$new_lang_name\"/>";
-
-		$new_lang_desc = getLanguagePackName( "$unzip_dir/$zip_from_dir/include/language/$new_lang_name.lang.php" );
-		if( $new_lang_desc == "" ){
-			die( $mod_strings['ERR_UW_NO_LANG_DESC_1']."include/language/$new_lang_name.lang.php".$mod_strings['ERR_UW_NO_LANG_DESC_2']."$install_file." );
-		}
-		$hidden_fields .= "<input type=hidden name=\"new_lang_desc\" value=\"$new_lang_desc\"/>";
-
-		if( !is_writable( "config.php" ) ){
-			die( $mod_strings['ERR_UW_CONFIG'] );
-		}
-		break;
-	case "module":
-		$previous_install = array();
-		if(!empty($id_name) & !empty($version))
-		$previous_install = $uh->determineIfUpgrade($id_name, $version);
-		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
-		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
-		$show_files = false;
-		//rrs pull out unique_key
-		$hidden_fields .= "<input type=hidden name=\"author\" value=\"$author\"/>";
-		$hidden_fields .= "<input type=hidden name=\"name\" value=\"$name\"/>";
-		$hidden_fields .= "<input type=hidden name=\"description\" value=\"$description\"/>";
-		$hidden_fields .= "<input type=hidden name=\"is_uninstallable\" value=\"$is_uninstallable\"/>";
-		$hidden_fields .= "<input type=hidden name=\"id_name\" value=\"$id_name\"/>";
-		$hidden_fields .= "<input type=hidden name=\"previous_version\" value=\"$previous_version\"/>";
-		$hidden_fields .= "<input type=hidden name=\"previous_id\" value=\"$previous_id\"/>";
-		break;
-	default:
-		die( $mod_strings['ERR_UW_WRONG_TYPE'].$install_type );
+    case "full":
+    case "patch":
+        if( !is_writable( "config.php" ) ){
+            die( $mod_strings['ERR_UW_CONFIG'] );
+        }
+        break;
+    case "theme":
+        break;
+    case "langpack":
+        // find name of language pack: find single file in include/language/xx_xx.lang.php
+        $d = dir( "$unzip_dir/$zip_from_dir/include/language" );
+        while( $f = $d->read() ){
+            if( $f == "." || $f == ".." ){
+                continue;
+            }
+            else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
+                $new_lang_name = $match[1];
+            }
+        }
+        if( $new_lang_name == "" ){
+            die( $mod_strings['ERR_UW_NO_LANGPACK'].$install_file );
+        }
+        $hidden_fields .= "<input type=hidden name=\"new_lang_name\" value=\"$new_lang_name\"/>";
+
+        $new_lang_desc = getLanguagePackName( "$unzip_dir/$zip_from_dir/include/language/$new_lang_name.lang.php" );
+        if( $new_lang_desc == "" ){
+            die( $mod_strings['ERR_UW_NO_LANG_DESC_1']."include/language/$new_lang_name.lang.php".$mod_strings['ERR_UW_NO_LANG_DESC_2']."$install_file." );
+        }
+        $hidden_fields .= "<input type=hidden name=\"new_lang_desc\" value=\"$new_lang_desc\"/>";
+
+        if( !is_writable( "config.php" ) ){
+            die( $mod_strings['ERR_UW_CONFIG'] );
+        }
+        break;
+    case "module":
+        $previous_install = array();
+        if(!empty($id_name) & !empty($version))
+        $previous_install = $uh->determineIfUpgrade($id_name, $version);
+        $previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
+        $previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
+        $show_files = false;
+        //rrs pull out unique_key
+        $hidden_fields .= "<input type=hidden name=\"author\" value=\"$author\"/>";
+        $hidden_fields .= "<input type=hidden name=\"name\" value=\"$name\"/>";
+        $hidden_fields .= "<input type=hidden name=\"description\" value=\"$description\"/>";
+        $hidden_fields .= "<input type=hidden name=\"is_uninstallable\" value=\"$is_uninstallable\"/>";
+        $hidden_fields .= "<input type=hidden name=\"id_name\" value=\"$id_name\"/>";
+        $hidden_fields .= "<input type=hidden name=\"previous_version\" value=\"$previous_version\"/>";
+        $hidden_fields .= "<input type=hidden name=\"previous_id\" value=\"$previous_id\"/>";
+        break;
+    default:
+        die( $mod_strings['ERR_UW_WRONG_TYPE'].$install_type );
 }
 
 
@@ -231,35 +231,35 @@ 
 <form action="<?php print( $form_action . "_commit" ); ?>" name="files" method="post"  onSubmit="return validateForm(<?php print($require_license); ?>);">
 <?php
 if(empty($new_studio_mod_files)) {
-	if(!empty($mode) && $mode == 'Uninstall')
-	echo $mod_strings['LBL_UW_UNINSTALL_READY'];
-	else if($mode == 'Disable')
-	echo $mod_strings['LBL_UW_DISABLE_READY'];
-	else if($mode == 'Enable')
-	echo $mod_strings['LBL_UW_ENABLE_READY'];
-	else
-	echo $mod_strings['LBL_UW_PATCH_READY'];
+    if(!empty($mode) && $mode == 'Uninstall')
+    echo $mod_strings['LBL_UW_UNINSTALL_READY'];
+    else if($mode == 'Disable')
+    echo $mod_strings['LBL_UW_DISABLE_READY'];
+    else if($mode == 'Enable')
+    echo $mod_strings['LBL_UW_ENABLE_READY'];
+    else
+    echo $mod_strings['LBL_UW_PATCH_READY'];
 } else {
-	echo $mod_strings['LBL_UW_PATCH_READY2'];
-	echo '<input type="checkbox" onclick="toggle_these(0, ' . count($new_studio_mod_files) . ', this)"> '.$mod_strings['LBL_UW_CHECK_ALL'];
-	foreach($new_studio_mod_files as $the_file) {
-		$new_file   = clean_path( "$zip_to_dir/$the_file" );
-		print( "<li><input id=\"copy_$count\" name=\"copy_$count\" type=\"checkbox\" value=\"" . $the_file . "\"> " . $new_file . "</li>");
-		$count++;
-	}
+    echo $mod_strings['LBL_UW_PATCH_READY2'];
+    echo '<input type="checkbox" onclick="toggle_these(0, ' . count($new_studio_mod_files) . ', this)"> '.$mod_strings['LBL_UW_CHECK_ALL'];
+    foreach($new_studio_mod_files as $the_file) {
+        $new_file   = clean_path( "$zip_to_dir/$the_file" );
+        print( "<li><input id=\"copy_$count\" name=\"copy_$count\" type=\"checkbox\" value=\"" . $the_file . "\"> " . $new_file . "</li>");
+        $count++;
+    }
 }
 echo '<br>';
 if($require_license){
     $contents = sugar_file_get_contents($license_file);
-	$readme_contents = '';
-	if($found_readme){
-		if(file_exists($readme_file) && filesize($readme_file) > 0){
-			$readme_contents = file_get_contents($readme_file);
-		}elseif(!empty($manifest['readme'])){
-			$readme_contents = $manifest['readme'];
-		}
-	}
-	$license_final =<<<eoq2
+    $readme_contents = '';
+    if($found_readme){
+        if(file_exists($readme_file) && filesize($readme_file) > 0){
+            $readme_contents = file_get_contents($readme_file);
+        }elseif(!empty($manifest['readme'])){
+            $readme_contents = $manifest['readme'];
+        }
+    }
+    $license_final =<<<eoq2
 	<table width='100%'>
 	<tr>
 	<td colspan="3"><ul class="tablist">
@@ -312,38 +312,38 @@ 
 </div>
 
 eoq2;
-	echo $license_final;
-	echo "<br>";
+    echo $license_final;
+    echo "<br>";
 }
 
 switch( $mode ){
-	case "Install":
-		if( $install_type == "langpack") {
-			print( $mod_strings['LBL_UW_LANGPACK_READY'] );
-			echo '<br><br>';
-		}
-		break;
-	case "Uninstall":
-		if( $install_type == "langpack" ){
-			print( $mod_strings['LBL_UW_LANGPACK_READY_UNISTALL'] );
-			echo '<br><br>';
-		}
-		else if($install_type != "module"){
-			print( $mod_strings['LBL_UW_FILES_REMOVED'] );
-		}
-		break;
-	case "Disable":
-		if( $install_type == "langpack" ){
-			print( $mod_strings['LBL_UW_LANGPACK_READY_DISABLE'] );
-			echo '<br><br>';
-		}
-		break;
-	case "Enable":
-		if( $install_type == "langpack" ){
-			print( $mod_strings['LBL_UW_LANGPACK_READY_ENABLE'] );
-			echo '<br><br>';
-		}
-		break;
+    case "Install":
+        if( $install_type == "langpack") {
+            print( $mod_strings['LBL_UW_LANGPACK_READY'] );
+            echo '<br><br>';
+        }
+        break;
+    case "Uninstall":
+        if( $install_type == "langpack" ){
+            print( $mod_strings['LBL_UW_LANGPACK_READY_UNISTALL'] );
+            echo '<br><br>';
+        }
+        else if($install_type != "module"){
+            print( $mod_strings['LBL_UW_FILES_REMOVED'] );
+        }
+        break;
+    case "Disable":
+        if( $install_type == "langpack" ){
+            print( $mod_strings['LBL_UW_LANGPACK_READY_DISABLE'] );
+            echo '<br><br>';
+        }
+        break;
+    case "Enable":
+        if( $install_type == "langpack" ){
+            print( $mod_strings['LBL_UW_LANGPACK_READY_ENABLE'] );
+            echo '<br><br>';
+        }
+        break;
 }
 
 
@@ -355,27 +355,27 @@ 
 
 if($remove_tables == 'prompt' && $mode == 'Uninstall'){
     print ("<br/><br/>");
-	print ("<input type='radio' id='remove_tables_true' name='remove_tables' value='true' checked>".$mod_strings['ML_LBL_REMOVE_TABLES']."&nbsp;");
+    print ("<input type='radio' id='remove_tables_true' name='remove_tables' value='true' checked>".$mod_strings['ML_LBL_REMOVE_TABLES']."&nbsp;");
     print ("<input type='radio' id='remove_tables_false' name='remove_tables' value='false'>".$mod_strings['ML_LBL_DO_NOT_REMOVE_TABLES']."<br>");
 }
 $count = 0;
 
 if( $show_files == true ){
-	$count = 0;
+    $count = 0;
 
-	$new_studio_mod_files = array();
-	$new_sugar_mod_files = array();
+    $new_studio_mod_files = array();
+    $new_sugar_mod_files = array();
 
-	$cache_html_files = findAllFilesRelative( sugar_cached("layout"), array());
+    $cache_html_files = findAllFilesRelative( sugar_cached("layout"), array());
 
-	foreach($new_files as $the_file) {
-		if(substr(strtolower($the_file), -5, 5) == '.html' && in_array($the_file, $cache_html_files))
-		array_push($new_studio_mod_files, $the_file);
-		else
-		array_push($new_sugar_mod_files, $the_file);
-	}
+    foreach($new_files as $the_file) {
+        if(substr(strtolower($the_file), -5, 5) == '.html' && in_array($the_file, $cache_html_files))
+        array_push($new_studio_mod_files, $the_file);
+        else
+        array_push($new_sugar_mod_files, $the_file);
+    }
 
-	echo '<script>
+    echo '<script>
             function toggle_these(start, end, ca) {
               while(start < end) {
                 elem = eval("document.forms.files.copy_" + start);
@@ -388,106 +388,106 @@ 
 
 
 
-	global $theme;
+    global $theme;
 
-	echo '<br/><br/>';
+    echo '<br/><br/>';
 
     echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;'.(($mode == 'Enable' || $mode == 'Disable')?'display:none;':'').'" onclick=\'this.style.display="none"; toggleDisplay("more");\'id="all_text">
         '.SugarThemeRegistry::current()->getImage('advanced_search', '', null, null, ".gif", $mod_strings['LBL_ADVANCED_SEARCH']).$mod_strings['LBL_UW_SHOW_DETAILS'].'</div><div id=\'more\' style=\'display: none\'>
               <div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" onclick=\'document.getElementById("all_text").style.display=""; toggleDisplay("more");\'>'
-         .SugarThemeRegistry::current()->getImage('basic_search', '', null, null, ".gif", $mod_strings['LBL_BASIC_SEARCH']).$mod_strings['LBL_UW_HIDE_DETAILS'].'</div><br>';
+            .SugarThemeRegistry::current()->getImage('basic_search', '', null, null, ".gif", $mod_strings['LBL_BASIC_SEARCH']).$mod_strings['LBL_UW_HIDE_DETAILS'].'</div><br>';
     echo '<input type="checkbox" checked onclick="toggle_these(' . count($new_studio_mod_files) . ',' . count($new_files) . ', this)"> '.$mod_strings['LBL_UW_CHECK_ALL'];
-	echo '<ul>';
-	foreach( $new_sugar_mod_files as $the_file ){
-		$highlight_start    = "";
-		$highlight_end      = "";
-		$checked            = "";
-		$disabled           = "";
-		$unzip_file = "$unzip_dir/$zip_from_dir/$the_file";
-		$new_file   = clean_path( "$zip_to_dir/$the_file" );
-		$forced_copy    = false;
-
-		if( $mode == "Install" ){
-			$checked = "checked";
-			foreach( $zip_force_copy as $pattern ){
-				if( preg_match("#" . $pattern . "#", $unzip_file) ){
-					$disabled = "disabled=\"true\"";
-					$forced_copy = true;
-				}
-			}
-			if( !$forced_copy && is_file( $new_file ) && (md5_file( $unzip_file ) == md5_file( $new_file )) ){
-				$disabled = "disabled=\"true\"";
-				//$checked = "";
-			}
-			if( $checked != "" && $disabled != "" ){    // need to put a hidden field
-				print( "<input name=\"copy_$count\" type=\"hidden\" value=\"" . $the_file . "\">\n" );
-			}
-			print( "<li><input id=\"copy_$count\" name=\"copy_$count\" type=\"checkbox\" value=\"" . $the_file . "\" $checked $disabled > " . $highlight_start . $new_file . $highlight_end );
-			if( $checked == "" && $disabled != "" ){    // need to explain this file hasn't changed
-				print( " (no changes)" );
-			}
-			print( "<br>\n" );
-		}
-		else if( $mode == "Uninstall" && file_exists( $new_file ) ){
-			if( md5_file( $unzip_file ) == md5_file( $new_file ) ){
-				$checked = "checked=\"true\"";
-			}
-			else{
-				$highlight_start    = "<font color=red>";
-				$highlight_end      = "</font>";
-			}
-			print( "<li><input name=\"copy_$count\" type=\"checkbox\" value=\"" . $the_file . "\" $checked $disabled > " . $highlight_start . $new_file . $highlight_end . "<br>\n" );
-		}
-		$count++;
-	}
+    echo '<ul>';
+    foreach( $new_sugar_mod_files as $the_file ){
+        $highlight_start    = "";
+        $highlight_end      = "";
+        $checked            = "";
+        $disabled           = "";
+        $unzip_file = "$unzip_dir/$zip_from_dir/$the_file";
+        $new_file   = clean_path( "$zip_to_dir/$the_file" );
+        $forced_copy    = false;
+
+        if( $mode == "Install" ){
+            $checked = "checked";
+            foreach( $zip_force_copy as $pattern ){
+                if( preg_match("#" . $pattern . "#", $unzip_file) ){
+                    $disabled = "disabled=\"true\"";
+                    $forced_copy = true;
+                }
+            }
+            if( !$forced_copy && is_file( $new_file ) && (md5_file( $unzip_file ) == md5_file( $new_file )) ){
+                $disabled = "disabled=\"true\"";
+                //$checked = "";
+            }
+            if( $checked != "" && $disabled != "" ){    // need to put a hidden field
+                print( "<input name=\"copy_$count\" type=\"hidden\" value=\"" . $the_file . "\">\n" );
+            }
+            print( "<li><input id=\"copy_$count\" name=\"copy_$count\" type=\"checkbox\" value=\"" . $the_file . "\" $checked $disabled > " . $highlight_start . $new_file . $highlight_end );
+            if( $checked == "" && $disabled != "" ){    // need to explain this file hasn't changed
+                print( " (no changes)" );
+            }
+            print( "<br>\n" );
+        }
+        else if( $mode == "Uninstall" && file_exists( $new_file ) ){
+            if( md5_file( $unzip_file ) == md5_file( $new_file ) ){
+                $checked = "checked=\"true\"";
+            }
+            else{
+                $highlight_start    = "<font color=red>";
+                $highlight_end      = "</font>";
+            }
+            print( "<li><input name=\"copy_$count\" type=\"checkbox\" value=\"" . $the_file . "\" $checked $disabled > " . $highlight_start . $new_file . $highlight_end . "<br>\n" );
+        }
+        $count++;
+    }
         print( "</ul>\n" );
 }
 //    echo '</div>';
 if($mode == "Disable" || $mode == "Enable"){
-	//check to see if any files have been modified
-	$modified_files = getDiffFiles($unzip_dir, $install_file, ($mode == 'Enable'), $previous_version);
-	if(count($modified_files) > 0){
-		//we need to tell the user that some files have been modified since they last did an install
-		echo '<script>' .
+    //check to see if any files have been modified
+    $modified_files = getDiffFiles($unzip_dir, $install_file, ($mode == 'Enable'), $previous_version);
+    if(count($modified_files) > 0){
+        //we need to tell the user that some files have been modified since they last did an install
+        echo '<script>' .
                 'function handleFileChange(){';
-		if(count($modified_files) > 0){
-			echo 'if(document.getElementById("radio_overwrite_files") != null && document.getElementById("radio_do_not_overwrite_files") != null){
+        if(count($modified_files) > 0){
+            echo 'if(document.getElementById("radio_overwrite_files") != null && document.getElementById("radio_do_not_overwrite_files") != null){
                 			var overwrite = false;
                 			if(document.getElementById("radio_overwrite_files").checked){
                    			 overwrite = true
                 			}
             			}
         				return true;';
-		}else{
-			echo 'return true;';
-		}
-		echo '}</script>';
-		print('<b>'.$mod_strings['ML_LBL_OVERWRITE_FILES'].'</b>');
-		print('<table><td align="left" valign="top" colspan=2>');
-		print("<input type='radio' id='radio_overwrite_files' name='radio_overwrite' value='overwrite'>{$mod_strings['LBL_OVERWRITE_FILES']}&nbsp;");
-		print("<input type='radio' id='radio_do_not_overwrite_files' name='radio_overwrite' value='do_not_overwrite' checked>{$mod_strings['LBL_DO_OVERWRITE_FILES']}");
-		print("</td></tr></table>");
-		print('<ul>');
-		foreach($modified_files as $modified_file){
-			print('<li>'.$modified_file.'</li>');
-		}
-		print('</ul>');
-	}else{
-		echo '<script>' .
-	        'function handleFileChange(){';
-		echo 'return true;';
-		echo '}</script>';
-	}
+        }else{
+            echo 'return true;';
+        }
+        echo '}</script>';
+        print('<b>'.$mod_strings['ML_LBL_OVERWRITE_FILES'].'</b>');
+        print('<table><td align="left" valign="top" colspan=2>');
+        print("<input type='radio' id='radio_overwrite_files' name='radio_overwrite' value='overwrite'>{$mod_strings['LBL_OVERWRITE_FILES']}&nbsp;");
+        print("<input type='radio' id='radio_do_not_overwrite_files' name='radio_overwrite' value='do_not_overwrite' checked>{$mod_strings['LBL_DO_OVERWRITE_FILES']}");
+        print("</td></tr></table>");
+        print('<ul>');
+        foreach($modified_files as $modified_file){
+            print('<li>'.$modified_file.'</li>');
+        }
+        print('</ul>');
+    }else{
+        echo '<script>' .
+            'function handleFileChange(){';
+        echo 'return true;';
+        echo '}</script>';
+    }
 }else{
-	echo '<script>' .
+    echo '<script>' .
         'function handleFileChange(){';
-	echo 'return true;';
-	echo '}</script>';
+    echo 'return true;';
+    echo '}</script>';
 }
 echo '<script>' .
-         		'function validateForm(process){'.
-         			'return (handleCommit(process) && handleFileChange());'.
-         		'}'.
+                    'function validateForm(process){'.
+                        'return (handleCommit(process) && handleFileChange());'.
+                    '}'.
                 'function handleCommit(process){
         if(process == 1) {
             if(document.getElementById("radio_license_agreement_reject") != null && document.getElementById("radio_license_agreement_accept") != null){

modules/Administration/RebuildJSLang.php

Indentation +1 added lines, -1 removed lines

@@ -50,6 +50,6 @@
     LanguageManager::clearLanguageCache();
 }
 else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>

modules/Administration/RepairActivities.php

Indentation +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 while ($row != null) {
     $date_end = $timedate->fromDb($row['date_start'])->modify("+{$row['duration_hours']} hours {$row['duration_minutes']} mins")->asDb();
     $updateQuery = "UPDATE calls set calls.date_end='{$date_end}' where calls.id='{$row['id']}'";
-	$call = new Call();
+    $call = new Call();
     $call->db->query($updateQuery);
     $row = $callBean->db->fetchByAssoc($result);
 }
@@ -62,8 +62,8 @@ 
 $row = $meetingBean->db->fetchByAssoc($result);
 while ($row != null) {
     $date_end = $timedate->fromDb($row['date_start'])->modify("+{$row['duration_hours']} hours {$row['duration_minutes']} mins")->asDb();
-	$updateQuery = "UPDATE meetings set meetings.date_end='{$date_end}' where meetings.id='{$row['id']}'";
-	$call = new Call();
+    $updateQuery = "UPDATE meetings set meetings.date_end='{$date_end}' where meetings.id='{$row['id']}'";
+    $call = new Call();
     $call->db->query($updateQuery);
     $row = $callBean->db->fetchByAssoc($result);
 }

modules/Administration/ExportCustomFieldStructure.php

Indentation +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@
 $fields = array();
 $str = '';
 while($row = $db->fetchByAssoc($result)){
-	foreach($row as $name=>$value){
-		$str.= "$name:::$value\n";
-	}
-	$str .= "DONE\n";
+    foreach($row as $name=>$value){
+        $str.= "$name:::$value\n";
+    }
+    $str .= "DONE\n";
 }
 ob_get_clean();