adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetSubPanelActivitiesStatusField.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.
@@ -56,8 +58,7 @@ 
 		if(isset($layout_def['varname']))
 		{
 			$key = strtoupper($layout_def['varname']);
-		}
-		else
+		} else
 		{
 			$key = $this->_get_column_alias($layout_def);
 			$key = strtoupper($key);

include/generic/SugarWidgets/SugarWidgetFieldcurrency_id.php

Braces +6 added lines, -7 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.
@@ -58,8 +60,7 @@ 
             if (is_array($list))
             {
                 $list = array_merge(array($currency), $list);
-            }
-            else
+            } else
             {
                 $list = array($currency);
             }
@@ -105,8 +106,7 @@ 
         if (!empty ($field_def['sort_on']))
         {
             $order_by = $layout_def['table_alias'].".".$field_def['sort_on'];
-        }
-        else
+        } else
         {
             $order_by = $this->_get_column_select($layout_def);
         }
@@ -114,8 +114,7 @@ 
         if (empty ($layout_def['sort_dir']) || $layout_def['sort_dir'] == 'a')
         {
             $order_dir = "ASC";
-        }
-        else
+        } else
         {
             $order_dir = "DESC";
         }

include/generic/SugarWidgets/SugarWidgetFieldbool.php

Braces +6 added lines, -7 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.
@@ -69,8 +71,7 @@ 
             global $app_list_strings;
             if (empty($value)) {
                 $value = $app_list_strings['dom_switch_bool']['off'];
-            }   
-            else {
+            } else {
                 $value = $app_list_strings['dom_switch_bool']['on'];
             } 
             return $value;
@@ -97,11 +98,9 @@ 
         $yes = $no = $default = '';
         if (isset($layout_def['input_name0']) && $layout_def['input_name0'] == 1) {
             $yes = ' selected="selected"';
-        }
-        elseif (isset($layout_def['input_name0']) && $layout_def['input_name0'] == 'off') {
+        } elseif (isset($layout_def['input_name0']) && $layout_def['input_name0'] == 'off') {
             $no = ' selected="selected"';
-        }
-        else {
+        } else {
             $default = ' selected="selected"';
         }
         

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateAccountNameButton.php

Braces +21 added lines, -13 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.
@@ -65,18 +67,24 @@ 
 		}
 		
 		$additionalFormFields = array();
-		if(isset($defines['focus']->billing_address_street)) 
-			$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-		if(isset($defines['focus']->billing_address_city)) 
-			$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-		if(isset($defines['focus']->billing_address_state)) 
-			$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-		if(isset($defines['focus']->billing_address_country)) 
-			$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-		if(isset($defines['focus']->billing_address_postalcode)) 
-			$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-		if(isset($defines['focus']->phone_office)) 
-			$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
+		if(isset($defines['focus']->billing_address_street)) {
+					$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
+		}
+		if(isset($defines['focus']->billing_address_city)) {
+					$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;
+		}
+		if(isset($defines['focus']->billing_address_state)) {
+					$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
+		}
+		if(isset($defines['focus']->billing_address_country)) {
+					$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
+		}
+		if(isset($defines['focus']->billing_address_postalcode)) {
+					$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
+		}
+		if(isset($defines['focus']->phone_office)) {
+					$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
+		}
 		
 		
 		$button = $this->_get_form($defines, $additionalFormFields);

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonMeetings.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.
@@ -111,7 +113,7 @@ 
 		if($layout_def['ListView']) {
             return "<a href=\"javascript:sub_p_rem('$subpanel', '$linked_field'" .", '$record', $refresh_page);\""
 			        . ' class="listViewTdToolsS1"' . " onclick=\"return sp_rem_conf();\"" . ">$icon_remove_text</a>";
-		}else{
+		} else{
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetSubPanelIcon.php

Braces +6 added lines, -7 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.
@@ -59,8 +61,7 @@ 
 		if(isset($layout_def['varname']))
 		{
 			$key = strtoupper($layout_def['varname']);
-		}
-		else
+		} else
 		{
 			$key = $this->_get_column_alias($layout_def);
 			$key = strtoupper($key);
@@ -77,8 +78,7 @@ 
 			if(empty($layout_def['target_module']))
 			{
 				$module = $layout_def['module'];
-			}
-		else
+			} else
 			{
 				$module = $layout_def['target_module'];
 			}
