adamjakab / SuiteCRM

modules/AOW_WorkFlow/aow_utils.php

Indentation +1 added lines, -1 removed lines

@@ -656,7 +656,7 @@
         }
     }
 
-   return $users[0];
+    return $users[0];
 }
 
 function setLastUser($user_id, $id) {

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;

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();
     	}
         	

Indentation +101 added lines, -101 removed lines

@@ -3,132 +3,132 @@ 
 class ProjectTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testProject()
-	{
-		//execute the contructor and check for the Object type and  attributes
-		$project = new Project();
+    public function testProject()
+    {
+        //execute the contructor and check for the Object type and  attributes
+        $project = new Project();
 
-		$this->assertInstanceOf('Project',$project);
-		$this->assertInstanceOf('SugarBean',$project);
+        $this->assertInstanceOf('Project',$project);
+        $this->assertInstanceOf('SugarBean',$project);
 
 
-		$this->assertAttributeEquals('project', 'table_name', $project);
-		$this->assertAttributeEquals('Project', 'module_dir', $project);
-		$this->assertAttributeEquals('Project', 'object_name', $project);
+        $this->assertAttributeEquals('project', 'table_name', $project);
+        $this->assertAttributeEquals('Project', 'module_dir', $project);
+        $this->assertAttributeEquals('Project', 'object_name', $project);
 
-		$this->assertAttributeEquals(true, 'new_schema', $project);
+        $this->assertAttributeEquals(true, 'new_schema', $project);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testfill_in_additional_detail_fields()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$project = new Project();
+        $project = new Project();
 
-		//test without setting assigned_user_id
-		$project->fill_in_additional_detail_fields();
-		$this->assertEquals("", $project->assigned_user_name);
+        //test without setting assigned_user_id
+        $project->fill_in_additional_detail_fields();
+        $this->assertEquals("", $project->assigned_user_name);
 
 
-		//test with assigned_user_id set
-		$project->assigned_user_id = 1;
-		$project->fill_in_additional_detail_fields();
-		$this->assertEquals("Administrator", $project->assigned_user_name);
+        //test with assigned_user_id set
+        $project->assigned_user_id = 1;
+        $project->fill_in_additional_detail_fields();
+        $this->assertEquals("Administrator", $project->assigned_user_name);
 
-	}
+    }
 
 
-	public function testfill_in_additional_list_fields()
-	{
-		$project = new Project();
+    public function testfill_in_additional_list_fields()
+    {
+        $project = new Project();
 
-		//test without setting assigned_user_id
-		$project->fill_in_additional_list_fields();
-		$this->assertEquals("", $project->assigned_user_name);
+        //test without setting assigned_user_id
+        $project->fill_in_additional_list_fields();
+        $this->assertEquals("", $project->assigned_user_name);
 
 
-		//test with assigned_user_id set
-		$project->assigned_user_id = 1;
-		$project->fill_in_additional_list_fields();
-		$this->assertEquals("Administrator", $project->assigned_user_name);
+        //test with assigned_user_id set
+        $project->assigned_user_id = 1;
+        $project->fill_in_additional_list_fields();
+        $this->assertEquals("Administrator", $project->assigned_user_name);
 
-	}
+    }
 
 
     public function testsave_relationship_changes()
     {
 
-    	$project = new Project();
+        $project = new Project();
 
-    	$project->id =1;
-    	$_REQUEST['relate_id'] = 2;
-    	$_REQUEST['relate_to'] = "contacts";
+        $project->id =1;
+        $_REQUEST['relate_id'] = 2;
+        $_REQUEST['relate_to'] = "contacts";
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$project->save_relationship_changes(true);
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $project->save_relationship_changes(true);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
     }
 
 
-	public function test_get_total_estimated_effort()
-	{
-		//$project = new Project();
-		//$result = $project->_get_total_estimated_effort("1");
-		$this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
+    public function test_get_total_estimated_effort()
+    {
+        //$project = new Project();
+        //$result = $project->_get_total_estimated_effort("1");
+        $this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
 
-	}
+    }
 
 
-	public function test_get_total_actual_effort()
-	{
-		$this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
-	}
+    public function test_get_total_actual_effort()
+    {
+        $this->markTestIncomplete('Can Not be implemented: Unknown column parent_id in where clause \n Argument 3 passed to MysqlManager::convert() must be of the type array, integer given');
+    }
 
 
-	public function testget_summary_text()
-	{
-		$project = new Project();
+    public function testget_summary_text()
+    {
+        $project = new Project();
 
-		//test without setting name
-		$this->assertEquals(Null,$project->get_summary_text());
+        //test without setting name
+        $this->assertEquals(Null,$project->get_summary_text());
 
-		//test with name set
-		$project->name = "test";
-		$this->assertEquals('test',$project->get_summary_text());
+        //test with name set
+        $project->name = "test";
+        $this->assertEquals('test',$project->get_summary_text());
 
-	}
+    }
 
 
-	public function testbuild_generic_where_clause ()
-	{
+    public function testbuild_generic_where_clause ()
+    {
 
-		$project = new Project();
+        $project = new Project();
 
-		//test with empty string params
-		$expected = "project.name LIKE '%%'";
-		$actual = $project->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "project.name LIKE '%%'";
+        $actual = $project->build_generic_where_clause('');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "project.name LIKE '%%'";
-		$actual = $project->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "project.name LIKE '%%'";
+        $actual = $project->build_generic_where_clause('test');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testget_list_view_data()
-	{
+    public function testget_list_view_data()
+    {
         /*
 		$project = new Project();
 
@@ -146,44 +146,44 @@ 
 		$this->assertSame($expected, $actual);
 		*/
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
-	public function testbean_implements(){
+    public function testbean_implements(){
 
-		$project = new Project();
+        $project = new Project();
 
-		$this->assertEquals(false, $project->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $project->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $project->bean_implements('ACL')); //test with valid value
+        $this->assertEquals(false, $project->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $project->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $project->bean_implements('ACL')); //test with valid value
 
-	}
+    }
 
     public function testcreate_export_query()
     {
-    	$project = new Project();
+        $project = new Project();
 
-    	//test with empty string params
-    	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
-    	$actual = $project->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
+        $actual = $project->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-    	//test with valid string params
-    	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
-    	$actual = $project->create_export_query('project.id','users.user_name');
-    	$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
+        $actual = $project->create_export_query('project.id','users.user_name');
+        $this->assertSame($expected,$actual);
 
     }
 
-	public function testgetAllProjectTasks(){
+    public function testgetAllProjectTasks(){
 
-		$project = new Project();
+        $project = new Project();
 
-		$project->id = 1;
-		$result = $project->getAllProjectTasks();
-		$this->assertTrue(is_array($result));
+        $project->id = 1;
+        $result = $project->getAllProjectTasks();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
 }
 ?>

Spacing +14 added lines, -14 removed lines

@@ -8,8 +8,8 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$project = new Project();
 
-		$this->assertInstanceOf('Project',$project);
-		$this->assertInstanceOf('SugarBean',$project);
+		$this->assertInstanceOf('Project', $project);
+		$this->assertInstanceOf('SugarBean', $project);
 
 
 		$this->assertAttributeEquals('project', 'table_name', $project);
@@ -61,7 +61,7 @@ 
 
     	$project = new Project();
 
-    	$project->id =1;
+    	$project->id = 1;
     	$_REQUEST['relate_id'] = 2;
     	$_REQUEST['relate_to'] = "contacts";
 
@@ -97,16 +97,16 @@ 
 		$project = new Project();
 
 		//test without setting name
-		$this->assertEquals(Null,$project->get_summary_text());
+		$this->assertEquals(Null, $project->get_summary_text());
 
 		//test with name set
 		$project->name = "test";
-		$this->assertEquals('test',$project->get_summary_text());
+		$this->assertEquals('test', $project->get_summary_text());
 
 	}
 
 
-	public function testbuild_generic_where_clause ()
+	public function testbuild_generic_where_clause()
 	{
 
 		$project = new Project();
@@ -114,13 +114,13 @@ 
 		//test with empty string params
 		$expected = "project.name LIKE '%%'";
 		$actual = $project->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "project.name LIKE '%%'";
 		$actual = $project->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -148,7 +148,7 @@ 
         $this->assertTrue(true, "NEEDS FIXING!");
 	}
 
-	public function testbean_implements(){
+	public function testbean_implements() {
 
 		$project = new Project();
 
@@ -164,18 +164,18 @@ 
 
     	//test with empty string params
     	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where  project.deleted=0 ";
-    	$actual = $project->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+    	$actual = $project->create_export_query('', '');
+    	$this->assertSame($expected, $actual);
 
 
     	//test with valid string params
     	$expected = "SELECT\n				project.*,\n                users.user_name as assigned_user_name ,project_cstm.jjwg_maps_lng_c,project_cstm.jjwg_maps_lat_c,project_cstm.jjwg_maps_geocode_status_c,project_cstm.jjwg_maps_address_c FROM project  LEFT JOIN project_cstm ON project.id = project_cstm.id_c  LEFT JOIN users\n                   	ON project.assigned_user_id=users.id where (users.user_name) AND  project.deleted=0  ORDER BY project.id";
-    	$actual = $project->create_export_query('project.id','users.user_name');
-    	$this->assertSame($expected,$actual);
+    	$actual = $project->create_export_query('project.id', 'users.user_name');
+    	$this->assertSame($expected, $actual);
 
     }
 
-	public function testgetAllProjectTasks(){
+	public function testgetAllProjectTasks() {
 
 		$project = new Project();
 

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());
     	}
     	

Indentation +642 added lines, -642 removed lines

@@ -4,976 +4,976 @@ 
 class UserTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testUser() {
+    public function testUser() {
 
-		//execute the contructor and check for the Object type and  attributes
-		$user = new User();
+        //execute the contructor and check for the Object type and  attributes
+        $user = new User();
 
-		$this->assertInstanceOf('User',$user);
-		$this->assertInstanceOf('Person',$user);
-		$this->assertInstanceOf('SugarBean',$user);
+        $this->assertInstanceOf('User',$user);
+        $this->assertInstanceOf('Person',$user);
+        $this->assertInstanceOf('SugarBean',$user);
 
-		$this->assertAttributeEquals('Users', 'module_dir', $user);
-		$this->assertAttributeEquals('User', 'object_name', $user);
-		$this->assertAttributeEquals('users', 'table_name', $user);
+        $this->assertAttributeEquals('Users', 'module_dir', $user);
+        $this->assertAttributeEquals('User', 'object_name', $user);
+        $this->assertAttributeEquals('users', 'table_name', $user);
 
-		$this->assertAttributeEquals(true, 'new_schema', $user);
-		$this->assertAttributeEquals(false, 'authenticated', $user);
-		$this->assertAttributeEquals(true, 'importable', $user);
-		$this->assertAttributeEquals(false, 'team_exists', $user);
+        $this->assertAttributeEquals(true, 'new_schema', $user);
+        $this->assertAttributeEquals(false, 'authenticated', $user);
+        $this->assertAttributeEquals(true, 'importable', $user);
+        $this->assertAttributeEquals(false, 'team_exists', $user);
 
-	}
+    }
 
 
     public function testgetSystemUser()
     {
-    	//unset and reconnect Db to resolve mysqli fetch exeception
-    	global $db;
-    	unset ($db->database);
-    	$db->checkConnection();
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-    	$user = new User();
+        $user = new User();
 
-    	$result = $user->getSystemUser();
+        $result = $user->getSystemUser();
 
-    	$this->assertInstanceOf('User',$result);
-    	$this->assertEquals(1, $result->id);
+        $this->assertInstanceOf('User',$result);
+        $this->assertEquals(1, $result->id);
 
     }
 
 
-	public function testgetDefaultSignature()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testgetDefaultSignature()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->getDefaultSignature();
-		$this->assertTrue(is_array($result));
+        $result = $user->getDefaultSignature();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
 
-	public function testgetSignature()
-	{
-		$user = new User();
+    public function testgetSignature()
+    {
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->getSignature(1);
-		$this->assertEquals(false,$result);
+        $result = $user->getSignature(1);
+        $this->assertEquals(false,$result);
 
-	}
+    }
 
-	public function testgetSignaturesArray() {
+    public function testgetSignaturesArray() {
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->getSignaturesArray();
-		$this->assertTrue(is_array($result));
+        $result = $user->getSignaturesArray();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
 
-	public function testgetSignatures()
-	{
-		$user = new User();
+    public function testgetSignatures()
+    {
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$expected = "<select onChange='setSigEditButtonVisibility();' id='signature_id' name='signature_id'>\n<OPTION selected value=''>--None--</OPTION></select>";
-		$actual = $user->getSignatures();
-		$this->assertSame($expected, $actual);
+        $expected = "<select onChange='setSigEditButtonVisibility();' id='signature_id' name='signature_id'>\n<OPTION selected value=''>--None--</OPTION></select>";
+        $actual = $user->getSignatures();
+        $this->assertSame($expected, $actual);
 
-	}
+    }
 
 
-	public function testgetSignatureButtons()
-	{
+    public function testgetSignatureButtons()
+    {
 
-		global $mod_strings;
+        global $mod_strings;
 
-		$user = new User();
+        $user = new User();
 
-		//preset required values
-		$user->retrieve(1);
-		$mod_strings['LBL_BUTTON_EDIT'] = "";
-		$mod_strings['LBL_BUTTON_CREATE'] = "";
+        //preset required values
+        $user->retrieve(1);
+        $mod_strings['LBL_BUTTON_EDIT'] = "";
+        $mod_strings['LBL_BUTTON_CREATE'] = "";
 
 
-		//test with defaultDisplay false
-		$expected = "<input class='button' onclick='javascript:open_email_signature_form(\"\", \"1\");' value='' type='button'>&nbsp;<span name=\"edit_sig\" id=\"edit_sig\" style=\"visibility:hidden;\"><input class=\"button\" onclick=\"javascript:open_email_signature_form(document.getElementById('signature_id', '').value)\" value=\"\" type=\"button\" tabindex=\"392\">&nbsp;\n					</span>";
-		$actual = $user->getSignatureButtons('');
-		$this->assertSame($expected, $actual);
+        //test with defaultDisplay false
+        $expected = "<input class='button' onclick='javascript:open_email_signature_form(\"\", \"1\");' value='' type='button'>&nbsp;<span name=\"edit_sig\" id=\"edit_sig\" style=\"visibility:hidden;\"><input class=\"button\" onclick=\"javascript:open_email_signature_form(document.getElementById('signature_id', '').value)\" value=\"\" type=\"button\" tabindex=\"392\">&nbsp;\n					</span>";
+        $actual = $user->getSignatureButtons('');
+        $this->assertSame($expected, $actual);
 
 
-		//test with defaultDisplay true
-		$expected = "<input class='button' onclick='javascript:open_email_signature_form(\"\", \"1\");' value='' type='button'>&nbsp;<span name=\"edit_sig\" id=\"edit_sig\" style=\"visibility:inherit;\"><input class=\"button\" onclick=\"javascript:open_email_signature_form(document.getElementById('signature_id', '').value)\" value=\"\" type=\"button\" tabindex=\"392\">&nbsp;\n					</span>";
-		$actual = $user->getSignatureButtons('',true);
-		$this->assertSame($expected, $actual);
+        //test with defaultDisplay true
+        $expected = "<input class='button' onclick='javascript:open_email_signature_form(\"\", \"1\");' value='' type='button'>&nbsp;<span name=\"edit_sig\" id=\"edit_sig\" style=\"visibility:inherit;\"><input class=\"button\" onclick=\"javascript:open_email_signature_form(document.getElementById('signature_id', '').value)\" value=\"\" type=\"button\" tabindex=\"392\">&nbsp;\n					</span>";
+        $actual = $user->getSignatureButtons('',true);
+        $this->assertSame($expected, $actual);
 
-	}
+    }
 
 
-	public function testhasPersonalEmail()
-	{
+    public function testhasPersonalEmail()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(2);
+        $user->retrieve(2);
 
-		$result = $user->hasPersonalEmail();
-		$this->assertEquals(false,$result);
+        $result = $user->hasPersonalEmail();
+        $this->assertEquals(false,$result);
 
-	}
+    }
 
 
-	public function testgetUserPrivGuid()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testgetUserPrivGuid()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->getUserPrivGuid();
+        $result = $user->getUserPrivGuid();
 
-		$this->assertTrue(isset($result));
-		$this->assertEquals(36, strlen($result));
+        $this->assertTrue(isset($result));
+        $this->assertEquals(36, strlen($result));
 
-	}
+    }
 
-	public function testsetUserPrivGuid()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testsetUserPrivGuid()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$user->setUserPrivGuid();
+        $user->setUserPrivGuid();
 
-		$result = $user->getPreference('userPrivGuid', 'global', $user);
+        $result = $user->getPreference('userPrivGuid', 'global', $user);
 
-		$this->assertTrue(isset($result));
-		$this->assertEquals(36, strlen($result));
+        $this->assertTrue(isset($result));
+        $this->assertEquals(36, strlen($result));
 
-	}
+    }
 
-	public function testSetAndGetAndResetPreference( )
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testSetAndGetAndResetPreference( )
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
 
-		//test setPreference method
-		$user->setPreference('userPrivGuid', 'someGuid', 0, 'global', $user);
+        //test setPreference method
+        $user->setPreference('userPrivGuid', 'someGuid', 0, 'global', $user);
 
 
-		//test getPreference method
-		$result = $user->getPreference('userPrivGuid', 'global', $user);
-		$this->assertTrue(isset($result));
-		$this->assertEquals('someGuid', $result);
+        //test getPreference method
+        $result = $user->getPreference('userPrivGuid', 'global', $user);
+        $this->assertTrue(isset($result));
+        $this->assertEquals('someGuid', $result);
 
 
-		//test resetPreferences method and verify that created preference is no longer available
-		$user->resetPreferences();
-		$result = $user->getPreference('userPrivGuid', 'global', $user);
-		$this->assertFalse(isset($result));
+        //test resetPreferences method and verify that created preference is no longer available
+        $user->resetPreferences();
+        $result = $user->getPreference('userPrivGuid', 'global', $user);
+        $this->assertFalse(isset($result));
 
-	}
+    }
 
 
 
 
-	public function testsavePreferencesToDB()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testsavePreferencesToDB()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$user->savePreferencesToDB();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $user->savePreferencesToDB();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-	}
+    }
 
 
-	public function testreloadPreferences()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testreloadPreferences()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->reloadPreferences();
-		$this->assertEquals(true, $result);
+        $result = $user->reloadPreferences();
+        $this->assertEquals(true, $result);
 
