adamjakab / SuiteCRM

modules/Administration/updater_utils.php

Braces +21 added lines, -15 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.
@@ -94,10 +96,11 @@ 
 
 		if(!$send_usage_info){
 			$info['latest_tracker_id'] = -1;
-		}else{
+		} else{
 			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
+			if ( $id !== false ) {
+						    $info['latest_tracker_id'] = $id;
+			}
 		}
 
 		$info['db_type']=$sugar_config['dbconfig']['db_type'];
@@ -105,7 +108,9 @@ 
 	}
 	if(file_exists('distro.php')){
 		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
+		if(!empty($distro_name)) {
+		    $info['distro_name'] = $distro_name;
+		}
 	}
 	$info['os'] = php_uname('s');
 	$info['os_version'] = php_uname('r');
@@ -143,14 +148,16 @@ 
 
 
 	$return_array=array();
-    if(!$from_install && empty($license))loadLicense(true);
+    if(!$from_install && empty($license)) {
+        loadLicense(true);
+    }
 
 	if(!$response_data){
 
         if($from_install){
     		$info = getBaseSystemInfo(false);
 
-        }else{
+        } else{
             $info = getSystemInfo($send_usage_info);
         }
 
@@ -183,7 +190,7 @@ 
 		}
 		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
 
-	}else{
+	} else{
 		$encodedResult = 	$response_data['data'];
 		$key = $response_data['key'];
 
@@ -197,7 +204,7 @@ 
 			$resultData = array();
 			$resultData['validation'] = 'invalid validation key';
 		}
-	}else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -209,22 +216,21 @@ 
 		if(!empty($resultData['msg'])){
 			if(!empty($resultData['msg']['admin'])){
 				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_admin','');
 			}
 			if(!empty($resultData['msg']['all'])){
 				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_all','');
 			}
-		}else{
+		} else{
 			$license->saveSetting('license', 'msg_admin','');
 			$license->saveSetting('license', 'msg_all','');
 		}
 		$license->saveSetting('license', 'last_validation', 'success');
 		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -243,7 +249,7 @@ 
 	if(!empty($resultData['versions'])){
 
 		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
+	} else{
 		$resultData['versions'] = array();
 		$license->saveSetting('license', 'latest_versions','')	;
 	}

modules/Administration/DiagnosticDownload.php

Braces +6 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +44,9 @@ 
 global $current_user;
 
 
-if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
 {
     sugar_die("Unauthorized access to diagnostic tool.");

modules/Administration/expandDatabase.php

Braces +4 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -157,7 +159,7 @@ 
 			    echo "<b>{$mod_strings['LBL_EXPAND_DATABASE_FINISHED_ERROR']}</b><br>";
 		} //if-else
 	} //if
-}else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 

modules/Administration/upgrade_custom_relationships.php

Braces +12 added lines, -7 removed lines

@@ -45,13 +45,16 @@ 
 function upgrade_custom_relationships($modules = array())
 {
 	global $current_user, $moduleList;
-	if (!is_admin($current_user)) sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']); 
+	if (!is_admin($current_user)) {
+	    sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
+	}
 	
 	require_once("modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php");
 	require_once("modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php");
 	
-	if (empty($modules))
-		$modules = $moduleList;
+	if (empty($modules)) {
+			$modules = $moduleList;
+	}
 	
 	foreach($modules as $module)
 	{
@@ -65,8 +68,9 @@ 
 			if ($def['lhs_module'] == $def['rhs_module'] && $def['is_custom'] && $def['relationship_type'] == "one-to-many")
 			{
 				$layout_defs = array();
-				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs"))
-					continue;
+				if (!is_dir("custom/Extension/modules/$module/Ext/Layoutdefs") || !is_dir("custom/Extension/modules/$module/Ext/Vardefs")) {
+									continue;
+				}
 				//Find the extension file containing the vardefs for this relationship
 				foreach(scandir("custom/Extension/modules/$module/Ext/Vardefs") as $file)
 				{
@@ -121,5 +125,6 @@ 
 	}
 }
 
-if (isset($_REQUEST['execute']) && $_REQUEST['execute'])
-	upgrade_custom_relationships();
\ No newline at end of file
+if (isset($_REQUEST['execute']) && $_REQUEST['execute']) {
+	upgrade_custom_relationships();
+}

modules/Administration/DiagnosticDelete.php

Braces +7 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.
@@ -60,8 +62,7 @@ 
 if(empty($_REQUEST['file']) || empty($_REQUEST['guid']))
 {
 	echo $mod_strings['LBL_DIAGNOSTIC_DELETE_ERROR'];
-}
-else
+} else
 {
     // Make sure the guid and file are valid file names for security purposes
     clean_string($_REQUEST['guid'], "ALPHANUM");
@@ -79,10 +80,10 @@ 
   	  unlink($cachedfile);
   	  rmdir(dirname($cachedfile));
 	  echo $mod_strings['LBL_DIAGNOSTIC_DELETED']."<br><br>";
+	} else {
+		  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
+	}
 	}
