adamjakab / SuiteCRM

tests/tests/modules/Project/ProjectTest.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
     	try {
     		$project->save_relationship_changes(true);
     		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
+    	} catch (Exception $e) {
     		$this->fail();
     	}
         	

tests/tests/modules/Users/UserTest.php

Braces +2 added lines, -4 removed lines

@@ -221,8 +221,7 @@ 
 		try {
 			$user->savePreferencesToDB();
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		
@@ -1095,8 +1094,7 @@ 
     	try {
     		$result = $user->afterImportSave();
     		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
+    	} catch (Exception $e) {
     		$this->assertStringStartsWith('Cannot modify header information', $e->getMessage());
     	}
     	

tests/tests/modules/ProspectLists/ProspectListTest.php

Braces +3 added lines, -6 removed lines

@@ -179,8 +179,7 @@ 
 		try {
 			$prospectList->mark_relationships_deleted('');
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		 
@@ -196,8 +195,7 @@ 
 		try {
 			$prospectList->fill_in_additional_list_fields();
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		 
@@ -224,8 +222,7 @@ 
 		try {
 			$prospectList->update_currency_id('','');
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		 

tests/tests/modules/Employees/EmployeeTest.php

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
 		try {
 			$employee->fill_in_additional_list_fields();
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		
@@ -118,8 +117,7 @@ 
 		try {
 			$employee->list_view_parse_additional_sections(new Sugar_Smarty(), $xTemplateSection);
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		
@@ -151,8 +149,7 @@ 
 		try {
 			$employee->preprocess_fields_on_save();
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 

tests/tests/modules/Contacts/ContactTest.php

Braces +4 added lines, -8 removed lines

@@ -154,8 +154,7 @@ 
 		try {
 			$contact->load_contacts_users_relationship();
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		
@@ -254,8 +253,7 @@ 
 			$contact->save_relationship_changes(true);
 			$contact->save_relationship_changes(false);
 			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->fail();
 		}
 		
@@ -289,8 +287,7 @@ 
     	try {
    			$contact->process_sync_to_outlook("all");
     		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
+    	} catch (Exception $e) {
     		$this->fail();
     	}
     	 
@@ -299,8 +296,7 @@ 
     	try {
     		$contact->process_sync_to_outlook("1");
     		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
+    	} catch (Exception $e) {
     		$this->fail();
     	}
     	 	

modules/Reminders/Reminder.php

Braces +6 added lines, -2 removed lines

@@ -105,7 +105,9 @@ 
     {
         $savedReminderIds = array();
         foreach ($remindersData as $reminderData) {
-            if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) $reminderData->id = '';
+            if (isset($_POST['isDuplicate']) && $_POST['isDuplicate']) {
+                $reminderData->id = '';
+            }
             $reminderBean = BeanFactory::getBean('Reminders', $reminderData->id);
             $reminderBean->popup = $reminderData->popup;
             $reminderBean->email = $reminderData->email;
@@ -379,7 +381,9 @@ 
     {
         $ret = '';
         for ($i = 0; $i < strlen($timestr); $i++) {
-            if ($timestr[$i] != "'") $ret .= $timestr[$i];
+            if ($timestr[$i] != "'") {
+                $ret .= $timestr[$i];
+            }
         }
         return $ret;
     }

modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php

Braces +26 added lines, -19 removed lines

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

include/database/DBManager.php

Braces +276 added lines, -198 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -403,13 +405,15 @@ 
 	$match = array();
 	preg_match_all("'.* FROM ([^ ]*).* ORDER BY (.*)'is", $sql, $match);
 	$indices = false;
-	if (!empty($match[1][0]))
-		$table = $match[1][0];
-	else
-		return false;
+	if (!empty($match[1][0])) {
+			$table = $match[1][0];
+	} else {
+			return false;
+	}
 
-	if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name]))
-		$indices = $GLOBALS['dictionary'][$object_name]['indices'];
+	if (!empty($object_name) && !empty($GLOBALS['dictionary'][$object_name])) {
+			$indices = $GLOBALS['dictionary'][$object_name]['indices'];
+	}
 
 	if (empty($indices)) {
 		foreach ( $GLOBALS['dictionary'] as $current ) {
@@ -427,25 +431,29 @@ 
 		$orderBys = explode(' ', $match[2][0]);
 		foreach ($orderBys as $orderBy){
 			$orderBy = trim($orderBy);
-			if (empty($orderBy))
-				continue;
+			if (empty($orderBy)) {
+							continue;
+			}
 			$orderBy = strtolower($orderBy);
-			if ($orderBy == 'asc' || $orderBy == 'desc')
-				continue;
+			if ($orderBy == 'asc' || $orderBy == 'desc') {
+							continue;
+			}
 
 			$orderBy = str_replace(array($table . '.', ','), '', $orderBy);
 
-			foreach ($indices as $index)
-				if (empty($index['db']) || $index['db'] == $this->dbType)
+			foreach ($indices as $index) {
+							if (empty($index['db']) || $index['db'] == $this->dbType)
 					foreach ($index['fields'] as $field)
 						if ($field == $orderBy)
 							return true;
+			}
 
 			$warning = 'Missing Index For Order By Table: ' . $table . ' Order By:' . $orderBy ;
-			if (!empty($GLOBALS['sugar_config']['dump_slow_queries']))
-				$this->log->fatal('CHECK QUERY:' .$warning);
-			else
-				$this->log->warn('CHECK QUERY:' .$warning);
+			if (!empty($GLOBALS['sugar_config']['dump_slow_queries'])) {
+							$this->log->fatal('CHECK QUERY:' .$warning);
+			} else {
+							$this->log->warn('CHECK QUERY:' .$warning);
+			}
 		}
 	}
 	return false;
@@ -467,8 +475,9 @@ 
 	public function checkConnection()
 	{
 		$this->last_error = '';
-		if (!isset($this->database))
-			$this->connect();
+		if (!isset($this->database)) {
+					$this->connect();
+		}
 	}
 
 	/**
@@ -510,9 +519,13 @@ 
 		$values = array();
 		foreach ($field_defs as $field => $fieldDef)
 		{
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db') {
+			    continue;
+			}
 			//custom fields handle there save seperatley
-			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) continue;
+			if(!empty($field_map) && !empty($field_map[$field]['custom_type'])) {
+			    continue;
+			}
 
 			if(isset($data[$field])) {
 				// clean the incoming value..
@@ -541,8 +554,10 @@ 
 			}
 		}
 
-		if (empty($values))
-			return $execute?true:''; // no columns set
+		if (empty($values)) {
+					return $execute?true:'';
+		}
+		// no columns set
 
 		// get the entire sql
 		$query = "INSERT INTO $table (".implode(",", array_keys($values)).")
@@ -642,9 +657,10 @@ 
 		if(!$this->supports("inline_keys")) {
 		// handle constraints and indices
 			$indicesArr = $this->createConstraintSql($bean);
-			if (count($indicesArr) > 0)
-				foreach ($indicesArr as $indexSql)
+			if (count($indicesArr) > 0) {
+							foreach ($indicesArr as $indexSql)
 					$this->query($indexSql, true, $msg);
+			}
 		}
 	}
 
@@ -681,9 +697,10 @@ 
 			if(!$this->supports("inline_keys")) {
 				// handle constraints and indices
 				$indicesArr = $this->getConstraintSql($indices, $tablename);
-				if (count($indicesArr) > 0)
-					foreach ($indicesArr as $indexSql)
+				if (count($indicesArr) > 0) {
+									foreach ($indicesArr as $indexSql)
 						$res = ($res and $this->query($indexSql, true, "Error creating indexes"));
+				}
 			}
 			return $res;
 		}
@@ -710,13 +727,15 @@ 
 		}
 		//jc: added this for beans that do not actually have a table, namely
 		//ForecastOpportunities
-		if($tablename == 'does_not_exist' || $tablename == '')
-			return '';
+		if($tablename == 'does_not_exist' || $tablename == '') {
+					return '';
+		}
 
 		global $dictionary;
 		$engine=null;
-		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) )
-			$engine = $dictionary[$bean->getObjectName()]['engine'];
+		if (isset($dictionary[$bean->getObjectName()]['engine']) && !empty($dictionary[$bean->getObjectName()]['engine']) ) {
+					$engine = $dictionary[$bean->getObjectName()]['engine'];
+		}
 
 		return $this->repairTableParams($tablename, $fielddefs,$new_index,$execute,$engine);
 	}
@@ -760,8 +779,9 @@ 
 	{
 		//jc: had a bug when running the repair if the tablename is blank the repair will
 		//fail when it tries to create a repair table
-		if ($tablename == '' || empty($fielddefs))
-			return '';
+		if ($tablename == '' || empty($fielddefs)) {
+					return '';
+		}
 
 		//if the table does not exist create it and we are done
 		$sql = "/* Table : $tablename */\n";
@@ -784,16 +804,16 @@ 
 		// do column comparisons
 		$sql .=	"/*COLUMNS*/\n";
 		foreach ($fielddefs as $name => $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
+			if (isset($value['source']) && $value['source'] != 'db') {
+							continue;
+			}
 
             // Bug #42406. Skipping breaked vardef without type or name
             if (isset($value['name']) == false || $value['name'] == false)
             {
                 $sql .= "/* NAME IS MISSING IN VARDEF $tablename::$name */\n";
                 continue;
-            }
-            else if (isset($value['type']) == false || $value['type'] == false)
+            } else if (isset($value['type']) == false || $value['type'] == false)
             {
                 $sql .= "/* TYPE IS MISSING IN VARDEF $tablename::$name */\n";
                 continue;
@@ -823,8 +843,9 @@ 
 				// ok we need this field lets create it
 				$sql .=	"/*MISSING IN DATABASE - $name -  ROW*/\n";
 				$sql .= $this->addColumnSQL($tablename, $value) .  "\n";
-				if ($execute)
-					$this->addColumn($tablename, $value);
+				if ($execute) {
+									$this->addColumn($tablename, $value);
+				}
 				$take_action = true;
 			} elseif ( !$this->compareVarDefs($compareFieldDefs[$name],$value)) {
 				//fields are different lets alter it
@@ -880,8 +901,9 @@ 
 		unset($compareIndices_case_insensitive);
 
 		foreach ($indices as $value) {
-			if (isset($value['source']) && $value['source'] != 'db')
-				continue;
+			if (isset($value['source']) && $value['source'] != 'db') {
+							continue;
+			}
 
 
 			$validDBName = $this->getValidDBName($value['name'], true, 'index', true);
@@ -891,19 +913,23 @@ 
 		    $name = strtolower($value['name']);
 
 			//Don't attempt to fix the same index twice in one pass;
-			if (isset($correctedIndexs[$name]))
-				continue;
+			if (isset($correctedIndexs[$name])) {
+							continue;
+			}
 
 			//don't bother checking primary nothing we can do about them
-			if (isset($value['type']) && $value['type'] == 'primary')
-				continue;
+			if (isset($value['type']) && $value['type'] == 'primary') {
+							continue;
+			}
 
 			//database helpers do not know how to handle full text indices
-			if ($value['type']=='fulltext')
-				continue;
+			if ($value['type']=='fulltext') {
+							continue;
+			}
 
-			if ( in_array($value['type'],array('alternate_key','foreign')) )
-				$value['type'] = 'index';
+			if ( in_array($value['type'],array('alternate_key','foreign')) ) {
+							$value['type'] = 'index';
+			}
 
 			if ( !isset($compareIndices[$name]) ) {
 				//First check if an index exists that doesn't match our name, if so, try to rename it
@@ -934,21 +960,23 @@ 
 				$sql .=	"/*INDEX MISMATCH WITH DATABASE - $name -  ROW ";
 				foreach ($compareIndices[$name] as $n1 => $t1) {
 					$sql .=	 "<$n1>";
-					if ( $n1 == 'fields' )
-						foreach($t1 as $rKey => $rValue)
+					if ( $n1 == 'fields' ) {
+											foreach($t1 as $rKey => $rValue)
 							$sql .= "[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
+					} else {
+											$sql .= " $t1 ";
+					}
 				}
 				$sql .=	"*/\n";
 				$sql .=	"/* VARDEF - $name -  ROW";
 				foreach ($value as $n1 => $t1) {
 					$sql .=	"<$n1>";
-					if ( $n1 == 'fields' )
-						foreach ($t1 as $rKey => $rValue)
+					if ( $n1 == 'fields' ) {
+											foreach ($t1 as $rKey => $rValue)
 							$sql .=	"[$rKey] => '$rValue'  ";
-					else
-						$sql .= " $t1 ";
+					} else {
+											$sql .= " $t1 ";
+					}
 				}
 				$sql .=	"*/\n";
 				$sql .= $this->modifyIndexes($tablename,array($value), $execute) .  "\n";
@@ -971,8 +999,9 @@ 
 	public function compareVarDefs($fielddef1, $fielddef2, $ignoreName = false)
 	{
 		foreach ( $fielddef1 as $key => $value ) {
-			if ($key == 'name' && $ignoreName)
-				continue;
+			if ($key == 'name' && $ignoreName) {
+							continue;
+			}
             if (isset($fielddef2[$key]))
             {
                 if (!is_array($fielddef1[$key]) && !is_array($fielddef2[$key]))
@@ -981,8 +1010,7 @@ 
                     {
                         continue;
                     }
-                }
-                else
+                } else
                 {
                     if (array_map('strtolower', $fielddef1[$key]) == array_map('strtolower',$fielddef2[$key]))
                     {
@@ -991,8 +1019,9 @@ 
                 }
             }
 			//Ignore len if its not set in the vardef
-			if ($key == 'len' && empty($fielddef2[$key]))
-				continue;
+			if ($key == 'len' && empty($fielddef2[$key])) {
+							continue;
+			}
             // if the length in db is greather than the vardef, ignore it
             if ($key == 'len' && ($fielddef1[$key] >= $fielddef2[$key])) {
                 continue;
@@ -1026,12 +1055,10 @@ 
 			if (!$row2) {
 				// Exists on table1 but not table2
 				$returnArray['msg'] = 'not_exists_table2';
-			}
-			else {
+			} else {
 				if (sizeof($row1) != sizeof($row2)) {
 					$returnArray['msg'] = 'no_match';
-				}
-				else {
+				} else {
 					$returnArray['msg'] = 'match';
 					foreach($row1 as $key => $value){
 						//ignore keys when checking we will check them when we do the index check
@@ -1041,8 +1068,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$returnArray['msg'] = 'not_exists_table1';
 		}
 
@@ -1122,16 +1148,19 @@ 
 	 */
 	public function getConstraintSql($indices, $table)
 	{
-		if (!$this->isFieldArray($indices))
-			$indices = array($indices);
+		if (!$this->isFieldArray($indices)) {
+					$indices = array($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;
+			}
 
 			$sql = $this->add_drop_constraint($table, $index);
 
@@ -1221,11 +1250,11 @@ 
 		$sql = $this->addColumnSQL($tablename, $fieldDefs);
 		if ($this->isFieldArray($fieldDefs)){
 			$columns = array();
-			foreach ($fieldDefs as $fieldDef)
-				$columns[] = $fieldDef['name'];
+			foreach ($fieldDefs as $fieldDef) {
+							$columns[] = $fieldDef['name'];
+			}
 			$columns = implode(",", $columns);
-		}
-		else {
+		} else {
 			$columns = $fieldDefs['name'];
 		}
 		$msg = "Error adding column(s) $columns on table: $tablename:";
@@ -1249,8 +1278,7 @@ 
 				$columns[] = $fieldDef['name'];
 			}
 			$columns = implode(",", $columns);
-		}
-		else {
+		} else {
 			$columns = $newFieldDef['name'];
 		}
 
@@ -1370,7 +1398,9 @@ 
 			if(!$is_related_query){
 				foreach ($fields as $fieldDef)
 				{
-					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') continue;
+					if(isset($fieldDef['source']) && $fieldDef['source'] != 'db' && $fieldDef['source'] != 'custom_fields') {
+					    continue;
+					}
 					$val = $row[$fieldDef['name']];
 
 					//handle auto increment values here only need to do this on insert not create
@@ -1379,8 +1409,7 @@ 
 							if(!$built_columns){
 							$columns[] = 'deleted';
 						}
-					}
-					else
+					} else
 					{
 						$type = $fieldDef['type'];
 						if(!empty($fieldDef['custom_type'])){
@@ -1388,28 +1417,32 @@ 
 						}
 						// need to do some thing about types of values
 						if($this->dbType == 'mysql' && $val == '' && ($type == 'datetime' ||  $type == 'date' || $type == 'int' || $type == 'currency' || $type == 'decimal')){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_values[$fieldDef['name']] = 'null';
-							else
-								$values[$fieldDef['name']] = 'null';
-						}else{
+							if(!empty($custom_fields[$fieldDef['name']])) {
+															$cstm_values[$fieldDef['name']] = 'null';
+							} else {
+															$values[$fieldDef['name']] = 'null';
+							}
+						} else{
 							if(isset($type) && $type=='int') {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
-								else
-									$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+								if(!empty($custom_fields[$fieldDef['name']])) {
+																	$cstm_values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+								} else {
+																	$values[$fieldDef['name']] = $GLOBALS['db']->quote(from_html($val));
+								}
 							} else {
-								if(!empty($custom_fields[$fieldDef['name']]))
-									$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
-								else
-									$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+								if(!empty($custom_fields[$fieldDef['name']])) {
+																	$cstm_values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+								} else {
+																	$values[$fieldDef['name']] = "'".$GLOBALS['db']->quote(from_html($val))."'";
+								}
 							}
 						}
 						if(!$built_columns){
-							if(!empty($custom_fields[$fieldDef['name']]))
-								$cstm_columns[] = $fieldDef['name'];
-							else
-								$columns[] = $fieldDef['name'];
+							if(!empty($custom_fields[$fieldDef['name']])) {
+															$cstm_columns[] = $fieldDef['name'];
+							} else {
+															$columns[] = $fieldDef['name'];
+							}
 						}
 					}
 
@@ -1624,7 +1657,9 @@ 
 		    $queryresult = $this->query($sql, $dieOnError, $msg);
 		}
 		$this->checkError($msg.' Get One Failed:' . $sql, $dieOnError);
-		if (!$queryresult) return false;
+		if (!$queryresult) {
+		    return false;
+		}
 		$row = $this->fetchByAssoc($queryresult);
 		if(!empty($row)) {
 			return array_shift($row);
@@ -1648,10 +1683,14 @@ 
 		$queryresult = $this->query($sql, $dieOnError, $msg);
 		$this->checkError($msg.' Fetch One Failed:' . $sql, $dieOnError);
 
-		if (!$queryresult) return false;
+		if (!$queryresult) {
+		    return false;
+		}
 
 		$row = $this->fetchByAssoc($queryresult);
-		if ( !$row ) return false;
+		if ( !$row ) {
+		    return false;
+		}
 
 		$this->freeResult($queryresult);
 		return $row;
@@ -1708,13 +1747,15 @@ 
 	protected function describeField($name, $tablename)
 	{
 		$table = $this->getTableDescription($tablename);
-		if(!empty($table) && isset($table[$name]))
-			return 	$table[$name];
+		if(!empty($table) && isset($table[$name])) {
+					return 	$table[$name];
+		}
 
 		$table = $this->getTableDescription($tablename, true);
 
-		if(isset($table[$name]))
-		return $table[$name];
+		if(isset($table[$name])) {
+				return $table[$name];
+		}
 
 		return array();
 	}
@@ -1768,11 +1809,15 @@ 
      */
 	public function concat($table, array $fields, $space = ' ')
 	{
-		if(empty($fields)) return '';
+		if(empty($fields)) {
+		    return '';
+		}
 		$elems = array();
 		$space = $this->quoted($space);
 		foreach ( $fields as $field ) {
-			if(!empty($elems)) $elems[] = $space;
+			if(!empty($elems)) {
+			    $elems[] = $space;
+			}
 			$elems[] = $this->convert("$table.$field", 'IFNULL', array("''"));
 		}
 		$first = array_shift($elems);
@@ -1864,7 +1909,7 @@ 
 				}//switch
 			}//foreach
 			return $this->query($query);
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -1926,20 +1971,30 @@ 
         $fields = $bean->getFieldDefinitions();
 		// get column names and values
 		foreach ($fields as $field => $fieldDef) {
-			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db')  continue;
+			if (isset($fieldDef['source']) && $fieldDef['source'] != 'db') {
+			    continue;
+			}
 			// Do not write out the id field on the update statement.
     		// We are not allowed to change ids.
-    		if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) continue;
+    		if (empty($fieldDef['name']) || $fieldDef['name'] == $primaryField['name']) {
+    		    continue;
+    		}
 
     		// If the field is an auto_increment field, then we shouldn't be setting it.  This was added
     		// specially for Bugs and Cases which have a number associated with them.
-    		if (!empty($bean->field_name_map[$field]['auto_increment'])) continue;
+    		if (!empty($bean->field_name_map[$field]['auto_increment'])) {
+    		    continue;
+    		}
 
     		//custom fields handle their save separately
-    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type']))  continue;
+    		if(isset($bean->field_name_map) && !empty($bean->field_name_map[$field]['custom_type'])) {
+    		    continue;
+    		}
 
     		// no need to clear deleted since we only update not deleted records anyway
-    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) continue;
+    		if($fieldDef['name'] == 'deleted' && empty($bean->deleted)) {
+    		    continue;
+    		}
 
     		if(isset($bean->$field)) {
     			$val = from_html($bean->$field);
@@ -1972,8 +2027,10 @@ 
     		}
 		}
 
-		if ( sizeof($columns) == 0 )
-			return ""; // no columns set
+		if ( sizeof($columns) == 0 ) {
+					return "";
+		}
+		// no columns set
 
 		// build where clause
 		$where = $this->getWhereClause($bean, $this->updateWhereArray($bean, $where));
@@ -2039,8 +2096,9 @@ 
 			$where[] = " $table.$name $op $val";
 		}
 
-		if (!empty($where))
-			return implode(" AND ", $where);
+		if (!empty($where)) {
+					return implode(" AND ", $where);
+		}
 
 		return '';
 	}
@@ -2144,21 +2202,25 @@ 
 	public function massageFieldDef(&$fieldDef, $tablename)
 	{
 		if ( !isset($fieldDef['dbType']) ) {
-			if ( isset($fieldDef['dbtype']) )
-				$fieldDef['dbType'] = $fieldDef['dbtype'];
-			else
-				$fieldDef['dbType'] = $fieldDef['type'];
+			if ( isset($fieldDef['dbtype']) ) {
+							$fieldDef['dbType'] = $fieldDef['dbtype'];
+			} else {
+							$fieldDef['dbType'] = $fieldDef['type'];
+			}
 		}
 		$type = $this->getColumnType($fieldDef['dbType'],$fieldDef['name'],$tablename);
 		$matches = array();
         // len can be a number or a string like 'max', for example, nvarchar(max)
         preg_match_all('/(\w+)(?:\(([0-9]+,?[0-9]*|\w+)\)|)/i', $type, $matches);
-		if ( isset($matches[1][0]) )
-			$fieldDef['type'] = $matches[1][0];
-		if ( isset($matches[2][0]) && empty($fieldDef['len']) )
-			$fieldDef['len'] = $matches[2][0];
-		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') )
-			$fieldDef['len'] .= ",{$fieldDef['precision']}";
+		if ( isset($matches[1][0]) ) {
+					$fieldDef['type'] = $matches[1][0];
+		}
+		if ( isset($matches[2][0]) && empty($fieldDef['len']) ) {
+					$fieldDef['len'] = $matches[2][0];
+		}
+		if ( !empty($fieldDef['precision']) && is_numeric($fieldDef['precision']) && !strstr($fieldDef['len'],',') ) {
+					$fieldDef['len'] .= ",{$fieldDef['precision']}";
+		}
 		if (!empty($fieldDef['required']) || ($fieldDef['name'] == 'id' && !isset($fieldDef['required'])) ) {
 			$fieldDef['required'] = 'true';
 		}
@@ -2172,8 +2234,9 @@ 
 	public function getSelectFieldsFromQuery($selectStatement)
 	{
 		$selectStatement = trim($selectStatement);
-		if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT")
-			$selectStatement = trim(substr($selectStatement, 6));
+		if (strtoupper(substr($selectStatement, 0, 6)) == "SELECT") {
+					$selectStatement = trim(substr($selectStatement, 6));
+		}
 
 		//Due to sql functions existing in many selects, we can't use php explode
 		$fields = array();
@@ -2189,17 +2252,15 @@ 
 				$field = $this->getFieldNameFromSelect(trim($selectField));
 				$fields[$field] = $selectField;
 				$selectField = "";
-			}
-			else if ($char == "("){
+			} else if ($char == "("){
 				$level++;
 				$selectField .= $char;
-			}
-			else if($char == ")"){
+			} else if($char == ")"){
 				$level--;
 				$selectField .= $char;
 
 
-			}else{
+			} else{
 				$selectField .= $char;
 			}
 
@@ -2218,18 +2279,19 @@ 
 		if(strncasecmp($string, "DISTINCT ", 9) == 0) {
 			$string = substr($string, 9);
 		}
-		if (stripos($string, " as ") !== false)
-			//"as" used for an alias
+		if (stripos($string, " as ") !== false) {
+					//"as" used for an alias
 			return trim(substr($string, strripos($string, " as ") + 4));
-		else if (strrpos($string, " ") != 0)
-			//Space used as a delimiter for an alias
+		} else if (strrpos($string, " ") != 0) {
+					//Space used as a delimiter for an alias
 			return trim(substr($string, strrpos($string, " ")));
-		else if (strpos($string, ".") !== false)
-			//No alias, but a table.field format was used
+		} else if (strpos($string, ".") !== false) {
+					//No alias, but a table.field format was used
 			return substr($string, strpos($string, ".") + 1);
-		else
-			//Give up and assume the whole thing is the field name
+		} else {
+					//Give up and assume the whole thing is the field name
 			return $string;
+		}
 	}
 
 	/**
@@ -2289,8 +2351,9 @@ 
 			$aliases[$tableName][] = $table;
 
 			// build part of select for this table
-			if (is_array($cols[$beanID]))
-				foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
+			if (is_array($cols[$beanID])) {
+							foreach ($cols[$beanID] as $def) $select[] = $table.".".$def['name'];
+			}
 
 			// build part of where clause
 			if (is_array($whereClause[$beanID])){
@@ -2322,7 +2385,10 @@ 
 		$separator = "";
 		$from = ''; $table_used_in_from = array();
 		foreach ($relations as $table1 => $rightsidearray){
-			if ($table_used_in_from[$table1]) continue; // table has been joined
+			if ($table_used_in_from[$table1]) {
+			    continue;
+			}
+			// table has been joined
 
 			$from .= $separator." ".$table1;
 			$table_used_in_from[$table1] = true;
@@ -2333,7 +2399,9 @@ 
 					//choose first alias that does not match
 					// we are doing this because of self joins.
 					// in case of self joins, the same table will have many aliases.
-					if ($table2 != $table1) break;
+					if ($table2 != $table1) {
+					    break;
+					}
 				}
 
 				$col = $tablearray['foreingColumn'];
@@ -2362,11 +2430,13 @@ 
 		$tablename = $bean->getTableName();
 		$columns = array();
 		// get column names
-		foreach ($fields as $fieldDef)
-			$columns[] = $fieldDef['name'];
+		foreach ($fields as $fieldDef) {
+					$columns[] = $fieldDef['name'];
+		}
 
-		if (empty($columns))
-			return "";
+		if (empty($columns)) {
+					return "";
+		}
 
 		$columns = implode(",", $columns);
 
@@ -2386,16 +2456,21 @@ 
 		// we do not have change a lot of existing code
 		// and add dbtype where type is being used for some special
 		// purposes like referring to foreign table etc.
-		if(!empty($fieldDef['dbType']))
-			return  $fieldDef['dbType'];
-		if(!empty($fieldDef['dbtype']))
-			return  $fieldDef['dbtype'];
-		if (!empty($fieldDef['type']))
-			return  $fieldDef['type'];
-		if (!empty($fieldDef['Type']))
-			return  $fieldDef['Type'];
-		if (!empty($fieldDef['data_type']))
-			return  $fieldDef['data_type'];
+		if(!empty($fieldDef['dbType'])) {
+					return  $fieldDef['dbType'];
+		}
+		if(!empty($fieldDef['dbtype'])) {
+					return  $fieldDef['dbtype'];
+		}
+		if (!empty($fieldDef['type'])) {
+					return  $fieldDef['type'];
+		}
+		if (!empty($fieldDef['Type'])) {
+					return  $fieldDef['Type'];
+		}
+		if (!empty($fieldDef['data_type'])) {
+					return  $fieldDef['data_type'];
+		}
 
 		return null;
 	}
@@ -2453,14 +2528,15 @@ 
                                           'clob', 'blob', 'text'))) {
           	    $colType = "$colBaseType(${fieldDef['len']})";
             } elseif(($colBaseType == 'decimal' || $colBaseType == 'float')){
-                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision']))
-                      if(strpos($fieldDef['len'],',') === false){
+                  if(!empty($fieldDef['precision']) && is_numeric($fieldDef['precision'])) {
+                                        if(strpos($fieldDef['len'],',') === false){
                           $colType = $colBaseType . "(".$fieldDef['len'].",".$fieldDef['precision'].")";
-                      }else{
-                          $colType = $colBaseType . "(".$fieldDef['len'].")";
-                      }
-                  else
+                  }
+                      } else{
                           $colType = $colBaseType . "(".$fieldDef['len'].")";
+                      } else {
+                                            $colType = $colBaseType . "(".$fieldDef['len'].")";
+                  }
               }
         } else {
             if (in_array($colBaseType, array( 'nvarchar', 'nchar', 'varchar', 'varchar2', 'char'))) {
@@ -2474,19 +2550,18 @@ 
         if (!empty($fieldDef['no_default']))
         {
             // nothing to do
-        }
-        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
+        } elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
         {
             $default = " DEFAULT ".$this->quoted($fieldDef['default']);
-        }
-        elseif (!isset($default) && $type == 'bool')
+        } elseif (!isset($default) && $type == 'bool')
         {
             $default = " DEFAULT 0 ";
         }
 
 		$auto_increment = '';
-		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
-			$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment']) {
+					$auto_increment = $this->setAutoIncrement($table , $fieldDef['name']);
+		}
 
 		$required = 'NULL';  // MySQL defaults to NULL, SQL Server defaults to NOT NULL -- must specify
 		//Starting in 6.0, only ID and auto_increment fields will be NOT NULL in the DB.
@@ -2500,8 +2575,9 @@ 
 			&& !empty($fieldDef['required'])) {
 			$required =  "NOT NULL";
 		}
-		if ($ignoreRequired)
-			$required = "";
+		if ($ignoreRequired) {
+					$required = "";
+		}
 
 		if ( $return_as_array ) {
 			return array(
@@ -2537,8 +2613,7 @@ 
 				}
 			}
 			$columns = implode(",", $columns);
-		}
-		else {
+		} else {
 			$columns = $this->oneColumnSQLRep($fieldDefs,$ignoreRequired, $tablename);
 		}
 
@@ -2760,8 +2835,9 @@ 
 	 */
 	public function isFieldArray($defArray)
 	{
-		if ( !is_array($defArray) )
-			return false;
+		if ( !is_array($defArray) ) {
+					return false;
+		}
 
 		if ( isset($defArray['type']) ){
 			// type key exists. May be an array of defs or a simple definition
@@ -2872,11 +2948,9 @@ 
                 } else {
                     if (isset($properties['dbType'])) {
                         $field_type=$properties['dbType'];
-                    }
-                    else if(isset($properties['data_type'])) {
+                    } else if(isset($properties['data_type'])) {
                         $field_type=$properties['data_type'];
-                    }
-                    else {
+                    } else {
                         $field_type=$properties['dbtype'];
                     }
                 }
@@ -2901,13 +2975,11 @@ 
                             if ($error >= 0.0000000001) {    // Smaller than 10E-10
                                 $change = true;
                             }
-                        }
-                        else if ($this->isBooleanType($field_type)) {
+                        } else if ($this->isBooleanType($field_type)) {
                             if ($this->_getBooleanValue($before_value) != $this->_getBooleanValue($after_value)) {
                                 $change = true;
                             }
-                        }
-                        else {
+                        } else {
                             $change = true;
                         }
                         if ($change) {
@@ -3005,8 +3077,9 @@ 
 	protected function _getBooleanValue($val)
 	{
 		//need to put the === sign here otherwise true == 'non empty string'
-		if (empty($val) or $val==='off')
-			return false;
+		if (empty($val) or $val==='off') {
+					return false;
+		}
 
 		return true;
 	}
@@ -3032,8 +3105,9 @@ 
      */
 	protected function _emptyValue($val, $type)
 	{
-		if (empty($val))
-			return true;
+		if (empty($val)) {
+					return true;
+		}
 
 		if($this->emptyValue($type) == $val) {
 			return true;
@@ -3050,10 +3124,12 @@ 
 			case 'short':
 				return ($val == 0);
 			case 'date':
-				if ($val == '0000-00-00')
-					return true;
-				if ($val == 'NULL')
-					return true;
+				if ($val == '0000-00-00') {
+									return true;
+				}
+				if ($val == 'NULL') {
+									return true;
+				}
 				return false;
 		}
 
@@ -3407,7 +3483,9 @@ 
 	 */
 	public function fetchByAssoc($result, $encode = true)
 	{
-	    if (empty($result))	return false;
+	    if (empty($result)) {
+	        return false;
+	    }
 
 	    if(is_int($encode) && func_num_args() == 3) {
 	        // old API: $result, $rowNum, $encode

modules/Campaigns/WizardNewsletter.php

Braces +45 added lines, -37 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -80,7 +82,7 @@ 
 
 if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_NEWSLETTER WIZARD_TITLE'].$focus->name), true, false);
-}else{
+} else{
     echo getClassicModuleTitle($mod_strings['LBL_MODULE_NAME'], array($mod_strings['LBL_CAMPAIGN'].$focus->name), true, false);   
 }
 
@@ -89,9 +91,15 @@ 
 $ss->assign("MOD", $mod_strings);
 $ss->assign("APP", $app_strings);
 
-if (isset($_REQUEST['return_module'])) $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
-if (isset($_REQUEST['return_action'])) $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
-if (isset($_REQUEST['return_id'])) $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+if (isset($_REQUEST['return_module'])) {
+    $ss->assign("RETURN_MODULE", $_REQUEST['return_module']);
+}
+if (isset($_REQUEST['return_action'])) {
+    $ss->assign("RETURN_ACTION", $_REQUEST['return_action']);
+}
+if (isset($_REQUEST['return_id'])) {
+    $ss->assign("RETURN_ID", $_REQUEST['return_id']);
+}
 // handle Create $module then Cancel
 if (empty($_REQUEST['return_id'])) {
     $ss->assign("RETURN_ACTION", 'index');
@@ -120,10 +128,10 @@ 
 if( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==1)  ||  ($focus->campaign_type=='NewsLetter')){
     $campaign_type = 'newsletter';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());    
-}elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
+} elseif( (isset($_REQUEST['wizardtype'])  && $_REQUEST['wizardtype']==2)  || ($focus->campaign_type=='Email') ){
     $campaign_type = 'email';
     $ss->assign("CAMPAIGN_DIAGNOSTIC_LINK", diagnose());
-}else{
+} else{
     $campaign_type = 'general';
 }
 
@@ -162,8 +170,12 @@ 
 $ss->assign("CAMP_NAME", $focus->name);
 $ss->assign("CAMP_RECORD", $focus->id);
 $ss->assign("CAMP_IMPRESSIONS", $focus->impressions);
-if (empty($focus->assigned_user_id) && empty($focus->id))  $focus->assigned_user_id = $current_user->id;
-if (empty($focus->assigned_name) && empty($focus->id))  $focus->assigned_user_name = $current_user->user_name;
+if (empty($focus->assigned_user_id) && empty($focus->id)) {
+    $focus->assigned_user_id = $current_user->id;
+}
+if (empty($focus->assigned_name) && empty($focus->id)) {
+    $focus->assigned_user_name = $current_user->user_name;
+}
 $ss->assign("ASSIGNED_USER_OPTIONS", get_select_options_with_id(get_user_array(TRUE, "Active", $focus->assigned_user_id), $focus->assigned_user_id));
 //$ss->assign("ASSIGNED_USER_NAME", $focus->assigned_user_name);
 
@@ -171,10 +183,11 @@ 
 
 $ss->assign("ASSIGNED_USER_ID", $focus->assigned_user_id );
 
-if((!isset($focus->status)) && (!isset($focus->id)))
+if((!isset($focus->status)) && (!isset($focus->id))) {
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], 'Planning'));
-else
+} else {
     $ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['campaign_status_dom'], $focus->status));
+}
 
 //hide frequency options if this is not a newsletter
 if($campaign_type == 'newsletter'){
@@ -182,10 +195,10 @@ 
     $ss->assign("FREQUENCY_LABEL", $mod_strings['LBL_CAMPAIGN_FREQUENCY']);
     if((!isset($focus->frequency)) && (!isset($focus->id))){
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], 'Monthly'));
-    }else{
+    } else{
         $ss->assign("FREQ_OPTIONS", get_select_options_with_id($app_list_strings['newsletter_frequency_dom'], $focus->frequency));
     }
-}else{
+} else{
     $ss->assign("HIDE_FREQUENCY_IF_NEWSLETTER", "input type='hidden'");
     $ss->assign("FREQUENCY_LABEL", '&nbsp;');
 }
@@ -195,12 +208,11 @@ 
 if(isset($focus->currency_id) && !empty($focus->currency_id)){
     $selectCurrency = $currency->getSelectOptions($focus->currency_id);
     $ss->assign("CURRENCY", $selectCurrency);
-}
-else if($current_user->getPreference('currency') && !isset($focus->id))
+} else if($current_user->getPreference('currency') && !isset($focus->id))
 {
     $selectCurrency = $currency->getSelectOptions($current_user->getPreference('currency'));
     $ss->assign("CURRENCY", $selectCurrency);
-}else{
+} else{
 
     $selectCurrency = $currency->getSelectOptions();
     $ss->assign("CURRENCY", $selectCurrency);
@@ -231,7 +243,7 @@ 
     foreach($OptionsArr as $key=>$val){
         if($val =='Newsletter' || $val =='Email' || $val =='' ){
             //do not add   
-        }else{
+        } else{
             $myTypeOptionsArr[$key] = $val;
         }
     }
@@ -243,7 +255,7 @@ 
         //if the selected flag is set to true, then just populate
         if($selected){
             $type_option_html .="<option value='$optionKey' >$optionName</option>";
-        }else{//if not selected yet, check to see if this option should be selected
+        } else{//if not selected yet, check to see if this option should be selected
             //if the campaign type is not empty, then select the retrieved type
             if(!empty($focus->campaign_type)){
                 //check to see if key matches campaign type
@@ -252,11 +264,11 @@ 
                     $type_option_html .="<option value='$optionKey' selected>$optionName</option>";
                     //mark as selected for next time
                     $selected=true;
-                }else{
+                } else{
                     //key does not match, just populate
                     $type_option_html .="<option value='$optionKey' >$optionName</option>";
                 }
-            }else{
+            } else{
             //since the campaign type is empty, then select first one                
                 $type_option_html .="<option value='$optionKey' selected>$optionName</option>";    
                 //mark as selected for next time
@@ -267,12 +279,12 @@ 
     //assign the modified dropdown for general campaign creation
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $type_option_html);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "select");    
-}elseif($campaign_type == 'email'){
+} elseif($campaign_type == 'email'){
     //Assign Email as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_EMAIL']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='Email'");
     $ss->assign("HIDE_CAMPAIGN_TYPE", true);
-}else{
+} else{
     //Assign NewsLetter as type of campaign being created an disable the select widget
     $ss->assign("CAMPAIGN_TYPE_OPTIONS", $mod_strings['LBL_NEWSLETTER']);
     $ss->assign("SHOULD_TYPE_BE_DISABLED", "input type='hidden' value='NewsLetter'");
@@ -300,7 +312,7 @@ 
         $ct_focus = new CampaignTracker();
         $ct_focus->retrieve($trkr_id);
       if(isset($ct_focus->tracker_name) && !empty($ct_focus->tracker_name)){
-            if($ct_focus->is_optout){$opt = 'checked';}else{$opt = '';}
+            if($ct_focus->is_optout){$opt = 'checked';} else{$opt = '';}
             $trkr_html .= "<div id='existing_trkr".$trkr_count."'> <table width='100%' border='0' cellspacing='0' cellpadding='0'>" ;
             $trkr_html .= "<tr class='evenListRowS1'><td width='15%'><input name='wiz_step3_is_optout".$trkr_count."' title='".$mod_strings['LBL_EDIT_OPT_OUT'] . $trkr_count ."' id='existing_is_optout". $trkr_count ."' class='checkbox' type='checkbox' $opt  /><input name='wiz_step3_id".$trkr_count."' value='".$ct_focus->id."' id='existing_tracker_id". $trkr_count ."'type='hidden''/></td>";
             $trkr_html .= "<td width='40%'> <input id='existing_tracker_name". $trkr_count ."' type='text' size='20' maxlength='255' name='wiz_step3_tracker_name". $trkr_count ."' title='".$mod_strings['LBL_EDIT_TRACKER_NAME']. $trkr_count ."' value='".$ct_focus->tracker_name."' ></td>";
@@ -315,7 +327,7 @@ 
     }
     
     $trkr_html .= "<div id='no_trackers'></div>";
-    }else{
+    } else{
         $trkr_html .= "<div id='no_trackers'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
     }
     $ss->assign('EXISTING_TRACKERS', $trkr_html);