-	}
+    }
 
 
-	public function testgetUserDateTimePreferences()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testgetUserDateTimePreferences()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->getUserDateTimePreferences();
+        $result = $user->getUserDateTimePreferences();
 
-		$this->assertTrue(is_array($result));
-		$this->assertTrue(isset($result['date']));
-		$this->assertTrue(isset($result['time']));
-		$this->assertTrue(isset($result['userGmt']));
-		$this->assertTrue(isset($result['userGmtOffset']));
+        $this->assertTrue(is_array($result));
+        $this->assertTrue(isset($result['date']));
+        $this->assertTrue(isset($result['time']));
+        $this->assertTrue(isset($result['userGmt']));
+        $this->assertTrue(isset($result['userGmtOffset']));
 
-	}
+    }
 
 
-	public function testloadPreferences( )
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testloadPreferences( )
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->loadPreferences();
-		$this->assertEquals(true, $result);
+        $result = $user->loadPreferences();
+        $this->assertEquals(true, $result);
 
-	}
+    }
 
 
     public function testGetETagSeedAndIncrementETag(){
 
-    	//unset and reconnect Db to resolve mysqli fetch exeception
-    	global $db;
-    	unset ($db->database);
-    	$db->checkConnection();
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-    	$user = new User();
+        $user = new User();
 
-    	$user->retrieve(1);
+        $user->retrieve(1);
 
-    	//execute getETagSeed method, get Etag value
-    	$ETagInitial = $user->getETagSeed('test');
-    	$this->assertGreaterThanOrEqual(0,$ETagInitial);
+        //execute getETagSeed method, get Etag value
+        $ETagInitial = $user->getETagSeed('test');
+        $this->assertGreaterThanOrEqual(0,$ETagInitial);
 
 
-    	//execute incrementETag to increment
-    	$user->incrementETag('test');
+        //execute incrementETag to increment
+        $user->incrementETag('test');
 
 
-    	//execute getETagSeed method again, get Etag final value and  compare final and initial values
-    	$ETagFinal = $user->getETagSeed('test');
-    	$this->assertGreaterThan($ETagInitial, $ETagFinal);
+        //execute getETagSeed method again, get Etag final value and  compare final and initial values
+        $ETagFinal = $user->getETagSeed('test');
+        $this->assertGreaterThan($ETagInitial, $ETagFinal);
 
     }
 
 
 
-	public function testgetLicensedUsersWhere()
-	{
-		$expected = "deleted=0 AND status='Active' AND user_name IS NOT NULL AND is_group=0 AND portal_only=0  AND LENGTH(user_name)>0";
-		$actual = User::getLicensedUsersWhere();
-		$this->assertSame($expected, $actual);
+    public function testgetLicensedUsersWhere()
+    {
+        $expected = "deleted=0 AND status='Active' AND user_name IS NOT NULL AND is_group=0 AND portal_only=0  AND LENGTH(user_name)>0";
+        $actual = User::getLicensedUsersWhere();
+        $this->assertSame($expected, $actual);
 
-	}
+    }
 
     public function testget_summary_text()
     {
-    	$user = new User();
+        $user = new User();
 
-    	//test without setting name
-    	$this->assertEquals(Null,$user->get_summary_text());
+        //test without setting name
+        $this->assertEquals(Null,$user->get_summary_text());
 
-    	//test with name set
-    	$user->name = "test";
-    	$this->assertEquals('test',$user->get_summary_text());
+        //test with name set
+        $user->name = "test";
+        $this->assertEquals('test',$user->get_summary_text());
 
-	}
+    }
 
-	public function testbean_implements()
-	{
-		$user = new User();
+    public function testbean_implements()
+    {
+        $user = new User();
 
-		$this->assertEquals(false, $user->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $user->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $user->bean_implements('ACL')); //test with valid value
-	}
+        $this->assertEquals(false, $user->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $user->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $user->bean_implements('ACL')); //test with valid value
+    }
 
 
-	public function testcheck_role_membership()
-	{
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+    public function testcheck_role_membership()
+    {
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-		$user = new User();
+        $user = new User();
 
-		$result = $user->check_role_membership("test", '');
-		$this->assertEquals(false, $result);
+        $result = $user->check_role_membership("test", '');
+        $this->assertEquals(false, $result);
 
 
-		$result = $user->check_role_membership("test", '1');
-		$this->assertEquals(false, $result);
+        $result = $user->check_role_membership("test", '1');
+        $this->assertEquals(false, $result);
 
-	}
+    }
 
 
-	public function testsaveAndOthers()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testsaveAndOthers()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
 
-		$user = new User();
+        $user = new User();
 
-		$user->user_name  = "test";
+        $user->user_name  = "test";
 
-		$user->first_name  = "firstn";
-		$user->last_name  = "lastn";
+        $user->first_name  = "firstn";
+        $user->last_name  = "lastn";
 
-		$user->email1 = "one@email.com";
-		$user->email2 = "two@email.com";
+        $user->email1 = "one@email.com";
+        $user->email2 = "two@email.com";
 
-		$result = $user->save();
+        $result = $user->save();
 
-		//test for record ID to verify that record is saved
-		$this->assertTrue(isset($user->id));
-		$this->assertEquals(36, strlen($user->id));
+        //test for record ID to verify that record is saved
+        $this->assertTrue(isset($user->id));
+        $this->assertEquals(36, strlen($user->id));
 
 
-		//test retrieve method
-		$this->retrieve($user->id);
+        //test retrieve method
+        $this->retrieve($user->id);
 
 
-		//test retrieve_by_email_address method
-		$this->retrieve_by_email_address($user->id);
+        //test retrieve_by_email_address method
+        $this->retrieve_by_email_address($user->id);
 
 
-		//test newPassword And findUserPassword methods
-		$this->NewPasswordAndFindUserPassword($user->id);
+        //test newPassword And findUserPassword methods
+        $this->NewPasswordAndFindUserPassword($user->id);
 
 
-		//test authenticate_user method
-		$this->authenticate_user($user->id);
+        //test authenticate_user method
+        $this->authenticate_user($user->id);
 
 
-		//test load_user method
-		$this->load_user($user->id);
+        //test load_user method
+        $this->load_user($user->id);
 
 
-		//test change_password method
-		$this->change_password($user->id);
+        //test change_password method
+        $this->change_password($user->id);
 
 
-		//test getPreferredEmail method
-		$this->getPreferredEmail($user->id);
+        //test getPreferredEmail method
+        $this->getPreferredEmail($user->id);
 
 
-		//test getUsersNameAndEmail method
-		$this->getUsersNameAndEmail($user->id);
+        //test getUsersNameAndEmail method
+        $this->getUsersNameAndEmail($user->id);
 
 
-		//test getEmailInfo method
-		$this->getEmailInfo($user->id);
+        //test getEmailInfo method
+        $this->getEmailInfo($user->id);
 
 
-		//change username and delete the user to avoid picking it up by password in future
-		$user->user_name  = "test_deleted";
-		$user->save();
-		$user->mark_deleted($user->id);
+        //change username and delete the user to avoid picking it up by password in future
+        $user->user_name  = "test_deleted";
+        $user->save();
+        $user->mark_deleted($user->id);
 
-	}
+    }
 
-	public function retrieve($id)
-	{
-		$user = new User();
+    public function retrieve($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		$this->assertEquals("test", $user->user_name);
+        $this->assertEquals("test", $user->user_name);
 
-		$this->assertEquals("firstn", $user->first_name);
-		$this->assertEquals("lastn", $user->last_name);
+        $this->assertEquals("firstn", $user->first_name);
+        $this->assertEquals("lastn", $user->last_name);
 
-		$this->assertEquals("one@email.com", $user->email1);
-		$this->assertEquals("two@email.com", $user->email2);
+        $this->assertEquals("one@email.com", $user->email1);
+        $this->assertEquals("two@email.com", $user->email2);
 
-	}
+    }
 
-	public function retrieve_by_email_address($id)
-	{
-		$user = new User();
+    public function retrieve_by_email_address($id)
+    {
+        $user = new User();
 
-		//test with invalid email
-		$user->retrieve_by_email_address("wrongone@email.com");
-		$this->assertEquals('', $user->id);
+        //test with invalid email
+        $user->retrieve_by_email_address("wrongone@email.com");
+        $this->assertEquals('', $user->id);
 
 
-		//test with valid email and test for record ID to verify that record is same
-		$user->retrieve_by_email_address("one@email.com");
-		$this->assertTrue(isset($user->id));
-		$this->assertEquals($id, $user->id);
+        //test with valid email and test for record ID to verify that record is same
+        $user->retrieve_by_email_address("one@email.com");
+        $this->assertTrue(isset($user->id));
+        $this->assertEquals($id, $user->id);
 
-	}
+    }
 
-	public function NewPasswordAndFindUserPassword($id)
-	{
-		$user = new User();
+    public function NewPasswordAndFindUserPassword($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		//set user password and then retrieve user by created password
-		$user->setNewPassword("test");
+        //set user password and then retrieve user by created password
+        $user->setNewPassword("test");
 
-		$result = User::findUserPassword("test",md5("test"));
+        $result = User::findUserPassword("test",md5("test"));
 
-		$this->assertTrue(isset($result['id']));
-		$this->assertEquals($id, $result['id']);
+        $this->assertTrue(isset($result['id']));
+        $this->assertEquals($id, $result['id']);
 
-	}
+    }
 
 
-	public function authenticate_user($id)
-	{
-		$user = new User();
+    public function authenticate_user($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		//test with invalid password
-		$result = $user->authenticate_user(md5("pass"));
-		$this->assertEquals(false ,$result);
+        //test with invalid password
+        $result = $user->authenticate_user(md5("pass"));
+        $this->assertEquals(false ,$result);
 
-		//test with invalid password
-		$result = $user->authenticate_user(md5("test"));
-		$this->assertEquals(true ,$result);
+        //test with invalid password
+        $result = $user->authenticate_user(md5("test"));
+        $this->assertEquals(true ,$result);
 
-	}
+    }
 
 
-	public function load_user($id)
-	{
-		$user = new User();
+    public function load_user($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		$result = $user->load_user("test");
+        $result = $user->load_user("test");
 
-		$this->assertEquals(true, $result->authenticated);
+        $this->assertEquals(true, $result->authenticated);
 
-	}
+    }
 
-	public function change_password($id)
-	{
-		$user = new User();
+    public function change_password($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		//execute the method and verifh that it returns true
-		$result = $user->change_password("test", "testpass");
-		$this->assertEquals(true, $result);
+        //execute the method and verifh that it returns true
+        $result = $user->change_password("test", "testpass");
+        $this->assertEquals(true, $result);
 
 
-		//find the user by new password
-		$result = User::findUserPassword("test",md5("testpass"));
+        //find the user by new password
+        $result = User::findUserPassword("test",md5("testpass"));
 
-		$this->assertTrue(isset($result['id']));
-		$this->assertEquals($id, $result['id']);
+        $this->assertTrue(isset($result['id']));
+        $this->assertEquals($id, $result['id']);
 
-	}
+    }
 
