adamjakab / SuiteCRM

install/language/en_us.lang.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.

install/performSetup.php

Braces +28 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.
@@ -243,8 +245,9 @@ 
 	    $focus = new $bean();
 	}
 
-	if ( $bean == 'Configurator' )
-	    continue;
+	if ( $bean == 'Configurator' ) {
+		    continue;
+	}
 
     $table_name = $focus->table_name;
     //installStatus(sprintf($mod_strings['STAT_CREATE_DB_TABLE'], $focus->table_name ));
@@ -278,8 +281,9 @@ 
             if( $bean == "User" ){
                 $new_tables = 1;
             }
-            if($bean == "Administration")
-                $new_config = 1;
+            if($bean == "Administration") {
+                            $new_config = 1;
+            }
 
 
         }
@@ -441,8 +445,9 @@ 
     }
     if ($fp && (!isset($_SESSION['oc_install']) || $_SESSION['oc_install'] == false)) {
         @fclose($fp);
-        if ($next_step == 9999)
-            $next_step = 8;
+        if ($next_step == 9999) {
+                    $next_step = 8;
+        }
         $fpResult = <<<FP
      <form action="install.php" method="post" name="form" id="form">
      <input type="hidden" name="current_step" value="{$next_step}">
@@ -460,7 +465,7 @@ 
 
     if( isset($_SESSION['setup_site_sugarbeet_automatic_checks']) && $_SESSION['setup_site_sugarbeet_automatic_checks'] == true){
         set_CheckUpdates_config_setting('automatic');
-    }else{
+    } else{
         set_CheckUpdates_config_setting('manual');
     }
     if(!empty($_SESSION['setup_system_name'])){
@@ -591,10 +596,18 @@ 
 
 installLog('handleOverride');
 // add local settings to config overrides
-if(!empty($_SESSION['default_date_format'])) $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
-if(!empty($_SESSION['default_time_format'])) $sugar_config['default_date_format'] = $_SESSION['default_time_format'];
-if(!empty($_SESSION['default_language'])) $sugar_config['default_language'] = $_SESSION['default_language'];
-if(!empty($_SESSION['default_locale_name_format'])) $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
+if(!empty($_SESSION['default_date_format'])) {
+    $sugar_config['default_date_format'] = $_SESSION['default_date_format'];
+}
+if(!empty($_SESSION['default_time_format'])) {
+    $sugar_config['default_date_format'] = $_SESSION['default_time_format'];
+}
+if(!empty($_SESSION['default_language'])) {
+    $sugar_config['default_language'] = $_SESSION['default_language'];
+}
+if(!empty($_SESSION['default_locale_name_format'])) {
+    $sugar_config['default_locale_name_format'] = $_SESSION['default_locale_name_format'];
+}
 //$configurator->handleOverride();
 
 
@@ -675,7 +688,9 @@ 
 
 // restore superglobals and vars
 $GLOBALS = $varStack['GLOBALS'];
-foreach($varStack['defined_vars'] as $__key => $__value) $$__key = $__value;
+foreach($varStack['defined_vars'] as $__key => $__value) {
+    $$__key = $__value;
+}
 
 
 

install/installConfig.php

Braces +40 added lines, -26 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.
@@ -89,7 +91,9 @@ 
         $out = "<select name=\"$name\">";
         foreach($options as $key => $value) {
             $selected = '';
-            if($key==$default) $selected = ' selected="selected"';
+            if($key==$default) {
+                $selected = ' selected="selected"';
+            }
             $out .= "<option label=\"$value\" value=\"$key\"$selected>$value</option>";
         }
         $out .= "</select>";
@@ -275,8 +279,7 @@ 
                 if(!empty($value)) {
                     if(!empty($value['required'])) {
                         $form .= "<span class=\"required\">*</span>";
-                    }
-                    else {
+                    } else {
                     }
                     if(!empty($_SESSION[$name])) {
                         $sessval = $_SESSION[$name];
@@ -295,7 +298,7 @@ 
                     //if the type is password, set a hidden field to capture the value.  This is so that we can properly encode special characters, which is a limitation with password fields
                     if($type=='password'){
                         $form .= "</div><div class=\"install_block\"><label>{$mod_strings['LBL_DBCONF_TITLE_PSWD_INFO_LABEL']}</label><span>&nbsp;</span><input type='$type' name='{$name}_entry' id='{$name}_entry' value='".urldecode($sessval)."'><input type='hidden' name='$name' id='$name' value='".urldecode($sessval)."'></div><div class=\"install_block\">";
-                    }else{
+                    } else{
                         $form .= "<input type='$type' name='$name' id='$name' value='$sessval'>";
                     }
 
@@ -559,7 +562,9 @@ 
         $notify_allow_default_outbound_checked = empty($_SESSION['notify_allow_default_outbound']) ? '' : ' checked="checked" ';
 
         // set default smtp toggle buttons selected value
-        if(empty($_SESSION['smtp_tab_selected'])) $_SESSION['smtp_tab_selected'] = 'smtp_tab_other';
+        if(empty($_SESSION['smtp_tab_selected'])) {
+            $_SESSION['smtp_tab_selected'] = 'smtp_tab_other';
+        }
 
         $out .= <<<EOQ
         <div class="floatbox full" id="fb2">
@@ -1705,28 +1710,37 @@ 
 
 
 if( is_file("config.php") ){
-    if(!empty($sugar_config['default_theme']))
-        $_SESSION['site_default_theme'] = $sugar_config['default_theme'];
+    if(!empty($sugar_config['default_theme'])) {
+            $_SESSION['site_default_theme'] = $sugar_config['default_theme'];
+    }
 
-    if(!empty($sugar_config['disable_persistent_connections']))
-        $_SESSION['disable_persistent_connections'] =
+    if(!empty($sugar_config['disable_persistent_connections'])) {
+            $_SESSION['disable_persistent_connections'] =
             $sugar_config['disable_persistent_connections'];
-    if(!empty($sugar_config['default_language']))
-        $_SESSION['default_language'] = $sugar_config['default_language'];
-    if(!empty($sugar_config['translation_string_prefix']))
-        $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix'];
-    if(!empty($sugar_config['default_charset']))
-        $_SESSION['default_charset'] = $sugar_config['default_charset'];
-
-    if(!empty($sugar_config['default_currency_name']))
-        $_SESSION['default_currency_name'] = $sugar_config['default_currency_name'];
-    if(!empty($sugar_config['default_currency_symbol']))
-        $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol'];
-    if(!empty($sugar_config['default_currency_iso4217']))
-        $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217'];
-
-    if(!empty($sugar_config['rss_cache_time']))
-        $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time'];
+    }
+    if(!empty($sugar_config['default_language'])) {
+            $_SESSION['default_language'] = $sugar_config['default_language'];
+    }
+    if(!empty($sugar_config['translation_string_prefix'])) {
+            $_SESSION['translation_string_prefix'] = $sugar_config['translation_string_prefix'];
+    }
+    if(!empty($sugar_config['default_charset'])) {
+            $_SESSION['default_charset'] = $sugar_config['default_charset'];
+    }
+
+    if(!empty($sugar_config['default_currency_name'])) {
+            $_SESSION['default_currency_name'] = $sugar_config['default_currency_name'];
+    }
+    if(!empty($sugar_config['default_currency_symbol'])) {
+            $_SESSION['default_currency_symbol'] = $sugar_config['default_currency_symbol'];
+    }
+    if(!empty($sugar_config['default_currency_iso4217'])) {
+            $_SESSION['default_currency_iso4217'] = $sugar_config['default_currency_iso4217'];
+    }
+
+    if(!empty($sugar_config['rss_cache_time'])) {
+            $_SESSION['rss_cache_time'] = $sugar_config['rss_cache_time'];
+    }
     if(!empty($sugar_config['languages']))
     {
         // We need to encode the languages in a way that can be retrieved later.

ModuleInstall/PackageManager/PackageManager.php

Braces +47 added lines, -34 removed lines

@@ -73,7 +73,7 @@ 
         if(!empty($name_value_list)){
             $name_value_list = PackageManager::fromNameValueList($name_value_list);
             return $name_value_list['description'];
-        }else {
+        } else {
            return '';
         }
     }
@@ -119,8 +119,9 @@ 
 		                 //check to see if we already this one installed
 		                 $result = $uh->determineIfUpgrade($myrelease['id_name'], $myrelease['version']);
 		                 $enable = false;
-		                 if($result == true || is_array($result))
-		                	 $enable = true;
+		                 if($result == true || is_array($result)) {
+		                 		                	 $enable = true;
+		                 }
 		                 $nodes[$mypack['category_id']]['packages'][$mypack['id']]['releases'][$myrelease['id']] = array('id' => $myrelease['id'], 'version' => $myrelease['version'], 'label' => $myrelease['description'], 'category_id' => $mypack['category_id'], 'package_id' => $mypack['id'], 'type' => 'release', 'enable' => $enable);
 		           	}
 	            }
@@ -198,7 +199,7 @@ 
 	           	$filepath = PackageManagerComm::performDownload($filename);
 	           	return $filepath;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -216,10 +217,11 @@ 
         PackageManager::setCredentials($username, $password, $systemname);
         PackageManagerComm::clearSession();
         $result = PackageManagerComm::login($terms_checked);
-        if(is_array($result))
-        	return $result;
-       	else
-        	return true;
+        if(is_array($result)) {
+                	return $result;
+        } else {
+       	        	return true;
+       	}
     }
 
     function setCredentials($username, $password, $systemname){
@@ -270,7 +272,7 @@ 
     	 if(!empty($release_id) || !empty($package_id)){
             $documents = PackageManagerComm::getDocumentation($package_id, $release_id);
             return $documents;
-        }else{
+        } else{
             return null;
         }
     }
@@ -465,8 +467,9 @@ 
         $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
         $manifest_file = $this->extractManifest( $base_filename,$base_tmp_upgrade_dir);
          $GLOBALS['log']->debug("Manifest: ".$manifest_file);
-        if($view == 'module')
-            $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
+        if($view == 'module') {
+                    $license_file = $this->extractFile($base_filename, 'LICENSE.txt', $base_tmp_upgrade_dir);
+        }
         if(is_file($manifest_file)){
             $GLOBALS['log']->debug("VALIDATING MANIFEST". $manifest_file);
             require_once( $manifest_file );
@@ -477,14 +480,16 @@ 
             if( $view == "module" ){
                 if ($upgrade_zip_type != "module" && $upgrade_zip_type != "theme" && $upgrade_zip_type != "langpack"){
                     $this->unlinkTempFiles();
-                    if($display_messages)
-                        die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    if($display_messages) {
+                                            die($mod_strings['ERR_UW_NOT_ACCEPTIBLE_TYPE']);
+                    }
                 }
-            }elseif( $view == "default" ){
+            } elseif( $view == "default" ){
                 if($upgrade_zip_type != "patch" ){
                     $this->unlinkTempFiles();
-                    if($display_messages)
-                        die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    if($display_messages) {
+                                            die($mod_strings['ERR_UW_ONLY_PATCHES']);
+                    }
                 }
             }
 
@@ -502,20 +507,24 @@ 
 
             if( copy( $tempFile , $target_path ) ){
                 copy( $manifest_file, $target_manifest );
-                if($display_messages)
-                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
-            }else{
-                if($display_messages)
-                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                if($display_messages) {
+                                    $messages = '<script>ajaxStatus.flashStatus("' .$base_filename.$mod_strings['LBL_UW_UPLOAD_SUCCESS'] . ', 5000");</script>';
+                }
+            } else{
+                if($display_messages) {
+                                	$messages = '<script>ajaxStatus.flashStatus("' .$mod_strings['ERR_UW_UPLOAD_ERROR'] . ', 5000");</script>';
+                }
             }
         }//fi
         else{
             $this->unlinkTempFiles();
-            if($display_messages)
-                die($mod_strings['ERR_UW_NO_MANIFEST']);
+            if($display_messages) {
+                            die($mod_strings['ERR_UW_NO_MANIFEST']);
+            }
+        }
+        if(isset($messages)) {
+                    return $messages;
         }
-        if(isset($messages))
-            return $messages;
     }
 
     function unlinkTempFiles() {
@@ -553,14 +562,15 @@ 
 			$version = $manifest['version'];
 			$uh = new UpgradeHistory();
 			$previous_install = array();
-    		if(!empty($id_name) & !empty($version))
-    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
+    		if(!empty($id_name) & !empty($version)) {
+    		    			$previous_install = $uh->determineIfUpgrade($id_name, $version);
+    		}
     		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
     		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
 
             if(!empty($previous_version)){
             	$mi->install($unzip_dir, true, $previous_version);
-            }else{
+            } else{
             	$mi->install($unzip_dir);
             }
             $GLOBALS['log']->debug("INSTALLED: ".$file);
@@ -597,7 +607,9 @@ 
 	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
 	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
             if(is_file($found->filename)){
-                if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
+                if(!isset($GLOBALS['mi_remove_tables'])) {
+                    $GLOBALS['mi_remove_tables'] = true;
+                }
                 $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
                 unzip($found->filename, $unzip_dir );
                 $mi = new ModuleInstaller();
@@ -606,7 +618,7 @@ 
                 $found->delete();
                 unlink(remove_file_extension( $found->filename ) . '-manifest.php');
                 unlink($found->filename);
-            }else{
+            } else{
                 //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
                 $found->delete();
             }
@@ -752,7 +764,7 @@ 
         if(is_file($license_file)){
             $contents = file_get_contents($license_file);
             return $contents;
-        }else{
+        } else{
             return null;
         }
     }
@@ -834,7 +846,7 @@ 
 						$serial_manifest['upgrade_manifest'] = (isset($upgrade_manifest) ? $upgrade_manifest : '');
 						$installed->manifest = base64_encode(serialize($serial_manifest));
 						$installed->save();
-					}else{
+					} else{
 						$serial_manifest = unserialize(base64_decode($installed->manifest));
 						$manifest = $serial_manifest['manifest'];
 					}
