adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetFieldcurrency_id.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?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,7 +81,7 @@ 
         {
             $currency = new Currency();
             $currency->retrieve($value);
-            $currencies[$value] = $currency->symbol . ' ' . $currency->iso4217;
+            $currencies[$value] = $currency->symbol.' '.$currency->iso4217;
         }
         return $currencies[$value];
     }
@@ -98,7 +98,7 @@ 
         $list = array();
         foreach ($tmpList as $bean)
         {
-            $list[$bean->id] = $bean->symbol . ' ' . $bean->iso4217;
+            $list[$bean->id] = $bean->symbol.' '.$bean->iso4217;
         }
 
         $field_def = $this->reporter->all_fields[$layout_def['column_key']];

include/generic/SugarWidgets/SugarWidgetSubPanelLoadSignedButton.php

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -55,27 +55,27 @@ 
 		global $app_strings;
 		
 
-		$href = 'index.php?module=' . 'Documents'
-			. '&action=' . 'EditView'
-			. '&record=' . $layout_def['fields']['ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record']
-			. '&load_signed_id=' . $layout_def['fields']['LINKED_ID']
-			. '&parent_id=' . $_REQUEST['record']			
-			. '&parent_name=' . $layout_def['fields']['CONTRACT_NAME']			
-			. '&parent_type=' . $_REQUEST['module']			
-			. '&selected_revision_id=' . $layout_def['fields']['SELECTED_REVISION_ID']	
+		$href = 'index.php?module='.'Documents'
+			. '&action='.'EditView'
+			. '&record='.$layout_def['fields']['ID']
+			. '&return_module='.$_REQUEST['module']
+			. '&return_action='.'DetailView'
+			. '&return_id='.$_REQUEST['record']
+			. '&load_signed_id='.$layout_def['fields']['LINKED_ID']
+			. '&parent_id='.$_REQUEST['record']			
+			. '&parent_name='.$layout_def['fields']['CONTRACT_NAME']			
+			. '&parent_type='.$_REQUEST['module']			
+			. '&selected_revision_id='.$layout_def['fields']['SELECTED_REVISION_ID']	
 			;
 
-		$edit_icon_html = SugarThemeRegistry::current()->getImage( 'loadSignedDocument','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_LOAD_SIGNED']);
+		$edit_icon_html = SugarThemeRegistry::current()->getImage('loadSignedDocument', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LNK_LOAD_SIGNED']);
 		//if the contract state is executed or document is not a template hide this action.
-		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS']=='executed') or
-			empty($layout_def['fields']['IS_TEMPLATE']) or $layout_def['fields']['IS_TEMPLATE']==0) {
+		if ((!empty($layout_def['fields']['CONTRACT_STATUS']) && $layout_def['fields']['CONTRACT_STATUS'] == 'executed') or
+			empty($layout_def['fields']['IS_TEMPLATE']) or $layout_def['fields']['IS_TEMPLATE'] == 0) {
 			return "";
 		}
-		return '<a href="' . $href . '"' . "title ='". $app_strings['LNK_LOAD_SIGNED_TOOLTIP']."'"
-			. 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_LOAD_SIGNED'] .'</a>&nbsp;';
+		return '<a href="'.$href.'"'."title ='".$app_strings['LNK_LOAD_SIGNED_TOOLTIP']."'"
+			. 'class="listViewTdToolsS1">'.$edit_icon_html.'&nbsp;'.$app_strings['LNK_LOAD_SIGNED'].'</a>&nbsp;';
 	}
 		
 }

include/generic/SugarWidgets/SugarWidgetFieldbool.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -51,7 +51,7 @@ 
 			return "(".$this->_get_column_select($layout_def)." LIKE 'on' OR ".$this->_get_column_select($layout_def)."='1')\n";
 		} else {
 			//return "(".$this->_get_column_select($layout_def)." is null OR ".$this->_get_column_select($layout_def)."='0' OR ".$this->_get_column_select($layout_def)."='off')\n";
-            return "(".$this->_get_column_select($layout_def)." is null OR ". $this->_get_column_select($layout_def)."='0')\n";            
+            return "(".$this->_get_column_select($layout_def)." is null OR ".$this->_get_column_select($layout_def)."='0')\n";            
 		}
  }
 
