adamjakab / SuiteCRM

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

Spacing +2 added lines, -2 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.
@@ -38,7 +38,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if(is_admin($current_user)){
+if (is_admin($current_user)) {
     global $mod_strings; 
 
     

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/RebuildSprites.php

Spacing +3 added lines, -3 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.
@@ -40,9 +40,9 @@ 
 
 
 global $current_user;
-if(is_admin($current_user))
+if (is_admin($current_user))
 {
-    if(!isset($_REQUEST['process']))
+    if (!isset($_REQUEST['process']))
     {
         global $mod_strings;
         echo '<br>'.$mod_strings['LBL_REPAIR_JS_FILES_PROCESSING'];

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

Spacing +25 added lines, -25 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.
@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 
 //Check if current user has admin access
-if(is_admin($current_user)) {
+if (is_admin($current_user)) {
     global $mod_strings;
 
     //echo out processing message
@@ -51,29 +51,29 @@ 
 
     $query = "SELECT * FROM fields_meta_data";
     $result = $GLOBALS['db']->query($query);
-    while($row = $GLOBALS['db']->fetchByAssoc($result)) {
+    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'])) {
+    	  if ($name != strtolower($row['name'])) {
     	  	 $database_entries[$row['custom_module']][$name] = $row;
     	  }
     }
 
     //If we have database entries to process
-    if(!empty($database_entries)) {
+    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'] . "'";
+           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'])));
            }
@@ -81,33 +81,33 @@ 
     }
 
     //If we have metadata files to alter
-    if(!empty($module_entries)) {
+    if (!empty($module_entries)) {
 	    $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 ('include/TemplateHandler/TemplateHandler.php');
 	    require_once('modules/ModuleBuilder/parsers/ParserFactory.php');
 
-	    foreach($modules as $module) {
-	       if(isset($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) {
-                try{
+	       foreach ($views as $view) {
+                try {
                     $parser = ParserFactory::getParser($view, $module);
                 }
-                catch(Exception $e){
+                catch (Exception $e) {
                     $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'])) {
+	       		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']);
 	       		   	  	 	}
 	       		   	  	 }
@@ -115,8 +115,8 @@ 
 	       		   }
 	       		} 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'])) {
+       		   	  foreach ($parser->_viewdefs as $entry_id=>$entry) {
+       		   	  	 if (is_array($entry) && isset($entry['name'])) {
        		   	  	 	$parser->_viewdefs[$entry_id]['name'] = strtolower($entry['name']);
        		   	  	 }
        		   	  }

Braces +4 added lines, -3 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.
@@ -98,8 +100,7 @@ 
 	       foreach($views as $view) {
                 try{
                     $parser = ParserFactory::getParser($view, $module);
-                }
-                catch(Exception $e){
+                } catch(Exception $e){
                     $GLOBALS['log']->fatal("Caught exception in RepairFieldCasing script: ".$e->getMessage());
                     continue;
                 }

modules/Administration/UpgradeAccess.php

Spacing +23 added lines, -23 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.
@@ -44,11 +44,11 @@ 
 global $mod_strings;
 global $sugar_config;
 
-$ignoreCase = (substr_count(strtolower($_SERVER['SERVER_SOFTWARE']), 'apache/2') > 0)?'(?i)':'';
-$htaccess_file   = getcwd() . "/.htaccess";
+$ignoreCase = (substr_count(strtolower($_SERVER['SERVER_SOFTWARE']), 'apache/2') > 0) ? '(?i)' : '';
+$htaccess_file = getcwd()."/.htaccess";
 $contents = '';
 $basePath = parse_url($sugar_config['site_url'], PHP_URL_PATH);
-if(empty($basePath)) $basePath = '/';
+if (empty($basePath)) $basePath = '/';
 
 $restrict_str = <<<EOQ
 # BEGIN SUGARCRM RESTRICTIONS
@@ -69,52 +69,52 @@ 
 # END SUGARCRM RESTRICTIONS
 EOQ;
 
-if(file_exists($htaccess_file)){
+if (file_exists($htaccess_file)) {
     $fp = fopen($htaccess_file, 'r');
     $skip = false;
-    while($line = fgets($fp)){
+    while ($line = fgets($fp)) {
 
-    	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;
+    	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;
     }
 }
-if(substr($contents, -1) != "\n") {
+if (substr($contents, -1) != "\n") {
     $restrict_str = "\n".$restrict_str;
 }
-$status =  file_put_contents($htaccess_file, $contents . $restrict_str);
-if( !$status ){
-    echo '<p>' . $mod_strings['LBL_HT_NO_WRITE'] . "<span class=stop>{$htaccess_file}</span></p>\n";
-    echo '<p>' . $mod_strings['LBL_HT_NO_WRITE_2'] . "</p>\n";
+$status = file_put_contents($htaccess_file, $contents.$restrict_str);
+if (!$status) {
+    echo '<p>'.$mod_strings['LBL_HT_NO_WRITE']."<span class=stop>{$htaccess_file}</span></p>\n";
+    echo '<p>'.$mod_strings['LBL_HT_NO_WRITE_2']."</p>\n";
     echo "{$redirect_str}\n";
 }
 
 
 // cn: bug 9365 - security for filesystem
-$uploadDir='';
-$uploadHta='';
+$uploadDir = '';
+$uploadHta = '';
 
 if (empty($GLOBALS['sugar_config']['upload_dir'])) {
-    $GLOBALS['sugar_config']['upload_dir']='upload/';
+    $GLOBALS['sugar_config']['upload_dir'] = 'upload/';
 }
 
 $uploadHta = "upload://.htaccess";
 
-$denyAll =<<<eoq
+$denyAll = <<<eoq
 	Order Deny,Allow
 	Deny from all
 eoq;
 
-if(file_exists($uploadHta) && filesize($uploadHta)) {
+if (file_exists($uploadHta) && filesize($uploadHta)) {
 	// file exists, parse to make sure it is current
-	if(is_writable($uploadHta)) {
+	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) {
+		if (strstr($oldHtaccess, $denyAll) === false) {
 		    $oldHtaccess .= "\n";
 			$oldHtaccess .= $denyAll;
 		}
-		if(!file_put_contents($uploadHta, $oldHtaccess)) {
+		if (!file_put_contents($uploadHta, $oldHtaccess)) {
 		    $htaccess_failed = true;
 		}
 	} else {
@@ -122,7 +122,7 @@ 
 	}
 } else {
 	// no .htaccess yet, create a fill
-	if(!file_put_contents($uploadHta, $denyAll)) {
+	if (!file_put_contents($uploadHta, $denyAll)) {
 		$htaccess_failed = true;
 	}
 }

Braces +15 added lines, -5 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.
@@ -48,7 +50,9 @@ 
 $htaccess_file   = getcwd() . "/.htaccess";
 $contents = '';
 $basePath = parse_url($sugar_config['site_url'], PHP_URL_PATH);
-if(empty($basePath)) $basePath = '/';
+if(empty($basePath)) {
+    $basePath = '/';
+}
 
 $restrict_str = <<<EOQ
 # BEGIN SUGARCRM RESTRICTIONS
@@ -74,9 +78,15 @@ 
     $skip = false;
     while($line = fgets($fp)){
 
-    	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;
+    	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;
+        }
     }
 }
 if(substr($contents, -1) != "\n") {

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;
+    }
 }
 
 /* Commenting out as this shows on upgrade screen

modules/Administration/UpgradeWizard_commit.php

Switch Indentation +50 added lines, -50 removed lines

@@ -305,50 +305,50 @@ 
 }
 
 switch( $install_type ){
-    case "langpack":
-        if( !isset($_REQUEST['new_lang_name']) || ($_REQUEST['new_lang_name'] == "") ){
-            die($mod_strings['ERR_UW_NO_LANG']);
-        }
-        if( !isset($_REQUEST['new_lang_desc']) || ($_REQUEST['new_lang_desc'] == "") ){
-            die($mod_strings['ERR_UW_NO_LANG_DESC']);
-        }
+        case "langpack":
+            if( !isset($_REQUEST['new_lang_name']) || ($_REQUEST['new_lang_name'] == "") ){
+                die($mod_strings['ERR_UW_NO_LANG']);
+            }
+            if( !isset($_REQUEST['new_lang_desc']) || ($_REQUEST['new_lang_desc'] == "") ){
+                die($mod_strings['ERR_UW_NO_LANG_DESC']);
+            }
 
-        if( $mode == "Install" || $mode=="Enable" ){
-            $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
-        }
-        else if( $mode == "Uninstall" || $mode=="Disable" ){
-            $new_langs = array();
-            $old_langs = $sugar_config['languages'];
-            foreach( $old_langs as $key => $value ){
-                if( $key != $_REQUEST['new_lang_name'] ){
-                    $new_langs += array( $key => $value );
+            if( $mode == "Install" || $mode=="Enable" ){
+                $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
+            }
+            else if( $mode == "Uninstall" || $mode=="Disable" ){
+                $new_langs = array();
+                $old_langs = $sugar_config['languages'];
+                foreach( $old_langs as $key => $value ){
+                    if( $key != $_REQUEST['new_lang_name'] ){
+                        $new_langs += array( $key => $value );
+                    }
                 }
+			    $sugar_config['languages'] = $new_langs;
+
+	            $default_sugar_instance_lang = 'en_us';
+	            if($current_language == $_REQUEST['new_lang_name']){
+	        	    $_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
+	        	    $lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+	            }
+
+	            if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
+	        	    $cfg = new Configurator();
+             	    $cfg->config['languages'] = $new_langs;
+				    $cfg->config['default_language'] = $default_sugar_instance_lang;
+				    $cfg->handleOverride();
+	        	    $lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+	            }
             }
-			$sugar_config['languages'] = $new_langs;
-
-	        $default_sugar_instance_lang = 'en_us';
-	        if($current_language == $_REQUEST['new_lang_name']){
-	        	$_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
-	        	$lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
-
-	        if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
-	        	$cfg = new Configurator();
-             	$cfg->config['languages'] = $new_langs;
-				$cfg->config['default_language'] = $default_sugar_instance_lang;
-				$cfg->handleOverride();
-	        	$lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
-        }
-        ksort( $sugar_config );
-        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
-            die($mod_strings['ERR_UW_CONFIG_FAILED']);
-        }
-        break;
-    case "module":
-        require_once( "ModuleInstall/ModuleInstaller.php" );
-        $mi = new ModuleInstaller();
-        switch( $mode ){
+            ksort( $sugar_config );
+            if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+                die($mod_strings['ERR_UW_CONFIG_FAILED']);
+            }
+            break;
+        case "module":
+            require_once( "ModuleInstall/ModuleInstaller.php" );
+            $mi = new ModuleInstaller();
+            switch( $mode ){
             case "Install":
             //here we can determine if this is an upgrade or a new version
             	if(!empty($previous_version)){
@@ -388,14 +388,14 @@ 
                 break;
             default:
                 break;
-        }
+            }
         $current_user->incrementETag("mainMenuETag");
         break;
-    case "full":
-        // purposely flow into "case: patch"
-    case "patch":
- 		switch($mode)
- 		{
+        case "full":
+            // purposely flow into "case: patch"
+        case "patch":
+ 		    switch($mode)
+ 		    {
  			case 'Install':
  				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
 				if(is_file($file))
@@ -424,7 +424,7 @@ 
  				break;
  			default:
  				break;
- 		}
+ 		    }
 
 		require( "sugar_version.php" );
 		$sugar_config['sugar_version'] = $sugar_version;
@@ -435,8 +435,8 @@ 
 			die($mod_strings['ERR_UW_UPDATE_CONFIG']);
 		}
         break;
-    default:
-        break;
+        default:
+            break;
 }
 
 switch( $mode ){

Indentation +159 added lines, -159 removed lines

@@ -43,11 +43,11 @@ 
 require_once('modules/Administration/UpgradeWizardCommon.php');
 require_once('modules/Configurator/Configurator.php');
 function UWrebuild() {
-	global $log;
-	global $db;
-	$log->info('Deleting Relationship Cache. Relationships will automatically refresh.');
+    global $log;
+    global $db;
+    $log->info('Deleting Relationship Cache. Relationships will automatically refresh.');
 
-	echo "
+    echo "
 	<div id='rrresult'></div>
 	<script>
 		var xmlhttp=false;
@@ -88,10 +88,10 @@ 
 		xmlhttp.send(null);
 		</script>";
 
-	$log->info('Rebuilding everything.');
-	require_once('ModuleInstall/ModuleInstaller.php');
-	$mi = new ModuleInstaller();
-	$mi->rebuild_all();
+    $log->info('Rebuilding everything.');
+    require_once('ModuleInstall/ModuleInstaller.php');
+    $mi = new ModuleInstaller();
+    $mi->rebuild_all();
 }
 
 unset($_SESSION['rebuild_relationships']);
@@ -140,19 +140,19 @@ 
 
 $id_name = '';
 if(isset($_REQUEST['id_name'])){
- $id_name = $_REQUEST['id_name'];
+    $id_name = $_REQUEST['id_name'];
 }
 $s_manifest = '';
 if(isset($_REQUEST['s_manifest'])){
- $s_manifest = $_REQUEST['s_manifest'];
+    $s_manifest = $_REQUEST['s_manifest'];
 }
 $previous_version = '';
 if(isset($_REQUEST['previous_version'])){
-	$previous_version = $_REQUEST['previous_version'];
+    $previous_version = $_REQUEST['previous_version'];
 }
 $previous_id = '';
 if(isset($_REQUEST['previous_id'])){
-	$previous_id = $_REQUEST['previous_id'];
+    $previous_id = $_REQUEST['previous_id'];
 }
 if( $install_type != "module" ){
     if( !isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "") ){
@@ -170,11 +170,11 @@ 
 }
 $remove_tables = 'true';
 if(isset($_REQUEST['remove_tables'])){
-	$remove_tables = $_REQUEST['remove_tables'];
+    $remove_tables = $_REQUEST['remove_tables'];
 }
 $overwrite_files = true;
 if(isset($_REQUEST['radio_overwrite'])){
- $overwrite_files = (($_REQUEST['radio_overwrite'] == 'do_not_overwrite') ? false : true);
+    $overwrite_files = (($_REQUEST['radio_overwrite'] == 'do_not_overwrite') ? false : true);
 }
 
 //rrs
@@ -200,13 +200,13 @@ 
 
 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()){
-		$ms->displayIssues();
-		sugar_cleanup(true);
-	}
+    require_once('ModuleInstall/ModuleScanner.php');
+    $ms = new ModuleScanner();
+    $ms->scanPackage($unzip_dir);
+    if($ms->hasIssues()){
+        $ms->displayIssues();
+        sugar_cleanup(true);
+    }
 }
 
 //
@@ -214,29 +214,29 @@ 
 //
 if($install_type == 'patch' || $install_type == 'module')
 {
-	switch($mode)
- 	{
- 		case 'Install':
- 			$file = "$unzip_dir/" . constant('SUGARCRM_PRE_INSTALL_FILE');
-			if(is_file($file))
-			{
-				print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-				include($file);
-				pre_install();
-   		}
- 			break;
- 		case 'Uninstall':
- 			$file = "$unzip_dir/" . constant('SUGARCRM_PRE_UNINSTALL_FILE');
-			if(is_file($file))
-			{
-				print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-				include($file);
-				pre_uninstall();
-   		}
- 			break;
- 		default:
- 			break;
- 		}
+    switch($mode)
+        {
+            case 'Install':
+             $file = "$unzip_dir/" . constant('SUGARCRM_PRE_INSTALL_FILE');
+            if(is_file($file))
+            {
+                print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                include($file);
+                pre_install();
+            }
+                break;
+            case 'Uninstall':
+             $file = "$unzip_dir/" . constant('SUGARCRM_PRE_UNINSTALL_FILE');
+            if(is_file($file))
+            {
+                print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                include($file);
+                pre_uninstall();
+            }
+                break;
+            default:
+             break;
+            }
 }
 
 //
@@ -251,9 +251,9 @@ 
         $sugar_home_dir = getCwd();
         $dest_file  = clean_path( "$sugar_home_dir/$zip_to_dir/$file_to_copy" );
         if($zip_to_dir != '.')
-        	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
+            $rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
         else
-        	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+            $rest_file  = clean_path("$rest_dir/$file_to_copy");
 
         switch( $mode ){
             case "Install":
@@ -261,11 +261,11 @@ 
 
                 if($install_type=="patch" && is_file($dest_file))
                 {
-	                if(!is_dir(dirname( $rest_file )))
-                		mkdir_recursive( dirname( $rest_file ) );
+                    if(!is_dir(dirname( $rest_file )))
+                        mkdir_recursive( dirname( $rest_file ) );
 
-	                copy( $dest_file, $rest_file);
-	                sugar_touch( $rest_file, filemtime($dest_file) );
+                    copy( $dest_file, $rest_file);
+                    sugar_touch( $rest_file, filemtime($dest_file) );
                 }
 
                 if( !copy( $src_file, $dest_file ) ){
@@ -276,8 +276,8 @@ 
             case "Uninstall":
                 if($install_type=="patch" && is_file($rest_file))
                 {
-	                copy( $rest_file, $dest_file);
-	                sugar_touch( $dest_file, filemtime($rest_file) );
+                    copy( $rest_file, $dest_file);
+                    sugar_touch( $dest_file, filemtime($rest_file) );
                 }
                 elseif(file_exists($dest_file) && !unlink($dest_file))
                 {
@@ -312,21 +312,21 @@ 
                     $new_langs += array( $key => $value );
                 }
             }
-			$sugar_config['languages'] = $new_langs;
-
-	        $default_sugar_instance_lang = 'en_us';
-	        if($current_language == $_REQUEST['new_lang_name']){
-	        	$_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
-	        	$lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
-
-	        if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
-	        	$cfg = new Configurator();
-             	$cfg->config['languages'] = $new_langs;
-				$cfg->config['default_language'] = $default_sugar_instance_lang;
-				$cfg->handleOverride();
-	        	$lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
+            $sugar_config['languages'] = $new_langs;
+
+            $default_sugar_instance_lang = 'en_us';
+            if($current_language == $_REQUEST['new_lang_name']){
+                $_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
+                $lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+            }
+
+            if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
+                $cfg = new Configurator();
+                    $cfg->config['languages'] = $new_langs;
+                $cfg->config['default_language'] = $default_sugar_instance_lang;
+                $cfg->handleOverride();
+                $lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+            }
         }
         ksort( $sugar_config );
         if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
@@ -339,39 +339,39 @@ 
         switch( $mode ){
             case "Install":
             //here we can determine if this is an upgrade or a new version
-            	if(!empty($previous_version)){
-            		$mi->install( "$unzip_dir", true, $previous_version);
-            	}else{
-                	$mi->install( "$unzip_dir" );
-            	}
-
-				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-				if(is_file($file))
-				{
-					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-					include($file);
-					post_install();
-				}
-            	break;
+                if(!empty($previous_version)){
+                    $mi->install( "$unzip_dir", true, $previous_version);
+                }else{
+                    $mi->install( "$unzip_dir" );
+                }
+
+                $file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
+                if(is_file($file))
+                {
+                    print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                    include($file);
+                    post_install();
+                }
+                break;
             case "Uninstall":
                 if($remove_tables == 'false')
-                	$GLOBALS['mi_remove_tables'] = false;
+                    $GLOBALS['mi_remove_tables'] = false;
                 else
-                	$GLOBALS['mi_remove_tables'] = true;
+                    $GLOBALS['mi_remove_tables'] = true;
                 $mi->uninstall( "$unzip_dir" );
                 break;
-             case "Disable":
+                case "Disable":
                 if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
+                    $GLOBALS['mi_overwrite_files'] = false;
                 else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                    $GLOBALS['mi_overwrite_files'] = true;
                 $mi->disable( "$unzip_dir" );
                 break;
-             case "Enable":
+                case "Enable":
                 if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
+                    $GLOBALS['mi_overwrite_files'] = false;
                 else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                    $GLOBALS['mi_overwrite_files'] = true;
                 $mi->enable( "$unzip_dir" );
                 break;
             default:
@@ -382,46 +382,46 @@ 
     case "full":
         // purposely flow into "case: patch"
     case "patch":
- 		switch($mode)
- 		{
- 			case 'Install':
- 				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-				if(is_file($file))
-				{
-					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-					include($file);
-					post_install();
-				}
-
-				UWrebuild();
- 				break;
- 			case 'Uninstall':
- 				$file = "$unzip_dir/" . constant('SUGARCRM_POST_UNINSTALL_FILE');
- 				if(is_file($file)) {
-					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
-					include($file);
-					post_uninstall();
-				}
-
-				if(is_dir($rest_dir))
-				{
-					rmdir_recursive($rest_dir);
-				}
-
-				UWrebuild();
- 				break;
- 			default:
- 				break;
- 		}
-
-		require( "sugar_version.php" );
-		$sugar_config['sugar_version'] = $sugar_version;
-		ksort( $sugar_config );
-
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) )
-		{
-			die($mod_strings['ERR_UW_UPDATE_CONFIG']);
-		}
+         switch($mode)
+            {
+                case 'Install':
+                 $file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
+                if(is_file($file))
+                {
+                    print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                    include($file);
+                    post_install();
+                }
+
+                UWrebuild();
+                    break;
+                case 'Uninstall':
+                 $file = "$unzip_dir/" . constant('SUGARCRM_POST_UNINSTALL_FILE');
+                    if(is_file($file)) {
+                    print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
+                    include($file);
+                    post_uninstall();
+                }
+
+                if(is_dir($rest_dir))
+                {
+                    rmdir_recursive($rest_dir);
+                }
+
+                UWrebuild();
+                    break;
+                default:
+                 break;
+            }
+
+        require( "sugar_version.php" );
+        $sugar_config['sugar_version'] = $sugar_version;
+        ksort( $sugar_config );
+
+        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) )
+        {
+            die($mod_strings['ERR_UW_UPDATE_CONFIG']);
+        }
         break;
     default:
         break;
@@ -434,15 +434,15 @@ 
         $new_upgrade = new UpgradeHistory();
         //determine if this module has already been installed given the unique_key to
         //identify the module
-       // $new_upgrade->checkForExisting($unique_key);
-       	if(!empty($previous_id)){
-       		$new_upgrade->id = $previous_id;
-       		$uh = new UpgradeHistory();
-       		$uh->retrieve($previous_id);
-       		if(is_file($uh->filename)) {
-       		unlink($uh->filename);
-       		}
-       	}
+        // $new_upgrade->checkForExisting($unique_key);
+            if(!empty($previous_id)){
+                $new_upgrade->id = $previous_id;
+                $uh = new UpgradeHistory();
+                $uh->retrieve($previous_id);
+                if(is_file($uh->filename)) {
+                unlink($uh->filename);
+                }
+            }
         $new_upgrade->filename      = $install_file;
         $new_upgrade->md5sum        = md5_file( $install_file );
         $new_upgrade->type          = $install_type;
@@ -457,25 +457,25 @@ 
         //Check if we need to show a page for the user to finalize their install with.
         if (is_file("$unzip_dir/manifest.php"))
         {
-        	include("$unzip_dir/manifest.php");
-        	if (!empty($manifest['post_install_url']))
-        	{
-        		$url_conf = $manifest['post_install_url'];
-        		if (is_string($url_conf))
-        			$url_conf = array('url' => $url_conf);
-        		if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
-        		{
-        			echo '<script type="text/javascript">window.open("' . $url_conf['url']
-        			   . '","' . (empty($url_conf['name']) ? 'sugar_popup' : $url_conf['name']) . '","'
-        			   . 'height=' . (empty($url_conf['height']) ? '500' : $url_conf['height']) . ','
-        			   . 'width=' . (empty($url_conf['width']) ? '800' : $url_conf['width']) . '");</script>';
-        		} else
-        		{
-        			echo '<iframe src="' . $url_conf['url'] . '" '
-        			   . 'width="' . (empty($url_conf['width']) ? '100%' : $url_conf['width']) . '" '
-        			   . 'height="' . (empty($url_conf['height']) ? '500px' : $url_conf['height']) . '"></iframe>';
-        		}
-        	}
+            include("$unzip_dir/manifest.php");
+            if (!empty($manifest['post_install_url']))
+            {
+                $url_conf = $manifest['post_install_url'];
+                if (is_string($url_conf))
+                    $url_conf = array('url' => $url_conf);
+                if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
+                {
+                    echo '<script type="text/javascript">window.open("' . $url_conf['url']
+                        . '","' . (empty($url_conf['name']) ? 'sugar_popup' : $url_conf['name']) . '","'
+                        . 'height=' . (empty($url_conf['height']) ? '500' : $url_conf['height']) . ','
+                        . 'width=' . (empty($url_conf['width']) ? '800' : $url_conf['width']) . '");</script>';
+                } else
+                {
+                    echo '<iframe src="' . $url_conf['url'] . '" '
+                        . 'width="' . (empty($url_conf['width']) ? '100%' : $url_conf['width']) . '" '
+                        . 'height="' . (empty($url_conf['height']) ? '500px' : $url_conf['height']) . '"></iframe>';
+                }
+            }
         }
     break;
     case "Uninstall":
@@ -499,7 +499,7 @@ 
             die( "{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file." );
         }
         foreach( $md5_matches as $md5_match ){
-             $md5_match->enabled = 0;
+                $md5_match->enabled = 0;
             $md5_match->save();
         }
         break;
@@ -532,7 +532,7 @@ 
 echo "</div>";
 echo "<br>";
 if(isset($lang_changed_string))
-	print($lang_changed_string);
+    print($lang_changed_string);
 if ($install_type != "module" && $install_type != "langpack"){
     if( sizeof( $files_to_handle ) > 0 ){
         echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" 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\'>

Spacing +135 added lines, -135 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.
@@ -100,80 +100,80 @@ 
 global $log, $db;
 
 // process commands
-if( !isset($_REQUEST['mode']) || ($_REQUEST['mode'] == "") ){
+if (!isset($_REQUEST['mode']) || ($_REQUEST['mode'] == "")) {
     die($mod_strings['ERR_UW_NO_MODE']);
 }
 $mode = $_REQUEST['mode'];
 
 
-if( !isset($_REQUEST['version']) ){
+if (!isset($_REQUEST['version'])) {
     die($mod_strings['ERR_UW_NO_MODE']);
 }
 $version = $_REQUEST['version'];
 
-if( !isset($_REQUEST['copy_count']) || ($_REQUEST['copy_count'] == "") ){
+if (!isset($_REQUEST['copy_count']) || ($_REQUEST['copy_count'] == "")) {
     die($mod_strings['ERR_UW_NO_FILES']);
 }
 
-if( empty($_REQUEST['unzip_dir']) || $_REQUEST['unzip_dir'] == "." || $_REQUEST['unzip_dir'] == ".."){
+if (empty($_REQUEST['unzip_dir']) || $_REQUEST['unzip_dir'] == "." || $_REQUEST['unzip_dir'] == "..") {
     die($mod_strings['ERR_UW_NO_TEMP_DIR']);
 }
-$unzip_dir = $base_tmp_upgrade_dir. "/". basename($_REQUEST['unzip_dir']);
+$unzip_dir = $base_tmp_upgrade_dir."/".basename($_REQUEST['unzip_dir']);
 
-if(empty($_REQUEST['install_file'])){
+if (empty($_REQUEST['install_file'])) {
     die($mod_strings['ERR_UW_NO_INSTALL_FILE']);
 }
 
-$install_file   = hashToFile($_REQUEST['install_file'] );
-$install_type   = getInstallType( $install_file );
+$install_file   = hashToFile($_REQUEST['install_file']);
+$install_type   = getInstallType($install_file);
 
 //from here on out, the install_file is used as the file path to copy or rename the physical file, so let's remove the stream wrapper if it's set
 //and replace it with the proper upload location
-if(strpos($install_file,'upload://') === 0){
+if (strpos($install_file, 'upload://') === 0) {
     //get the upload location if it's set, or default to 'upload'
     $upload_dir = empty($GLOBALS['sugar_config']['upload_dir']) ? 'upload' : rtrim($GLOBALS['sugar_config']['upload_dir'], '/\\');
 
     //replace the wrapper in the file name with the directory
-    $install_file = str_replace('upload:/',$upload_dir,$install_file);
+    $install_file = str_replace('upload:/', $upload_dir, $install_file);
     $_REQUEST['install_file'] = $install_file;
 }
 
 $id_name = '';
-if(isset($_REQUEST['id_name'])){
+if (isset($_REQUEST['id_name'])) {
  $id_name = $_REQUEST['id_name'];
 }
 $s_manifest = '';
-if(isset($_REQUEST['s_manifest'])){
+if (isset($_REQUEST['s_manifest'])) {
  $s_manifest = $_REQUEST['s_manifest'];
 }
 $previous_version = '';
-if(isset($_REQUEST['previous_version'])){
+if (isset($_REQUEST['previous_version'])) {
 	$previous_version = $_REQUEST['previous_version'];
 }
 $previous_id = '';
-if(isset($_REQUEST['previous_id'])){
+if (isset($_REQUEST['previous_id'])) {
 	$previous_id = $_REQUEST['previous_id'];
 }
-if( $install_type != "module" ){
-    if( !isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "") ){
-        $zip_from_dir     = ".";
+if ($install_type != "module") {
+    if (!isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "")) {
+        $zip_from_dir = ".";
     }
-    else{
+    else {
         $zip_from_dir   = $_REQUEST['zip_from_dir'];
     }
-    if( !isset($_REQUEST['zip_to_dir']) || ($_REQUEST['zip_to_dir'] == "") ){
+    if (!isset($_REQUEST['zip_to_dir']) || ($_REQUEST['zip_to_dir'] == "")) {
         $zip_to_dir     = ".";
     }
-    else{
+    else {
         $zip_to_dir     = $_REQUEST['zip_to_dir'];
     }
 }
 $remove_tables = 'true';
-if(isset($_REQUEST['remove_tables'])){
+if (isset($_REQUEST['remove_tables'])) {
 	$remove_tables = $_REQUEST['remove_tables'];
 }
 $overwrite_files = true;
-if(isset($_REQUEST['radio_overwrite'])){
+if (isset($_REQUEST['radio_overwrite'])) {
  $overwrite_files = (($_REQUEST['radio_overwrite'] == 'do_not_overwrite') ? false : true);
 }
 
@@ -183,7 +183,7 @@ 
 $name = '';
 $description = '';
 
-if($install_type == 'module'){
+if ($install_type == 'module') {
     $is_uninstallable = $_REQUEST['is_uninstallable'];
     $name = $_REQUEST['name'];
     $description = $_REQUEST['description'];
@@ -195,7 +195,7 @@ 
 
 $rest_dir = remove_file_extension($install_file)."-restore";
 
-$files_to_handle  = array();
+$files_to_handle = array();
 register_shutdown_function("rmdir_recursive", $unzip_dir);
 
 if (((defined('MODULE_INSTALLER_PACKAGE_SCAN') && MODULE_INSTALLER_PACKAGE_SCAN)
@@ -203,7 +203,7 @@ 
 	require_once('ModuleInstall/ModuleScanner.php');
 	$ms = new ModuleScanner();
 	$ms->scanPackage($unzip_dir);
-	if($ms->hasIssues()){
+	if ($ms->hasIssues()) {
 		$ms->displayIssues();
 		sugar_cleanup(true);
 	}
@@ -212,13 +212,13 @@ 
 //
 // execute the PRE scripts
 //
-if($install_type == 'patch' || $install_type == 'module')
+if ($install_type == 'patch' || $install_type == 'module')
 {
-	switch($mode)
+	switch ($mode)
  	{
  		case 'Install':
- 			$file = "$unzip_dir/" . constant('SUGARCRM_PRE_INSTALL_FILE');
-			if(is_file($file))
+ 			$file = "$unzip_dir/".constant('SUGARCRM_PRE_INSTALL_FILE');
+			if (is_file($file))
 			{
 				print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
 				include($file);
@@ -226,8 +226,8 @@ 
    		}
  			break;
  		case 'Uninstall':
- 			$file = "$unzip_dir/" . constant('SUGARCRM_PRE_UNINSTALL_FILE');
-			if(is_file($file))
+ 			$file = "$unzip_dir/".constant('SUGARCRM_PRE_UNINSTALL_FILE');
+			if (is_file($file))
 			{
 				print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
 				include($file);
@@ -243,84 +243,84 @@ 
 // perform the action
 //
 
-for( $iii = 0; $iii < $_REQUEST['copy_count']; $iii++ ){
-    if( isset($_REQUEST["copy_" . $iii]) && ($_REQUEST["copy_" . $iii] != "") ){
-        $file_to_copy = $_REQUEST["copy_" . $iii];
-        $src_file   = clean_path( "$unzip_dir/$zip_from_dir/$file_to_copy" );
+for ($iii = 0; $iii < $_REQUEST['copy_count']; $iii++) {
+    if (isset($_REQUEST["copy_".$iii]) && ($_REQUEST["copy_".$iii] != "")) {
+        $file_to_copy = $_REQUEST["copy_".$iii];
+        $src_file   = clean_path("$unzip_dir/$zip_from_dir/$file_to_copy");
 
         $sugar_home_dir = getCwd();
-        $dest_file  = clean_path( "$sugar_home_dir/$zip_to_dir/$file_to_copy" );
-        if($zip_to_dir != '.')
+        $dest_file  = clean_path("$sugar_home_dir/$zip_to_dir/$file_to_copy");
+        if ($zip_to_dir != '.')
         	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
         else
         	$rest_file  = clean_path("$rest_dir/$file_to_copy");
 
-        switch( $mode ){
+        switch ($mode) {
             case "Install":
-                mkdir_recursive( dirname( $dest_file ) );
+                mkdir_recursive(dirname($dest_file));
 
-                if($install_type=="patch" && is_file($dest_file))
+                if ($install_type == "patch" && is_file($dest_file))
                 {
-	                if(!is_dir(dirname( $rest_file )))
-                		mkdir_recursive( dirname( $rest_file ) );
+	                if (!is_dir(dirname($rest_file)))
+                		mkdir_recursive(dirname($rest_file));
 
-	                copy( $dest_file, $rest_file);
-	                sugar_touch( $rest_file, filemtime($dest_file) );
+	                copy($dest_file, $rest_file);
+	                sugar_touch($rest_file, filemtime($dest_file));
                 }
 
-                if( !copy( $src_file, $dest_file ) ){
-                    die( $mod_strings['ERR_UW_COPY_FAILED'].$src_file.$mod_strings['LBL_TO'].$dest_file);
+                if (!copy($src_file, $dest_file)) {
+                    die($mod_strings['ERR_UW_COPY_FAILED'].$src_file.$mod_strings['LBL_TO'].$dest_file);
                 }
                 $uh_status = "installed";
                 break;
             case "Uninstall":
-                if($install_type=="patch" && is_file($rest_file))
+                if ($install_type == "patch" && is_file($rest_file))
                 {
-	                copy( $rest_file, $dest_file);
-	                sugar_touch( $dest_file, filemtime($rest_file) );
+	                copy($rest_file, $dest_file);
+	                sugar_touch($dest_file, filemtime($rest_file));
                 }
-                elseif(file_exists($dest_file) && !unlink($dest_file))
+                elseif (file_exists($dest_file) && !unlink($dest_file))
                 {
                     die($mod_strings['ERR_UW_REMOVE_FAILED'].$dest_file);
                 }
                 $uh_status = "uninstalled";
                 break;
             default:
-                die("{$mod_strings['LBL_UW_OP_MODE']} '$mode' {$mod_strings['ERR_UW_NOT_RECOGNIZED']}." );
+                die("{$mod_strings['LBL_UW_OP_MODE']} '$mode' {$mod_strings['ERR_UW_NOT_RECOGNIZED']}.");
         }
-        $files_to_handle[] = clean_path( "$zip_to_dir/$file_to_copy" );
+        $files_to_handle[] = clean_path("$zip_to_dir/$file_to_copy");
     }
 }
 
-switch( $install_type ){
+switch ($install_type) {
     case "langpack":
-        if( !isset($_REQUEST['new_lang_name']) || ($_REQUEST['new_lang_name'] == "") ){
+        if (!isset($_REQUEST['new_lang_name']) || ($_REQUEST['new_lang_name'] == "")) {
             die($mod_strings['ERR_UW_NO_LANG']);
         }
-        if( !isset($_REQUEST['new_lang_desc']) || ($_REQUEST['new_lang_desc'] == "") ){
+        if (!isset($_REQUEST['new_lang_desc']) || ($_REQUEST['new_lang_desc'] == "")) {
             die($mod_strings['ERR_UW_NO_LANG_DESC']);
         }
 
-        if( $mode == "Install" || $mode=="Enable" ){
-            $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
+        if ($mode == "Install" || $mode == "Enable") {
+            $sugar_config['languages'] = $sugar_config['languages'] + array($_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc']);
         }
-        else if( $mode == "Uninstall" || $mode=="Disable" ){
+        else if ($mode == "Uninstall" || $mode == "Disable") {
             $new_langs = array();
             $old_langs = $sugar_config['languages'];
-            foreach( $old_langs as $key => $value ){
-                if( $key != $_REQUEST['new_lang_name'] ){
-                    $new_langs += array( $key => $value );
+            foreach ($old_langs as $key => $value) {
+                if ($key != $_REQUEST['new_lang_name']) {
+                    $new_langs += array($key => $value);
                 }
             }
 			$sugar_config['languages'] = $new_langs;
 
 	        $default_sugar_instance_lang = 'en_us';
-	        if($current_language == $_REQUEST['new_lang_name']){
-	        	$_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
+	        if ($current_language == $_REQUEST['new_lang_name']) {
+	        	$_SESSION['authenticated_user_language'] = $default_sugar_instance_lang;
 	        	$lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
 	        }
 
-	        if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
+	        if ($sugar_config['default_language'] == $_REQUEST['new_lang_name']) {
 	        	$cfg = new Configurator();
              	$cfg->config['languages'] = $new_langs;
 				$cfg->config['default_language'] = $default_sugar_instance_lang;
@@ -328,25 +328,25 @@ 
 	        	$lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
 	        }
         }
-        ksort( $sugar_config );
-        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+        ksort($sugar_config);
+        if (!write_array_to_file("sugar_config", $sugar_config, "config.php")) {
             die($mod_strings['ERR_UW_CONFIG_FAILED']);
         }
         break;
     case "module":
-        require_once( "ModuleInstall/ModuleInstaller.php" );
+        require_once("ModuleInstall/ModuleInstaller.php");
         $mi = new ModuleInstaller();
-        switch( $mode ){
+        switch ($mode) {
             case "Install":
             //here we can determine if this is an upgrade or a new version
-            	if(!empty($previous_version)){
-            		$mi->install( "$unzip_dir", true, $previous_version);
-            	}else{
-                	$mi->install( "$unzip_dir" );
+            	if (!empty($previous_version)) {
+            		$mi->install("$unzip_dir", true, $previous_version);
+            	} else {
+                	$mi->install("$unzip_dir");
             	}
 
-				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-				if(is_file($file))
+				$file = "$unzip_dir/".constant('SUGARCRM_POST_INSTALL_FILE');
+				if (is_file($file))
 				{
 					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
 					include($file);
@@ -354,25 +354,25 @@ 
 				}
             	break;
             case "Uninstall":
-                if($remove_tables == 'false')
+                if ($remove_tables == 'false')
                 	$GLOBALS['mi_remove_tables'] = false;
                 else
                 	$GLOBALS['mi_remove_tables'] = true;
-                $mi->uninstall( "$unzip_dir" );
+                $mi->uninstall("$unzip_dir");
                 break;
              case "Disable":
-                if(!$overwrite_files)
+                if (!$overwrite_files)
                 	$GLOBALS['mi_overwrite_files'] = false;
                 else
                 	$GLOBALS['mi_overwrite_files'] = true;
-                $mi->disable( "$unzip_dir" );
+                $mi->disable("$unzip_dir");
                 break;
              case "Enable":
-                if(!$overwrite_files)
+                if (!$overwrite_files)
                 	$GLOBALS['mi_overwrite_files'] = false;
                 else
                 	$GLOBALS['mi_overwrite_files'] = true;
-                $mi->enable( "$unzip_dir" );
+                $mi->enable("$unzip_dir");
                 break;
             default:
                 break;
@@ -382,11 +382,11 @@ 
     case "full":
         // purposely flow into "case: patch"
     case "patch":
- 		switch($mode)
+ 		switch ($mode)
  		{
  			case 'Install':
- 				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
-				if(is_file($file))
+ 				$file = "$unzip_dir/".constant('SUGARCRM_POST_INSTALL_FILE');
+				if (is_file($file))
 				{
 					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
 					include($file);
@@ -396,14 +396,14 @@ 
 				UWrebuild();
  				break;
  			case 'Uninstall':
- 				$file = "$unzip_dir/" . constant('SUGARCRM_POST_UNINSTALL_FILE');
- 				if(is_file($file)) {
+ 				$file = "$unzip_dir/".constant('SUGARCRM_POST_UNINSTALL_FILE');
+ 				if (is_file($file)) {
 					print("{$mod_strings['LBL_UW_INCLUDING']}: $file <br>\n");
 					include($file);
 					post_uninstall();
 				}
 
-				if(is_dir($rest_dir))
+				if (is_dir($rest_dir))
 				{
 					rmdir_recursive($rest_dir);
 				}
@@ -414,11 +414,11 @@ 
  				break;
  		}
 
-		require( "sugar_version.php" );
+		require("sugar_version.php");
 		$sugar_config['sugar_version'] = $sugar_version;
-		ksort( $sugar_config );
+		ksort($sugar_config);
 
-		if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) )
+		if (!write_array_to_file("sugar_config", $sugar_config, "config.php"))
 		{
 			die($mod_strings['ERR_UW_UPDATE_CONFIG']);
 		}
@@ -427,7 +427,7 @@ 
         break;
 }
 
-switch( $mode ){
+switch ($mode) {
     case "Install":
         $file_action = "copied";
         // if error was encountered, script should have died before now
@@ -435,23 +435,23 @@ 
         //determine if this module has already been installed given the unique_key to
         //identify the module
        // $new_upgrade->checkForExisting($unique_key);
-       	if(!empty($previous_id)){
+       	if (!empty($previous_id)) {
        		$new_upgrade->id = $previous_id;
        		$uh = new UpgradeHistory();
        		$uh->retrieve($previous_id);
-       		if(is_file($uh->filename)) {
+       		if (is_file($uh->filename)) {
        		unlink($uh->filename);
        		}
        	}
         $new_upgrade->filename      = $install_file;
-        $new_upgrade->md5sum        = md5_file( $install_file );
+        $new_upgrade->md5sum        = md5_file($install_file);
         $new_upgrade->type          = $install_type;
         $new_upgrade->version       = $version;
         $new_upgrade->status        = "installed";
         $new_upgrade->name          = $name;
         $new_upgrade->description   = $description;
-        $new_upgrade->id_name		= $id_name;
-        $new_upgrade->manifest		= $s_manifest;
+        $new_upgrade->id_name = $id_name;
+        $new_upgrade->manifest = $s_manifest;
         $new_upgrade->save();
 
         //Check if we need to show a page for the user to finalize their install with.
@@ -465,15 +465,15 @@ 
         			$url_conf = array('url' => $url_conf);
         		if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
         		{
-        			echo '<script type="text/javascript">window.open("' . $url_conf['url']
-        			   . '","' . (empty($url_conf['name']) ? 'sugar_popup' : $url_conf['name']) . '","'
-        			   . 'height=' . (empty($url_conf['height']) ? '500' : $url_conf['height']) . ','
-        			   . 'width=' . (empty($url_conf['width']) ? '800' : $url_conf['width']) . '");</script>';
+        			echo '<script type="text/javascript">window.open("'.$url_conf['url']
+        			   . '","'.(empty($url_conf['name']) ? 'sugar_popup' : $url_conf['name']).'","'
+        			   . 'height='.(empty($url_conf['height']) ? '500' : $url_conf['height']).','
+        			   . 'width='.(empty($url_conf['width']) ? '800' : $url_conf['width']).'");</script>';
         		} else
         		{
-        			echo '<iframe src="' . $url_conf['url'] . '" '
-        			   . 'width="' . (empty($url_conf['width']) ? '100%' : $url_conf['width']) . '" '
-        			   . 'height="' . (empty($url_conf['height']) ? '500px' : $url_conf['height']) . '"></iframe>';
+        			echo '<iframe src="'.$url_conf['url'].'" '
+        			   . 'width="'.(empty($url_conf['width']) ? '100%' : $url_conf['width']).'" '
+        			   . 'height="'.(empty($url_conf['height']) ? '500px' : $url_conf['height']).'"></iframe>';
         		}
         	}
         }
@@ -481,24 +481,24 @@ 
     case "Uninstall":
         $file_action = "removed";
         $uh = new UpgradeHistory();
-        $the_md5 = md5_file( $install_file );
-        $md5_matches = $uh->findByMd5( $the_md5 );
-        if( sizeof( $md5_matches ) == 0 ){
-            die( "{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file." );
+        $the_md5 = md5_file($install_file);
+        $md5_matches = $uh->findByMd5($the_md5);
+        if (sizeof($md5_matches) == 0) {
+            die("{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file.");
         }
-        foreach( $md5_matches as $md5_match ){
+        foreach ($md5_matches as $md5_match) {
             $md5_match->delete();
         }
         break;
     case "Disable":
         $file_action = "disabled";
         $uh = new UpgradeHistory();
-        $the_md5 = md5_file( $install_file );
-        $md5_matches = $uh->findByMd5( $the_md5 );
-        if( sizeof( $md5_matches ) == 0 ){
-            die( "{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file." );
+        $the_md5 = md5_file($install_file);
+        $md5_matches = $uh->findByMd5($the_md5);
+        if (sizeof($md5_matches) == 0) {
+            die("{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file.");
         }
-        foreach( $md5_matches as $md5_match ){
+        foreach ($md5_matches as $md5_match) {
              $md5_match->enabled = 0;
             $md5_match->save();
         }
@@ -506,12 +506,12 @@ 
     case "Enable":
         $file_action = "enabled";
         $uh = new UpgradeHistory();
-        $the_md5 = md5_file( $install_file );
-        $md5_matches = $uh->findByMd5( $the_md5 );
-        if( sizeof( $md5_matches ) == 0 ){
-            die( "{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file." );
+        $the_md5 = md5_file($install_file);
+        $md5_matches = $uh->findByMd5($the_md5);
+        if (sizeof($md5_matches) == 0) {
+            die("{$mod_strings['ERR_UW_NO_UPDATE_RECORD']} $install_file.");
         }
-        foreach( $md5_matches as $md5_match ){
+        foreach ($md5_matches as $md5_match) {
             $md5_match->enabled = 1;
             $md5_match->save();
         }
@@ -520,41 +520,41 @@ 
 
 // present list to user
 ?>
-<form action="<?php print( $form_action ); ?>" method="post">
+<form action="<?php print($form_action); ?>" method="post">
 
 
 <?php
 echo "<div>";
-print( getUITextForType($install_type) . " ". getUITextForMode($mode) . " ". $mod_strings['LBL_UW_SUCCESSFULLY']);
+print(getUITextForType($install_type)." ".getUITextForMode($mode)." ".$mod_strings['LBL_UW_SUCCESSFULLY']);
 echo "<br>";
 echo "<br>";
-print( "<input type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_MOD_LOADER']}\" /><br>" );
+print("<input type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_MOD_LOADER']}\" /><br>");
 echo "</div>";
 echo "<br>";
-if(isset($lang_changed_string))
+if (isset($lang_changed_string))
 	print($lang_changed_string);
-if ($install_type != "module" && $install_type != "langpack"){
-    if( sizeof( $files_to_handle ) > 0 ){
-        echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" 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>';
-        print( "{$mod_strings['LBL_UW_FOLLOWING_FILES']} $file_action:<br>\n" );
-        print( "<ul id=\"subMenu\">\n" );
-        foreach( $files_to_handle as $file_to_copy ){
-            print( "<li>$file_to_copy<br>\n" );
+if ($install_type != "module" && $install_type != "langpack") {
+    if (sizeof($files_to_handle) > 0) {
+        echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" 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>';
+        print("{$mod_strings['LBL_UW_FOLLOWING_FILES']} $file_action:<br>\n");
+        print("<ul id=\"subMenu\">\n");
+        foreach ($files_to_handle as $file_to_copy) {
+            print("<li>$file_to_copy<br>\n");
         }
-        print( "</ul>\n" );
+        print("</ul>\n");
         echo '</div>';
     }
-    else if( $mode != 'Disable' && $mode !='Enable' ){
-        print( "{$mod_strings['LBL_UW_NO_FILES_SELECTED']} $file_action.<br>\n" );
+    else if ($mode != 'Disable' && $mode != 'Enable') {
+        print("{$mod_strings['LBL_UW_NO_FILES_SELECTED']} $file_action.<br>\n");
     }
 
         print($mod_strings['LBL_UW_UPGRADE_SUCCESSFUL']);
-        print( "<input class='button' type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_UW']}\" />\n" );
+        print("<input class='button' type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_UW']}\" />\n");
 }
 ?>
 </form>
 
 <?php
-    $GLOBALS['log']->info( "Upgrade Wizard patches" );
+    $GLOBALS['log']->info("Upgrade Wizard patches");
 ?>

Braces +37 added lines, -33 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.
@@ -157,14 +159,12 @@ 
 if( $install_type != "module" ){
     if( !isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "") ){
         $zip_from_dir     = ".";
-    }
-    else{
+    } else{
         $zip_from_dir   = $_REQUEST['zip_from_dir'];
     }
     if( !isset($_REQUEST['zip_to_dir']) || ($_REQUEST['zip_to_dir'] == "") ){
         $zip_to_dir     = ".";
-    }
-    else{
+    } else{
         $zip_to_dir     = $_REQUEST['zip_to_dir'];
     }
 }
@@ -250,10 +250,11 @@ 
 
         $sugar_home_dir = getCwd();
         $dest_file  = clean_path( "$sugar_home_dir/$zip_to_dir/$file_to_copy" );
-        if($zip_to_dir != '.')
-        	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
-        else
-        	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+        if($zip_to_dir != '.') {
+                	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
+        } else {
+                	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+        }
 
         switch( $mode ){
             case "Install":
@@ -261,8 +262,9 @@ 
 
                 if($install_type=="patch" && is_file($dest_file))
                 {
-	                if(!is_dir(dirname( $rest_file )))
-                		mkdir_recursive( dirname( $rest_file ) );
+	                if(!is_dir(dirname( $rest_file ))) {
+	                                		mkdir_recursive( dirname( $rest_file ) );
+	                }
 
 	                copy( $dest_file, $rest_file);
 	                sugar_touch( $rest_file, filemtime($dest_file) );
@@ -278,8 +280,7 @@ 
                 {
 	                copy( $rest_file, $dest_file);
 	                sugar_touch( $dest_file, filemtime($rest_file) );
-                }
-                elseif(file_exists($dest_file) && !unlink($dest_file))
+                } elseif(file_exists($dest_file) && !unlink($dest_file))
                 {
                     die($mod_strings['ERR_UW_REMOVE_FAILED'].$dest_file);
                 }
@@ -303,8 +304,7 @@ 
 
         if( $mode == "Install" || $mode=="Enable" ){
             $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
-        }
-        else if( $mode == "Uninstall" || $mode=="Disable" ){
+        } else if( $mode == "Uninstall" || $mode=="Disable" ){
             $new_langs = array();
             $old_langs = $sugar_config['languages'];
             foreach( $old_langs as $key => $value ){
@@ -341,7 +341,7 @@ 
             //here we can determine if this is an upgrade or a new version
             	if(!empty($previous_version)){
             		$mi->install( "$unzip_dir", true, $previous_version);
-            	}else{
+            	} else{
                 	$mi->install( "$unzip_dir" );
             	}
 
@@ -354,24 +354,27 @@ 
 				}
             	break;
             case "Uninstall":
-                if($remove_tables == 'false')
-                	$GLOBALS['mi_remove_tables'] = false;
-                else
-                	$GLOBALS['mi_remove_tables'] = true;
+                if($remove_tables == 'false') {
+                                	$GLOBALS['mi_remove_tables'] = false;
+                } else {
+                                	$GLOBALS['mi_remove_tables'] = true;
+                }
                 $mi->uninstall( "$unzip_dir" );
                 break;
              case "Disable":
-                if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
-                else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                if(!$overwrite_files) {
+                                	$GLOBALS['mi_overwrite_files'] = false;
+                } else {
+                                	$GLOBALS['mi_overwrite_files'] = true;
+                }
                 $mi->disable( "$unzip_dir" );
                 break;
              case "Enable":
-                if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
-                else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                if(!$overwrite_files) {
+                                	$GLOBALS['mi_overwrite_files'] = false;
+                } else {
+                                	$GLOBALS['mi_overwrite_files'] = true;
+                }
                 $mi->enable( "$unzip_dir" );
                 break;
             default:
@@ -461,8 +464,9 @@ 
         	if (!empty($manifest['post_install_url']))
         	{
         		$url_conf = $manifest['post_install_url'];
-        		if (is_string($url_conf))
-        			$url_conf = array('url' => $url_conf);
+        		if (is_string($url_conf)) {
+        		        			$url_conf = array('url' => $url_conf);
+        		}
         		if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
         		{
         			echo '<script type="text/javascript">window.open("' . $url_conf['url']
@@ -531,8 +535,9 @@ 
 print( "<input type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_MOD_LOADER']}\" /><br>" );
 echo "</div>";
 echo "<br>";
-if(isset($lang_changed_string))
+if(isset($lang_changed_string)) {
 	print($lang_changed_string);
+}
 if ($install_type != "module" && $install_type != "langpack"){
     if( sizeof( $files_to_handle ) > 0 ){
         echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" 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\'>
@@ -544,8 +549,7 @@ 
         }
         print( "</ul>\n" );
         echo '</div>';
-    }
-    else if( $mode != 'Disable' && $mode !='Enable' ){
+    } else if( $mode != 'Disable' && $mode !='Enable' ){
         print( "{$mod_strings['LBL_UW_NO_FILES_SELECTED']} $file_action.<br>\n" );
     }
 

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){

Switch Indentation +79 added lines, -79 removed lines

@@ -164,58 +164,58 @@ 
 	}//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 );
 }
 
 
@@ -317,33 +317,33 @@ 
 }
 
 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;
 }
 
 

Spacing +121 added lines, -121 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.
@@ -48,18 +48,18 @@ 
 unset($_SESSION['rebuild_relationships']);
 unset($_SESSION['rebuild_extensions']);
 // process commands
-if(empty($_REQUEST['install_file'])){
-    die( "File to install not specified." );
+if (empty($_REQUEST['install_file'])) {
+    die("File to install not specified.");
 }
-if( !isset($_REQUEST['mode']) || ($_REQUEST['mode'] == "") ){
-    die( "No mode specified." );
+if (!isset($_REQUEST['mode']) || ($_REQUEST['mode'] == "")) {
+    die("No mode specified.");
 }
 
-if(!file_exists($base_tmp_upgrade_dir)) {
+if (!file_exists($base_tmp_upgrade_dir)) {
     mkdir($base_tmp_upgrade_dir, 0755, true);
 }
 
-$unzip_dir      = mk_temp_dir( $base_tmp_upgrade_dir );
+$unzip_dir      = mk_temp_dir($base_tmp_upgrade_dir);
 $install_file   = hashToFile($_REQUEST['install_file']);
 $hidden_fields = "";
 $new_lang_name = "";
@@ -69,7 +69,7 @@ 
 $hidden_fields .= "<input type=hidden name=\"mode\" value=\"$mode\"/>";
 
 
-$install_type   = getInstallType( $install_file );
+$install_type   = getInstallType($install_file);
 
 $version        = "";
 $previous_version = "";
@@ -90,9 +90,9 @@ 
 $dependencies = array();
 $remove_tables = 'true';
 
-unzip( $install_file, $unzip_dir );
-if($install_type == 'module' && $mode != 'Uninstall'){
-   if(file_exists($license_file)){
+unzip($install_file, $unzip_dir);
+if ($install_type == 'module' && $mode != 'Uninstall') {
+   if (file_exists($license_file)) {
         $require_license = true;
    }
 }
@@ -103,7 +103,7 @@ 
 	require_once('ModuleInstall/ModuleScanner.php');
 	$ms = new ModuleScanner();
 	$ms->scanPackage($unzip_dir);
-	if($ms->hasIssues()){
+	if ($ms->hasIssues()) {
 	    rmdir_recursive($unzip_dir);
 		$ms->displayIssues();
 		sugar_cleanup(true);
@@ -111,96 +111,96 @@ 
 }
 
 // assumption -- already validated manifest.php at time of upload
-require( "$unzip_dir/manifest.php" );
+require("$unzip_dir/manifest.php");
 
 
 
-if( isset( $manifest['copy_files']['from_dir'] ) && $manifest['copy_files']['from_dir'] != "" ){
+if (isset($manifest['copy_files']['from_dir']) && $manifest['copy_files']['from_dir'] != "") {
     $zip_from_dir   = $manifest['copy_files']['from_dir'];
 }
-if( isset( $manifest['copy_files']['to_dir'] ) && $manifest['copy_files']['to_dir'] != "" ){
+if (isset($manifest['copy_files']['to_dir']) && $manifest['copy_files']['to_dir'] != "") {
     $zip_to_dir     = $manifest['copy_files']['to_dir'];
 }
-if( isset( $manifest['copy_files']['force_copy'] ) && $manifest['copy_files']['force_copy'] != "" ){
-    $zip_force_copy     = $manifest['copy_files']['force_copy'];
+if (isset($manifest['copy_files']['force_copy']) && $manifest['copy_files']['force_copy'] != "") {
+    $zip_force_copy = $manifest['copy_files']['force_copy'];
 }
-if( isset( $manifest['version'] ) ){
-    $version    = $manifest['version'];
+if (isset($manifest['version'])) {
+    $version = $manifest['version'];
 }
-if( isset( $manifest['author'] ) ){
-    $author    = $manifest['author'];
+if (isset($manifest['author'])) {
+    $author = $manifest['author'];
 }
-if( isset( $manifest['name'] ) ){
-    $name    = $manifest['name'];
+if (isset($manifest['name'])) {
+    $name = $manifest['name'];
 }
-if( isset( $manifest['description'] ) ){
-    $description    = $manifest['description'];
+if (isset($manifest['description'])) {
+    $description = $manifest['description'];
 }
-if( isset( $manifest['is_uninstallable'] ) ){
-    $is_uninstallable    = $manifest['is_uninstallable'];
+if (isset($manifest['is_uninstallable'])) {
+    $is_uninstallable = $manifest['is_uninstallable'];
 }
-if(isset($installdefs) && isset( $installdefs['id'] ) ){
-    $id_name    = $installdefs['id'];
+if (isset($installdefs) && isset($installdefs['id'])) {
+    $id_name = $installdefs['id'];
 }
-if( isset( $manifest['dependencies']) ){
-    $dependencies    = $manifest['dependencies'];
+if (isset($manifest['dependencies'])) {
+    $dependencies = $manifest['dependencies'];
 }
-if( isset( $manifest['remove_tables']) ){
+if (isset($manifest['remove_tables'])) {
     $remove_tables = $manifest['remove_tables'];
 }
 
-if($remove_tables != 'prompt'){
+if ($remove_tables != 'prompt') {
 	$hidden_fields .= "<input type=hidden name=\"remove_tables\" value='".$remove_tables."'>";
 }
-if(file_exists($readme_file) || !empty($manifest['readme'])){
+if (file_exists($readme_file) || !empty($manifest['readme'])) {
         $found_readme = true;
    }
 $uh = new UpgradeHistory();
 //check dependencies first
-if(!empty($dependencies)){
+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)."]");
+	if (!empty($not_found) && count($not_found) > 0) {
+			die($mod_strings['ERR_UW_NO_DEPENDENCY']."[".implode(',', $not_found)."]");
 	}//fi
 }
-switch( $install_type ){
+switch ($install_type) {
 	case "full":
 	case "patch":
-		if( !is_writable( "config.php" ) ){
-			die( $mod_strings['ERR_UW_CONFIG'] );
+		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 == ".." ){
+		$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) ){
+			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 );
+		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." );
+		$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'] );
+		if (!is_writable("config.php")) {
+			die($mod_strings['ERR_UW_CONFIG']);
 		}
 		break;
 	case "module":
 		$previous_install = array();
-		if(!empty($id_name) & !empty($version))
+		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'];
@@ -215,11 +215,11 @@ 
 		$hidden_fields .= "<input type=hidden name=\"previous_id\" value=\"$previous_id\"/>";
 		break;
 	default:
-		die( $mod_strings['ERR_UW_WRONG_TYPE'].$install_type );
+		die($mod_strings['ERR_UW_WRONG_TYPE'].$install_type);
 }
 
 
-$new_files      = findAllFilesRelative( "$unzip_dir/$zip_from_dir", array() );
+$new_files      = findAllFilesRelative("$unzip_dir/$zip_from_dir", array());
 $hidden_fields .= "<input type=hidden name=\"version\" value=\"$version\"/>";
 $serial_manifest = array();
 $serial_manifest['manifest'] = (isset($manifest) ? $manifest : '');
@@ -228,38 +228,38 @@ 
 $hidden_fields .= "<input type=hidden name=\"s_manifest\" value='".base64_encode(serialize($serial_manifest))."'>";
 // present list to user
 ?>
-<form action="<?php print( $form_action . "_commit" ); ?>" name="files" method="post"  onSubmit="return validateForm(<?php print($require_license); ?>);">
+<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')
+if (empty($new_studio_mod_files)) {
+	if (!empty($mode) && $mode == 'Uninstall')
 	echo $mod_strings['LBL_UW_UNINSTALL_READY'];
-	else if($mode == 'Disable')
+	else if ($mode == 'Disable')
 	echo $mod_strings['LBL_UW_DISABLE_READY'];
-	else if($mode == 'Enable')
+	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>");
+	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){
+if ($require_license) {
     $contents = sugar_file_get_contents($license_file);
 	$readme_contents = '';
-	if($found_readme){
-		if(file_exists($readme_file) && filesize($readme_file) > 0){
+	if ($found_readme) {
+		if (file_exists($readme_file) && filesize($readme_file) > 0) {
 			$readme_contents = file_get_contents($readme_file);
-		}elseif(!empty($manifest['readme'])){
+		}elseif (!empty($manifest['readme'])) {
 			$readme_contents = $manifest['readme'];
 		}
 	}
-	$license_final =<<<eoq2
+	$license_final = <<<eoq2
 	<table width='100%'>
 	<tr>
 	<td colspan="3"><ul class="tablist">
@@ -316,31 +316,31 @@ 
 	echo "<br>";
 }
 
-switch( $mode ){
+switch ($mode) {
 	case "Install":
-		if( $install_type == "langpack") {
-			print( $mod_strings['LBL_UW_LANGPACK_READY'] );
+		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'] );
+		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'] );
+		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'] );
+		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'] );
+		if ($install_type == "langpack") {
+			print($mod_strings['LBL_UW_LANGPACK_READY_ENABLE']);
 			echo '<br><br>';
 		}
 		break;
@@ -348,28 +348,28 @@ 
 
 
 ?>
-<input type=submit value="<?php echo $mod_strings['LBL_ML_COMMIT'];?>" class="button" id="submit_button" />
-<input type=button value="<?php echo $mod_strings['LBL_ML_CANCEL'];?>" class="button" onClick="location.href='index.php?module=Administration&action=UpgradeWizard&view=module';"/>
+<input type=submit value="<?php echo $mod_strings['LBL_ML_COMMIT']; ?>" class="button" id="submit_button" />
+<input type=button value="<?php echo $mod_strings['LBL_ML_CANCEL']; ?>" class="button" onClick="location.href='index.php?module=Administration&action=UpgradeWizard&view=module';"/>
 
 <?php
 
-if($remove_tables == 'prompt' && $mode == 'Uninstall'){
+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_false' name='remove_tables' value='false'>".$mod_strings['ML_LBL_DO_NOT_REMOVE_TABLES']."<br>");
 }
 $count = 0;
 
-if( $show_files == true ){
+if ($show_files == true) {
 	$count = 0;
 
 	$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))
+	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);
@@ -392,65 +392,65 @@ 
 
 	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">
+    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>';
-    echo '<input type="checkbox" checked onclick="toggle_these(' . count($new_studio_mod_files) . ',' . count($new_files) . ', this)"> '.$mod_strings['LBL_UW_CHECK_ALL'];
+    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 ){
+	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;
+		$new_file   = clean_path("$zip_to_dir/$the_file");
+		$forced_copy = false;
 
-		if( $mode == "Install" ){
+		if ($mode == "Install") {
 			$checked = "checked";
-			foreach( $zip_force_copy as $pattern ){
-				if( preg_match("#" . $pattern . "#", $unzip_file) ){
+			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 )) ){
+			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" );
+			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("<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" );
+			print("<br>\n");
 		}
-		else if( $mode == "Uninstall" && file_exists( $new_file ) ){
-			if( md5_file( $unzip_file ) == md5_file( $new_file ) ){
+		else if ($mode == "Uninstall" && file_exists($new_file)) {
+			if (md5_file($unzip_file) == md5_file($new_file)) {
 				$checked = "checked=\"true\"";
 			}
-			else{
+			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" );
+			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" );
+        print("</ul>\n");
 }
 //    echo '</div>';
-if($mode == "Disable" || $mode == "Enable"){
+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){
+	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>' .
+		echo '<script>'.
                 'function handleFileChange(){';
-		if(count($modified_files) > 0){
+		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){
@@ -458,7 +458,7 @@ 
                 			}
             			}
         				return true;';
-		}else{
+		} else {
 			echo 'return true;';
 		}
 		echo '}</script>';
@@ -468,23 +468,23 @@ 
 		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){
+		foreach ($modified_files as $modified_file) {
 			print('<li>'.$modified_file.'</li>');
 		}
 		print('</ul>');
-	}else{
-		echo '<script>' .
+	} else {
+		echo '<script>'.
 	        'function handleFileChange(){';
 		echo 'return true;';
 		echo '}</script>';
 	}
-}else{
-	echo '<script>' .
+} else {
+	echo '<script>'.
         'function handleFileChange(){';
 	echo 'return true;';
 	echo '}</script>';
 }
-echo '<script>' .
+echo '<script>'.
          		'function validateForm(process){'.
          			'return (handleCommit(process) && handleFileChange());'.
          		'}'.
@@ -527,10 +527,10 @@ 
             }
       </script>';
 
-    $fileHash = fileToHash($install_file );
+    $fileHash = fileToHash($install_file);
 ?>
-    <?php print( $hidden_fields ); ?>
-    <input type="hidden" name="copy_count" value="<?php print( $count );?>"/>
+    <?php print($hidden_fields); ?>
+    <input type="hidden" name="copy_count" value="<?php print($count); ?>"/>
     <input type="hidden" name="run" value="commit" />
     <input type="hidden" name="install_file"  value="<?php echo $fileHash; ?>" />
     <input type="hidden" name="unzip_dir"     value="<?php echo basename($unzip_dir); ?>" />
@@ -539,5 +539,5 @@ 
 </form>
 
 <?php
-    $GLOBALS['log']->info( "Upgrade Wizard patches" );
+    $GLOBALS['log']->info("Upgrade Wizard patches");
 ?>

Braces +29 added lines, -28 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.
@@ -178,8 +180,7 @@ 
 		while( $f = $d->read() ){
 			if( $f == "." || $f == ".." ){
 				continue;
-			}
-			else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
+			} else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
 				$new_lang_name = $match[1];
 			}
 		}
@@ -200,8 +201,9 @@ 
 		break;
 	case "module":
 		$previous_install = array();
-		if(!empty($id_name) & !empty($version))
-		$previous_install = $uh->determineIfUpgrade($id_name, $version);
+		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;
@@ -231,15 +233,16 @@ 
 <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'];
-} else {
+	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) {
@@ -255,7 +258,7 @@ 
 	if($found_readme){
 		if(file_exists($readme_file) && filesize($readme_file) > 0){
 			$readme_contents = file_get_contents($readme_file);
-		}elseif(!empty($manifest['readme'])){
+		} elseif(!empty($manifest['readme'])){
 			$readme_contents = $manifest['readme'];
 		}
 	}
@@ -327,8 +330,7 @@ 
 		if( $install_type == "langpack" ){
 			print( $mod_strings['LBL_UW_LANGPACK_READY_UNISTALL'] );
 			echo '<br><br>';
-		}
-		else if($install_type != "module"){
+		} else if($install_type != "module"){
 			print( $mod_strings['LBL_UW_FILES_REMOVED'] );
 		}
 		break;
@@ -369,10 +371,11 @@ 
 	$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);
+		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>
@@ -427,12 +430,10 @@ 
 				print( " (no changes)" );
 			}
 			print( "<br>\n" );
-		}
-		else if( $mode == "Uninstall" && file_exists( $new_file ) ){
+		} else if( $mode == "Uninstall" && file_exists( $new_file ) ){
 			if( md5_file( $unzip_file ) == md5_file( $new_file ) ){
 				$checked = "checked=\"true\"";
-			}
-			else{
+			} else{
 				$highlight_start    = "<font color=red>";
 				$highlight_end      = "</font>";
 			}
@@ -458,7 +459,7 @@ 
                 			}
             			}
         				return true;';
-		}else{
+		} else{
 			echo 'return true;';
 		}
 		echo '}</script>';
@@ -472,13 +473,13 @@ 
 			print('<li>'.$modified_file.'</li>');
 		}
 		print('</ul>');
-	}else{
+	} else{
 		echo '<script>' .
 	        'function handleFileChange(){';
 		echo 'return true;';
 		echo '}</script>';
 	}
-}else{
+} else{
 	echo '<script>' .
         'function handleFileChange(){';
 	echo 'return true;';

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']);
 }
 ?>

Spacing +3 added lines, -3 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.
@@ -38,7 +38,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if(is_admin($current_user)){
+if (is_admin($current_user)) {
 
     global $mod_strings, $sugar_config;
     echo $mod_strings['LBL_REBUILD_JAVASCRIPT_LANG_DESC'];
@@ -49,7 +49,7 @@ 
     //remove language cache files
     LanguageManager::clearLanguageCache();
 }
-else{
+else {
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>

Braces +4 added lines, -3 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.
@@ -48,8 +50,7 @@ 
 
     //remove language cache files
     LanguageManager::clearLanguageCache();
-}
-else{
+} else{
 	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);
 }

Spacing +2 added lines, -2 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.
@@ -38,7 +38,7 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if(!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
 
 global $timedate;
 

Braces +6 added lines, -2 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.
@@ -38,7 +40,9 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-if(!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if(!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 
 global $timedate;
 

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

Spacing +7 added lines, -7 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,9 +43,9 @@ 
 $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0');
 $fields = array();
 $str = '';
-while($row = $db->fetchByAssoc($result)){
-	foreach($row as $name=>$value){
-		$str.= "$name:::$value\n";
+while ($row = $db->fetchByAssoc($result)) {
+	foreach ($row as $name=>$value) {
+		$str .= "$name:::$value\n";
 	}
 	$str .= "DONE\n";
 }
@@ -53,9 +53,9 @@ 
 
 header("Content-Disposition: attachment; filename=CustomFieldStruct.sugar");
 header("Content-Type: text/txt; 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("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($str));
 echo $str;
 ?>
\ 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.