@@ -844,8 +856,9 @@ 
 						$uninstallable = true;
 					}
 					$enabled = $installed->enabled;
-					if(!$enabled)
-						$enabled_string = 'DISABLED';
+					if(!$enabled) {
+											$enabled_string = 'DISABLED';
+					}
 					$file_uninstall = $filename;
 					if(!$uninstallable){
 						$file_uninstall = 'UNINSTALLABLE';

ModuleInstall/PackageManager/PackageManagerDisplay.php

Braces +39 added lines, -33 removed lines

@@ -86,8 +86,9 @@ 
 
         $form2 = "<table  class='tabForm' width='100%'  cellpadding='0' cellspacing='0' width='100%' border='0'>";
         $form2 .= $error_html;
-        if(!$isAlive)
-        	$form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
+        if(!$isAlive) {
+                	$form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
+        }
         $form2 .= "</table>";
 
         $tree = null;
@@ -101,14 +102,14 @@ 
         $form2 .= "<tr><td></td><td align='left'>";
         if($isAlive){
         	$form2 .= "<input type='button' id='modifCredentialsBtn' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'>";
-        }else{
+        } else{
             $form2 .= "<input type='button' id='modifCredentialsBtn' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'style='display:none;'>";
         }
         $form2 .= "</td><td align='left'><div id='workingStatusDiv' style='display:none;'>".SugarThemeRegistry::current()->getImage("sqsWait","border='0' align='bottom'",null,null,'.gif',"Loading")."</div></td><td align='right'>";
 
         if($isAlive){
             $form2 .= "<slot><a class=\"listViewTdToolsS1\" id='href_animate' onClick=\"PackageManager.toggleDiv('span_animate_server_div', 'catview');\"><span id='span_animate_server_div'><img src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."' width='8' height='8' border='0'>&nbsp;Collapse</span></a></slot>";
-        }else{
+        } else{
             $form2 .= "<slot><a class=\"listViewTdToolsS1\" id='href_animate' onClick=\"PackageManager.toggleDiv('span_animate_server_div', 'catview');\"><span id='span_animate_server_div' style='display:none;'><img src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."' width='8' height='8' border='0'>&nbsp;Collapse</span></a></slot>";
         }
         $form2 .= "</td></tr></table>";
@@ -123,8 +124,7 @@ 
         if (UploadStream::getSuhosinStatus() == false)
         {
             $ss->assign('ERR_SUHOSIN', true);
-        }
-        else
+        } else
         {
             $ss->assign('scripts', PackageManagerDisplay::getDisplayScript($install));
         }
