adamjakab / SuiteCRM

modules/FP_Event_Locations/Menu.php

Braces +9 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');
+}
 /**
  * Advanced OpenWorkflow, Automating SugarCRM.
  * @package Advanced OpenWorkflow for SugarCRM
@@ -26,5 +28,9 @@ 
 
 global $mod_strings, $app_strings, $sugar_config;
  
-if(ACLController::checkAccess('FP_Event_Locations', 'edit', true))$module_menu[]=Array("index.php?module=FP_Event_Locations&action=EditView&return_module=FP_Event_Locations&return_action=DetailView", $mod_strings['LNK_NEW_RECORD'],"Create", 'FP_Event_Locations');
-if(ACLController::checkAccess('FP_Event_Locations', 'list', true))$module_menu[]=Array("index.php?module=FP_Event_Locations&action=index", $mod_strings['LNK_LIST'],"List", 'FP_Event_Locations');
\ No newline at end of file
+if(ACLController::checkAccess('FP_Event_Locations', 'edit', true)) {
+    $module_menu[]=Array("index.php?module=FP_Event_Locations&action=EditView&return_module=FP_Event_Locations&return_action=DetailView", $mod_strings['LNK_NEW_RECORD'],"Create", 'FP_Event_Locations');
+}
+if(ACLController::checkAccess('FP_Event_Locations', 'list', true)) {
+    $module_menu[]=Array("index.php?module=FP_Event_Locations&action=index", $mod_strings['LNK_LIST'],"List", 'FP_Event_Locations');
+}

data/Relationships/One2OneRelationship.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.

data/SugarBean.php

Braces +2 added lines, -4 removed lines

@@ -484,8 +484,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -5122,8 +5121,7 @@ 
                 elseif (((!empty($value['type']) && ($value['type'] == 'enum' || $value['type'] == 'radioenum'))) && empty($value['function'])) {
                     if (!empty($value['options']) && !empty($app_list_strings[$value['options']][$this->$field])) {
                         $return_array[$cache[$field]] = $app_list_strings[$value['options']][$this->$field];
-                    }
-                    elseif (!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field])) {
+                    } elseif (!empty($value['options']) && !empty($mod_strings[$value['options']][$this->$field])) {
                         $return_array[$cache[$field]] = $mod_strings[$value['options']][$this->$field];
                     } else {
                         $return_array[$cache[$field]] = $this->$field;

tests/tests/include/utils/LogicHookTest.php

Braces +3 added lines, -6 removed lines

@@ -16,8 +16,7 @@ 
 		try {
 			$LogicHook = new LogicHook();
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 
@@ -303,8 +302,7 @@ 
 		try {
 			$LogicHook->call_custom_logic('', 'after_ui_footer');
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 
@@ -322,8 +320,7 @@ 
 		try {
 			$LogicHook->process_hooks($hooks, 'after_ui_footer',array() );
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 

install.php

Braces +13 added lines, -15 removed lines

@@ -217,8 +217,7 @@ 
                 $detectedType = exif_imagetype($_FILES['company_logo']['tmp_name']);
                 if(!in_array($detectedType, $allowedTypes)) {
                     $errors[] = $mod_strings['ERR_UPLOAD_FILETYPE'];
-                }
-                else {
+                } else {
                     // uploaded image stored in the /custom path instead of put into the original theme directory..
 
                     mkdir_recursive('custom/' . SugarThemeRegistry::current()->getDefaultImagePath(), true);
@@ -226,8 +225,7 @@ 
                     $destFile = 'custom/' . $tmpvar[0];
                     if (!move_uploaded_file($_FILES['company_logo']['tmp_name'], $destFile)) {
                         $errors[] = $mod_strings['ERR_LANG_UPLOAD_1'];
-                    }
-                    else {
+                    } else {
                         $filepath = $destFile;
                     }
                 }
@@ -277,7 +275,9 @@ 
 
     if(isset($_REQUEST['storeConfig']) && ($_REQUEST['storeConfig'])){
         // store configuration by form to session
-        if(!isset($_SESSION)) session_start();
+        if(!isset($_SESSION)) {
+            session_start();
+        }
         $_SESSION = array_merge($_SESSION, $_POST);
 
         // TODO--low: don't forget the custom type install settings! validate here..
@@ -370,7 +370,7 @@ 
 //define web root, which will be used as default for site_url
 if($_SERVER['SERVER_PORT']=='80'){
     $web_root = $_SERVER['SERVER_NAME'].$_SERVER['PHP_SELF'];
-}else{
+} else{
     $web_root = $_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF'];
 }
 $web_root = str_replace("/install.php", "", $web_root);
@@ -515,8 +515,7 @@ 
 
 		<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
 EOQ;
-}
-else{
+} else{
 $validation_errors = array();
 // process the data posted
 if($next_clicked) {
@@ -607,27 +606,27 @@ 
             $_SESSION['setup_site_custom_session_path']     = get_boolean_from_request('setup_site_custom_session_path');
             if($_SESSION['setup_site_custom_session_path']){
                 $_SESSION['setup_site_session_path']            = $_REQUEST['setup_site_session_path'];
-            }else{
+            } else{
                 $_SESSION['setup_site_session_path'] = '';
             }
 
             $_SESSION['setup_site_custom_log_dir']          = get_boolean_from_request('setup_site_custom_log_dir');
             if($_SESSION['setup_site_custom_log_dir']){
                 $_SESSION['setup_site_log_dir']                 = $_REQUEST['setup_site_log_dir'];
-            }else{
+            } else{
                 $_SESSION['setup_site_log_dir'] = '.';
             }
 
             $_SESSION['setup_site_specify_guid']            = get_boolean_from_request('setup_site_specify_guid');
             if($_SESSION['setup_site_specify_guid']){
                 $_SESSION['setup_site_guid']                    = $_REQUEST['setup_site_guid'];
-            }else{
+            } else{
                 $_SESSION['setup_site_guid'] = '';
             }
             $_SESSION['siteConfig_submitted']               = true;
             if(isset($_REQUEST['setup_site_sugarbeet_anonymous_stats'])){
                 $_SESSION['setup_site_sugarbeet_anonymous_stats'] = get_boolean_from_request('setup_site_sugarbeet_anonymous_stats');
-            }else{
+            } else{
                 $_SESSION['setup_site_sugarbeet_anonymous_stats'] = 0;
             }
 
@@ -642,13 +641,12 @@ 
 
 if($next_step == 9999) {
     $the_file = 'SilentInstall';
-}else if($next_step == 9191) {
+} else if($next_step == 9191) {
 	$_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
     $_SESSION['oc_username']    = $_REQUEST['oc_username'];
     $_SESSION['oc_password']   	= $_REQUEST['oc_password'];
     $the_file = 'oc_convert.php';
-}
-else{
+} else{
         $the_file = $workflow[$next_step];
 
 }

include/javascript/jsAlerts.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.

include/SugarObjects/VardefManager.php

Braces +44 added lines, -24 removed lines

@@ -96,14 +96,18 @@ 
     }
 
     static function addTemplate($module, $object, $template, $object_name=false){
-        if($template == 'default')$template = 'basic';
+        if($template == 'default') {
+            $template = 'basic';
+        }
         $templates = array();
         $fields = array();
-        if(empty($object_name))$object_name = $object;
+        if(empty($object_name)) {
+            $object_name = $object;
+        }
         $_object_name = strtolower($object_name);
         if(!empty($GLOBALS['dictionary'][$object]['table'])){
             $table_name = $GLOBALS['dictionary'][$object]['table'];
-        }else{
+        } else{
             $table_name = strtolower($module);
         }
 
@@ -112,7 +116,7 @@ 
             if(file_exists($path)){
                 require($path);
                 $templates[$template] = $vardefs;
-            }else{
+            } else{
                 $path = 'include/SugarObjects/implements/' . $template . '/vardefs.php';
                 if(file_exists($path)){
                     require($path);
@@ -122,12 +126,22 @@ 
         }
        
         if(!empty($templates[$template])){
-            if(empty($GLOBALS['dictionary'][$object]['fields']))$GLOBALS['dictionary'][$object]['fields'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array();
-            if(empty($GLOBALS['dictionary'][$object]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array();
+            if(empty($GLOBALS['dictionary'][$object]['fields'])) {
+                $GLOBALS['dictionary'][$object]['fields'] = array();
+            }
+            if(empty($GLOBALS['dictionary'][$object]['relationships'])) {
+                $GLOBALS['dictionary'][$object]['relationships'] = array();
+            }
+            if(empty($GLOBALS['dictionary'][$object]['indices'])) {
+                $GLOBALS['dictionary'][$object]['indices'] = array();
+            }
             $GLOBALS['dictionary'][$object]['fields'] = array_merge($templates[$template]['fields'], $GLOBALS['dictionary'][$object]['fields']);
-            if(!empty($templates[$template]['relationships']))$GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
-            if(!empty($templates[$template]['indices']))$GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
+            if(!empty($templates[$template]['relationships'])) {
+                $GLOBALS['dictionary'][$object]['relationships'] = array_merge($templates[$template]['relationships'], $GLOBALS['dictionary'][$object]['relationships']);
+            }
+            if(!empty($templates[$template]['indices'])) {
+                $GLOBALS['dictionary'][$object]['indices'] = array_merge($templates[$template]['indices'], $GLOBALS['dictionary'][$object]['indices']);
+            }
             // maintain a record of this objects inheritance from the SugarObject templates...
             $GLOBALS['dictionary'][$object]['templates'][ $template ] = $template ;
         }
@@ -160,8 +174,9 @@ 
      */
     static function saveCache($module,$object, $additonal_objects= array()){
 
-        if (empty($GLOBALS['dictionary'][$object]))
-            $object = BeanFactory::getObjectName($module);
+        if (empty($GLOBALS['dictionary'][$object])) {
+                    $object = BeanFactory::getObjectName($module);
+        }
 
         //Sometimes bad definitions can get in from left over extensions or file system lag(caching). We need to clean those.
         $data = self::cleanVardefs($GLOBALS['dictionary'][$object]);
@@ -191,7 +206,7 @@ 
         //otherwise go through each module and remove the vardefs.php
         if(!empty($module_dir) && !empty($object_name)){
             VardefManager::_clearCache($module_dir, $object_name);
-        }else{
+        } else{
             global $beanList;
             foreach($beanList as $module_dir => $object_name){
                 VardefManager::_clearCache($module_dir, $object_name);
@@ -310,11 +325,13 @@ 
         }
 
         //Cache link fields for this call in a static variable
-        if (!isset(self::$linkFields))
-            self::$linkFields = array();
+        if (!isset(self::$linkFields)) {
+                    self::$linkFields = array();
+        }
 
-        if (isset(self::$linkFields[$object]))
-            return self::$linkFields[$object];
+        if (isset(self::$linkFields[$object])) {
+                    return self::$linkFields[$object];
+        }
 
         $vardef = $dictionary[$object];
         $links = array();
@@ -337,8 +354,9 @@ 
     {
         $cacheKey = "LFR{$module}{$object}{$relName}";
         $cacheValue = sugar_cache_retrieve($cacheKey);
-        if(!empty($cacheValue))
-            return $cacheValue;
+        if(!empty($cacheValue)) {
+                    return $cacheValue;
+        }
 
         $relLinkFields = self::getLinkFieldsForModule($module, $object);
         $matches = array();
@@ -352,13 +370,15 @@ 
                 }
             }
         }