@@ -63,7 +63,7 @@ 
         $key = $this->_get_column_alias($layout_def);
         $key = strtoupper($key);
         
-        if(empty($layout_def['fields'][$key]))
+        if (empty($layout_def['fields'][$key]))
         {
             $layout_def['name'] = $name;
             global $app_list_strings;
@@ -77,7 +77,7 @@ 
         }
 
         $on_or_off = 'CHECKED';
-        if ( empty($value) ||  $value == 'off')
+        if (empty($value) || $value == 'off')
         {
             $on_or_off = '';
         }

include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateAccountNameButton.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?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,23 +59,23 @@ 
 		//$accesskey = $app_strings['LBL_NEW_BUTTON_KEY'];
 		$value = $app_strings['LBL_NEW_BUTTON_LABEL'];
 		$this->module = 'Contacts';
-		if( ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+		if (ACLController::moduleSupportsACL($defines['module']) && !ACLController::checkAccess($defines['module'], 'edit', true)) {
 			$button = "<input title='$title'class='button' type='button' name='button' value='  $value  ' disabled/>\n";
 			return $button;
 		}
 		
 		$additionalFormFields = array();
-		if(isset($defines['focus']->billing_address_street)) 
+		if (isset($defines['focus']->billing_address_street)) 
 			$additionalFormFields['primary_address_street'] = $defines['focus']->billing_address_street;
-		if(isset($defines['focus']->billing_address_city)) 
+		if (isset($defines['focus']->billing_address_city)) 
 			$additionalFormFields['primary_address_city'] = $defines['focus']->billing_address_city;						  		
-		if(isset($defines['focus']->billing_address_state)) 
+		if (isset($defines['focus']->billing_address_state)) 
 			$additionalFormFields['primary_address_state'] = $defines['focus']->billing_address_state;
-		if(isset($defines['focus']->billing_address_country)) 
+		if (isset($defines['focus']->billing_address_country)) 
 			$additionalFormFields['primary_address_country'] = $defines['focus']->billing_address_country;
-		if(isset($defines['focus']->billing_address_postalcode)) 
+		if (isset($defines['focus']->billing_address_postalcode)) 
 			$additionalFormFields['primary_address_postalcode'] = $defines['focus']->billing_address_postalcode;
-		if(isset($defines['focus']->phone_office)) 
+		if (isset($defines['focus']->phone_office)) 
 			$additionalFormFields['phone_work'] = $defines['focus']->phone_office;
 		
 		

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonMeetings.php

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -67,12 +67,12 @@ 
 		$return_id = $_REQUEST['record'];
 		
 		
-		if(isset($GLOBALS['FOCUS'])) {	
+		if (isset($GLOBALS['FOCUS'])) {	
 			$focus = $GLOBALS['FOCUS'];
 		}
 		
         /* Handle case where we generate subpanels from MySettings/LoadTabSubpanels.php */
-        else if($return_module == 'MySettings') {
+        else if ($return_module == 'MySettings') {
         	global $beanList, $beanFiles;
             $return_module = $_REQUEST['loadModule'];
             
@@ -86,12 +86,12 @@ 
 		//if($focus->assigned_user_id == $record) return '';
 		
 		if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
-			$linked_field= $layout_def['linked_field_set'] ;
+			$linked_field = $layout_def['linked_field_set'];
 		} else {
 			$linked_field = $layout_def['linked_field'];
 		}
 		$refresh_page = 0;
-		if(!empty($layout_def['refresh_page'])){
+		if (!empty($layout_def['refresh_page'])) {
 			$refresh_page = 1;
 		}
 		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1";
@@ -103,15 +103,15 @@ 
 			. "&record=$parent_record_id"
 			. "&linked_field=$linked_field"
 			. "&linked_id=$record"
-			. "&return_url=" . urlencode(urlencode($return_url))
+			. "&return_url=".urlencode(urlencode($return_url))
 			. "&refresh_page=$refresh_page"
 			. $layout_def['end_link_wrapper'];
 		$remove_confirmation_text = $app_strings['NTC_REMOVE_CONFIRMATION'];
 		//based on listview since that lets you select records
-		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{
+		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 {
 			return '';
 		}
 	}

include/generic/SugarWidgets/SugarWidgetFielduser_name.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?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,7 +46,7 @@ 
  function displayInput(&$layout_def) 
  {
         $selected_users = empty($layout_def['input_name0']) ? '' : $layout_def['input_name0'];
- 		$str = '<select multiple="true" size="3" name="' . $layout_def['name'] . '[]">' . get_select_options_with_id(get_user_array(false), $selected_users) . '</select>';
+ 		$str = '<select multiple="true" size="3" name="'.$layout_def['name'].'[]">'.get_select_options_with_id(get_user_array(false), $selected_users).'</select>';
  		return $str;
  }
 }

include/generic/SugarWidgets/SugarWidgetSubPanelIcon.php

Spacing +27 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?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,7 +56,7 @@ 
 		global $app_list_strings;
 		global $current_user;
 
-		if(isset($layout_def['varname']))
+		if (isset($layout_def['varname']))
 		{
 			$key = strtoupper($layout_def['varname']);
 		}
@@ -67,14 +67,14 @@ 
 		}
 //add module image
 		//add module image
-		if(!empty($layout_def['target_module_key'])) {
+		if (!empty($layout_def['target_module_key'])) {
 			if (!empty($layout_def['fields'][strtoupper($layout_def['target_module_key'])])) {
-				$module=$layout_def['fields'][strtoupper($layout_def['target_module_key'])];
+				$module = $layout_def['fields'][strtoupper($layout_def['target_module_key'])];
 			}
 		}
 
         if (empty($module)) {
-			if(empty($layout_def['target_module']))
+			if (empty($layout_def['target_module']))
 			{
 				$module = $layout_def['module'];
 			}
@@ -84,7 +84,7 @@ 
 			}
 		}
 		$action = 'DetailView';
-		if(empty($layout_def['target_record_key']))
+		if (empty($layout_def['target_record_key']))
 		{
 			$record = $layout_def['fields']['ID'];
 		}
@@ -94,70 +94,70 @@ 
 			$record = $layout_def['fields'][$record_key];
 		}
 		$action_access = false;
-		if(!empty($record) &&
+		if (!empty($record) &&
 			($layout_def[$action] && !$layout_def['owner_module']
 			||  $layout_def[$action] && !ACLController::moduleSupportsACL($layout_def['owner_module'])
 			|| ACLController::checkAccess($layout_def['owner_module'], 'view', $layout_def['owner_id'] == $current_user->id))) {
 			$action_access = true;
 		}
-		$icon_img_html = SugarThemeRegistry::current()->getImage( $module . '', 'border="0"',null,null,'.gif',$app_list_strings['moduleList'][$module]);
+		$icon_img_html = SugarThemeRegistry::current()->getImage($module.'', 'border="0"', null, null, '.gif', $app_list_strings['moduleList'][$module]);
 		if (!empty($layout_def['attachment_image_only']) && $layout_def['attachment_image_only'] == true) {
-			$ret="";
+			$ret = "";
 		} else {
 			if ($action_access) {
-				$ret = '<a href="index.php?module=' . $module . '&action=' . $action . '&record=' . $record	. '" >' . $icon_img_html . "</a>";
+				$ret = '<a href="index.php?module='.$module.'&action='.$action.'&record='.$record.'" >'.$icon_img_html."</a>";
 			} else {
 				$ret = $icon_img_html;
 			}
 		}
 
-		if(!empty($layout_def['image2']) &&  !empty($layout_def['image2_ext_url_field'])){
+		if (!empty($layout_def['image2']) && !empty($layout_def['image2_ext_url_field'])) {
 
 			if (!empty($layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])])) {
-				$link_url  = $layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])];
+				$link_url = $layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])];
 			}
 
             $imagePath = '';