-	public function getPreferredEmail($id)
-	{
-		$user = new User();
+    public function getPreferredEmail($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+        $expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
 
-		$actual = $user->getPreferredEmail();
+        $actual = $user->getPreferredEmail();
 
-		$this->assertSame($actual,$expected);
+        $this->assertSame($actual,$expected);
 
-	}
+    }
 
-	public function getUsersNameAndEmail($id)
-	{
-		$user = new User();
+    public function getUsersNameAndEmail($id)
+    {
+        $user = new User();
 
-		$user->retrieve($id);
+        $user->retrieve($id);
 
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+        $expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
 
-		$actual = $user->getUsersNameAndEmail();
+        $actual = $user->getUsersNameAndEmail();
 
-		$this->assertEquals($actual,$expected);
-	}
+        $this->assertEquals($actual,$expected);
+    }
 
 
-	public function getEmailInfo($id)
-	{
-		$user = new User();
+    public function getEmailInfo($id)
+    {
+        $user = new User();
 
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+        $expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
 
-		$actual = $user->getEmailInfo($id);
+        $actual = $user->getEmailInfo($id);
 
-		$this->assertEquals($actual,$expected);
-	}
+        $this->assertEquals($actual,$expected);
+    }
 
 
-	public function testencrypt_password()
-	{
-		$user = new User();
+    public function testencrypt_password()
+    {
+        $user = new User();
 
-		$result = $user->encrypt_password("test");
-		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+        $result = $user->encrypt_password("test");
+        $this->assertTrue(isset($result));
+        $this->assertGreaterThan(0,strlen($result));
 
-	}
+    }
 