@@ -87,8 +87,7 @@ 
 		if(empty($layout_def['target_record_key']))
 		{
 			$record = $layout_def['fields']['ID'];
-		}
-		else
+		} else
 		{
 			$record_key = strtoupper($layout_def['target_record_key']);
 			$record = $layout_def['fields'][$record_key];

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php

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.
@@ -106,8 +108,9 @@ 
 
 		$icon_remove_text = mb_strtolower($app_strings['LBL_ID_FF_REMOVE'], 'UTF-8');
 		
-         if($linked_field == 'get_emails_by_assign_or_link')
-            $linked_field = 'emails';
+         if($linked_field == 'get_emails_by_assign_or_link') {
+                     $linked_field = 'emails';
+         }
 		//based on listview since that lets you select records
 		if($layout_def['ListView'] && !$hideremove) {
             $retStr = "<a href=\"javascript:sub_p_rem('$subpanel', '$linked_field'" 
@@ -118,7 +121,7 @@ 
 			. ">$icon_remove_text</a>";
         return $retStr;
             
-		}else{
+		} else{
 			return '';
 		}
 	}

include/generic/DeleteRelationship.php

Braces +7 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.
@@ -81,13 +83,13 @@ 
  {
  	$focus->retrieve($record);
  	$focus->remove_user_from_team($linked_id);
- }
- else
+ } else
  {
  	// cut it off:
  	$focus->load_relationship($linked_field);
- 	if($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto')
- 		unset($focus->$linked_field->_relationship->relationship_role_column);
+ 	if($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto') {
+ 	 		unset($focus->$linked_field->_relationship->relationship_role_column);
+ 	}
  	$focus->$linked_field->delete($record,$linked_id);
  }
  if ($bean_name == 'Campaign' and $linked_field=='prospectlists' ) {

include/SugarTheme/SugarTheme.php

Braces +216 added lines, -158 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.
@@ -46,8 +48,9 @@ 
  * theme basis.
  ********************************************************************************/
 
-if(!defined('JSMIN_AS_LIB'))
+if(!defined('JSMIN_AS_LIB')) {
     define('JSMIN_AS_LIB', true);
+}
 
 require_once("include/SugarTheme/cssmin.php");
 require_once("jssource/jsmin.php");
@@ -299,10 +302,11 @@ 
                 if ( property_exists(__CLASS__,$key) ) {
                     // For all arrays ( except colors and fonts ) you can just specify the items
                     // to change instead of all of the values
-                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                        $this->$key = array_merge($this->$key,$value);
-                    else
-                        $this->$key = $value;
+                    if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) ) {
+                                            $this->$key = array_merge($this->$key,$value);
+                    } else {
+                                            $this->$key = $value;
+                    }
                 }
             }
         }