-            if ( $layout_def['image2'] == '__VARIABLE' ) {
-                if ( !empty($layout_def['fields'][$key.'_ICON']) ) {
+            if ($layout_def['image2'] == '__VARIABLE') {
+                if (!empty($layout_def['fields'][$key.'_ICON'])) {
                     $imagePath = $layout_def['fields'][$key.'_ICON'];
                 }
             } else {
                 $imagePath = $layout_def['image2'];
             }
 
-            if ( !empty($imagePath) ) {
-                $icon_img_html = SugarThemeRegistry::current()->getImage( $imagePath . '', 'border="0"',null,null,'.gif',$imagePath);
-                $ret.= (empty($link_url)) ? '' : '&nbsp;<a href="' . $link_url. '" TARGET = "_blank">' . "$icon_img_html</a>";
+            if (!empty($imagePath)) {
+                $icon_img_html = SugarThemeRegistry::current()->getImage($imagePath.'', 'border="0"', null, null, '.gif', $imagePath);
+                $ret .= (empty($link_url)) ? '' : '&nbsp;<a href="'.$link_url.'" TARGET = "_blank">'."$icon_img_html</a>";
             }
         }
 //if requested, add attachment icon.
-		if(!empty($layout_def['image2']) && !empty($layout_def['image2_url_field'])){
+		if (!empty($layout_def['image2']) && !empty($layout_def['image2_url_field'])) {
 
 			if (is_array($layout_def['image2_url_field'])) {
 				//Generate file url.
 				if (!empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])])
-				and !empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])]) ) {
+				and !empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])])) {
 
-					$key=$layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])];
-                    $file=$layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])];
-                    $filepath="index.php?entryPoint=download&id=".$key."&type=".$layout_def['module'];
+					$key = $layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])];
+                    $file = $layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])];
+                    $filepath = "index.php?entryPoint=download&id=".$key."&type=".$layout_def['module'];
 				}
 			} else {
 				if (!empty($layout_def['fields'][strtoupper($layout_def['image2_url_field'])])) {
-					$filepath="index.php?entryPoint=download&id=".$layout_def['fields']['ID']."&type=".$layout_def['module'];
+					$filepath = "index.php?entryPoint=download&id=".$layout_def['fields']['ID']."&type=".$layout_def['module'];
 				}
 			}