-        if (empty($matches))
-            return false;
-        if (sizeof($matches) == 1)
-            $results = $matches[0];
-        else
-            //For relationships where both sides are the same module, more than one link will be returned
+        if (empty($matches)) {
+                    return false;
+        }
+        if (sizeof($matches) == 1) {
+                    $results = $matches[0];
+        } else {
+                    //For relationships where both sides are the same module, more than one link will be returned
             $results = $matches;
+        }
 
         sugar_cache_put($cacheKey, $results);
         return $results ;

include/database/MysqliManager.php

Braces +34 added lines, -19 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.
@@ -135,8 +137,9 @@ 
 		$result = $suppress?@mysqli_query($this->database,$sql):mysqli_query($this->database,$sql);
 		$md5 = md5($sql);
 
-		if (empty($queryMD5[$md5]))
-			$queryMD5[$md5] = true;
+		if (empty($queryMD5[$md5])) {
+					$queryMD5[$md5] = true;
+		}
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
@@ -155,8 +158,9 @@ 
 		*/
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 		$this->checkError($msg.' Query Failed: ' . $sql, $dieOnError);
 
 		return $result;
@@ -209,8 +213,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysqli_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysqli_free_result($dbResult);
+		}
 	}
 
 	/**
@@ -220,17 +225,20 @@ 
 	{
 		$field_array = array();
 
-		if (!isset($result) || empty($result))
-			return 0;
+		if (!isset($result) || empty($result)) {
+					return 0;
+		}
 
 		$i = 0;
 		while ($i < mysqli_num_fields($result)) {
 			$meta = mysqli_fetch_field_direct($result, $i);
-			if (!$meta)
-				return 0;
+			if (!$meta) {
+							return 0;
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 
@@ -245,10 +253,15 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		$row = mysqli_fetch_assoc($result);
-		if($row == null) $row = false; //Make sure MySQLi driver results are consistent with other database drivers
+		if($row == null) {
+		    $row = false;
+		}
+		//Make sure MySQLi driver results are consistent with other database drivers
 		return $row;
 	}
 
@@ -267,8 +280,9 @@ 
 	{
 		global $sugar_config;
 
-		if (is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if (is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if(!isset($this->database)) {
 
@@ -319,8 +333,9 @@ 
 		}
 	    mysqli_set_charset ($this->database , "utf8" );
 
-		if($this->checkError('Could Not Connect', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if($this->checkError('Could Not Connect', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 
 		$this->connectOptions = $configOptions;
 		return true;

include/MVC/Controller/file_access_control_map.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.