-	public function testgetPasswordHash()
-	{
+    public function testgetPasswordHash()
+    {
 
-		$result= User::getPasswordHash("test");
+        $result= User::getPasswordHash("test");
 
-		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+        $this->assertTrue(isset($result));
+        $this->assertGreaterThan(0,strlen($result));
 
-		$this->markTestIncomplete('Error: crypt(): No salt parameter was specified. You must use a randomly generated salt and a strong hash function to produce a secure hash.');
+        $this->markTestIncomplete('Error: crypt(): No salt parameter was specified. You must use a randomly generated salt and a strong hash function to produce a secure hash.');
 
-	}
+    }
 
 
-	public function testcheckPassword()
-	{
+    public function testcheckPassword()
+    {
 
-		//test with empty password and empty hash
-		$result = User::checkPassword("", '');
-		$this->assertEquals(false,$result);
+        //test with empty password and empty hash
+        $result = User::checkPassword("", '');
+        $this->assertEquals(false,$result);
 
 
-		//test with valid hash and empty password
-		$result = User::checkPassword("", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(false,$result);
+        //test with valid hash and empty password
+        $result = User::checkPassword("", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
+        $this->assertEquals(false,$result);
 
 
-		//test with valid password and invalid hash
-		$result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
-		$this->assertEquals(false,$result);
+        //test with valid password and invalid hash
+        $result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
+        $this->assertEquals(false,$result);
 
 
-		//test with valid password and valid hash
-		$result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(true,$result);
+        //test with valid password and valid hash
+        $result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
+        $this->assertEquals(true,$result);
 
-	}
+    }
 
 
-	public function testcheckPasswordMD5()
-	{
+    public function testcheckPasswordMD5()
+    {
 
-		//test with empty password and empty hash
-		$result = User::checkPasswordMD5(md5(""), '');
-		$this->assertEquals(false,$result);
+        //test with empty password and empty hash
+        $result = User::checkPasswordMD5(md5(""), '');
+        $this->assertEquals(false,$result);
 
 
-		//test with valid hash and empty password
-		$result = User::checkPasswordMD5(md5(""), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(false,$result);
+        //test with valid hash and empty password
+        $result = User::checkPasswordMD5(md5(""), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
+        $this->assertEquals(false,$result);
 
 
-		//test with valid password and invalid hash
-		$result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
-		$this->assertEquals(false,$result);
+        //test with valid password and invalid hash
+        $result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
+        $this->assertEquals(false,$result);
 
 
-		//test with valid password and valid hash
-		$result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(true,$result);
+        //test with valid password and valid hash
+        $result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
+        $this->assertEquals(true,$result);
 
-	}
+    }
 
 
-	public function testis_authenticated()
-	{
+    public function testis_authenticated()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		//test without setting name
-		$this->assertEquals(false, $user->is_authenticated());
+        //test without setting name
+        $this->assertEquals(false, $user->is_authenticated());
 
-		//test with name set
-		$user->authenticated = true;
-		$this->assertEquals(true,$user->is_authenticated());
+        //test with name set
+        $user->authenticated = true;
+        $this->assertEquals(true,$user->is_authenticated());
 
-	}
+    }
 
-	public function testfill_in_additional_list_fields()
-	{
+    public function testfill_in_additional_list_fields()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$user->fill_in_additional_list_fields();
+        $user->fill_in_additional_list_fields();
 
-		$this->assertEquals("Administrator",$user->full_name);
+        $this->assertEquals("Administrator",$user->full_name);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields()
-	{
+    public function testfill_in_additional_detail_fields()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$user->fill_in_additional_detail_fields();
+        $user->fill_in_additional_detail_fields();
 
-		$this->assertEquals("Administrator",$user->full_name);
+        $this->assertEquals("Administrator",$user->full_name);
 
-	}
+    }
 
-	public function testretrieve_user_id()
-	{
-		$user = new User();
+    public function testretrieve_user_id()
+    {
+        $user = new User();
 
-		$result = $user->retrieve_user_id("admin");
-		$this->assertEquals(1, $result);
-	}
+        $result = $user->retrieve_user_id("admin");
+        $this->assertEquals(1, $result);
+    }
 
 
-	public function testverify_data()
-	{
+    public function testverify_data()
+    {
 
-		global $mod_strings;
+        global $mod_strings;
 
-		$mod_strings['ERR_EMAIL_NO_OPTS'] = "";
+        $mod_strings['ERR_EMAIL_NO_OPTS'] = "";
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		//test with default/true
-		$result = $user->verify_data();
-		$this->assertEquals(true, $result);
+        //test with default/true
+        $result = $user->verify_data();
+        $this->assertEquals(true, $result);
 
 
-		//test with false
-		$result = $user->verify_data(false);
-		$this->assertEquals(false, $result);
+        //test with false
+        $result = $user->verify_data(false);
+        $this->assertEquals(false, $result);
 
-	}
+    }
 
-	public function testget_list_view_data()
-	{
-		global $mod_strings;
-		$mod_strings['LBL_CHECKMARK'] = "";
+    public function testget_list_view_data()
+    {
+        global $mod_strings;
+        $mod_strings['LBL_CHECKMARK'] = "";
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
-		$result = $user->get_list_view_data();
-		$this->assertTrue(is_array($result));
+        $result = $user->get_list_view_data();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
-	public function testlist_view_parse_additional_sections()
-	{
+    public function testlist_view_parse_additional_sections()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		$list_form = array();
-		$result = $user->list_view_parse_additional_sections($list_form);
-		$this->assertSame($list_form, $result);
+        $list_form = array();
+        $result = $user->list_view_parse_additional_sections($list_form);
+        $this->assertSame($list_form, $result);
 
-	}
+    }
 
     public function testGetAllUsersAndGetActiveUsers()
     {
 
-    	$all_users = User::getAllUsers();
-    	$this->assertTrue(is_array($all_users));
+        $all_users = User::getAllUsers();
+        $this->assertTrue(is_array($all_users));
 
-    	$active_users = User::getActiveUsers();
-    	$this->assertTrue(is_array($active_users));
+        $active_users = User::getActiveUsers();
+        $this->assertTrue(is_array($active_users));
 
-    	$this->assertGreaterThanOrEqual(count($active_users), count($all_users));
+        $this->assertGreaterThanOrEqual(count($active_users), count($all_users));
     }
 
 
-	public function testcreate_export_query() {
+    public function testcreate_export_query() {
 
-		$user = new User();
+        $user = new User();
 
-    	//test with empty string params
-    	$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 AND users.is_admin=0 ORDER BY users.user_name";
-    	$actual = $user->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 AND users.is_admin=0 ORDER BY users.user_name";
+        $actual = $user->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-    	//test with valid string params
-    	$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE user_name=\"\" AND  users.deleted = 0 AND users.is_admin=0 ORDER BY id";
-    	$actual = $user->create_export_query('id','user_name=""');
-    	$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE user_name=\"\" AND  users.deleted = 0 AND users.is_admin=0 ORDER BY id";
+        $actual = $user->create_export_query('id','user_name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testget_meetings() {
+    public function testget_meetings() {
 
-		$user = new User();
+        $user = new User();
 
-		$result = $user->get_meetings();
-		$this->assertTrue(is_array($result));
+        $result = $user->get_meetings();
+        $this->assertTrue(is_array($result));
 
-	}
+    }
 
-	public function testget_calls() {
+    public function testget_calls() {
 
-		$user = new User();
+        $user = new User();
 
-		//$result = $user->get_calls();
-		//$this->assertTrue(is_array($result));
+        //$result = $user->get_calls();
+        //$this->assertTrue(is_array($result));
 
-		$this->markTestIncomplete('Error:Only variables should be passed by reference');
-	}
+        $this->markTestIncomplete('Error:Only variables should be passed by reference');
+    }
 
 
-	public function testdisplayEmailCounts() {
+    public function testdisplayEmailCounts() {
 
-		//unset and reconnect Db to resolve mysqli fetch exeception
-		global $db;
-		unset ($db->database);
-		$db->checkConnection();
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
 
-		$user = new User();
+        $user = new User();
 
-		$expected = '<script type="text/javascript" language="Javascript">var welcome = document.getElementById("welcome");var welcomeContent = welcome.innerHTML;welcome.innerHTML = welcomeContent + "&nbsp;&nbsp;&nbsp;&nbsp;<a href=index.php?module=Emails&action=ListViewGroup>Group Inbox: (0 New)</a>";</script>';
+        $expected = '<script type="text/javascript" language="Javascript">var welcome = document.getElementById("welcome");var welcomeContent = welcome.innerHTML;welcome.innerHTML = welcomeContent + "&nbsp;&nbsp;&nbsp;&nbsp;<a href=index.php?module=Emails&action=ListViewGroup>Group Inbox: (0 New)</a>";</script>';
 
-		//cpature the screen output and compare with exected values
+        //cpature the screen output and compare with exected values
 
-		ob_start();
+        ob_start();
 
-		$user->displayEmailCounts();
+        $user->displayEmailCounts();
 
-		$renderedContent = ob_get_contents();
-		ob_end_clean();
+        $renderedContent = ob_get_contents();
+        ob_end_clean();
 
-		$this->assertSame($expected,$renderedContent);
+        $this->assertSame($expected,$renderedContent);
 
-	}
+    }
 
 
-	public function testgetSystemDefaultNameAndEmail()
-	{
+    public function testgetSystemDefaultNameAndEmail()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		$expected = array( 'email' => 'do_not_reply@example.com', 'name' => 'SuiteCRM');
-		$actual = $user->getSystemDefaultNameAndEmail();
-		$this->assertSame($expected,$actual);
+        $expected = array( 'email' => 'do_not_reply@example.com', 'name' => 'SuiteCRM');
+        $actual = $user->getSystemDefaultNameAndEmail();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testsetDefaultsInConfig()
-	{
-		$user = new User();
+    public function testsetDefaultsInConfig()
+    {
+        $user = new User();
 
-		$result = $user->setDefaultsInConfig();
+        $result = $user->setDefaultsInConfig();
 
-		$this->assertTrue(is_array($result));
-		$this->assertEquals('sugar', $result['email_default_client']);
-		$this->assertEquals('html', $result['email_default_editor']);
+        $this->assertTrue(is_array($result));
+        $this->assertEquals('sugar', $result['email_default_client']);
+        $this->assertEquals('html', $result['email_default_editor']);
 
-	}
+    }
 
 
-	public function testgetEmailLink2()
-	{
-		$user = new User();
+    public function testgetEmailLink2()
+    {
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
 
-		//test with accounts module
-		$account = new Account();
-		$account->name = "test";
+        //test with accounts module
+        $account = new Account();
+        $account->name = "test";
 
-		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Cabc@email.com\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
-		$actual = $user->getEmailLink2("abc@email.com", $account);
-		$this->assertSame($expected,$actual);
+        $expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Cabc@email.com\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
+        $actual = $user->getEmailLink2("abc@email.com", $account);
+        $this->assertSame($expected,$actual);
 
 
-		//test with contacts module
-		$contact = new Contact();
-		$contact->name = "test";
+        //test with contacts module
+        $contact = new Contact();
+        $contact->name = "test";
 
-		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Cabc@email.com\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
-		$actual = $user->getEmailLink2("abc@email.com", $contact);
-		$this->assertSame($expected,$actual);
+        $expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Cabc@email.com\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
+        $actual = $user->getEmailLink2("abc@email.com", $contact);
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testgetEmailLink()
-	{
+    public function testgetEmailLink()
+    {
 
-		$user = new User();
+        $user = new User();
 
-		$user->retrieve(1);
+        $user->retrieve(1);
 
 
-		//test with accounts module
-		$account = new Account();
-		$account->name = "test";
+        //test with accounts module
+        $account = new Account();
+        $account->name = "test";
 
-		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Ctest\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
-		$actual = $user->getEmailLink("name", $account);
-		$this->assertSame($expected,$actual);
+        $expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Ctest\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
+        $actual = $user->getEmailLink("name", $account);
+        $this->assertSame($expected,$actual);
 
 
-		//test with contacts module
-		$contact = new Contact();
-		$contact->name = "test";
+        //test with contacts module
+        $contact = new Contact();
+        $contact->name = "test";
 
-		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Ctest\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
-		$actual = $user->getEmailLink("name", $contact);
-		$this->assertSame($expected,$actual);
+        $expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Ctest\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
+        $actual = $user->getEmailLink("name", $contact);
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testgetLocaleFormatDesc()
-	{
-		$user = new User();
+    public function testgetLocaleFormatDesc()
+    {
+        $user = new User();
 
-		$result = $user->getLocaleFormatDesc();
-		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+        $result = $user->getLocaleFormatDesc();
+        $this->assertTrue(isset($result));
+        $this->assertGreaterThan(0,strlen($result));
 
-	}
+    }
 
     public function testisAdmin()
     {
-    	$user = new User();
+        $user = new User();
 
-    	//test without setting attribute
-    	$this->assertEquals(false, $user->isAdmin());
+        //test without setting attribute
+        $this->assertEquals(false, $user->isAdmin());
 
-    	//test with attribute set
-    	$user->is_admin = 1;
-    	$this->assertEquals(true, $user->isAdmin());
+        //test with attribute set
+        $user->is_admin = 1;
+        $this->assertEquals(true, $user->isAdmin());
 
     }
 
     public function testisDeveloperForAnyModule()
     {
-    	$user = new User();
+        $user = new User();
 
-    	//test without setting is_admin
-    	$this->assertEquals(false, $user->isDeveloperForAnyModule());
+        //test without setting is_admin
+        $this->assertEquals(false, $user->isDeveloperForAnyModule());
 
 
-    	//test with id set
-    	$user->id = 1;
-    	$this->assertEquals(false, $user->isDeveloperForAnyModule());
+        //test with id set
+        $user->id = 1;
+        $this->assertEquals(false, $user->isDeveloperForAnyModule());
 
 
-    	//test with id and is_admin set
-    	$user->is_admin = 1;
-    	$this->assertEquals(true, $user->isDeveloperForAnyModule());
+        //test with id and is_admin set
+        $user->is_admin = 1;
+        $this->assertEquals(true, $user->isDeveloperForAnyModule());
 
     }
 
     public function testgetDeveloperModules()
     {
-    	//unset and reconnect Db to resolve mysqli fetch exeception
-    	global $db;
-    	unset ($db->database);
-    	$db->checkConnection();
+        //unset and reconnect Db to resolve mysqli fetch exeception
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-    	$user = new User();
+        $user = new User();
 
-    	$user->retrieve(1);
+        $user->retrieve(1);
 
-    	$result = $user->getDeveloperModules();
-    	$this->assertTrue(is_array($result));
+        $result = $user->getDeveloperModules();
+        $this->assertTrue(is_array($result));
 
     }
 
     public function testisDeveloperForModule()
     {
-    	global $db;
-    	unset ($db->database);
-    	$db->checkConnection();
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-    	$user = new User();
+        $user = new User();
 
 
-    	//test without setting is_admin
-    	$this->assertEquals(false, $user->isDeveloperForModule("Accounts"));
+        //test without setting is_admin
+        $this->assertEquals(false, $user->isDeveloperForModule("Accounts"));
 
 
-    	//test with id set
-    	$user->id = 1;
-    	$this->assertEquals(false, $user->isDeveloperForModule("Accounts"));
+        //test with id set
+        $user->id = 1;
+        $this->assertEquals(false, $user->isDeveloperForModule("Accounts"));
 
 
-    	//test with id and is_admin set
-    	$user->is_admin = 1;
-    	$this->assertEquals(true, $user->isDeveloperForModule("Accounts"));
+        //test with id and is_admin set
+        $user->is_admin = 1;
+        $this->assertEquals(true, $user->isDeveloperForModule("Accounts"));
 
 
     }
@@ -981,59 +981,59 @@ 
     public function testgetAdminModules()
     {
         //unset and reconnect Db to resolve mysqli fetch exeception
-    	global $db;
-    	unset ($db->database);
-    	$db->checkConnection();
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-    	$user = new User();
+        $user = new User();
 
-    	$user->retrieve(1);
+        $user->retrieve(1);
 
-    	$result = $user->getAdminModules();
-    	$this->assertTrue(is_array($result));
+        $result = $user->getAdminModules();
+        $this->assertTrue(is_array($result));
 
     }
 
     public function testisAdminForModule()
     {
-    	global $db;
-    	unset ($db->database);
-    	$db->checkConnection();
+        global $db;
+        unset ($db->database);
+        $db->checkConnection();
 
-    	$user = new User();
+        $user = new User();
 
 
-    	//test without setting is_admin
-    	$this->assertEquals(false, $user->isAdminForModule("Accounts"));
+        //test without setting is_admin
+        $this->assertEquals(false, $user->isAdminForModule("Accounts"));
 
 
-    	//test with id set
-    	$user->id = 1;
-    	$this->assertEquals(false, $user->isAdminForModule("Accounts"));
+        //test with id set
+        $user->id = 1;
+        $this->assertEquals(false, $user->isAdminForModule("Accounts"));
 
 
-    	//test with id and is_admin set
-    	$user->is_admin = 1;
-    	$this->assertEquals(true, $user->isAdminForModule("Accounts"));
+        //test with id and is_admin set
+        $user->is_admin = 1;
+        $this->assertEquals(true, $user->isAdminForModule("Accounts"));
 
 
     }
 
-	public function testshowLastNameFirst()
-	{
-		$user = new User();
+    public function testshowLastNameFirst()
+    {
+        $user = new User();
 
-		$result = $user->showLastNameFirst();
-		$this->assertEquals(false, $result);
+        $result = $user->showLastNameFirst();
+        $this->assertEquals(false, $result);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-   public function testcreate_new_list_query()
-   {
-       /*
+    public function testcreate_new_list_query()
+    {
+        /*
 	   	$user = new User();
 
 	   	//test with empty string params
@@ -1048,31 +1048,31 @@ 
 	   	$actual = $user->create_new_list_query('id','user_name=""');
 	   	$this->assertSame($expected,$actual);
        */
-       $this->assertTrue(true, "NEEDS FIXING!");
-   }
+        $this->assertTrue(true, "NEEDS FIXING!");
+    }
 
 
     public function testget_first_day_of_week()
     {
-    	$user = new User();
+        $user = new User();
 
-    	$result = $user->get_first_day_of_week();
-    	$this->assertTrue(is_numeric($result));
+        $result = $user->get_first_day_of_week();
+        $this->assertTrue(is_numeric($result));
 
     }
 
 
     public function testgeneratePassword()
     {
-    	//generate apsswords and verify they are not same
+        //generate apsswords and verify they are not same
 
-    	$password1 = User::generatePassword();
-    	$this->assertGreaterThan(0,strlen($password1));
+        $password1 = User::generatePassword();
+        $this->assertGreaterThan(0,strlen($password1));
 
-    	$password2 = User::generatePassword();
-    	$this->assertGreaterThan(0,strlen($password2));
+        $password2 = User::generatePassword();
+        $this->assertGreaterThan(0,strlen($password2));
 
-    	$this->assertNotEquals($password1, $password2);
+        $this->assertNotEquals($password1, $password2);
 
     }
 
@@ -1080,50 +1080,50 @@ 
     public function testsendEmailForPassword()
     {
 
-    	$user = new User();
+        $user = new User();
 
-    	$result = $user->sendEmailForPassword("1");
+        $result = $user->sendEmailForPassword("1");
 
-    	//expected result is a array with template not found message.
-    	$this->assertTrue(is_array($result));
+        //expected result is a array with template not found message.
+        $this->assertTrue(is_array($result));
 
     }
 
 
     public function testafterImportSave()
     {
-    	error_reporting(E_ALL);
+        error_reporting(E_ALL);
 
-    	$user = new User();
+        $user = new User();
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$result = $user->afterImportSave();
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->assertStringStartsWith('Cannot modify header information', $e->getMessage());
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $result = $user->afterImportSave();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->assertStringStartsWith('Cannot modify header information', $e->getMessage());
+        }
 
     }
 
 
     public function testisPrimaryEmail()
     {
-    	$user = new User();
+        $user = new User();
 
-    	//test without user email
-    	$this->assertEquals(false, $user->isPrimaryEmail("abc@abc.com"));
+        //test without user email
+        $this->assertEquals(false, $user->isPrimaryEmail("abc@abc.com"));
 
 
-    	//test with non matching user email
-    	$user->email1 = "xyz@abc.com";
-    	$this->assertEquals(false, $user->isPrimaryEmail("abc@abc.com"));
+        //test with non matching user email
+        $user->email1 = "xyz@abc.com";
+        $this->assertEquals(false, $user->isPrimaryEmail("abc@abc.com"));
 
 
-    	//test with matching user email
-    	$user->email1 = "abc@abc.com";
-    	$this->assertEquals(true, $user->isPrimaryEmail("abc@abc.com"));
+        //test with matching user email
+        $user->email1 = "abc@abc.com";
+        $this->assertEquals(true, $user->isPrimaryEmail("abc@abc.com"));
 
     }
 

Spacing +51 added lines, -51 removed lines

@@ -9,9 +9,9 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$user = new User();
 
-		$this->assertInstanceOf('User',$user);
-		$this->assertInstanceOf('Person',$user);
-		$this->assertInstanceOf('SugarBean',$user);
+		$this->assertInstanceOf('User', $user);
+		$this->assertInstanceOf('Person', $user);
+		$this->assertInstanceOf('SugarBean', $user);
 
 		$this->assertAttributeEquals('Users', 'module_dir', $user);
 		$this->assertAttributeEquals('User', 'object_name', $user);
@@ -36,7 +36,7 @@ 
 
     	$result = $user->getSystemUser();
 
-    	$this->assertInstanceOf('User',$result);
+    	$this->assertInstanceOf('User', $result);
     	$this->assertEquals(1, $result->id);
 
     }
@@ -66,7 +66,7 @@ 
 		$user->retrieve(1);
 
 		$result = $user->getSignature(1);
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 	}
 
@@ -116,7 +116,7 @@ 
 
 		//test with defaultDisplay true
 		$expected = "<input class='button' onclick='javascript:open_email_signature_form(\"\", \"1\");' value='' type='button'>&nbsp;<span name=\"edit_sig\" id=\"edit_sig\" style=\"visibility:inherit;\"><input class=\"button\" onclick=\"javascript:open_email_signature_form(document.getElementById('signature_id', '').value)\" value=\"\" type=\"button\" tabindex=\"392\">&nbsp;\n					</span>";
-		$actual = $user->getSignatureButtons('',true);
+		$actual = $user->getSignatureButtons('', true);
 		$this->assertSame($expected, $actual);
 
 	}
@@ -130,7 +130,7 @@ 
 		$user->retrieve(2);
 
 		$result = $user->hasPersonalEmail();
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 	}
 
@@ -285,7 +285,7 @@ 
 	}
 
 
-    public function testGetETagSeedAndIncrementETag(){
+    public function testGetETagSeedAndIncrementETag() {
 
     	//unset and reconnect Db to resolve mysqli fetch exeception
     	global $db;
@@ -298,7 +298,7 @@ 
 
     	//execute getETagSeed method, get Etag value
     	$ETagInitial = $user->getETagSeed('test');
-    	$this->assertGreaterThanOrEqual(0,$ETagInitial);
+    	$this->assertGreaterThanOrEqual(0, $ETagInitial);
 
 
     	//execute incrementETag to increment
@@ -326,11 +326,11 @@ 
     	$user = new User();
 
     	//test without setting name
-    	$this->assertEquals(Null,$user->get_summary_text());
+    	$this->assertEquals(Null, $user->get_summary_text());
 
     	//test with name set
     	$user->name = "test";
-    	$this->assertEquals('test',$user->get_summary_text());
+    	$this->assertEquals('test', $user->get_summary_text());
 
 	}
 
@@ -377,7 +377,7 @@ 
 
 		$user->user_name  = "test";
 
-		$user->first_name  = "firstn";
+		$user->first_name = "firstn";
 		$user->last_name  = "lastn";
 
 		$user->email1 = "one@email.com";
@@ -427,7 +427,7 @@ 
 
 
 		//change username and delete the user to avoid picking it up by password in future
-		$user->user_name  = "test_deleted";
+		$user->user_name = "test_deleted";
 		$user->save();
 		$user->mark_deleted($user->id);
 
@@ -474,7 +474,7 @@ 
 		//set user password and then retrieve user by created password
 		$user->setNewPassword("test");
 
-		$result = User::findUserPassword("test",md5("test"));
+		$result = User::findUserPassword("test", md5("test"));
 
 		$this->assertTrue(isset($result['id']));
 		$this->assertEquals($id, $result['id']);
@@ -490,11 +490,11 @@ 
 
 		//test with invalid password
 		$result = $user->authenticate_user(md5("pass"));
-		$this->assertEquals(false ,$result);
+		$this->assertEquals(false, $result);
 
 		//test with invalid password
 		$result = $user->authenticate_user(md5("test"));
-		$this->assertEquals(true ,$result);
+		$this->assertEquals(true, $result);
 
 	}
 
@@ -523,7 +523,7 @@ 
 
 
 		//find the user by new password
-		$result = User::findUserPassword("test",md5("testpass"));
+		$result = User::findUserPassword("test", md5("testpass"));
 
 		$this->assertTrue(isset($result['id']));
 		$this->assertEquals($id, $result['id']);
@@ -536,11 +536,11 @@ 
 
 		$user->retrieve($id);
 
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com");
 
 		$actual = $user->getPreferredEmail();
 
-		$this->assertSame($actual,$expected);
+		$this->assertSame($actual, $expected);
 
 	}
 
@@ -550,11 +550,11 @@ 
 
 		$user->retrieve($id);
 
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com");
 
 		$actual = $user->getUsersNameAndEmail();
 
-		$this->assertEquals($actual,$expected);
+		$this->assertEquals($actual, $expected);
 	}
 
 
@@ -562,11 +562,11 @@ 
 	{
 		$user = new User();
 
-		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com" );
+		$expected = array("name"=>"firstn lastn", "email"=>"one@email.com");
 
 		$actual = $user->getEmailInfo($id);
 
-		$this->assertEquals($actual,$expected);
+		$this->assertEquals($actual, $expected);
 	}
 
 
@@ -576,17 +576,17 @@ 
 
 		$result = $user->encrypt_password("test");
 		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+		$this->assertGreaterThan(0, strlen($result));
 
 	}
 
 	public function testgetPasswordHash()
 	{
 
-		$result= User::getPasswordHash("test");
+		$result = User::getPasswordHash("test");
 
 		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+		$this->assertGreaterThan(0, strlen($result));
 
 		$this->markTestIncomplete('Error: crypt(): No salt parameter was specified. You must use a randomly generated salt and a strong hash function to produce a secure hash.');
 
@@ -598,22 +598,22 @@ 
 
 		//test with empty password and empty hash
 		$result = User::checkPassword("", '');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 
 		//test with valid hash and empty password
 		$result = User::checkPassword("", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 
 		//test with valid password and invalid hash
 		$result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 
 		//test with valid password and valid hash
 		$result = User::checkPassword("test", '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(true,$result);
+		$this->assertEquals(true, $result);
 
 	}
 
@@ -623,22 +623,22 @@ 
 
 		//test with empty password and empty hash
 		$result = User::checkPasswordMD5(md5(""), '');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 
 		//test with valid hash and empty password
 		$result = User::checkPasswordMD5(md5(""), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 
 		//test with valid password and invalid hash
 		$result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la2');
-		$this->assertEquals(false,$result);
+		$this->assertEquals(false, $result);
 
 
 		//test with valid password and valid hash
 		$result = User::checkPasswordMD5(md5("test"), '$1$Gt0.XI4.$tVVSXgE36sfsVMBNo/9la1');
-		$this->assertEquals(true,$result);
+		$this->assertEquals(true, $result);
 
 	}
 
@@ -653,7 +653,7 @@ 
 
 		//test with name set
 		$user->authenticated = true;
-		$this->assertEquals(true,$user->is_authenticated());
+		$this->assertEquals(true, $user->is_authenticated());
 
 	}
 
@@ -666,7 +666,7 @@ 
 
 		$user->fill_in_additional_list_fields();
 
-		$this->assertEquals("Administrator",$user->full_name);
+		$this->assertEquals("Administrator", $user->full_name);
 
 	}
 
@@ -679,7 +679,7 @@ 
 
 		$user->fill_in_additional_detail_fields();
 
-		$this->assertEquals("Administrator",$user->full_name);
+		$this->assertEquals("Administrator", $user->full_name);
 
 	}
 
@@ -758,14 +758,14 @@ 
 
     	//test with empty string params
     	$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 AND users.is_admin=0 ORDER BY users.user_name";
-    	$actual = $user->create_export_query('','');
-    	$this->assertSame($expected,$actual);
+    	$actual = $user->create_export_query('', '');
+    	$this->assertSame($expected, $actual);
 
 
     	//test with valid string params
     	$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE user_name=\"\" AND  users.deleted = 0 AND users.is_admin=0 ORDER BY id";
-    	$actual = $user->create_export_query('id','user_name=""');
-    	$this->assertSame($expected,$actual);
+    	$actual = $user->create_export_query('id', 'user_name=""');
+    	$this->assertSame($expected, $actual);
 
 	}
 
@@ -811,7 +811,7 @@ 
 		$renderedContent = ob_get_contents();
 		ob_end_clean();
 
-		$this->assertSame($expected,$renderedContent);
+		$this->assertSame($expected, $renderedContent);
 
 	}
 