@@ -310,23 +314,28 @@ 
             if ( property_exists(__CLASS__,$key) ) {
                 // For all arrays ( except colors and fonts ) you can just specify the items
                 // to change instead of all of the values
-                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) )
-                    $this->$key = array_merge($this->$key,$value);
-                else
-                    $this->$key = $value;
+                if ( is_array($this->$key) && !in_array($key,array('colors','fonts')) ) {
+                                    $this->$key = array_merge($this->$key,$value);
+                } else {
+                                    $this->$key = $value;
+                }
             }
         }
         if ( !inDeveloperMode() ) {
             if ( sugar_is_file($cachedfile = sugar_cached($this->getFilePath().'/pathCache.php'))) {
                 $caches = unserialize(file_get_contents($cachedfile));
-                if ( isset($caches['jsCache']) )
-                    $this->_jsCache       = $caches['jsCache'];
-                if ( isset($caches['cssCache']) )
-                    $this->_cssCache      = $caches['cssCache'];
-                if ( isset($caches['imageCache']) )
-                    $this->_imageCache    = $caches['imageCache'];
-                if ( isset($caches['templateCache']) )
-                    $this->_templateCache = $caches['templateCache'];
+                if ( isset($caches['jsCache']) ) {
+                                    $this->_jsCache       = $caches['jsCache'];
+                }
+                if ( isset($caches['cssCache']) ) {
+                                    $this->_cssCache      = $caches['cssCache'];
+                }
+                if ( isset($caches['imageCache']) ) {
+                                    $this->_imageCache    = $caches['imageCache'];
+                }
+                if ( isset($caches['templateCache']) ) {
+                                    $this->_templateCache = $caches['templateCache'];
+                }
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
 			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
@@ -378,13 +387,14 @@ 
         // clear out the cache on destroy if we are asked to
         if ( $this->_clearCacheOnDestroy ) {
 
-            if (is_file("$cachedir/pathCache.php"))
-                unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/pathCache.php")) {
+                            unlink("$cachedir/pathCache.php");
+            }
+			if (is_file("$cachedir/spriteCache.php")) {
+							unlink("$cachedir/spriteCache.php");
+			}
 
-        }
-        elseif ( !inDeveloperMode() ) {
+        } elseif ( !inDeveloperMode() ) {
             // only update the caches if they have been changed in this request
             if ( count($this->_jsCache) != $this->_initialCacheSize['jsCache']
                     || count($this->_cssCache) != $this->_initialCacheSize['cssCache']
@@ -433,8 +443,9 @@ 
         $key
         )
     {
-        if ( isset($this->$key) )
-            return $this->$key;
+        if ( isset($this->$key) ) {
+                    return $this->$key;
+        }
     }
 
     public function __isset($key){
@@ -607,38 +618,44 @@ 
 		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
 			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+			if(file_exists("cache/sprites/default/sprites.css")) {
+							$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+			}
 
 			// theme specific sprites
-			if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+			if(file_exists("cache/sprites/{$this->dirName}/sprites.css")) {
+							$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+			}
 
 			// parent sprites
 			if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
-					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css")) {
+									$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+				}
 			}
 
 			// repeatable sprites
-			if(file_exists("cache/sprites/Repeatable/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
+			if(file_exists("cache/sprites/Repeatable/sprites.css")) {
+							$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
+			}
 		}
 
         // for BC during upgrade
         if ( !empty($this->colors) ) {
-            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors))
-                $color = $_SESSION['authenticated_user_theme_color'];
-            else
-                $color = $this->colors[0];
+            if ( isset($_SESSION['authenticated_user_theme_color']) && in_array($_SESSION['authenticated_user_theme_color'], $this->colors)) {
+                            $color = $_SESSION['authenticated_user_theme_color'];
+            } else {
+                            $color = $this->colors[0];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('colors.'.$color.'.css').'" id="current_color_style" />';
         }
 
         if ( !empty($this->fonts) ) {
-            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts))
-                $font = $_SESSION['authenticated_user_theme_font'];
-            else
-                $font = $this->fonts[0];
+            if ( isset($_SESSION['authenticated_user_theme_font']) && in_array($_SESSION['authenticated_user_theme_font'], $this->fonts)) {
+                            $font = $_SESSION['authenticated_user_theme_font'];
+            } else {
+                            $font = $this->fonts[0];
+            }
             $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('fonts.'.$font.'.css').'" id="current_font_style" />';
         }
 