@@ -457,7 +469,7 @@ 
 
 
 
-}else{
+} else{
     //this is not a newlsetter campaign, so fill in target list table
     //create array for javascript, this will help to display the option text, not the value
     $dom_txt =' ';
@@ -485,7 +497,7 @@ 
         }
 
         $trgt_html  .= "<div id='no_targets'></div>";
-    }else{
+    } else{
         $trgt_html  .= "<div id='no_targets'><table width='100%' border='0' cellspacing='0' cellpadding='0'><tr class='evenListRowS1'><td>".$mod_strings['LBL_NONE']."</td></tr></table></div>";
 
     }
@@ -572,12 +584,11 @@ 
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'campaign',$mrkt_string,$summ_url, 'dotlist'));
     $ss->assign('HIDE_CONTINUE','hidden');
 
-}elseif($campaign_type == 'email'){
+} elseif($campaign_type == 'email'){
     $steps = create_email_steps();
     if($focus->id) {
         $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=" . $focus->id . "&record=" . $focus->id;
-    }
-    else {
+    } else {
         $summ_url = false;
     }
     foreach($steps as $key => $step) {
@@ -588,13 +599,12 @@ 
     $template_id = isset($_REQUEST['template_id']) && $_REQUEST['template_id'] ? $_REQUEST['template_id'] : null;
     $ss->assign('NAV_ITEMS',create_wiz_menu_items($_steps,'email',$mrkt_string,$summ_url, 'dotlist', $campaign_id, $marketing_id, $template_id));
     $ss->assign('HIDE_CONTINUE','submit');
-}else{
+} else{
     $steps = create_newsletter_steps();
 
     if($focus->id) {
         $summ_url = "index.php?action=WizardHome&module=Campaigns&return_id=" . $focus->id . "&record=" . $focus->id;
-    }
-    else {
+    } else {
         $summ_url = false;
     }
     foreach($steps as $key => $step) {
@@ -696,8 +706,7 @@ 
             preg_match('/\bhref=\'([^\']*)/', $mrkt_string, $matches);
             if(isset($matches[1])) {
                 $marketingLink = $matches[1] . ($matches[1] ? '&jump=2' : false);
-            }
-            else {
+            } else {
                 $marketingLink = false;
             }
 
@@ -710,8 +719,7 @@ 
 
         $nav_html = new DotListWizardMenu($mod_strings, $steps, true);
 
-    }
-    else {
+    } else {
         $nav_html = '<table border="0" cellspacing="0" cellpadding="0" width="100%" >';
         if(isset($steps)  && !empty($steps)){
             $i=1;
@@ -724,7 +732,7 @@ 
             $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">$mrkt_string</div></td></tr>";
             $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+2).">".$mod_strings['LBL_NAVIGATION_MENU_SEND_EMAIL']."</div></li>";
             $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+3).">".$summ_url."</div></td></tr>";
-        }else{
+        } else{
             $nav_html .= "<tr><td scope='row' nowrap><div id='nav_step'".($i+1).">".$summ_url."</div></td></tr>";
         }