@@ -821,9 +821,9 @@ 
 
 		$user = new User();
 
-		$expected = array( 'email' => 'do_not_reply@example.com', 'name' => 'SuiteCRM');
+		$expected = array('email' => 'do_not_reply@example.com', 'name' => 'SuiteCRM');
 		$actual = $user->getSystemDefaultNameAndEmail();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -854,7 +854,7 @@ 
 
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Cabc@email.com\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink2("abc@email.com", $account);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with contacts module
@@ -863,7 +863,7 @@ 
 
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Babc%40email.com%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Cabc@email.com\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink2("abc@email.com", $contact);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -882,7 +882,7 @@ 
 
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Accounts\u0026parent_id=\u0026parent_name=test\u0026to_addrs_ids=\u0026to_addrs_names=\u0026to_addrs_emails=\u0026to_email_addrs=test%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Accounts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Accounts\",\"parent_id\":\"\",\"parent_name\":\"test\",\"to_addrs_ids\":\"\",\"to_addrs_names\":\"\",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"test \u003Ctest\u003E\",\"return_module\":\"Accounts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink("name", $account);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with contacts module
@@ -891,7 +891,7 @@ 
 
 		$expected = "<a href='javascript:void(0);' onclick='SUGAR.quickCompose.init({\"fullComposeUrl\":\"contact_id=\u0026parent_type=Contacts\u0026parent_id=\u0026parent_name=+\u0026to_addrs_ids=\u0026to_addrs_names=+\u0026to_addrs_emails=\u0026to_email_addrs=+%26nbsp%3B%26lt%3Btest%26gt%3B\u0026return_module=Contacts\u0026return_action=DetailView\u0026return_id=\",\"composePackage\":{\"contact_id\":\"\",\"parent_type\":\"Contacts\",\"parent_id\":\"\",\"parent_name\":\" \",\"to_addrs_ids\":\"\",\"to_addrs_names\":\" \",\"to_addrs_emails\":\"\",\"to_email_addrs\":\"  \u003Ctest\u003E\",\"return_module\":\"Contacts\",\"return_action\":\"DetailView\",\"return_id\":\"\"}});' class=''>";
 		$actual = $user->getEmailLink("name", $contact);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -901,7 +901,7 @@ 
 
 		$result = $user->getLocaleFormatDesc();
 		$this->assertTrue(isset($result));
-		$this->assertGreaterThan(0,strlen($result));
+		$this->assertGreaterThan(0, strlen($result));
 
 	}
 
@@ -1067,10 +1067,10 @@ 
     	//generate apsswords and verify they are not same
 
     	$password1 = User::generatePassword();
-    	$this->assertGreaterThan(0,strlen($password1));
+    	$this->assertGreaterThan(0, strlen($password1));
 
     	$password2 = User::generatePassword();
-    	$this->assertGreaterThan(0,strlen($password2));
+    	$this->assertGreaterThan(0, strlen($password2));
 
     	$this->assertNotEquals($password1, $password2);
 

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();
 		}
 		 

Indentation +173 added lines, -173 removed lines

@@ -3,79 +3,79 @@ 
 class ProspectListTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testProspectList()
-	{
+    public function testProspectList()
+    {
 
-		//execute the contructor and check for the Object type and  attributes
-		$prospectList = new ProspectList();
+        //execute the contructor and check for the Object type and  attributes
+        $prospectList = new ProspectList();
 
-		$this->assertInstanceOf('ProspectList',$prospectList);
-		$this->assertInstanceOf('SugarBean',$prospectList);
+        $this->assertInstanceOf('ProspectList',$prospectList);
+        $this->assertInstanceOf('SugarBean',$prospectList);
 
-		$this->assertAttributeEquals('prospect_lists', 'table_name', $prospectList);
-		$this->assertAttributeEquals('ProspectLists', 'module_dir', $prospectList);
-		$this->assertAttributeEquals('ProspectList', 'object_name', $prospectList);
+        $this->assertAttributeEquals('prospect_lists', 'table_name', $prospectList);
+        $this->assertAttributeEquals('ProspectLists', 'module_dir', $prospectList);
+        $this->assertAttributeEquals('ProspectList', 'object_name', $prospectList);
 
-		$this->assertAttributeEquals("prospect_lists_prospects", 'rel_prospects_table', $prospectList);
+        $this->assertAttributeEquals("prospect_lists_prospects", 'rel_prospects_table', $prospectList);
 
-	}
+    }
 
-	public function testget_summary_text()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testget_summary_text()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		//test without setting name
-		$this->assertEquals(Null,$prospectList->get_summary_text());
+        //test without setting name
+        $this->assertEquals(Null,$prospectList->get_summary_text());
 
-		//test with name set
-		$prospectList->name = "test";
-		$this->assertEquals('test',$prospectList->get_summary_text());
-	}
+        //test with name set
+        $prospectList->name = "test";
+        $this->assertEquals('test',$prospectList->get_summary_text());
+    }
 
