adamjakab / SuiteCRM

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/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];
 
 }

include/generic/SugarWidgets/SugarWidgetSubPanelTopMessage.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/generic/SugarWidgets/SugarWidgetFieldid.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/generic/SugarWidgets/SugarWidgetFieldimage.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/generic/SugarWidgets/SugarWidgetSubPanelSelectAllButton.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/generic/SugarWidgets/SugarWidgetSubPanelTopCreateTaskButton.php

Braces +8 added lines, -11 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.
@@ -61,8 +63,7 @@ 
 				if(!empty($defines['focus']->$value))
 				{
 					$additionalFormFields[$key] = $defines['focus']->$value;
-				}
-				else
+				} else
 				{
 					$additionalFormFields[$key] = '';
 				}
@@ -72,8 +73,7 @@ 
 		if(!empty($this->module))
 		{
 			$defines['child_module_name'] = $this->module;
-		}
-		else
+		} else
 		{
 			$defines['child_module_name'] = $defines['module'];
 		}
@@ -109,8 +109,7 @@ 
 		{
 			if($defines['focus']->object_name=='Contact') {
 				$additionalFormFields['parent_type'] = 'Accounts';
-			}
-			else {
+			} else {
 				$additionalFormFields['parent_type'] = $defines['focus']->module_dir;
 			}
 		}
@@ -119,8 +118,7 @@ 
 			if($defines['focus']->object_name=='Contact') {
 				$additionalFormFields['parent_name'] = $defines['focus']->account_name;
 				$additionalFormFields['account_name'] = $defines['focus']->account_name;
-			}
-			else {
+			} else {
 				$additionalFormFields['parent_name'] = $defines['focus']->name;
 			}
 		}
@@ -129,8 +127,7 @@ 
 			if($defines['focus']->object_name=='Contact') {
 				$additionalFormFields['parent_id'] = $defines['focus']->account_id;
 				$additionalFormFields['account_id'] = $defines['focus']->account_id;
-			}
-			else {
+			} else {
 				$additionalFormFields['parent_id'] = $defines['focus']->id;
 			}
 		}