adamjakab / SuiteCRM

modules/Administration/UpgradeWizard.php

Indentation +93 added lines, -93 removed lines

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

Spacing +51 added lines, -51 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.
@@ -55,14 +55,14 @@ 
 $base_tmp_upgrade_dir   = sugar_cached('upgrades/temp');
 
 // make sure dirs exist
-foreach( $GLOBALS['subdirs'] as $subdir ){
-    if(!file_exists("$base_upgrade_dir/$subdir")) {
+foreach ($GLOBALS['subdirs'] as $subdir) {
+    if (!file_exists("$base_upgrade_dir/$subdir")) {
         sugar_mkdir("$base_upgrade_dir/$subdir", 0770, true);
     }
 }
 
 // get labels and text that are specific to either Module Loader or Upgrade Wizard
-if( $view == "module") {
+if ($view == "module") {
 	$uploaddLabel = $mod_strings['LBL_UW_UPLOAD_MODULE'];
 	$descItemsQueued = $mod_strings['LBL_UW_DESC_MODULES_QUEUED'];
 	$descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
@@ -78,44 +78,44 @@ 
 // check that the upload limit is set to 6M or greater
 //
 
-define('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES', 6 * 1024 * 1024);  // 6 Megabytes
+define('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES', 6 * 1024 * 1024); // 6 Megabytes
 
 $upload_max_filesize = ini_get('upload_max_filesize');
 $upload_max_filesize_bytes = return_bytes($upload_max_filesize);
-if($upload_max_filesize_bytes < constant('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES'))
+if ($upload_max_filesize_bytes < constant('SUGARCRM_MIN_UPLOAD_MAX_FILESIZE_BYTES'))
 {
 	$GLOBALS['log']->debug("detected upload_max_filesize: $upload_max_filesize");
-	print('<p class="error">' . $mod_strings['MSG_INCREASE_UPLOAD_MAX_FILESIZE'] . ' '
-		. get_cfg_var('cfg_file_path') . "</p>\n");
+	print('<p class="error">'.$mod_strings['MSG_INCREASE_UPLOAD_MAX_FILESIZE'].' '
+		. get_cfg_var('cfg_file_path')."</p>\n");
 }
 
 //
 // process "run" commands
 //
 
-if( isset( $_REQUEST['run'] ) && ($_REQUEST['run'] != "") ){
+if (isset($_REQUEST['run']) && ($_REQUEST['run'] != "")) {
     $run = $_REQUEST['run'];
 
-    if( $run == "upload" ){
+    if ($run == "upload") {
         $perform = false;
-        if(isset($_REQUEST['release_id']) && $_REQUEST['release_id'] != ""){
+        if (isset($_REQUEST['release_id']) && $_REQUEST['release_id'] != "") {
             require_once('ModuleInstall/PackageManager.php');
             $pm = new PackageManager();
-            $tempFile = $pm->download('','',$_REQUEST['release_id']);
+            $tempFile = $pm->download('', '', $_REQUEST['release_id']);
             $perform = true;
             $base_filename = urldecode($tempFile);
-        } elseif(!empty($_REQUEST['load_module_from_dir'])) {
+        } elseif (!empty($_REQUEST['load_module_from_dir'])) {
         	//copy file to proper location then call performSetup
         	copy($_REQUEST['load_module_from_dir'].'/'.$_REQUEST['upgrade_zip_escaped'], "upload://".$_REQUEST['upgrade_zip_escaped']);
 
         	$perform = true;
-            $base_filename = urldecode( $_REQUEST['upgrade_zip_escaped'] );
+            $base_filename = urldecode($_REQUEST['upgrade_zip_escaped']);
         } else {
-            if( empty( $_FILES['upgrade_zip']['tmp_name'] ) ){
+            if (empty($_FILES['upgrade_zip']['tmp_name'])) {
                 echo $mod_strings['ERR_UW_NO_UPLOAD_FILE'];
-            } else{
+            } else {
                 $upload = new UploadFile('upgrade_zip');
-                if(!$upload->confirm_upload() ||
+                if (!$upload->confirm_upload() ||
                     strtolower(pathinfo($upload->get_stored_file_name(), PATHINFO_EXTENSION)) != 'zip' ||
                     !$upload->final_move($upload->get_stored_file_name())
                     ) {
@@ -124,41 +124,41 @@ 
             	} else {
     			     $tempFile = "upload://".$upload->get_stored_file_name();
                      $perform = true;
-                     $base_filename = urldecode( $_REQUEST['upgrade_zip_escaped'] );
+                     $base_filename = urldecode($_REQUEST['upgrade_zip_escaped']);
     		    }
             }
         }
-        if($perform) {
-            $manifest_file = extractManifest( $tempFile );
-			if(is_file($manifest_file))
+        if ($perform) {
+            $manifest_file = extractManifest($tempFile);
+			if (is_file($manifest_file))
 			{
     			//SCAN THE MANIFEST FILE TO MAKE SURE NO COPIES OR ANYTHING ARE HAPPENING IN IT
 	    		$ms = new ModuleScanner();
 	    		$ms->lockConfig();
 		    	$fileIssues = $ms->scanFile($manifest_file);
-    			if(!empty($fileIssues)){
-    				echo '<h2>' . $mod_strings['ML_MANIFEST_ISSUE'] . '</h2><br>';
+    			if (!empty($fileIssues)) {
+    				echo '<h2>'.$mod_strings['ML_MANIFEST_ISSUE'].'</h2><br>';
     				$ms->displayIssues();
     				die();
     			}
     			list($manifest, $installdefs) = MSLoadManifest($manifest_file);
-    			if($ms->checkConfig($manifest_file)) {
-    				echo '<h2>' . $mod_strings['ML_MANIFEST_ISSUE'] . '</h2><br>';
+    			if ($ms->checkConfig($manifest_file)) {
+    				echo '<h2>'.$mod_strings['ML_MANIFEST_ISSUE'].'</h2><br>';
     				$ms->displayIssues();
     				die();
     			}
-    			validate_manifest( $manifest );
+    			validate_manifest($manifest);
 
 			    $upgrade_zip_type = $manifest['type'];
 
     			// exclude the bad permutations
-    			if( $view == "module" )	{
+    			if ($view == "module") {
     				if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack") {
     					unlinkTempFiles();
     					 die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
     				}
-    			} elseif( $view == "default" ) {
-    				if($upgrade_zip_type != "patch" ) {
+    			} elseif ($view == "default") {
+    				if ($upgrade_zip_type != "patch") {
     					unlinkTempFiles();
     					die($mod_strings['ERR_UW_ONLY_PATCHES']);
     				}
@@ -166,19 +166,19 @@ 
 
     			$base_filename = pathinfo($tempFile, PATHINFO_BASENAME);
 
-    			mkdir_recursive( "$base_upgrade_dir/$upgrade_zip_type" );
+    			mkdir_recursive("$base_upgrade_dir/$upgrade_zip_type");
 	    		$target_path = "$base_upgrade_dir/$upgrade_zip_type/$base_filename";
-			    $target_manifest = remove_file_extension( $target_path ) . "-manifest.php";
+			    $target_manifest = remove_file_extension($target_path)."-manifest.php";
 
-    			if( isset($manifest['icon']) && $manifest['icon'] != "" ){
-	    			 $icon_location = extractFile( $tempFile ,$manifest['icon'] );
-    				 copy($icon_location, remove_file_extension( $target_path )."-icon.".pathinfo($icon_location, PATHINFO_EXTENSION));
+    			if (isset($manifest['icon']) && $manifest['icon'] != "") {
+	    			 $icon_location = extractFile($tempFile, $manifest['icon']);
+    				 copy($icon_location, remove_file_extension($target_path)."-icon.".pathinfo($icon_location, PATHINFO_EXTENSION));
 	    		}
 
-				if(rename( $tempFile , $target_path )) {
-					 copy( $manifest_file, $target_manifest );
+				if (rename($tempFile, $target_path)) {
+					 copy($manifest_file, $target_manifest);
 					$GLOBALS['ML_STATUS_MESSAGE'] = $base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'];
-                } else{
+                } else {
 					 $GLOBALS['ML_STATUS_MESSAGE'] = $mod_strings['ERR_UW_UPLOAD_ERROR'];
 				}
 			} else {
@@ -186,8 +186,8 @@ 
 				die($mod_strings['ERR_UW_NO_MANIFEST']);
 			}
         }
-    } else if( $run == $mod_strings['LBL_UW_BTN_DELETE_PACKAGE'] ){
-        if(!empty ($_REQUEST['install_file']) ){
+    } else if ($run == $mod_strings['LBL_UW_BTN_DELETE_PACKAGE']) {
+        if (!empty ($_REQUEST['install_file'])) {
             die($mod_strings['ERR_UW_NO_UPLOAD_FILE']);
         }
 
@@ -195,11 +195,11 @@ 
 
         $checkFile = strtolower($delete_me);
 
-        if(substr($delete_me, -4) != ".zip" || substr($delete_me, 0, 9) != "upload://" ||
+        if (substr($delete_me, -4) != ".zip" || substr($delete_me, 0, 9) != "upload://" ||
         strpos($checkFile, "..") !== false || !file_exists($checkFile)) {
             die("<span class='error'>File is not a zipped archive.</span>");
         }
-		if(unlink($delete_me)) { // successful deletion?
+		if (unlink($delete_me)) { // successful deletion?
 			echo "Package $delete_me has been removed.<br>";
 		} else {
 			die("Problem removing package $delete_me.");
@@ -207,22 +207,22 @@ 
     }
 }
 
-if( $view == "module") {
-	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_LOADER_TITLE']), false) );
+if ($view == "module") {
+	print(getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_LOADER_TITLE']), false));
 }
 else {
-	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_UPGRADE_WIZARD_TITLE']), false) );
+	print(getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'], $mod_strings['LBL_UPGRADE_WIZARD_TITLE']), false));
 }
 
 // upload link
-if(!empty($GLOBALS['sugar_config']['use_common_ml_dir']) && $GLOBALS['sugar_config']['use_common_ml_dir'] && !empty($GLOBALS['sugar_config']['common_ml_dir'])){
+if (!empty($GLOBALS['sugar_config']['use_common_ml_dir']) && $GLOBALS['sugar_config']['use_common_ml_dir'] && !empty($GLOBALS['sugar_config']['common_ml_dir'])) {
 	//rrs
 	$form = '<form name="move_form" action="index.php?module=Administration&view=module&action=UpgradeWizard" method="post"  ><input type=hidden name="run" value="upload" /><input type=hidden name="load_module_from_dir" id="load_module_from_dir" value="'.$GLOBALS['sugar_config']['common_ml_dir'].'" /><input type=hidden name="upgrade_zip_escaped" value="" />';
 	$form .= '<br>'.$mod_strings['LBL_MODULE_UPLOAD_DISABLE_HELP_TEXT'].'</br>';
-	$form .='<table width="100%" class="edit view"><tr><th align="left">'.$mod_strings['LBL_ML_NAME'].'</th><th align="left">'.$mod_strings['LBL_ML_ACTION'].'</th></tr>';
+	$form .= '<table width="100%" class="edit view"><tr><th align="left">'.$mod_strings['LBL_ML_NAME'].'</th><th align="left">'.$mod_strings['LBL_ML_ACTION'].'</th></tr>';
 	if ($handle = opendir($GLOBALS['sugar_config']['common_ml_dir'])) {
 		while (false !== ($filename = readdir($handle))) {
-	        if($filename == '.' || $filename == '..' || !preg_match("#.*\.zip\$#", $filename)) {
+	        if ($filename == '.' || $filename == '..' || !preg_match("#.*\.zip\$#", $filename)) {
                 continue;
             }
 	        $form .= '<tr><td>'.$filename.'</td><td><input type=button class="button" value="'.$mod_strings['LBL_UW_BTN_UPLOAD'].'" onClick="document.move_form.upgrade_zip_escaped.value = escape( \''.$filename.'\');document.move_form.submit();" /></td></tr>';
@@ -231,8 +231,8 @@ 
 	$form .= '</table></form>';
 //rrs
 
-}else{
-    $form =<<<eoq
+} else {
+    $form = <<<eoq
 <form name="the_form" enctype="multipart/form-data" action="{$form_action}" method="post"  >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="edit view">
 <tr><td>
@@ -256,7 +256,7 @@ 
 $hidden_fields .= "<input type=hidden name=\"mode\"/>";
 
 $form2 = PackageManagerDisplay::buildPackageDisplay($form, $hidden_fields, $form_action, array('module'));
-$form3 =<<<eoq3
+$form3 = <<<eoq3
 
 
 eoq3;
@@ -349,7 +349,7 @@ 
 ?>
 */
 
-$GLOBALS['log']->info( "Upgrade Wizard view");
+$GLOBALS['log']->info("Upgrade Wizard view");
 ?>
 </td>
 </tr>

Braces +6 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -66,8 +68,7 @@ 
 	$uploaddLabel = $mod_strings['LBL_UW_UPLOAD_MODULE'];
 	$descItemsQueued = $mod_strings['LBL_UW_DESC_MODULES_QUEUED'];
 	$descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
-}
-else {
+} else {
 
 	$uploaddLabel = $mod_strings['LBL_UPLOAD_UPGRADE'];
 	$descItemsQueued = $mod_strings['DESC_FILES_QUEUED'];
@@ -209,8 +210,7 @@ 
 
 if( $view == "module") {
 	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_LOADER_TITLE']), false) );
-}
-else {
+} else {
 	print( getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_MODULE_NAME'],$mod_strings['LBL_UPGRADE_WIZARD_TITLE']), false) );
 }
 
@@ -231,7 +231,7 @@ 
 	$form .= '</table></form>';
 //rrs
 
-}else{
+} else{
     $form =<<<eoq
 <form name="the_form" enctype="multipart/form-data" action="{$form_action}" method="post"  >
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="edit view">

modules/Administration/RebuildFulltextIndices.php

Indentation +27 added lines, -27 removed lines

@@ -41,42 +41,42 @@
 global $current_user;
 
 if(!is_admin($current_user)){
-	die('Unauthorized Access. Aborting.');
+    die('Unauthorized Access. Aborting.');
 }
 
 //find  modules that have a full-text index and rebuild it.
 global $beanFiles;
 foreach ($beanFiles as $beanname=>$beanpath) {
-	require_once($beanpath);
-	$focus= new $beanname();
+    require_once($beanpath);
+    $focus= new $beanname();
 
-	//skips beans based on same tables. user, employee and group are an example.
-	if(empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
-		continue;
-	} else {
-		$processed_tables[$focus->table_name]=$focus->table_name;
-	}
+    //skips beans based on same tables. user, employee and group are an example.
+    if(empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
+        continue;
+    } else {
+        $processed_tables[$focus->table_name]=$focus->table_name;
+    }
 
-	if(!empty($dictionary[$focus->object_name]['indices'])) {
-		$indices=$dictionary[$focus->object_name]['indices'];
-	} else {
-		$indices=array();
-	}
+    if(!empty($dictionary[$focus->object_name]['indices'])) {
+        $indices=$dictionary[$focus->object_name]['indices'];
+    } else {
+        $indices=array();
+    }
 
-	//clean vardef definitions.. removed indexes not value for this dbtype.
-	//set index name as the key.
-	$var_indices=array();
-	foreach ($indices as $definition) {
-		//database helpers do not know how to handle full text indices
-		if ($definition['type']=='fulltext') {
-			if (isset($definition['db']) and $definition['db'] != $GLOBALS['db']->dbType) {
-				continue;
-			}
+    //clean vardef definitions.. removed indexes not value for this dbtype.
+    //set index name as the key.
+    $var_indices=array();
+    foreach ($indices as $definition) {
+        //database helpers do not know how to handle full text indices
+        if ($definition['type']=='fulltext') {
+            if (isset($definition['db']) and $definition['db'] != $GLOBALS['db']->dbType) {
+                continue;
+            }
 
-			echo "Rebuilding Index {$definition['name']} <BR/>";
-			$GLOBALS['db']->query('alter index ' .$definition['name'] . " REBUILD");
-		}
+            echo "Rebuilding Index {$definition['name']} <BR/>";
+            $GLOBALS['db']->query('alter index ' .$definition['name'] . " REBUILD");
+        }
 
-	}
+    }
 }
 ?>

Spacing +11 added lines, -11 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,7 +40,7 @@ 
 
 global $current_user;
 
-if(!is_admin($current_user)){
+if (!is_admin($current_user)) {
 	die('Unauthorized Access. Aborting.');
 }
 
@@ -48,33 +48,33 @@ 
 global $beanFiles;
 foreach ($beanFiles as $beanname=>$beanpath) {
 	require_once($beanpath);
-	$focus= new $beanname();
+	$focus = new $beanname();
 
 	//skips beans based on same tables. user, employee and group are an example.
-	if(empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
+	if (empty($focus->table_name) || isset($processed_tables[$focus->table_name])) {
 		continue;
 	} else {
-		$processed_tables[$focus->table_name]=$focus->table_name;
+		$processed_tables[$focus->table_name] = $focus->table_name;
 	}
 
-	if(!empty($dictionary[$focus->object_name]['indices'])) {
-		$indices=$dictionary[$focus->object_name]['indices'];
+	if (!empty($dictionary[$focus->object_name]['indices'])) {
+		$indices = $dictionary[$focus->object_name]['indices'];
 	} else {
-		$indices=array();
+		$indices = array();
 	}
 
 	//clean vardef definitions.. removed indexes not value for this dbtype.
 	//set index name as the key.
-	$var_indices=array();
+	$var_indices = array();
 	foreach ($indices as $definition) {
 		//database helpers do not know how to handle full text indices
-		if ($definition['type']=='fulltext') {
+		if ($definition['type'] == 'fulltext') {
 			if (isset($definition['db']) and $definition['db'] != $GLOBALS['db']->dbType) {
 				continue;
 			}
 
 			echo "Rebuilding Index {$definition['name']} <BR/>";
-			$GLOBALS['db']->query('alter index ' .$definition['name'] . " REBUILD");
+			$GLOBALS['db']->query('alter index '.$definition['name']." REBUILD");
 		}
 
 	}

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

Indentation +106 added lines, -106 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -47,7 +47,7 @@ 
 $db = DBManagerFactory::getInstance();
 
 if (is_admin($current_user) || isset ($from_sync_client) || is_admin_for_any_module($current_user)) {
-	isset($_REQUEST['execute'])? $execute=$_REQUEST['execute'] : $execute= false;
+	isset($_REQUEST['execute']) ? $execute = $_REQUEST['execute'] : $execute = false;
 	$export = false;
 
 	if (sizeof($_POST) && isset ($_POST['raction'])) {
@@ -60,14 +60,14 @@ 
 			header("Content-Disposition: attachment; filename=repairSugarDB.sql");
 			header("Content-Type: text/sql; charset={$app_strings['LBL_CHARSET']}");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . TimeDate::httpTime());
+			header("Last-Modified: ".TimeDate::httpTime());
 			header("Cache-Control: post-check=0, pre-check=0", false);
-			header("Content-Length: " . strlen($_POST['sql']));
+			header("Content-Length: ".strlen($_POST['sql']));
 
 		    //jc:7347 - for whatever reason, html_entity_decode is choking on converting
 		    //the html entity ' to a single quote, so we will use str_replace
 		    //instead
-		    $sql = str_replace(''',"'", $_POST['sql']);
+		    $sql = str_replace(''', "'", $_POST['sql']);
 		    //echo html_entity_decode($_POST['sql']);
 		    echo $sql;
 		}
@@ -87,7 +87,7 @@ 
 				$stmt = trim($stmt);
 
 				if (!empty ($stmt)) {
-					$db->query($stmt,true,'Executing repair query: ');
+					$db->query($stmt, true, 'Executing repair query: ');
 				}
 			}
 
@@ -96,7 +96,7 @@ 
 	} else {
 
 		if (!$export && empty ($_REQUEST['repair_silent'])) {
-			if ( empty($hideModuleMenu) )
+			if (empty($hideModuleMenu))
 		        echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
 			echo "<h1 id=\"rdloading\">{$mod_strings['LBL_REPAIR_DATABASE_PROCESSING']}</h1>";
 			ob_flush();
@@ -108,23 +108,23 @@ 
 		$repairedTables = array();
 
 		foreach ($beanFiles as $bean => $file) {
-			if(file_exists($file)){
+			if (file_exists($file)) {
 				require_once ($file);
 				unset($GLOBALS['dictionary'][$bean]);
-				$focus = new $bean ();
+				$focus = new $bean();
 				if (($focus instanceOf SugarBean) && !isset($repairedTables[$focus->table_name])) {
 				    $sql .= $db->repairTable($focus, $execute);
 				    $repairedTables[$focus->table_name] = true;
 				}
                 //Repair Custom Fields
-                if (($focus instanceOf SugarBean) && $focus->hasCustomFields() && !isset($repairedTables[$focus->table_name . '_cstm'])) {
+                if (($focus instanceOf SugarBean) && $focus->hasCustomFields() && !isset($repairedTables[$focus->table_name.'_cstm'])) {
 				    $df = new DynamicField($focus->module_dir);
                     //Need to check if the method exists as during upgrade an old version of Dynamic Fields may be loaded.
                     if (method_exists($df, "repairCustomFields"))
                     {
                         $df->bean = $focus;
                         $sql .= $df->repairCustomFields($execute);
-                        $repairedTables[$focus->table_name . '_cstm'] = true;
+                        $repairedTables[$focus->table_name.'_cstm'] = true;
                     }
 				}
 			}
@@ -137,13 +137,13 @@ 
 
 		foreach ($dictionary as $meta) {
 
-			if ( !isset($meta['table']) || isset($repairedTables[$meta['table']]))
+			if (!isset($meta['table']) || isset($repairedTables[$meta['table']]))
                 continue;
             
             $tablename = $meta['table'];
 			$fielddefs = $meta['fields'];
 			$indices = $meta['indices'];
-			$engine = isset($meta['engine'])?$meta['engine']:null;
+			$engine = isset($meta['engine']) ? $meta['engine'] : null;
 			$sql .= $db->repairTableParams($tablename, $fielddefs, $indices, $execute, $engine);
 			$repairedTables[$tablename] = true;
 		}
@@ -163,7 +163,7 @@ 
 						$line .= ";";
 					}
 
-					$qry_str .= $line . "\n";
+					$qry_str .= $line."\n";
 				}
 
 	            $ss = new Sugar_Smarty();

Braces +9 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry) {
 	die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -70,8 +71,7 @@ 
 		    $sql = str_replace('&#039;',"'", $_POST['sql']);
 		    //echo html_entity_decode($_POST['sql']);
 		    echo $sql;
-		}
-		elseif (isset ($_POST['raction']) && strtolower($_POST['raction']) == "execute") {
+		} elseif (isset ($_POST['raction']) && strtolower($_POST['raction']) == "execute") {
 			$sql = str_replace(
 				array(
 					"\n",
@@ -96,8 +96,9 @@ 
 	} else {
 
 		if (!$export && empty ($_REQUEST['repair_silent'])) {
-			if ( empty($hideModuleMenu) )
-		        echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
+			if ( empty($hideModuleMenu) ) {
+					        echo getClassicModuleTitle($mod_strings['LBL_REPAIR_DATABASE'], array($mod_strings['LBL_REPAIR_DATABASE']), true);
+			}
 			echo "<h1 id=\"rdloading\">{$mod_strings['LBL_REPAIR_DATABASE_PROCESSING']}</h1>";
 			ob_flush();
 		}
@@ -137,8 +138,9 @@ 
 
 		foreach ($dictionary as $meta) {
 
-			if ( !isset($meta['table']) || isset($repairedTables[$meta['table']]))
-                continue;
+			if ( !isset($meta['table']) || isset($repairedTables[$meta['table']])) {
+			                continue;
+			}
             
             $tablename = $meta['table'];
 			$fielddefs = $meta['fields'];

modules/Administration/UpgradeFields.php

Indentation +58 added lines, -58 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if(!defined('sugarEntry') || !sugarEntry)
-	die('Not A Valid Entry Point');
+    die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -44,7 +44,7 @@ 
 global $db;
 
 if (!isset ($db)) {
-	$db = DBManagerFactory:: getInstance();
+    $db = DBManagerFactory:: getInstance();
 }
 
 $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
@@ -53,82 +53,82 @@ 
  * get the real field_meta_data
  */
 while ($row = $db->fetchByAssoc($result)) {
-	$the_modules = $row['custom_module'];
-	if (!isset ($modules[$the_modules])) {
-		$modules[$the_modules] = array ();
-	}
-	$modules[$the_modules][$row['name']] = $row['name'];
+    $the_modules = $row['custom_module'];
+    if (!isset ($modules[$the_modules])) {
+        $modules[$the_modules] = array ();
+    }
+    $modules[$the_modules][$row['name']] = $row['name'];
 }
 
 $simulate = false;
 if (!isset ($_REQUEST['run'])) {
-	$simulate = true;
-	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
+    $simulate = true;
+    echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
 }
 
 foreach ($modules as $the_module => $fields) {
-	$class_name = $beanList[$the_module];
-	echo "<br><br>Scanning $the_module <br>";
+    $class_name = $beanList[$the_module];
+    echo "<br><br>Scanning $the_module <br>";
 
-	require_once ($beanFiles[$class_name]);
-	$mod = new $class_name ();
-	if (!$db->tableExists($mod->table_name."_cstm")) {
-		$mod->custom_fields = new DynamicField();
-		$mod->custom_fields->setup($mod);
-		$mod->custom_fields->createCustomTable();
-	}
+    require_once ($beanFiles[$class_name]);
+    $mod = new $class_name ();
+    if (!$db->tableExists($mod->table_name."_cstm")) {
+        $mod->custom_fields = new DynamicField();
+        $mod->custom_fields->setup($mod);
+        $mod->custom_fields->createCustomTable();
+    }
 
-	$table = $db->getTableDescription($mod->table_name."_cstm");
-	foreach($table as $row) {
-		$col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
-		$the_field = $mod->custom_fields->getField($col);
-		$type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
-		if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
-			$type.='(' . $row['data_precision'];
-			if (!empty($row['data_scale'])) {
-				$type.=',' . $row['data_scale'];
-			}
-			$type.=')';
-		} elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
-			$type.='(' . $row['data_length'] . ')';
-		}
-		if (!isset ($fields[$col]) && $col != 'id_c') {
-			if (!$simulate) {
-				$db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
-			}
-			unset ($fields[$col]);
-			echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
-		} else {
-			if ($col != 'id_c') {
-				$db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
+    $table = $db->getTableDescription($mod->table_name."_cstm");
+    foreach($table as $row) {
+        $col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
+        $the_field = $mod->custom_fields->getField($col);
+        $type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
+        if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
+            $type.='(' . $row['data_precision'];
+            if (!empty($row['data_scale'])) {
+                $type.=',' . $row['data_scale'];
+            }
+            $type.=')';
+        } elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
+            $type.='(' . $row['data_length'] . ')';
+        }
+        if (!isset ($fields[$col]) && $col != 'id_c') {
+            if (!$simulate) {
+                $db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
+            }
+            unset ($fields[$col]);
+            echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
+        } else {
+            if ($col != 'id_c') {
+                $db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
 
-				$type = strtolower(str_replace(' ' , '', $type));
-				if (strcmp($db_data_type,$type) != 0) {
+                $type = strtolower(str_replace(' ' , '', $type));
+                if (strcmp($db_data_type,$type) != 0) {
 
-					echo "Fixing Column Type for $col changing $type to ".$db_data_type."<br>";
-					if (!$simulate) {
-						$db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));
+                    echo "Fixing Column Type for $col changing $type to ".$db_data_type."<br>";
+                    if (!$simulate) {
+                        $db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));
                     }
-				}
-			}
+                }
+            }
 
-			unset ($fields[$col]);
-		}
+            unset ($fields[$col]);
+        }
 
-	}
+    }
 
-	echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
-	foreach ($fields as $field) {
-		echo "Adding Column $field to $mod->table_name"."_cstm<br>";
-		if (!$simulate)
-			$mod->custom_fields->add_existing_custom_field($field);
-	}
+    echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
+    foreach ($fields as $field) {
+        echo "Adding Column $field to $mod->table_name"."_cstm<br>";
+        if (!$simulate)
+            $mod->custom_fields->add_existing_custom_field($field);
+    }
 
 }
 
 DynamicField :: deleteCache();
 echo '<br>Done<br>';
 if ($simulate) {
-	echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';
+    echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';
 }
 ?>
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry)
+if (!defined('sugarEntry') || !sugarEntry)
 	die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -48,14 +48,14 @@ 
 }
 
 $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
-$modules = array ();
+$modules = array();
 /*
  * get the real field_meta_data
  */
 while ($row = $db->fetchByAssoc($result)) {
 	$the_modules = $row['custom_module'];
 	if (!isset ($modules[$the_modules])) {
-		$modules[$the_modules] = array ();
+		$modules[$the_modules] = array();
 	}
 	$modules[$the_modules][$row['name']] = $row['name'];
 }
@@ -71,7 +71,7 @@ 
 	echo "<br><br>Scanning $the_module <br>";
 
 	require_once ($beanFiles[$class_name]);
-	$mod = new $class_name ();
+	$mod = new $class_name();
 	if (!$db->tableExists($mod->table_name."_cstm")) {
 		$mod->custom_fields = new DynamicField();
 		$mod->custom_fields->setup($mod);
@@ -79,18 +79,18 @@ 
 	}
 
 	$table = $db->getTableDescription($mod->table_name."_cstm");
-	foreach($table as $row) {
+	foreach ($table as $row) {
 		$col = strtolower(empty ($row['Field']) ? $row['field'] : $row['Field']);
 		$the_field = $mod->custom_fields->getField($col);
 		$type = strtolower(empty ($row['Type']) ? $row['type'] : $row['Type']);
 		if (!empty($row['data_precision']) && !empty($row['data_scale'])) {
-			$type.='(' . $row['data_precision'];
+			$type .= '('.$row['data_precision'];
 			if (!empty($row['data_scale'])) {
-				$type.=',' . $row['data_scale'];
+				$type .= ','.$row['data_scale'];
 			}
-			$type.=')';
-		} elseif(!empty($row['data_length']) && (strtolower($row['type'])=='varchar' or strtolower($row['type'])=='varchar2')) {
-			$type.='(' . $row['data_length'] . ')';
+			$type .= ')';
+		} elseif (!empty($row['data_length']) && (strtolower($row['type']) == 'varchar' or strtolower($row['type']) == 'varchar2')) {
+			$type .= '('.$row['data_length'].')';
 		}
 		if (!isset ($fields[$col]) && $col != 'id_c') {
 			if (!$simulate) {
@@ -100,10 +100,10 @@ 
 			echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
 		} else {
 			if ($col != 'id_c') {
-				$db_data_type = strtolower(str_replace(' ' , '', $the_field->get_db_type()));
+				$db_data_type = strtolower(str_replace(' ', '', $the_field->get_db_type()));
 
-				$type = strtolower(str_replace(' ' , '', $type));
-				if (strcmp($db_data_type,$type) != 0) {
+				$type = strtolower(str_replace(' ', '', $type));
+				if (strcmp($db_data_type, $type) != 0) {
 
 					echo "Fixing Column Type for $col changing $type to ".$db_data_type."<br>";
 					if (!$simulate) {

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry)
+if(!defined('sugarEntry') || !sugarEntry) {
 	die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -120,8 +121,9 @@ 
 	echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
 	foreach ($fields as $field) {
 		echo "Adding Column $field to $mod->table_name"."_cstm<br>";
-		if (!$simulate)
-			$mod->custom_fields->add_existing_custom_field($field);
+		if (!$simulate) {
+					$mod->custom_fields->add_existing_custom_field($field);
+		}
 	}
 
 }

modules/Administration/callJSRepair.php

Indentation +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
                 ConcatenateFiles("$from");
     
             }elseif($_REQUEST['js_admin_repair'] == 'repair'){
-             //should compress existing javascript (including changes done) without overwriting original source files
+                //should compress existing javascript (including changes done) without overwriting original source files
                 BackUpAndCompressScriptFiles("$from","",false);
                 ConcatenateFiles("$from");        
             }

Spacing +13 added lines, -13 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,41 +47,41 @@ 
  
     //set default root directory
     $from = getcwd();
-    if(isset($_REQUEST['root_directory'])  && !empty($_REQUEST['root_directory'])){
+    if (isset($_REQUEST['root_directory']) && !empty($_REQUEST['root_directory'])) {
         $from = $_REQUEST['root_directory'];
     }
     //this script can take a while, change max execution time to 10 mins
     $tmp_time = ini_get('max_execution_time');
-    ini_set('max_execution_time','600');
+    ini_set('max_execution_time', '600');
         
         //figure out which commands to call.  
-        if($_REQUEST['js_admin_repair'] == 'concat' ){
+        if ($_REQUEST['js_admin_repair'] == 'concat') {
             //concatenate mode, call the files that will concatenate javascript group files
             $_REQUEST['js_rebuild_concat'] = 'rebuild';
             require_once('jssource/minify.php');
          
-        }else{
+        } else {
             $_REQUEST['root_directory'] = getcwd();
             require_once('jssource/minify.php');
         
-            if($_REQUEST['js_admin_repair'] == 'replace'){
+            if ($_REQUEST['js_admin_repair'] == 'replace') {
                 //should replace compressed JS with source js
-                reverseScripts("$from/jssource/src_files","$from");    
+                reverseScripts("$from/jssource/src_files", "$from");    
     
-            }elseif($_REQUEST['js_admin_repair'] == 'mini'){
+            }elseif ($_REQUEST['js_admin_repair'] == 'mini') {
                 //should replace compressed JS with minified version of source js
-                reverseScripts("$from/jssource/src_files","$from");
-                BackUpAndCompressScriptFiles("$from","",false);
+                reverseScripts("$from/jssource/src_files", "$from");
+                BackUpAndCompressScriptFiles("$from", "", false);
                 ConcatenateFiles("$from");
     
-            }elseif($_REQUEST['js_admin_repair'] == 'repair'){
+            }elseif ($_REQUEST['js_admin_repair'] == 'repair') {
              //should compress existing javascript (including changes done) without overwriting original source files
-                BackUpAndCompressScriptFiles("$from","",false);
+                BackUpAndCompressScriptFiles("$from", "", false);
                 ConcatenateFiles("$from");        
             }
         }
     //set execution time back to what it was   
-    ini_set('max_execution_time',$tmp_time);
+    ini_set('max_execution_time', $tmp_time);
 
     
  

Braces +6 added lines, -4 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.
@@ -60,7 +62,7 @@ 
             $_REQUEST['js_rebuild_concat'] = 'rebuild';
             require_once('jssource/minify.php');
          
-        }else{
+        } else{
             $_REQUEST['root_directory'] = getcwd();
             require_once('jssource/minify.php');
         
@@ -68,13 +70,13 @@ 
                 //should replace compressed JS with source js
                 reverseScripts("$from/jssource/src_files","$from");    
     
-            }elseif($_REQUEST['js_admin_repair'] == 'mini'){
+            } elseif($_REQUEST['js_admin_repair'] == 'mini'){
                 //should replace compressed JS with minified version of source js
                 reverseScripts("$from/jssource/src_files","$from");
                 BackUpAndCompressScriptFiles("$from","",false);
                 ConcatenateFiles("$from");
     
-            }elseif($_REQUEST['js_admin_repair'] == 'repair'){
+            } elseif($_REQUEST['js_admin_repair'] == 'repair'){
              //should compress existing javascript (including changes done) without overwriting original source files
                 BackUpAndCompressScriptFiles("$from","",false);
                 ConcatenateFiles("$from");        

modules/Administration/RebuildDashlets.php

Indentation +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 $silent = isset($_REQUEST['silent']) ? true : false;
 if(is_admin($current_user)){
     global $mod_strings;
-	if (!$silent) { echo $mod_strings['LBL_REBUILD_DASHLETS_DESC']; }
+    if (!$silent) { echo $mod_strings['LBL_REBUILD_DASHLETS_DESC']; }
     if(is_file($cachedfile = sugar_cached('dashlets/dashlets.php'))) {
         unlink($cachedfile);
     }
@@ -50,9 +50,9 @@ 
 
     $dc = new DashletCacheBuilder();
     $dc->buildCache();
-   if( !$silent ) echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
+    if( !$silent ) echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
 }
 else{
-	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

Spacing +5 added lines, -5 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,19 +40,19 @@ 
 
 global $current_user;
 $silent = isset($_REQUEST['silent']) ? true : false;
-if(is_admin($current_user)){
+if (is_admin($current_user)) {
     global $mod_strings;
 	if (!$silent) { echo $mod_strings['LBL_REBUILD_DASHLETS_DESC']; }
-    if(is_file($cachedfile = sugar_cached('dashlets/dashlets.php'))) {
+    if (is_file($cachedfile = sugar_cached('dashlets/dashlets.php'))) {
         unlink($cachedfile);
     }
     require_once('include/Dashlets/DashletCacheBuilder.php');
 
     $dc = new DashletCacheBuilder();
     $dc->buildCache();
-   if( !$silent ) echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
+   if (!$silent) echo '<br><br><br><br>'.$mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
 }
-else{
+else {
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

Braces +7 added lines, -4 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.
@@ -50,9 +52,10 @@ 
 
     $dc = new DashletCacheBuilder();
     $dc->buildCache();
-   if( !$silent ) echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
-}
-else{
+   if( !$silent ) {
+       echo '<br><br><br><br>' . $mod_strings['LBL_REBUILD_DASHLETS_DESC_SUCCESS'];
+   }
+   } else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

modules/Administration/updateclass.php

Indentation +14 added lines, -14 removed lines

@@ -43,21 +43,21 @@ 
 require_once("include/utils/sugar_file_utils.php");
 
 foreach ($beanFiles as $classname => $filename){ 
-	if (file_exists($filename)){
-		// Rename the class and its constructor adding SugarCore at the beginning  (Ex: class SugarCoreCall)
-		$handle = file_get_contents($filename);
+    if (file_exists($filename)){
+        // Rename the class and its constructor adding SugarCore at the beginning  (Ex: class SugarCoreCall)
+        $handle = file_get_contents($filename);
         $patterns = array ('/class '.$classname.'/','/function '.$classname.'/');
         $replace = array ('class SugarCore'.$classname,'function SugarCore'.$classname);
-		$data = preg_replace($patterns,$replace, $handle);
-		sugar_file_put_contents($filename,$data);
+        $data = preg_replace($patterns,$replace, $handle);
+        sugar_file_put_contents($filename,$data);
 		
-		// Rename the SugarBean file into SugarCore.SugarBean (Ex: SugarCore.Call.php)
-		$pos=strrpos($filename,"/");
-		$newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
-		sugar_rename($filename,$newfilename);
+        // Rename the SugarBean file into SugarCore.SugarBean (Ex: SugarCore.Call.php)
+        $pos=strrpos($filename,"/");
+        $newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
+        sugar_rename($filename,$newfilename);
 		
-		//Create a new SugarBean that extends CoreBean
-		$fileHandle = sugar_fopen($filename, 'w') ;
+        //Create a new SugarBean that extends CoreBean
+        $fileHandle = sugar_fopen($filename, 'w') ;
 $newclass = <<<FABRICE
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
@@ -110,8 +110,8 @@ 
 }
 ?>
 FABRICE;
-		fwrite($fileHandle, $newclass);
-		fclose($fileHandle);
-	}
+        fwrite($fileHandle, $newclass);
+        fclose($fileHandle);
+    }
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 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.
@@ -42,22 +42,22 @@ 
 require("include/modules.php");
 require_once("include/utils/sugar_file_utils.php");
 
-foreach ($beanFiles as $classname => $filename){ 
-	if (file_exists($filename)){
+foreach ($beanFiles as $classname => $filename) { 
+	if (file_exists($filename)) {
 		// Rename the class and its constructor adding SugarCore at the beginning  (Ex: class SugarCoreCall)
 		$handle = file_get_contents($filename);
-        $patterns = array ('/class '.$classname.'/','/function '.$classname.'/');
-        $replace = array ('class SugarCore'.$classname,'function SugarCore'.$classname);
-		$data = preg_replace($patterns,$replace, $handle);
-		sugar_file_put_contents($filename,$data);
+        $patterns = array('/class '.$classname.'/', '/function '.$classname.'/');
+        $replace = array('class SugarCore'.$classname, 'function SugarCore'.$classname);
+		$data = preg_replace($patterns, $replace, $handle);
+		sugar_file_put_contents($filename, $data);
 		
 		// Rename the SugarBean file into SugarCore.SugarBean (Ex: SugarCore.Call.php)
-		$pos=strrpos($filename,"/");
-		$newfilename=substr_replace($filename, 'SugarCore.', $pos+1, 0);
-		sugar_rename($filename,$newfilename);
+		$pos = strrpos($filename, "/");
+		$newfilename = substr_replace($filename, 'SugarCore.', $pos + 1, 0);
+		sugar_rename($filename, $newfilename);
 		
 		//Create a new SugarBean that extends CoreBean
-		$fileHandle = sugar_fopen($filename, 'w') ;
+		$fileHandle = sugar_fopen($filename, 'w');
 $newclass = <<<FABRICE
 <?php
 if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');

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

Indentation +8 added lines, -8 removed lines

@@ -43,8 +43,8 @@ 
 }
 
 if (empty($_FILES)) {
-	echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_DESC'];
-	echo <<<EOQ
+    echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_DESC'];
+    echo <<<EOQ
 <br>
 <br>
 <form enctype="multipart/form-data" action="index.php" method="POST">
@@ -64,7 +64,7 @@ 
         if (trim($line) == 'DONE') {
             $fmd->new_with_id = true;
             echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_ADDING'] . ':' . $fmd->custom_module . '-' .
-                 $fmd->name . '<br>';
+                    $fmd->name . '<br>';
             $fmd->db->query("DELETE FROM $fmd->table_name WHERE id=".$fmd->db->quoted($fmd->id));
             $fmd->save(false);
             $fmd = BeanFactory::getBean('EditCustomFields');
@@ -80,9 +80,9 @@ 
             }
         }
     }
-	$_REQUEST['run'] = true;
-	$result = $fmd->db->query("SELECT count(*) field_count FROM $fmd->table_name");
-	$row = $fmd->db->fetchByAssoc($result);
-	echo 'Total Custom Fields :' . $row['field_count'] . '<br>';
-	include('modules/Administration/UpgradeFields.php');
+    $_REQUEST['run'] = true;
+    $result = $fmd->db->query("SELECT count(*) field_count FROM $fmd->table_name");
+    $row = $fmd->db->fetchByAssoc($result);
+    echo 'Total Custom Fields :' . $row['field_count'] . '<br>';
+    include('modules/Administration/UpgradeFields.php');
 }

Spacing +5 added lines, -5 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.
@@ -57,14 +57,14 @@ 
 } else {
     $fmd = BeanFactory::getBean('EditCustomFields');
 
-    echo $mod_strings['LBL_ICF_DROPPING'] . '<br>';
+    echo $mod_strings['LBL_ICF_DROPPING'].'<br>';
     $lines = file($_FILES['sugfile']['tmp_name']);
     $cur = array();
     foreach ($lines as $line) {
         if (trim($line) == 'DONE') {
             $fmd->new_with_id = true;
-            echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_ADDING'] . ':' . $fmd->custom_module . '-' .
-                 $fmd->name . '<br>';
+            echo $mod_strings['LBL_IMPORT_CUSTOM_FIELDS_ADDING'].':'.$fmd->custom_module.'-'.
+                 $fmd->name.'<br>';
             $fmd->db->query("DELETE FROM $fmd->table_name WHERE id=".$fmd->db->quoted($fmd->id));
             $fmd->save(false);
             $fmd = BeanFactory::getBean('EditCustomFields');
@@ -83,6 +83,6 @@ 
 	$_REQUEST['run'] = true;
 	$result = $fmd->db->query("SELECT count(*) field_count FROM $fmd->table_name");
 	$row = $fmd->db->fetchByAssoc($result);
-	echo 'Total Custom Fields :' . $row['field_count'] . '<br>';
+	echo 'Total Custom Fields :'.$row['field_count'].'<br>';
 	include('modules/Administration/UpgradeFields.php');
 }

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

Indentation +355 added lines, -355 removed lines

@@ -43,49 +43,49 @@ 
 
 class SugarSpriteBuilder
 {
-	var $isAvailable = false;
-	var $silentRun = false;
+    var $isAvailable = false;
+    var $silentRun = false;
     var $fromSilentUpgrade = false;
     var $writeToUpgradeLog = false;
 
-	var $debug = false;
-	var $fileName = 'sprites';
-	var $cssMinify = true;
+    var $debug = false;
+    var $fileName = 'sprites';
+    var $cssMinify = true;
 
-	// class supported image types
-	var $supportedTypeMap = array(
-		IMG_GIF => IMAGETYPE_GIF,
-		IMG_JPG => IMAGETYPE_JPEG,
-		IMG_PNG => IMAGETYPE_PNG,
-	);
+    // class supported image types
+    var $supportedTypeMap = array(
+        IMG_GIF => IMAGETYPE_GIF,
+        IMG_JPG => IMAGETYPE_JPEG,
+        IMG_PNG => IMAGETYPE_PNG,
+    );
 
-	// sprite settings
-	var $pngCompression = 9;
-	var $pngFilter = PNG_NO_FILTER;
-	var $maxWidth = 75;
-	var $maxHeight = 75;
-	var $rowCnt = 30;
+    // sprite settings
+    var $pngCompression = 9;
+    var $pngFilter = PNG_NO_FILTER;
+    var $maxWidth = 75;
+    var $maxHeight = 75;
+    var $rowCnt = 30;
 
-	// processed image types
-	var $imageTypes = array();
+    // processed image types
+    var $imageTypes = array();
 
-	// source files
-	var $spriteSrc = array();
-	var $spriteRepeat = array();
+    // source files
+    var $spriteSrc = array();
+    var $spriteRepeat = array();
 
-	// sprite resource images
-	var $spriteImg;
+    // sprite resource images
+    var $spriteImg;
 
-	// sprite_config collection
-	var $sprites_config = array();
+    // sprite_config collection
+    var $sprites_config = array();
 
 
     public function __construct()
     {
-		// check if we have gd installed
-		if(function_exists('imagecreatetruecolor'))
+        // check if we have gd installed
+        if(function_exists('imagecreatetruecolor'))
         {
-			$this->isAvailable = true;
+            $this->isAvailable = true;
             foreach($this->supportedTypeMap as $gd_bit => $imagetype)
             {
                 if(imagetypes() & $gd_bit) {
@@ -93,13 +93,13 @@ 
                     $this->imageTypes[$imagetype] = $gd_bit;
                 }
             }
-		}
+        }
 
         if(function_exists('logThis') && isset($GLOBALS['path']))
         {
             $this->writeToUpgradeLog = true;
         }
-	}
+    }
 
 
     /**
@@ -109,80 +109,80 @@ 
      * @param $name String value of the sprite name
      * @param $dir String value of the directory associated with the sprite entry
      */
-	public function addDirectory($name, $dir) {
+    public function addDirectory($name, $dir) {
 
-		// sprite namespace
-		if(!array_key_exists($name, $this->spriteSrc))
+        // sprite namespace
+        if(!array_key_exists($name, $this->spriteSrc))
         {
-			$this->spriteSrc[$name] = array();
-		}
+            $this->spriteSrc[$name] = array();
+        }
 
-		// add files from directory
-		$this->spriteSrc[$name][$dir] = $this->getFileList($dir);
-	}
+        // add files from directory
+        $this->spriteSrc[$name][$dir] = $this->getFileList($dir);
+    }
 
-	/**
+    /**
      * getFileList
      *
      * This method processes files in a directory and adds them to the sprites array
      * @param $dir String value of the directory to scan for image files in
      */
-	private function getFileList($dir) {
-		$list = array();
-		if(is_dir($dir)) {
-			if($dh = opendir($dir)) {
+    private function getFileList($dir) {
+        $list = array();
+        if(is_dir($dir)) {
+            if($dh = opendir($dir)) {
 
-				// optional sprites_config.php file
-				$this->loadSpritesConfig($dir);
+                // optional sprites_config.php file
+                $this->loadSpritesConfig($dir);
 
-			    while (($file = readdir($dh)) !== false)
+                while (($file = readdir($dh)) !== false)
                 {
-					if ($file != "." && $file != ".." && $file != "sprites_config.php")
+                    if ($file != "." && $file != ".." && $file != "sprites_config.php")
                     {
 
-						// file info & check supported image format
-						if($info = $this->getFileInfo($dir, $file)) {
+                        // file info & check supported image format
+                        if($info = $this->getFileInfo($dir, $file)) {
 
-							// skip excluded files
-							if(isset($this->sprites_config[$dir]['exclude']) && array_search($file, $this->sprites_config[$dir]['exclude']) !== false)
+                            // skip excluded files
+                            if(isset($this->sprites_config[$dir]['exclude']) && array_search($file, $this->sprites_config[$dir]['exclude']) !== false)
                             {
                                 global $mod_strings;
                                 $msg = string_format($mod_strings['LBL_SPRITES_EXCLUDING_FILE'], array("{$dir}/{$file}"));
-								$GLOBALS['log']->debug($msg);
+                                $GLOBALS['log']->debug($msg);
                                 $this->logMessage($msg);
-							} else {
-								// repeatable sprite ?
-								$isRepeat = false;
+                            } else {
+                                // repeatable sprite ?
+                                $isRepeat = false;
 
-								if(isset($this->sprites_config[$dir]['repeat']))
+                                if(isset($this->sprites_config[$dir]['repeat']))
                                 {
-									foreach($this->sprites_config[$dir]['repeat'] as $repeat)
+                                    foreach($this->sprites_config[$dir]['repeat'] as $repeat)
                                     {
-										if($info['x'] == $repeat['width'] && $info['y'] == $repeat['height'])
+                                        if($info['x'] == $repeat['width'] && $info['y'] == $repeat['height'])
                                         {
-											$id = md5($repeat['width'].$repeat['height'].$repeat['direction']);
-											$isRepeat = true;
-											$this->spriteRepeat['repeat_'.$repeat['direction'].'_'.$id][$dir][$file] = $info;
-										}
-									}
-								}
-
-								if(!$isRepeat)
+                                            $id = md5($repeat['width'].$repeat['height'].$repeat['direction']);
+                                            $isRepeat = true;
+                                            $this->spriteRepeat['repeat_'.$repeat['direction'].'_'.$id][$dir][$file] = $info;
+                                        }
+                                    }
+                                }
+
+                                if(!$isRepeat)
                                 {
-									$list[$file] = $info;
+                                    $list[$file] = $info;
                                 }
-							}
-						} else if(preg_match('/\.(jpg|jpeg|gif|png|bmp|ico)$/i', $file)) {
+                            }
+                        } else if(preg_match('/\.(jpg|jpeg|gif|png|bmp|ico)$/i', $file)) {
                             $GLOBALS['log']->error('Unable to process image file ' . $file);
                             //$this->logMessage('Unable to process image file ' . $file);
                         }
-	   	     		}
-   		 		}
-			}
-		    closedir($dh);
-		}
-		return $list;
-	}
+                        }
+                    }
+            }
+            closedir($dh);
+        }
+        return $list;
+    }
 
 
     /**
@@ -194,19 +194,19 @@ 
      *
      * @param $dir String value of the directory containing the custom sprites_config.php file
      */
-	private function loadSpritesConfig($dir) {
-		$sprites_config = array();
-		if(file_exists("$dir/sprites_config.php"))
+    private function loadSpritesConfig($dir) {
+        $sprites_config = array();
+        if(file_exists("$dir/sprites_config.php"))
         {
-			include("$dir/sprites_config.php");
-			if(count($sprites_config)) {
-				$this->sprites_config = array_merge($this->sprites_config, $sprites_config);
-			}
-		}
-	}
+            include("$dir/sprites_config.php");
+            if(count($sprites_config)) {
+                $this->sprites_config = array_merge($this->sprites_config, $sprites_config);
+            }
+        }
+    }
 
 
-	/**
+    /**
      * getFileInfo
      *
      * This is a private helper function to return attributes about an image.  If the width, height or type of the
@@ -214,44 +214,44 @@ 
      *
      * @return array of file info entries containing file information (x, y, type) if image type is supported
      */
-	private function getFileInfo($dir, $file) {
-		$result = false;
-		$info = @getimagesize($dir.'/'.$file);
-		if($info) {
+    private function getFileInfo($dir, $file) {
+        $result = false;
+        $info = @getimagesize($dir.'/'.$file);
+        if($info) {
 
-			// supported image type ?
-			if(isset($this->imageTypes[$info[2]]))
+            // supported image type ?
+            if(isset($this->imageTypes[$info[2]]))
             {
-				$w = $info[0];
-				$h = $info[1];
-				$surface = $w * $h;
+                $w = $info[0];
+                $h = $info[1];
+                $surface = $w * $h;
 
-				// be sure we have an image size
-				$addSprite = false;
-				if($surface)
+                // be sure we have an image size
+                $addSprite = false;
+                if($surface)
                 {
-					// sprite dimensions
-					if($w <= $this->maxWidth && $h <= $this->maxHeight)
+                    // sprite dimensions
+                    if($w <= $this->maxWidth && $h <= $this->maxHeight)
                     {
-						$addSprite = true;
-					}
-				}
+                        $addSprite = true;
+                    }
+                }
 
-				if($addSprite)
+                if($addSprite)
                 {
-					$result = array();
-					$result['x'] = $w;
-					$result['y'] = $h;
-					$result['type'] = $info[2];
-				}
-			} else {
+                    $result = array();
+                    $result['x'] = $w;
+                    $result['y'] = $h;
+                    $result['type'] = $info[2];
+                }
+            } else {
                 $msg = "Skipping unsupported image file type ({$info[2]}) for file {$file}";
                 $GLOBALS['log']->error($msg);
                 $this->logMessage($msg."\n");
             }
-		}
-		return $result;
-	}
+        }
+        return $result;
+    }
 
 
     /**
@@ -261,220 +261,220 @@ 
      *
      * @return $result boolean value indicating whether or not sprites were created
      */
-	public function createSprites() {
+    public function createSprites() {
 
         global $mod_strings;
 
-		if(!$this->isAvailable)
+        if(!$this->isAvailable)
         {
-			if(!$this->silentRun)
+            if(!$this->silentRun)
             {
                 $msg = $mod_strings['LBL_SPRITES_NOT_SUPPORTED'];
                 $GLOBALS['log']->warn($msg);
                 $this->logMessage($msg);
             }
-			return false;
-		}
+            return false;
+        }
 
-		// add repeatable sprites
-		if(count($this->spriteRepeat))
+        // add repeatable sprites
+        if(count($this->spriteRepeat))
         {
-			$this->spriteSrc = array_merge($this->spriteSrc, $this->spriteRepeat);
+            $this->spriteSrc = array_merge($this->spriteSrc, $this->spriteRepeat);
         }
 
-		foreach($this->spriteSrc as $name => $dirs)
+        foreach($this->spriteSrc as $name => $dirs)
         {
-			if(!$this->silentRun)
+            if(!$this->silentRun)
             {
                 $msg = string_format($mod_strings['LBL_SPRITES_CREATING_NAMESPACE'], array($name));
                 $GLOBALS['log']->debug($msg);
-				$this->logMessage($msg);
+                $this->logMessage($msg);
             }
 
-			// setup config for sprite placement algorithm
-			if(substr($name, 0, 6) == 'repeat')
+            // setup config for sprite placement algorithm
+            if(substr($name, 0, 6) == 'repeat')
             {
-				$isRepeat = true;
+                $isRepeat = true;
                 $type = substr($name, 7, 10) == 'horizontal' ? 'horizontal' : 'vertical';
-				$config = array(
-					'type' => $type,
-				);
-			} else {
-				$isRepeat = false;
-				$config = array(
-					'type' => 'boxed',
-					'width' => $this->maxWidth,
-					'height' => $this->maxHeight,
-					'rowcnt' => $this->rowCnt,
-				);
-			}
-
-			// use separate class to arrange the images
-			$sp = new SpritePlacement($dirs, $config);
-			$sp->processSprites();
-
-			//if(! $this->silentRun)
-			//	echo " (size {$sp->width()}x{$sp->height()})<br />";
-
-			// we need a target image size
-			if($sp->width() && $sp->height())
+                $config = array(
+                    'type' => $type,
+                );
+            } else {
+                $isRepeat = false;
+                $config = array(
+                    'type' => 'boxed',
+                    'width' => $this->maxWidth,
+                    'height' => $this->maxHeight,
+                    'rowcnt' => $this->rowCnt,
+                );
+            }
+
+            // use separate class to arrange the images
+            $sp = new SpritePlacement($dirs, $config);
+            $sp->processSprites();
+
+            //if(! $this->silentRun)
+            //	echo " (size {$sp->width()}x{$sp->height()})<br />";
+
+            // we need a target image size
+            if($sp->width() && $sp->height())
             {
-				// init sprite image
-				$this->initSpriteImg($sp->width(), $sp->height());
+                // init sprite image
+                $this->initSpriteImg($sp->width(), $sp->height());
 
-				// add sprites based upon determined coordinates
-				foreach($dirs as $dir => $files)
+                // add sprites based upon determined coordinates
+                foreach($dirs as $dir => $files)
                 {
-					if(!$this->silentRun)
+                    if(!$this->silentRun)
                     {
                         $msg = string_format($mod_strings['LBL_SPRITES_PROCESSING_DIR'], array($dir));
                         $GLOBALS['log']->debug($msg);
                         $this->logMessage($msg);
                     }
 
-					foreach($files as $file => $info)
+                    foreach($files as $file => $info)
                     {
-						if($im = $this->loadImage($dir, $file, $info['type']))
+                        if($im = $this->loadImage($dir, $file, $info['type']))
                         {
-							// coordinates
-							$dst_x = $sp->spriteMatrix[$dir.'/'.$file]['x'];
-							$dst_y = $sp->spriteMatrix[$dir.'/'.$file]['y'];
+                            // coordinates
+                            $dst_x = $sp->spriteMatrix[$dir.'/'.$file]['x'];
+                            $dst_y = $sp->spriteMatrix[$dir.'/'.$file]['y'];
 
-							imagecopy($this->spriteImg, $im, $dst_x, $dst_y, 0, 0, $info['x'], $info['y']);
-							imagedestroy($im);
+                            imagecopy($this->spriteImg, $im, $dst_x, $dst_y, 0, 0, $info['x'], $info['y']);
+                            imagedestroy($im);
 
-							if(!$this->silentRun)
+                            if(!$this->silentRun)
                             {
                                 $msg = string_format($mod_strings['LBL_SPRITES_ADDED'], array("{$dir}/{$file}"));
                                 $GLOBALS['log']->debug($msg);
                                 $this->logMessage($msg);
                             }
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				// dir & filenames
-				if($isRepeat)
+                // dir & filenames
+                if($isRepeat)
                 {
-					$outputDir = sugar_cached("sprites/Repeatable");
-					$spriteFileName = "{$name}.png";
-					$cssFileName = "{$this->fileName}.css";
-					$metaFileName = "{$this->fileName}.meta.php";
-					$nameSpace = "Repeatable";
-				} else {
-					$outputDir = sugar_cached("sprites/$name");
-					$spriteFileName = "{$this->fileName}.png";
-					$cssFileName = "{$this->fileName}.css";
-					$metaFileName = "{$this->fileName}.meta.php";
-					$nameSpace = "{$name}";
-				}
-
-				// directory structure
-				if(!is_dir(sugar_cached("sprites/$nameSpace")))
+                    $outputDir = sugar_cached("sprites/Repeatable");
+                    $spriteFileName = "{$name}.png";
+                    $cssFileName = "{$this->fileName}.css";
+                    $metaFileName = "{$this->fileName}.meta.php";
+                    $nameSpace = "Repeatable";
+                } else {
+                    $outputDir = sugar_cached("sprites/$name");
+                    $spriteFileName = "{$this->fileName}.png";
+                    $cssFileName = "{$this->fileName}.css";
+                    $metaFileName = "{$this->fileName}.meta.php";
+                    $nameSpace = "{$name}";
+                }
+
+                // directory structure
+                if(!is_dir(sugar_cached("sprites/$nameSpace")))
                 {
-					sugar_mkdir(sugar_cached("sprites/$nameSpace"), 0775, true);
+                    sugar_mkdir(sugar_cached("sprites/$nameSpace"), 0775, true);
                 }
 
-				// save sprite image
-				imagepng($this->spriteImg, "$outputDir/$spriteFileName", $this->pngCompression, $this->pngFilter);
-				imagedestroy($this->spriteImg);
+                // save sprite image
+                imagepng($this->spriteImg, "$outputDir/$spriteFileName", $this->pngCompression, $this->pngFilter);
+                imagedestroy($this->spriteImg);
 
-				/* generate css & metadata */
+                /* generate css & metadata */
 
-				$head = '';
-				$body = '';
-				$metadata = '';
+                $head = '';
+                $body = '';
+                $metadata = '';
 
-				foreach($sp->spriteSrc as $id => $info)
+                foreach($sp->spriteSrc as $id => $info)
                 {
-					// sprite id
-					$hash_id = md5($id);
+                    // sprite id
+                    $hash_id = md5($id);
 
-					// header
-					$head .= "span.spr_{$hash_id},\n";
+                    // header
+                    $head .= "span.spr_{$hash_id},\n";
 
-					// image size
-					$w = $info['x'];
-					$h = $info['y'];
+                    // image size
+                    $w = $info['x'];
+                    $h = $info['y'];
 
-					// image offset
-					$offset_x = $sp->spriteMatrix[$id]['x'];
-					$offset_y = $sp->spriteMatrix[$id]['y'];
+                    // image offset
+                    $offset_x = $sp->spriteMatrix[$id]['x'];
+                    $offset_y = $sp->spriteMatrix[$id]['y'];
 
-					// sprite css
-					$body .= "/* {$id} */
+                    // sprite css
+                    $body .= "/* {$id} */
 span.spr_{$hash_id} {
 width: {$w}px;
 height: {$h}px;
 background-position: -{$offset_x}px -{$offset_y}px;
 }\n";
 
-					$metadata .= '$sprites["'.$id.'"] = array ("class"=>"'.$hash_id.'","width"=>"'.$w.'","height"=>"'.$h.'");'."\n";
-				}
+                    $metadata .= '$sprites["'.$id.'"] = array ("class"=>"'.$hash_id.'","width"=>"'.$w.'","height"=>"'.$h.'");'."\n";
+                }
 
-				// common css header
+                // common css header
                 require_once('include/utils.php');
                 $bg_path = getVersionedPath('index.php').'&entryPoint=getImage&imageName='.$spriteFileName.'&spriteNamespace='.$nameSpace;
-				$head = rtrim($head, "\n,")." {background: url('../../../{$bg_path}'); no-repeat;display:inline-block;}\n";
+                $head = rtrim($head, "\n,")." {background: url('../../../{$bg_path}'); no-repeat;display:inline-block;}\n";
 
-				// append mode for repeatable sprites
+                // append mode for repeatable sprites
                 $fileMode = $isRepeat ? 'a' : 'w';
 
-				// save css
-				$css_content = "\n/* autogenerated sprites - $name */\n".$head.$body;
-				if($this->cssMinify)
+                // save css
+                $css_content = "\n/* autogenerated sprites - $name */\n".$head.$body;
+                if($this->cssMinify)
                 {
-					$css_content = cssmin::minify($css_content);
+                    $css_content = cssmin::minify($css_content);
                 }
-				$fh = fopen("$outputDir/$cssFileName", $fileMode);
-				fwrite($fh, $css_content);
-				fclose($fh);
-
-				/* save metadata */
-				$add_php_tag = (file_exists("$outputDir/$metaFileName") && $isRepeat) ? false : true;
-				$fh = fopen("$outputDir/$metaFileName", $fileMode);
-				if($add_php_tag)
+                $fh = fopen("$outputDir/$cssFileName", $fileMode);
+                fwrite($fh, $css_content);
+                fclose($fh);
+
+                /* save metadata */
+                $add_php_tag = (file_exists("$outputDir/$metaFileName") && $isRepeat) ? false : true;
+                $fh = fopen("$outputDir/$metaFileName", $fileMode);
+                if($add_php_tag)
                 {
-					fwrite($fh, '<?php');
+                    fwrite($fh, '<?php');
                 }
-				fwrite($fh, "\n/* sprites metadata - $name */\n");
-				fwrite($fh, $metadata."\n");
-				fclose($fh);
+                fwrite($fh, "\n/* sprites metadata - $name */\n");
+                fwrite($fh, $metadata."\n");
+                fclose($fh);
 
-			// if width & height
-			} else {
+            // if width & height
+            } else {
 
-				if(!$this->silentRun)
+                if(!$this->silentRun)
                 {
                     $msg = string_format($mod_strings['LBL_SPRITES_ADDED'], array($name));
                     $GLOBALS['log']->debug($msg);
                     $this->logMessage($msg);
                 }
 
-			}
+            }
 
-		}
-		return true;
-	}
+        }
+        return true;
+    }
 
 
-	/**
+    /**
      * initSpriteImg
      *
      * @param w int value representing width of sprite
      * @param h int value representing height of sprite
      * Private function to initialize creating the sprite canvas image
      */
-	private function initSpriteImg($w, $h) {
-		$this->spriteImg = imagecreatetruecolor($w,$h);
-		$transparent = imagecolorallocatealpha($this->spriteImg, 0, 0, 0, 127);
-		imagefill($this->spriteImg, 0, 0, $transparent);
-		imagealphablending($this->spriteImg, false);
-		imagesavealpha($this->spriteImg, true);
-	}
+    private function initSpriteImg($w, $h) {
+        $this->spriteImg = imagecreatetruecolor($w,$h);
+        $transparent = imagecolorallocatealpha($this->spriteImg, 0, 0, 0, 127);
+        imagefill($this->spriteImg, 0, 0, $transparent);
+        imagealphablending($this->spriteImg, false);
+        imagesavealpha($this->spriteImg, true);
+    }
 
 
-	/**
+    /**
      * loadImage
      *
      * private function to load image resources
@@ -484,19 +484,19 @@ 
      * @param $type String value of the file type (IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG)
      *
      */
-	private function loadImage($dir, $file, $type) {
-		$path_file = $dir.'/'.$file;
-		switch($type) {
-			case IMAGETYPE_GIF:
-				return imagecreatefromgif($path_file);
-			case IMAGETYPE_JPEG:
-				return imagecreatefromjpeg($path_file);
-			case IMAGETYPE_PNG:
-				return imagecreatefrompng($path_file);
-			default:
-				return false;
-		}
-	}
+    private function loadImage($dir, $file, $type) {
+        $path_file = $dir.'/'.$file;
+        switch($type) {
+            case IMAGETYPE_GIF:
+                return imagecreatefromgif($path_file);
+            case IMAGETYPE_JPEG:
+                return imagecreatefromjpeg($path_file);
+            case IMAGETYPE_PNG:
+                return imagecreatefrompng($path_file);
+            default:
+                return false;
+        }
+    }
 
     /**
      * private logMessage
@@ -527,17 +527,17 @@ 
 class SpritePlacement
 {
 
-	// occupied space
-	var $spriteMatrix = array();
+    // occupied space
+    var $spriteMatrix = array();
 
-	// minimum surface
-	var $minSurface = 0;
+    // minimum surface
+    var $minSurface = 0;
 
-	// sprite src (flattened array)
-	var $spriteSrc = array();
+    // sprite src (flattened array)
+    var $spriteSrc = array();
 
-	// placement config array
-	/*
+    // placement config array
+    /*
 		type = 	boxed
 				horizontal
 				vertical
@@ -548,99 +548,99 @@ 
 				-> rowcnt
 
 	*/
-	var $config = array();
-
-	function __construct($spriteSrc, $config) {
-
-		// convert spriteSrc to flat array
-		foreach($spriteSrc as $dir => $files) {
-			foreach($files as $file => $info) {
-				// use full path as identifier
-				$full_path = $dir.'/'.$file;
-				$this->spriteSrc[$full_path] = $info;
-			}
-		}
-
-		$this->config = $config;
-	}
-
-	function processSprites() {
-
-		foreach($this->spriteSrc as $id => $info) {
-
-			// dimensions
-			$x = $info['x'];
-			$y = $info['y'];
-
-			// update min surface
-			$this->minSurface += $x * $y;
-
-			// get coordinates where to add this sprite
-			if($coor = $this->addSprite($x, $y)) {
-				$this->spriteMatrix[$id] = $coor;
-			}
-		}
-	}
-
-	// returns x/y coordinates to fit the sprite
-	function addSprite($w, $h) {
-		$result = false;
-
-		switch($this->config['type']) {
-
-			// boxed
-			case 'boxed':
-
-				$spriteX = $this->config['width'];
-				$spriteY = $this->config['height'];
-				$spriteCnt = count($this->spriteMatrix) + 1;
-				$y = ceil($spriteCnt / $this->config['rowcnt']);
-				$x = $spriteCnt - (($y - 1) * $this->config['rowcnt']);
-				$result = array(
-					'x' => ($x * $spriteX) + 1 - $spriteX,
-					'y' => ($y * $spriteY) + 1 - $spriteY);
-
-				break;
-
-			// horizontal -> align vertically
-			case 'horizontal':
-				$result = array('x' => 1, 'y' => $this->height() + 1);
-				break;
-
-			// vertical -> align horizontally
-			case 'vertical':
-				$result = array('x' => $this->width() + 1, 'y' => 1);
-				break;
-
-			default:
-				$GLOBALS['log']->warn(__CLASS__.": Unknown sprite placement algorithm -> {$this->config['type']}");
-				break;
-		}
-
-		return $result;
-	}
-
-	// calculate total width
-	function width() {
-		return $this->getMaxAxis('x');
-	}
-
-	// calculate total height
-	function height() {
-		return $this->getMaxAxis('y');
-	}
-
-	// helper function to get highest axis value
-	function getMaxAxis($axis) {
-		$val = 0;
-		foreach($this->spriteMatrix as $id => $coor) {
-			$new_val = $coor[$axis] + $this->spriteSrc[$id][$axis] - 1;
-			if($new_val > $val) {
-				$val = $new_val;
-			}
-		}
-		return $val;
-	}
+    var $config = array();
+
+    function __construct($spriteSrc, $config) {
+
+        // convert spriteSrc to flat array
+        foreach($spriteSrc as $dir => $files) {
+            foreach($files as $file => $info) {
+                // use full path as identifier
+                $full_path = $dir.'/'.$file;
+                $this->spriteSrc[$full_path] = $info;
+            }
+        }
+
+        $this->config = $config;
+    }
+
+    function processSprites() {
+
+        foreach($this->spriteSrc as $id => $info) {
+
+            // dimensions
+            $x = $info['x'];
+            $y = $info['y'];
+
+            // update min surface
+            $this->minSurface += $x * $y;
+
+            // get coordinates where to add this sprite
+            if($coor = $this->addSprite($x, $y)) {
+                $this->spriteMatrix[$id] = $coor;
+            }
+        }
+    }
+
+    // returns x/y coordinates to fit the sprite
+    function addSprite($w, $h) {
+        $result = false;
+
+        switch($this->config['type']) {
+
+            // boxed
+            case 'boxed':
+
+                $spriteX = $this->config['width'];
+                $spriteY = $this->config['height'];
+                $spriteCnt = count($this->spriteMatrix) + 1;
+                $y = ceil($spriteCnt / $this->config['rowcnt']);
+                $x = $spriteCnt - (($y - 1) * $this->config['rowcnt']);
+                $result = array(
+                    'x' => ($x * $spriteX) + 1 - $spriteX,
+                    'y' => ($y * $spriteY) + 1 - $spriteY);
+
+                break;
+
+            // horizontal -> align vertically
+            case 'horizontal':
+                $result = array('x' => 1, 'y' => $this->height() + 1);
+                break;
+
+            // vertical -> align horizontally
+            case 'vertical':
+                $result = array('x' => $this->width() + 1, 'y' => 1);
+                break;
+
+            default:
+                $GLOBALS['log']->warn(__CLASS__.": Unknown sprite placement algorithm -> {$this->config['type']}");
+                break;
+        }
+
+        return $result;
+    }
+
+    // calculate total width
+    function width() {
+        return $this->getMaxAxis('x');
+    }
+
+    // calculate total height
+    function height() {
+        return $this->getMaxAxis('y');
+    }
+
+    // helper function to get highest axis value
+    function getMaxAxis($axis) {
+        $val = 0;
+        foreach($this->spriteMatrix as $id => $coor) {
+            $new_val = $coor[$axis] + $this->spriteSrc[$id][$axis] - 1;
+            if($new_val > $val) {
+                $val = $new_val;
+            }
+        }
+        return $val;
+    }
 }
 
 ?>

Spacing +54 added lines, -54 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.
@@ -83,19 +83,19 @@ 
     public function __construct()
     {
 		// check if we have gd installed
-		if(function_exists('imagecreatetruecolor'))
+		if (function_exists('imagecreatetruecolor'))
         {
 			$this->isAvailable = true;
-            foreach($this->supportedTypeMap as $gd_bit => $imagetype)
+            foreach ($this->supportedTypeMap as $gd_bit => $imagetype)
             {
-                if(imagetypes() & $gd_bit) {
+                if (imagetypes() & $gd_bit) {
                     // swap gd_bit & imagetype
                     $this->imageTypes[$imagetype] = $gd_bit;
                 }
             }
 		}
 
-        if(function_exists('logThis') && isset($GLOBALS['path']))
+        if (function_exists('logThis') && isset($GLOBALS['path']))
         {
             $this->writeToUpgradeLog = true;
         }
@@ -112,7 +112,7 @@ 
 	public function addDirectory($name, $dir) {
 
 		// sprite namespace
-		if(!array_key_exists($name, $this->spriteSrc))
+		if (!array_key_exists($name, $this->spriteSrc))
         {
 			$this->spriteSrc[$name] = array();
 		}
@@ -129,8 +129,8 @@ 
      */
 	private function getFileList($dir) {
 		$list = array();
-		if(is_dir($dir)) {
-			if($dh = opendir($dir)) {
+		if (is_dir($dir)) {
+			if ($dh = opendir($dir)) {
 
 				// optional sprites_config.php file
 				$this->loadSpritesConfig($dir);
@@ -141,10 +141,10 @@ 
                     {
 
 						// file info & check supported image format
-						if($info = $this->getFileInfo($dir, $file)) {
+						if ($info = $this->getFileInfo($dir, $file)) {
 
 							// skip excluded files
-							if(isset($this->sprites_config[$dir]['exclude']) && array_search($file, $this->sprites_config[$dir]['exclude']) !== false)
+							if (isset($this->sprites_config[$dir]['exclude']) && array_search($file, $this->sprites_config[$dir]['exclude']) !== false)
                             {
                                 global $mod_strings;
                                 $msg = string_format($mod_strings['LBL_SPRITES_EXCLUDING_FILE'], array("{$dir}/{$file}"));
@@ -154,11 +154,11 @@ 
 								// repeatable sprite ?
 								$isRepeat = false;
 
-								if(isset($this->sprites_config[$dir]['repeat']))
+								if (isset($this->sprites_config[$dir]['repeat']))
                                 {
-									foreach($this->sprites_config[$dir]['repeat'] as $repeat)
+									foreach ($this->sprites_config[$dir]['repeat'] as $repeat)
                                     {
-										if($info['x'] == $repeat['width'] && $info['y'] == $repeat['height'])
+										if ($info['x'] == $repeat['width'] && $info['y'] == $repeat['height'])
                                         {
 											$id = md5($repeat['width'].$repeat['height'].$repeat['direction']);
 											$isRepeat = true;
@@ -167,13 +167,13 @@ 
 									}
 								}
 
-								if(!$isRepeat)
+								if (!$isRepeat)
                                 {
 									$list[$file] = $info;
                                 }
 							}
-						} else if(preg_match('/\.(jpg|jpeg|gif|png|bmp|ico)$/i', $file)) {
-                            $GLOBALS['log']->error('Unable to process image file ' . $file);
+						} else if (preg_match('/\.(jpg|jpeg|gif|png|bmp|ico)$/i', $file)) {
+                            $GLOBALS['log']->error('Unable to process image file '.$file);
                             //$this->logMessage('Unable to process image file ' . $file);
                         }
 	   	     		}
@@ -196,10 +196,10 @@ 
      */
 	private function loadSpritesConfig($dir) {
 		$sprites_config = array();
-		if(file_exists("$dir/sprites_config.php"))
+		if (file_exists("$dir/sprites_config.php"))
         {
 			include("$dir/sprites_config.php");
-			if(count($sprites_config)) {
+			if (count($sprites_config)) {
 				$this->sprites_config = array_merge($this->sprites_config, $sprites_config);
 			}
 		}
@@ -217,10 +217,10 @@ 
 	private function getFileInfo($dir, $file) {
 		$result = false;
 		$info = @getimagesize($dir.'/'.$file);
-		if($info) {
+		if ($info) {
 
 			// supported image type ?
-			if(isset($this->imageTypes[$info[2]]))
+			if (isset($this->imageTypes[$info[2]]))
             {
 				$w = $info[0];
 				$h = $info[1];
@@ -228,16 +228,16 @@ 
 
 				// be sure we have an image size
 				$addSprite = false;
-				if($surface)
+				if ($surface)
                 {
 					// sprite dimensions
-					if($w <= $this->maxWidth && $h <= $this->maxHeight)
+					if ($w <= $this->maxWidth && $h <= $this->maxHeight)
                     {
 						$addSprite = true;
 					}
 				}
 
-				if($addSprite)
+				if ($addSprite)
                 {
 					$result = array();
 					$result['x'] = $w;
@@ -265,9 +265,9 @@ 
 
         global $mod_strings;
 
-		if(!$this->isAvailable)
+		if (!$this->isAvailable)
         {
-			if(!$this->silentRun)
+			if (!$this->silentRun)
             {
                 $msg = $mod_strings['LBL_SPRITES_NOT_SUPPORTED'];
                 $GLOBALS['log']->warn($msg);
@@ -277,14 +277,14 @@ 
 		}
 
 		// add repeatable sprites
-		if(count($this->spriteRepeat))
+		if (count($this->spriteRepeat))
         {
 			$this->spriteSrc = array_merge($this->spriteSrc, $this->spriteRepeat);
         }
 
-		foreach($this->spriteSrc as $name => $dirs)
+		foreach ($this->spriteSrc as $name => $dirs)
         {
-			if(!$this->silentRun)
+			if (!$this->silentRun)
             {
                 $msg = string_format($mod_strings['LBL_SPRITES_CREATING_NAMESPACE'], array($name));
                 $GLOBALS['log']->debug($msg);
@@ -292,7 +292,7 @@ 
             }
 
 			// setup config for sprite placement algorithm
-			if(substr($name, 0, 6) == 'repeat')
+			if (substr($name, 0, 6) == 'repeat')
             {
 				$isRepeat = true;
                 $type = substr($name, 7, 10) == 'horizontal' ? 'horizontal' : 'vertical';
@@ -317,24 +317,24 @@ 
 			//	echo " (size {$sp->width()}x{$sp->height()})<br />";
 
 			// we need a target image size
-			if($sp->width() && $sp->height())
+			if ($sp->width() && $sp->height())
             {
 				// init sprite image
 				$this->initSpriteImg($sp->width(), $sp->height());
 
 				// add sprites based upon determined coordinates
-				foreach($dirs as $dir => $files)
+				foreach ($dirs as $dir => $files)
                 {
-					if(!$this->silentRun)
+					if (!$this->silentRun)
                     {
                         $msg = string_format($mod_strings['LBL_SPRITES_PROCESSING_DIR'], array($dir));
                         $GLOBALS['log']->debug($msg);
                         $this->logMessage($msg);
                     }
 
-					foreach($files as $file => $info)
+					foreach ($files as $file => $info)
                     {
-						if($im = $this->loadImage($dir, $file, $info['type']))
+						if ($im = $this->loadImage($dir, $file, $info['type']))
                         {
 							// coordinates
 							$dst_x = $sp->spriteMatrix[$dir.'/'.$file]['x'];
@@ -343,7 +343,7 @@ 
 							imagecopy($this->spriteImg, $im, $dst_x, $dst_y, 0, 0, $info['x'], $info['y']);
 							imagedestroy($im);
 
-							if(!$this->silentRun)
+							if (!$this->silentRun)
                             {
                                 $msg = string_format($mod_strings['LBL_SPRITES_ADDED'], array("{$dir}/{$file}"));
                                 $GLOBALS['log']->debug($msg);
@@ -354,7 +354,7 @@ 
 				}
 
 				// dir & filenames
-				if($isRepeat)
+				if ($isRepeat)
                 {
 					$outputDir = sugar_cached("sprites/Repeatable");
 					$spriteFileName = "{$name}.png";
@@ -370,7 +370,7 @@ 
 				}
 
 				// directory structure
-				if(!is_dir(sugar_cached("sprites/$nameSpace")))
+				if (!is_dir(sugar_cached("sprites/$nameSpace")))
                 {
 					sugar_mkdir(sugar_cached("sprites/$nameSpace"), 0775, true);
                 }
@@ -385,7 +385,7 @@ 
 				$body = '';
 				$metadata = '';
 
-				foreach($sp->spriteSrc as $id => $info)
+				foreach ($sp->spriteSrc as $id => $info)
                 {
 					// sprite id
 					$hash_id = md5($id);
@@ -422,7 +422,7 @@ 
 
 				// save css
 				$css_content = "\n/* autogenerated sprites - $name */\n".$head.$body;
-				if($this->cssMinify)
+				if ($this->cssMinify)
                 {
 					$css_content = cssmin::minify($css_content);
                 }
@@ -433,7 +433,7 @@ 
 				/* save metadata */
 				$add_php_tag = (file_exists("$outputDir/$metaFileName") && $isRepeat) ? false : true;
 				$fh = fopen("$outputDir/$metaFileName", $fileMode);
-				if($add_php_tag)
+				if ($add_php_tag)
                 {
 					fwrite($fh, '<?php');
                 }
@@ -444,7 +444,7 @@ 
 			// if width & height
 			} else {
 
-				if(!$this->silentRun)
+				if (!$this->silentRun)
                 {
                     $msg = string_format($mod_strings['LBL_SPRITES_ADDED'], array($name));
                     $GLOBALS['log']->debug($msg);
@@ -466,7 +466,7 @@ 
      * Private function to initialize creating the sprite canvas image
      */
 	private function initSpriteImg($w, $h) {
-		$this->spriteImg = imagecreatetruecolor($w,$h);
+		$this->spriteImg = imagecreatetruecolor($w, $h);
 		$transparent = imagecolorallocatealpha($this->spriteImg, 0, 0, 0, 127);
 		imagefill($this->spriteImg, 0, 0, $transparent);
 		imagealphablending($this->spriteImg, false);
@@ -486,7 +486,7 @@ 
      */
 	private function loadImage($dir, $file, $type) {
 		$path_file = $dir.'/'.$file;
-		switch($type) {
+		switch ($type) {
 			case IMAGETYPE_GIF:
 				return imagecreatefromgif($path_file);
 			case IMAGETYPE_JPEG:
@@ -508,13 +508,13 @@ 
      */
     private function logMessage($msg)
     {
-        if(!$this->silentRun && !$this->fromSilentUpgrade)
+        if (!$this->silentRun && !$this->fromSilentUpgrade)
         {
-            echo $msg . '<br />';
+            echo $msg.'<br />';
         } else if ($this->fromSilentUpgrade && $this->writeToUpgradeLog) {
             logThis($msg, $GLOBALS['path']);
-        } else if(!$this->silentRun) {
-            echo $msg . "\n";
+        } else if (!$this->silentRun) {
+            echo $msg."\n";
         }
     }
 }
@@ -553,8 +553,8 @@ 
 	function __construct($spriteSrc, $config) {
 
 		// convert spriteSrc to flat array
-		foreach($spriteSrc as $dir => $files) {
-			foreach($files as $file => $info) {
+		foreach ($spriteSrc as $dir => $files) {
+			foreach ($files as $file => $info) {
 				// use full path as identifier
 				$full_path = $dir.'/'.$file;
 				$this->spriteSrc[$full_path] = $info;
@@ -566,7 +566,7 @@ 
 
 	function processSprites() {
 
-		foreach($this->spriteSrc as $id => $info) {
+		foreach ($this->spriteSrc as $id => $info) {
 
 			// dimensions
 			$x = $info['x'];
@@ -576,7 +576,7 @@ 
 			$this->minSurface += $x * $y;
 
 			// get coordinates where to add this sprite
-			if($coor = $this->addSprite($x, $y)) {
+			if ($coor = $this->addSprite($x, $y)) {
 				$this->spriteMatrix[$id] = $coor;
 			}
 		}
@@ -586,7 +586,7 @@ 
 	function addSprite($w, $h) {
 		$result = false;
 
-		switch($this->config['type']) {
+		switch ($this->config['type']) {
 
 			// boxed
 			case 'boxed':
@@ -633,9 +633,9 @@ 
 	// helper function to get highest axis value
 	function getMaxAxis($axis) {
 		$val = 0;
-		foreach($this->spriteMatrix as $id => $coor) {
+		foreach ($this->spriteMatrix as $id => $coor) {
 			$new_val = $coor[$axis] + $this->spriteSrc[$id][$axis] - 1;
-			if($new_val > $val) {
+			if ($new_val > $val) {
 				$val = $new_val;
 			}
 		}

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.