adamjakab / SuiteCRM

include/utils.php

Indentation +3 added lines, -3 removed lines

@@ -1727,7 +1727,7 @@ 
         $isSelected = false;
 
         if(empty($option_key)) {
-         continue;
+            continue;
         }
 
         if(empty($option_value)) {
@@ -3128,8 +3128,8 @@ 
     }
 
     // If there are some bug ridden versions, we should include them here
-	// and check immediately for one of this versions
-	$bug_php_versions = array();
+    // and check immediately for one of this versions
+    $bug_php_versions = array();
     foreach ($bug_php_versions as $v) {
         if ( version_compare($sys_php_version, $v, '=') === true) {
             return -1;

Spacing +31 added lines, -31 removed lines

@@ -115,8 +115,8 @@ 
             'd.m.Y' => '23.12.2010',
             'm.d.Y' => '12.23.2010',
         ) : $dateFormats,
-        'dbconfig' => $dbconfig,  // this must be set!!
-        'dbconfigoption' => $dbconfigoption,  // this must be set!!
+        'dbconfig' => $dbconfig, // this must be set!!
+        'dbconfigoption' => $dbconfigoption, // this must be set!!
         'default_action' => empty($default_action) ? 'index' : $default_action,
         'default_charset' => empty($default_charset) ? 'UTF-8' : $default_charset,
         'default_currency_name' => empty($default_currency_name) ? 'US Dollar' : $default_currency_name,
@@ -144,7 +144,7 @@ 
         'display_inbound_email_buttons' => empty($display_inbound_email_buttons) ? false : $display_inbound_email_buttons,
         'history_max_viewed' => empty($history_max_viewed) ? 50 : $history_max_viewed,
         'host_name' => empty($host_name) ? 'localhost' : $host_name,
-        'import_dir' => $import_dir,  // this must be set!!
+        'import_dir' => $import_dir, // this must be set!!
         'import_max_records_per_file' => 100,
         'import_max_records_total_limit' => '',
         'languages' => empty($languages) ? array('en_us' => 'English (US)') : $languages,
@@ -164,21 +164,21 @@ 
         ),
         'require_accounts' => empty($requireAccounts) ? true : $requireAccounts,
         'rss_cache_time' => empty($RSS_CACHE_TIME) ? '10800' : $RSS_CACHE_TIME,
-        'session_dir' => $session_dir,  // this must be set!!
-        'site_url' => empty($site_URL) ? $site_url : $site_URL,  // this must be set!!
+        'session_dir' => $session_dir, // this must be set!!
+        'site_url' => empty($site_URL) ? $site_url : $site_URL, // this must be set!!
         'showDetailData' => true, // if true, read-only ACL fields will still appear on EditViews as non-editable
         'showThemePicker' => true,
         'sugar_version' => empty($sugar_version) ? 'unknown' : $sugar_version,
         'time_formats' => empty($timeFormats) ? array(
             'H:i' => '23:00', 'h:ia' => '11:00 pm', 'h:iA' => '11:00PM',
-            'H.i' => '23.00', 'h.ia' => '11.00 pm', 'h.iA' => '11.00PM', ) : $timeFormats,
-        'tmp_dir' => $tmp_dir,  // this must be set!!
+            'H.i' => '23.00', 'h.ia' => '11.00 pm', 'h.iA' => '11.00PM',) : $timeFormats,
+        'tmp_dir' => $tmp_dir, // this must be set!!
         'translation_string_prefix' => empty($translation_string_prefix) ? false : $translation_string_prefix,
         'unique_key' => empty($unique_key) ? md5(create_guid()) : $unique_key,
         'upload_badext' => empty($upload_badext) ? array(
             'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', ) : $upload_badext,
-        'upload_dir' => $upload_dir,  // this must be set!!
+            'asp', 'cfm', 'js', 'vbs', 'html', 'htm',) : $upload_badext,
+        'upload_dir' => $upload_dir, // this must be set!!
         'upload_maxsize' => empty($upload_maxsize) ? 30000000 : $upload_maxsize,
         'import_max_execution_time' => empty($import_max_execution_time) ? 3600 : $import_max_execution_time,
         'lock_homepage' => false,
@@ -244,7 +244,7 @@ 
         'date_formats' => array(
             'Y-m-d' => '2010-12-23', 'm-d-Y' => '12-23-2010', 'd-m-Y' => '23-12-2010',
             'Y/m/d' => '2010/12/23', 'm/d/Y' => '12/23/2010', 'd/m/Y' => '23/12/2010',
-            'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010', ),
+            'Y.m.d' => '2010.12.23', 'd.m.Y' => '23.12.2010', 'm.d.Y' => '12.23.2010',),
         'name_formats' => array(
             's f l' => 's f l', 'f l' => 'f l', 's l' => 's l', 'l, s f' => 'l, s f',
             'l, f' => 'l, f', 's l, f' => 's l, f', 'l s f' => 'l s f', 'l f s' => 'l f s',
@@ -253,7 +253,7 @@ 
             'persistent' => true,
             'autofree' => false,
             'debug' => 0,
-            'ssl' => false, ),
+            'ssl' => false,),
         'default_action' => 'index',
         'default_charset' => return_session_value_or_default('default_charset',
             'UTF-8'),
@@ -316,12 +316,12 @@ 
         'sugarbeet' => true,
         'time_formats' => array(
             'H:i' => '23:00', 'h:ia' => '11:00pm', 'h:iA' => '11:00PM', 'h:i a' => '11:00 pm', 'h:i A' => '11:00 PM',
-            'H.i' => '23.00', 'h.ia' => '11.00pm', 'h.iA' => '11.00PM', 'h.i a' => '11.00 pm', 'h.i A' => '11.00 PM', ),
+            'H.i' => '23.00', 'h.ia' => '11.00pm', 'h.iA' => '11.00PM', 'h.i a' => '11.00 pm', 'h.i A' => '11.00 PM',),
         'tracker_max_display_length' => 15,
         'translation_string_prefix' => return_session_value_or_default('translation_string_prefix', false),
         'upload_badext' => array(
             'php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py',
-            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml', ),
+            'asp', 'cfm', 'js', 'vbs', 'html', 'htm', 'phtml',),
         'upload_maxsize' => 30000000,
         'import_max_execution_time' => 3600,
 //	'use_php_code_json' => returnPhpJsonStatus(),