@@ -168,8 +168,9 @@ 
             $display = 'block';
         //}
         $form2 = "<table  class='tabForm' width='100%'  cellpadding='0' cellspacing='0' width='100%' border='0'>";
-        if(!$isAlive)
-        	$form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
+        if(!$isAlive) {
+                	$form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
+        }
         $form2 .= "</table>";
         $form2 .= "<table width='100%'><tr><td align='left'>";
         if($show_login){
@@ -182,8 +183,9 @@ 
 		$form2 .= "<div id='selectView' style='display:".$selectViewStyle."'>";
 		$form2 .= "  <div id='patch_downloads' class='ygrid-mso' style='height:205px; display: ".$display.";'></div>";
 		 $form2 .= "</div>";
-		 if(!$show_login)
-         	$loginViewStyle = 'none';
+		 if(!$show_login) {
+		          	$loginViewStyle = 'none';
+		 }
          //$form2 .= "<div id='loginView' style='display:".$loginViewStyle."'>";
     	 //$form2 .= PackageManagerDisplay::buildLoginPanel($mod_strings, $isAlive);
     	 //$form2 .= "</div>";
@@ -199,8 +201,9 @@ 
           	$type_str = '"';
           	foreach($types as $type){
           		$type_str .= "'".$type."'";
-          		if($index < $count)
-          			$type_str .= ",";
+          		if($index < $count) {
+          		          			$type_str .= ",";
+          		}
           		$index++;
           	}
           	$type_str .= '"';
@@ -286,8 +289,9 @@ 
             $output .= "</td></tr></table>";
         // }
          $output .= "</div>";
-         if(!$show_login)
-         	$loginViewStyle = 'none';
+         if(!$show_login) {
+                  	$loginViewStyle = 'none';
+         }
         // $output .= "<div id='loginView' style='display:".$loginViewStyle."'>";
          // jchi ,#24296 :commented code because we are currently not using depot, in the future this may change so you can put this code back in.
     	 //$output .= PackageManagerDisplay::buildLoginPanel($mod_strings, $display);
@@ -307,8 +311,9 @@ 
     static function buildTreeView($div_id, $isAlive = true){
         $tree = new Tree($div_id);
         $nodes = array();
-        if($isAlive)
-        	$nodes = PackageManager::getCategories('');
+        if($isAlive) {
+                	$nodes = PackageManager::getCategories('');
+        }
 
         foreach($nodes as $arr_node){
             $node = new Node($arr_node['id'], $arr_node['label']);
@@ -399,7 +404,7 @@ 
             $patches = PackageManagerDisplay::createJavascriptPackageArray($releases);
             $ss->assign('PATCHES', $patches);
              $ss->assign('GRID_TYPE', implode(',', $types));
-        }else{
+        } else{
            	$pm = new PackageManager();
            	$releases = $pm->getPackagesInStaging();
            	$patches = PackageManagerDisplay::createJavascriptModuleArray($releases);
@@ -410,8 +415,9 @@ 
 			 $ss->assign('UPGARDE_WIZARD_URL', 'index.php?module=UpgradeWizard&action=index');
             $ss->assign('module_load', 'true');
         }
-        if(!empty($GLOBALS['ML_STATUS_MESSAGE']))
-        	$ss->assign('ML_STATUS_MESSAGE',$GLOBALS['ML_STATUS_MESSAGE']);
+        if(!empty($GLOBALS['ML_STATUS_MESSAGE'])) {
+                	$ss->assign('ML_STATUS_MESSAGE',$GLOBALS['ML_STATUS_MESSAGE']);
+        }
 
         //Bug 24064. Checking and Defining labels since these might not be cached during Upgrade
         if(!isset($mod_strings['LBL_ML_INSTALL']) || empty($mod_strings['LBL_ML_INSTALL'])){
@@ -467,8 +473,9 @@ 
 	            $output .= "[";
 	            $output .= "'".$release['description']."', '".$release['version']."', '".$release['build_number']."', '".$release['id']."'";
 	            $output .= "]";
-	            if($index < $count)
-	                $output .= ",";
+	            if($index < $count) {
+	            	                $output .= ",";
+	            }
 	            $index++;
 	        }
         }
@@ -484,13 +491,15 @@ 
 	        foreach($modules as $module){
 	            $output .= "[";
 	            $output .= "'".$module['name']."', '".$module['file_install']."', '".$module['file']."', '";
-	            if(!empty($module['enabled']))
-	            	$output .= $module['enabled'].'_'.$module['file']."', '";
+	            if(!empty($module['enabled'])) {
+	            	            	$output .= $module['enabled'].'_'.$module['file']."', '";
+	            }
 
  				$description = js_escape($module['description']);
 	            $output .= $module['type']."', '".$module['version']."', '".$module['published_date']."', '".$module['uninstallable']."', '".$description."'".(isset($module['upload_file'])?" , '".$module['upload_file']."']":"]");
-	            if($index < $count)
-	                $output .= ",";
+	            if($index < $count) {
+	            	                $output .= ",";
+	            }
 	            $index++;
 	        }
 
@@ -529,16 +538,15 @@ 
         if(!function_exists('curl_init') && $show_login){
         	$header_text = "<font color='red'><b>".$mod_strings['ERR_ENABLE_CURL']."</b></font>";
         	$show_login = false;
-        }else{
+        } else{
             $credentials = PackageManager::getCredentials();
             if(empty($credentials['username']) || empty($credentials['password'])){
             	//$header_text = "<font color='red'><b>".$mod_strings['ERR_CREDENTIALS_MISSING']."</b></font>";
-            }
-            else{
+            } else{
             	$result = PackageManagerComm::login();
             	if((is_array($result) && !empty($result['faultcode'])) || $result == false){
             		$header_text = "<font color='red'><b>".$result['faultstring']."</b></font>";
-            	}else{
+            	} else{
             		$header_text = PackageManager::getPromotion();
             		$isAlive = true;
             	}
@@ -576,8 +584,7 @@ 
 					&& is_file($filename) && !empty($manifest['is_uninstallable']))
 				{
 					$link = urlencode( $filename );
-				}
-				else
+				} else
 				{
 					$link = 'false';
 				}
@@ -607,8 +614,7 @@ 
 				$manifest_copy_files_from_dir = isset($manifest['copy_files']['from_dir']) ? clean_path($manifest['copy_files']['from_dir']) : "";
 				$manifest_icon = clean_path($manifest['icon']);
 				$icon = "<img src=\"" . $manifest_copy_files_to_dir . ($manifest_copy_files_from_dir != "" ? substr($manifest_icon, strlen($manifest_copy_files_from_dir)+1) : $manifest_icon ) . "\">";
-			}
-			else
+			} else
 			{
 				$icon = getImageForType( $manifest['type'] );
 			}