-	public function testcreate_list_query()
-	{
+    public function testcreate_list_query()
+    {
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		//test with empty string params
-		$expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where prospect_lists.deleted=0 ORDER BY prospect_lists.name";
-		$actual = $prospectList->create_list_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where prospect_lists.deleted=0 ORDER BY prospect_lists.name";
+        $actual = $prospectList->create_list_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where users.user_name = \"\" AND prospect_lists.deleted=0 ORDER BY prospect_lists.id";
-		$actual = $prospectList->create_list_query('prospect_lists.id','users.user_name = ""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where users.user_name = \"\" AND prospect_lists.deleted=0 ORDER BY prospect_lists.id";
+        $actual = $prospectList->create_list_query('prospect_lists.id','users.user_name = ""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testcreate_export_query()
-	{
+    public function testcreate_export_query()
+    {
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		//test with empty string params
-		$expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE  prospect_lists.deleted=0 ORDER BY prospect_lists.name";
-		$actual = $prospectList->create_export_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE  prospect_lists.deleted=0 ORDER BY prospect_lists.name";
+        $actual = $prospectList->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE users.user_name = \"\" AND  prospect_lists.deleted=0 ORDER BY prospect_lists.id";
-		$actual = $prospectList->create_export_query('prospect_lists.id','users.user_name = ""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE users.user_name = \"\" AND  prospect_lists.deleted=0 ORDER BY prospect_lists.id";
+        $actual = $prospectList->create_export_query('prospect_lists.id','users.user_name = ""');
+        $this->assertSame($expected,$actual);
 
     }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_export_members_query()
-	{
+    public function testcreate_export_members_query()
+    {
         /*
     	$prospectList = new ProspectList();
 
@@ -85,208 +85,208 @@ 
     	$this->assertSame($expected,$actual);
         */
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
-	public function testsave() {
+    public function testsave() {
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		$prospectList->name = "test";
-		$prospectList->description ="test description";
+        $prospectList->name = "test";
+        $prospectList->description ="test description";
 
-		$result = $prospectList->save();
+        $result = $prospectList->save();
 
-		//test for record ID to verify that record is saved
-		$this->assertTrue(isset($prospectList->id));
-		$this->assertEquals(36, strlen($prospectList->id));
+        //test for record ID to verify that record is saved
+        $this->assertTrue(isset($prospectList->id));
+        $this->assertEquals(36, strlen($prospectList->id));
 
 
-		//test set_prospect_relationship method
-		$this->set_prospect_relationship($prospectList->id);
+        //test set_prospect_relationship method
+        $this->set_prospect_relationship($prospectList->id);
 
 
-		//test set_prospect_relationship_single method
-		$this->set_prospect_relationship_single($prospectList->id);
+        //test set_prospect_relationship_single method
+        $this->set_prospect_relationship_single($prospectList->id);
 
 
-		//mark the record as deleted and verify that this record cannot be retrieved anymore.
-		$prospectList->mark_deleted($prospectList->id);
-		$result = $prospectList->retrieve($prospectList->id);
-		$this->assertEquals(null,$result);
+        //mark the record as deleted and verify that this record cannot be retrieved anymore.
+        $prospectList->mark_deleted($prospectList->id);
+        $result = $prospectList->retrieve($prospectList->id);
+        $this->assertEquals(null,$result);
 
-	}
+    }
 
 
-	public function testsave_relationship_changes()
+    public function testsave_relationship_changes()
     {
-    	$this->markTestIncomplete('Error in query: columns mismatch | Error in methodd call params: 2nd param should be array but string given');
+        $this->markTestIncomplete('Error in query: columns mismatch | Error in methodd call params: 2nd param should be array but string given');
     }
 
-	public function set_prospect_relationship($id)
-	{
-		$prospectList = new ProspectList();
+    public function set_prospect_relationship($id)
+    {
+        $prospectList = new ProspectList();
 
-		//preset the required attributes, retrive the bean by id and verify the count of records
-		$link_ids = array('1','2');
+        //preset the required attributes, retrive the bean by id and verify the count of records
+        $link_ids = array('1','2');
 
-		$prospectList->retrieve($id);
-		$prospectList->set_prospect_relationship($id, $link_ids ,'related');
+        $prospectList->retrieve($id);
+        $prospectList->set_prospect_relationship($id, $link_ids ,'related');
 
-		$expected_count = $prospectList->get_entry_count();
+        $expected_count = $prospectList->get_entry_count();
 
-		$this->assertEquals(2,$expected_count);
+        $this->assertEquals(2,$expected_count);
 
 
-		//test clear_prospect_relationship method with expected counts
-		$this->clear_prospect_relationship($id, '1');
-		$this->clear_prospect_relationship($id, '2');
+        //test clear_prospect_relationship method with expected counts
+        $this->clear_prospect_relationship($id, '1');
+        $this->clear_prospect_relationship($id, '2');
 
-	}
+    }
 
-	public function set_prospect_relationship_single($id)
-	{
-		$prospectList = new ProspectList();
+    public function set_prospect_relationship_single($id)
+    {
+        $prospectList = new ProspectList();
 
-		$prospectList->retrieve($id);
-		$prospectList->set_prospect_relationship_single($id, '3' ,'related');
+        $prospectList->retrieve($id);
+        $prospectList->set_prospect_relationship_single($id, '3' ,'related');
 
-		$expected_count = $prospectList->get_entry_count();
+        $expected_count = $prospectList->get_entry_count();
 
-		$this->assertEquals(1,$expected_count);
+        $this->assertEquals(1,$expected_count);
 
-		$this->clear_prospect_relationship($id, '3');
+        $this->clear_prospect_relationship($id, '3');
 
-	}
+    }
 
 
-	public function clear_prospect_relationship($id, $related_id)
-	{
-		$prospectList = new ProspectList();
+    public function clear_prospect_relationship($id, $related_id)
+    {
+        $prospectList = new ProspectList();
 
-		//retrieve the bean and get counts before and after method execution for comparison.
+        //retrieve the bean and get counts before and after method execution for comparison.
 
-		$prospectList->retrieve($id);
+        $prospectList->retrieve($id);
 
-		$initial_count = (int)$prospectList->get_entry_count();
+        $initial_count = (int)$prospectList->get_entry_count();
 
-		$prospectList->clear_prospect_relationship($id, $related_id, 'related');
+        $prospectList->clear_prospect_relationship($id, $related_id, 'related');
 
-		$expected_count = (int)$prospectList->get_entry_count();
-		$this->assertEquals($initial_count - 1 , $expected_count);
-	}
+        $expected_count = (int)$prospectList->get_entry_count();
+        $this->assertEquals($initial_count - 1 , $expected_count);
+    }
 
 
-	public function testmark_relationships_deleted()
-	{
-		$prospectList = new ProspectList();
+    public function testmark_relationships_deleted()
+    {
+        $prospectList = new ProspectList();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$prospectList->mark_relationships_deleted('');
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $prospectList->mark_relationships_deleted('');
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-		$this->markTestIncomplete('Method has no implementation');
+        $this->markTestIncomplete('Method has no implementation');
 
-	}
+    }
 
-	public function testfill_in_additional_list_fields()
-	{
-		$prospectList = new ProspectList();
+    public function testfill_in_additional_list_fields()
+    {
+        $prospectList = new ProspectList();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$prospectList->fill_in_additional_list_fields();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $prospectList->fill_in_additional_list_fields();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-		$this->markTestIncomplete('Method has no implementation');
+        $this->markTestIncomplete('Method has no implementation');
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields()
-	{
-		$prospectList = new ProspectList();
+    public function testfill_in_additional_detail_fields()
+    {
+        $prospectList = new ProspectList();
 
-		$prospectList->fill_in_additional_detail_fields();
-		$this->assertEquals(0,$prospectList->entry_count);
+        $prospectList->fill_in_additional_detail_fields();
+        $this->assertEquals(0,$prospectList->entry_count);
 
-	}
+    }
 
 
-	public function testupdate_currency_id()
-	{
+    public function testupdate_currency_id()
+    {
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$prospectList->update_currency_id('','');
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $prospectList->update_currency_id('','');
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-		$this->markTestIncomplete('Method has no implementation');
+        $this->markTestIncomplete('Method has no implementation');
 
-	}
+    }
 
 
-	public function testget_entry_count()
-	{
-		$prospectList = new ProspectList();
+    public function testget_entry_count()
+    {
+        $prospectList = new ProspectList();
 
-		$result = $prospectList->get_entry_count();
-		$this->assertEquals(0, $result);
+        $result = $prospectList->get_entry_count();
+        $this->assertEquals(0, $result);
 
-	}
+    }
 
 
-	public function testget_list_view_data(){
+    public function testget_list_view_data(){
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		$expected = array( "DELETED"=> 0, "ENTRY_COUNT"=> '0' );
-		$actual = $prospectList->get_list_view_data();
-		$this->assertSame($expected, $actual);
+        $expected = array( "DELETED"=> 0, "ENTRY_COUNT"=> '0' );
+        $actual = $prospectList->get_list_view_data();
+        $this->assertSame($expected, $actual);
 
-	}
+    }
 
-	public function testbuild_generic_where_clause()
-	{
+    public function testbuild_generic_where_clause()
+    {
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		//test with empty string params
-		$expected = "prospect_lists.name like '%'";
-		$actual = $prospectList->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "prospect_lists.name like '%'";
+        $actual = $prospectList->build_generic_where_clause('');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "prospect_lists.name like '%'";
-		$actual = $prospectList->build_generic_where_clause('1');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "prospect_lists.name like '%'";
+        $actual = $prospectList->build_generic_where_clause('1');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
-	public function testbean_implements(){
+    public function testbean_implements(){
 
-		$prospectList = new ProspectList();
+        $prospectList = new ProspectList();
 
-		$this->assertEquals(false, $prospectList->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $prospectList->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $prospectList->bean_implements('ACL')); //test with valid value
+        $this->assertEquals(false, $prospectList->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $prospectList->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $prospectList->bean_implements('ACL')); //test with valid value
 
-	}
+    }
 
 }
 

Spacing +27 added lines, -27 removed lines

@@ -9,8 +9,8 @@ 
 		//execute the contructor and check for the Object type and  attributes
 		$prospectList = new ProspectList();
 
-		$this->assertInstanceOf('ProspectList',$prospectList);
-		$this->assertInstanceOf('SugarBean',$prospectList);
+		$this->assertInstanceOf('ProspectList', $prospectList);
+		$this->assertInstanceOf('SugarBean', $prospectList);
 
 		$this->assertAttributeEquals('prospect_lists', 'table_name', $prospectList);
 		$this->assertAttributeEquals('ProspectLists', 'module_dir', $prospectList);
@@ -27,11 +27,11 @@ 
 		$prospectList = new ProspectList();
 
 		//test without setting name
-		$this->assertEquals(Null,$prospectList->get_summary_text());
+		$this->assertEquals(Null, $prospectList->get_summary_text());
 
 		//test with name set
 		$prospectList->name = "test";
-		$this->assertEquals('test',$prospectList->get_summary_text());
+		$this->assertEquals('test', $prospectList->get_summary_text());
 	}
 
 	public function testcreate_list_query()
@@ -41,14 +41,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where prospect_lists.deleted=0 ORDER BY prospect_lists.name";
-		$actual = $prospectList->create_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_list_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT users.user_name as assigned_user_name, prospect_lists.* FROM prospect_lists LEFT JOIN users\n					ON prospect_lists.assigned_user_id=users.id where users.user_name = \"\" AND prospect_lists.deleted=0 ORDER BY prospect_lists.id";
-		$actual = $prospectList->create_list_query('prospect_lists.id','users.user_name = ""');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_list_query('prospect_lists.id', 'users.user_name = ""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -60,14 +60,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE  prospect_lists.deleted=0 ORDER BY prospect_lists.name";
-		$actual = $prospectList->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT\n                                prospect_lists.*,\n                                users.user_name as assigned_user_name FROM prospect_lists LEFT JOIN users\n                                ON prospect_lists.assigned_user_id=users.id  WHERE users.user_name = \"\" AND  prospect_lists.deleted=0 ORDER BY prospect_lists.id";
-		$actual = $prospectList->create_export_query('prospect_lists.id','users.user_name = ""');
-		$this->assertSame($expected,$actual);
+		$actual = $prospectList->create_export_query('prospect_lists.id', 'users.user_name = ""');
+		$this->assertSame($expected, $actual);
 
     }
 
@@ -92,7 +92,7 @@ 
 		$prospectList = new ProspectList();
 
 		$prospectList->name = "test";
-		$prospectList->description ="test description";
+		$prospectList->description = "test description";
 
 		$result = $prospectList->save();
 
@@ -112,7 +112,7 @@ 
 		//mark the record as deleted and verify that this record cannot be retrieved anymore.
 		$prospectList->mark_deleted($prospectList->id);
 		$result = $prospectList->retrieve($prospectList->id);
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 
 	}
 
@@ -127,14 +127,14 @@ 
 		$prospectList = new ProspectList();
 
 		//preset the required attributes, retrive the bean by id and verify the count of records
-		$link_ids = array('1','2');
+		$link_ids = array('1', '2');
 
 		$prospectList->retrieve($id);
-		$prospectList->set_prospect_relationship($id, $link_ids ,'related');
+		$prospectList->set_prospect_relationship($id, $link_ids, 'related');
 
 		$expected_count = $prospectList->get_entry_count();
 
-		$this->assertEquals(2,$expected_count);
+		$this->assertEquals(2, $expected_count);
 
 
 		//test clear_prospect_relationship method with expected counts
@@ -148,11 +148,11 @@ 
 		$prospectList = new ProspectList();
 
 		$prospectList->retrieve($id);
-		$prospectList->set_prospect_relationship_single($id, '3' ,'related');
+		$prospectList->set_prospect_relationship_single($id, '3', 'related');
 
 		$expected_count = $prospectList->get_entry_count();
 
-		$this->assertEquals(1,$expected_count);
+		$this->assertEquals(1, $expected_count);
 
 		$this->clear_prospect_relationship($id, '3');
 
@@ -172,7 +172,7 @@ 
 		$prospectList->clear_prospect_relationship($id, $related_id, 'related');
 
 		$expected_count = (int)$prospectList->get_entry_count();
-		$this->assertEquals($initial_count - 1 , $expected_count);
+		$this->assertEquals($initial_count - 1, $expected_count);
 	}
 
 
@@ -215,7 +215,7 @@ 
 		$prospectList = new ProspectList();
 
 		$prospectList->fill_in_additional_detail_fields();
-		$this->assertEquals(0,$prospectList->entry_count);
+		$this->assertEquals(0, $prospectList->entry_count);
 
 	}
 
@@ -227,7 +227,7 @@ 
 
 		//execute the method and test if it works and does not throws an exception.
 		try {
-			$prospectList->update_currency_id('','');
+			$prospectList->update_currency_id('', '');
 			$this->assertTrue(true);
 		}
 		catch (Exception $e) {
@@ -249,11 +249,11 @@ 
 	}
 
 
-	public function testget_list_view_data(){
+	public function testget_list_view_data() {
 
 		$prospectList = new ProspectList();
 
-		$expected = array( "DELETED"=> 0, "ENTRY_COUNT"=> '0' );
+		$expected = array("DELETED"=> 0, "ENTRY_COUNT"=> '0');
 		$actual = $prospectList->get_list_view_data();
 		$this->assertSame($expected, $actual);
 
@@ -267,18 +267,18 @@ 
 		//test with empty string params
 		$expected = "prospect_lists.name like '%'";
 		$actual = $prospectList->build_generic_where_clause('');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "prospect_lists.name like '%'";
 		$actual = $prospectList->build_generic_where_clause('1');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
 
-	public function testbean_implements(){
+	public function testbean_implements() {
 
 		$prospectList = new ProspectList();
 

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();
 		}
 

Indentation +113 added lines, -113 removed lines

@@ -3,165 +3,165 @@ 
 class EmployeeTest extends PHPUnit_Framework_TestCase {
 
 
-	public function testEmployee() {
+    public function testEmployee() {
 
-		//execute the contructor and check for the Object type and  attributes
-		$employee = new Employee();
-		$this->assertInstanceOf('Employee',$employee);
-		$this->assertInstanceOf('Person',$employee);
-		$this->assertInstanceOf('SugarBean',$employee);
+        //execute the contructor and check for the Object type and  attributes
+        $employee = new Employee();
+        $this->assertInstanceOf('Employee',$employee);
+        $this->assertInstanceOf('Person',$employee);
+        $this->assertInstanceOf('SugarBean',$employee);
 
-		$this->assertAttributeEquals('Employees', 'module_dir', $employee);
-		$this->assertAttributeEquals('Employee', 'object_name', $employee);
-		$this->assertAttributeEquals('users', 'table_name', $employee);
-		$this->assertAttributeEquals(true, 'new_schema', $employee);
+        $this->assertAttributeEquals('Employees', 'module_dir', $employee);
+        $this->assertAttributeEquals('Employee', 'object_name', $employee);
+        $this->assertAttributeEquals('users', 'table_name', $employee);
+        $this->assertAttributeEquals(true, 'new_schema', $employee);
 
-	}
+    }
 
 
-	public function testget_summary_text() {
+    public function testget_summary_text() {
 
-		error_reporting(E_ERROR | E_PARSE);
+        error_reporting(E_ERROR | E_PARSE);
 
-		$employee = new Employee();
+        $employee = new Employee();
 
-		//test without setting name
-		$this->assertEquals(' ',$employee->get_summary_text());
+        //test without setting name
+        $this->assertEquals(' ',$employee->get_summary_text());
 
-		//test with name set
-		$employee->retrieve(1);
-		$this->assertEquals('Administrator',$employee->get_summary_text());
+        //test with name set
+        $employee->retrieve(1);
+        $this->assertEquals('Administrator',$employee->get_summary_text());
 
     }
 
 
-	public function testfill_in_additional_list_fields() {
-
-		$employee = new Employee();
-
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$employee->fill_in_additional_list_fields();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
-
-	}
+    public function testfill_in_additional_list_fields() {
 
-	public function testfill_in_additional_detail_fields()
-	{
-		$employee = new Employee();
+        $employee = new Employee();
 
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $employee->fill_in_additional_list_fields();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-		//test with a empty employee bean
-		$employee->fill_in_additional_detail_fields();
-		$this->assertEquals("", $employee->reports_to_name);
+    }
 
+    public function testfill_in_additional_detail_fields()
+    {
+        $employee = new Employee();
 
-		//test with a valid employee bean
-		$employee->retrieve(1);
-		$employee->fill_in_additional_detail_fields();
-		$this->assertEquals("", $employee->reports_to_name);
 
-	}
+        //test with a empty employee bean
+        $employee->fill_in_additional_detail_fields();
+        $this->assertEquals("", $employee->reports_to_name);
 
-	public function testretrieve_employee_id()
-	{
-		$employee = new Employee();
-		//$this->assertEquals('1' ,$employee->retrieve_employee_id('admin'));
 
-		$this->markTestSkipped('Bug in query: employee_name parameter is wrongly used as user_name');
+        //test with a valid employee bean
+        $employee->retrieve(1);
+        $employee->fill_in_additional_detail_fields();
+        $this->assertEquals("", $employee->reports_to_name);
 
-	}
+    }
 
+    public function testretrieve_employee_id()
+    {
+        $employee = new Employee();
+        //$this->assertEquals('1' ,$employee->retrieve_employee_id('admin'));
 
-	public function testverify_data()
-	{
-		$employee = new Employee();
-		$this->assertEquals(true ,$employee->verify_data() );
+        $this->markTestSkipped('Bug in query: employee_name parameter is wrongly used as user_name');
 
-	}
+    }
 
-	public function testget_list_view_data(){
 
-		$employee = new Employee();
+    public function testverify_data()
+    {
+        $employee = new Employee();
+        $this->assertEquals(true ,$employee->verify_data() );
 
-		$expected = array (
-					  'SUGAR_LOGIN' => '1',
-					  'FULL_NAME' => ' ',
-					  'NAME' => ' ',
-					  'IS_ADMIN' => '0',
-					  'EXTERNAL_AUTH_ONLY' => '0',
-					  'RECEIVE_NOTIFICATIONS' => '1',
-					  'DELETED' => 0,
-					  'PORTAL_ONLY' => '0',
-					  'SHOW_ON_EMPLOYEES' => '1',
-					  'ENCODED_NAME' => ' ',
-					  'EMAIL1' => '',
-					  'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Employees\\u0026parent_id=\\u0026parent_name=+\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=+%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Employees\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Employees","parent_id":"","parent_name":" ","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":"  \\u003C\\u003E","return_module":"Employees","return_action":"ListView","return_id":""}});\' class=\'\'>',
-					  'MESSENGER_TYPE' => '',
-					  'REPORTS_TO_NAME' => NULL,
-					);
+    }
 
-		$actual = $employee->get_list_view_data();
-		$this->assertSame($expected, $actual);
+    public function testget_list_view_data(){
+
+        $employee = new Employee();
+
+        $expected = array (
+                        'SUGAR_LOGIN' => '1',
+                        'FULL_NAME' => ' ',
+                        'NAME' => ' ',
+                        'IS_ADMIN' => '0',
+                        'EXTERNAL_AUTH_ONLY' => '0',
+                        'RECEIVE_NOTIFICATIONS' => '1',
+                        'DELETED' => 0,
+                        'PORTAL_ONLY' => '0',
+                        'SHOW_ON_EMPLOYEES' => '1',
+                        'ENCODED_NAME' => ' ',
+                        'EMAIL1' => '',
+                        'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Employees\\u0026parent_id=\\u0026parent_name=+\\u0026to_addrs_ids=\\u0026to_addrs_names=\\u0026to_addrs_emails=\\u0026to_email_addrs=+%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Employees\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Employees","parent_id":"","parent_name":" ","to_addrs_ids":"","to_addrs_names":"","to_addrs_emails":"","to_email_addrs":"  \\u003C\\u003E","return_module":"Employees","return_action":"ListView","return_id":""}});\' class=\'\'>',
+                        'MESSENGER_TYPE' => '',
+                        'REPORTS_TO_NAME' => NULL,
+                    );
+
+        $actual = $employee->get_list_view_data();
+        $this->assertSame($expected, $actual);
 
-	}
+    }
 
-	public function testlist_view_parse_additional_sections(){
+    public function testlist_view_parse_additional_sections(){
 
-		$employee = new Employee();
+        $employee = new Employee();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$employee->list_view_parse_additional_sections(new Sugar_Smarty(), $xTemplateSection);
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $employee->list_view_parse_additional_sections(new Sugar_Smarty(), $xTemplateSection);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-	}
+    }
 
 
-	public function testcreate_export_query() {
+    public function testcreate_export_query() {
 
-		$employee = new Employee();
+        $employee = new Employee();
 
-		//test with empty string params
-		$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 ORDER BY users.user_name";
-		$actual = $employee->create_export_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 ORDER BY users.user_name";
+        $actual = $employee->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE users.user_name=\"\" AND  users.deleted = 0 ORDER BY users.id";
-		$actual = $employee->create_export_query('users.id','users.user_name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE users.user_name=\"\" AND  users.deleted = 0 ORDER BY users.id";
+        $actual = $employee->create_export_query('users.id','users.user_name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testpreprocess_fields_on_save(){
+    public function testpreprocess_fields_on_save(){
 
-		$employee = new Employee();
+        $employee = new Employee();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$employee->preprocess_fields_on_save();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $employee->preprocess_fields_on_save();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_new_list_query()
+    public function testcreate_new_list_query()
     {
         /*
     	$employee = new Employee();
@@ -183,9 +183,9 @@ 
 
     public function testhasCustomFields()
     {
-    	$employee = new Employee();
-    	$result = $employee->hasCustomFields();
-    	$this->assertEquals(false,$result);
+        $employee = new Employee();
+        $result = $employee->hasCustomFields();
+        $this->assertEquals(false,$result);
     }
 
 }

Spacing +15 added lines, -15 removed lines

@@ -7,9 +7,9 @@ 
 
 		//execute the contructor and check for the Object type and  attributes
 		$employee = new Employee();
-		$this->assertInstanceOf('Employee',$employee);
-		$this->assertInstanceOf('Person',$employee);
-		$this->assertInstanceOf('SugarBean',$employee);
+		$this->assertInstanceOf('Employee', $employee);
+		$this->assertInstanceOf('Person', $employee);
+		$this->assertInstanceOf('SugarBean', $employee);
 
 		$this->assertAttributeEquals('Employees', 'module_dir', $employee);
 		$this->assertAttributeEquals('Employee', 'object_name', $employee);
@@ -26,11 +26,11 @@ 
 		$employee = new Employee();
 
 		//test without setting name
-		$this->assertEquals(' ',$employee->get_summary_text());
+		$this->assertEquals(' ', $employee->get_summary_text());
 
 		//test with name set
 		$employee->retrieve(1);
-		$this->assertEquals('Administrator',$employee->get_summary_text());
+		$this->assertEquals('Administrator', $employee->get_summary_text());
 
     }
 
@@ -80,15 +80,15 @@ 
 	public function testverify_data()
 	{
 		$employee = new Employee();
-		$this->assertEquals(true ,$employee->verify_data() );
+		$this->assertEquals(true, $employee->verify_data());
 
 	}
 
-	public function testget_list_view_data(){
+	public function testget_list_view_data() {
 
 		$employee = new Employee();
 
-		$expected = array (
+		$expected = array(
 					  'SUGAR_LOGIN' => '1',
 					  'FULL_NAME' => ' ',
 					  'NAME' => ' ',
@@ -110,7 +110,7 @@ 
 
 	}
 
-	public function testlist_view_parse_additional_sections(){
+	public function testlist_view_parse_additional_sections() {
 
 		$employee = new Employee();
 
@@ -132,18 +132,18 @@ 
 
 		//test with empty string params
 		$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 ORDER BY users.user_name";
-		$actual = $employee->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $employee->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE users.user_name=\"\" AND  users.deleted = 0 ORDER BY users.id";
-		$actual = $employee->create_export_query('users.id','users.user_name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $employee->create_export_query('users.id', 'users.user_name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
-	public function testpreprocess_fields_on_save(){
+	public function testpreprocess_fields_on_save() {
 
 		$employee = new Employee();
 
@@ -185,7 +185,7 @@ 
     {
     	$employee = new Employee();
     	$result = $employee->hasCustomFields();
-    	$this->assertEquals(false,$result);
+    	$this->assertEquals(false, $result);
     }
 
 }

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();
     	}
     	 	

Indentation +211 added lines, -211 removed lines

@@ -2,68 +2,68 @@ 
 
 class ContactTest extends PHPUnit_Framework_TestCase {
 
-	public function testContact() {
+    public function testContact() {
 
-		//execute the contructor and check for the Object type and  attributes
-		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+        //execute the contructor and check for the Object type and  attributes
+        $contact = new Contact();
+        $this->assertInstanceOf('Contact',$contact);
+        $this->assertInstanceOf('Person',$contact);
+        $this->assertInstanceOf('SugarBean',$contact);
 
-		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
-		$this->assertAttributeEquals('Contact', 'object_name', $contact);
-		$this->assertAttributeEquals('contacts', 'table_name', $contact);
-		$this->assertAttributeEquals('accounts_contacts', 'rel_account_table', $contact);
-		$this->assertAttributeEquals('opportunities_contacts', 'rel_opportunity_table', $contact);
-		$this->assertAttributeEquals(true, 'importable', $contact);
-		$this->assertAttributeEquals(true, 'new_schema', $contact);
+        $this->assertAttributeEquals('Contacts', 'module_dir', $contact);
+        $this->assertAttributeEquals('Contact', 'object_name', $contact);
+        $this->assertAttributeEquals('contacts', 'table_name', $contact);
+        $this->assertAttributeEquals('accounts_contacts', 'rel_account_table', $contact);
+        $this->assertAttributeEquals('opportunities_contacts', 'rel_opportunity_table', $contact);
+        $this->assertAttributeEquals(true, 'importable', $contact);
+        $this->assertAttributeEquals(true, 'new_schema', $contact);
 
-	}
+    }
 
-	public function testadd_list_count_joins()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testadd_list_count_joins()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with empty strings
-		$query = "";
-		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+        //test with empty strings
+        $query = "";
+        $contact->add_list_count_joins($query, '');
+        $this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
 
 
-		//test with valid string
-		$query = "";
-		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
-		$contact->add_list_count_joins($query, 'accounts.name');
-		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+        //test with valid string
+        $query = "";
+        $expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
+        $contact->add_list_count_joins($query, 'accounts.name');
+        $query = preg_replace('/\s+/', '', $query);
+        $expected =preg_replace('/\s+/', '', $expected);
+        $this->assertSame($expected,$query);
 		
-		//test with valid string
-		$query = "";
-		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
-		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+        //test with valid string
+        $query = "";
+        $expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
+        $contact->add_list_count_joins($query, 'contacts.name');
+        $this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
 
 
-	}
+    }
 
-	public function testlistviewACLHelper()
-	{
-		$contact = new Contact();
+    public function testlistviewACLHelper()
+    {
+        $contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
-		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+        $expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+        $actual = $contact->listviewACLHelper();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
     /**
      * @todo: NEEDS FIXING!
      */
-	public function testcreate_new_list_query()
-	{
+    public function testcreate_new_list_query()
+    {
         /*
 		$contact = new Contact();
 
@@ -79,239 +79,239 @@ 
 		$this->assertSame($expected,$actual);
 		*/
         $this->assertTrue(true, "NEEDS FIXING!");
-	}
+    }
 
 
-	public function testaddress_popup_create_new_list_query()
-	{
+    public function testaddress_popup_create_new_list_query()
+    {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with empty string params
-		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
+        $actual = $contact->address_popup_create_new_list_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
+        $actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testcreate_export_query()
-	{
-		$contact = new Contact();
+    public function testcreate_export_query()
+    {
+        $contact = new Contact();
 
-		//test with empty string params
-		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+        //test with empty string params
+        $expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
+        $actual = $contact->create_export_query('','');
+        $this->assertSame($expected,$actual);
 
 
-		//test with valid string params
-		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+        //test with valid string params
+        $expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
+        $actual = $contact->create_export_query('contacts.id','contacts.name=""');
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testfill_in_additional_list_fields() {
+    public function testfill_in_additional_list_fields() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "firstn";
-		$contact->last_name = "lastn";
-		$contact->email1 = "1@test.com";
-		$contact->email2 = "2@test.com";
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "firstn";
+        $contact->last_name = "lastn";
+        $contact->email1 = "1@test.com";
+        $contact->email2 = "2@test.com";
 
 
-		$contact->fill_in_additional_list_fields();
+        $contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+        $this->assertEquals("firstn lastn",$contact->full_name);
+        $this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
+        $this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
 
-	}
+    }
 
-	public function testfill_in_additional_detail_fields() {
+    public function testfill_in_additional_detail_fields() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->id = "1";
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->id = "1";
 
-		$contact->fill_in_additional_detail_fields();
+        $contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+        $this->assertEquals("",$contact->account_name);
+        $this->assertEquals("",$contact->account_id);
+        $this->assertEquals("",$contact->report_to_name);
 
-	}
+    }
 
 
-	public function testload_contacts_users_relationship(){
+    public function testload_contacts_users_relationship(){
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$contact->load_contacts_users_relationship();
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->load_contacts_users_relationship();
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
-	}
+    }
 
-	public function testget_list_view_data() {
+    public function testget_list_view_data() {
 
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "first";
-		$contact->last_name = "last";
-
-		$expected = array (
-					  'NAME' => 'first last',
-					  'DELETED' => 0,
-					  'FIRST_NAME' => 'first',
-					  'LAST_NAME' => 'last',
-					  'FULL_NAME' => 'first last',
-					  'DO_NOT_CALL' => '0',
-					  'PORTAL_USER_TYPE' => 'Single user',
-					  'ENCODED_NAME' => 'first last',
-					  'EMAIL1' => '',
-					  'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Contacts\\u0026parent_id=\\u0026parent_name=first+last\\u0026to_addrs_ids=\\u0026to_addrs_names=first+last\\u0026to_addrs_emails=\\u0026to_email_addrs=first+last%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Contacts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Contacts","parent_id":"","parent_name":"first last","to_addrs_ids":"","to_addrs_names":"first last","to_addrs_emails":"","to_email_addrs":"first last \\u003C\\u003E","return_module":"Contacts","return_action":"ListView","return_id":""}});\' class=\'\'>',
-					  'EMAIL_AND_NAME1' => 'first last &lt;&gt;',
-					);
-
-		$actual = $contact->get_list_view_data();
-		//$this->assertSame($expected, $actual);
-		$this->assertEquals($expected['NAME'], $actual['NAME']);
-		$this->assertEquals($expected['FIRST_NAME'], $actual['FIRST_NAME']);
-		$this->assertEquals($expected['LAST_NAME'], $actual['LAST_NAME']);
-		$this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
-		$this->assertEquals($expected['ENCODED_NAME'], $actual['ENCODED_NAME']);
-		$this->assertEquals($expected['EMAIL_AND_NAME1'], $actual['EMAIL_AND_NAME1']);
-
-	}
-
-
-	public function testbuild_generic_where_clause ()
-	{
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "first";
+        $contact->last_name = "last";
 
-		$contact = new Contact();
+        $expected = array (
+                        'NAME' => 'first last',
+                        'DELETED' => 0,
+                        'FIRST_NAME' => 'first',
+                        'LAST_NAME' => 'last',
+                        'FULL_NAME' => 'first last',
+                        'DO_NOT_CALL' => '0',
+                        'PORTAL_USER_TYPE' => 'Single user',
+                        'ENCODED_NAME' => 'first last',
+                        'EMAIL1' => '',
+                        'EMAIL1_LINK' => '<a href=\'javascript:void(0);\' onclick=\'SUGAR.quickCompose.init({"fullComposeUrl":"contact_id=\\u0026parent_type=Contacts\\u0026parent_id=\\u0026parent_name=first+last\\u0026to_addrs_ids=\\u0026to_addrs_names=first+last\\u0026to_addrs_emails=\\u0026to_email_addrs=first+last%26nbsp%3B%26lt%3B%26gt%3B\\u0026return_module=Contacts\\u0026return_action=ListView\\u0026return_id=","composePackage":{"contact_id":"","parent_type":"Contacts","parent_id":"","parent_name":"first last","to_addrs_ids":"","to_addrs_names":"first last","to_addrs_emails":"","to_email_addrs":"first last \\u003C\\u003E","return_module":"Contacts","return_action":"ListView","return_id":""}});\' class=\'\'>',
+                        'EMAIL_AND_NAME1' => 'first last &lt;&gt;',
+                    );
 
-		//test with string
-		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
-		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+        $actual = $contact->get_list_view_data();
+        //$this->assertSame($expected, $actual);
+        $this->assertEquals($expected['NAME'], $actual['NAME']);
+        $this->assertEquals($expected['FIRST_NAME'], $actual['FIRST_NAME']);
+        $this->assertEquals($expected['LAST_NAME'], $actual['LAST_NAME']);
+        $this->assertEquals($expected['FULL_NAME'], $actual['FULL_NAME']);
+        $this->assertEquals($expected['ENCODED_NAME'], $actual['ENCODED_NAME']);
+        $this->assertEquals($expected['EMAIL_AND_NAME1'], $actual['EMAIL_AND_NAME1']);
 
+    }
 
-		//test with number
-		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
-		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
 
-	}
+    public function testbuild_generic_where_clause ()
+    {
 
-	public function testset_notification_body()
-	{
-		$contact = new Contact();
+        $contact = new Contact();
 
-		//test with attributes preset and verify attributes are set accordingly
-		$contact->first_name = "first";
-		$contact->last_name = "last";
-		$contact->description = "some text";
-		$contact->fill_in_additional_list_fields();
+        //test with string
+        $expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
+        $actual = $contact->build_generic_where_clause('test');
+        $this->assertSame($expected,$actual);
 
-		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+        //test with number
+        $expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
+        $actual = $contact->build_generic_where_clause(1);
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
-	public function testget_contact_id_by_email()
-	{
-		$contact = new Contact();
+    public function testset_notification_body()
+    {
+        $contact = new Contact();
 
-		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+        //test with attributes preset and verify attributes are set accordingly
+        $contact->first_name = "first";
+        $contact->last_name = "last";
+        $contact->description = "some text";
+        $contact->fill_in_additional_list_fields();
 
+        $result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		//$result = $contact->get_contact_id_by_email("test@test.com");
-		//$this->assertEquals(null,$result);
+        $this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
+        $this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
 
-		$this->markTestSkipped('Invalid Columns(email1,email2) in Query ');
+    }
 
-	}
+    public function testget_contact_id_by_email()
+    {
+        $contact = new Contact();
 
-	public function testsave_relationship_changes() {
+        $result = $contact->get_contact_id_by_email("");
+        $this->assertEquals(null,$result);
 
-		$contact = new Contact();
 
-		//execute the method and test if it works and does not throws an exception.
-		try {
-			$contact->save_relationship_changes(true);
-			$contact->save_relationship_changes(false);
-			$this->assertTrue(true);
-		}
-		catch (Exception $e) {
-			$this->fail();
-		}
+        //$result = $contact->get_contact_id_by_email("test@test.com");
+        //$this->assertEquals(null,$result);
 
-	}
+        $this->markTestSkipped('Invalid Columns(email1,email2) in Query ');
 
-	public function testbean_implements()
-	{
-		$contact = new Contact();
-		$this->assertEquals(false, $contact->bean_implements('')); //test with blank value
-		$this->assertEquals(false, $contact->bean_implements('test')); //test with invalid value
-		$this->assertEquals(true, $contact->bean_implements('ACL')); //test with valid value
-	}
+    }
 
-	public function testget_unlinked_email_query()
-	{
-		$contact = new Contact();
+    public function testsave_relationship_changes() {
 
-		//execute the method and verify that it retunrs expected results
-		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
-		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+        $contact = new Contact();
+
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->save_relationship_changes(true);
+            $contact->save_relationship_changes(false);
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
+
+    }
+
+    public function testbean_implements()
+    {
+        $contact = new Contact();
+        $this->assertEquals(false, $contact->bean_implements('')); //test with blank value
+        $this->assertEquals(false, $contact->bean_implements('test')); //test with invalid value
+        $this->assertEquals(true, $contact->bean_implements('ACL')); //test with valid value
+    }
+
+    public function testget_unlinked_email_query()
+    {
+        $contact = new Contact();
+
+        //execute the method and verify that it retunrs expected results
+        $expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
+        $actual = $contact->get_unlinked_email_query();
+        $this->assertSame($expected,$actual);
 
-	}
+    }
 
 
     public function testprocess_sync_to_outlook()
     {
-    	$contact = new Contact();
+        $contact = new Contact();
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-   			$contact->process_sync_to_outlook("all");
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+                $contact->process_sync_to_outlook("all");
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
 
-    	//execute the method and test if it works and does not throws an exception.
-    	try {
-    		$contact->process_sync_to_outlook("1");
-    		$this->assertTrue(true);
-    	}
-    	catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and test if it works and does not throws an exception.
+        try {
+            $contact->process_sync_to_outlook("1");
+            $this->assertTrue(true);
+        }
+        catch (Exception $e) {
+            $this->fail();
+        }
 
 
 
-	}
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -6,9 +6,9 @@ 
 
 		//execute the contructor and check for the Object type and  attributes
 		$contact = new Contact();
-		$this->assertInstanceOf('Contact',$contact);
-		$this->assertInstanceOf('Person',$contact);
-		$this->assertInstanceOf('SugarBean',$contact);
+		$this->assertInstanceOf('Contact', $contact);
+		$this->assertInstanceOf('Person', $contact);
+		$this->assertInstanceOf('SugarBean', $contact);
 
 		$this->assertAttributeEquals('Contacts', 'module_dir', $contact);
 		$this->assertAttributeEquals('Contact', 'object_name', $contact);
@@ -29,7 +29,7 @@ 
 		//test with empty strings
 		$query = "";
 		$contact->add_list_count_joins($query, '');
-		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertEquals(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 		//test with valid string
@@ -37,14 +37,14 @@ 
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n                    LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'accounts.name');
 		$query = preg_replace('/\s+/', '', $query);
-		$expected =preg_replace('/\s+/', '', $expected);
-		$this->assertSame($expected,$query);
+		$expected = preg_replace('/\s+/', '', $expected);
+		$this->assertSame($expected, $query);
 		
 		//test with valid string
 		$query = "";
 		$expected = "\n	            LEFT JOIN accounts_contacts\n	            ON contacts.id=accounts_contacts.contact_id\n	            LEFT JOIN accounts\n	            ON accounts_contacts.account_id=accounts.id\n	                 LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ";
 		$contact->add_list_count_joins($query, 'contacts.name');
-		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ",$query);
+		$this->assertSame(" LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c ", $query);
 
 
 	}
@@ -53,9 +53,9 @@ 
 	{
 		$contact = new Contact();
 
-		$expected = array( "MAIN"=>"a", "ACCOUNT"=>"a");
+		$expected = array("MAIN"=>"a", "ACCOUNT"=>"a");
 		$actual = $contact->listviewACLHelper();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -89,14 +89,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT LTRIM(RTRIM(CONCAT(IFNULL(contacts.first_name,''),'',IFNULL(contacts.last_name,'')))) name, \n				contacts.*,\n                accounts.name as account_name,\n                accounts.id as account_id,\n                accounts.assigned_user_id account_id_owner,\n                users.user_name as assigned_user_name ,contacts_cstm.*\n                FROM contacts LEFT JOIN users\n	                    ON contacts.assigned_user_id=users.id\n	                    LEFT JOIN accounts_contacts\n	                    ON contacts.id=accounts_contacts.contact_id  and accounts_contacts.deleted = 0\n	                    LEFT JOIN accounts\n	                    ON accounts_contacts.account_id=accounts.id AND accounts.deleted=0 LEFT JOIN email_addr_bean_rel eabl  ON eabl.bean_id = contacts.id AND eabl.bean_module = 'Contacts' and eabl.primary_address = 1 and eabl.deleted=0 LEFT JOIN email_addresses ea ON (ea.id = eabl.email_address_id)  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND  contacts.deleted=0 ";
-		$actual = $contact->address_popup_create_new_list_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->address_popup_create_new_list_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -106,14 +106,14 @@ 
 
 		//test with empty string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('','');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('', '');
+		$this->assertSame($expected, $actual);
 
 
 		//test with valid string params
 		$expected = "SELECT\n                                contacts.*,\n                                email_addresses.email_address email_address,\n                                '' email_addresses_non_primary, accounts.name as account_name,\n                                users.user_name as assigned_user_name ,contacts_cstm.jjwg_maps_lng_c,contacts_cstm.jjwg_maps_lat_c,contacts_cstm.jjwg_maps_geocode_status_c,contacts_cstm.jjwg_maps_address_c FROM contacts LEFT JOIN users\n	                                ON contacts.assigned_user_id=users.id LEFT JOIN accounts_contacts\n	                                ON ( contacts.id=accounts_contacts.contact_id and (accounts_contacts.deleted is null or accounts_contacts.deleted = 0))\n	                                LEFT JOIN accounts\n	                                ON accounts_contacts.account_id=accounts.id  LEFT JOIN  email_addr_bean_rel on contacts.id = email_addr_bean_rel.bean_id and email_addr_bean_rel.bean_module='Contacts' and email_addr_bean_rel.deleted=0 and email_addr_bean_rel.primary_address=1  LEFT JOIN email_addresses on email_addresses.id = email_addr_bean_rel.email_address_id  LEFT JOIN contacts_cstm ON contacts.id = contacts_cstm.id_c where (contacts.name=\"\") AND ( accounts.deleted IS NULL OR accounts.deleted=0 )\n                      AND contacts.deleted=0 ";
-		$actual = $contact->create_export_query('contacts.id','contacts.name=""');
-		$this->assertSame($expected,$actual);
+		$actual = $contact->create_export_query('contacts.id', 'contacts.name=""');
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -130,9 +130,9 @@ 
 
 		$contact->fill_in_additional_list_fields();
 
-		$this->assertEquals("firstn lastn",$contact->full_name);
-		$this->assertEquals("firstn lastn <1@test.com>",$contact->email_and_name1);
-		$this->assertEquals("firstn lastn <2@test.com>",$contact->email_and_name2);
+		$this->assertEquals("firstn lastn", $contact->full_name);
+		$this->assertEquals("firstn lastn <1@test.com>", $contact->email_and_name1);
+		$this->assertEquals("firstn lastn <2@test.com>", $contact->email_and_name2);
 
 	}
 
@@ -145,14 +145,14 @@ 
 
 		$contact->fill_in_additional_detail_fields();
 
-		$this->assertEquals("",$contact->account_name);
-		$this->assertEquals("",$contact->account_id);
-		$this->assertEquals("",$contact->report_to_name);
+		$this->assertEquals("", $contact->account_name);
+		$this->assertEquals("", $contact->account_id);
+		$this->assertEquals("", $contact->report_to_name);
 
 	}
 
 
-	public function testload_contacts_users_relationship(){
+	public function testload_contacts_users_relationship() {
 
 		$contact = new Contact();
 
@@ -175,7 +175,7 @@ 
 		$contact->first_name = "first";
 		$contact->last_name = "last";
 
-		$expected = array (
+		$expected = array(
 					  'NAME' => 'first last',
 					  'DELETED' => 0,
 					  'FIRST_NAME' => 'first',
@@ -201,7 +201,7 @@ 
 	}
 
 
-	public function testbuild_generic_where_clause ()
+	public function testbuild_generic_where_clause()
 	{
 
 		$contact = new Contact();
@@ -209,13 +209,13 @@ 
 		//test with string
 		$expected = "contacts.last_name like 'test%' or contacts.first_name like 'test%' or accounts.name like 'test%' or contacts.assistant like 'test%' or ea.email_address like 'test%'";
 		$actual = $contact->build_generic_where_clause('test');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
 		//test with number
 		$expected = "contacts.last_name like '1%' or contacts.first_name like '1%' or accounts.name like '1%' or contacts.assistant like '1%' or ea.email_address like '1%' or contacts.phone_home like '%1%' or contacts.phone_mobile like '%1%' or contacts.phone_work like '%1%' or contacts.phone_other like '%1%' or contacts.phone_fax like '%1%' or contacts.assistant_phone like '%1%'";
 		$actual = $contact->build_generic_where_clause(1);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 
@@ -231,8 +231,8 @@ 
 
 		$result = $contact->set_notification_body(new Sugar_Smarty(), $contact);
 
-		$this->assertEquals($contact->full_name ,$result->_tpl_vars['CONTACT_NAME']);
-		$this->assertEquals($contact->description ,$result->_tpl_vars['CONTACT_DESCRIPTION']);
+		$this->assertEquals($contact->full_name, $result->_tpl_vars['CONTACT_NAME']);
+		$this->assertEquals($contact->description, $result->_tpl_vars['CONTACT_DESCRIPTION']);
 
 	}
 
@@ -241,7 +241,7 @@ 
 		$contact = new Contact();
 
 		$result = $contact->get_contact_id_by_email("");
-		$this->assertEquals(null,$result);
+		$this->assertEquals(null, $result);
 
 
 		//$result = $contact->get_contact_id_by_email("test@test.com");
@@ -282,7 +282,7 @@ 
 		//execute the method and verify that it retunrs expected results
 		$expected = "SELECT emails.id FROM emails  JOIN (select DISTINCT email_id from emails_email_addr_rel eear\n\n	join email_addr_bean_rel eabr on eabr.bean_id ='' and eabr.bean_module = 'Contacts' and\n	eabr.email_address_id = eear.email_address_id and eabr.deleted=0\n	where eear.deleted=0 and eear.email_id not in\n	(select eb.email_id from emails_beans eb where eb.bean_module ='Contacts' and eb.bean_id = '')\n	) derivedemails on derivedemails.email_id = emails.id";
 		$actual = $contact->get_unlinked_email_query();
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 	}
 

include/Smarty/plugins/modifier.spacify.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 function smarty_modifier_spacify($string, $spacify_char = ' ')
 {
     return implode($spacify_char,
-                   preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY));
+                    preg_split('//', $string, -1, PREG_SPLIT_NO_EMPTY));
 }
 
 /* vim: set expandtab: */

modules/AOR_Reports/metadata/searchdefs.php

Indentation +15 added lines, -15 removed lines

@@ -22,21 +22,21 @@
  * @author SalesAgility <info@salesagility.com>
  */
  
-  $searchdefs['AOR_Reports'] = array(
-					'templateMeta' => array(
-							'maxColumns' => '3',
-  							'maxColumnsBasic' => '4', 
+    $searchdefs['AOR_Reports'] = array(
+                    'templateMeta' => array(
+                            'maxColumns' => '3',
+                                'maxColumnsBasic' => '4', 
                             'widths' => array('label' => '10', 'field' => '30'),                 
-                           ),
+                            ),
                     'layout' => array(  					
-						'basic_search' => array(
-							'name', 
-							array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
-							),
-						'advanced_search' => array(
-							'name', 
-							array('name' => 'assigned_user_id', 'label' => 'LBL_ASSIGNED_TO', 'type' => 'enum', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
-						),
-					),
- 			   );
+                        'basic_search' => array(
+                            'name', 
+                            array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
+                            ),
+                        'advanced_search' => array(
+                            'name', 
+                            array('name' => 'assigned_user_id', 'label' => 'LBL_ASSIGNED_TO', 'type' => 'enum', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
+                        ),
+                    ),
+                );
 ?>

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

Spacing +10 added lines, -10 removed lines

@@ -242,7 +242,7 @@ 
         if (!empty($reminderBeans)) {
             foreach ($reminderBeans as $reminderBean) {
                 $eventBean = BeanFactory::getBean($reminderBean->related_event_module, $reminderBean->related_event_module_id);
-                if($eventBean) {
+                if ($eventBean) {
                     $remind_ts = $timedate->fromUser($eventBean->date_start)->modify("-{$reminderBean->timer_email} seconds")->ts;
                     $now_ts = $timedate->getNow()->ts;
                     if ($now_ts >= $remind_ts) {
@@ -325,7 +325,7 @@ 
                             $timeRemind = $popupReminder->timer_popup;
                             $timeStart -= $timeRemind;
 
-                            $url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+                            $url = 'index.php?action=DetailView&module='.$popupReminder->related_event_module.'&record='.$popupReminder->related_event_module_id;
                             $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
                             if ($popupReminder->related_event_module == 'Meetings') {
@@ -345,8 +345,8 @@ 
 
                             $relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 
-                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'] . $desc1 . "\n";
-                            $description = $description . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'] . $relatedToMeeting;
+                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+                            $description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].(isset($relatedEvent->status) ? $relatedEvent->status : '')."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
                             if (isset($relatedEvent->date_start)) {
@@ -364,9 +364,9 @@ 
 
                             // standard functionality
                             $alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'] . $time,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'] . $location .
-                                $description .
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                                $description.
                                 $instructions,
                                 $timeStart - strtotime($alertDateTimeNow),
                                 $url
@@ -429,7 +429,7 @@ 
 
     private function upgradeEventPersonQuery(SugarBean $event, $person_table)
     {
-        $eventIdField = strtolower($event->object_name) . '_id';
+        $eventIdField = strtolower($event->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person_table}
 			WHERE
@@ -443,9 +443,9 @@ 
     {
         $eventIdField = array_search($event->table_name, $event->relationship_fields);
         if (!$eventIdField) {
-            $eventIdField = strtolower($event->object_name . '_id');
+            $eventIdField = strtolower($event->object_name.'_id');
         }
-        $personIdField = strtolower($person->object_name) . '_id';
+        $personIdField = strtolower($person->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE

Indentation +4 added lines, -4 removed lines

@@ -532,9 +532,9 @@ 
         }
     }
 
-	/**
-	 * @param string $eventModule 'Calls' or 'Meetings'
-	 */
+    /**
+     * @param string $eventModule 'Calls' or 'Meetings'
+     */
     private static function upgradeEventReminders($eventModule)
     {
         global $db;
@@ -542,7 +542,7 @@ 
         $eventBean = BeanFactory::getBean($eventModule);
         $events = $eventBean->get_full_list('', "{$eventBean->table_name}.date_start >  {$db->convert('', 'today')} AND ({$eventBean->table_name}.reminder_time != -1 OR ({$eventBean->table_name}.email_reminder_time != -1 AND {$eventBean->table_name}.email_reminder_sent != 1))");
         if ($events) {
-			foreach ($events as $event) {
+            foreach ($events as $event) {
 
                 $oldReminderPopupChecked = false;
                 $oldReminderPopupTimer = null;