@@ -669,23 +686,24 @@ 
         $templateName
         )
     {
-        if ( isset($this->_templateCache[$templateName]) )
-            return $this->_templateCache[$templateName];
+        if ( isset($this->_templateCache[$templateName]) ) {
+                    return $this->_templateCache[$templateName];
+        }
 
         $templatePath = '';
-        if (sugar_is_file('custom/'.$this->getTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
-        elseif (sugar_is_file($this->getTemplatePath().'/'.$templateName))
-            $templatePath = $this->getTemplatePath().'/'.$templateName;
-        elseif (isset($this->parentTheme)
+        if (sugar_is_file('custom/'.$this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getTemplatePath().'/'.$templateName;
+        } elseif (sugar_is_file($this->getTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getTemplatePath().'/'.$templateName;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '')
-            $templatePath = $filename;
-        elseif (sugar_is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
-        elseif (sugar_is_file($this->getDefaultTemplatePath().'/'.$templateName))
-            $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getTemplate($templateName)) != '') {
+                    $templatePath = $filename;
+        } elseif (sugar_is_file('custom/'.$this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = 'custom/'.$this->getDefaultTemplatePath().'/'.$templateName;
+        } elseif (sugar_is_file($this->getDefaultTemplatePath().'/'.$templateName)) {
+                    $templatePath = $this->getDefaultTemplatePath().'/'.$templateName;
+        } else {
             $GLOBALS['log']->warn("Template $templateName not found");
             return false;
         }
@@ -721,15 +739,17 @@ 
 		// trap deprecated use of image extension
 		if(is_null($ext)) {
 			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
-				$imageName .= '.gif';
+			if(count($imageNameExp) == 1) {
+							$imageName .= '.gif';
+			}
 		} else {
 			$imageName .= $ext;
 		}
 
 		// trap alt attributes in other_attributes
-		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
-			$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes)) {
+					$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+		}
 		// sprite handler, makes use of own caching mechanism
 		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 			// get sprite metadata
@@ -751,8 +771,9 @@ 
 		// img caching
 		if(empty($cached_results[$imageName])) {
 			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+			if ( empty($imageURL) ) {
+							return false;
+			}
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
@@ -779,8 +800,9 @@ 
 	public function getSpriteMeta($imageName) {
 
 		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
+	    if(isset($this->_spriteCache[$imageName])) {
+	    			return $this->_spriteCache[$imageName];
+	    }
 
 			// sprite keys are base on imageURL
 		$imageURL = $this->getImageURL($imageName,false);
@@ -832,8 +854,9 @@ 
 			$attr .= ' class="spr_'.$class.'"';
 		}
 
-		if($title)
-			$attr .= ' title="'.$title.'"';
+		if($title) {
+					$attr .= ' title="'.$title.'"';
+		}
 
 		// use </span> instead of /> to prevent weird UI results
 		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
@@ -887,35 +910,37 @@ 
         $addJSPath = true
         ){
         if ( isset($this->_imageCache[$imageName]) ) {
-            if ( $addJSPath )
-                return getJSPath($this->_imageCache[$imageName]);
-            else
-                return $this->_imageCache[$imageName];
+            if ( $addJSPath ) {
+                            return getJSPath($this->_imageCache[$imageName]);
+            } else {
+                            return $this->_imageCache[$imageName];
+            }
         }
         $imagePath = '';
-        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (isset($this->parentTheme)
+        if (($filename = $this->_getImageFileName('custom/'.$this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-        elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
-            $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
-        else {
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getImageURL($imageName,false)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('custom/'.$this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '') {
+                    $imagePath = $filename;
+        } elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '') {
+					$imagePath = $filename;
+		} else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
         }
 
         $this->_imageCache[$imageName] = $imagePath;
 
-        if ( $addJSPath )
-            return getJSPath($imagePath);
+        if ( $addJSPath ) {
+                    return getJSPath($imagePath);
+        }
 
         return $imagePath;
     }
@@ -931,14 +956,16 @@ 
         )
     {
         // return now if the extension matches that of which we are looking for
-        if ( sugar_is_file($imageName) )
-            return $imageName;
+        if ( sugar_is_file($imageName) ) {
+                    return $imageName;
+        }
         $pathParts = pathinfo($imageName);
-        foreach ( $this->imageExtensions as $extension )
-            if ( isset($pathParts['extension']) )
+        foreach ( $this->imageExtensions as $extension ) {
+                    if ( isset($pathParts['extension']) )
                 if ( ( $extension != $pathParts['extension'] )
                         && sugar_is_file($pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension) )
                     return $pathParts['dirname'].'/'.$pathParts['filename'].'.'.$extension;
+        }
 
         return '';
     }
@@ -954,10 +981,11 @@ 
     public function getCSSURL($cssFileName, $returnURL = true)
     {
         if ( isset($this->_cssCache[$cssFileName]) && sugar_is_file(sugar_cached($this->_cssCache[$cssFileName])) ) {
-            if ( $returnURL )
-                return getJSPath("cache/".$this->_cssCache[$cssFileName]);
-            else
-                return sugar_cached($this->_cssCache[$cssFileName]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_cssCache[$cssFileName]);
+            } else {
+                            return sugar_cached($this->_cssCache[$cssFileName]);
+            }
         }
 
         $cssFileContents = '';
@@ -965,13 +993,15 @@ 
         $fullFileName = $this->getCSSPath().'/'.$cssFileName;
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
-                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '')
-            $cssFileContents .= file_get_contents($filename);
-        else {
-            if (sugar_is_file($defaultFileName))
-                $cssFileContents .= file_get_contents($defaultFileName);
-            if (sugar_is_file('custom/'.$defaultFileName))
-                $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+                && ($filename = SugarThemeRegistry::get($this->parentTheme)->getCSSURL($cssFileName,false)) != '') {
+                    $cssFileContents .= file_get_contents($filename);
+        } else {
+            if (sugar_is_file($defaultFileName)) {
+                            $cssFileContents .= file_get_contents($defaultFileName);
+            }
+            if (sugar_is_file('custom/'.$defaultFileName)) {
+                            $cssFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
         }
         if (sugar_is_file($fullFileName)) {
             $cssFileContents .= file_get_contents($fullFileName);
@@ -995,10 +1025,11 @@ 
         // if this is the style.css file, prepend the base.css and calendar-win2k-cold-1.css
         // files before the theme styles
         if ( $cssFileName == 'style.css' && !isset($this->parentTheme) ) {
-            if ( inDeveloperMode() )
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
-            else
-                $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            if ( inDeveloperMode() ) {
+                            $cssFileContents = file_get_contents('include/javascript/yui/build/base/base.css') . $cssFileContents;
+            } else {
+                            $cssFileContents = file_get_contents('include/javascript/yui/build/base/base-min.css') . $cssFileContents;
+            }
         }
 
         // minify the css
@@ -1011,8 +1042,9 @@ 
 
         $this->_cssCache[$cssFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1028,10 +1060,11 @@ 
     public function getJSURL($jsFileName, $returnURL = true)
     {
         if ( isset($this->_jsCache[$jsFileName]) && sugar_is_file(sugar_cached($this->_jsCache[$jsFileName])) ) {
-            if ( $returnURL )
-                return getJSPath("cache/".$this->_jsCache[$jsFileName]);
-            else
-                return sugar_cached($this->_jsCache[$jsFileName]);
+            if ( $returnURL ) {
+                            return getJSPath("cache/".$this->_jsCache[$jsFileName]);
+            } else {
+                            return sugar_cached($this->_jsCache[$jsFileName]);
+            }
         }
 
         $jsFileContents = '';
@@ -1042,15 +1075,19 @@ 
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
            $jsFileContents .= file_get_contents($filename);
        } else {
-            if (sugar_is_file($defaultFileName))
-                $jsFileContents .= file_get_contents($defaultFileName);
-            if (sugar_is_file('custom/'.$defaultFileName))
-                $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            if (sugar_is_file($defaultFileName)) {
+                            $jsFileContents .= file_get_contents($defaultFileName);
+            }
+            if (sugar_is_file('custom/'.$defaultFileName)) {
+                            $jsFileContents .= file_get_contents('custom/'.$defaultFileName);
+            }
+        }
+        if (sugar_is_file($fullFileName)) {
+                    $jsFileContents .= file_get_contents($fullFileName);
+        }
+        if (sugar_is_file('custom/'.$fullFileName)) {
+                    $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         }
-        if (sugar_is_file($fullFileName))
-            $jsFileContents .= file_get_contents($fullFileName);
-        if (sugar_is_file('custom/'.$fullFileName))
-            $jsFileContents .= file_get_contents('custom/'.$fullFileName);
         if (empty($jsFileContents)) {
             $GLOBALS['log']->warn("Javascript File $jsFileName not found");
             return false;
@@ -1071,8 +1108,9 @@ 
 
         $this->_jsCache[$jsFileName] = $fullFileName;
 
-        if ( $returnURL )
-            return getJSPath("cache/".$fullFileName);
+        if ( $returnURL ) {
+                    return getJSPath("cache/".$fullFileName);
+        }
 
         return sugar_cached($fullFileName);
     }
@@ -1097,7 +1135,9 @@ 
         $imageArray = array();
         foreach ( $pathsToSearch as $path )
         {
-            if (!sugar_is_dir($path)) $path = "custom/$path";
+            if (!sugar_is_dir($path)) {
+                $path = "custom/$path";
+            }
             if (sugar_is_dir($path) && is_readable($path) && $dir = opendir($path)) {
                 while (($file = readdir($dir)) !== false) {
                     if ($file == ".."
@@ -1105,10 +1145,12 @@ 
                             || $file == ".svn"
                             || $file == "CVS"
                             || $file == "Attic"
-                            )
-                        continue;
-                    if ( !isset($imageArray[$file]) )
-                        $imageArray[$file] = $this->getImageURL($file,false);
+                            ) {
+                                            continue;
+                    }
+                    if ( !isset($imageArray[$file]) ) {
+                                            $imageArray[$file] = $this->getImageURL($file,false);
+                    }
                 }
                 closedir($dir);
             }
@@ -1189,8 +1231,9 @@ 
         }
 
         // Assume theme is designed for 5.5.x if not specified otherwise
-        if ( !isset($themedef['version']) )
-            $themedef['version']['regex_matches'] = array('5\.5\.*');
+        if ( !isset($themedef['version']) ) {
+                    $themedef['version']['regex_matches'] = array('5\.5\.*');
+        }
 
         // Check to see if theme is valid for this version of Sugar; return false if not
         $version_ok = false;
@@ -1210,8 +1253,9 @@ 
                 }
             }
         }
-        if ( !$version_ok )
-            return false;
+        if ( !$version_ok ) {
+                    return false;
+        }
 
         $theme = new SugarTheme($themedef);
         self::$_themes[$theme->dirName] = $theme;
@@ -1226,8 +1270,9 @@ 
         $themeName
         )
     {
-        if ( self::exists($themeName) )
-            unset(self::$_themes[$themeName]);
+        if ( self::exists($themeName) ) {
+                    unset(self::$_themes[$themeName]);
+        }
     }
 
     /**
@@ -1239,8 +1284,9 @@ 
         $themeName
         )
     {
-        if ( isset(self::$_themes[$themeName]) )
-            return self::$_themes[$themeName];
+        if ( isset(self::$_themes[$themeName]) ) {
+                    return self::$_themes[$themeName];
+        }
     }
 
     /**
@@ -1250,8 +1296,9 @@ 
      */
     public static function current()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         return self::$_themes[self::$_currentTheme];
     }
@@ -1263,8 +1310,9 @@ 
      */
     public static function getDefault()
     {
-        if ( !isset(self::$_currentTheme) )
-            self::buildRegistry();
+        if ( !isset(self::$_currentTheme) ) {
+                    self::buildRegistry();
+        }
 
         if ( isset($GLOBALS['sugar_config']['default_theme']) && self::exists($GLOBALS['sugar_config']['default_theme']) ) {
             return self::get($GLOBALS['sugar_config']['default_theme']);
@@ -1295,8 +1343,9 @@ 
         $themeName
         )
     {
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         self::$_currentTheme = $themeName;
 
@@ -1333,8 +1382,9 @@ 
                             || $file == "default"
                             || !sugar_is_dir("./$dirPath".$file)
                             || !sugar_is_file("./{$dirPath}{$file}/themedef.php")
-                            )
-                        continue;
+                            ) {
+                                            continue;
+                    }
                     $themedef = array();
                     require("./{$dirPath}{$file}/themedef.php");
                     $themedef = array_merge($themedef,$themedefDefault);
@@ -1343,9 +1393,10 @@ 
                     // if so, then it will override the current one
                     if ( self::exists($themedef['dirName']) ) {
                         $existingTheme = self::get($themedef['dirName']);
-                        foreach ( SugarTheme::getThemeDefFields() as $field )
-                            if ( !isset($themedef[$field]) )
+                        foreach ( SugarTheme::getThemeDefFields() as $field ) {
+                                                    if ( !isset($themedef[$field]) )
                                 $themedef[$field] = $existingTheme->$field;
+                        }
                         self::remove($themedef['dirName']);
                     }
                     if ( isset($themedef['name']) ) {
@@ -1400,12 +1451,14 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if ( isset($GLOBALS['sugar_config']['disabled_themes']) ) {
+                    $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
-                continue;
+            if ( in_array($themename,$disabledThemes) ) {
+                            continue;
+            }
             $themelist[$themeobject->dirName] = $themeobject->name;
         }
         asort($themelist, SORT_STRING);
@@ -1421,12 +1474,14 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if ( isset($GLOBALS['sugar_config']['disabled_themes']) )
-            $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        if ( isset($GLOBALS['sugar_config']['disabled_themes']) ) {
+                    $disabledThemes = explode(',',$GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach ( self::$_themes as $themename => $themeobject ) {
-            if ( in_array($themename,$disabledThemes) )
-                $themelist[$themeobject->dirName] = $themeobject->name;
+            if ( in_array($themename,$disabledThemes) ) {
+                            $themelist[$themeobject->dirName] = $themeobject->name;
+            }
         }
 
         return $themelist;
@@ -1441,8 +1496,9 @@ 
     {
         $themelist = array();
 
-        foreach ( self::$_themes as $themename => $themeobject )
-            $themelist[$themeobject->dirName] = $themeobject->name;
+        foreach ( self::$_themes as $themename => $themeobject ) {
+                    $themelist[$themeobject->dirName] = $themeobject->name;
+        }
 
         return $themelist;
     }
@@ -1456,8 +1512,9 @@ 
     {
         $themelist = array();
         $disabledThemes = array();
-        if (isset($GLOBALS['sugar_config']['disabled_themes']))
-            $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
+        if (isset($GLOBALS['sugar_config']['disabled_themes'])) {
+                    $disabledThemes = explode(',', $GLOBALS['sugar_config']['disabled_themes']);
+        }
 
         foreach (self::$_themes as $themename => $themeobject) {
             $themearray['name'] = $themeobject->name;
@@ -1478,8 +1535,9 @@ 
     {
         global $sugar_config;
 
-        if ( !self::exists($themeName) )
-            return false;
+        if ( !self::exists($themeName) ) {
+                    return false;
+        }
 
         $config = array();