ModuleInstall/PackageManager/PackageController.php

Braces +12 added lines, -9 removed lines

@@ -109,8 +109,9 @@ 
           	$type_str = '';
           	foreach($types as $type){
           		$type_str .= "'".$type."'";
-          		if($index < $count)
-          			$type_str .= ",";
+          		if($index < $count) {
+          		          			$type_str .= ",";
+          		}
           		$index++;
           	}
 
@@ -295,18 +296,20 @@ 
             }
             if(isset($_REQUEST['terms_checked'])) {
                 $terms_checked = $_REQUEST['terms_checked'];
-                if($terms_checked == 'on')
-                	$terms_checked = true;
+                if($terms_checked == 'on') {
+                                	$terms_checked = true;
+                }
             }
 
             if(!empty($username) && !empty($password)){
                 $password = md5($password);
                 $result = PackageManager::authenticate($username, $password, $servername, $terms_checked);
-                if(!is_array($result) && $result == true)
-                    $status  = 'success';
-                else
-                    $status  = $result['faultstring'];
-            }else{
+                if(!is_array($result) && $result == true) {
+                                    $status  = 'success';
+                } else {
+                                    $status  = $result['faultstring'];
+                }
+            } else{
                 $status  = 'failed';
             }
 

ModuleInstall/PackageManager/PackageManagerComm.php