-			$icon_img_html = SugarThemeRegistry::current()->getImage( $layout_def['image2'] . '', 'border="0"',null,null,'.gif',$layout_def['image2']);
+			$icon_img_html = SugarThemeRegistry::current()->getImage($layout_def['image2'].'', 'border="0"', null, null, '.gif', $layout_def['image2']);
 			if ($action_access && !empty($filepath)) {
-				$ret .= '<a href="' . $filepath. '" >' . "$icon_img_html</a>";
+				$ret .= '<a href="'.$filepath.'" >'."$icon_img_html</a>";
 			} elseif (!empty($filepath)) {
 				$ret .= $icon_img_html;
 			}
 		}
 		// now handle attachments for Emails
-		else if(!empty($layout_def['module']) && $layout_def['module'] == 'Emails' && !empty($layout_def['fields']['ATTACHMENT_IMAGE'])) {
-			$ret.= $layout_def['fields']['ATTACHMENT_IMAGE'];
+		else if (!empty($layout_def['module']) && $layout_def['module'] == 'Emails' && !empty($layout_def['fields']['ATTACHMENT_IMAGE'])) {
+			$ret .= $layout_def['fields']['ATTACHMENT_IMAGE'];
 		}
 		return $ret;
 	}

include/generic/SugarWidgets/SugarWidgetSubPanelConcat.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?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,15 +47,15 @@ 
 {
 	function displayList(&$layout_def)
 	{
-		$value='';
+		$value = '';
 		if (isset($layout_def['source']) and is_array($layout_def['source']) and isset($layout_def['fields']) and is_array($layout_def['fields'])) {
 			
 			foreach ($layout_def['source'] as $field) {
 			
 				if (isset($layout_def['fields'][strtoupper($field)])) {
-					$value.=$layout_def['fields'][strtoupper($field)];
+					$value .= $layout_def['fields'][strtoupper($field)];
 				} else {
-					$value.=$field;
+					$value .= $field;
 				}	
 			}
 		}

include/database/SqlsrvManager.php

Spacing +57 added lines, -57 removed lines

@@ -1,5 +1,5 @@ 
 <?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.
@@ -175,14 +175,14 @@ 
                     "ReturnDatesAsStrings" => true,
                     "MultipleActiveResultSets" => true,
                     );
-        if(!empty($configOptions['db_name'])) {
+        if (!empty($configOptions['db_name'])) {
             $options["Database"] = $configOptions['db_name'];
         }
         $this->database = sqlsrv_connect($connect_param, $options);
-        if(empty($this->database)) {
+        if (empty($this->database)) {
             $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].".");
-            if($dieOnError) {
-                    if(isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
+            if ($dieOnError) {
+                    if (isset($GLOBALS['app_strings']['ERR_NO_DB'])) {
                         sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
                     } else {
                         sugar_die("Could not connect to the database. Please refer to suitecrm.log for details.");
@@ -192,7 +192,7 @@ 
             }
         }
 
-        if($this->checkError('Could Not Connect:', $dieOnError))
+        if ($this->checkError('Could Not Connect:', $dieOnError))
             $GLOBALS['log']->info("connected to db");
 
         sqlsrv_query($this->database, 'SET DATEFORMAT mdy');
@@ -208,26 +208,26 @@ 
 	 */
 	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
     {
-        if(is_array($sql)) {
+        if (is_array($sql)) {
             return $this->queryArray($sql, $dieOnError, $msg, $suppress);
         }
         $sql = $this->_appendN($sql);
 
         $this->countQuery($sql);
-        $GLOBALS['log']->info('Query:' . $sql);
+        $GLOBALS['log']->info('Query:'.$sql);
         $this->checkConnection();
         $this->query_time = microtime(true);
 
-        $result = $suppress?@sqlsrv_query($this->database, $sql):sqlsrv_query($this->database, $sql);
+        $result = $suppress ? @sqlsrv_query($this->database, $sql) : sqlsrv_query($this->database, $sql);
 
         $this->query_time = microtime(true) - $this->query_time;
         $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        $this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 
         //suppress non error messages
-        sqlsrv_configure('WarningsReturnAsErrors',false);
+        sqlsrv_configure('WarningsReturnAsErrors', false);
 
         return $result;
     }
@@ -239,13 +239,13 @@ 
 	{
         $field_array = array();
 
-        if ( !$result ) {
+        if (!$result) {
         	return false;
         }
 
-        foreach ( sqlsrv_field_metadata($result) as $fieldMetadata ) {
+        foreach (sqlsrv_field_metadata($result) as $fieldMetadata) {
             $key = $fieldMetadata['Name'];
-            if($make_lower_case==true)
+            if ($make_lower_case == true)
                 $key = strtolower($key);
 
             $field_array[] = $key;
@@ -261,12 +261,12 @@ 
 	{
 		if (empty($result))	return false;
 
-	    $row = sqlsrv_fetch_array($result,SQLSRV_FETCH_ASSOC);
+	    $row = sqlsrv_fetch_array($result, SQLSRV_FETCH_ASSOC);
         if (empty($row)) {
             return false;
         }
 
-        foreach($row as $key => $column) {
+        foreach ($row as $key => $column) {
             // MSSQL returns a space " " when a varchar column is empty ("") and not null.
             // We need to strip empty spaces
             // notice we only strip if one space is returned.  we do not want to strip
@@ -284,7 +284,7 @@ 
      */
     public function convert($string, $type, array $additional_parameters = array())
     {
-        if ( $type == 'datetime')
+        if ($type == 'datetime')
         // see http://msdn.microsoft.com/en-us/library/ms187928.aspx for details
             return "CONVERT(datetime,$string,120)";
         else
@@ -300,10 +300,10 @@ 
      * @param  array  $fielddef2
      * @return bool   true if they match, false if they don't
      */
-    public function compareVarDefs($fielddef1,$fielddef2, $ignoreName = false)
+    public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
     {
-        if((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])){
-            if(isset($fielddef1['type']) && isset($fielddef2['type'])){
+        if ((isset($fielddef2['dbType']) && $fielddef2['dbType'] == 'id') || preg_match('/(_id$|^id$)/', $fielddef2['name'])) {
+            if (isset($fielddef1['type']) && isset($fielddef2['type'])) {
                 $fielddef2['type'] = $fielddef1['type'];
             }
         }
@@ -318,7 +318,7 @@ 
     public function disconnect()
     {
     	$GLOBALS['log']->debug('Calling Mssql::disconnect()');
-        if(!empty($this->database)){
+        if (!empty($this->database)) {
             $this->freeResult();
             sqlsrv_close($this->database);
             $this->database = null;
@@ -330,7 +330,7 @@ 
      */
     protected function freeDbResult($dbResult)
     {
-        if(!empty($dbResult))
+        if (!empty($dbResult))
             sqlsrv_free_stmt($dbResult);
     }
 
@@ -342,19 +342,19 @@ 
      */
     public function getConstraintSql($indices, $table)
     {
-        if ( $this->doesTableHaveAClusteredIndexDefined($table) ) {
+        if ($this->doesTableHaveAClusteredIndexDefined($table)) {
             return parent::getConstraintSql($indices, $table);
         }
 
         // check to see if one of the passed in indices is a primary one; if so we can bail as well
-        foreach ( $indices as $index ) {
-            if ( $index['type'] == 'primary' ) {
+        foreach ($indices as $index) {
+            if ($index['type'] == 'primary') {
                 return parent::getConstraintSql($indices, $table);
             }
         }
 
         // Change the first index listed to be a clustered one instead ( so we have at least one for the table )
-        if ( isset($indices[0]) ) {
+        if (isset($indices[0])) {
             $indices[0]['type'] = 'clustered';
         }
 
@@ -370,41 +370,41 @@ 
         $result = $this->query("sp_columns_90 $tablename");
 
         $columns = array();
-        while (($row=$this->fetchByAssoc($result)) !=null) {
+        while (($row = $this->fetchByAssoc($result)) != null) {
             $column_name = strtolower($row['COLUMN_NAME']);
-            $columns[$column_name]['name']=$column_name;
-            $columns[$column_name]['type']=strtolower($row['TYPE_NAME']);
-            if ( $row['TYPE_NAME'] == 'decimal' ) {
-                $columns[$column_name]['len']=strtolower($row['PRECISION']);
-                $columns[$column_name]['len'].=','.strtolower($row['SCALE']);
+            $columns[$column_name]['name'] = $column_name;
+            $columns[$column_name]['type'] = strtolower($row['TYPE_NAME']);
+            if ($row['TYPE_NAME'] == 'decimal') {
+                $columns[$column_name]['len'] = strtolower($row['PRECISION']);
+                $columns[$column_name]['len'] .= ','.strtolower($row['SCALE']);
             }
-			elseif ( in_array($row['TYPE_NAME'],array('nchar','nvarchar')) ) {
-				$columns[$column_name]['len']=strtolower($row['PRECISION']);
-				if ( $row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0' ) {
-				    $columns[$column_name]['len']='max';
+			elseif (in_array($row['TYPE_NAME'], array('nchar', 'nvarchar'))) {
+				$columns[$column_name]['len'] = strtolower($row['PRECISION']);
+				if ($row['TYPE_NAME'] == 'nvarchar' && $row['PRECISION'] == '0') {
+				    $columns[$column_name]['len'] = 'max';
 				}
 			}
-            elseif ( !in_array($row['TYPE_NAME'],array('datetime','text')) ) {
-                $columns[$column_name]['len']=strtolower($row['LENGTH']);
+            elseif (!in_array($row['TYPE_NAME'], array('datetime', 'text'))) {
+                $columns[$column_name]['len'] = strtolower($row['LENGTH']);
             }
-            if ( stristr($row['TYPE_NAME'],'identity') ) {
+            if (stristr($row['TYPE_NAME'], 'identity')) {
                 $columns[$column_name]['auto_increment'] = '1';
-                $columns[$column_name]['type']=str_replace(' identity','',strtolower($row['TYPE_NAME']));
+                $columns[$column_name]['type'] = str_replace(' identity', '', strtolower($row['TYPE_NAME']));
             }
 
-            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'],'PRI')))
+            if (!empty($row['IS_NULLABLE']) && $row['IS_NULLABLE'] == 'NO' && (empty($row['KEY']) || !stristr($row['KEY'], 'PRI')))
                 $columns[strtolower($row['COLUMN_NAME'])]['required'] = 'true';
 
             $column_def = 1;
-            if ( strtolower($tablename) == 'relationships' ) {
+            if (strtolower($tablename) == 'relationships') {
                 $column_def = $this->getOne("select cdefault from syscolumns where id = object_id('relationships') and name = '$column_name'");
             }
-            if ( $column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
+            if ($column_def != 0 && ($row['COLUMN_DEF'] != null)) {	// NOTE Not using !empty as an empty string may be a viable default value.
                 $matches = array();
-                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'],ENT_QUOTES);
-                if ( preg_match('/\([\(|\'](.*)[\)|\']\)/i',$row['COLUMN_DEF'],$matches) )
+                $row['COLUMN_DEF'] = html_entity_decode($row['COLUMN_DEF'], ENT_QUOTES);
+                if (preg_match('/\([\(|\'](.*)[\)|\']\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
-                elseif ( preg_match('/\(N\'(.*)\'\)/i',$row['COLUMN_DEF'],$matches) )
+                elseif (preg_match('/\(N\'(.*)\'\)/i', $row['COLUMN_DEF'], $matches))
                     $columns[$column_name]['default'] = $matches[1];
                 else
                     $columns[$column_name]['default'] = $row['COLUMN_DEF'];
@@ -430,7 +430,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -453,7 +453,7 @@ 
 EOSQL;
 
         $result = $this->getOne($query);
-        if ( !$result ) {
+        if (!$result) {
             return false;
         }
 
@@ -466,10 +466,10 @@ 
      * @see DBManager::changeColumnSQL()
      * @see MssqlHelper::changeColumnSQL()
      */
-    protected function changeColumnSQL($tablename,$fieldDefs, $action, $ignoreRequired = false)
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
     {
         $sql = '';
-        if ( $action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename) ) {
+        if ($action == 'drop' && $this->doesTableHaveAFulltextIndexDefined($tablename)) {
             $sql .= "DROP FULLTEXT INDEX ON {$tablename}";
         }
 
@@ -495,33 +495,33 @@ 
     public function lastDbError()
     {
         $errors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-        if(empty($errors)) return false;
+        if (empty($errors)) return false;
         global $app_strings;
         if (empty($app_strings)
 		    or !isset($app_strings['ERR_MSSQL_DB_CONTEXT'])
-			or !isset($app_strings['ERR_MSSQL_WARNING']) ) {
+			or !isset($app_strings['ERR_MSSQL_WARNING'])) {
         //ignore the message from sql-server if $app_strings array is empty. This will happen
         //only if connection if made before languge is set.
 		    return false;
         }
         $messages = array();
-        foreach($errors as $error) {
+        foreach ($errors as $error) {
             $sqlmsg = $error['message'];
             $sqlpos = strpos($sqlmsg, 'Changed database context to');
             $sqlpos2 = strpos($sqlmsg, 'Warning:');
             $sqlpos3 = strpos($sqlmsg, 'Checking identity information:');
-            if ( $sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false ) {
+            if ($sqlpos !== false || $sqlpos2 !== false || $sqlpos3 !== false) {
                 continue;
             }
             $sqlpos = strpos($sqlmsg, $app_strings['ERR_MSSQL_DB_CONTEXT']);
             $sqlpos2 = strpos($sqlmsg, $app_strings['ERR_MSSQL_WARNING']);
-    		if ( $sqlpos !== false || $sqlpos2 !== false) {
+    		if ($sqlpos !== false || $sqlpos2 !== false) {
                     continue;
             }
             $messages[] = $sqlmsg;
         }
 
-        if(!empty($messages)) {
+        if (!empty($messages)) {
             return join("\n", $messages);
         }
         return false;
@@ -548,7 +548,7 @@ 
     protected function verifyGenericQueryRollback($type, $table, $query)
     {
         $this->log->debug("verifying $type statement");
-        if(!sqlsrv_begin_transaction($this->database)) {
+        if (!sqlsrv_begin_transaction($this->database)) {
             return "Failed to create transaction";
         }
         $this->query($query, false);