adamjakab / SuiteCRM

modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php

Braces +21 added lines, -15 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,14 +67,17 @@ 
     {
         global $timedate;
 
-        if(empty($options['pbss_date_start']))
-            $options['pbss_date_start'] = $timedate->nowDbDate();
+        if(empty($options['pbss_date_start'])) {
+                    $options['pbss_date_start'] = $timedate->nowDbDate();
+        }
 
-        if(empty($options['pbss_date_end']))
-            $options['pbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        if(empty($options['pbss_date_end'])) {
+                    $options['pbss_date_end'] = $timedate->asDbDate($timedate->getNow()->modify("+6 months"));
+        }
 
-        if(empty($options['title']))
-            $options['title'] = translate('LBL_RGraph_PIPELINE_FORM_TITLE', 'Home');
+        if(empty($options['title'])) {
+                    $options['title'] = translate('LBL_RGraph_PIPELINE_FORM_TITLE', 'Home');
+        }
 
         parent::__construct($id,$options);
     }
@@ -84,11 +89,12 @@ 
     {
         global $app_list_strings;
 
-        if (!empty($this->pbss_sales_stages) && count($this->pbss_sales_stages) > 0)
-            foreach ($this->pbss_sales_stages as $key)
+        if (!empty($this->pbss_sales_stages) && count($this->pbss_sales_stages) > 0) {
+                    foreach ($this->pbss_sales_stages as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
+        }
 
         $this->_searchFields['pbss_sales_stages']['options'] = $app_list_strings['sales_stage_dom'];
         $this->_searchFields['pbss_sales_stages']['input_name0'] = $selected_datax;
@@ -263,15 +269,15 @@ 
                 $datax[$key] = $app_list_strings['sales_stage_dom'][$key];
                 $selected_datax[] = $key;
             }
-        }
-        else {
+        } else {
             $datax = $app_list_strings['sales_stage_dom'];
             $selected_datax = array_keys($app_list_strings['sales_stage_dom']);
         }
 
         $result = $db->query($query);