@@ -438,7 +438,7 @@ 
 {
     global $sugar_config;
 
-    if (is_windows() || !isset($sugar_config)|| !isset($addUser) || ($addUser == '')) {
+    if (is_windows() || !isset($sugar_config) || !isset($addUser) || ($addUser == '')) {
         return;
     }
     if (!array_key_exists('cron', $sugar_config)) {
@@ -1687,11 +1687,11 @@ 
 
     $response = '<OPTION value="'.$value.'"';
 
-    if($isSelected === true) {
-        $response .= ' ' . 'selected';
+    if ($isSelected === true) {
+        $response .= ' '.'selected';
     }
 
-    $response .= '>' .  $app_strings[$app_strings_label] . '</OPTION>';
+    $response .= '>'.$app_strings[$app_strings_label].'</OPTION>';
 
     return $response;
 }
@@ -1702,8 +1702,8 @@ 
 
     $response = '<OPTION value="'.$value.'"';
 
-    if($isSelected === true) {
-        $response .= ' ' . 'selected';
+    if ($isSelected === true) {
+        $response .= ' '.'selected';
     }
 
     $response .= '>';
@@ -1726,15 +1726,15 @@ 
     {
         $isSelected = false;
 
-        if(empty($option_key)) {
+        if (empty($option_key)) {
          continue;
         }
 
-        if(empty($option_value)) {
+        if (empty($option_value)) {
             continue;
         }
 
-        if($option_key === $selected_key)
+        if ($option_key === $selected_key)
         {
             $isSelected = true;
         }
@@ -2455,9 +2455,9 @@ 
 {
     $current_theme = SugarThemeRegistry::current();
     $theme_directory = $current_theme->dirName;
-    if(strpos($relative_path, "themes".DIRECTORY_SEPARATOR.$theme_directory) === false) {
+    if (strpos($relative_path, "themes".DIRECTORY_SEPARATOR.$theme_directory) === false) {
         $test_path = SUGAR_PATH.DIRECTORY_SEPARATOR."themes".DIRECTORY_SEPARATOR.$theme_directory.DIRECTORY_SEPARATOR.$relative_path;
-        if(file_exists($test_path)) {
+        if (file_exists($test_path)) {
             $resource_name = "themes".DIRECTORY_SEPARATOR.$theme_directory.DIRECTORY_SEPARATOR.$relative_path;
         }
     }
@@ -3116,14 +3116,14 @@ 
  * 0 if version is between minimun and recomended PHP versions,
  * -1 otherwise (less than minimum or buggy version)
  */
-function check_php_version($sys_php_version = ''){
-if ($sys_php_version === ''){
-    $sys_php_version =  constant('PHP_VERSION') ;
+function check_php_version($sys_php_version = '') {
+if ($sys_php_version === '') {
+    $sys_php_version = constant('PHP_VERSION');
     }
 
     // versions below MIN_PHP_VERSION are not accepted, so return early.
-        if ( version_compare($sys_php_version, constant('SUITECRM_PHP_MIN_VERSION'), '<') === true) {
-            return - 1;
+        if (version_compare($sys_php_version, constant('SUITECRM_PHP_MIN_VERSION'), '<') === true) {
+            return -1;
 
     }
 
@@ -3131,7 +3131,7 @@ 
 	// and check immediately for one of this versions
 	$bug_php_versions = array();
     foreach ($bug_php_versions as $v) {
-        if ( version_compare($sys_php_version, $v, '=') === true) {
+        if (version_compare($sys_php_version, $v, '=') === true) {
             return -1;
 
         }
@@ -4407,7 +4407,7 @@ 
 
 function _getIcon($iconFileName)
 {
-    if(file_exists(SugarThemeRegistry::current()->getImagePath().DIRECTORY_SEPARATOR.'icon_'.$iconFileName.'.svg')) {
+    if (file_exists(SugarThemeRegistry::current()->getImagePath().DIRECTORY_SEPARATOR.'icon_'.$iconFileName.'.svg')) {
         $iconName = "icon_{$iconFileName}.svg";
         $iconFound = SugarThemeRegistry::current()->getImageURL($iconName, false);
     }

include/InlineEditing/InlineEditing.php

Spacing +45 added lines, -45 removed lines

@@ -47,9 +47,9 @@ 
 
     global $current_language, $app_strings, $app_list_strings, $current_user, $beanFiles, $beanList;
 
-    $bean = BeanFactory::getBean($module,$id);
+    $bean = BeanFactory::getBean($module, $id);
 
-    if(!checkAccess($bean)){
+    if (!checkAccess($bean)) {
         return false;
     }
 
@@ -59,7 +59,7 @@ 
     $mod_strings = return_module_language($current_language, $module);
 
     // set the filename for this control
-    $file = create_cache_directory('include/InlineEditing/') . $module . $view . $alt_type . $fieldname . '.tpl';
+    $file = create_cache_directory('include/InlineEditing/').$module.$view.$alt_type.$fieldname.'.tpl';
 
     if (!is_file($file)
         || inDeveloperMode()
@@ -104,7 +104,7 @@ 
         if ($vardef['type'] == 'link') {
             $vardef['type'] = 'relate';
             $vardef['rname'] = 'name';
-            $vardef['id_name'] = $vardef['name'] . '_id';
+            $vardef['id_name'] = $vardef['name'].'_id';
             if ((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
                 $vardef['module'] = $focus->{$vardef['name']}->getRelatedModuleName();
             }
@@ -140,15 +140,15 @@ 
         // Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
         // remove extra wrong javascript which breaks auto complete on flexi relationship parent fields
-        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/","",$contents);
+        $contents = preg_replace("/<script language=\"javascript\">if\(typeof sqs_objects == \'undefined\'\){var sqs_objects = new Array;}sqs_objects\[\'EditView_parent_name\'\].*?<\/script>/", "", $contents);
 
 
         if ($view == 'EditView' && ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')) {
 
-            $contents = str_replace('"' . $vardef['id_name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.id_name}"{literal}', $contents);
-            $contents = str_replace('"' . $vardef['name'] . '"', '{/literal}"{$fields.' . $vardef['name'] . '.name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['id_name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
             // regex below fixes button javascript for flexi relationship
-            if($vardef['type'] == 'parent') {
+            if ($vardef['type'] == 'parent') {
                 $contents = str_replace("onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"{\$fields.parent_name.id_name}", "onclick='open_popup(document.{\$form_name}.parent_type.value, 600, 400, \"\", true, false, {literal}{\"call_back_function\":\"set_return\",\"form_name\":\"EditView\",\"field_to_name_array\":{\"id\":{/literal}\"parent_id", $contents);
             }
         }
@@ -182,10 +182,10 @@ 
     }
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if (!isset($match[2]) || $match[2] == '') {
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M");
     } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M".$pm);
     }
 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
@@ -224,7 +224,7 @@ 
     }
 
     if ($fieldlist[$fieldname]['type'] == 'link') {
-        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'] . '_id';
+        $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'].'_id';
 
         if ((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
             $relateField = $fieldlist[$fieldname]['name'];
@@ -232,7 +232,7 @@ 
         }
     }
 
-    if($fieldlist[$fieldname]['type'] == 'parent'){
+    if ($fieldlist[$fieldname]['type'] == 'parent') {
         $fieldlist['parent_id']['name'] = 'parent_id';
     }
 
@@ -243,15 +243,15 @@ 
     }
 
     if (isset($fieldlist[$fieldname]['id_name']) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']) {
-        if($value){
+        if ($value) {
             $relateIdField = $fieldlist[$fieldname]['id_name'];
-            $rel_value =  $bean->$relateIdField;
+            $rel_value = $bean->$relateIdField;
 
         }
         $fieldlist[$fieldlist[$fieldname]['id_name']]['value'] = $rel_value;
         $fieldlist[$fieldname]['value'] = $value;
         $fieldlist[$fieldname]['id_name'] = $aow_field;
-        $fieldlist[$fieldname]['name'] = $aow_field . '_display';
+        $fieldlist[$fieldname]['name'] = $aow_field.'_display';
     } else if (isset($fieldlist[$fieldname]['type']) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if (!$value) {
@@ -323,29 +323,29 @@ 
 
         if ($bean->field_defs[$field]['type'] == "multienum") {
             $bean->$field = encodeMultienumValue($value);
-        }else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent'){
+        } else if ($bean->field_defs[$field]['type'] == "relate" || $bean->field_defs[$field]['type'] == 'parent') {
             $save_field = $bean->field_defs[$field]['id_name'];
             $bean->$save_field = $value;
             if ($bean->field_defs[$field]['type'] == 'parent') {
                 $bean->parent_type = $_REQUEST['parent_type'];
                 $bean->fill_in_additional_parent_fields(); // get up to date parent info as need it to display name
             }
-        }else if ($bean->field_defs[$field]['type'] == "currency"){
+        } else if ($bean->field_defs[$field]['type'] == "currency") {
 			if (stripos($field, 'usdollar')) {
 				$newfield = str_replace("_usdollar", "", $field);
 				$bean->$newfield = $value;
 			}
-			else{
+			else {
 				$bean->$field = $value;
 			}
             
-        }else{
+        } else {
             $bean->$field = $value;
         }
 
         $check_notify = FALSE;
 
-        if (isset( $bean->fetched_row['assigned_user_id']) && $field == "assigned_user_name") {
+        if (isset($bean->fetched_row['assigned_user_id']) && $field == "assigned_user_name") {
             $old_assigned_user_id = $bean->fetched_row['assigned_user_id'];
             if (!empty($value) && ($old_assigned_user_id != $value) && ($value != $current_user->id)) {
                 $check_notify = TRUE;
@@ -355,12 +355,12 @@ 
         $adminOnlyModules = array('Users', 'Employees');
 
         $enabled = true;
-        if(in_array($module, $adminOnlyModules) && !is_admin($current_user)) {
+        if (in_array($module, $adminOnlyModules) && !is_admin($current_user)) {
             $enabled = false;
         }
 
-        if(($bean->ACLAccess("edit") || is_admin($current_user)) && $enabled) {
-            if(!$bean->save($check_notify)) {
+        if (($bean->ACLAccess("edit") || is_admin($current_user)) && $enabled) {
+            if (!$bean->save($check_notify)) {
                 $GLOBALS['log']->fatal("Saving probably failed or bean->save() method did not return with a positive result.");
             }
         } else {
@@ -385,7 +385,7 @@ 
 
     $fieldlist[$field] = $bean->getFieldDefinition($field);
 
-    if(is_array($listViewDefs)){
+    if (is_array($listViewDefs)) {
         $fieldlist[$field] = array_merge($fieldlist[$field], $listViewDefs);
     }
 
@@ -423,7 +423,7 @@ 
         $vardef['module'] = $bean->module_dir;
 
         $SugarWidgetSubPanelDetailViewLink = new SugarWidgetSubPanelDetailViewLink($vardef);
-        $value = "<b>" . $SugarWidgetSubPanelDetailViewLink->displayList($vardef) . "</b>";
+        $value = "<b>".$SugarWidgetSubPanelDetailViewLink->displayList($vardef)."</b>";
 
     }
 
@@ -436,7 +436,7 @@ 
         }
         $datetime_format = $timedate->get_date_time_format();
         // create utc date (as it's utc in db)
-        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value,new DateTimeZone('UTC'));
+        $datetime = DateTime::createFromFormat("Y-m-d H:i:s", $value, new DateTimeZone('UTC'));
         // convert it to timezone the user uses
         $datetime = $timedate->tzUser($datetime);
 
@@ -475,24 +475,24 @@ 
     }
 
     //if field is of type relate.
-    if ($vardef['type'] == "relate" || $vardef['type'] == "parent")  {
+    if ($vardef['type'] == "relate" || $vardef['type'] == "parent") {
 
-        if($vardef['source'] == "non-db"){
+        if ($vardef['source'] == "non-db") {
 
-            if($vardef['module'] == "Employees"){
+            if ($vardef['module'] == "Employees") {
                 $vardef['ext2'] = "Users";
                 $vardef['rname'] = "full_name";
             }
 
         }
-        if($vardef['type'] == "parent") {
+        if ($vardef['type'] == "parent") {
             $vardef['module'] = $bean->parent_type;
             $name = $bean->parent_name;
         }
         $idName = $vardef['id_name'];
         $record = $bean->$idName;
 
-        if($vardef['name'] != "assigned_user_name") {
+        if ($vardef['name'] != "assigned_user_name") {
             $value = "<a class=\"listViewTdLinkS1\" href=\"index.php?action=DetailView&module=".$vardef['module']."&record=$record\">";
         } else {
             $value = "";
@@ -500,32 +500,32 @@ 
 
 
         //To fix github bug 880 (the rname was null and was causing a 500 error in the getFieldValueFromModule call to $fieldname
-        $fieldName = 'name';//$vardef['name'];
-        if(!is_null($vardef['rname']))
+        $fieldName = 'name'; //$vardef['name'];
+        if (!is_null($vardef['rname']))
             $fieldName = $vardef['rname'];
 
-        if($vardef['ext2']){
+        if ($vardef['ext2']) {
 
-            $value .= getFieldValueFromModule($fieldName,$vardef['ext2'],$record);
+            $value .= getFieldValueFromModule($fieldName, $vardef['ext2'], $record);
 
-        } else if(!empty($vardef['rname']) || $vardef['name'] == "related_doc_name") {
-            $value .= getFieldValueFromModule($fieldName,$vardef['module'],$record);
+        } else if (!empty($vardef['rname']) || $vardef['name'] == "related_doc_name") {
+            $value .= getFieldValueFromModule($fieldName, $vardef['module'], $record);
 
         } else {
             $value .= $name;
         }
 
-        if($vardef['name'] != "assigned_user_name") {
+        if ($vardef['name'] != "assigned_user_name") {
             $value .= "</a>";
         }
     }
-	if($vardef['type'] == "url")
+	if ($vardef['type'] == "url")
 	{
 		$value = '<a href='.$value.' target="_blank">'.$value.'</a>';
 	}
 	
-	if($vardef['type'] == "currency"){
-		if($_REQUEST['view'] != "DetailView"){			
+	if ($vardef['type'] == "currency") {
+		if ($_REQUEST['view'] != "DetailView") {			
 			$value = currency_format_number($value);		
 		}
 		else
@@ -538,7 +538,7 @@ 
 function getFieldValueFromModule($fieldname, $module, $id)
 {
     //Github bug 880, if the fieldname is null, do no call from bean
-    if(is_null($fieldname))
+    if (is_null($fieldname))
         return '';
 
     $bean = BeanFactory::getBean($module, $id);
@@ -559,11 +559,11 @@ 
     return $value;
 }
 
-function checkAccess($bean){
+function checkAccess($bean) {
 
-    if($bean->ACLAccess('EditView')) {
+    if ($bean->ACLAccess('EditView')) {
         return true;
-    }else {
+    } else {
         return false;
     }
 }

include/database/MysqlManager.php

Indentation +1344 added lines, -1344 removed lines

@@ -100,368 +100,368 @@ 
  */
 class MysqlManager extends DBManager
 {
-	/**
-	 * @see DBManager::$dbType
-	 */
-	public $dbType = 'mysql';
-	public $variant = 'mysql';
-	public $dbName = 'MySQL';
-	public $label = 'LBL_MYSQL';
-
-	protected $maxNameLengths = array(
-		'table' => 64,
-		'column' => 64,
-		'index' => 64,
-		'alias' => 256
-	);
-
-	protected $type_map = array(
-			'int'      => 'int',
-			'double'   => 'double',
-			'float'    => 'float',
-			'uint'     => 'int unsigned',
-			'ulong'    => 'bigint unsigned',
-			'long'     => 'bigint',
-			'short'    => 'smallint',
-			'varchar'  => 'varchar',
-			'text'     => 'text',
-			'longtext' => 'longtext',
-			'date'     => 'date',
-			'enum'     => 'varchar',
-			'relate'   => 'varchar',
-			'multienum'=> 'text',
-			'html'     => 'text',
-			'longhtml' => 'longtext',
-			'datetime' => 'datetime',
-			'datetimecombo' => 'datetime',
-			'time'     => 'time',
-			'bool'     => 'bool',
-			'tinyint'  => 'tinyint',
-			'char'     => 'char',
-			'blob'     => 'blob',
-			'longblob' => 'longblob',
-			'currency' => 'decimal(26,6)',
-			'decimal'  => 'decimal',
-			'decimal2' => 'decimal',
-			'id'       => 'char(36)',
-			'url'      => 'varchar',
-			'encrypt'  => 'varchar',
-			'file'     => 'varchar',
-			'decimal_tpl' => 'decimal(%d, %d)',
-
-	);
-
-	protected $capabilities = array(
-		"affected_rows" => true,
-		"select_rows" => true,
-		"inline_keys" => true,
-		"create_user" => true,
-		"fulltext" => true,
-	    "collation" => true,
-	    "create_db" => true,
-	    "disable_keys" => true,
-	);
-
-	/**
-	 * Parses and runs queries
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Flag to suppress all error output unless in debug logging mode.
-	 * @param  bool     $keepResult True if we want to push this result into the $lastResult array.
-	 * @return resource result set
-	 */
-	public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
-	{
-		if(is_array($sql)) {
-			return $this->queryArray($sql, $dieOnError, $msg, $suppress);
-		}
-
-		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
-		$this->checkConnection();
-		$this->query_time = microtime(true);
-		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
-
-		$this->query_time = microtime(true) - $this->query_time;
-		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
-
-
-		if($keepResult)
-			$this->lastResult = $result;
-
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
-		return $result;
-	}
+    /**
+     * @see DBManager::$dbType
+     */
+    public $dbType = 'mysql';
+    public $variant = 'mysql';
+    public $dbName = 'MySQL';
+    public $label = 'LBL_MYSQL';
+
+    protected $maxNameLengths = array(
+        'table' => 64,
+        'column' => 64,
+        'index' => 64,
+        'alias' => 256
+    );
+
+    protected $type_map = array(
+            'int'      => 'int',
+            'double'   => 'double',
+            'float'    => 'float',
+            'uint'     => 'int unsigned',
+            'ulong'    => 'bigint unsigned',
+            'long'     => 'bigint',
+            'short'    => 'smallint',
+            'varchar'  => 'varchar',
+            'text'     => 'text',
+            'longtext' => 'longtext',
+            'date'     => 'date',
+            'enum'     => 'varchar',
+            'relate'   => 'varchar',
+            'multienum'=> 'text',
+            'html'     => 'text',
+            'longhtml' => 'longtext',
+            'datetime' => 'datetime',
+            'datetimecombo' => 'datetime',
+            'time'     => 'time',
+            'bool'     => 'bool',
+            'tinyint'  => 'tinyint',
+            'char'     => 'char',
+            'blob'     => 'blob',
+            'longblob' => 'longblob',
+            'currency' => 'decimal(26,6)',
+            'decimal'  => 'decimal',
+            'decimal2' => 'decimal',
+            'id'       => 'char(36)',
+            'url'      => 'varchar',
+            'encrypt'  => 'varchar',
+            'file'     => 'varchar',
+            'decimal_tpl' => 'decimal(%d, %d)',
+
+    );
+
+    protected $capabilities = array(
+        "affected_rows" => true,
+        "select_rows" => true,
+        "inline_keys" => true,
+        "create_user" => true,
+        "fulltext" => true,
+        "collation" => true,
+        "create_db" => true,
+        "disable_keys" => true,
+    );
+
+    /**
+     * Parses and runs queries
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Flag to suppress all error output unless in debug logging mode.
+     * @param  bool     $keepResult True if we want to push this result into the $lastResult array.
+     * @return resource result set
+     */
+    public function query($sql, $dieOnError = false, $msg = '', $suppress = false, $keepResult = false)
+    {
+        if(is_array($sql)) {
+            return $this->queryArray($sql, $dieOnError, $msg, $suppress);
+        }
+
+        parent::countQuery($sql);
+        $GLOBALS['log']->info('Query:' . $sql);
+        $this->checkConnection();
+        $this->query_time = microtime(true);
+        $this->lastsql = $sql;
+        $result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+
+        $this->query_time = microtime(true) - $this->query_time;
+        $GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
+
+
+        if($keepResult)
+            $this->lastResult = $result;
+
+        $this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+        return $result;
+    }
 
     /**
      * Returns the number of rows affected by the last query
      * @param $result
      * @return int
      */
-	public function getAffectedRowCount($result)
-	{
-		return mysql_affected_rows($this->getDatabase());
-	}
-
-	/**
-	 * Returns the number of rows returned by the result
-	 *
-	 * This function can't be reliably implemented on most DB, do not use it.
-	 * @abstract
-	 * @deprecated
-	 * @param  resource $result
-	 * @return int
-	 */
-	public function getRowCount($result)
-	{
-	    return mysql_num_rows($result);
-	}
-
-	/**
-	 * Disconnects from the database
-	 *
-	 * Also handles any cleanup needed
-	 */
-	public function disconnect()
-	{
-		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
-			$this->freeResult();
-			mysql_close($this->database);
-			$this->database = null;
-		}
-	}
-
-	/**
-	 * @see DBManager::freeDbResult()
-	 */
-	protected function freeDbResult($dbResult)
-	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
-	}
-
-
-	/**
-	 * @abstract
-	 * Check if query has LIMIT clause
-	 * Relevant for now only for Mysql
-	 * @param string $sql
-	 * @return bool
-	 */
-	protected function hasLimit($sql)
-	{
-	    return stripos($sql, " limit ") !== false;
-	}
-
-	/**
-	 * @see DBManager::limitQuery()
-	 */
-	public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
-	{
+    public function getAffectedRowCount($result)
+    {
+        return mysql_affected_rows($this->getDatabase());
+    }
+
+    /**
+     * Returns the number of rows returned by the result
+     *
+     * This function can't be reliably implemented on most DB, do not use it.
+     * @abstract
+     * @deprecated
+     * @param  resource $result
+     * @return int
+     */
+    public function getRowCount($result)
+    {
+        return mysql_num_rows($result);
+    }
+
+    /**
+     * Disconnects from the database
+     *
+     * Also handles any cleanup needed
+     */
+    public function disconnect()
+    {
+        $GLOBALS['log']->debug('Calling MySQL::disconnect()');
+        if(!empty($this->database)){
+            $this->freeResult();
+            mysql_close($this->database);
+            $this->database = null;
+        }
+    }
+
+    /**
+     * @see DBManager::freeDbResult()
+     */
+    protected function freeDbResult($dbResult)
+    {
+        if(!empty($dbResult))
+            mysql_free_result($dbResult);
+    }
+
+
+    /**
+     * @abstract
+     * Check if query has LIMIT clause
+     * Relevant for now only for Mysql
+     * @param string $sql
+     * @return bool
+     */
+    protected function hasLimit($sql)
+    {
+        return stripos($sql, " limit ") !== false;
+    }
+
+    /**
+     * @see DBManager::limitQuery()
+     */
+    public function limitQuery($sql, $start, $count, $dieOnError = false, $msg = '', $execute = true)
+    {
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
-
-	    $sql = "$sql LIMIT $start,$count";
-		$this->lastsql = $sql;
-
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
-			$this->checkQuery($sql);
-		}
-		if(!$execute) {
-			return $sql;
-		}
-
-		return $this->query($sql, $dieOnError, $msg);
-	}
-
-
-	/**
-	 * @see DBManager::checkQuery()
-	 */
-	protected function checkQuery($sql, $object_name = false)
-	{
-		$result   = $this->query('EXPLAIN ' . $sql);
-		$badQuery = array();
-		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
-			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
-			if (empty($row['key']))
-				$badQuery[$row['table']] .= ' No Index Key Used;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
-		}
-
-		if ( empty($badQuery) )
-			return true;
-
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
-					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @see DBManager::get_columns()
-	 */
-	public function get_columns($tablename)
-	{
-		//find all unique indexes and primary keys.
-		$result = $this->query("DESCRIBE $tablename");
-
-		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
-			$matches = array();
-			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
-				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
-		}
-		return $columns;
-	}
-
-	/**
-	 * @see DBManager::getFieldsArray()
-	 */
-	public function getFieldsArray($result, $make_lower_case=false)
-	{
-		$field_array = array();
-
-		if(empty($result))
-			return 0;
-
-		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
-			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
-
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
-
-			$field_array[] = $meta->name;
-		}
-
-		return $field_array;
-	}
-
-	/**
-	 * @see DBManager::fetchRow()
-	 */
-	public function fetchRow($result)
-	{
-		if (empty($result))	return false;
-
-		return mysql_fetch_assoc($result);
-	}
-
-	/**
-	 * @see DBManager::getTablesArray()
-	 */
-	public function getTablesArray()
-	{
-		$this->log->debug('Fetching table list');
-
-		if ($this->getDatabase()) {
-			$tables = array();
-			$r = $this->query('SHOW TABLES');
-			if (!empty($r)) {
-				while ($a = $this->fetchByAssoc($r)) {
-					$row = array_values($a);
-					$tables[]=$row[0];
-				}
-				return $tables;
-			}
-		}
-
-		return false; // no database available
-	}
-
-	/**
-	 * @see DBManager::version()
-	 */
-	public function version()
-	{
-		return $this->getOne("SELECT version() version");
-	}
-
-	/**
-	 * @see DBManager::tableExists()
-	 */
-	public function tableExists($tableName)
-	{
-		$this->log->info("tableExists: $tableName");
-
-		if ($this->getDatabase()) {
-			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
-			$row = $this->fetchByAssoc($result);
-			return !empty($row);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get tables like expression
-	 * @param $like string
-	 * @return array
-	 */
-	public function tablesLike($like)
-	{
-		if ($this->getDatabase()) {
-			$tables = array();
-			$r = $this->query('SHOW TABLES LIKE '.$this->quoted($like));
-			if (!empty($r)) {
-				while ($a = $this->fetchByAssoc($r)) {
-					$row = array_values($a);
-					$tables[]=$row[0];
-				}
-				return $tables;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @see DBManager::quote()
-	 */
-	public function quote($string)
-	{
-		if(is_array($string)) {
-			return $this->arrayQuote($string);
-		}
-		return mysqli_real_escape_string($this->quoteInternal($string), $this->getDatabase());
-	}
+        if ($start < 0)
+            $start = 0;
+        $GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+
+        $sql = "$sql LIMIT $start,$count";
+        $this->lastsql = $sql;
+
+        if(!empty($GLOBALS['sugar_config']['check_query'])){
+            $this->checkQuery($sql);
+        }
+        if(!$execute) {
+            return $sql;
+        }
+
+        return $this->query($sql, $dieOnError, $msg);
+    }
+
+
+    /**
+     * @see DBManager::checkQuery()
+     */
+    protected function checkQuery($sql, $object_name = false)
+    {
+        $result   = $this->query('EXPLAIN ' . $sql);
+        $badQuery = array();
+        while ($row = $this->fetchByAssoc($result)) {
+            if (empty($row['table']))
+                continue;
+            $badQuery[$row['table']] = '';
+            if (strtoupper($row['type']) == 'ALL')
+                $badQuery[$row['table']]  .=  ' Full Table Scan;';
+            if (empty($row['key']))
+                $badQuery[$row['table']] .= ' No Index Key Used;';
+            if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
+                $badQuery[$row['table']] .= ' Using FileSort;';
+            if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
+                $badQuery[$row['table']] .= ' Using Temporary Table;';
+        }
+
+        if ( empty($badQuery) )
+            return true;
+
+        foreach($badQuery as $table=>$data ){
+            if(!empty($data)){
+                $warning = ' Table:' . $table . ' Data:' . $data;
+                if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+                    $GLOBALS['log']->fatal($sql);
+                    $GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+                }
+                else{
+                    $GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @see DBManager::get_columns()
+     */
+    public function get_columns($tablename)
+    {
+        //find all unique indexes and primary keys.
+        $result = $this->query("DESCRIBE $tablename");
+
+        $columns = array();
+        while (($row=$this->fetchByAssoc($result)) !=null) {
+            $name = strtolower($row['Field']);
+            $columns[$name]['name']=$name;
+            $matches = array();
+            preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
+            $columns[$name]['type']=strtolower($matches[1][0]);
+            if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
+                $columns[$name]['len']=strtolower($matches[2][0]);
+            if ( stristr($row['Extra'],'auto_increment') )
+                $columns[$name]['auto_increment'] = '1';
+            if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+                $columns[$name]['required'] = 'true';
+            if (!empty($row['Default']) )
+                $columns[$name]['default'] = $row['Default'];
+        }
+        return $columns;
+    }
+
+    /**
+     * @see DBManager::getFieldsArray()
+     */
+    public function getFieldsArray($result, $make_lower_case=false)
+    {
+        $field_array = array();
+
+        if(empty($result))
+            return 0;
+
+        $fields = mysql_num_fields($result);
+        for ($i=0; $i < $fields; $i++) {
+            $meta = mysql_fetch_field($result, $i);
+            if (!$meta)
+                return array();
+
+            if($make_lower_case == true)
+                $meta->name = strtolower($meta->name);
+
+            $field_array[] = $meta->name;
+        }
+
+        return $field_array;
+    }
+
+    /**
+     * @see DBManager::fetchRow()
+     */
+    public function fetchRow($result)
+    {
+        if (empty($result))	return false;
+
+        return mysql_fetch_assoc($result);
+    }
+
+    /**
+     * @see DBManager::getTablesArray()
+     */
+    public function getTablesArray()
+    {
+        $this->log->debug('Fetching table list');
+
+        if ($this->getDatabase()) {
+            $tables = array();
+            $r = $this->query('SHOW TABLES');
+            if (!empty($r)) {
+                while ($a = $this->fetchByAssoc($r)) {
+                    $row = array_values($a);
+                    $tables[]=$row[0];
+                }
+                return $tables;
+            }
+        }
+
+        return false; // no database available
+    }
+
+    /**
+     * @see DBManager::version()
+     */
+    public function version()
+    {
+        return $this->getOne("SELECT version() version");
+    }
+
+    /**
+     * @see DBManager::tableExists()
+     */
+    public function tableExists($tableName)
+    {
+        $this->log->info("tableExists: $tableName");
+
+        if ($this->getDatabase()) {
+            $result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
+            if(empty($result)) return false;
+            $row = $this->fetchByAssoc($result);
+            return !empty($row);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get tables like expression
+     * @param $like string
+     * @return array
+     */
+    public function tablesLike($like)
+    {
+        if ($this->getDatabase()) {
+            $tables = array();
+            $r = $this->query('SHOW TABLES LIKE '.$this->quoted($like));
+            if (!empty($r)) {
+                while ($a = $this->fetchByAssoc($r)) {
+                    $row = array_values($a);
+                    $tables[]=$row[0];
+                }
+                return $tables;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @see DBManager::quote()
+     */
+    public function quote($string)
+    {
+        if(is_array($string)) {
+            return $this->arrayQuote($string);
+        }
+        return mysqli_real_escape_string($this->quoteInternal($string), $this->getDatabase());
+    }
 
     /**
      * @see DBManager::quoteIdentifier()
@@ -471,272 +471,272 @@ 
         return '`'.$string.'`';
     }
 
-	/**
-	 * @see DBManager::connect()
-	 */
-	public function connect(array $configOptions = null, $dieOnError = false)
-	{
-		global $sugar_config;
-
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
-
-		if ($this->getOption('persistent')) {
-			$this->database = @mysql_pconnect(
-				$configOptions['db_host_name'],
-				$configOptions['db_user_name'],
-				$configOptions['db_password']
-				);
-		}
-
-		if (!$this->database) {
-			$this->database = mysql_connect(
-					$configOptions['db_host_name'],
-					$configOptions['db_user_name'],
-					$configOptions['db_password']
-					);
-			if(empty($this->database)) {
-				$GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
-				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.");
-					}
-				} else {
-					return false;
-				}
-			}
-			// Do not pass connection information because we have not connected yet
-			if($this->database  && $this->getOption('persistent')){
-				$_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
-					. "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
-					. "in your config.php file</b>";
-			}
-		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
-				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
-			} else {
-				return false;
-			}
-		}
-
-		// cn: using direct calls to prevent this from spamming the Logs
-	    mysql_query("SET CHARACTER SET utf8", $this->database);
-	    $names = "SET NAMES 'utf8'";
-	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
-	        $names .= " COLLATE '$collation'";
-		}
-	    mysql_query($names, $this->database);
-
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
-		$this->connectOptions = $configOptions;
-
-		$GLOBALS['log']->info("Connect:".$this->database);
-		return true;
-	}
-
-	/**
-	 * @see DBManager::repairTableParams()
-	 *
-	 * For MySQL, we can write the ALTER TABLE statement all in one line, which speeds things
-	 * up quite a bit. So here, we'll parse the returned SQL into a single ALTER TABLE command.
-	 */
-	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
-	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
-
-		if ( $sql == '' )
-			return '';
-
-		if ( stristr($sql,'create table') )
-		{
-			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
-			}
-			return $sql;
-		}
-
-		// first, parse out all the comments
-		$match = array();
-		preg_match_all('!/\*.*?\*/!is', $sql, $match);
-		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
-
-		// now, we should only have alter table statements
-		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
-
-		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
-		$sql = "ALTER TABLE $tablename $sql";
-
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
-
-		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
-
-		return $sql;
-	}
-
-	/**
-	 * @see DBManager::convert()
-	 */
-	public function convert($string, $type, array $additional_parameters = array())
-	{
-		$all_parameters = $additional_parameters;
-		if(is_array($string)) {
-			$all_parameters = array_merge($string, $all_parameters);
-		} elseif (!is_null($string)) {
-			array_unshift($all_parameters, $string);
-		}
-		$all_strings = implode(',', $all_parameters);
-
-		switch (strtolower($type)) {
-			case 'today':
-				return "CURDATE()";
-			case 'left':
-				return "LEFT($all_strings)";
-			case 'date_format':
-				if(empty($additional_parameters)) {
-					return "DATE_FORMAT($string,'%Y-%m-%d')";
-				} else {
-					$format = $additional_parameters[0];
-					if($format[0] != "'") {
-						$format = $this->quoted($format);
-					}
-					return "DATE_FORMAT($string,$format)";
-				}
-			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
-					$all_strings .= ",''";
-				}
-				return "IFNULL($all_strings)";
-			case 'concat':
-				return "CONCAT($all_strings)";
-			case 'quarter':
-					return "QUARTER($string)";
-			case "length":
-					return "LENGTH($string)";
-			case 'month':
-					return "MONTH($string)";
-			case 'add_date':
-					return "DATE_ADD($string, INTERVAL {$additional_parameters[0]} {$additional_parameters[1]})";
-			case 'add_time':
-					return "DATE_ADD($string, INTERVAL + CONCAT({$additional_parameters[0]}, ':', {$additional_parameters[1]}) HOUR_MINUTE)";
+    /**
+     * @see DBManager::connect()
+     */
+    public function connect(array $configOptions = null, $dieOnError = false)
+    {
+        global $sugar_config;
+
+        if(is_null($configOptions))
+            $configOptions = $sugar_config['dbconfig'];
+
+        if ($this->getOption('persistent')) {
+            $this->database = @mysql_pconnect(
+                $configOptions['db_host_name'],
+                $configOptions['db_user_name'],
+                $configOptions['db_password']
+                );
+        }
+
+        if (!$this->database) {
+            $this->database = mysql_connect(
+                    $configOptions['db_host_name'],
+                    $configOptions['db_user_name'],
+                    $configOptions['db_password']
+                    );
+            if(empty($this->database)) {
+                $GLOBALS['log']->fatal("Could not connect to server ".$configOptions['db_host_name']." as ".$configOptions['db_user_name'].":".mysql_error());
+                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.");
+                    }
+                } else {
+                    return false;
+                }
+            }
+            // Do not pass connection information because we have not connected yet
+            if($this->database  && $this->getOption('persistent')){
+                $_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
+                    . "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
+                    . "in your config.php file</b>";
+            }
+        }
+        if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+            $GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
+            if($dieOnError) {
+                sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
+            } else {
+                return false;
+            }
+        }
+
+        // cn: using direct calls to prevent this from spamming the Logs
+        mysql_query("SET CHARACTER SET utf8", $this->database);
+        $names = "SET NAMES 'utf8'";
+        $collation = $this->getOption('collation');
+        if(!empty($collation)) {
+            $names .= " COLLATE '$collation'";
+        }
+        mysql_query($names, $this->database);
+
+        if(!$this->checkError('Could Not Connect:', $dieOnError))
+            $GLOBALS['log']->info("connected to db");
+        $this->connectOptions = $configOptions;
+
+        $GLOBALS['log']->info("Connect:".$this->database);
+        return true;
+    }
+
+    /**
+     * @see DBManager::repairTableParams()
+     *
+     * For MySQL, we can write the ALTER TABLE statement all in one line, which speeds things
+     * up quite a bit. So here, we'll parse the returned SQL into a single ALTER TABLE command.
+     */
+    public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
+    {
+        $sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+
+        if ( $sql == '' )
+            return '';
+
+        if ( stristr($sql,'create table') )
+        {
+            if ($execute) {
+                $msg = "Error creating table: ".$tablename. ":";
+                $this->query($sql,true,$msg);
+            }
+            return $sql;
+        }
+
+        // first, parse out all the comments
+        $match = array();
+        preg_match_all('!/\*.*?\*/!is', $sql, $match);
+        $commentBlocks = $match[0];
+        $sql = preg_replace('!/\*.*?\*/!is','', $sql);
+
+        // now, we should only have alter table statements
+        // let's replace the 'alter table name' part with a comma
+        $sql = preg_replace("!alter table $tablename!is",', ', $sql);
+
+        // re-add it at the beginning
+        $sql = substr_replace($sql,'',strpos($sql,','),1);
+        $sql = str_replace(";","",$sql);
+        $sql = str_replace("\n","",$sql);
+        $sql = "ALTER TABLE $tablename $sql";
+
+        if ( $execute )
+            $this->query($sql,'Error with MySQL repair table');
+
+        // and re-add the comments at the beginning
+        $sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+
+        return $sql;
+    }
+
+    /**
+     * @see DBManager::convert()
+     */
+    public function convert($string, $type, array $additional_parameters = array())
+    {
+        $all_parameters = $additional_parameters;
+        if(is_array($string)) {
+            $all_parameters = array_merge($string, $all_parameters);
+        } elseif (!is_null($string)) {
+            array_unshift($all_parameters, $string);
+        }
+        $all_strings = implode(',', $all_parameters);
+
+        switch (strtolower($type)) {
+            case 'today':
+                return "CURDATE()";
+            case 'left':
+                return "LEFT($all_strings)";
+            case 'date_format':
+                if(empty($additional_parameters)) {
+                    return "DATE_FORMAT($string,'%Y-%m-%d')";
+                } else {
+                    $format = $additional_parameters[0];
+                    if($format[0] != "'") {
+                        $format = $this->quoted($format);
+                    }
+                    return "DATE_FORMAT($string,$format)";
+                }
+            case 'ifnull':
+                if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+                    $all_strings .= ",''";
+                }
+                return "IFNULL($all_strings)";
+            case 'concat':
+                return "CONCAT($all_strings)";
+            case 'quarter':
+                    return "QUARTER($string)";
+            case "length":
+                    return "LENGTH($string)";
+            case 'month':
+                    return "MONTH($string)";
+            case 'add_date':
+                    return "DATE_ADD($string, INTERVAL {$additional_parameters[0]} {$additional_parameters[1]})";
+            case 'add_time':
+                    return "DATE_ADD($string, INTERVAL + CONCAT({$additional_parameters[0]}, ':', {$additional_parameters[1]}) HOUR_MINUTE)";
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
                 return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
             case 'avg':
                 return "avg($string)";
-		}
-
-		return $string;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::fromConvert()
-	 */
-	public function fromConvert($string, $type)
-	{
-		return $string;
-	}
-
-	/**
-	 * Returns the name of the engine to use or null if we are to use the default
-	 *
-	 * @param  object $bean SugarBean instance
-	 * @return string
-	 */
-	protected function getEngine($bean)
-	{
-		global $dictionary;
-		$engine = null;
-		if (isset($dictionary[$bean->getObjectName()]['engine'])) {
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
-		}
-		return $engine;
-	}
-
-	/**
-	 * Returns true if the engine given is enabled in the backend
-	 *
-	 * @param  string $engine
-	 * @return bool
-	 */
-	protected function isEngineEnabled($engine)
-	{
-		if(!is_string($engine)) return false;
-
-		$engine = strtoupper($engine);
-
-		$r = $this->query("SHOW ENGINES");
-
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
-
-		return false;
-	}
-
-	/**
-	 * @see DBManager::createTableSQL()
-	 */
-	public function createTableSQL(SugarBean $bean)
-	{
-		$tablename = $bean->getTableName();
-		$fieldDefs = $bean->getFieldDefinitions();
-		$indices   = $bean->getIndices();
-		$engine    = $this->getEngine($bean);
-		return $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
-	}
-
-	/**
-	 * Generates sql for create table statement for a bean.
-	 *
-	 * @param  string $tablename
-	 * @param  array  $fieldDefs
-	 * @param  array  $indices
-	 * @param  string $engine optional, MySQL engine to use
-	 * @return string SQL Create Table statement
-	*/
-	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
-	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
-
-		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
-
-		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
-
-		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
-		$collation = $this->getOption('collation');
-		if(empty($collation)) {
-		    $collation = 'utf8_general_ci';
-		}
-		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
-
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
-
-		return $sql;
-	}
+        }
+
+        return $string;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::fromConvert()
+     */
+    public function fromConvert($string, $type)
+    {
+        return $string;
+    }
+
+    /**
+     * Returns the name of the engine to use or null if we are to use the default
+     *
+     * @param  object $bean SugarBean instance
+     * @return string
+     */
+    protected function getEngine($bean)
+    {
+        global $dictionary;
+        $engine = null;
+        if (isset($dictionary[$bean->getObjectName()]['engine'])) {
+            $engine = $dictionary[$bean->getObjectName()]['engine'];
+        }
+        return $engine;
+    }
+
+    /**
+     * Returns true if the engine given is enabled in the backend
+     *
+     * @param  string $engine
+     * @return bool
+     */
+    protected function isEngineEnabled($engine)
+    {
+        if(!is_string($engine)) return false;
+
+        $engine = strtoupper($engine);
+
+        $r = $this->query("SHOW ENGINES");
+
+        while ( $row = $this->fetchByAssoc($r) )
+            if ( strtoupper($row['Engine']) == $engine )
+                return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+
+        return false;
+    }
+
+    /**
+     * @see DBManager::createTableSQL()
+     */
+    public function createTableSQL(SugarBean $bean)
+    {
+        $tablename = $bean->getTableName();
+        $fieldDefs = $bean->getFieldDefinitions();
+        $indices   = $bean->getIndices();
+        $engine    = $this->getEngine($bean);
+        return $this->createTableSQLParams($tablename, $fieldDefs, $indices, $engine);
+    }
+
+    /**
+     * Generates sql for create table statement for a bean.
+     *
+     * @param  string $tablename
+     * @param  array  $fieldDefs
+     * @param  array  $indices
+     * @param  string $engine optional, MySQL engine to use
+     * @return string SQL Create Table statement
+     */
+    public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
+    {
+        if ( empty($engine) && isset($fieldDefs['engine']))
+            $engine = $fieldDefs['engine'];
+        if ( !$this->isEngineEnabled($engine) )
+            $engine = '';
+
+        $columns = $this->columnSQLRep($fieldDefs, false, $tablename);
+        if (empty($columns))
+            return false;
+
+        $keys = $this->keysSQL($indices);
+        if (!empty($keys))
+            $keys = ",$keys";
+
+        // cn: bug 9873 - module tables do not get created in utf8 with assoc collation
+        $collation = $this->getOption('collation');
+        if(empty($collation)) {
+            $collation = 'utf8_general_ci';
+        }
+        $sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
+
+        if (!empty($engine))
+            $sql.= " ENGINE=$engine";
+
+        return $sql;
+    }
 
     /**
      * Does this type represent text (i.e., non-varchar) value?
@@ -748,745 +748,745 @@ 
         return in_array($type, array('blob','text','longblob', 'longtext'));
     }
 
-	/**
-	 * @see DBManager::oneColumnSQLRep()
-	 */
-	protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
-	{
-		// always return as array for post-processing
-		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
+    /**
+     * @see DBManager::oneColumnSQLRep()
+     */
+    protected function oneColumnSQLRep($fieldDef, $ignoreRequired = false, $table = '', $return_as_array = false)
+    {
+        // always return as array for post-processing
+        $ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
-			$ref['colType'] .= "(".$fieldDef['len'].")";
-		}
+        if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+            $ref['colType'] .= "(".$fieldDef['len'].")";
+        }
 
-		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+        // bug 22338 - don't set a default value on text or blob fields
+        if ( isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
-
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
-	}
-
-	/**
-	 * @see DBManager::changeColumnSQL()
-	 */
-	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
-	{
-		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
-			}
-		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
-		}
-
-		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
-	}
-
-	/**
-	 * Generates SQL for key specification inside CREATE TABLE statement
-	 *
-	 * The passes array is an array of field definitions or a field definition
-	 * itself. The keys generated will be either primary, foreign, unique, index
-	 * or none at all depending on the setting of the "key" parameter of a field definition
-	 *
-	 * @param  array  $indices
-	 * @param  bool   $alter_table
-	 * @param  string $alter_action
-	 * @return string SQL Statement
-	 */
-	protected function keysSQL($indices, $alter_table = false, $alter_action = '')
-	{
-	// check if the passed value is an array of fields.
-	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
-
-	$columns = array();
-	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
-
-		$type = $index['type'];
-		$name = $index['name'];
-
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
-
-		switch ($type) {
-		case 'unique':
-			$columns[] = " UNIQUE $name ($fields)";
-			break;
-		case 'primary':
-			$columns[] = " PRIMARY KEY ($fields)";
-			break;
-		case 'index':
-		case 'foreign':
-		case 'clustered':
-		case 'alternate_key':
-			/**
-				* @todo here it is assumed that the primary key of the foreign
-				* table will always be named 'id'. It must be noted though
-				* that this can easily be fixed by referring to db dictionary
-				* to find the correct primary field name
-				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
-			break;
-		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
-			break;
-		}
-	}
-	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
-	}
-	return $columns;
-	}
-
-	/**
-	 * @see DBManager::setAutoIncrement()
-	 */
-	protected function setAutoIncrement($table, $field_name)
-	{
-		return "auto_increment";
-	}
-
-	/**
-	 * Sets the next auto-increment value of a column to a specific value.
-	 *
-	 * @param  string $table tablename
-	 * @param  string $field_name
-	 */
-	public function setAutoIncrementStart($table, $field_name, $start_value)
-	{
-		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
-	}
-
-	/**
-	 * Returns the next value for an auto increment
-	 *
-	 * @param  string $table tablename
-	 * @param  string $field_name
-	 * @return string
-	 */
-	public function getAutoIncrement($table, $field_name)
-	{
-		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
-		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
-
-		return "";
-	}
-
-	/**
-	 * @see DBManager::get_indices()
-	 */
-	public function get_indices($tablename)
-	{
-		//find all unique indexes and primary keys.
-		$result = $this->query("SHOW INDEX FROM $tablename");
-
-		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
-			}
-			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
-		}
-		return $indices;
-	}
-
-	/**
-	 * @see DBManager::add_drop_constraint()
-	 */
-	public function add_drop_constraint($table, $definition, $drop = false)
-	{
-		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
-		$name         = $definition['name'];
-		$sql          = '';
-
-		switch ($type){
-		// generic indices
-		case 'index':
-		case 'alternate_key':
-		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
-			break;
-		// constraints as indices
-		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
-			break;
-		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
-			break;
-		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
-			break;
-		}
-		return $sql;
-	}
-
-	/**
-	 * Runs a query and returns a single row
-	 *
-	 * @param  string   $sql        SQL Statement to execute
-	 * @param  bool     $dieOnError True if we want to call die if the query returns errors
-	 * @param  string   $msg        Message to log if error occurs
-	 * @param  bool     $suppress   Message to log if error occurs
-	 * @return array    single row from the query
-	 */
-	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
-	{
-		if(stripos($sql, ' LIMIT ') === false) {
-			// little optimization to just fetch one row
-			$sql .= " LIMIT 0,1";
-		}
-		return parent::fetchOne($sql, $dieOnError, $msg, $suppress);
-	}
-
-	/**
-	 * @see DBManager::full_text_indexing_installed()
-	 */
-	public function full_text_indexing_installed($dbname = null)
-	{
-		return $this->isEngineEnabled('MyISAM');
-	}
-
-	/**
-	 * @see DBManager::massageFieldDef()
-	 */
-	public function massageFieldDef(&$fieldDef, $tablename)
-	{
-		parent::massageFieldDef($fieldDef,$tablename);
-
-		if ( isset($fieldDef['default']) &&
-			($fieldDef['dbType'] == 'text'
-				|| $fieldDef['dbType'] == 'blob'
-				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
-			$fieldDef['len'] = '255';
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
-			$fieldDef['len'] = '11';
-
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
-					$fieldDef['len'] .= ",0";
-				}
-			} else {
-				$fieldDef['len']  = '10,0';
-			}
-		}
-	}
-
-	/**
-	 * Generates SQL for dropping a table.
-	 *
-	 * @param  string $name table name
-	 * @return string SQL statement
-	 */
-	public function dropTableNameSQL($name)
-	{
-		return "DROP TABLE IF EXISTS ".$name;
-	}
-
-	public function dropIndexes($tablename, $indexes, $execute = true)
-	{
-		$sql = array();
-		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
-			unset(self::$index_descriptions[$tablename][$name]);
-			}
-			if ($index['type'] == 'primary') {
-				$sql[] = 'DROP PRIMARY KEY';
-			} else {
-				$sql[] = "DROP INDEX $name";
-			}
-		}
-		if (!empty($sql)) {
+                $ref['default'] = '';
+
+        if ( $return_as_array )
+            return $ref;
+        else
+            return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+    }
+
+    /**
+     * @see DBManager::changeColumnSQL()
+     */
+    protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
+    {
+        $columns = array();
+        if ($this->isFieldArray($fieldDefs)){
+            foreach ($fieldDefs as $def){
+                if ($action == 'drop')
+                    $columns[] = $def['name'];
+                else
+                    $columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+            }
+        } else {
+            if ($action == 'drop')
+                $columns[] = $fieldDefs['name'];
+        else
+            $columns[] = $this->oneColumnSQLRep($fieldDefs);
+        }
+
+        return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
+    }
+
+    /**
+     * Generates SQL for key specification inside CREATE TABLE statement
+     *
+     * The passes array is an array of field definitions or a field definition
+     * itself. The keys generated will be either primary, foreign, unique, index
+     * or none at all depending on the setting of the "key" parameter of a field definition
+     *
+     * @param  array  $indices
+     * @param  bool   $alter_table
+     * @param  string $alter_action
+     * @return string SQL Statement
+     */
+    protected function keysSQL($indices, $alter_table = false, $alter_action = '')
+    {
+    // check if the passed value is an array of fields.
+    // if not, convert it into an array
+    if (!$this->isFieldArray($indices))
+        $indices[] = $indices;
+
+    $columns = array();
+    foreach ($indices as $index) {
+        if(!empty($index['db']) && $index['db'] != $this->dbType)
+            continue;
+        if (isset($index['source']) && $index['source'] != 'db')
+            continue;
+
+        $type = $index['type'];
+        $name = $index['name'];
+
+        if (is_array($index['fields']))
+            $fields = implode(", ", $index['fields']);
+        else
+            $fields = $index['fields'];
+
+        switch ($type) {
+        case 'unique':
+            $columns[] = " UNIQUE $name ($fields)";
+            break;
+        case 'primary':
+            $columns[] = " PRIMARY KEY ($fields)";
+            break;
+        case 'index':
+        case 'foreign':
+        case 'clustered':
+        case 'alternate_key':
+            /**
+             * @todo here it is assumed that the primary key of the foreign
+             * table will always be named 'id'. It must be noted though
+             * that this can easily be fixed by referring to db dictionary
+             * to find the correct primary field name
+             */
+            if ( $alter_table )
+                $columns[] = " INDEX $name ($fields)";
+            else
+                $columns[] = " KEY $name ($fields)";
+            break;
+        case 'fulltext':
+            if ($this->full_text_indexing_installed())
+                $columns[] = " FULLTEXT ($fields)";
+            else
+                $GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+            break;
+        }
+    }
+    $columns = implode(", $alter_action ", $columns);
+    if(!empty($alter_action)){
+        $columns = $alter_action . ' '. $columns;
+    }
+    return $columns;
+    }
+
+    /**
+     * @see DBManager::setAutoIncrement()
+     */
+    protected function setAutoIncrement($table, $field_name)
+    {
+        return "auto_increment";
+    }
+
+    /**
+     * Sets the next auto-increment value of a column to a specific value.
+     *
+     * @param  string $table tablename
+     * @param  string $field_name
+     */
+    public function setAutoIncrementStart($table, $field_name, $start_value)
+    {
+        $start_value = (int)$start_value;
+        return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+    }
+
+    /**
+     * Returns the next value for an auto increment
+     *
+     * @param  string $table tablename
+     * @param  string $field_name
+     * @return string
+     */
+    public function getAutoIncrement($table, $field_name)
+    {
+        $result = $this->query("SHOW TABLE STATUS LIKE '$table'");
+        $row = $this->fetchByAssoc($result);
+        if (!empty($row['Auto_increment']))
+            return $row['Auto_increment'];
+
+        return "";
+    }
+
+    /**
+     * @see DBManager::get_indices()
+     */
+    public function get_indices($tablename)
+    {
+        //find all unique indexes and primary keys.
+        $result = $this->query("SHOW INDEX FROM $tablename");
+
+        $indices = array();
+        while (($row=$this->fetchByAssoc($result)) !=null) {
+            $index_type='index';
+            if ($row['Key_name'] =='PRIMARY') {
+                $index_type='primary';
+            }
+            elseif ( $row['Non_unique'] == '0' ) {
+                $index_type='unique';
+            }
+            $name = strtolower($row['Key_name']);
+            $indices[$name]['name']=$name;
+            $indices[$name]['type']=$index_type;
+            $indices[$name]['fields'][]=strtolower($row['Column_name']);
+        }
+        return $indices;
+    }
+
+    /**
+     * @see DBManager::add_drop_constraint()
+     */
+    public function add_drop_constraint($table, $definition, $drop = false)
+    {
+        $type         = $definition['type'];
+        $fields       = implode(',',$definition['fields']);
+        $name         = $definition['name'];
+        $sql          = '';
+
+        switch ($type){
+        // generic indices
+        case 'index':
+        case 'alternate_key':
+        case 'clustered':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+            else
+                $sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+            break;
+        // constraints as indices
+        case 'unique':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP INDEX $name";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+            break;
+        case 'primary':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+            break;
+        case 'foreign':
+            if ($drop)
+                $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+            else
+                $sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+            break;
+        }
+        return $sql;
+    }
+
+    /**
+     * Runs a query and returns a single row
+     *
+     * @param  string   $sql        SQL Statement to execute
+     * @param  bool     $dieOnError True if we want to call die if the query returns errors
+     * @param  string   $msg        Message to log if error occurs
+     * @param  bool     $suppress   Message to log if error occurs
+     * @return array    single row from the query
+     */
+    public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
+    {
+        if(stripos($sql, ' LIMIT ') === false) {
+            // little optimization to just fetch one row
+            $sql .= " LIMIT 0,1";
+        }
+        return parent::fetchOne($sql, $dieOnError, $msg, $suppress);
+    }
+
+    /**
+     * @see DBManager::full_text_indexing_installed()
+     */
+    public function full_text_indexing_installed($dbname = null)
+    {
+        return $this->isEngineEnabled('MyISAM');
+    }
+
+    /**
+     * @see DBManager::massageFieldDef()
+     */
+    public function massageFieldDef(&$fieldDef, $tablename)
+    {
+        parent::massageFieldDef($fieldDef,$tablename);
+
+        if ( isset($fieldDef['default']) &&
+            ($fieldDef['dbType'] == 'text'
+                || $fieldDef['dbType'] == 'blob'
+                || $fieldDef['dbType'] == 'longtext'
+                || $fieldDef['dbType'] == 'longblob' ))
+            unset($fieldDef['default']);
+        if ($fieldDef['dbType'] == 'uint')
+            $fieldDef['len'] = '10';
+        if ($fieldDef['dbType'] == 'ulong')
+            $fieldDef['len'] = '20';
+        if ($fieldDef['dbType'] == 'bool')
+            $fieldDef['type'] = 'tinyint';
+        if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+            $fieldDef['default'] = '0';
+        if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+            $fieldDef['len'] = '255';
+        if ($fieldDef['dbType'] == 'uint')
+            $fieldDef['len'] = '10';
+        if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+            $fieldDef['len'] = '11';
+
+        if($fieldDef['dbType'] == 'decimal') {
+            if(isset($fieldDef['len'])) {
+                if(strstr($fieldDef['len'], ",") === false) {
+                    $fieldDef['len'] .= ",0";
+                }
+            } else {
+                $fieldDef['len']  = '10,0';
+            }
+        }
+    }
+
+    /**
+     * Generates SQL for dropping a table.
+     *
+     * @param  string $name table name
+     * @return string SQL statement
+     */
+    public function dropTableNameSQL($name)
+    {
+        return "DROP TABLE IF EXISTS ".$name;
+    }
+
+    public function dropIndexes($tablename, $indexes, $execute = true)
+    {
+        $sql = array();
+        foreach ($indexes as $index) {
+            $name =$index['name'];
+            if($execute) {
+            unset(self::$index_descriptions[$tablename][$name]);
+            }
+            if ($index['type'] == 'primary') {
+                $sql[] = 'DROP PRIMARY KEY';
+            } else {
+                $sql[] = "DROP INDEX $name";
+            }
+        }
+        if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
-		} else {
-			$sql = '';
-		}
-		return $sql;
-	}
-
-	/**
-	 * List of available collation settings
-	 * @return string
-	 */
-	public function getDefaultCollation()
-	{
-		return "utf8_general_ci";
-	}
-
-	/**
-	 * List of available collation settings
-	 * @return array
-	 */
-	public function getCollationList()
-	{
-		$q = "SHOW COLLATION LIKE 'utf8%'";
-		$r = $this->query($q);
-		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
-			$res[] = $a['Collation'];
-		}
-		return $res;
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::renameColumnSQL()
-	 */
-	public function renameColumnSQL($tablename, $column, $newname)
-	{
-		$field = $this->describeField($column, $tablename);
-		$field['name'] = $newname;
-		return "ALTER TABLE $tablename CHANGE COLUMN $column ".$this->oneColumnSQLRep($field);
-	}
-
-	public function emptyValue($type)
-	{
-		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
-			return 'NULL';
-		}
-		if($ctype == "date") {
-			return 'NULL';
-		}
-		if($ctype == "time") {
-			return 'NULL';
-		}
-		return parent::emptyValue($type);
-	}
-
-	/**
-	 * (non-PHPdoc)
-	 * @see DBManager::lastDbError()
-	 */
-	public function lastDbError()
-	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
-			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
-		    }
-		} else {
-			$err =  mysql_error();
-			if($err) {
-			    return $err;
-			}
-		}
+            if($execute)
+                $this->query($sql);
+        } else {
+            $sql = '';
+        }
+        return $sql;
+    }
+
+    /**
+     * List of available collation settings
+     * @return string
+     */
+    public function getDefaultCollation()
+    {
+        return "utf8_general_ci";
+    }
+
+    /**
+     * List of available collation settings
+     * @return array
+     */
+    public function getCollationList()
+    {
+        $q = "SHOW COLLATION LIKE 'utf8%'";
+        $r = $this->query($q);
+        $res = array();
+        while($a = $this->fetchByAssoc($r)) {
+            $res[] = $a['Collation'];
+        }
+        return $res;
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::renameColumnSQL()
+     */
+    public function renameColumnSQL($tablename, $column, $newname)
+    {
+        $field = $this->describeField($column, $tablename);
+        $field['name'] = $newname;
+        return "ALTER TABLE $tablename CHANGE COLUMN $column ".$this->oneColumnSQLRep($field);
+    }
+
+    public function emptyValue($type)
+    {
+        $ctype = $this->getColumnType($type);
+        if($ctype == "datetime") {
+            return 'NULL';
+        }
+        if($ctype == "date") {
+            return 'NULL';
+        }
+        if($ctype == "time") {
+            return 'NULL';
+        }
+        return parent::emptyValue($type);
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see DBManager::lastDbError()
+     */
+    public function lastDbError()
+    {
+        if($this->database) {
+            if(mysql_errno($this->database)) {
+                return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
+            }
+        } else {
+            $err =  mysql_error();
+            if($err) {
+                return $err;
+            }
+        }
         return false;
     }
 
-	/**
-	 * Quote MySQL search term
-	 * @param unknown_type $term
-	 */
-	protected function quoteTerm($term)
-	{
-		if(strpos($term, ' ') !== false) {
-			return '"'.$term.'"';
-		}
-		return $term;
-	}
-
-	/**
-	 * Generate fulltext query from set of terms
-	 * @param string $fields Field to search against
-	 * @param array $terms Search terms that may be or not be in the result
-	 * @param array $must_terms Search terms that have to be in the result
-	 * @param array $exclude_terms Search terms that have to be not in the result
-	 */
-	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
-	{
-		$condition = array();
-		foreach($terms as $term) {
-			$condition[] = $this->quoteTerm($term);
-		}
-		foreach($must_terms as $term) {
-			$condition[] = "+".$this->quoteTerm($term);
-		}
-		foreach($exclude_terms as $term) {
-			$condition[] = "-".$this->quoteTerm($term);
-		}
-		$condition = $this->quoted(join(" ",$condition));
-		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
-	}
-
-	/**
-	 * Get list of all defined charsets
-	 * @return array
-	 */
-	protected function getCharsetInfo()
-	{
-		$charsets = array();
-		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
-			$charsets[$row['Variable_name']] = $row['Value'];
-		}
-		return $charsets;
-	}
-
-	public function getDbInfo()
-	{
-		$charsets = $this->getCharsetInfo();
-		$charset_str = array();
-		foreach($charsets as $name => $value) {
-			$charset_str[] = "$name = $value";
-		}
-		return array(
-			"MySQL Version" => @mysql_get_client_info(),
-			"MySQL Host Info" => @mysql_get_host_info($this->database),
-			"MySQL Server Info" => @mysql_get_server_info($this->database),
-			"MySQL Client Encoding" =>  @mysql_client_encoding($this->database),
-			"MySQL Character Set Settings" => join(", ", $charset_str),
-		);
-	}
-
-	public function validateQuery($query)
-	{
-		$res = $this->query("EXPLAIN $query");
-		return !empty($res);
-	}
-
-	protected function makeTempTableCopy($table)
-	{
-		$this->log->debug("creating temp table for [$table]...");
-		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
-			return false;
-		}
-		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
-		    return false;
-		}
-		$create = $row['Create Table'];
-		// rewrite DDL with _temp name
-		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
-		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
-			return false;
-		}
-
-		// get sample data into the temp table to test for data/constraint conflicts
-		$this->log->debug('inserting temp dataset...');
-		$q3 = "INSERT INTO `{$table}__uw_temp` SELECT * FROM `{$table}` LIMIT 10";
-		$this->query($q3, false, "Preflight Failed for: {$q3}");
-		return true;
-	}
-
-	/**
-	 * Tests an ALTER TABLE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	protected function verifyAlterTable($table, $query)
-	{
-		$this->log->debug("verifying ALTER TABLE");
-		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
-		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
-			$this->log->debug("Skipping DROP PRIMARY KEY");
-			return '';
-		}
-		if(!$this->makeTempTableCopy($table)) {
-			return 'Could not create temp table copy';
-		}
-
-		// test the query on the test table
-		$this->log->debug('testing query: ['.$query.']');
-		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
-		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
-				return 'Could not use a temp table to test query!';
-			}
-
-			$this->log->debug('testing query on temp table: ['.$tempTableTestQuery.']');
-			$this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
-		} else {
-			// test insertion of an index on a table
-			$tempTableTestQuery_idx = str_replace("ADD INDEX `idx_", "ADD INDEX `temp_idx_", $tempTableTestQuery);
-			$this->log->debug('testing query on temp table: ['.$tempTableTestQuery_idx.']');
-			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
-		}
-		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
-			return $mysqlError;
-		}
-		$this->dropTableName("{$table}__uw_temp");
-
-		return '';
-	}
-
-	protected function verifyGenericReplaceQuery($querytype, $table, $query)
-	{
-		$this->log->debug("verifying $querytype statement");
-
-		if(!$this->makeTempTableCopy($table)) {
-			return 'Could not create temp table copy';
-		}
-		// test the query on the test table
-		$this->log->debug('testing query: ['.$query.']');
-		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
-			return 'Could not use a temp table to test query!';
-		}
-
-		$this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
-		$error = $this->lastError(); // empty on no-errors
-		$this->dropTableName("{$table}__uw_temp"); // just in case
-		return $error;
-	}
-
-	/**
-	 * Tests a DROP TABLE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyDropTable($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("DROP TABLE", $table, $query);
-	}
-
-	/**
-	 * Tests an INSERT INTO query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyInsertInto($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("INSERT INTO", $table, $query);
-	}
-
-	/**
-	 * Tests an UPDATE query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyUpdate($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("UPDATE", $table, $query);
-	}
-
-	/**
-	 * Tests an DELETE FROM query
-	 * @param string table The table name to get DDL
-	 * @param string query The query to test.
-	 * @return string Non-empty if error found
-	 */
-	public function verifyDeleteFrom($table, $query)
-	{
-		return $this->verifyGenericReplaceQuery("DELETE FROM", $table, $query);
-	}
-
-	/**
-	 * Check if certain database exists
-	 * @param string $dbname
-	 */
-	public function dbExists($dbname)
-	{
-		$db = $this->getOne("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ".$this->quoted($dbname));
-		return !empty($db);
-	}
-
-	/**
-	 * Select database
-	 * @param string $dbname
-	 */
-	protected function selectDb($dbname)
-	{
-		return mysql_select_db($dbname);
-	}
-
-	/**
-	 * Check if certain DB user exists
-	 * @param string $username
-	 */
-	public function userExists($username)
-	{
-		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
-			return false;
-		}
-		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
-			$this->checkError("Cannot select database $db", true);
-		}
-		return !empty($user);
-	}
-
-	/**
-	 * Create DB user
-	 * @param string $database_name
-	 * @param string $host_name
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function createDbUser($database_name, $host_name, $user, $password)
-	{
-		$qpassword = $this->quote($password);
-		$this->query("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX
+    /**
+     * Quote MySQL search term
+     * @param unknown_type $term
+     */
+    protected function quoteTerm($term)
+    {
+        if(strpos($term, ' ') !== false) {
+            return '"'.$term.'"';
+        }
+        return $term;
+    }
+
+    /**
+     * Generate fulltext query from set of terms
+     * @param string $fields Field to search against
+     * @param array $terms Search terms that may be or not be in the result
+     * @param array $must_terms Search terms that have to be in the result
+     * @param array $exclude_terms Search terms that have to be not in the result
+     */
+    public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
+    {
+        $condition = array();
+        foreach($terms as $term) {
+            $condition[] = $this->quoteTerm($term);
+        }
+        foreach($must_terms as $term) {
+            $condition[] = "+".$this->quoteTerm($term);
+        }
+        foreach($exclude_terms as $term) {
+            $condition[] = "-".$this->quoteTerm($term);
+        }
+        $condition = $this->quoted(join(" ",$condition));
+        return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
+    }
+
+    /**
+     * Get list of all defined charsets
+     * @return array
+     */
+    protected function getCharsetInfo()
+    {
+        $charsets = array();
+        $res = $this->query("show variables like 'character\\_set\\_%'");
+        while($row = $this->fetchByAssoc($res)) {
+            $charsets[$row['Variable_name']] = $row['Value'];
+        }
+        return $charsets;
+    }
+
+    public function getDbInfo()
+    {
+        $charsets = $this->getCharsetInfo();
+        $charset_str = array();
+        foreach($charsets as $name => $value) {
+            $charset_str[] = "$name = $value";
+        }
+        return array(
+            "MySQL Version" => @mysql_get_client_info(),
+            "MySQL Host Info" => @mysql_get_host_info($this->database),
+            "MySQL Server Info" => @mysql_get_server_info($this->database),
+            "MySQL Client Encoding" =>  @mysql_client_encoding($this->database),
+            "MySQL Character Set Settings" => join(", ", $charset_str),
+        );
+    }
+
+    public function validateQuery($query)
+    {
+        $res = $this->query("EXPLAIN $query");
+        return !empty($res);
+    }
+
+    protected function makeTempTableCopy($table)
+    {
+        $this->log->debug("creating temp table for [$table]...");
+        $result = $this->query("SHOW CREATE TABLE {$table}");
+        if(empty($result)) {
+            return false;
+        }
+        $row = $this->fetchByAssoc($result);
+        if(empty($row) || empty($row['Create Table'])) {
+            return false;
+        }
+        $create = $row['Create Table'];
+        // rewrite DDL with _temp name
+        $tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
+        $r2 = $this->query($tempTableQuery);
+        if(empty($r2)) {
+            return false;
+        }
+
+        // get sample data into the temp table to test for data/constraint conflicts
+        $this->log->debug('inserting temp dataset...');
+        $q3 = "INSERT INTO `{$table}__uw_temp` SELECT * FROM `{$table}` LIMIT 10";
+        $this->query($q3, false, "Preflight Failed for: {$q3}");
+        return true;
+    }
+
+    /**
+     * Tests an ALTER TABLE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    protected function verifyAlterTable($table, $query)
+    {
+        $this->log->debug("verifying ALTER TABLE");
+        // Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
+        // over to the temp tables
+        if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+            $this->log->debug("Skipping DROP PRIMARY KEY");
+            return '';
+        }
+        if(!$this->makeTempTableCopy($table)) {
+            return 'Could not create temp table copy';
+        }
+
+        // test the query on the test table
+        $this->log->debug('testing query: ['.$query.']');
+        $tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
+        if (strpos($tempTableTestQuery, 'idx') === false) {
+            if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+                return 'Could not use a temp table to test query!';
+            }
+
+            $this->log->debug('testing query on temp table: ['.$tempTableTestQuery.']');
+            $this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
+        } else {
+            // test insertion of an index on a table
+            $tempTableTestQuery_idx = str_replace("ADD INDEX `idx_", "ADD INDEX `temp_idx_", $tempTableTestQuery);
+            $this->log->debug('testing query on temp table: ['.$tempTableTestQuery_idx.']');
+            $this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
+        }
+        $mysqlError = $this->getL();
+        if(!empty($mysqlError)) {
+            return $mysqlError;
+        }
+        $this->dropTableName("{$table}__uw_temp");
+
+        return '';
+    }
+
+    protected function verifyGenericReplaceQuery($querytype, $table, $query)
+    {
+        $this->log->debug("verifying $querytype statement");
+
+        if(!$this->makeTempTableCopy($table)) {
+            return 'Could not create temp table copy';
+        }
+        // test the query on the test table
+        $this->log->debug('testing query: ['.$query.']');
+        $tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
+        if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+            return 'Could not use a temp table to test query!';
+        }
+
+        $this->query($tempTableTestQuery, false, "Preflight Failed for: {$query}");
+        $error = $this->lastError(); // empty on no-errors
+        $this->dropTableName("{$table}__uw_temp"); // just in case
+        return $error;
+    }
+
+    /**
+     * Tests a DROP TABLE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyDropTable($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("DROP TABLE", $table, $query);
+    }
+
+    /**
+     * Tests an INSERT INTO query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyInsertInto($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("INSERT INTO", $table, $query);
+    }
+
+    /**
+     * Tests an UPDATE query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyUpdate($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("UPDATE", $table, $query);
+    }
+
+    /**
+     * Tests an DELETE FROM query
+     * @param string table The table name to get DDL
+     * @param string query The query to test.
+     * @return string Non-empty if error found
+     */
+    public function verifyDeleteFrom($table, $query)
+    {
+        return $this->verifyGenericReplaceQuery("DELETE FROM", $table, $query);
+    }
+
+    /**
+     * Check if certain database exists
+     * @param string $dbname
+     */
+    public function dbExists($dbname)
+    {
+        $db = $this->getOne("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = ".$this->quoted($dbname));
+        return !empty($db);
+    }
+
+    /**
+     * Select database
+     * @param string $dbname
+     */
+    protected function selectDb($dbname)
+    {
+        return mysql_select_db($dbname);
+    }
+
+    /**
+     * Check if certain DB user exists
+     * @param string $username
+     */
+    public function userExists($username)
+    {
+        $db = $this->getOne("SELECT DATABASE()");
+        if(!$this->selectDb("mysql")) {
+            return false;
+        }
+        $user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
+        if(!$this->selectDb($db)) {
+            $this->checkError("Cannot select database $db", true);
+        }
+        return !empty($user);
+    }
+
+    /**
+     * Create DB user
+     * @param string $database_name
+     * @param string $host_name
+     * @param string $user
+     * @param string $password
+     */
+    public function createDbUser($database_name, $host_name, $user, $password)
+    {
+        $qpassword = $this->quote($password);
+        $this->query("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, DROP, INDEX
 							ON `$database_name`.*
 							TO \"$user\"@\"$host_name\"
 							IDENTIFIED BY '{$qpassword}';", true);
 
-		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
-			$this->createDbUser($database_name, "localhost", $user, $password);
-		}
-	}
-
-	/**
-	 * Create a database
-	 * @param string $dbname
-	 */
-	public function createDatabase($dbname)
-	{
-		$this->query("CREATE DATABASE `$dbname` CHARACTER SET utf8 COLLATE utf8_general_ci", true);
-	}
-
-	public function preInstall()
-	{
-		$db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT CHARACTER SET utf8", true);
-		$db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT COLLATE utf8_general_ci", true);
-
-	}
-
-	/**
-	 * Drop a database
-	 * @param string $dbname
-	 */
-	public function dropDatabase($dbname)
-	{
-		return $this->query("DROP DATABASE IF EXISTS `$dbname`", true);
-	}
-
-	/**
-	 * Check if this driver can be used
-	 * @return bool
-	 */
-	public function valid()
-	{
-		return function_exists("mysql_connect");
-	}
-
-	/**
-	 * Check DB version
-	 * @see DBManager::canInstall()
-	 */
-	public function canInstall()
-	{
-		$db_version = $this->version();
-		if(empty($db_version)) {
-			return array('ERR_DB_VERSION_FAILURE');
-		}
-		if(version_compare($db_version, '4.1.2') < 0) {
-			return array('ERR_DB_MYSQL_VERSION', $db_version);
-		}
-		return true;
-	}
-
-	public function installConfig()
-	{
-		return array(
-			'LBL_DBCONFIG_MSG3' =>  array(
-				"setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
-			),
-			'LBL_DBCONFIG_MSG2' =>  array(
-				"setup_db_host_name" => array("label" => 'LBL_DBCONF_HOST_NAME', "required" => true),
-			),
-			'LBL_DBCONF_TITLE_USER_INFO' => array(),
-			'LBL_DBCONFIG_B_MSG1' => array(
-				"setup_db_admin_user_name" => array("label" => 'LBL_DBCONF_DB_ADMIN_USER', "required" => true),
-				"setup_db_admin_password" => array("label" => 'LBL_DBCONF_DB_ADMIN_PASSWORD', "type" => "password"),
-			)
-		);
-	}
-
-	/**
-	 * Disable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function disableKeys($tableName)
-	{
-	    return $this->query('ALTER TABLE '.$tableName.' DISABLE KEYS');
-	}
-
-	/**
-	 * Re-enable keys on the table
-	 * @abstract
-	 * @param string $tableName
-	 */
-	public function enableKeys($tableName)
-	{
-	    return $this->query('ALTER TABLE '.$tableName.' ENABLE KEYS');
-	}
+        $this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
+        if($host_name != 'localhost') {
+            $this->createDbUser($database_name, "localhost", $user, $password);
+        }
+    }
+
+    /**
+     * Create a database
+     * @param string $dbname
+     */
+    public function createDatabase($dbname)
+    {
+        $this->query("CREATE DATABASE `$dbname` CHARACTER SET utf8 COLLATE utf8_general_ci", true);
+    }
+
+    public function preInstall()
+    {
+        $db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT CHARACTER SET utf8", true);
+        $db->query("ALTER DATABASE `{$setup_db_database_name}` DEFAULT COLLATE utf8_general_ci", true);
+
+    }
+
+    /**
+     * Drop a database
+     * @param string $dbname
+     */
+    public function dropDatabase($dbname)
+    {
+        return $this->query("DROP DATABASE IF EXISTS `$dbname`", true);
+    }
+
+    /**
+     * Check if this driver can be used
+     * @return bool
+     */
+    public function valid()
+    {
+        return function_exists("mysql_connect");
+    }
+
+    /**
+     * Check DB version
+     * @see DBManager::canInstall()
+     */
+    public function canInstall()
+    {
+        $db_version = $this->version();
+        if(empty($db_version)) {
+            return array('ERR_DB_VERSION_FAILURE');
+        }
+        if(version_compare($db_version, '4.1.2') < 0) {
+            return array('ERR_DB_MYSQL_VERSION', $db_version);
+        }
+        return true;
+    }
+
+    public function installConfig()
+    {
+        return array(
+            'LBL_DBCONFIG_MSG3' =>  array(
+                "setup_db_database_name" => array("label" => 'LBL_DBCONF_DB_NAME', "required" => true),
+            ),
+            'LBL_DBCONFIG_MSG2' =>  array(
+                "setup_db_host_name" => array("label" => 'LBL_DBCONF_HOST_NAME', "required" => true),
+            ),
+            'LBL_DBCONF_TITLE_USER_INFO' => array(),
+            'LBL_DBCONFIG_B_MSG1' => array(
+                "setup_db_admin_user_name" => array("label" => 'LBL_DBCONF_DB_ADMIN_USER', "required" => true),
+                "setup_db_admin_password" => array("label" => 'LBL_DBCONF_DB_ADMIN_PASSWORD', "type" => "password"),
+            )
+        );
+    }
+
+    /**
+     * Disable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function disableKeys($tableName)
+    {
+        return $this->query('ALTER TABLE '.$tableName.' DISABLE KEYS');
+    }
+
+    /**
+     * Re-enable keys on the table
+     * @abstract
+     * @param string $tableName
+     */
+    public function enableKeys($tableName)
+    {
+        return $this->query('ALTER TABLE '.$tableName.' ENABLE KEYS');
+    }
 
     /**
      * Returns a DB specific FROM clause which can be used to select against functions.
@@ -1505,8 +1505,8 @@ 
      * @return string
      */
 
-	public function getGuidSQL()
+    public function getGuidSQL()
     {
-      	return 'UUID()';
+            return 'UUID()';
     }
 }

Spacing +139 added lines, -139 removed lines

@@ -174,25 +174,25 @@ 
 	 */
 	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);
 		}
 
 		parent::countQuery($sql);
-		$GLOBALS['log']->info('Query:' . $sql);
+		$GLOBALS['log']->info('Query:'.$sql);
 		$this->checkConnection();
 		$this->query_time = microtime(true);
 		$this->lastsql = $sql;
-		$result = $suppress?@mysql_query($sql, $this->database):mysql_query($sql, $this->database);
+		$result = $suppress ? @mysql_query($sql, $this->database) : mysql_query($sql, $this->database);
 
 		$this->query_time = microtime(true) - $this->query_time;
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
+		if ($keepResult)
 			$this->lastResult = $result;
 
-		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
+		$this->checkError($msg.' Query Failed:'.$sql.'::', $dieOnError);
 		return $result;
 	}
 
@@ -228,7 +228,7 @@ 
 	public function disconnect()
 	{
 		$GLOBALS['log']->debug('Calling MySQL::disconnect()');
-		if(!empty($this->database)){
+		if (!empty($this->database)) {
 			$this->freeResult();
 			mysql_close($this->database);
 			$this->database = null;
@@ -240,7 +240,7 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
+		if (!empty($dbResult))
 			mysql_free_result($dbResult);
 	}
 
@@ -266,15 +266,15 @@ 
         $count = (int)$count;
 	    if ($start < 0)
 			$start = 0;
-		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
+		$GLOBALS['log']->debug('Limit Query:'.$sql.' Start: '.$start.' count: '.$count);
 
 	    $sql = "$sql LIMIT $start,$count";
 		$this->lastsql = $sql;
 
-		if(!empty($GLOBALS['sugar_config']['check_query'])){
+		if (!empty($GLOBALS['sugar_config']['check_query'])) {
 			$this->checkQuery($sql);
 		}
-		if(!$execute) {
+		if (!$execute) {
 			return $sql;
 		}
 
@@ -287,14 +287,14 @@ 
 	 */
 	protected function checkQuery($sql, $object_name = false)
 	{
-		$result   = $this->query('EXPLAIN ' . $sql);
+		$result   = $this->query('EXPLAIN '.$sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
 			if (empty($row['table']))
 				continue;
 			$badQuery[$row['table']] = '';
 			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
+				$badQuery[$row['table']] .= ' Full Table Scan;';
 			if (empty($row['key']))
 				$badQuery[$row['table']] .= ' No Index Key Used;';
 			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
@@ -303,18 +303,18 @@ 
 				$badQuery[$row['table']] .= ' Using Temporary Table;';
 		}
 
-		if ( empty($badQuery) )
+		if (empty($badQuery))
 			return true;
 
-		foreach($badQuery as $table=>$data ){
-			if(!empty($data)){
-				$warning = ' Table:' . $table . ' Data:' . $data;
-				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
+		foreach ($badQuery as $table=>$data) {
+			if (!empty($data)) {
+				$warning = ' Table:'.$table.' Data:'.$data;
+				if (!empty($GLOBALS['sugar_config']['check_query_log'])) {
 					$GLOBALS['log']->fatal($sql);
-					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
+					$GLOBALS['log']->fatal('CHECK QUERY:'.$warning);
 				}
-				else{
-					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
+				else {
+					$GLOBALS['log']->warn('CHECK QUERY:'.$warning);
 				}
 			}
 		}
@@ -331,19 +331,19 @@ 
 		$result = $this->query("DESCRIBE $tablename");
 
 		$columns = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
+		while (($row = $this->fetchByAssoc($result)) != null) {
 			$name = strtolower($row['Field']);
-			$columns[$name]['name']=$name;
+			$columns[$name]['name'] = $name;
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
-			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
+			$columns[$name]['type'] = strtolower($matches[1][0]);
+			if (isset($matches[2][0]) && in_array(strtolower($matches[1][0]), array('varchar', 'char', 'varchar2', 'int', 'decimal', 'float')))
+				$columns[$name]['len'] = strtolower($matches[2][0]);
+			if (stristr($row['Extra'], 'auto_increment'))
 				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
+			if ($row['Null'] == 'NO' && !stristr($row['Key'], 'PRI'))
 				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
+			if (!empty($row['Default']))
 				$columns[$name]['default'] = $row['Default'];
 		}
 		return $columns;
@@ -352,20 +352,20 @@ 
 	/**
 	 * @see DBManager::getFieldsArray()
 	 */
-	public function getFieldsArray($result, $make_lower_case=false)
+	public function getFieldsArray($result, $make_lower_case = false)
 	{
 		$field_array = array();
 
-		if(empty($result))
+		if (empty($result))
 			return 0;
 
 		$fields = mysql_num_fields($result);
-		for ($i=0; $i < $fields; $i++) {
+		for ($i = 0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
 			if (!$meta)
 				return array();
 
-			if($make_lower_case == true)
+			if ($make_lower_case == true)
 				$meta->name = strtolower($meta->name);
 
 			$field_array[] = $meta->name;
@@ -397,7 +397,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -423,7 +423,7 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if (empty($result)) return false;
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -444,7 +444,7 @@ 
 			if (!empty($r)) {
 				while ($a = $this->fetchByAssoc($r)) {
 					$row = array_values($a);
-					$tables[]=$row[0];
+					$tables[] = $row[0];
 				}
 				return $tables;
 			}
@@ -457,7 +457,7 @@ 
 	 */
 	public function quote($string)
 	{
-		if(is_array($string)) {
+		if (is_array($string)) {
 			return $this->arrayQuote($string);
 		}
 		return mysqli_real_escape_string($this->quoteInternal($string), $this->getDatabase());
@@ -478,7 +478,7 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
+		if (is_null($configOptions))
 			$configOptions = $sugar_config['dbconfig'];
 
 		if ($this->getOption('persistent')) {
@@ -495,10 +495,10 @@ 
 					$configOptions['db_user_name'],
 					$configOptions['db_password']
 					);
-			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'].":".mysql_error());
-				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.");
@@ -508,15 +508,15 @@ 
 				}
 			}
 			// Do not pass connection information because we have not connected yet
-			if($this->database  && $this->getOption('persistent')){
+			if ($this->database && $this->getOption('persistent')) {
 				$_SESSION['administrator_error'] = "<b>Severe Performance Degradation: Persistent Database Connections "
 					. "not working.  Please set \$sugar_config['dbconfigoption']['persistent'] to false "
 					. "in your config.php file</b>";
 			}
 		}
-		if(!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
-			$GLOBALS['log']->fatal( "Unable to select database {$configOptions['db_name']}: " . mysql_error($this->database));
-			if($dieOnError) {
+		if (!empty($configOptions['db_name']) && !@mysql_select_db($configOptions['db_name'])) {
+			$GLOBALS['log']->fatal("Unable to select database {$configOptions['db_name']}: ".mysql_error($this->database));
+			if ($dieOnError) {
 				sugar_die($GLOBALS['app_strings']['ERR_NO_DB']);
 			} else {
 				return false;
@@ -527,12 +527,12 @@ 
 	    mysql_query("SET CHARACTER SET utf8", $this->database);
 	    $names = "SET NAMES 'utf8'";
 	    $collation = $this->getOption('collation');
-	    if(!empty($collation)) {
+	    if (!empty($collation)) {
 	        $names .= " COLLATE '$collation'";
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
+		if (!$this->checkError('Could Not Connect:', $dieOnError))
 			$GLOBALS['log']->info("connected to db");
 		$this->connectOptions = $configOptions;
 
@@ -548,16 +548,16 @@ 
 	 */
 	public function repairTableParams($tablename, $fielddefs, $indices, $execute = true, $engine = null)
 	{
-		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
+		$sql = parent::repairTableParams($tablename, $fielddefs, $indices, false, $engine);
 
-		if ( $sql == '' )
+		if ($sql == '')
 			return '';
 
-		if ( stristr($sql,'create table') )
+		if (stristr($sql, 'create table'))
 		{
 			if ($execute) {
-				$msg = "Error creating table: ".$tablename. ":";
-				$this->query($sql,true,$msg);
+				$msg = "Error creating table: ".$tablename.":";
+				$this->query($sql, true, $msg);
 			}
 			return $sql;
 		}
@@ -566,23 +566,23 @@ 
 		$match = array();
 		preg_match_all('!/\*.*?\*/!is', $sql, $match);
 		$commentBlocks = $match[0];
-		$sql = preg_replace('!/\*.*?\*/!is','', $sql);
+		$sql = preg_replace('!/\*.*?\*/!is', '', $sql);
 
 		// now, we should only have alter table statements
 		// let's replace the 'alter table name' part with a comma
-		$sql = preg_replace("!alter table $tablename!is",', ', $sql);
+		$sql = preg_replace("!alter table $tablename!is", ', ', $sql);
 
 		// re-add it at the beginning
-		$sql = substr_replace($sql,'',strpos($sql,','),1);
-		$sql = str_replace(";","",$sql);
-		$sql = str_replace("\n","",$sql);
+		$sql = substr_replace($sql, '', strpos($sql, ','), 1);
+		$sql = str_replace(";", "", $sql);
+		$sql = str_replace("\n", "", $sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ($execute)
+			$this->query($sql, 'Error with MySQL repair table');
 
 		// and re-add the comments at the beginning
-		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
+		$sql = implode("\n", $commentBlocks)."\n".$sql."\n";
 
 		return $sql;
 	}
@@ -593,7 +593,7 @@ 
 	public function convert($string, $type, array $additional_parameters = array())
 	{
 		$all_parameters = $additional_parameters;
-		if(is_array($string)) {
+		if (is_array($string)) {
 			$all_parameters = array_merge($string, $all_parameters);
 		} elseif (!is_null($string)) {
 			array_unshift($all_parameters, $string);
@@ -606,17 +606,17 @@ 
 			case 'left':
 				return "LEFT($all_strings)";
 			case 'date_format':
-				if(empty($additional_parameters)) {
+				if (empty($additional_parameters)) {
 					return "DATE_FORMAT($string,'%Y-%m-%d')";
 				} else {
 					$format = $additional_parameters[0];
-					if($format[0] != "'") {
+					if ($format[0] != "'") {
 						$format = $this->quoted($format);
 					}
 					return "DATE_FORMAT($string,$format)";
 				}
 			case 'ifnull':
-				if(empty($additional_parameters) && !strstr($all_strings, ",")) {
+				if (empty($additional_parameters) && !strstr($all_strings, ",")) {
 					$all_strings .= ",''";
 				}
 				return "IFNULL($all_strings)";
@@ -635,7 +635,7 @@ 
             case 'add_tz_offset' :
                 $getUserUTCOffset = $GLOBALS['timedate']->getUserUTCOffset();
                 $operation = $getUserUTCOffset < 0 ? '-' : '+';
-                return $string . ' ' . $operation . ' INTERVAL ' . abs($getUserUTCOffset) . ' MINUTE';
+                return $string.' '.$operation.' INTERVAL '.abs($getUserUTCOffset).' MINUTE';
             case 'avg':
                 return "avg($string)";
 		}
@@ -676,15 +676,15 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if (!is_string($engine)) return false;
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
-				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		while ($row = $this->fetchByAssoc($r))
+			if (strtoupper($row['Engine']) == $engine)
+				return ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT');
 
 		return false;
 	}
@@ -712,9 +712,9 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
+		if (empty($engine) && isset($fieldDefs['engine']))
 			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
+		if (!$this->isEngineEnabled($engine))
 			$engine = '';
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
@@ -727,13 +727,13 @@ 
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
-		if(empty($collation)) {
+		if (empty($collation)) {
 		    $collation = 'utf8_general_ci';
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
 		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+			$sql .= " ENGINE=$engine";
 
 		return $sql;
 	}
@@ -745,7 +745,7 @@ 
     public function isTextType($type)
     {
         $type = $this->getColumnType(strtolower($type));
-        return in_array($type, array('blob','text','longblob', 'longtext'));
+        return in_array($type, array('blob', 'text', 'longblob', 'longtext'));
     }
 
 	/**
@@ -756,16 +756,16 @@ 
 		// always return as array for post-processing
 		$ref = parent::oneColumnSQLRep($fieldDef, $ignoreRequired, $table, true);
 
-		if ( $ref['colType'] == 'int' && !empty($fieldDef['len']) ) {
+		if ($ref['colType'] == 'int' && !empty($fieldDef['len'])) {
 			$ref['colType'] .= "(".$fieldDef['len'].")";
 		}
 
 		// bug 22338 - don't set a default value on text or blob fields
-		if ( isset($ref['default']) &&
+		if (isset($ref['default']) &&
             in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
 			    $ref['default'] = '';
 
-		if ( $return_as_array )
+		if ($return_as_array)
 			return $ref;
 		else
 			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
@@ -777,8 +777,8 @@ 
 	protected function changeColumnSQL($tablename, $fieldDefs, $action, $ignoreRequired = false)
 	{
 		$columns = array();
-		if ($this->isFieldArray($fieldDefs)){
-			foreach ($fieldDefs as $def){
+		if ($this->isFieldArray($fieldDefs)) {
+			foreach ($fieldDefs as $def) {
 				if ($action == 'drop')
 					$columns[] = $def['name'];
 				else
@@ -815,7 +815,7 @@ 
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
+		if (!empty($index['db']) && $index['db'] != $this->dbType)
 			continue;
 		if (isset($index['source']) && $index['source'] != 'db')
 			continue;
@@ -845,7 +845,7 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
+			if ($alter_table)
 				$columns[] = " INDEX $name ($fields)";
 			else
 				$columns[] = " KEY $name ($fields)";
@@ -854,13 +854,13 @@ 
 			if ($this->full_text_indexing_installed())
 				$columns[] = " FULLTEXT ($fields)";
 			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:', $name);
 			break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
-	if(!empty($alter_action)){
-		$columns = $alter_action . ' '. $columns;
+	if (!empty($alter_action)) {
+		$columns = $alter_action.' '.$columns;
 	}
 	return $columns;
 	}
@@ -882,7 +882,7 @@ 
 	public function setAutoIncrementStart($table, $field_name, $start_value)
 	{
 		$start_value = (int)$start_value;
-		return $this->query( "ALTER TABLE $table AUTO_INCREMENT = $start_value;");
+		return $this->query("ALTER TABLE $table AUTO_INCREMENT = $start_value;");
 	}
 
 	/**
@@ -911,18 +911,18 @@ 
 		$result = $this->query("SHOW INDEX FROM $tablename");
 
 		$indices = array();
-		while (($row=$this->fetchByAssoc($result)) !=null) {
-			$index_type='index';
-			if ($row['Key_name'] =='PRIMARY') {
-				$index_type='primary';
+		while (($row = $this->fetchByAssoc($result)) != null) {
+			$index_type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+				$index_type = 'primary';
 			}
-			elseif ( $row['Non_unique'] == '0' ) {
-				$index_type='unique';
+			elseif ($row['Non_unique'] == '0') {
+				$index_type = 'unique';
 			}
 			$name = strtolower($row['Key_name']);
-			$indices[$name]['name']=$name;
-			$indices[$name]['type']=$index_type;
-			$indices[$name]['fields'][]=strtolower($row['Column_name']);
+			$indices[$name]['name'] = $name;
+			$indices[$name]['type'] = $index_type;
+			$indices[$name]['fields'][] = strtolower($row['Column_name']);
 		}
 		return $indices;
 	}
@@ -933,11 +933,11 @@ 
 	public function add_drop_constraint($table, $definition, $drop = false)
 	{
 		$type         = $definition['type'];
-		$fields       = implode(',',$definition['fields']);
+		$fields       = implode(',', $definition['fields']);
 		$name         = $definition['name'];
 		$sql          = '';
 
-		switch ($type){
+		switch ($type) {
 		// generic indices
 		case 'index':
 		case 'alternate_key':
@@ -981,7 +981,7 @@ 
 	 */
 	public function fetchOne($sql, $dieOnError = false, $msg = '', $suppress = false)
 	{
-		if(stripos($sql, ' LIMIT ') === false) {
+		if (stripos($sql, ' LIMIT ') === false) {
 			// little optimization to just fetch one row
 			$sql .= " LIMIT 0,1";
 		}
@@ -1001,13 +1001,13 @@ 
 	 */
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
-		parent::massageFieldDef($fieldDef,$tablename);
+		parent::massageFieldDef($fieldDef, $tablename);
 
-		if ( isset($fieldDef['default']) &&
+		if (isset($fieldDef['default']) &&
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
+				|| $fieldDef['dbType'] == 'longblob'))
 			unset($fieldDef['default']);
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
@@ -1015,22 +1015,22 @@ 
 			$fieldDef['len'] = '20';
 		if ($fieldDef['dbType'] == 'bool')
 			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']))
 			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']))
 			$fieldDef['len'] = '255';
 		if ($fieldDef['dbType'] == 'uint')
 			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']))
 			$fieldDef['len'] = '11';
 
-		if($fieldDef['dbType'] == 'decimal') {
-			if(isset($fieldDef['len'])) {
-				if(strstr($fieldDef['len'], ",") === false) {
+		if ($fieldDef['dbType'] == 'decimal') {
+			if (isset($fieldDef['len'])) {
+				if (strstr($fieldDef['len'], ",") === false) {
 					$fieldDef['len'] .= ",0";
 				}
 			} else {
-				$fieldDef['len']  = '10,0';
+				$fieldDef['len'] = '10,0';
 			}
 		}
 	}
@@ -1050,8 +1050,8 @@ 
 	{
 		$sql = array();
 		foreach ($indexes as $index) {
-			$name =$index['name'];
-			if($execute) {
+			$name = $index['name'];
+			if ($execute) {
 			unset(self::$index_descriptions[$tablename][$name]);
 			}
 			if ($index['type'] == 'primary') {
@@ -1061,8 +1061,8 @@ 
 			}
 		}
 		if (!empty($sql)) {
-            $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
+            $sql = "ALTER TABLE $tablename ".join(",", $sql).";";
+			if ($execute)
 				$this->query($sql);
 		} else {
 			$sql = '';
@@ -1088,7 +1088,7 @@ 
 		$q = "SHOW COLLATION LIKE 'utf8%'";
 		$r = $this->query($q);
 		$res = array();
-		while($a = $this->fetchByAssoc($r)) {
+		while ($a = $this->fetchByAssoc($r)) {
 			$res[] = $a['Collation'];
 		}
 		return $res;
@@ -1108,13 +1108,13 @@ 
 	public function emptyValue($type)
 	{
 		$ctype = $this->getColumnType($type);
-		if($ctype == "datetime") {
+		if ($ctype == "datetime") {
 			return 'NULL';
 		}
-		if($ctype == "date") {
+		if ($ctype == "date") {
 			return 'NULL';
 		}
-		if($ctype == "time") {
+		if ($ctype == "time") {
 			return 'NULL';
 		}
 		return parent::emptyValue($type);
@@ -1126,13 +1126,13 @@ 
 	 */
 	public function lastDbError()
 	{
-		if($this->database) {
-		    if(mysql_errno($this->database)) {
+		if ($this->database) {
+		    if (mysql_errno($this->database)) {
 			    return "MySQL error ".mysql_errno($this->database).": ".mysql_error($this->database);
 		    }
 		} else {
-			$err =  mysql_error();
-			if($err) {
+			$err = mysql_error();
+			if ($err) {
 			    return $err;
 			}
 		}
@@ -1145,7 +1145,7 @@ 
 	 */
 	protected function quoteTerm($term)
 	{
-		if(strpos($term, ' ') !== false) {
+		if (strpos($term, ' ') !== false) {
 			return '"'.$term.'"';
 		}
 		return $term;
@@ -1161,16 +1161,16 @@ 
 	public function getFulltextQuery($field, $terms, $must_terms = array(), $exclude_terms = array())
 	{
 		$condition = array();
-		foreach($terms as $term) {
+		foreach ($terms as $term) {
 			$condition[] = $this->quoteTerm($term);
 		}
-		foreach($must_terms as $term) {
+		foreach ($must_terms as $term) {
 			$condition[] = "+".$this->quoteTerm($term);
 		}
-		foreach($exclude_terms as $term) {
+		foreach ($exclude_terms as $term) {
 			$condition[] = "-".$this->quoteTerm($term);
 		}
-		$condition = $this->quoted(join(" ",$condition));
+		$condition = $this->quoted(join(" ", $condition));
 		return "MATCH($field) AGAINST($condition IN BOOLEAN MODE)";
 	}
 
@@ -1182,7 +1182,7 @@ 
 	{
 		$charsets = array();
 		$res = $this->query("show variables like 'character\\_set\\_%'");
-		while($row = $this->fetchByAssoc($res)) {
+		while ($row = $this->fetchByAssoc($res)) {
 			$charsets[$row['Variable_name']] = $row['Value'];
 		}
 		return $charsets;
@@ -1192,7 +1192,7 @@ 
 	{
 		$charsets = $this->getCharsetInfo();
 		$charset_str = array();
-		foreach($charsets as $name => $value) {
+		foreach ($charsets as $name => $value) {
 			$charset_str[] = "$name = $value";
 		}
 		return array(
@@ -1214,18 +1214,18 @@ 
 	{
 		$this->log->debug("creating temp table for [$table]...");
 		$result = $this->query("SHOW CREATE TABLE {$table}");
-		if(empty($result)) {
+		if (empty($result)) {
 			return false;
 		}
 		$row = $this->fetchByAssoc($result);
-		if(empty($row) || empty($row['Create Table'])) {
+		if (empty($row) || empty($row['Create Table'])) {
 		    return false;
 		}
 		$create = $row['Create Table'];
 		// rewrite DDL with _temp name
 		$tempTableQuery = str_replace("CREATE TABLE `{$table}`", "CREATE TABLE `{$table}__uw_temp`", $create);
 		$r2 = $this->query($tempTableQuery);
-		if(empty($r2)) {
+		if (empty($r2)) {
 			return false;
 		}
 
@@ -1247,11 +1247,11 @@ 
 		$this->log->debug("verifying ALTER TABLE");
 		// Skipping ALTER TABLE [table] DROP PRIMARY KEY because primary keys are not being copied
 		// over to the temp tables
-		if(strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
+		if (strpos(strtoupper($query), 'DROP PRIMARY KEY') !== false) {
 			$this->log->debug("Skipping DROP PRIMARY KEY");
 			return '';
 		}
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 
@@ -1259,7 +1259,7 @@ 
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("ALTER TABLE `{$table}`", "ALTER TABLE `{$table}__uw_temp`", $query);
 		if (strpos($tempTableTestQuery, 'idx') === false) {
-			if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+			if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 				return 'Could not use a temp table to test query!';
 			}
 
@@ -1272,7 +1272,7 @@ 
 			$this->query($tempTableTestQuery_idx, false, "Preflight Failed for: {$query}");
 		}
 		$mysqlError = $this->getL();
-		if(!empty($mysqlError)) {
+		if (!empty($mysqlError)) {
 			return $mysqlError;
 		}
 		$this->dropTableName("{$table}__uw_temp");
@@ -1284,13 +1284,13 @@ 
 	{
 		$this->log->debug("verifying $querytype statement");
 
-		if(!$this->makeTempTableCopy($table)) {
+		if (!$this->makeTempTableCopy($table)) {
 			return 'Could not create temp table copy';
 		}
 		// test the query on the test table
 		$this->log->debug('testing query: ['.$query.']');
 		$tempTableTestQuery = str_replace("$querytype `{$table}`", "$querytype `{$table}__uw_temp`", $query);
-		if(strpos($tempTableTestQuery, '__uw_temp') === false) {
+		if (strpos($tempTableTestQuery, '__uw_temp') === false) {
 			return 'Could not use a temp table to test query!';
 		}
 
@@ -1370,11 +1370,11 @@ 
 	public function userExists($username)
 	{
 		$db = $this->getOne("SELECT DATABASE()");
-		if(!$this->selectDb("mysql")) {
+		if (!$this->selectDb("mysql")) {
 			return false;
 		}
 		$user = $this->getOne("select count(*) from user where user = ".$this->quoted($username));
-		if(!$this->selectDb($db)) {
+		if (!$this->selectDb($db)) {
 			$this->checkError("Cannot select database $db", true);
 		}
 		return !empty($user);
@@ -1396,7 +1396,7 @@ 
 							IDENTIFIED BY '{$qpassword}';", true);
 
 		$this->query("SET PASSWORD FOR \"{$user}\"@\"{$host_name}\" = password('{$qpassword}');", true);
-		if($host_name != 'localhost') {
+		if ($host_name != 'localhost') {
 			$this->createDbUser($database_name, "localhost", $user, $password);
 		}
 	}
@@ -1442,10 +1442,10 @@ 
 	public function canInstall()
 	{
 		$db_version = $this->version();
-		if(empty($db_version)) {
+		if (empty($db_version)) {
 			return array('ERR_DB_VERSION_FAILURE');
 		}
-		if(version_compare($db_version, '4.1.2') < 0) {
+		if (version_compare($db_version, '4.1.2') < 0) {
 			return array('ERR_DB_MYSQL_VERSION', $db_version);
 		}
 		return true;

Braces +181 added lines, -127 removed lines

@@ -189,8 +189,9 @@ 
 		$GLOBALS['log']->info('Query Execution Time:'.$this->query_time);
 
 
-		if($keepResult)
-			$this->lastResult = $result;
+		if($keepResult) {
+					$this->lastResult = $result;
+		}
 
 		$this->checkError($msg.' Query Failed:' . $sql . '::', $dieOnError);
 		return $result;
@@ -240,8 +241,9 @@ 
 	 */
 	protected function freeDbResult($dbResult)
 	{
-		if(!empty($dbResult))
-			mysql_free_result($dbResult);
+		if(!empty($dbResult)) {
+					mysql_free_result($dbResult);
+		}
 	}
 
 
@@ -264,8 +266,9 @@ 
 	{
         $start = (int)$start;
         $count = (int)$count;
-	    if ($start < 0)
-			$start = 0;
+	    if ($start < 0) {
+	    			$start = 0;
+	    }
 		$GLOBALS['log']->debug('Limit Query:' . $sql. ' Start: ' .$start . ' count: ' . $count);
 
 	    $sql = "$sql LIMIT $start,$count";
@@ -290,21 +293,27 @@ 
 		$result   = $this->query('EXPLAIN ' . $sql);
 		$badQuery = array();
 		while ($row = $this->fetchByAssoc($result)) {
-			if (empty($row['table']))
-				continue;
+			if (empty($row['table'])) {
+							continue;
+			}
 			$badQuery[$row['table']] = '';
-			if (strtoupper($row['type']) == 'ALL')
-				$badQuery[$row['table']]  .=  ' Full Table Scan;';
-			if (empty($row['key']))
-				$badQuery[$row['table']] .= ' No Index Key Used;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0)
-				$badQuery[$row['table']] .= ' Using FileSort;';
-			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0)
-				$badQuery[$row['table']] .= ' Using Temporary Table;';
+			if (strtoupper($row['type']) == 'ALL') {
+							$badQuery[$row['table']]  .=  ' Full Table Scan;';
+			}
+			if (empty($row['key'])) {
+							$badQuery[$row['table']] .= ' No Index Key Used;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using filesort') > 0) {
+							$badQuery[$row['table']] .= ' Using FileSort;';
+			}
+			if (!empty($row['Extra']) && substr_count($row['Extra'], 'Using temporary') > 0) {
+							$badQuery[$row['table']] .= ' Using Temporary Table;';
+			}
 		}
 
-		if ( empty($badQuery) )
-			return true;
+		if ( empty($badQuery) ) {
+					return true;
+		}
 
 		foreach($badQuery as $table=>$data ){
 			if(!empty($data)){
@@ -312,8 +321,7 @@ 
 				if(!empty($GLOBALS['sugar_config']['check_query_log'])){
 					$GLOBALS['log']->fatal($sql);
 					$GLOBALS['log']->fatal('CHECK QUERY:' .$warning);
-				}
-				else{
+				} else{
 					$GLOBALS['log']->warn('CHECK QUERY:' .$warning);
 				}
 			}
@@ -337,14 +345,18 @@ 
 			$matches = array();
 			preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*)\)|)( unsigned)?/i', $row['Type'], $matches);
 			$columns[$name]['type']=strtolower($matches[1][0]);
-			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) )
-				$columns[$name]['len']=strtolower($matches[2][0]);
-			if ( stristr($row['Extra'],'auto_increment') )
-				$columns[$name]['auto_increment'] = '1';
-			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI'))
-				$columns[$name]['required'] = 'true';
-			if (!empty($row['Default']) )
-				$columns[$name]['default'] = $row['Default'];
+			if ( isset($matches[2][0]) && in_array(strtolower($matches[1][0]),array('varchar','char','varchar2','int','decimal','float')) ) {
+							$columns[$name]['len']=strtolower($matches[2][0]);
+			}
+			if ( stristr($row['Extra'],'auto_increment') ) {
+							$columns[$name]['auto_increment'] = '1';
+			}
+			if ($row['Null'] == 'NO' && !stristr($row['Key'],'PRI')) {
+							$columns[$name]['required'] = 'true';
+			}
+			if (!empty($row['Default']) ) {
+							$columns[$name]['default'] = $row['Default'];
+			}
 		}
 		return $columns;
 	}
@@ -356,17 +368,20 @@ 
 	{
 		$field_array = array();
 
-		if(empty($result))
-			return 0;
+		if(empty($result)) {
+					return 0;
+		}
 
 		$fields = mysql_num_fields($result);
 		for ($i=0; $i < $fields; $i++) {
 			$meta = mysql_fetch_field($result, $i);
-			if (!$meta)
-				return array();
+			if (!$meta) {
+							return array();
+			}
 
-			if($make_lower_case == true)
-				$meta->name = strtolower($meta->name);
+			if($make_lower_case == true) {
+							$meta->name = strtolower($meta->name);
+			}
 
 			$field_array[] = $meta->name;
 		}
@@ -379,7 +394,9 @@ 
 	 */
 	public function fetchRow($result)
 	{
-		if (empty($result))	return false;
+		if (empty($result)) {
+		    return false;
+		}
 
 		return mysql_fetch_assoc($result);
 	}
@@ -423,7 +440,9 @@ 
 
 		if ($this->getDatabase()) {
 			$result = $this->query("SHOW TABLES LIKE ".$this->quoted($tableName));
-			if(empty($result)) return false;
+			if(empty($result)) {
+			    return false;
+			}
 			$row = $this->fetchByAssoc($result);
 			return !empty($row);
 		}
@@ -478,8 +497,9 @@ 
 	{
 		global $sugar_config;
 
-		if(is_null($configOptions))
-			$configOptions = $sugar_config['dbconfig'];
+		if(is_null($configOptions)) {
+					$configOptions = $sugar_config['dbconfig'];
+		}
 
 		if ($this->getOption('persistent')) {
 			$this->database = @mysql_pconnect(
@@ -532,8 +552,9 @@ 
 		}
 	    mysql_query($names, $this->database);
 
-		if(!$this->checkError('Could Not Connect:', $dieOnError))
-			$GLOBALS['log']->info("connected to db");
+		if(!$this->checkError('Could Not Connect:', $dieOnError)) {
+					$GLOBALS['log']->info("connected to db");
+		}
 		$this->connectOptions = $configOptions;
 
 		$GLOBALS['log']->info("Connect:".$this->database);
@@ -550,8 +571,9 @@ 
 	{
 		$sql = parent::repairTableParams($tablename,$fielddefs,$indices,false,$engine);
 
-		if ( $sql == '' )
-			return '';
+		if ( $sql == '' ) {
+					return '';
+		}
 
 		if ( stristr($sql,'create table') )
 		{
@@ -578,8 +600,9 @@ 
 		$sql = str_replace("\n","",$sql);
 		$sql = "ALTER TABLE $tablename $sql";
 
-		if ( $execute )
-			$this->query($sql,'Error with MySQL repair table');
+		if ( $execute ) {
+					$this->query($sql,'Error with MySQL repair table');
+		}
 
 		// and re-add the comments at the beginning
 		$sql = implode("\n",$commentBlocks) . "\n". $sql . "\n";
@@ -676,15 +699,18 @@ 
 	 */
 	protected function isEngineEnabled($engine)
 	{
-		if(!is_string($engine)) return false;
+		if(!is_string($engine)) {
+		    return false;
+		}
 
 		$engine = strtoupper($engine);
 
 		$r = $this->query("SHOW ENGINES");
 
-		while ( $row = $this->fetchByAssoc($r) )
-			if ( strtoupper($row['Engine']) == $engine )
+		while ( $row = $this->fetchByAssoc($r) ) {
+					if ( strtoupper($row['Engine']) == $engine )
 				return ($row['Support']=='YES' || $row['Support']=='DEFAULT');
+		}
 
 		return false;
 	}
@@ -712,18 +738,22 @@ 
 	*/
 	public function createTableSQLParams($tablename, $fieldDefs, $indices, $engine = null)
 	{
-		if ( empty($engine) && isset($fieldDefs['engine']))
-			$engine = $fieldDefs['engine'];
-		if ( !$this->isEngineEnabled($engine) )
-			$engine = '';
+		if ( empty($engine) && isset($fieldDefs['engine'])) {
+					$engine = $fieldDefs['engine'];
+		}
+		if ( !$this->isEngineEnabled($engine) ) {
+					$engine = '';
+		}
 
 		$columns = $this->columnSQLRep($fieldDefs, false, $tablename);
-		if (empty($columns))
-			return false;
+		if (empty($columns)) {
+					return false;
+		}
 
 		$keys = $this->keysSQL($indices);
-		if (!empty($keys))
-			$keys = ",$keys";
+		if (!empty($keys)) {
+					$keys = ",$keys";
+		}
 
 		// cn: bug 9873 - module tables do not get created in utf8 with assoc collation
 		$collation = $this->getOption('collation');
@@ -732,8 +762,9 @@ 
 		}
 		$sql = "CREATE TABLE $tablename ($columns $keys) CHARACTER SET utf8 COLLATE $collation";
 
-		if (!empty($engine))
-			$sql.= " ENGINE=$engine";
+		if (!empty($engine)) {
+					$sql.= " ENGINE=$engine";
+		}
 
 		return $sql;
 	}
@@ -762,13 +793,15 @@ 
 
 		// bug 22338 - don't set a default value on text or blob fields
 		if ( isset($ref['default']) &&
-            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob')))
-			    $ref['default'] = '';
+            in_array($ref['colBaseType'], array('text', 'blob', 'longtext', 'longblob'))) {
+					    $ref['default'] = '';
+		}
 
-		if ( $return_as_array )
-			return $ref;
-		else
-			return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		if ( $return_as_array ) {
+					return $ref;
+		} else {
+					return "{$ref['name']} {$ref['colType']} {$ref['default']} {$ref['required']} {$ref['auto_increment']}";
+		}
 	}
 
 	/**
@@ -779,16 +812,18 @@ 
 		$columns = array();
 		if ($this->isFieldArray($fieldDefs)){
 			foreach ($fieldDefs as $def){
-				if ($action == 'drop')
-					$columns[] = $def['name'];
-				else
-					$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				if ($action == 'drop') {
+									$columns[] = $def['name'];
+				} else {
+									$columns[] = $this->oneColumnSQLRep($def, $ignoreRequired);
+				}
 			}
 		} else {
-			if ($action == 'drop')
-				$columns[] = $fieldDefs['name'];
-		else
-			$columns[] = $this->oneColumnSQLRep($fieldDefs);
+			if ($action == 'drop') {
+							$columns[] = $fieldDefs['name'];
+			} else {
+					$columns[] = $this->oneColumnSQLRep($fieldDefs);
+		}
 		}
 
 		return "ALTER TABLE $tablename $action COLUMN ".implode(",$action column ", $columns);
@@ -810,23 +845,27 @@ 
 	{
 	// check if the passed value is an array of fields.
 	// if not, convert it into an array
-	if (!$this->isFieldArray($indices))
-		$indices[] = $indices;
+	if (!$this->isFieldArray($indices)) {
+			$indices[] = $indices;
+	}
 
 	$columns = array();
 	foreach ($indices as $index) {
-		if(!empty($index['db']) && $index['db'] != $this->dbType)
-			continue;
-		if (isset($index['source']) && $index['source'] != 'db')
-			continue;
+		if(!empty($index['db']) && $index['db'] != $this->dbType) {
+					continue;
+		}
+		if (isset($index['source']) && $index['source'] != 'db') {
+					continue;
+		}
 
 		$type = $index['type'];
 		$name = $index['name'];
 
-		if (is_array($index['fields']))
-			$fields = implode(", ", $index['fields']);
-		else
-			$fields = $index['fields'];
+		if (is_array($index['fields'])) {
+					$fields = implode(", ", $index['fields']);
+		} else {
+					$fields = $index['fields'];
+		}
 
 		switch ($type) {
 		case 'unique':
@@ -845,16 +884,18 @@ 
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
+			if ( $alter_table ) {
+							$columns[] = " INDEX $name ($fields)";
+			} else {
+							$columns[] = " KEY $name ($fields)";
+			}
 			break;
 		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			if ($this->full_text_indexing_installed()) {
+							$columns[] = " FULLTEXT ($fields)";
+			} else {
+							$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			}
 			break;
 		}
 	}
@@ -896,8 +937,9 @@ 
 	{
 		$result = $this->query("SHOW TABLE STATUS LIKE '$table'");
 		$row = $this->fetchByAssoc($result);
-		if (!empty($row['Auto_increment']))
-			return $row['Auto_increment'];
+		if (!empty($row['Auto_increment'])) {
+					return $row['Auto_increment'];
+		}
 
 		return "";
 	}
@@ -915,8 +957,7 @@ 
 			$index_type='index';
 			if ($row['Key_name'] =='PRIMARY') {
 				$index_type='primary';
-			}
-			elseif ( $row['Non_unique'] == '0' ) {
+			} elseif ( $row['Non_unique'] == '0' ) {
 				$index_type='unique';
 			}
 			$name = strtolower($row['Key_name']);
@@ -942,29 +983,33 @@ 
 		case 'index':
 		case 'alternate_key':
 		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			}
 			break;
 		// constraints as indices
 		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP INDEX $name";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			}
 			break;
 		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			}
 			break;
 		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			if ($drop) {
+							$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			} else {
+							$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			}
 			break;
 		}
 		return $sql;
@@ -1007,22 +1052,30 @@ 
 			($fieldDef['dbType'] == 'text'
 				|| $fieldDef['dbType'] == 'blob'
 				|| $fieldDef['dbType'] == 'longtext'
-				|| $fieldDef['dbType'] == 'longblob' ))
-			unset($fieldDef['default']);
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'ulong')
-			$fieldDef['len'] = '20';
-		if ($fieldDef['dbType'] == 'bool')
-			$fieldDef['type'] = 'tinyint';
-		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) )
-			$fieldDef['default'] = '0';
-		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) )
-			$fieldDef['len'] = '255';
-		if ($fieldDef['dbType'] == 'uint')
-			$fieldDef['len'] = '10';
-		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) )
-			$fieldDef['len'] = '11';
+				|| $fieldDef['dbType'] == 'longblob' )) {
+					unset($fieldDef['default']);
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'ulong') {
+					$fieldDef['len'] = '20';
+		}
+		if ($fieldDef['dbType'] == 'bool') {
+					$fieldDef['type'] = 'tinyint';
+		}
+		if ($fieldDef['dbType'] == 'bool' && empty($fieldDef['default']) ) {
+					$fieldDef['default'] = '0';
+		}
+		if (($fieldDef['dbType'] == 'varchar' || $fieldDef['dbType'] == 'enum') && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = '255';
+		}
+		if ($fieldDef['dbType'] == 'uint') {
+					$fieldDef['len'] = '10';
+		}
+		if ($fieldDef['dbType'] == 'int' && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = '11';
+		}
 
 		if($fieldDef['dbType'] == 'decimal') {
 			if(isset($fieldDef['len'])) {
@@ -1062,8 +1115,9 @@ 
 		}
 		if (!empty($sql)) {
             $sql = "ALTER TABLE $tablename " . join(",", $sql) . ";";
-			if($execute)
-				$this->query($sql);
+			if($execute) {
+							$this->query($sql);
+			}
 		} else {
 			$sql = '';
 		}

include/MVC/Controller/SugarController.php

Indentation +12 added lines, -13 removed lines

@@ -3,8 +3,7 @@ 
  *
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
-
-* * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
+ * * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
  * Copyright (C) 2011 - 2017 SalesAgility Ltd.
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -174,12 +173,12 @@ 
      */
     protected $action_view_map = array();
 
-	/**
-	 * This can be set from the application to tell us whether we have authorization to
-	 * process the action. If this is set we will default to the noaccess view.
-	 *@var bool
+    /**
+     * This can be set from the application to tell us whether we have authorization to
+     * process the action. If this is set we will default to the noaccess view.
+     *@var bool
      */
-	public $hasAccess ;
+    public $hasAccess ;
 
     /**
      * Map case sensitive filenames to action.  This is used for linux/unix systems
@@ -191,12 +190,12 @@ 
         'listview' => 'ListView'
     );
 
-	/**
-	 * Constructor. This ie meant to load up the module, action, record as well
-	 * as the mapping arrays.
-	 */
-	public function __construct()
-	{
+    /**
+     * Constructor. This ie meant to load up the module, action, record as well
+     * as the mapping arrays.
+     */
+    public function __construct()
+    {
         $this->hasAccess = true;}
 
     /**

Spacing +44 added lines, -49 removed lines

@@ -179,7 +179,7 @@ 
 	 * process the action. If this is set we will default to the noaccess view.
 	 *@var bool
      */
-	public $hasAccess ;
+	public $hasAccess;
 
     /**
      * Map case sensitive filenames to action.  This is used for linux/unix systems
@@ -197,7 +197,7 @@ 
 	 */
 	public function __construct()
 	{
-        $this->hasAccess = true;}
+        $this->hasAccess = true; }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -328,24 +328,24 @@ 
      */
     private function loadMapping($var, $merge = false)
     {
-        $$var = sugar_cache_retrieve("CONTROLLER_" . $var . "_" . $this->module);
+        $$var = sugar_cache_retrieve("CONTROLLER_".$var."_".$this->module);
         if (!$$var) {
             if ($merge && !empty($this->$var)) {
                 $$var = $this->$var;
             } else {
                 $$var = array();
             }
-            if (file_exists('include/MVC/Controller/' . $var . '.php')) {
-                require('include/MVC/Controller/' . $var . '.php');
+            if (file_exists('include/MVC/Controller/'.$var.'.php')) {
+                require('include/MVC/Controller/'.$var.'.php');
             }
-            if (file_exists('modules/' . $this->module . '/' . $var . '.php')) {
-                require('modules/' . $this->module . '/' . $var . '.php');
+            if (file_exists('modules/'.$this->module.'/'.$var.'.php')) {
+                require('modules/'.$this->module.'/'.$var.'.php');
             }
-            if (file_exists('custom/modules/' . $this->module . '/' . $var . '.php')) {
-                require('custom/modules/' . $this->module . '/' . $var . '.php');
+            if (file_exists('custom/modules/'.$this->module.'/'.$var.'.php')) {
+                require('custom/modules/'.$this->module.'/'.$var.'.php');
             }
-            if (file_exists('custom/include/MVC/Controller/' . $var . '.php')) {
-                require('custom/include/MVC/Controller/' . $var . '.php');
+            if (file_exists('custom/include/MVC/Controller/'.$var.'.php')) {
+                require('custom/include/MVC/Controller/'.$var.'.php');
             }
 
             // entry_point_registry -> EntryPointRegistry
@@ -358,7 +358,7 @@ 
                 require("custom/modules/{$this->module}/Ext/$varname/$var.ext.php");
             }
 
-            sugar_cache_put("CONTROLLER_" . $var . "_" . $this->module, $$var);
+            sugar_cache_put("CONTROLLER_".$var."_".$this->module, $$var);
         }
         $this->$var = $$var;
     }
@@ -376,7 +376,7 @@ 
             } elseif (!empty($this->redirect_url)) {
                 $this->redirect();
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->handleException($e);
         }
 
@@ -385,8 +385,8 @@ 
 
     protected function showException(Exception $e)
     {
-        $GLOBALS['log']->fatal('Exception in Controller: ' . $e->getMessage());
-        $GLOBALS['log']->fatal("backtrace:\n" . $e->getTraceAsString());
+        $GLOBALS['log']->fatal('Exception in Controller: '.$e->getMessage());
+        $GLOBALS['log']->fatal("backtrace:\n".$e->getTraceAsString());
         if ($prev = $e->getPrevious()) {
             $GLOBALS['log']->fatal("Previous:\n");
             $this->showException($prev);
@@ -399,7 +399,7 @@ 
      */
     protected function handleException(Exception $e)
     {
-        $GLOBALS['log']->fatal("Exception handling in " . __FILE__ . ':' . __LINE__);
+        $GLOBALS['log']->fatal("Exception handling in ".__FILE__.':'.__LINE__);
         $this->showException($e);
         $logicHook = new LogicHook();
 
@@ -519,7 +519,7 @@ 
 
         $function = $this->getActionMethodName();
         if ($this->hasFunction($function)) {
-            $GLOBALS['log']->debug('Performing action: ' . $function . ' MODULE: ' . $this->module);
+            $GLOBALS['log']->debug('Performing action: '.$function.' MODULE: '.$this->module);
             $this->$function();
 
             return true;
@@ -581,7 +581,7 @@ 
      */
     protected function getPreActionMethodName()
     {
-        return 'pre_' . $this->action;
+        return 'pre_'.$this->action;
     }
 
     /**
@@ -590,7 +590,7 @@ 
      */
     protected function getActionMethodName()
     {
-        return 'action_' . strtolower($this->do_action);
+        return 'action_'.strtolower($this->do_action);
     }
 
     /**
@@ -599,7 +599,7 @@ 
      */
     protected function getPostActionMethodName()
     {
-        return 'post_' . strtolower($this->action);
+        return 'post_'.strtolower($this->action);
     }
 
     /**
@@ -655,7 +655,7 @@ 
                 }
                 $this->bean->$field = $_POST[$field];
             } else {
-                if (!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field . '_multiselect'])) {
+                if (!empty($properties['isMultiSelect']) && !isset($_POST[$field]) && isset($_POST[$field.'_multiselect'])) {
                     $this->bean->$field = '';
                 }
             }
@@ -699,7 +699,7 @@ 
         $action = (!empty($this->return_action) ? $this->return_action : 'DetailView');
         $id = (!empty($this->return_id) ? $this->return_id : $this->bean->id);
 
-        $url = "index.php?module=" . $module . "&action=" . $action . "&record=" . $id;
+        $url = "index.php?module=".$module."&action=".$action."&record=".$id;
         $this->set_redirect($url);
     }
 
@@ -732,22 +732,19 @@ 
     {
         if (empty($_REQUEST['return_url'])) {
             $return_module = isset($_REQUEST['return_module']) ?
-                $_REQUEST['return_module'] :
-                $GLOBALS['sugar_config']['default_module'];
+                $_REQUEST['return_module'] : $GLOBALS['sugar_config']['default_module'];
             $return_action = isset($_REQUEST['return_action']) ?
-                $_REQUEST['return_action'] :
-                $GLOBALS['sugar_config']['default_action'];
+                $_REQUEST['return_action'] : $GLOBALS['sugar_config']['default_action'];
             $return_id = isset($_REQUEST['return_id']) ?
-                $_REQUEST['return_id'] :
-                '';
-            $url = "index.php?module=" . $return_module . "&action=" . $return_action . "&record=" . $return_id;
+                $_REQUEST['return_id'] : '';
+            $url = "index.php?module=".$return_module."&action=".$return_action."&record=".$return_id;
         } else {
             $url = $_REQUEST['return_url'];
         }
 
         //eggsurplus Bug 23816: maintain VCR after an edit/save. If it is a duplicate then don't worry about it. The offset is now worthless.
         if (isset($_REQUEST['offset']) && empty($_REQUEST['duplicateSave'])) {
-            $url .= "&offset=" . $_REQUEST['offset'];
+            $url .= "&offset=".$_REQUEST['offset'];
         }
 
         $this->set_redirect($url);
@@ -766,7 +763,7 @@ 
                 sugar_cleanup(true);
             }
 
-            set_time_limit(0);//I'm wondering if we will set it never goes timeout here.
+            set_time_limit(0); //I'm wondering if we will set it never goes timeout here.
             // until we have more efficient way of handling MU, we have to disable the limit
             $GLOBALS['db']->setQueryLimit(0);
             require_once("include/MassUpdate.php");
@@ -778,7 +775,7 @@ 
                 $mass->generateSearchWhere($_REQUEST['module'], $_REQUEST['current_query_by_page']);
             }
             $mass->handleMassUpdate();
-            $storeQuery = new StoreQuery();//restore the current search. to solve bug 24722 for multi tabs massupdate.
+            $storeQuery = new StoreQuery(); //restore the current search. to solve bug 24722 for multi tabs massupdate.
             $temp_req = array(
                 'current_query_by_page' => $_REQUEST['current_query_by_page'],
                 'return_module' => $_REQUEST['return_module'],
@@ -794,12 +791,12 @@ 
             }
             $_REQUEST = array();
             $_REQUEST = json_decode(html_entity_decode($temp_req['current_query_by_page']), true);
-            unset($_REQUEST[$seed->module_dir . '2_' . strtoupper($seed->object_name) . '_offset']);//after massupdate, the page should redirect to no offset page
+            unset($_REQUEST[$seed->module_dir.'2_'.strtoupper($seed->object_name).'_offset']); //after massupdate, the page should redirect to no offset page
             $storeQuery->saveFromRequest($_REQUEST['module']);
             $_REQUEST = array(
                 'return_module' => $temp_req['return_module'],
                 'return_action' => $temp_req['return_action']
-            );//for post_massupdate, to go back to original page.
+            ); //for post_massupdate, to go back to original page.
         } else {
             sugar_die("You must massupdate at least one record");
         }
@@ -811,15 +808,13 @@ 
     protected function post_massupdate()
     {
         $return_module = isset($_REQUEST['return_module']) ?
-            $_REQUEST['return_module'] :
-            $GLOBALS['sugar_config']['default_module'];
+            $_REQUEST['return_module'] : $GLOBALS['sugar_config']['default_module'];
         $return_action = isset($_REQUEST['return_action']) ?
-            $_REQUEST['return_action'] :
-            $GLOBALS['sugar_config']['default_action'];
-        $url = "index.php?module=" . $return_module . "&action=" . $return_action;
+            $_REQUEST['return_action'] : $GLOBALS['sugar_config']['default_action'];
+        $url = "index.php?module=".$return_module."&action=".$return_action;
         if ($return_module == 'Emails') {//specificly for My Achieves
             if (!empty($this->req_for_email['type']) && !empty($this->req_for_email['ie_assigned_user_id'])) {
-                $url = $url . "&type=" . $this->req_for_email['type'] . "&assigned_user_id=" . $this->req_for_email['ie_assigned_user_id'];
+                $url = $url."&type=".$this->req_for_email['type']."&assigned_user_id=".$this->req_for_email['ie_assigned_user_id'];
             }
         }
         $this->set_redirect($url);
@@ -893,8 +888,8 @@ 
             } else { // display options
                 $json = getJSONobj();
 
-                return 'result = ' . $json->encode((array(
-                        'header' => $dashlet->title . ' : ' . $mod_strings['LBL_OPTIONS'],
+                return 'result = '.$json->encode((array(
+                        'header' => $dashlet->title.' : '.$mod_strings['LBL_OPTIONS'],
                         'body' => $dashlet->displayOptions()
                     )));
 
@@ -1054,15 +1049,15 @@ 
             $action = 'list';
         }
 
-        if ((file_exists('modules/' . $this->module . '/' . $file . '.php')
-                && !file_exists('modules/' . $this->module . '/views/view.' . $action . '.php'))
-            || (file_exists('custom/modules/' . $this->module . '/' . $file . '.php')
-                && !file_exists('custom/modules/' . $this->module . '/views/view.' . $action . '.php'))
+        if ((file_exists('modules/'.$this->module.'/'.$file.'.php')
+                && !file_exists('modules/'.$this->module.'/views/view.'.$action.'.php'))
+            || (file_exists('custom/modules/'.$this->module.'/'.$file.'.php')
+                && !file_exists('custom/modules/'.$this->module.'/views/view.'.$action.'.php'))
         ) {
             // A 'classic' module, using the old pre-MVC display files
             // We should now discard the bean we just obtained for tracking as the pre-MVC module will instantiate its own
             unset($GLOBALS['FOCUS']);
-            $GLOBALS['log']->debug('Module:' . $this->module . ' using file: ' . $file);
+            $GLOBALS['log']->debug('Module:'.$this->module.' using file: '.$file);
             $this->action_default();
             $this->_processed = true;
         }
@@ -1077,11 +1072,11 @@ 
     {
         if (!empty($this->action_file_map[strtolower($this->do_action)])) {
             $this->view = '';
-            $GLOBALS['log']->debug('Using Action File Map:' . $this->action_file_map[strtolower($this->do_action)]);
+            $GLOBALS['log']->debug('Using Action File Map:'.$this->action_file_map[strtolower($this->do_action)]);
             require_once($this->action_file_map[strtolower($this->do_action)]);
             $this->_processed = true;
         } elseif (!empty($this->action_view_map[strtolower($this->do_action)])) {
-            $GLOBALS['log']->debug('Using Action View Map:' . $this->action_view_map[strtolower($this->do_action)]);
+            $GLOBALS['log']->debug('Using Action View Map:'.$this->action_view_map[strtolower($this->do_action)]);
             $this->view = $this->action_view_map[strtolower($this->do_action)];
             $this->_processed = true;
         } else {

include/generic/DeleteRelationship.php

Indentation +25 added lines, -25 removed lines

@@ -62,42 +62,42 @@
 
 require_once('include/formbase.php');
 
- global $beanFiles,$beanList;
- $bean_name = $beanList[$_REQUEST['module']];
- require_once($beanFiles[$bean_name]);
- $focus = new $bean_name();
- if (  empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field'])  || empty($_REQUEST['record'])){
-
-	die("need linked_field, linked_id and record fields");
- }
- $linked_field = $_REQUEST['linked_field'];
- $record = $_REQUEST['record'];
- $linked_id = $_REQUEST['linked_id'];
- if ($linked_field === 'aclroles') {
+    global $beanFiles,$beanList;
+    $bean_name = $beanList[$_REQUEST['module']];
+    require_once($beanFiles[$bean_name]);
+    $focus = new $bean_name();
+    if (  empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field'])  || empty($_REQUEST['record'])){
+
+    die("need linked_field, linked_id and record fields");
+    }
+    $linked_field = $_REQUEST['linked_field'];
+    $record = $_REQUEST['record'];
+    $linked_id = $_REQUEST['linked_id'];
+    if ($linked_field === 'aclroles') {
     if (!ACLController::checkAccess($bean_name, 'edit', true)) {
         ACLController::displayNoAccess();
         sugar_cleanup(true);
     }
 }if($linked_field === 'aclroles') {
     if (!ACLController::checkAccess($bean_name , 'edit', true)) {
- ACLController::displayNoAccess();
+    ACLController::displayNoAccess();
         sugar_cleanup(true);
     }
 }
 
 if ($bean_name === 'Team'){
- 	$focus->retrieve($record);
- 	$focus->remove_user_from_team($linked_id);
- }
- else{
-
- 	// cut it off:
- 	$focus->load_relationship($linked_field);
- 	if($focus->$linked_field->_relationship->relationship_name === 'quotes_contacts_shipto'){
- 		unset($focus->$linked_field->_relationship->relationship_role_column);}
- 	$focus->$linked_field->delete($record,$linked_id);
- }
- if ($bean_name === 'Campaign' and $linked_field==='prospectlists' ) {
+        $focus->retrieve($record);
+        $focus->remove_user_from_team($linked_id);
+    }
+    else{
+
+        // cut it off:
+        $focus->load_relationship($linked_field);
+        if($focus->$linked_field->_relationship->relationship_name === 'quotes_contacts_shipto'){
+            unset($focus->$linked_field->_relationship->relationship_role_column);}
+        $focus->$linked_field->delete($record,$linked_id);
+    }
+    if ($bean_name === 'Campaign' and $linked_field==='prospectlists' ) {
 
     $query = "SELECT email_marketing_prospect_lists.id from email_marketing_prospect_lists ";
     $query .= " left join email_marketing on email_marketing.id=email_marketing_prospect_lists.email_marketing_id";

Spacing +11 added lines, -11 removed lines

@@ -62,11 +62,11 @@ 
 
 require_once('include/formbase.php');
 
- global $beanFiles,$beanList;
+ global $beanFiles, $beanList;
  $bean_name = $beanList[$_REQUEST['module']];
  require_once($beanFiles[$bean_name]);
  $focus = new $bean_name();
- if (  empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field'])  || empty($_REQUEST['record'])){
+ if (empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field']) || empty($_REQUEST['record'])) {
 
 	die("need linked_field, linked_id and record fields");
  }
@@ -78,26 +78,26 @@ 
         ACLController::displayNoAccess();
         sugar_cleanup(true);
     }
-}if($linked_field === 'aclroles') {
-    if (!ACLController::checkAccess($bean_name , 'edit', true)) {
+}if ($linked_field === 'aclroles') {
+    if (!ACLController::checkAccess($bean_name, 'edit', true)) {
  ACLController::displayNoAccess();
         sugar_cleanup(true);
     }
 }
 
-if ($bean_name === 'Team'){
+if ($bean_name === 'Team') {
  	$focus->retrieve($record);
  	$focus->remove_user_from_team($linked_id);
  }
- else{
+ else {
 
  	// cut it off:
  	$focus->load_relationship($linked_field);
- 	if($focus->$linked_field->_relationship->relationship_name === 'quotes_contacts_shipto'){
- 		unset($focus->$linked_field->_relationship->relationship_role_column);}
- 	$focus->$linked_field->delete($record,$linked_id);
+ 	if ($focus->$linked_field->_relationship->relationship_name === 'quotes_contacts_shipto') {
+ 		unset($focus->$linked_field->_relationship->relationship_role_column); }
+ 	$focus->$linked_field->delete($record, $linked_id);
  }
- if ($bean_name === 'Campaign' and $linked_field==='prospectlists' ) {
+ if ($bean_name === 'Campaign' and $linked_field === 'prospectlists') {
 
     $query = "SELECT email_marketing_prospect_lists.id from email_marketing_prospect_lists ";
     $query .= " left join email_marketing on email_marketing.id=email_marketing_prospect_lists.email_marketing_id";
@@ -106,7 +106,7 @@ 
 
     $result = $focus->db->query($query);
     while (($row = $focus->db->fetchByAssoc($result)) != null) {
-        $del_query = " update email_marketing_prospect_lists set email_marketing_prospect_lists.deleted=1, email_marketing_prospect_lists.date_modified=" . $focus->db->convert("'" . TimeDate::getInstance()->nowDb() . "'",
+        $del_query = " update email_marketing_prospect_lists set email_marketing_prospect_lists.deleted=1, email_marketing_prospect_lists.date_modified=".$focus->db->convert("'".TimeDate::getInstance()->nowDb()."'",
                 'datetime');
         $del_query .= " WHERE  email_marketing_prospect_lists.id='{$row['id']}'";
         $focus->db->query($del_query);

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 if ($bean_name === 'Team'){
  	$focus->retrieve($record);
  	$focus->remove_user_from_team($linked_id);
- }
- else{
+ } else{
 
  	// cut it off:
  	$focus->load_relationship($linked_field);

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php

Indentation +41 added lines, -41 removed lines

@@ -60,50 +60,50 @@
         $parent_record_id = $_REQUEST['record'];
         $parent_module = $_REQUEST['module'];
 
-		$action = 'DeleteRelationship';
-		$record = $layout_def['fields']['ID'];
-		$current_module=$layout_def['module'];
-		//in document revisions subpanel ,users are now allowed to 
-		//delete the latest revsion of a document. this will be tested here
-		//and if the condition is met delete button will be removed.
-		$hideremove=false;
-		if ($current_module==='DocumentRevisions') {
-			if ($layout_def['fields']['ID']===$layout_def['fields']['LATEST_REVISION_ID']) {
-				$hideremove=true;
-			}
-		}elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
-		// Implicit Team-memberships are not "removeable"
-
-			if($layout_def['fields']['UPLINE'] !== translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
-				$hideremove = true;
-			}
-
-			//We also cannot remove the user whose private team is set to the parent_record_id value
-			$user = new User();
-			$user->retrieve($layout_def['fields']['ID']);
-			if($parent_record_id === $user->getPrivateTeamID()){
-
-			    $hideremove = true;
-			}} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
+        $action = 'DeleteRelationship';
+        $record = $layout_def['fields']['ID'];
+        $current_module=$layout_def['module'];
+        //in document revisions subpanel ,users are now allowed to 
+        //delete the latest revsion of a document. this will be tested here
+        //and if the condition is met delete button will be removed.
+        $hideremove=false;
+        if ($current_module==='DocumentRevisions') {
+            if ($layout_def['fields']['ID']===$layout_def['fields']['LATEST_REVISION_ID']) {
+                $hideremove=true;
+            }
+        }elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
+        // Implicit Team-memberships are not "removeable"
+
+            if($layout_def['fields']['UPLINE'] !== translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
+                $hideremove = true;
+            }
+
+            //We also cannot remove the user whose private team is set to the parent_record_id value
+            $user = new User();
+            $user->retrieve($layout_def['fields']['ID']);
+            if($parent_record_id === $user->getPrivateTeamID()){
+
+                $hideremove = true;
+            }} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
             $hideremove = true;
-		}elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
+        }elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
             $hideremove = true;
-		}
+        }
 		
-		$return_module = $_REQUEST['module'];
-		$return_action = 'SubPanelViewer';
-		$subpanel = $layout_def['subpanel_id'];
-		$return_id = $_REQUEST['record'];
-		if (isset($layout_def['linked_field_set']) && !empty($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'])){
-			$refresh_page = 1;
-		}
-		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
+        $return_module = $_REQUEST['module'];
+        $return_action = 'SubPanelViewer';
+        $subpanel = $layout_def['subpanel_id'];
+        $return_id = $_REQUEST['record'];
+        if (isset($layout_def['linked_field_set']) && !empty($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'])){
+            $refresh_page = 1;
+        }
+        $return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
 
         $icon_remove_text = $app_strings['LBL_ID_FF_REMOVE'];
 

Spacing +10 added lines, -10 removed lines

@@ -55,33 +55,33 @@ 
         global $app_strings;
         global $subpanel_item_count;
 
-        $unique_id = $layout_def['subpanel_id'] . "_remove_" . $subpanel_item_count; //bug 51512
+        $unique_id = $layout_def['subpanel_id']."_remove_".$subpanel_item_count; //bug 51512
 
         $parent_record_id = $_REQUEST['record'];
         $parent_module = $_REQUEST['module'];
 
 		$action = 'DeleteRelationship';
 		$record = $layout_def['fields']['ID'];
-		$current_module=$layout_def['module'];
+		$current_module = $layout_def['module'];
 		//in document revisions subpanel ,users are now allowed to 
 		//delete the latest revsion of a document. this will be tested here
 		//and if the condition is met delete button will be removed.
-		$hideremove=false;
-		if ($current_module==='DocumentRevisions') {
-			if ($layout_def['fields']['ID']===$layout_def['fields']['LATEST_REVISION_ID']) {
-				$hideremove=true;
+		$hideremove = false;
+		if ($current_module === 'DocumentRevisions') {
+			if ($layout_def['fields']['ID'] === $layout_def['fields']['LATEST_REVISION_ID']) {
+				$hideremove = true;
 			}
 		}elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
 		// Implicit Team-memberships are not "removeable"
 
-			if($layout_def['fields']['UPLINE'] !== translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
+			if ($layout_def['fields']['UPLINE'] !== translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
 				$hideremove = true;
 			}
 
 			//We also cannot remove the user whose private team is set to the parent_record_id value
 			$user = new User();
 			$user->retrieve($layout_def['fields']['ID']);
-			if($parent_record_id === $user->getPrivateTeamID()){
+			if ($parent_record_id === $user->getPrivateTeamID()) {
 
 			    $hideremove = true;
 			}} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
@@ -95,12 +95,12 @@ 
 		$subpanel = $layout_def['subpanel_id'];
 		$return_id = $_REQUEST['record'];
 		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&inline=1";

Braces +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 			if ($layout_def['fields']['ID']===$layout_def['fields']['LATEST_REVISION_ID']) {
 				$hideremove=true;
 			}
-		}elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
+		} elseif ($_REQUEST['module'] === 'Teams' && $current_module === 'Users') {
 		// Implicit Team-memberships are not "removeable"
 
 			if($layout_def['fields']['UPLINE'] !== translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
@@ -86,7 +86,7 @@ 
 			    $hideremove = true;
 			}} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
             $hideremove = true;
-		}elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
+		} elseif ($current_module === 'ACLRoles' && (!ACLController::checkAccess($current_module, 'edit', true))) {
             $hideremove = true;
 		}
 		

include/TemplateHandler/TemplateHandler.php

Spacing +41 added lines, -41 removed lines

@@ -114,7 +114,7 @@ 
      */
     public static function clearCache($module, $view = '')
     {
-        $cacheDir = create_cache_directory('modules/' . $module . '/');
+        $cacheDir = create_cache_directory('modules/'.$module.'/');
         $d = dir($cacheDir);
         while ($e = $d->read()) {
             if (!empty($view) && $e !== $view) {
@@ -122,8 +122,8 @@ 
             }
 
             $end = strlen($e) - 4;
-            if (is_file($cacheDir . $e) && $end > 1 && substr($e, $end) === '.tpl') {
-                unlink($cacheDir . $e);
+            if (is_file($cacheDir.$e) && $end > 1 && substr($e, $end) === '.tpl') {
+                unlink($cacheDir.$e);
             }
         }
 
@@ -134,10 +134,10 @@ 
          * The tpl files for each theme should be cleared for consistency.
          */
         $cacheDir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
-        $themesDir = array_filter(glob($cacheDir . '/themes/*'), 'is_dir');
+        $themesDir = array_filter(glob($cacheDir.'/themes/*'), 'is_dir');
 
         foreach ($themesDir as $theme) {
-            $tplDir = $theme . '/modules/' . $module . '/';
+            $tplDir = $theme.'/modules/'.$module.'/';
             if (!file_exists($tplDir)) {
                 continue;
             }
@@ -148,8 +148,8 @@ 
                 }
 
                 $end = strlen($e) - 4;
-                if ($end > 1 && is_file($tplDir . $e) && substr($e, $end) === '.tpl') {
-                    unlink($tplDir . $e);
+                if ($end > 1 && is_file($tplDir.$e) && substr($e, $end) === '.tpl') {
+                    unlink($tplDir.$e);
                 }
             }
         }
@@ -171,8 +171,8 @@ 
         global $theme;
 
         $this->loadSmarty();
-        $cacheDir = create_cache_directory($this->themeDir . $theme . '/' . $this->templateDir . $module . '/');
-        $file = $cacheDir . $view . '.tpl';
+        $cacheDir = create_cache_directory($this->themeDir.$theme.'/'.$this->templateDir.$module.'/');
+        $file = $cacheDir.$view.'.tpl';
         $this->ss->left_delimiter = '{{';
         $this->ss->right_delimiter = '}}';
         $this->ss->assign('module', $module);
@@ -257,7 +257,7 @@ 
 
             $validatedFields = array();
             $javascript->addToValidateBinaryDependency('assigned_user_name', 'alpha',
-                $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD') . ': ' . $javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'),
+                $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty('LBL_ASSIGNED_TO'),
                 'false', '', 'assigned_user_id');
             $validatedFields[] = 'assigned_user_name';
             //Add remaining validation dependency for related fields
@@ -284,7 +284,7 @@ 
                         $vname = "undefined";
                     }
                     $javascript->addToValidateBinaryDependency($name, 'alpha',
-                        $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD') . ': ' . $javascript->buildStringToTranslateInSmarty($vname),
+                        $javascript->buildStringToTranslateInSmarty('ERR_SQS_NO_MATCH_FIELD').': '.$javascript->buildStringToTranslateInSmarty($vname),
                         (!empty($def['required']) ? 'true' : 'false'), '', $def['id_name']);
                     $validatedFields[] = $name;
                 }
@@ -340,7 +340,7 @@ 
         }
         $view = $checkFormName ? $formName : $view;
 
-        return file_exists($this->cacheDir . $this->themeDir . $theme . '/' . $this->templateDir . $module . '/' . $view . '.tpl');
+        return file_exists($this->cacheDir.$this->themeDir.$theme.'/'.$this->templateDir.$module.'/'.$view.'.tpl');
     }
 
     /**
@@ -360,14 +360,14 @@ 
         if (!$this->checkTemplate($module, $view)) {
             $this->buildTemplate($module, $view, $tpl, $ajaxSave, $metaDataDefs);
         }
-        $file = $this->cacheDir . $this->themeDir . $theme . '/' . $this->templateDir . $module . '/' . $view . '.tpl';
+        $file = $this->cacheDir.$this->themeDir.$theme.'/'.$this->templateDir.$module.'/'.$view.'.tpl';
         if (file_exists($file)) {
             return $this->ss->fetch($file);
         } else {
             global $app_strings;
-            $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'] . ": $file");
+            $GLOBALS['log']->fatal($app_strings['ERR_NO_SUCH_FILE'].": $file");
 
-            return $app_strings['ERR_NO_SUCH_FILE'] . ": $file";
+            return $app_strings['ERR_NO_SUCH_FILE'].": $file";
         }
     }
 
@@ -381,15 +381,15 @@ 
     public function deleteTemplate($module, $view)
     {
         global $theme;
-        if (is_file($this->cacheDir . $this->themeDir . $theme . '/' . $this->templateDir . $module . '/' . $view . '.tpl')) {
+        if (is_file($this->cacheDir.$this->themeDir.$theme.'/'.$this->templateDir.$module.'/'.$view.'.tpl')) {
             // Bug #54634 : RTC 18144 : Cannot add more than 1 user to role but popup is multi-selectable
             if (!isset($this->ss)) {
                 $this->loadSmarty();
             }
-            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir . $this->themeDir . $theme . '/' . $this->templateDir . $module . '/' . $view . '.tpl');
+            $cache_file_name = $this->ss->_get_compile_path($this->cacheDir.$this->themeDir.$theme.'/'.$this->templateDir.$module.'/'.$view.'.tpl');
             SugarCache::cleanFile($cache_file_name);
 
-            return unlink($this->cacheDir . $this->themeDir . $theme . '/' . $this->templateDir . $module . '/' . $view . '.tpl');
+            return unlink($this->cacheDir.$this->themeDir.$theme.'/'.$this->templateDir.$module.'/'.$view.'.tpl');
         }
 
         return false;
@@ -430,7 +430,7 @@ 
             //Loop through the Meta-Data fields to see which ones need quick search support
             foreach ($defs as $f) {
                 $field = $f;
-                $name = $qsd->form_name . '_' . $field['name'];
+                $name = $qsd->form_name.'_'.$field['name'];
 
                 if (($field['type'] === 'relate' &&
                         isset($field['module']) &&
@@ -441,20 +441,20 @@ 
                     if (preg_match('/^(Campaigns|Teams|Users|Contacts|Accounts)$/si', $field['module'], $matches)) {
 
                         if ($matches[0] === 'Campaigns') {
-                            $sqs_objects[$name . '_' . $parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign',
+                            $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns', 'Campaign',
                                 $field['name'], $field['id_name'], $field['id_name']);
                         } else {
                             if ($matches[0] === 'Users') {
 
                                 if (!empty($f['name']) && !empty($f['id_name'])) {
-                                    $sqs_objects[$name . '_' . $parsedView] = $qsd->getQSUser($f['name'],
+                                    $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser($f['name'],
                                         $f['id_name']);
                                 } else {
-                                    $sqs_objects[$name . '_' . $parsedView] = $qsd->getQSUser();
+                                    $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSUser();
                                 }
                             } else {
                                 if ($matches[0] === 'Campaigns') {
-                                    $sqs_objects[$name . '_' . $parsedView] = $qsd->loadQSObject('Campaigns',
+                                    $sqs_objects[$name.'_'.$parsedView] = $qsd->loadQSObject('Campaigns',
                                         'Campaign', $field['name'], $field['id_name'], $field['id_name']);
                                 } else {
                                     if ($matches[0] === 'Accounts') {
@@ -469,11 +469,11 @@ 
                                         $billingKey = isset($f['displayParams']['billingKey']) ? $f['displayParams']['billingKey'] : null;
                                         $shippingKey = isset($f['displayParams']['shippingKey']) ? $f['displayParams']['shippingKey'] : null;
                                         $additionalFields = isset($f['displayParams']['additionalFields']) ? $f['displayParams']['additionalFields'] : null;
-                                        $sqs_objects[$name . '_' . $parsedView] = $qsd->getQSAccount($nameKey, $idKey,
+                                        $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSAccount($nameKey, $idKey,
                                             $billingKey, $shippingKey, $additionalFields);
                                     } else {
                                         if ($matches[0] === 'Contacts') {
-                                            $sqs_objects[$name . '_' . $parsedView] = $qsd->getQSContact($field['name'],
+                                            $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSContact($field['name'],
                                                 $field['id_name']);
                                         }
                                     }
@@ -481,28 +481,28 @@ 
                             }
                         }
                     } else {
-                        $sqs_objects[$name . '_' . $parsedView] = $qsd->getQSParent($field['module']);
+                        $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent($field['module']);
                         if (!isset($field['field_list']) && !isset($field['populate_list'])) {
-                            $sqs_objects[$name . '_' . $parsedView]['populate_list'] = array(
+                            $sqs_objects[$name.'_'.$parsedView]['populate_list'] = array(
                                 $field['name'],
                                 $field['id_name']
                             );
-                            $sqs_objects[$name . '_' . $parsedView]['field_list'] = array('name', 'id');
+                            $sqs_objects[$name.'_'.$parsedView]['field_list'] = array('name', 'id');
                         } else {
-                            $sqs_objects[$name . '_' . $parsedView]['populate_list'] = $field['field_list'];
-                            $sqs_objects[$name . '_' . $parsedView]['field_list'] = $field['populate_list'];
+                            $sqs_objects[$name.'_'.$parsedView]['populate_list'] = $field['field_list'];
+                            $sqs_objects[$name.'_'.$parsedView]['field_list'] = $field['populate_list'];
                         }
                     }
                 } else {
                     if ($field['type'] == 'parent') {
-                        $sqs_objects[$name . '_' . $parsedView] = $qsd->getQSParent();
+                        $sqs_objects[$name.'_'.$parsedView] = $qsd->getQSParent();
                     }
                 } //if-else
             } //foreach
 
             foreach ($sqs_objects as $name => $field) {
                 foreach ($field['populate_list'] as $key => $fieldname) {
-                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key] . '_' . $parsedView;
+                    $sqs_objects[$name]['populate_list'][$key] = $sqs_objects[$name]['populate_list'][$key].'_'.$parsedView;
                 }
             }
         } else {
@@ -514,25 +514,25 @@ 
 
                 $field = $defs[$f['name']];
                 if ($view === 'ConvertLead') {
-                    $field['name'] = $module . $field['name'];
+                    $field['name'] = $module.$field['name'];
                     if (isset($field['module']) &&
                         isset($field['id_name']) &&
                         substr($field['id_name'], -4) === '_ida'
                     ) {
                         $lc_module = strtolower($field['module']);
-                        $ida_suffix = '_' . $lc_module . $lc_module . '_ida';
-                        if (preg_match('/' . $ida_suffix . '$/', $field['id_name']) > 0) {
-                            $field['id_name'] = $module . $field['id_name'];
+                        $ida_suffix = '_'.$lc_module.$lc_module.'_ida';
+                        if (preg_match('/'.$ida_suffix.'$/', $field['id_name']) > 0) {
+                            $field['id_name'] = $module.$field['id_name'];
                         } else {
-                            $field['id_name'] = $field['name'] . '_' . $field['id_name'];
+                            $field['id_name'] = $field['name'].'_'.$field['id_name'];
                         }
                     } else {
                         if (!empty($field['id_name'])) {
-                            $field['id_name'] = $module . $field['id_name'];
+                            $field['id_name'] = $module.$field['id_name'];
                         }
                     }
                 }
-                $name = $qsd->form_name . '_' . $field['name'];
+                $name = $qsd->form_name.'_'.$field['name'];
 
 
                 if ($field['type'] === 'relate' && isset($field['module']) && (preg_match('/_name$|_c$/si',
@@ -632,7 +632,7 @@ 
                     for ($j = 0; $j < $totalFields; $j++) {
                         //search for the same couple (field_list_item,populate_field_item)
                         $field_list_item = $field['field_list'][$j];
-                        $field_list_item_alternate = $qsd->form_name . '_' . $field['field_list'][$j];
+                        $field_list_item_alternate = $qsd->form_name.'_'.$field['field_list'][$j];
                         $populate_list_item = $field['populate_list'][$j];
                         $found = false;
                         $totalSqsObjects = count($sqs_objects[$name]['field_list']);
@@ -667,7 +667,7 @@ 
                 $quicksearch_js .= "sqs_objects['$sqsfield']={$json->encode($sqsfieldArray)};";
             }
 
-            return $quicksearch_js . '</script>';
+            return $quicksearch_js.'</script>';
         }
 
         return '';

modules/ModuleBuilder/parsers/relationships/ManyToOneRelationship.php

Indentation +20 added lines, -20 removed lines

@@ -60,21 +60,21 @@ 
     function __construct ($definition) 
     {
         
-    	parent::__construct ( $definition ) ;
-    	$onetomanyDef = array_merge($definition, array(
-	        'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
-	        'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
-	        'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
-	        'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
-	        'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
-	        'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
-	        'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
-	        'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
-	        'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
-	        'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
-	        'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
-	        'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
-	        'relationship_type' => MB_ONETOMANY,
+        parent::__construct ( $definition ) ;
+        $onetomanyDef = array_merge($definition, array(
+            'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
+            'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
+            'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
+            'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
+            'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
+            'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
+            'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
+            'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
+            'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
+            'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
+            'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
+            'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
+            'relationship_type' => MB_ONETOMANY,
         ));
         $this->one_to_many = new OneToManyRelationship($onetomanyDef);
     }
@@ -83,7 +83,7 @@ 
      * BUILD methods called during the build
      */
 	
-	function buildLabels($update = false)
+    function buildLabels($update = false)
     {
         return $this->one_to_many->buildLabels();
     }
@@ -104,7 +104,7 @@ 
      */
     function buildVardefs ( )
     {
-       return $this->one_to_many->buildVardefs();
+        return $this->one_to_many->buildVardefs();
     }
     
     /*
@@ -130,19 +130,19 @@ 
     public function setName ($relationshipName)
     {
         parent::setName($relationshipName);
-    	$this->one_to_many->setname($relationshipName);
+        $this->one_to_many->setname($relationshipName);
     }
     
     public function setReadonly ($set = true)
     {
         parent::setReadonly($set);
-    	$this->one_to_many->setReadonly();
+        $this->one_to_many->setReadonly();
     }
     
     public function delete ()
     {
         parent::delete();
-    	$this->one_to_many->delete();
+        $this->one_to_many->delete();
     }
     
     public function setRelationship_only ()

Spacing +24 added lines, -24 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.
@@ -39,9 +39,9 @@ 
  ********************************************************************************/
 
 
-require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php' ;
-require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php' ;
-require_once 'modules/ModuleBuilder/parsers/constants.php' ;
+require_once 'modules/ModuleBuilder/parsers/relationships/AbstractRelationship.php';
+require_once 'modules/ModuleBuilder/parsers/relationships/OneToManyRelationship.php';
+require_once 'modules/ModuleBuilder/parsers/constants.php';
 
 /*
  * Class to manage the metadata for a many-To-one Relationship
@@ -57,21 +57,21 @@ 
      * @param array $definition Parameters passed in as array defined in parent::$definitionKeys
      * The lhs_module value is for the One side; the rhs_module value is for the Many
      */
-    function __construct ($definition) 
+    function __construct($definition) 
     {
         
-    	parent::__construct ( $definition ) ;
+    	parent::__construct($definition);
     	$onetomanyDef = array_merge($definition, array(
-	        'rhs_label'    => isset($definition['lhs_label'])    ? $definition['lhs_label']    : null,
-	        'lhs_label'    => isset($definition['rhs_label'])    ? $definition['rhs_label']    : null,
+	        'rhs_label'    => isset($definition['lhs_label']) ? $definition['lhs_label'] : null,
+	        'lhs_label'    => isset($definition['rhs_label']) ? $definition['rhs_label'] : null,
 	        'lhs_subpanel' => isset($definition['rhs_subpanel']) ? $definition['rhs_subpanel'] : null,
 	        'rhs_subpanel' => isset($definition['lhs_subpanel']) ? $definition['lhs_subpanel'] : null,
-	        'lhs_module'   => isset($definition['rhs_module'])   ? $definition['rhs_module']   : null,
-	        'lhs_table'    => isset($definition['rhs_table'])    ? $definition['rhs_table']    : null,
-	        'lhs_key'      => isset($definition['rhs_key'])      ? $definition['rhs_key']      : null,
-	        'rhs_module'   => isset($definition['lhs_module'])   ? $definition['lhs_module']   : null,
-	        'rhs_table'    => isset($definition['lhs_table'])    ? $definition['lhs_table']    : null,
-	        'rhs_key'      => isset($definition['lhs_key'])      ? $definition['lhs_key']      : null,
+	        'lhs_module'   => isset($definition['rhs_module']) ? $definition['rhs_module'] : null,
+	        'lhs_table'    => isset($definition['rhs_table']) ? $definition['rhs_table'] : null,
+	        'lhs_key'      => isset($definition['rhs_key']) ? $definition['rhs_key'] : null,
+	        'rhs_module'   => isset($definition['lhs_module']) ? $definition['lhs_module'] : null,
+	        'rhs_table'    => isset($definition['lhs_table']) ? $definition['lhs_table'] : null,
+	        'rhs_key'      => isset($definition['lhs_key']) ? $definition['lhs_key'] : null,
 	        'join_key_lhs' => isset($definition['join_key_rhs']) ? $definition['join_key_rhs'] : null,
 	        'join_key_rhs' => isset($definition['join_key_lhs']) ? $definition['join_key_lhs'] : null,
 	        'relationship_type' => MB_ONETOMANY,
@@ -93,7 +93,7 @@ 
      * The format is that of TO_MODULE => relationship, FROM_MODULE, FROM_MODULES_SUBPANEL, mimicking the format in the layoutdefs.php
      * @return array    An array of subpanel definitions, keyed by the module
      */
-    function buildSubpanelDefinitions ()
+    function buildSubpanelDefinitions()
     {        
         return $this->one_to_many->buildSubpanelDefinitions();
     }
@@ -102,7 +102,7 @@ 
     /*
      * @return array    An array of field definitions, ready for the vardefs, keyed by module
      */
-    function buildVardefs ( )
+    function buildVardefs( )
     {
        return $this->one_to_many->buildVardefs();
     }
@@ -111,41 +111,41 @@ 
      * Define what fields to add to which modules layouts
      * @return array    An array of module => fieldname
      */
-    function buildFieldsToLayouts ()
+    function buildFieldsToLayouts()
     {
         if ($this->relationship_only)
-            return array () ;
+            return array();
  
-        return array( $this->lhs_module => $this->getValidDBName($this->relationship_name . "_name") ) ; // this must match the name of the relate field from buildVardefs
+        return array($this->lhs_module => $this->getValidDBName($this->relationship_name."_name")); // this must match the name of the relate field from buildVardefs
     }
        
     /*
      * @return array    An array of relationship metadata definitions
      */
-    function buildRelationshipMetaData ()
+    function buildRelationshipMetaData()
     {
         return $this->one_to_many->buildRelationshipMetaData();
     }
     
-    public function setName ($relationshipName)
+    public function setName($relationshipName)
     {
         parent::setName($relationshipName);
     	$this->one_to_many->setname($relationshipName);
     }
     
-    public function setReadonly ($set = true)
+    public function setReadonly($set = true)
     {
         parent::setReadonly($set);
     	$this->one_to_many->setReadonly();
     }
     
-    public function delete ()
+    public function delete()
     {
         parent::delete();
     	$this->one_to_many->delete();
     }
     
-    public function setRelationship_only ()
+    public function setRelationship_only()
     {
         parent::setRelationship_only();
         $this->one_to_many->setRelationship_only();

modules/AOW_WorkFlow/aow_utils.php

Spacing +172 added lines, -172 removed lines

@@ -42,7 +42,7 @@ 
     die('Not A Valid Entry Point');
 }
 
-function getModuleFields($module, $view='EditView', $value = '', $valid = array())
+function getModuleFields($module, $view = 'EditView', $value = '', $valid = array())
 {
     global $app_strings, $beanList, $current_user;
 
@@ -79,7 +79,7 @@ 
                                 $blockedModuleFields[$mod->module_dir]
                             ) && !$current_user->isAdmin()
                         ) {
-                            $GLOBALS['log']->debug('hiding ' . $arr['name'] . ' field from ' . $current_user->name);
+                            $GLOBALS['log']->debug('hiding '.$arr['name'].' field from '.$current_user->name);
                             continue;
                         }
                     }
@@ -107,44 +107,44 @@ 
         }
     }
     asort($fields);
-    if($view == 'JSON'){
+    if ($view == 'JSON') {
         return json_encode($fields);
     }
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         return get_select_options_with_id($fields, $value);
     } else {
         return $fields[$value];
     }
 }
 
-function getRelModuleFields($module, $rel_field, $view='EditView',$value = ''){
+function getRelModuleFields($module, $rel_field, $view = 'EditView', $value = '') {
     global $beanList;
 
-    if($module == $rel_field){
+    if ($module == $rel_field) {
         return getModuleFields($module, $view, $value);
     }
 
     $mod = new $beanList[$module]();
     $data = $mod->field_defs[$rel_field];
 
-    if(isset($data['module']) && $data['module'] != ''){
+    if (isset($data['module']) && $data['module'] != '') {
         return getModuleFields($data['module'], $view, $value);
     }
 
 }
 
-function getRelatedModule($module, $rel_field){
+function getRelatedModule($module, $rel_field) {
     global $beanList;
 
-    if($module == $rel_field){
+    if ($module == $rel_field) {
         return $module;
     }
 
     $mod = new $beanList[$module]();
 
-    if(isset($arr['module']) && $arr['module'] != '') {
+    if (isset($arr['module']) && $arr['module'] != '') {
         return $arr['module'];
-    } else if($mod->load_relationship($rel_field)){
+    } else if ($mod->load_relationship($rel_field)) {
         return $mod->$rel_field->getRelatedModuleName();
     }
 
@@ -152,7 +152,7 @@ 
 
 }
 
-function getModuleTreeData($module){
+function getModuleTreeData($module) {
     global $beanList, $app_list_strings;
 
     $sort_fields = array();
@@ -165,33 +165,33 @@ 
     );
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
 
-            foreach($mod->get_linked_fields() as $name => $arr){
-                if(isset($arr['module']) && $arr['module'] != '') {
+            foreach ($mod->get_linked_fields() as $name => $arr) {
+                if (isset($arr['module']) && $arr['module'] != '') {
                     $rel_module = $arr['module'];
-                } else if($mod->load_relationship($name)){
+                } else if ($mod->load_relationship($name)) {
                     $rel_module = $mod->$name->getRelatedModuleName();
                 }
 
                 $rel_module_label = isset($app_list_strings['moduleList'][$rel_module]) ? $app_list_strings['moduleList'][$rel_module] : $rel_module;
-                if(isset($arr['vname']) && $arr['vname'] != '') {
-                    $label = $rel_module_label . ' : ' . translate($arr['vname'], $mod->module_dir);
-                    $module_label = trim(translate($arr['vname'],$mod->module_dir),':');
-                }else {
-                    $label = $rel_module_label . ' : '. $name;
+                if (isset($arr['vname']) && $arr['vname'] != '') {
+                    $label = $rel_module_label.' : '.translate($arr['vname'], $mod->module_dir);
+                    $module_label = trim(translate($arr['vname'], $mod->module_dir), ':');
+                } else {
+                    $label = $rel_module_label.' : '.$name;
                     $module_label = $name;
                 }
-                $sort_fields[$name] = array('label'=>$label,'type'=>'relationship','module' => $rel_module,'module_label'=>$module_label);
-                if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                    if(isset($fields[$arr['id_name']])){
-                        unset( $fields[$arr['id_name']]);
+                $sort_fields[$name] = array('label'=>$label, 'type'=>'relationship', 'module' => $rel_module, 'module_label'=>$module_label);
+                if ($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != '') {
+                    if (isset($fields[$arr['id_name']])) {
+                        unset($fields[$arr['id_name']]);
                     }
                 }
             } //End loop.
-            uasort($sort_fields,function($a,$b){
-                return strcmp($a['label'],$b['label']);
+            uasort($sort_fields, function($a, $b) {
+                return strcmp($a['label'], $b['label']);
             });
 
             $fields = array_merge((array)$fields, (array)$sort_fields);
@@ -201,7 +201,7 @@ 
     return json_encode($fields);
 }
 
-function getModuleRelationships($module, $view='EditView',$value = '')
+function getModuleRelationships($module, $view = 'EditView', $value = '')
 {
     global $beanList, $app_list_strings;
 
@@ -210,27 +210,27 @@ 
     $invalid_modules = array();
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
 
             /*if($mod->is_AuditEnabled()){
                 $fields['Audit'] = translate('LBL_AUDIT_TABLE','AOR_Fields');
             }*/
-            foreach($mod->get_linked_fields() as $name => $arr){
-                if(isset($arr['module']) && $arr['module'] != '') {
+            foreach ($mod->get_linked_fields() as $name => $arr) {
+                if (isset($arr['module']) && $arr['module'] != '') {
                     $rel_module = $arr['module'];
-                } else if($mod->load_relationship($name)){
+                } else if ($mod->load_relationship($name)) {
                     $rel_module = $mod->$name->getRelatedModuleName();
                 }
-                if(!in_array($rel_module,$invalid_modules)){
+                if (!in_array($rel_module, $invalid_modules)) {
                     $relModuleName = isset($app_list_strings['moduleList'][$rel_module]) ? $app_list_strings['moduleList'][$rel_module] : $rel_module;
-                    if(isset($arr['vname']) && $arr['vname'] != ''){
-                        $sort_fields[$name] = $relModuleName.' : '.translate($arr['vname'],$mod->module_dir);
+                    if (isset($arr['vname']) && $arr['vname'] != '') {
+                        $sort_fields[$name] = $relModuleName.' : '.translate($arr['vname'], $mod->module_dir);
                     } else {
-                        $sort_fields[$name] = $relModuleName.' : '. $name;
+                        $sort_fields[$name] = $relModuleName.' : '.$name;
                     }
-                    if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                        if(isset($fields[$arr['id_name']])) unset( $fields[$arr['id_name']]);
+                    if ($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != '') {
+                        if (isset($fields[$arr['id_name']])) unset($fields[$arr['id_name']]);
                     }
                 }
             } //End loop.
@@ -238,26 +238,26 @@ 
             $fields = array_merge((array)$fields, (array)$sort_fields);
         }
     }
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         return get_select_options_with_id($fields, $value);
     } else {
         return $fields[$value];
     }
 }
 
-function getValidFieldsTypes($module, $field){
+function getValidFieldsTypes($module, $field) {
     global $beanFiles, $beanList;
 
     require_once($beanFiles[$beanList[$module]]);
     $focus = new $beanList[$module];
     $vardef = $focus->getFieldDefinition($field);
 
-    switch($vardef['type']) {
+    switch ($vardef['type']) {
         case 'double':
         case 'decimal':
         case 'float':
         case 'currency':
-            $valid_type = array('double','decimal','float','currency');
+            $valid_type = array('double', 'decimal', 'float', 'currency');
             break;
         case 'uint':
         case 'ulong':
@@ -265,12 +265,12 @@ 
         case 'short':
         case 'tinyint':
         case 'int':
-            $valid_type = array('uint','ulong','long','short','tinyint','int');
+            $valid_type = array('uint', 'ulong', 'long', 'short', 'tinyint', 'int');
             break;
         case 'date':
         case 'datetime':
         case 'datetimecombo':
-            $valid_type = array('date','datetime', 'datetimecombo');
+            $valid_type = array('date', 'datetime', 'datetimecombo');
             break;
         case 'id':
         case 'relate':
@@ -287,29 +287,29 @@ 
 }
 
 
-function getModuleField($module, $fieldname, $aow_field, $view='EditView',$value = '', $alt_type = '', $currency_id = '', $params= array()){
+function getModuleField($module, $fieldname, $aow_field, $view = 'EditView', $value = '', $alt_type = '', $currency_id = '', $params = array()) {
     global $current_language, $app_strings, $app_list_strings, $current_user, $beanFiles, $beanList;
 
     // use the mod_strings for this module
-    $mod_strings = return_module_language($current_language,$module);
+    $mod_strings = return_module_language($current_language, $module);
 
     // set the filename for this control
-    $file = create_cache_directory('modules/AOW_WorkFlow/') . $module . $view . $alt_type . $fieldname . '.tpl';
+    $file = create_cache_directory('modules/AOW_WorkFlow/').$module.$view.$alt_type.$fieldname.'.tpl';
 
     $displayParams = array();
 
-    if ( !is_file($file)
+    if (!is_file($file)
         || inDeveloperMode()
-        || !empty($_SESSION['developerMode']) ) {
+        || !empty($_SESSION['developerMode'])) {
 
-        if ( !isset($vardef) ) {
+        if (!isset($vardef)) {
             require_once($beanFiles[$beanList[$module]]);
             $focus = new $beanList[$module];
             $vardef = $focus->getFieldDefinition($fieldname);
         }
 
         // Bug: check for AOR value SecurityGroups value missing
-        if(stristr($fieldname, 'securitygroups') != false && empty($vardef)) {
+        if (stristr($fieldname, 'securitygroups') != false && empty($vardef)) {
             require_once($beanFiles[$beanList['SecurityGroups']]);
             $module = 'SecurityGroups';
             $focus = new $beanList[$module];
@@ -320,36 +320,36 @@ 
         //$displayParams['formName'] = 'EditView';
 
         // if this is the id relation field, then don't have a pop-up selector.
-        if( $vardef['type'] == 'relate' && $vardef['id_name'] == $vardef['name']) {
+        if ($vardef['type'] == 'relate' && $vardef['id_name'] == $vardef['name']) {
             $vardef['type'] = 'varchar';
         }
 
-        if(isset($vardef['precision'])) unset($vardef['precision']);
+        if (isset($vardef['precision'])) unset($vardef['precision']);
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
         //TODO Fix datetimecomebo
         //temp work around
-        if( $vardef['type'] == 'datetimecombo') {
+        if ($vardef['type'] == 'datetimecombo') {
             $vardef['type'] = 'datetime';
         }
 
         // trim down textbox display
-        if( $vardef['type'] == 'text' ) {
+        if ($vardef['type'] == 'text') {
             $vardef['rows'] = 2;
             $vardef['cols'] = 32;
         }
 
         // create the dropdowns for the parent type fields
-        if ( $vardef['type'] == 'parent_type' ) {
+        if ($vardef['type'] == 'parent_type') {
             $vardef['type'] = 'enum';
         }
 
-        if($vardef['type'] == 'link'){
+        if ($vardef['type'] == 'link') {
             $vardef['type'] = 'relate';
             $vardef['rname'] = 'name';
             $vardef['id_name'] = $vardef['name'].'_id';
-            if((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
+            if ((!isset($vardef['module']) || $vardef['module'] == '') && $focus->load_relationship($vardef['name'])) {
                 $relName = $vardef['name'];
                 $vardef['module'] = $focus->$relName->getRelatedModuleName();
             }
@@ -357,24 +357,24 @@ 
         }
 
         //check for $alt_type
-        if ( $alt_type != '' ) {
+        if ($alt_type != '') {
             $vardef['type'] = $alt_type;
         }
 
         // remove the special text entry field function 'getEmailAddressWidget'
-        if ( isset($vardef['function'])
-            && ( $vardef['function'] == 'getEmailAddressWidget'
-                || $vardef['function']['name'] == 'getEmailAddressWidget' ) )
+        if (isset($vardef['function'])
+            && ($vardef['function'] == 'getEmailAddressWidget'
+                || $vardef['function']['name'] == 'getEmailAddressWidget'))
             unset($vardef['function']);
 
-        if(isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')){
+        if (isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')) {
             $vardef['name'] = 'aow_temp_date';
         }
 
         // load SugarFieldHandler to render the field tpl file
         static $sfh;
 
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
@@ -384,17 +384,17 @@ 
         // Remove all the copyright comments
         $contents = preg_replace('/\{\*[^\}]*?\*\}/', '', $contents);
 
-        if( $view == 'EditView' &&  ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')){
-            $contents = str_replace('"'.$vardef['id_name'].'"','{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
-            $contents = str_replace('"'.$vardef['name'].'"','{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
+        if ($view == 'EditView' && ($vardef['type'] == 'relate' || $vardef['type'] == 'parent')) {
+            $contents = str_replace('"'.$vardef['id_name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.id_name}"{literal}', $contents);
+            $contents = str_replace('"'.$vardef['name'].'"', '{/literal}"{$fields.'.$vardef['name'].'.name}"{literal}', $contents);
         }
 
         // hack to disable one of the js calls in this control
-        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) )
+        if (isset($vardef['function']) && ($vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown'))
             $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
 
         // Save it to the cache file
-        if($fh = @sugar_fopen($file, 'w')) {
+        if ($fh = @sugar_fopen($file, 'w')) {
             fputs($fh, $contents);
             fclose($fh);
         }
@@ -411,51 +411,51 @@ 
     $ss->assign('TIME_FORMAT', $time_format);
     $time_separator = ":";
     $match = array();
-    if(preg_match('/\d+([^\d])\d+([^\d]*)/s', $time_format, $match)) {
+    if (preg_match('/\d+([^\d])\d+([^\d]*)/s', $time_format, $match)) {
         $time_separator = $match[1];
     }
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
-    if(!isset($match[2]) || $match[2] == '') {
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
+    if (!isset($match[2]) || $match[2] == '') {
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M");
     }
     else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
-        $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
+        $ss->assign('CALENDAR_FORMAT', $date_format.' '.$t23.$time_separator."%M".$pm);
     }
 
     $ss->assign('CALENDAR_FDOW', $current_user->get_first_day_of_week());
 
     // populate the fieldlist from the vardefs
     $fieldlist = array();
-    if ( !isset($focus) || !($focus instanceof SugarBean) )
+    if (!isset($focus) || !($focus instanceof SugarBean))
         require_once($beanFiles[$beanList[$module]]);
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields = $focus->getFieldDefinitions();
-    if (isset($vardefFields[$fieldname]['type']) && $vardefFields[$fieldname]['type'] == 'parent_type' ) {
+    if (isset($vardefFields[$fieldname]['type']) && $vardefFields[$fieldname]['type'] == 'parent_type') {
         $focus->field_defs[$fieldname]['options'] = $focus->field_defs[$vardefFields[$fieldname]['group']]['options'];
     }
-    foreach ( $vardefFields as $name => $properties ) {
+    foreach ($vardefFields as $name => $properties) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
+        if (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
             $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
+        elseif (isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
             $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
         // Bug 22730: make sure all enums have the ability to select blank as the default value.
-        if(!isset($fieldlist[$name]['options']['']))
+        if (!isset($fieldlist[$name]['options']['']))
             $fieldlist[$name]['options'][''] = '';
     }
 
     // fill in function return values
-    if ( !in_array($fieldname,array('email1','email2')) )
+    if (!in_array($fieldname, array('email1', 'email2')))
     {
         if (!empty($fieldlist[$fieldname]['function']['returns']) && $fieldlist[$fieldname]['function']['returns'] == 'html')
         {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
+            if (isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
                 require_once($fieldlist[$fieldname]['function']['include']);
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
@@ -464,40 +464,40 @@ 
         }
     }
 
-    if(isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'link'){
+    if (isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'link') {
         $fieldlist[$fieldname]['id_name'] = $fieldlist[$fieldname]['name'].'_id';
 
-        if((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
+        if ((!isset($fieldlist[$fieldname]['module']) || $fieldlist[$fieldname]['module'] == '') && $focus->load_relationship($fieldlist[$fieldname]['name'])) {
             $relName = $fieldlist[$fieldname]['name'];
             $fieldlist[$fieldname]['module'] = $focus->$relName->getRelatedModuleName();
         }
     }
 
-    if(isset($fieldlist[$fieldname]['name']) && ($fieldlist[$fieldname]['name'] == 'date_entered' || $fieldlist[$fieldname]['name'] == 'date_modified')){
+    if (isset($fieldlist[$fieldname]['name']) && ($fieldlist[$fieldname]['name'] == 'date_entered' || $fieldlist[$fieldname]['name'] == 'date_modified')) {
         $fieldlist[$fieldname]['name'] = 'aow_temp_date';
         $fieldlist['aow_temp_date'] = $fieldlist[$fieldname];
         $fieldname = 'aow_temp_date';
     }
 
     $quicksearch_js = '';
-    if(isset( $fieldlist[$fieldname]['id_name'] ) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']){
+    if (isset($fieldlist[$fieldname]['id_name']) && $fieldlist[$fieldname]['id_name'] != '' && $fieldlist[$fieldname]['id_name'] != $fieldlist[$fieldname]['name']) {
         $rel_value = $value;
 
         require_once("include/TemplateHandler/TemplateHandler.php");
         $template_handler = new TemplateHandler();
-        $quicksearch_js = $template_handler->createQuickSearchCode($fieldlist,$fieldlist,$view);
+        $quicksearch_js = $template_handler->createQuickSearchCode($fieldlist, $fieldlist, $view);
         $quicksearch_js = str_replace($fieldname, $aow_field.'_display', $quicksearch_js);
         $quicksearch_js = str_replace($fieldlist[$fieldname]['id_name'], $aow_field, $quicksearch_js);
 
         echo $quicksearch_js;
 
-        if(isset($fieldlist[$fieldname]['module']) && $fieldlist[$fieldname]['module'] == 'Users'){
+        if (isset($fieldlist[$fieldname]['module']) && $fieldlist[$fieldname]['module'] == 'Users') {
             $rel_value = get_assigned_user_name($value);
-        } else if(isset($fieldlist[$fieldname]['module'])){
+        } else if (isset($fieldlist[$fieldname]['module'])) {
             require_once($beanFiles[$beanList[$fieldlist[$fieldname]['module']]]);
             $rel_focus = new $beanList[$fieldlist[$fieldname]['module']];
             $rel_focus->retrieve($value);
-            if(isset($fieldlist[$fieldname]['rname']) && $fieldlist[$fieldname]['rname'] != ''){
+            if (isset($fieldlist[$fieldname]['rname']) && $fieldlist[$fieldname]['rname'] != '') {
                 $relDisplayField = $fieldlist[$fieldname]['rname'];
             } else {
                 $relDisplayField = 'name';
@@ -510,17 +510,17 @@ 
         $fieldlist[$fieldname]['id_name'] = $aow_field;
         $fieldlist[$fieldlist[$fieldname]['id_name']]['name'] = $aow_field;
         $fieldlist[$fieldname]['name'] = $aow_field.'_display';
-    } else if(isset( $fieldlist[$fieldname]['type'] ) && $view == 'DetailView' && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')){
+    } else if (isset($fieldlist[$fieldname]['type']) && $view == 'DetailView' && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
-        if(!empty($params['date_format']) && isset($params['date_format'])){
+        if (!empty($params['date_format']) && isset($params['date_format'])) {
             $convert_format = "Y-m-d H:i:s";
-            if($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
+            if ($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
             $fieldlist[$fieldname]['value'] = $timedate->to_display($value, $convert_format, $params['date_format']);
-        }else{
+        } else {
             $fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
         }
         $fieldlist[$fieldname]['name'] = $aow_field;
-    } else if(isset( $fieldlist[$fieldname]['type'] ) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')){
+    } else if (isset($fieldlist[$fieldname]['type']) && ($fieldlist[$fieldname]['type'] == 'datetimecombo' || $fieldlist[$fieldname]['type'] == 'datetime' || $fieldlist[$fieldname]['type'] == 'date')) {
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         $fieldlist[$fieldname]['value'] = $timedate->to_display_date($value);
         //$fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
@@ -532,17 +532,17 @@ 
 
     }
 
-    if(isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'currency' && $view != 'EditView'){
+    if (isset($fieldlist[$fieldname]['type']) && $fieldlist[$fieldname]['type'] == 'currency' && $view != 'EditView') {
         static $sfh;
 
-        if(!isset($sfh)) {
+        if (!isset($sfh)) {
             require_once('include/SugarFields/SugarFieldHandler.php');
             $sfh = new SugarFieldHandler();
         }
 
-        if($currency_id != '' && !stripos($fieldname, '_USD')){
+        if ($currency_id != '' && !stripos($fieldname, '_USD')) {
             $userCurrencyId = $current_user->getPreference('currency');
-            if($currency_id != $userCurrencyId){
+            if ($currency_id != $userCurrencyId) {
                 $currency = new Currency();
                 $currency->retrieve($currency_id);
                 $value = $currency->convertToDollar($value);
@@ -557,9 +557,9 @@ 
     }
 
     $ss->assign("QS_JS", $quicksearch_js);
-    $ss->assign("fields",$fieldlist);
-    $ss->assign("form_name",$view);
-    $ss->assign("bean",$focus);
+    $ss->assign("fields", $fieldlist);
+    $ss->assign("form_name", $view);
+    $ss->assign("bean", $focus);
 
     // add in any additional strings
     $ss->assign("MOD", $mod_strings);
@@ -572,7 +572,7 @@ 
 
 
 
-function getDateField($module, $aow_field, $view, $value, $field_option = true){
+function getDateField($module, $aow_field, $view, $value, $field_option = true) {
     global $app_list_strings;
 
     // set $view = 'EditView' as default
@@ -582,21 +582,21 @@ 
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
+    if (!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
 
     $field = '';
 
-    if($view == 'EditView'){
-        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>". getDateFields($module, $view, $value[0], $field_option) ."</select>&nbsp;&nbsp;";
-        $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1]) ."</select>&nbsp;";
+    if ($view == 'EditView') {
+        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>".getDateFields($module, $view, $value[0], $field_option)."</select>&nbsp;&nbsp;";
+        $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1])."</select>&nbsp;";
         $display = 'none';
-        if($value[1] == 'plus' || $value[1] == 'minus') $display = '';
+        if ($value[1] == 'plus' || $value[1] == 'minus') $display = '';
         $field .= "<input  type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' value='$value[2]' tabindex='116'>&nbsp;";
-        $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3]) ."</select>";
+        $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3])."</select>";
     }
     else {
         $field = getDateFields($module, $view, $value[0], $field_option).' '.$app_list_strings['aow_date_operator'][$value[1]];
-        if($value[1] == 'plus' || $value[1] == 'minus'){
+        if ($value[1] == 'plus' || $value[1] == 'minus') {
             $field .= ' '.$value[2].' '.$app_list_strings['aow_date_type_list'][$value[3]];
         }
     }
@@ -604,21 +604,21 @@ 
 
 }
 
-function getDateFields($module, $view='EditView',$value = '', $field_option = true)
+function getDateFields($module, $view = 'EditView', $value = '', $field_option = true)
 {
     global $beanList, $app_list_strings;
 
     $fields = $app_list_strings['aow_date_options'];
 
-    if(!$field_option) unset($fields['field']);
+    if (!$field_option) unset($fields['field']);
 
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
-            foreach($mod->field_defs as $name => $arr){
-                if($arr['type'] == 'date' || $arr['type'] == 'datetime' || $arr['type'] == 'datetimecombo'){
-                    if(isset($arr['vname']) && $arr['vname'] != ''){
-                        $fields[$name] = translate($arr['vname'],$mod->module_dir);
+            foreach ($mod->field_defs as $name => $arr) {
+                if ($arr['type'] == 'date' || $arr['type'] == 'datetime' || $arr['type'] == 'datetimecombo') {
+                    if (isset($arr['vname']) && $arr['vname'] != '') {
+                        $fields[$name] = translate($arr['vname'], $mod->module_dir);
                     } else {
                         $fields[$name] = $name;
                     }
@@ -627,42 +627,42 @@ 
 
         }
     }
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         return get_select_options_with_id($fields, $value);
     } else {
         return $fields[$value];
     }
 }
 
-function getAssignField($aow_field, $view, $value){
+function getAssignField($aow_field, $view, $value) {
     global $app_list_strings;
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    $roles = get_bean_select_array(true, 'ACLRole','name', '','name',true);
+    $roles = get_bean_select_array(true, 'ACLRole', 'name', '', 'name', true);
 
-    if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
+    if (!file_exists('modules/SecurityGroups/SecurityGroup.php')) {
         unset($app_list_strings['aow_assign_options']['security_group']);
     }
-    else{
-        $securityGroups = get_bean_select_array(true, 'SecurityGroup','name', '','name',true);
+    else {
+        $securityGroups = get_bean_select_array(true, 'SecurityGroup', 'name', '', 'name', true);
     }
 
     $field = '';
 
-    if($view == 'EditView'){
-        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0]) ."</select>&nbsp;&nbsp;";
-        if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
+    if ($view == 'EditView') {
+        $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>".get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0])."</select>&nbsp;&nbsp;";
+        if (!file_exists('modules/SecurityGroups/SecurityGroup.php')) {
             $field .= "<input type='hidden' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' value=''  />";
         }
         else {
             $display = 'none';
-            if($value[0] == 'security_group') $display = '';
-            $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>". get_select_options_with_id($securityGroups, $value[1]) ."</select>&nbsp;&nbsp;";
+            if ($value[0] == 'security_group') $display = '';
+            $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>".get_select_options_with_id($securityGroups, $value[1])."</select>&nbsp;&nbsp;";
         }
         $display = 'none';
-        if($value[0] == 'role' || $value[0] == 'security_group') $display = '';
-        $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>". get_select_options_with_id($roles, $value[2]) ."</select>&nbsp;&nbsp;";
+        if ($value[0] == 'role' || $value[0] == 'security_group') $display = '';
+        $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>".get_select_options_with_id($roles, $value[2])."</select>&nbsp;&nbsp;";
     }
     else {
         $field = $app_list_strings['aow_assign_options'][$value[1]];
@@ -674,10 +674,10 @@ 
 function getDropdownList($list_id, $selected_value) {
     global $app_list_strings;
     $option = '';
-    foreach($app_list_strings[$list_id] as $key => $value) {
-        if(base64_decode($selected_value) == $key) {
+    foreach ($app_list_strings[$list_id] as $key => $value) {
+        if (base64_decode($selected_value) == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
-        } else if($selected_value == $key) {
+        } else if ($selected_value == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
         }
         else {
@@ -688,7 +688,7 @@ 
 }
 function getLeastBusyUser($users, $field, SugarBean $bean) {
     $counts = array();
-    foreach($users as $id) {
+    foreach ($users as $id) {
         $c = $bean->db->getOne("SELECT count(*) AS c FROM ".$bean->table_name." WHERE $field = '$id' AND deleted = 0");
         $counts[$id] = $c;
     }
@@ -699,21 +699,21 @@ 
 
 function getRoundRobinUser($users, $id) {
 
-    $file = create_cache_directory('modules/AOW_WorkFlow/Users/') . $id . 'lastUser.cache.php';
+    $file = create_cache_directory('modules/AOW_WorkFlow/Users/').$id.'lastUser.cache.php';
 
-    if(isset($_SESSION['lastuser'][$id]) && $_SESSION['lastuser'][$id] != '') {
+    if (isset($_SESSION['lastuser'][$id]) && $_SESSION['lastuser'][$id] != '') {
         $users_by_key = array_flip($users); // now keys are values
         $key = $users_by_key[$_SESSION['lastuser'][$id]] + 1;
-        if(!empty($users[$key])) {
+        if (!empty($users[$key])) {
             return $users[$key];
         }
     }
-    else if (is_file($file)){
+    else if (is_file($file)) {
         require_once($file);
-        if(isset($lastUser['User']) && $lastUser['User'] != '') {
+        if (isset($lastUser['User']) && $lastUser['User'] != '') {
             $users_by_key = array_flip($users); // now keys are values
             $key = $users_by_key[$lastUser['User']] + 1;
-            if(!empty($users[$key])) {
+            if (!empty($users[$key])) {
                 return $users[$key];
             }
         }
@@ -726,31 +726,31 @@ 
 
     $_SESSION['lastuser'][$id] = $user_id;
 
-    $file = create_cache_directory('modules/AOW_WorkFlow/Users/') . $id . 'lastUser.cache.php';
+    $file = create_cache_directory('modules/AOW_WorkFlow/Users/').$id.'lastUser.cache.php';
 
     $arrayString = var_export_helper(array('User' => $user_id));
 
-    $content =<<<eoq
+    $content = <<<eoq
 <?php
 	\$lastUser = {$arrayString};
 ?>
 eoq;
 
-    if($fh = @sugar_fopen($file, 'w')) {
+    if ($fh = @sugar_fopen($file, 'w')) {
         fputs($fh, $content);
         fclose($fh);
     }
     return true;
 }
 
-function getEmailableModules(){
+function getEmailableModules() {
     global $beanFiles, $beanList, $app_list_strings;
     $emailableModules = array();
-    foreach($app_list_strings['aow_moduleList'] as $bean_name => $bean_dis) {
-        if(isset($beanList[$bean_name]) && isset($beanFiles[$beanList[$bean_name]])){
+    foreach ($app_list_strings['aow_moduleList'] as $bean_name => $bean_dis) {
+        if (isset($beanList[$bean_name]) && isset($beanFiles[$beanList[$bean_name]])) {
             require_once($beanFiles[$beanList[$bean_name]]);
             $obj = new $beanList[$bean_name];
-            if($obj instanceof Person || $obj instanceof Company){
+            if ($obj instanceof Person || $obj instanceof Company) {
                 $emailableModules[] = $bean_name;
             }
         }
@@ -759,37 +759,37 @@ 
     return $emailableModules;
 }
 
-function getRelatedEmailableFields($module){
+function getRelatedEmailableFields($module) {
     global $beanList, $app_list_strings;
     $relEmailFields = array();
     $checked_link = array();
     $emailableModules = getEmailableModules();
     if ($module != '') {
-        if(isset($beanList[$module]) && $beanList[$module]){
+        if (isset($beanList[$module]) && $beanList[$module]) {
             $mod = new $beanList[$module]();
 
-            foreach($mod->get_related_fields() as $field){
-                if(isset($field['link'])) $checked_link[] = $field['link'];
-                if(!isset($field['module']) || !in_array($field['module'],$emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")){
+            foreach ($mod->get_related_fields() as $field) {
+                if (isset($field['link'])) $checked_link[] = $field['link'];
+                if (!isset($field['module']) || !in_array($field['module'], $emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")) {
                     continue;
                 }
-                $relEmailFields[$field['name']] = $field['module'].": ".trim(translate($field['vname'],$mod->module_name),":");
+                $relEmailFields[$field['name']] = $field['module'].": ".trim(translate($field['vname'], $mod->module_name), ":");
             }
 
-            foreach($mod->get_linked_fields() as $field){
-                if(!in_array($field['name'],$checked_link) && !in_array($field['relationship'],$checked_link)){
-                    if(isset($field['module']) && $field['module'] != '') {
+            foreach ($mod->get_linked_fields() as $field) {
+                if (!in_array($field['name'], $checked_link) && !in_array($field['relationship'], $checked_link)) {
+                    if (isset($field['module']) && $field['module'] != '') {
                         $rel_module = $field['module'];
-                    } else if($mod->load_relationship($field['name'])){
+                    } else if ($mod->load_relationship($field['name'])) {
                         $relField = $field['name'];
                         $rel_module = $mod->$relField->getRelatedModuleName();
                     }
 
-                    if(in_array($rel_module,$emailableModules)) {
+                    if (in_array($rel_module, $emailableModules)) {
                         if (isset($field['vname']) && $field['vname'] != '') {
-                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module] . ' : ' . translate($field['vname'], $mod->module_dir);
+                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module].' : '.translate($field['vname'], $mod->module_dir);
                         } else {
-                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module] . ' : ' . $field['name'];
+                            $relEmailFields[$field['name']] = $app_list_strings['moduleList'][$rel_module].' : '.$field['name'];
                         }
                     }
                 }
@@ -810,37 +810,37 @@ 
     
     static $boolean_false_values = array('off', 'false', '0', 'no');
 
-    switch($bean->field_defs[$field]['type']) {
+    switch ($bean->field_defs[$field]['type']) {
         case 'datetime':
         case 'datetimecombo':
-            if(empty($value)) break;
+            if (empty($value)) break;
             if ($value == 'NULL') {
                 $value = '';
                 break;
             }
-            if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/',$value) ) {
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $value)) {
                 // This appears to be formatted in user date/time
                 $value = $timedate->to_db($value);
             }
             break;
         case 'date':
-            if(empty($value)) break;
+            if (empty($value)) break;
             if ($value == 'NULL') {
                 $value = '';
                 break;
             }
-            if ( ! preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$value) ) {
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $value)) {
                 // This date appears to be formatted in the user's format
                 $value = $timedate->to_db_date($value, false);
             }
             break;
         case 'time':
-            if(empty($value)) break;
+            if (empty($value)) break;
             if ($value == 'NULL') {
                 $value = '';
                 break;
             }
-            if ( preg_match('/(am|pm)/i',$value) ) {
+            if (preg_match('/(am|pm)/i', $value)) {
                 // This time appears to be formatted in the user's format
                 $value = $timedate->fromUserTime($value)->format(TimeDate::DB_TIME_FORMAT);
             }
@@ -849,10 +849,10 @@ 
         case 'decimal':
         case 'currency':
         case 'float':
-            if ( $value === '' || $value == NULL || $value == 'NULL') {
+            if ($value === '' || $value == NULL || $value == 'NULL') {
                 continue;
             }
-            if ( is_string($value) ) {
+            if (is_string($value)) {
                 $value = (float)unformat_number($value);
             }
             break;
@@ -862,19 +862,19 @@ 
         case 'short':
         case 'tinyint':
         case 'int':
-            if ( $value === '' || $value == NULL || $value == 'NULL') {
+            if ($value === '' || $value == NULL || $value == 'NULL') {
                 continue;
             }
-            if ( is_string($value) ) {
+            if (is_string($value)) {
                 $value = (int)unformat_number($value);
             }
             break;
         case 'bool':
             if (empty($value)) {
                 $value = false;
-            } else if(true === $value || 1 == $value) {
+            } else if (true === $value || 1 == $value) {
                 $value = true;
-            } else if(in_array(strval($value), $boolean_false_values)) {
+            } else if (in_array(strval($value), $boolean_false_values)) {
                 $value = false;
             } else {
                 $value = true;

Braces +66 added lines, -42 removed lines

@@ -179,7 +179,7 @@ 
                 if(isset($arr['vname']) && $arr['vname'] != '') {
                     $label = $rel_module_label . ' : ' . translate($arr['vname'], $mod->module_dir);
                     $module_label = trim(translate($arr['vname'],$mod->module_dir),':');
-                }else {
+                } else {
                     $label = $rel_module_label . ' : '. $name;
                     $module_label = $name;
                 }
@@ -230,7 +230,9 @@ 
                         $sort_fields[$name] = $relModuleName.' : '. $name;
                     }
                     if($arr['type'] == 'relate' && isset($arr['id_name']) && $arr['id_name'] != ''){
-                        if(isset($fields[$arr['id_name']])) unset( $fields[$arr['id_name']]);
+                        if(isset($fields[$arr['id_name']])) {
+                            unset( $fields[$arr['id_name']]);
+                        }
                     }
                 }
             } //End loop.
@@ -324,7 +326,9 @@ 
             $vardef['type'] = 'varchar';
         }
 
-        if(isset($vardef['precision'])) unset($vardef['precision']);
+        if(isset($vardef['precision'])) {
+            unset($vardef['precision']);
+        }
 
         //$vardef['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits', $current_user);
 
@@ -364,8 +368,9 @@ 
         // remove the special text entry field function 'getEmailAddressWidget'
         if ( isset($vardef['function'])
             && ( $vardef['function'] == 'getEmailAddressWidget'
-                || $vardef['function']['name'] == 'getEmailAddressWidget' ) )
-            unset($vardef['function']);
+                || $vardef['function']['name'] == 'getEmailAddressWidget' ) ) {
+                    unset($vardef['function']);
+        }
 
         if(isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')){
             $vardef['name'] = 'aow_temp_date';
@@ -390,8 +395,9 @@ 
         }
 
         // hack to disable one of the js calls in this control
-        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) )
-            $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        if ( isset($vardef['function']) && ( $vardef['function'] == 'getCurrencyDropDown' || $vardef['function']['name'] == 'getCurrencyDropDown' ) ) {
+                    $contents .= "{literal}<script>function CurrencyConvertAll() { return; }</script>{/literal}";
+        }
 
         // Save it to the cache file
         if($fh = @sugar_fopen($file, 'w')) {
@@ -417,8 +423,7 @@ 
     $t23 = strpos($time_format, '23') !== false ? '%H' : '%I';
     if(!isset($match[2]) || $match[2] == '') {
         $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M");
-    }
-    else {
+    } else {
         $pm = $match[2] == "pm" ? "%P" : "%p";
         $ss->assign('CALENDAR_FORMAT', $date_format . ' ' . $t23 . $time_separator . "%M" . $pm);
     }
@@ -427,8 +432,9 @@ 
 
     // populate the fieldlist from the vardefs
     $fieldlist = array();
-    if ( !isset($focus) || !($focus instanceof SugarBean) )
-        require_once($beanFiles[$beanList[$module]]);
+    if ( !isset($focus) || !($focus instanceof SugarBean) ) {
+            require_once($beanFiles[$beanList[$module]]);
+    }
     $focus = new $beanList[$module];
     // create the dropdowns for the parent type fields
     $vardefFields = $focus->getFieldDefinitions();
@@ -438,14 +444,17 @@ 
     foreach ( $vardefFields as $name => $properties ) {
         $fieldlist[$name] = $properties;
         // fill in enums
-        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        if(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($app_list_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $app_list_strings[$fieldlist[$name]['options']];
+        }
         // Bug 32626: fall back on checking the mod_strings if not in the app_list_strings
-        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']]))
-            $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        elseif(isset($fieldlist[$name]['options']) && is_string($fieldlist[$name]['options']) && isset($mod_strings[$fieldlist[$name]['options']])) {
+                    $fieldlist[$name]['options'] = $mod_strings[$fieldlist[$name]['options']];
+        }
         // Bug 22730: make sure all enums have the ability to select blank as the default value.
-        if(!isset($fieldlist[$name]['options']['']))
-            $fieldlist[$name]['options'][''] = '';
+        if(!isset($fieldlist[$name]['options'][''])) {
+                    $fieldlist[$name]['options'][''] = '';
+        }
     }
 
     // fill in function return values
@@ -455,8 +464,9 @@ 
         {
             $function = $fieldlist[$fieldname]['function']['name'];
             // include various functions required in the various vardefs
-            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include']))
-                require_once($fieldlist[$fieldname]['function']['include']);
+            if ( isset($fieldlist[$fieldname]['function']['include']) && is_file($fieldlist[$fieldname]['function']['include'])) {
+                            require_once($fieldlist[$fieldname]['function']['include']);
+            }
             $_REQUEST[$fieldname] = $value;
             $value = $function($focus, $fieldname, $value, $view);
 
@@ -514,9 +524,11 @@ 
         $value = $focus->convertField($value, $fieldlist[$fieldname]);
         if(!empty($params['date_format']) && isset($params['date_format'])){
             $convert_format = "Y-m-d H:i:s";
-            if($fieldlist[$fieldname]['type'] == 'date') $convert_format = "Y-m-d";
+            if($fieldlist[$fieldname]['type'] == 'date') {
+                $convert_format = "Y-m-d";
+            }
             $fieldlist[$fieldname]['value'] = $timedate->to_display($value, $convert_format, $params['date_format']);
-        }else{
+        } else{
             $fieldlist[$fieldname]['value'] = $timedate->to_display_date_time($value, true, true);
         }
         $fieldlist[$fieldname]['name'] = $aow_field;
@@ -582,7 +594,9 @@ 
 
     $value = json_decode(html_entity_decode_utf8($value), true);
 
-    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) unset($app_list_strings['aow_date_type_list']['business_hours']);
+    if(!file_exists('modules/AOBH_BusinessHours/AOBH_BusinessHours.php')) {
+        unset($app_list_strings['aow_date_type_list']['business_hours']);
+    }
 
     $field = '';
 
@@ -590,11 +604,12 @@ 
         $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' title='' tabindex='116'>". getDateFields($module, $view, $value[0], $field_option) ."</select>&nbsp;&nbsp;";
         $field .= "<select type='text' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' onchange='date_field_change(\"$aow_field\")'  title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_operator'], $value[1]) ."</select>&nbsp;";
         $display = 'none';
-        if($value[1] == 'plus' || $value[1] == 'minus') $display = '';
+        if($value[1] == 'plus' || $value[1] == 'minus') {
+            $display = '';
+        }
         $field .= "<input  type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' value='$value[2]' tabindex='116'>&nbsp;";
         $field .= "<select type='text' style='display:$display' name='$aow_field".'[3]'."' id='$aow_field".'[3]'."' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_date_type_list'], $value[3]) ."</select>";
-    }
-    else {
+    } else {
         $field = getDateFields($module, $view, $value[0], $field_option).' '.$app_list_strings['aow_date_operator'][$value[1]];
         if($value[1] == 'plus' || $value[1] == 'minus'){
             $field .= ' '.$value[2].' '.$app_list_strings['aow_date_type_list'][$value[3]];
@@ -610,7 +625,9 @@ 
 
     $fields = $app_list_strings['aow_date_options'];
 
-    if(!$field_option) unset($fields['field']);
+    if(!$field_option) {
+        unset($fields['field']);
+    }
 
     if ($module != '') {
         if(isset($beanList[$module]) && $beanList[$module]){
@@ -643,8 +660,7 @@ 
 
     if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
         unset($app_list_strings['aow_assign_options']['security_group']);
-    }
-    else{
+    } else{
         $securityGroups = get_bean_select_array(true, 'SecurityGroup','name', '','name',true);
     }
 
@@ -654,17 +670,19 @@ 
         $field .= "<select type='text' name='$aow_field".'[0]'."' id='$aow_field".'[0]'."' onchange='assign_field_change(\"$aow_field\")' title='' tabindex='116'>". get_select_options_with_id($app_list_strings['aow_assign_options'], $value[0]) ."</select>&nbsp;&nbsp;";
         if(!file_exists('modules/SecurityGroups/SecurityGroup.php')){
             $field .= "<input type='hidden' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' value=''  />";
-        }
-        else {
+        } else {
             $display = 'none';
-            if($value[0] == 'security_group') $display = '';
+            if($value[0] == 'security_group') {
+                $display = '';
+            }
             $field .= "<select type='text' style='display:$display' name='$aow_field".'[1]'."' id='$aow_field".'[1]'."' title='' tabindex='116'>". get_select_options_with_id($securityGroups, $value[1]) ."</select>&nbsp;&nbsp;";
         }
         $display = 'none';
-        if($value[0] == 'role' || $value[0] == 'security_group') $display = '';
+        if($value[0] == 'role' || $value[0] == 'security_group') {
+            $display = '';
+        }
         $field .= "<select type='text' style='display:$display' name='$aow_field".'[2]'."' id='$aow_field".'[2]'."' title='' tabindex='116'>". get_select_options_with_id($roles, $value[2]) ."</select>&nbsp;&nbsp;";
-    }
-    else {
+    } else {
         $field = $app_list_strings['aow_assign_options'][$value[1]];
     }
     return $field;
@@ -679,8 +697,7 @@ 
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
         } else if($selected_value == $key) {
             $option .= '<option value="'.$key.'" selected>'.$value.'</option>';
-        }
-        else {
+        } else {
             $option .= '<option value="'.$key.'">'.$value.'</option>';
         }
     }
@@ -707,8 +724,7 @@ 
         if(!empty($users[$key])) {
             return $users[$key];
         }
-    }
-    else if (is_file($file)){
+    } else if (is_file($file)){
         require_once($file);
         if(isset($lastUser['User']) && $lastUser['User'] != '') {
             $users_by_key = array_flip($users); // now keys are values
@@ -769,7 +785,9 @@ 
             $mod = new $beanList[$module]();
 
             foreach($mod->get_related_fields() as $field){
-                if(isset($field['link'])) $checked_link[] = $field['link'];
+                if(isset($field['link'])) {
+                    $checked_link[] = $field['link'];
+                }
                 if(!isset($field['module']) || !in_array($field['module'],$emailableModules) || (isset($field['dbType']) && $field['dbType'] == "id")){
                     continue;
                 }
@@ -813,7 +831,9 @@ 
     switch($bean->field_defs[$field]['type']) {
         case 'datetime':
         case 'datetimecombo':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;
@@ -824,7 +844,9 @@ 
             }
             break;
         case 'date':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;
@@ -835,7 +857,9 @@ 
             }
             break;
         case 'time':
-            if(empty($value)) break;
+            if(empty($value)) {
+                break;
+            }
             if ($value == 'NULL') {
                 $value = '';
                 break;