-	else
-	  echo $mod_strings['LBL_DIAGNOSTIC_FILE'] . $_REQUEST['file'].$mod_strings['LBL_DIAGNOSTIC_ZIP'];
-}
 
 print "<a href=\"index.php?module=Administration&action=index\">" . $mod_strings['LBL_DIAGNOSTIC_DELETE_RETURN'] . "</a><br>";
 

modules/Administration/RebuildRelationship.php

Braces +29 added lines, -17 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.
@@ -67,11 +68,13 @@ 
         if ( $focus instanceOf SugarBean ) {
             $table_name = $focus->table_name ;
             $empty = array() ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_REBUILD_REL_PROC_META' ] . $focus->table_name . "..." ;
+            if (empty ( $_REQUEST [ 'silent' ] )) {
+                            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_META' ] . $focus->table_name . "..." ;
+            }
             SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir ) ;
-            if (empty ( $_REQUEST [ 'silent' ] ))
-                echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+            if (empty ( $_REQUEST [ 'silent' ] )) {
+                            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+            }
         }
     }
 }
@@ -80,7 +83,9 @@ 
 foreach ( $GLOBALS['beanFiles'] as $bean => $file )
 {
 	//skip this file if it does not exist
-	if(!file_exists($file)) continue;
+	if(!file_exists($file)) {
+	    continue;
+	}
 
 	if (! class_exists ( $bean ))
     {
@@ -90,11 +95,13 @@ 
     if ( $focus instanceOf SugarBean ) {
         $table_name = $focus->table_name ;
         $empty = array() ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $focus->table_name . "..." ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $focus->table_name . "..." ;
+        }
         SugarBean::createRelationshipMeta ( $focus->getObjectName (), $db, $table_name, $empty, $focus->module_dir, true ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        }
     }
 }
 
@@ -111,24 +118,28 @@ 
     {
         $table = isset($rel_data [ 'table' ]) ? $rel_data [ 'table' ] : "" ;
 
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $rel_name . "..." ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_REBUILD_REL_PROC_C_META' ] . $rel_name . "..." ;
+        }
         SugarBean::createRelationshipMeta ( $rel_name, $db, $table, $rel_dictionary, '' ) ;
-        if (empty ( $_REQUEST [ 'silent' ] ))
-            echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        if (empty ( $_REQUEST [ 'silent' ] )) {
+                    echo $mod_strings [ 'LBL_DONE' ] . '<br>' ;
+        }
     }
 
 //clean relationship cache..will be rebuilt upon first access.
-if (empty ( $_REQUEST [ 'silent' ] ))
+if (empty ( $_REQUEST [ 'silent' ] )) {
     echo $mod_strings [ 'LBL_REBUILD_REL_DEL_CACHE' ] ;
+}
 Relationship::delete_cache () ;
 
 //////////////////////////////////////////////////////////////////////////////
 // Remove the "Rebuild Relationships" red text message on admin logins
 
 
-if (empty ( $_REQUEST [ 'silent' ] ))
+if (empty ( $_REQUEST [ 'silent' ] )) {
     echo $mod_strings [ 'LBL_REBUILD_REL_UPD_WARNING' ] ;
+}
 
 // clear the database row if it exists (just to be sure)
 $query = "DELETE FROM versions WHERE name='Rebuild Relationships'" ;