Braces +12 added lines, -8 removed lines

@@ -107,25 +107,29 @@ 
 	        require('sugar_version.php');
 	        require('config.php');
 	        $credentials = PackageManager::getCredentials();
-	        if(empty($license))loadLicense();
+	        if(empty($license)) {
+	            loadLicense();
+	        }
 	        $info = sugarEncode('2813', serialize(getSystemInfo(true)));
 	        $pm = new PackageManager();
 	        $installed = $pm->buildInstalledReleases();
 	        $installed = base64_encode(serialize($installed));
 	        $params = array('installed_modules' => $installed, 'terms_checked' => $terms_checked, 'system_name' => $credentials['system_name']);
 	        $terms_version = (!empty($_SESSION['SugarDepot_TermsVersion']) ? $_SESSION['SugarDepot_TermsVersion'] : '');
-	        if(!empty($terms_version))
-	        	$params['terms_version'] = $terms_version;
+	        if(!empty($terms_version)) {
+	        	        	$params['terms_version'] = $terms_version;
+	        }
 
 	        $result = $GLOBALS['SugarDepot']->call('depotLogin', array(array('user_name' => $credentials['username'], 'password' => $credentials['password']),'info'=>$info, 'params' => $params));
 	        PackageManagerComm::errorCheck();
-	        if(!is_array($result))
-	        	$_SESSION['SugarDepotSessionID'] = $result;
+	        if(!is_array($result)) {
+	        	        	$_SESSION['SugarDepotSessionID'] = $result;
+	        }
 	        $GLOBALS['log']->debug("End SugarDepot Login");
 	        return $result;
+      } else {
+            	return $_SESSION['SugarDepotSessionID'];
       }
-      else
-      	return $_SESSION['SugarDepotSessionID'];
      }
 
      /**
@@ -301,7 +305,7 @@ 
         $status = $GLOBALS['SugarDepot']->call('sugarPing', array());
         if(empty($status) || $GLOBALS['SugarDepot']->getError() || $status != ACTIVE_STATUS){
             return false;
-        }else{
+        } else{
             return true;
         }
      }

suitecrm_version.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');
+ }
 
 $suitecrm_version      = '7.5.1';
 $suitecrm_timestamp    = '2015-01-26 17:00';

install.php

Braces +17 added lines, -17 removed lines

@@ -1,6 +1,8 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
-/*********************************************************************************
+ if(!defined('sugarEntry')) {
+     define('sugarEntry', true);
+ }
+ /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 
@@ -193,8 +195,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);
@@ -202,8 +203,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;
                     }
                 }
@@ -253,7 +253,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..
@@ -330,7 +332,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);
@@ -475,8 +477,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) {
@@ -562,27 +563,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;
             }
 
@@ -597,13 +598,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];
 
 }