-        while($row = $db->fetchByAssoc($result, false))
-            $temp_data[] = $row;
+        while($row = $db->fetchByAssoc($result, false)) {
+                    $temp_data[] = $row;
+        }
 
         // reorder and set the array based on the order of selected_datax
         foreach($selected_datax as $sales_stage){

modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php

Braces +19 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.
@@ -62,17 +64,19 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (!empty($this->pbls_lead_sources) && sizeof($this->pbls_lead_sources) > 0)
-            foreach ($this->pbls_lead_sources as $key)
+        if (!empty($this->pbls_lead_sources) && sizeof($this->pbls_lead_sources) > 0) {
+                    foreach ($this->pbls_lead_sources as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        }
 
         $this->_searchFields['pbls_lead_sources']['options'] = array_filter($app_list_strings['lead_source_dom']);
         $this->_searchFields['pbls_lead_sources']['input_name0'] = $selected_datax;
 
-        if (!isset($this->pbls_ids) || count($this->pbls_ids) == 0)
-            $this->_searchFields['pbls_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->pbls_ids) || count($this->pbls_ids) == 0) {
+                    $this->_searchFields['pbls_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -241,12 +245,14 @@ 
         $query = "SELECT lead_source,sum(amount_usdollar/1000) as total,count(*) as opp_count ".
             "FROM opportunities ";
         $query .= "WHERE opportunities.deleted=0 ";
-        if ( count($this->pbls_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
-        if ( count($this->pbls_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
-        else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        if ( count($this->pbls_ids) > 0 ) {
+                    $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->pbls_ids)."') ";
+        }
+        if ( count($this->pbls_lead_sources) > 0 ) {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",$this->pbls_lead_sources)."') ";
+        } else {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        }
         $query .= "GROUP BY lead_source ORDER BY total DESC";
 
         return $query;

modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php

Braces +25 added lines, -17 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,17 +63,19 @@ 
         global $app_list_strings;
 
         $selected_datax = array();
-        if (!empty($this->lsbo_lead_sources) && sizeof($this->lsbo_lead_sources) > 0)
-            foreach ($this->lsbo_lead_sources as $key)
+        if (!empty($this->lsbo_lead_sources) && sizeof($this->lsbo_lead_sources) > 0) {
+                    foreach ($this->lsbo_lead_sources as $key)
                 $selected_datax[] = $key;
-        else
-            $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        } else {
+                    $selected_datax = array_keys($app_list_strings['lead_source_dom']);
+        }
 
         $this->_searchFields['lsbo_lead_sources']['options'] = array_filter($app_list_strings['lead_source_dom']);
         $this->_searchFields['lsbo_lead_sources']['input_name0'] = $selected_datax;
 
-        if (!isset($this->lsbo_ids) || count($this->lsbo_ids) == 0)
-            $this->_searchFields['lsbo_ids']['input_name0'] = array_keys(get_user_array(false));
+        if (!isset($this->lsbo_ids) || count($this->lsbo_ids) == 0) {
+                    $this->_searchFields['lsbo_ids']['input_name0'] = array_keys(get_user_array(false));
+        }
 
         return parent::displayOptions();
     }
@@ -131,8 +135,9 @@ 
 
 
         $url_params = array();
-        if ( count($this->lsbo_ids) > 0 )
-            $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
+        if ( count($this->lsbo_ids) > 0 ) {
+                    $url_params['assigned_user_id'] = array_values($this->lsbo_ids);
+        }
 
 
         $data = $this->getChartData($this->constructQuery());
@@ -253,12 +258,14 @@ 
         $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ".
             "count(*) as opp_count FROM opportunities ";
         $query .= " WHERE opportunities.deleted=0 ";
-        if ( count($this->lsbo_ids) > 0 )
-            $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
-        if ( count($this->lsbo_lead_sources) > 0 )
-            $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
-        else
-            $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        if ( count($this->lsbo_ids) > 0 ) {
+                    $query .= "AND opportunities.assigned_user_id IN ('".implode("','",$this->lsbo_ids)."') ";
+        }
+        if ( count($this->lsbo_lead_sources) > 0 ) {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",$this->lsbo_lead_sources)."') ";
+        } else {
+                    $query .= "AND opportunities.lead_source IN ('".implode("','",array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') ";
+        }
         $query .= " GROUP BY sales_stage,lead_source ORDER BY lead_source,sales_stage";
 
         return $query;
@@ -282,8 +289,9 @@ 
                 $chart['labels'][] = $key;
                 $chart['data'][] = array();
             }
-            if(!in_array($stage,$chart['key']))
-                $chart['key'][] = $stage;
+            if(!in_array($stage,$chart['key'])) {
+                            $chart['key'][] = $stage;
+            }
 
             $formattedFloat = (float)number_format((float)$i["total"], 2, '.', '');
             $chart['data'][count($chart['data'])-1][] = $formattedFloat;

modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.php

Braces +27 added lines, -19 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -60,11 +62,12 @@ 
         $this->getSeedBean()->disable_row_level_security = false;
 
         $campaigns = $this->getSeedBean()->get_full_list("","");
-        if ( $campaigns != null )
-            foreach ($campaigns as $c)
+        if ( $campaigns != null ) {
+                    foreach ($campaigns as $c)
                 $this->_searchFields['campaign_id']['options'][$c->id] = $c->name;
-        else
-            $this->_searchFields['campaign_id']['options'] = array();
+        } else {
+                    $this->_searchFields['campaign_id']['options'] = array();
+        }
 
         return parent::displayOptions();
     }
@@ -234,7 +237,9 @@ 
 
         $opp_result=$focus->db->query($opp_query);
         $opp_data=$focus->db->fetchByAssoc($opp_result);
-        if (empty($opp_data['total_value'])) $opp_data['total_value']=0;
+        if (empty($opp_data['total_value'])) {
+            $opp_data['total_value']=0;
+        }
 
         $chartData['Total Value']= $opp_data['total_value'];
 
@@ -252,7 +257,7 @@ 
         if (empty($opp_data1['revenue'])){
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = 0;
             unset($opp_data1['revenue']);
-        }else{
+        } else{
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = $opp_data1['revenue'];
             unset($opp_data1['revenue']);
             $not_empty = true;
@@ -269,18 +274,21 @@ 
         $camp_data1=$focus->db->fetchByAssoc($camp_result1);
 
 
-        if (empty($camp_data1['investment']))
-            $camp_data1['investment'] = 0;
-        else
-            $not_empty = true;
-        if (empty($camp_data1['budget']))
-            $camp_data1['budget'] = 0;
-        else
-            $not_empty = true;
-        if (empty($camp_data1['expected_revenue']))
-            $camp_data1['expected_revenue'] = 0;
-        else
-            $not_empty = true;
+        if (empty($camp_data1['investment'])) {
+                    $camp_data1['investment'] = 0;
+        } else {
+                    $not_empty = true;
+        }
+        if (empty($camp_data1['budget'])) {
+                    $camp_data1['budget'] = 0;
+        } else {
+                    $not_empty = true;
+        }
+        if (empty($camp_data1['expected_revenue'])) {
+                    $camp_data1['expected_revenue'] = 0;
+        } else {
+                    $not_empty = true;
+        }
 
         $chartData['Investment']= $camp_data1['investment'];
         $chartData['Budget']= $camp_data1['budget'];

modules/Administration/SupportPortal.php

Braces +19 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.
@@ -53,7 +55,9 @@ 
 
 switch ($_REQUEST['view']) {
 	case "support_portal":
-		if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+		if (!is_admin($current_user)) {
+		    sugar_die("Unauthorized access to administration.");
+		}
 		$GLOBALS['log']->info("Administration SupportPortal");
 
 		$iframe_url = add_http("www.sugarcrm.com/network/redirect.php?tmpl=network");
@@ -83,14 +87,18 @@ 
 		$send_key = isset($_REQUEST['key']) ? $_REQUEST['key'] : "";
 		$send_anchor = '';
 		// awu: Fixes the ProjectTasks pluralization issue -- must fix in later versions.
-		if ($send_module == 'ProjectTasks')
-			$send_module = 'ProjectTask';
-        if ($send_module == 'ProductCatalog')
-                $send_module = 'ProductTemplates';
-        if ($send_module == 'TargetLists')
-                $send_module = 'ProspectLists';
-        if ($send_module == 'Targets')
-                $send_module = 'Prospects';                            
+		if ($send_module == 'ProjectTasks') {
+					$send_module = 'ProjectTask';
+		}
+        if ($send_module == 'ProductCatalog') {
+                        $send_module = 'ProductTemplates';
+        }
+        if ($send_module == 'TargetLists') {
+                        $send_module = 'ProspectLists';
+        }
+        if ($send_module == 'Targets') {
+                        $send_module = 'Prospects';
+        }
 		// FG - Bug 39819 - Check for custom help files
 		$helpPath = 'modules/'.$send_module.'/language/'.$send_lang.'.help.'.$send_action.'.html';
 		if (sugar_is_file("custom/" . $helpPath)) {
@@ -205,7 +213,7 @@ 
 								$send_anchor = $map['anchor'];
 							}
 						}
-					}else{
+					} else{
 						$send_module = $map['name'];
 						if(!empty($map['anchor'])){
 								$send_anchor = $map['anchor'];

modules/Administration/DiagnosticRun.php

Braces +74 added lines, -50 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.
@@ -47,7 +49,9 @@ 
 global $current_user;
 
 
-if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (!is_admin($current_user)) {
+    sugar_die("Unauthorized access to administration.");
+}
 if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
 {
     sugar_die("Unauthorized access to diagnostic tool.");
@@ -131,9 +135,9 @@ 
     global $currentitems;
 
     $currentitems++;
-    if($currentitems == $totalitems)
-      update_progress_bar("diagnostic", 100, 100);
-    else
+    if($currentitems == $totalitems) {
+          update_progress_bar("diagnostic", 100, 100);
+    } else
     {
       $progress_bar_percent += ($itemweight / $GLOBALS['totalweight'] * 100);
       update_progress_bar("diagnostic", $progress_bar_percent, 100);
@@ -214,18 +218,21 @@ 
 			//perform this check when counter is set to two, which means it is on the 'value' column
 			if($counter == 2) {
 				//if the previous "name" column value was set to smtppass, set replace_val to true
-				if(strcmp($row[$counter - 1], "smtppass") == 0  )
-					$replace_val = true;
+				if(strcmp($row[$counter - 1], "smtppass") == 0  ) {
+									$replace_val = true;
+				}
 
 				//if the previous "name" column value was set to smtppass,
 				//and the "category" value set to ldap, set replace_val to true
-				if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0)
-					$replace_val = true;
+				if (strcmp($row[$counter - 2], "ldap") == 0 && strcmp($row[$counter - 1], "admin_password") == 0) {
+									$replace_val = true;
+				}
 
 				//if the previous "name" column value was set to password,
 				//and the "category" value set to proxy, set replace_val to true
-				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 )
-					$replace_val = true;
+				if(strcmp($row[$counter - 2], "proxy") == 0 && strcmp($row[$counter - 1], "password") == 0 ) {
+									$replace_val = true;
+				}
 			}
 
 			if($replace_val) {
@@ -245,8 +252,9 @@ 
 // Deletes the directory recursively
 function deleteDir($dir)
 {
-   if (substr($dir, strlen($dir)-1, 1) != '/')
-       $dir .= '/';
+   if (substr($dir, strlen($dir)-1, 1) != '/') {
+          $dir .= '/';
+   }
 
    if ($handle = opendir($dir))
    {
@@ -256,21 +264,23 @@ 
            {
                if (is_dir($dir.$obj))
                {
-                   if (!deleteDir($dir.$obj))
-                       return false;
-               }
-               elseif (is_file($dir.$obj))
+                   if (!deleteDir($dir.$obj)) {
+                                          return false;
+                   }
+               } elseif (is_file($dir.$obj))
                {
-                   if (!unlink($dir.$obj))
-                       return false;
+                   if (!unlink($dir.$obj)) {
+                                          return false;
+                   }
                }
            }
        }
 
        closedir($handle);
 
-       if (!@rmdir($dir))
-           return false;
+       if (!@rmdir($dir)) {
+                  return false;
+       }
        return true;
    }
    return false;
@@ -301,10 +311,11 @@ 
 
 
 	//determine if files.md5 exists or not
-	if(file_exists('files.md5'))
-		$skip_md5_diff = false;
-	else
-		$skip_md5_diff = true;
+	if(file_exists('files.md5')) {
+			$skip_md5_diff = false;
+	} else {
+			$skip_md5_diff = true;
+	}
 
 	// array of all tables that we need to pull rows from below
 	$getDumpsFrom = array('config' => 'config',
@@ -392,8 +403,9 @@ 
 
 
     //create directory for table definitions
-    if($getschema)
-      $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
+    if($getschema) {
+          $tablesSchemaDir = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/{$db->dbName}/TableSchema/");
+    }
 
     //make sure they checked the box to get basic info
     if($getinfo)
@@ -547,13 +559,13 @@ 
 		if(!isset($beanFiles[$beanz]))
 		{
 			echo "<font color=orange>NO! --- ".$beanz." is not an index in \$beanFiles</font><br>";
-		}
-		else
+		} else
 		{
-			if(file_exists($beanFiles[$beanz]))
-				echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
-			else
-				echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
+			if(file_exists($beanFiles[$beanz])) {
+							echo "<font color=green>YES --- ".$beanz." file \"".$beanFiles[$beanz]."\" exists</font><br>";
+			} else {
+							echo "<font color=red>NO! --- ".$beanz." file \"".$beanFiles[$beanz]."\" does NOT exist</font><br>";
+			}
 		}
 	}
 
@@ -589,8 +601,9 @@ 
 	global $curdatetime;
 	global $skip_md5_diff;
 	global $sod_guid;
-	if(file_exists('files.md5'))
-        include( 'files.md5');
+	if(file_exists('files.md5')) {
+	        include( 'files.md5');
+	}
 	//create dir for md5s
 	$md5_directory = create_cache_directory("diagnostic/".$sod_guid."/diagnostic".$curdatetime."/md5/");
 
@@ -598,15 +611,17 @@ 
 	if(!$skip_md5_diff)
 	{
 		//make sure the files.md5
-		if($filesmd5)
-			if(!copy('files.md5', $md5_directory."files.md5"))
+		if($filesmd5) {
+					if(!copy('files.md5', $md5_directory."files.md5"))
 				echo "Couldn't copy files.md5 to ".$md5_directory."<br>Skipping md5 checks.<br>";
+		}
 	}
 
 	$md5_string_calculated = generateMD5array('./');
 
-	if($md5calculated)
-		write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
+	if($md5calculated) {
+			write_array_to_file('md5_string_calculated', $md5_string_calculated, $md5_directory."md5_array_calculated.php");
+	}
 
 
 	//if the files.md5 didn't exist, we can't do this
@@ -668,8 +683,9 @@ 
 
     foreach($tables as $t) {
 	$name = $t;
-	if ( $name == "does_not_exist" )
-	  continue;
+	if ( $name == "does_not_exist" ) {
+		  continue;
+	}
 	$comment = $comments[$t];
 	echo "<h2>Table: $t</h2>
 		<p><i>{$comment}</i></p>";
@@ -686,8 +702,9 @@ 
 
 	foreach($fields[$t] as $k => $v) {
 	  // we only care about physical tables ('source' can be 'non-db' or 'nondb' or 'function' )
-	  if ( isset( $v[ 'source' ] ))
-	    continue;
+	  if ( isset( $v[ 'source' ] )) {
+	  	    continue;
+	  }
 	  $columnname = $v[ 'name' ];
 	  $columntype = $v[ 'type' ];
 	  $columndbtype = $v[ 'dbType' ];
@@ -695,13 +712,20 @@ 
 	  $columncomment = $v[ 'comment' ];
 	  $columnrequired = $v[ 'required' ];
 
-	  if ( empty( $columnlen ) ) $columnlen = '<i>n/a</i>';
-	  if ( empty( $columncomment ) ) $columncomment = '<i>(none)</i>';
-	  if ( !empty( $columndbtype ) ) $columntype = $columndbtype;
-	  if ( empty( $columnrequired ) || ( $columnrequired == false ))
-	    $columndisplayrequired = 'no';
-	  else
-	    $columndisplayrequired = 'yes';
+	  if ( empty( $columnlen ) ) {
+	      $columnlen = '<i>n/a</i>';
+	  }
+	  if ( empty( $columncomment ) ) {
+	      $columncomment = '<i>(none)</i>';
+	  }
+	  if ( !empty( $columndbtype ) ) {
+	      $columntype = $columndbtype;
+	  }
+	  if ( empty( $columnrequired ) || ( $columnrequired == false )) {
+	  	    $columndisplayrequired = 'no';
+	  } else {
+	  	    $columndisplayrequired = 'yes';
+	  }
 
 	  echo '<TR BGCOLOR="#FFFFFF" ALIGN=left>
 			<TD ALIGN=left class=\"tabDetailViewDF\">'.$columnname.'</TD>

modules/Administration/RepairSeedUsers.php

Braces +7 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +49,7 @@ 
     		$status = '';
     		if($_POST['activate'] == 'false'){
     			$status = 'Inactive';
-    		}else{
+    		} else{
     			$status = 'Active';
     		}
     	}
@@ -73,18 +75,17 @@ 
 				<table cellspacing="{CELLSPACING}" class="otherview">
 					<tr>
 					    <td scope="row" width="30%"><?php echo $mod_strings['LBL_REPAIR_SEED_USERS_TITLE']; ?></td>
-					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];}else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
+					    <td><input type="submit" name="button" value="<?php if($row['status'] == 'Inactive'){echo $mod_strings['LBL_REPAIR_SEED_USERS_ACTIVATE'];} else{echo $mod_strings['LBL_REPAIR_SEED_USERS_DECACTIVATE'];} ?>"></td>
 					</tr>
 				</table>
 				</form>
 				</p>
 			<?php
 
-		}else{
+		} else{
 			echo 'No seed Users';
 		}
-}
-else{
+} else{
 	sugar_die($GLOBALS['app_strings']['ERR_NOT_ADMIN']);
 }
 ?>
\ No newline at end of file

modules/Administration/Administration.php

Braces +15 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.
@@ -106,10 +108,11 @@ 
         }
 
         while($row = $this->db->fetchByAssoc($result)) {
-            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password')
-                $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
-            else
-                $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            if($row['category']."_".$row['name'] == 'ldap_admin_password' || $row['category']."_".$row['name'] == 'proxy_password') {
+                            $this->settings[$row['category']."_".$row['name']] = $this->decrypt_after_retrieve($row['value']);
+            } else {
+                            $this->settings[$row['category']."_".$row['name']] = $row['value'];
+            }
         }
         $this->settings[$category] = true;
 
@@ -118,8 +121,9 @@ 
         $oe->getSystemMailerSettings();
 
         foreach($oe->field_defs as $def) {
-            if(strpos($def, "mail_") !== false)
-                $this->settings[$def] = $oe->$def;
+            if(strpos($def, "mail_") !== false) {
+                            $this->settings[$def] = $oe->$def;
+            }
         }
 
         // At this point, we have built a new array that should be cached.
@@ -162,13 +166,13 @@ 
         $row = $this->db->fetchByAssoc($result);
         $row_count = $row['the_count'];
 
-        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password')
-            $value = $this->encrpyt_before_save($value);
+        if($category."_".$key == 'ldap_admin_password' || $category."_".$key == 'proxy_password') {
+                    $value = $this->encrpyt_before_save($value);
+        }
 
         if( $row_count == 0){
             $result = $this->db->query("INSERT INTO config (value, category, name) VALUES ('$value','$category', '$key')");
-        }
-        else{
+        } else{
             $result = $this->db->query("UPDATE config SET value = '{$value}' WHERE category = '{$category}' AND name = '{$key}'");
         }
         sugar_cache_clear('admin_settings_cache');

modules/Administration/updater_utils.php

Braces +21 added lines, -15 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,10 +96,11 @@ 
 
 		if(!$send_usage_info){
 			$info['latest_tracker_id'] = -1;
-		}else{
+		} else{
 			$id=$db->getOne("select id from tracker order by date_modified desc", false, 'fetching most recent tracker entry');
-			if ( $id !== false )
-			    $info['latest_tracker_id'] = $id;
+			if ( $id !== false ) {
+						    $info['latest_tracker_id'] = $id;
+			}
 		}
 
 		$info['db_type']=$sugar_config['dbconfig']['db_type'];
@@ -105,7 +108,9 @@ 
 	}
 	if(file_exists('distro.php')){
 		include('distro.php');
-		if(!empty($distro_name))$info['distro_name'] = $distro_name;
+		if(!empty($distro_name)) {
+		    $info['distro_name'] = $distro_name;
+		}
 	}
 	$info['os'] = php_uname('s');
 	$info['os_version'] = php_uname('r');
@@ -143,14 +148,16 @@ 
 
 
 	$return_array=array();
-    if(!$from_install && empty($license))loadLicense(true);
+    if(!$from_install && empty($license)) {
+        loadLicense(true);
+    }
 
 	if(!$response_data){
 
         if($from_install){
     		$info = getBaseSystemInfo(false);
 
-        }else{
+        } else{
             $info = getSystemInfo($send_usage_info);
         }
 
@@ -183,7 +190,7 @@ 
 		}
 		$encodedResult = $sclient->call('sugarHome', array('key'=>$key, 'data'=>$encoded));
 
-	}else{
+	} else{
 		$encodedResult = 	$response_data['data'];
 		$key = $response_data['key'];
 
@@ -197,7 +204,7 @@ 
 			$resultData = array();
 			$resultData['validation'] = 'invalid validation key';
 		}
-	}else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -209,22 +216,21 @@ 
 		if(!empty($resultData['msg'])){
 			if(!empty($resultData['msg']['admin'])){
 				$license->saveSetting('license', 'msg_admin', base64_encode($resultData['msg']['admin']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_admin','');
 			}
 			if(!empty($resultData['msg']['all'])){
 				$license->saveSetting('license', 'msg_all', base64_encode($resultData['msg']['all']));
-			}else{
+			} else{
 				$license->saveSetting('license', 'msg_all','');
 			}
-		}else{
+		} else{
 			$license->saveSetting('license', 'msg_admin','');
 			$license->saveSetting('license', 'msg_all','');
 		}
 		$license->saveSetting('license', 'last_validation', 'success');
 		unset($_SESSION['COULD_NOT_CONNECT']);
-	}
-	else
+	} else
 	{
 		$resultData = array();
 		$resultData['versions'] = array();
@@ -243,7 +249,7 @@ 
 	if(!empty($resultData['versions'])){
 
 		$license->saveSetting('license', 'latest_versions',base64_encode(serialize($resultData['versions'])));
-	}else{
+	} else{
 		$resultData['versions'] = array();
 		$license->saveSetting('license', 'latest_versions','')	;
 	}