@@ -153,6 +164,7 @@ 
     unset ( $_SESSION [ 'rebuild_relationships' ] ) ;
 }
 
-if (empty ( $_REQUEST [ 'silent' ] ))
+if (empty ( $_REQUEST [ 'silent' ] )) {
     echo $mod_strings [ 'LBL_DONE' ] ;
+}
 ?>

modules/Administration/RepairFieldCasing.php

Braces +4 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -98,8 +100,7 @@ 
 	       foreach($views as $view) {
                 try{
                     $parser = ParserFactory::getParser($view, $module);
-                }
-                catch(Exception $e){
+                } catch(Exception $e){
                     $GLOBALS['log']->fatal("Caught exception in RepairFieldCasing script: ".$e->getMessage());
                     continue;
                 }

modules/Administration/UpgradeAccess.php

Braces +15 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,7 +50,9 @@ 
 $htaccess_file   = getcwd() . "/.htaccess";
 $contents = '';
 $basePath = parse_url($sugar_config['site_url'], PHP_URL_PATH);
-if(empty($basePath)) $basePath = '/';
+if(empty($basePath)) {
+    $basePath = '/';
+}
 
 $restrict_str = <<<EOQ
 # BEGIN SUGARCRM RESTRICTIONS
@@ -74,9 +78,15 @@ 
     $skip = false;
     while($line = fgets($fp)){
 
-    	if(preg_match('/\s*#\s*BEGIN\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = true;
-        if(!$skip)$contents .= $line;
-        if(preg_match('/\s*#\s*END\s*SUGARCRM\s*RESTRICTIONS/i', $line))$skip = false;
+    	if(preg_match('/\s*#\s*BEGIN\s*SUGARCRM\s*RESTRICTIONS/i', $line)) {
+    	    $skip = true;
+    	}
+        if(!$skip) {
+            $contents .= $line;
+        }
+        if(preg_match('/\s*#\s*END\s*SUGARCRM\s*RESTRICTIONS/i', $line)) {
+            $skip = false;
+        }
     }
 }
 if(substr($contents, -1) != "\n") {

modules/Administration/UpgradeWizard_commit.php

Braces +37 added lines, -33 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -169,14 +171,12 @@ 
 if( $install_type != "module" ){
     if( !isset($_REQUEST['zip_from_dir']) || ($_REQUEST['zip_from_dir'] == "") ){
         $zip_from_dir     = ".";
-    }
-    else{
+    } else{
         $zip_from_dir   = $_REQUEST['zip_from_dir'];
     }
     if( !isset($_REQUEST['zip_to_dir']) || ($_REQUEST['zip_to_dir'] == "") ){
         $zip_to_dir     = ".";
-    }
-    else{
+    } else{
         $zip_to_dir     = $_REQUEST['zip_to_dir'];
     }
 }
@@ -262,10 +262,11 @@ 
 
         $sugar_home_dir = getCwd();
         $dest_file  = clean_path( "$sugar_home_dir/$zip_to_dir/$file_to_copy" );
-        if($zip_to_dir != '.')
-        	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
-        else
-        	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+        if($zip_to_dir != '.') {
+                	$rest_file  = clean_path("$rest_dir/$zip_to_dir/$file_to_copy");
+        } else {
+                	$rest_file  = clean_path("$rest_dir/$file_to_copy");
+        }
 
         switch( $mode ){
             case "Install":
@@ -273,8 +274,9 @@ 
 
                 if($install_type=="patch" && is_file($dest_file))
                 {
-	                if(!is_dir(dirname( $rest_file )))
-                		mkdir_recursive( dirname( $rest_file ) );
+	                if(!is_dir(dirname( $rest_file ))) {
+	                                		mkdir_recursive( dirname( $rest_file ) );
+	                }
 
 	                copy( $dest_file, $rest_file);
 	                sugar_touch( $rest_file, filemtime($dest_file) );
@@ -290,8 +292,7 @@ 
                 {
 	                copy( $rest_file, $dest_file);
 	                sugar_touch( $dest_file, filemtime($rest_file) );
-                }
-                elseif(file_exists($dest_file) && !unlink($dest_file))
+                } elseif(file_exists($dest_file) && !unlink($dest_file))
                 {
                     die($mod_strings['ERR_UW_REMOVE_FAILED'].$dest_file);
                 }
@@ -315,8 +316,7 @@ 
 
         if( $mode == "Install" || $mode=="Enable" ){
             $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
-        }
-        else if( $mode == "Uninstall" || $mode=="Disable" ){
+        } else if( $mode == "Uninstall" || $mode=="Disable" ){
             $new_langs = array();
             $old_langs = $sugar_config['languages'];
             foreach( $old_langs as $key => $value ){
@@ -353,7 +353,7 @@ 
             //here we can determine if this is an upgrade or a new version
             	if(!empty($previous_version)){
             		$mi->install( "$unzip_dir", true, $previous_version);
-            	}else{
+            	} else{
                 	$mi->install( "$unzip_dir" );
             	}
 
@@ -366,24 +366,27 @@ 
 				}
             	break;
             case "Uninstall":
-                if($remove_tables == 'false')
-                	$GLOBALS['mi_remove_tables'] = false;
-                else
-                	$GLOBALS['mi_remove_tables'] = true;
+                if($remove_tables == 'false') {
+                                	$GLOBALS['mi_remove_tables'] = false;
+                } else {
+                                	$GLOBALS['mi_remove_tables'] = true;
+                }
                 $mi->uninstall( "$unzip_dir" );
                 break;
              case "Disable":
-                if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
-                else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                if(!$overwrite_files) {
+                                	$GLOBALS['mi_overwrite_files'] = false;
+                } else {
+                                	$GLOBALS['mi_overwrite_files'] = true;
+                }
                 $mi->disable( "$unzip_dir" );
                 break;
              case "Enable":
-                if(!$overwrite_files)
-                	$GLOBALS['mi_overwrite_files'] = false;
-                else
-                	$GLOBALS['mi_overwrite_files'] = true;
+                if(!$overwrite_files) {
+                                	$GLOBALS['mi_overwrite_files'] = false;
+                } else {
+                                	$GLOBALS['mi_overwrite_files'] = true;
+                }
                 $mi->enable( "$unzip_dir" );
                 break;
             default:
@@ -473,8 +476,9 @@ 
         	if (!empty($manifest['post_install_url']))
         	{
         		$url_conf = $manifest['post_install_url'];
-        		if (is_string($url_conf))
-        			$url_conf = array('url' => $url_conf);
+        		if (is_string($url_conf)) {
+        		        			$url_conf = array('url' => $url_conf);
+        		}
         		if (isset($url_conf['type']) && $url_conf['type'] == 'popup')
         		{
         			echo '<script type="text/javascript">window.open("' . $url_conf['url']
@@ -543,8 +547,9 @@ 
 print( "<input type=submit value=\"{$mod_strings['LBL_UW_BTN_BACK_TO_MOD_LOADER']}\" /><br>" );
 echo "</div>";
 echo "<br>";
-if(isset($lang_changed_string))
+if(isset($lang_changed_string)) {
 	print($lang_changed_string);
+}
 if ($install_type != "module" && $install_type != "langpack"){
     if( sizeof( $files_to_handle ) > 0 ){
         echo '<div style="text-align: left; cursor: hand; cursor: pointer; text-decoration: underline;" onclick=\'this.style.display="none"; toggleDisplay("more");\' id="all_text">' . SugarThemeRegistry::current()->getImage('advanced_search', '', null, null, ".gif", $mod_strings['LBL_ADVANCED_SEARCH']) . ' Show Details</div><div id=\'more\' style=\'display: none\'>
@@ -556,8 +561,7 @@ 
         }
         print( "</ul>\n" );
         echo '</div>';
-    }
-    else if( $mode != 'Disable' && $mode !='Enable' ){
+    } else if( $mode != 'Disable' && $mode !='Enable' ){
         print( "{$mod_strings['LBL_UW_NO_FILES_SELECTED']} $file_action.<br>\n" );
     }