adamjakab / SuiteCRM

modules/Notes/SubPanelView.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -56,29 +56,29 @@ 
 var $hideNewButton = false;
 var $focus;
 
-function setFocus(&$value){
-	$this->focus =(object) $value;
+function setFocus(&$value) {
+	$this->focus = (object)$value;
 }
 
 
-function setNotesList(&$value){
-	$this->notes_list =$value;
+function setNotesList(&$value) {
+	$this->notes_list = $value;
 }
 
-function setHideNewButton($value){
+function setHideNewButton($value) {
 	$this->hideNewButton = $value;
 }
 
-function __construct(){
+function __construct() {
 	global $theme;
 }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function SubPanelViewNotes(){
+    function SubPanelViewNotes() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -88,33 +88,33 @@ 
     }
 
 
-function getHeaderText($action, $currentModule){
+function getHeaderText($action, $currentModule) {
 	global $app_strings;
 	$button  = "<table cellspacing='0' cellpadding='0' border='0'><form border='0' action='index.php' method='post' name='form' id='form'>\n";
 	$button .= "<input type='hidden' name='module' value='Notes'>\n";
-	if(!$this->hideNewButton){
+	if (!$this->hideNewButton) {
 		$button .= "<td><input title='".$app_strings['LBL_NEW_BUTTON_TITLE']."' class='button' onclick=\"this.form.action.value='EditView'\" type='submit' name='button' value='  ".$app_strings['LBL_NEW_BUTTON_LABEL']."  '></td>\n";
 	}
 	$button .= "</tr></form></table>\n";
 	return $button;
 }
 
-function ProcessSubPanelListView($xTemplatePath, &$mod_strings,$action, $curModule=''){
-	global $currentModule,$app_strings;
-	if(empty($curModule))
+function ProcessSubPanelListView($xTemplatePath, &$mod_strings, $action, $curModule = '') {
+	global $currentModule, $app_strings;
+	if (empty($curModule))
 		$curModule = $currentModule;
 	$ListView = new ListView();
 	global $current_user;
 $header_text = '';
-if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){
-		$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Notes&record=". $this->focus->id."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
+if (is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])) {
+		$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Notes&record=".$this->focus->id."'>".SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDITLAYOUT'])."</a>";
 }
-	$ListView->initNewXTemplate($xTemplatePath,$mod_strings);
+	$ListView->initNewXTemplate($xTemplatePath, $mod_strings);
 	$ListView->xTemplateAssign("RETURN_URL", "&return_module=".$curModule."&return_action=DetailView&return_id=".$this->focus->id);
-	$ListView->xTemplateAssign("DELETE_INLINE_PNG",  SugarThemeRegistry::current()->getImage('delete_inline','align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_DELETE']));
-	$ListView->xTemplateAssign("EDIT_INLINE_PNG",  SugarThemeRegistry::current()->getImage('edit_inline','align="absmiddle"  border="0"',null,null,'.gif',$app_strings['LNK_EDIT']));
-	$ListView->xTemplateAssign("RECORD_ID",  $this->focus->id);
-	$ListView->setHeaderTitle($mod_strings['LBL_MODULE_NAME']. $header_text);
+	$ListView->xTemplateAssign("DELETE_INLINE_PNG", SugarThemeRegistry::current()->getImage('delete_inline', 'align="absmiddle" border="0"', null, null, '.gif', $app_strings['LNK_DELETE']));
+	$ListView->xTemplateAssign("EDIT_INLINE_PNG", SugarThemeRegistry::current()->getImage('edit_inline', 'align="absmiddle"  border="0"', null, null, '.gif', $app_strings['LNK_EDIT']));
+	$ListView->xTemplateAssign("RECORD_ID", $this->focus->id);
+	$ListView->setHeaderTitle($mod_strings['LBL_MODULE_NAME'].$header_text);
 	$ListView->setHeaderText($this->getHeaderText($action, $curModule));
 	$ListView->processListView($this->notes_list, "notes", "NOTE");
 }

Braces +7 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -80,8 +82,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -101,8 +102,9 @@ 
 
 function ProcessSubPanelListView($xTemplatePath, &$mod_strings,$action, $curModule=''){
 	global $currentModule,$app_strings;
-	if(empty($curModule))
-		$curModule = $currentModule;
+	if(empty($curModule)) {
+			$curModule = $currentModule;
+	}
 	$ListView = new ListView();
 	global $current_user;
 $header_text = '';

modules/Notes/Dashlets/MyNotesDashlet/MyNotesDashlet.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,7 +49,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_MY_NOTES_DASHLETNAME', 'Notes');
+        if (empty($def['title'])) $this->title = translate('LBL_MY_NOTES_DASHLETNAME', 'Notes');
 
         $this->searchFields = $dashletData['MyNotesDashlet']['searchFields'];
         $this->columns = $dashletData['MyNotesDashlet']['columns'];
@@ -60,9 +60,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function MyNotesDashlet($id, $def = null){
+    function MyNotesDashlet($id, $def = null) {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {

Braces +7 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,7 +51,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_MY_NOTES_DASHLETNAME', 'Notes');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_MY_NOTES_DASHLETNAME', 'Notes');
+        }
 
         $this->searchFields = $dashletData['MyNotesDashlet']['searchFields'];
         $this->columns = $dashletData['MyNotesDashlet']['columns'];
@@ -64,8 +68,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct($id, $def);

modules/Notes/NoteSoap.php

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -54,9 +54,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function NoteSoap(){
+    function NoteSoap() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -74,16 +74,16 @@ 
 
 
 
-        if(!empty($note['id'])){
+        if (!empty($note['id'])) {
                 $focus->retrieve($note['id']);
-                if(empty($focus->id)) {
+                if (empty($focus->id)) {
                     return '-1';
                 }
-        }else{
+        } else {
                 return '-1';
         }
 
-        if(!empty($note['file'])){
+        if (!empty($note['file'])) {
                 $decodedFile = base64_decode($note['file']);
                 $this->upload_file->set_for_soap($note['filename'], $decodedFile);
 
@@ -99,29 +99,29 @@ 
                	$focus->id = $note['id'];
                 $return_id = $focus->save();
                 $this->upload_file->final_move($focus->id);
-        }else{
+        } else {
                 return '-1';
         }
 
         return $return_id;
     }
 
-    function newSaveFile($note, $portal = false){
+    function newSaveFile($note, $portal = false) {
         global $sugar_config;
 
         $focus = new Note();
 
 
-        if(!empty($note['id'])){
+        if (!empty($note['id'])) {
         	$focus->retrieve($note['id']);
-            if(empty($focus->id)) {
+            if (empty($focus->id)) {
                 return '-1';
             }
         } else {
            	return '-1';
         }
 
-        if(!empty($note['file'])){
+        if (!empty($note['file'])) {
             $decodedFile = base64_decode($note['file']);
             $this->upload_file->set_for_soap($note['filename'], $decodedFile);
 
@@ -139,19 +139,19 @@ 
 
         $return_id = $focus->id;
 
-        if(!empty($note['file'])){
+        if (!empty($note['file'])) {
         	$this->upload_file->final_move($focus->id);
         }
 
 		if (!empty($note['related_module_id']) && !empty($note['related_module_name'])) {
-        	$focus->process_save_dates=false;
+        	$focus->process_save_dates = false;
         	$module_name = $note['related_module_name'];
         	$module_id = $note['related_module_id'];
-			if($module_name != 'Contacts'){
-				$focus->parent_type=$module_name;
+			if ($module_name != 'Contacts') {
+				$focus->parent_type = $module_name;
 				$focus->parent_id = $module_id;
-			}else{
-				$focus->contact_id=$module_id;
+			} else {
+				$focus->contact_id = $module_id;
 			}
 			$focus->save();
 
@@ -161,13 +161,13 @@ 
 
     function retrieveFile($id, $filename)
     {
-    	if(empty($filename)){
+    	if (empty($filename)) {
     		return '';
     	}
 
     	$this->upload_file->stored_file_name = $filename;
     	$filepath = $this->upload_file->get_upload_path($id);
-    	if(file_exists($filepath)){
+    	if (file_exists($filepath)) {
     		$file = file_get_contents($filepath);
     		return base64_encode($file);
     	}

Braces +7 added lines, -6 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -58,8 +60,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -79,7 +80,7 @@ 
                 if(empty($focus->id)) {
                     return '-1';
                 }
-        }else{
+        } else{
                 return '-1';
         }
 
@@ -99,7 +100,7 @@ 
                	$focus->id = $note['id'];
                 $return_id = $focus->save();
                 $this->upload_file->final_move($focus->id);
-        }else{
+        } else{
                 return '-1';
         }
 
@@ -150,7 +151,7 @@ 
 			if($module_name != 'Contacts'){
 				$focus->parent_type=$module_name;
 				$focus->parent_id = $module_id;
-			}else{
+			} else{
 				$focus->contact_id=$module_id;
 			}
 			$focus->save();

modules/Notes/Note.php

Indentation +233 added lines, -233 removed lines

@@ -54,48 +54,48 @@ 
 
 // Note is used to store customer information.
 class Note extends SugarBean {
-	var $field_name_map;
-	// Stored fields
-	var $id;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $assigned_user_id;
-	var $created_by;
-	var $created_by_name;
-	var $modified_by_name;
-	var $description;
-	var $name;
-	var $filename;
-	// handle to an upload_file object
-	// used in emails
-	var $file;
-	var $embed_flag; // inline image flag
-	var $parent_type;
-	var $parent_id;
-	var $contact_id;
-	var $portal_flag;
-
-	var $parent_name;
-	var $contact_name;
-	var $contact_phone;
-	var $contact_email;
-	var $file_mime_type;
-	var $module_dir = "Notes";
-	var $default_note_name_dom = array('Meeting notes', 'Reminder');
-	var $table_name = "notes";
-	var $new_schema = true;
-	var $object_name = "Note";
-	var $importable = true;
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array('contact_name', 'contact_phone', 'contact_email', 'parent_name','first_name','last_name');
+    var $field_name_map;
+    // Stored fields
+    var $id;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $assigned_user_id;
+    var $created_by;
+    var $created_by_name;
+    var $modified_by_name;
+    var $description;
+    var $name;
+    var $filename;
+    // handle to an upload_file object
+    // used in emails
+    var $file;
+    var $embed_flag; // inline image flag
+    var $parent_type;
+    var $parent_id;
+    var $contact_id;
+    var $portal_flag;
+
+    var $parent_name;
+    var $contact_name;
+    var $contact_phone;
+    var $contact_email;
+    var $file_mime_type;
+    var $module_dir = "Notes";
+    var $default_note_name_dom = array('Meeting notes', 'Reminder');
+    var $table_name = "notes";
+    var $new_schema = true;
+    var $object_name = "Note";
+    var $importable = true;
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = Array('contact_name', 'contact_phone', 'contact_email', 'parent_name','first_name','last_name');
 
 
 
     public function __construct() {
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -112,109 +112,109 @@ 
     }
 
 
-	function safeAttachmentName() {
-		global $sugar_config;
-
-		//get position of last "." in file name
-		$file_ext_beg = strrpos($this->filename, ".");
-		$file_ext = "";
-
-		//get file extension
-		if($file_ext_beg !== false) {
-			$file_ext = substr($this->filename, $file_ext_beg + 1);
-		}
-
-		//check to see if this is a file with extension located in "badext"
-		foreach($sugar_config['upload_badext'] as $badExt) {
-			if(strtolower($file_ext) == strtolower($badExt)) {
-				//if found, then append with .txt and break out of lookup
-				$this->name = $this->name . ".txt";
-				$this->file_mime_type = 'text/';
-				$this->filename = $this->filename . ".txt";
-				break; // no need to look for more
-			}
-		}
-
-	}
-
-	/**
-	 * overrides SugarBean's method.
-	 * If a system setting is set, it will mark all related notes as deleted, and attempt to delete files that are
-	 * related to those notes
-	 * @param string id ID
-	 */
-	function mark_deleted($id) {
-		global $sugar_config;
-
-		if($this->parent_type == 'Emails') {
-			if(isset($sugar_config['email_default_delete_attachments']) && $sugar_config['email_default_delete_attachments'] == true) {
-				$removeFile = "upload://$id";
-				if(file_exists($removeFile)) {
-					if(!unlink($removeFile)) {
-						$GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
-					}
-				}
-			}
-		}
-
-		// delete note
-		parent::mark_deleted($id);
-	}
-
-	function deleteAttachment($isduplicate="false"){
-		if($this->ACLAccess('edit')){
-			if($isduplicate=="true"){
-				return true;
-			}
-			$removeFile = "upload://{$this->id}";
-		}
-
-		if(file_exists($removeFile)) {
-			if(!unlink($removeFile)) {
-				$GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
-			}else{
-				$this->filename = '';
-				$this->file_mime_type = '';
-				$this->file = '';
-				$this->save();
-				return true;
-			}
-		} else {
-			$this->filename = '';
-			$this->file_mime_type = '';
-			$this->file = '';
-			$this->save();
-			return true;
-		}
-		return false;
-	}
-
-
-	function get_summary_text() {
-		return "$this->name";
-	}
+    function safeAttachmentName() {
+        global $sugar_config;
+
+        //get position of last "." in file name
+        $file_ext_beg = strrpos($this->filename, ".");
+        $file_ext = "";
+
+        //get file extension
+        if($file_ext_beg !== false) {
+            $file_ext = substr($this->filename, $file_ext_beg + 1);
+        }
+
+        //check to see if this is a file with extension located in "badext"
+        foreach($sugar_config['upload_badext'] as $badExt) {
+            if(strtolower($file_ext) == strtolower($badExt)) {
+                //if found, then append with .txt and break out of lookup
+                $this->name = $this->name . ".txt";
+                $this->file_mime_type = 'text/';
+                $this->filename = $this->filename . ".txt";
+                break; // no need to look for more
+            }
+        }
+
+    }
+
+    /**
+     * overrides SugarBean's method.
+     * If a system setting is set, it will mark all related notes as deleted, and attempt to delete files that are
+     * related to those notes
+     * @param string id ID
+     */
+    function mark_deleted($id) {
+        global $sugar_config;
+
+        if($this->parent_type == 'Emails') {
+            if(isset($sugar_config['email_default_delete_attachments']) && $sugar_config['email_default_delete_attachments'] == true) {
+                $removeFile = "upload://$id";
+                if(file_exists($removeFile)) {
+                    if(!unlink($removeFile)) {
+                        $GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
+                    }
+                }
+            }
+        }
+
+        // delete note
+        parent::mark_deleted($id);
+    }
+
+    function deleteAttachment($isduplicate="false"){
+        if($this->ACLAccess('edit')){
+            if($isduplicate=="true"){
+                return true;
+            }
+            $removeFile = "upload://{$this->id}";
+        }
+
+        if(file_exists($removeFile)) {
+            if(!unlink($removeFile)) {
+                $GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
+            }else{
+                $this->filename = '';
+                $this->file_mime_type = '';
+                $this->file = '';
+                $this->save();
+                return true;
+            }
+        } else {
+            $this->filename = '';
+            $this->file_mime_type = '';
+            $this->file = '';
+            $this->save();
+            return true;
+        }
+        return false;
+    }
+
+
+    function get_summary_text() {
+        return "$this->name";
+    }
 
     function create_export_query($order_by, $where, $relate_link_join='')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
-		$query = "SELECT notes.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
+        $query = "SELECT notes.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
 
         $query .= $custom_join['select'];
 
-    	$query .= " FROM notes ";
+        $query .= " FROM notes ";
 
-		$query .= "	LEFT JOIN contacts ON notes.contact_id=contacts.id ";
-        	$query .= "  LEFT JOIN users ON notes.assigned_user_id=users.id ";
+        $query .= "	LEFT JOIN contacts ON notes.contact_id=contacts.id ";
+            $query .= "  LEFT JOIN users ON notes.assigned_user_id=users.id ";
 
         $query .= $custom_join['join'];
 
-		$where_auto = " notes.deleted=0 AND (contacts.deleted IS NULL OR contacts.deleted=0)";
+        $where_auto = " notes.deleted=0 AND (contacts.deleted IS NULL OR contacts.deleted=0)";
 
         if($where != "")
-			$query .= "where $where AND ".$where_auto;
+            $query .= "where $where AND ".$where_auto;
         else
-			$query .= "where ".$where_auto;
+            $query .= "where ".$where_auto;
 
         $order_by = $this->process_order_by($order_by);
         if (empty($order_by)) {
@@ -222,143 +222,143 @@ 
         }
         $query .= ' ORDER BY ' . $order_by;
 
-		return $query;
-	}
+        return $query;
+    }
 
-	function fill_in_additional_list_fields() {
-		$this->fill_in_additional_detail_fields();
-	}
+    function fill_in_additional_list_fields() {
+        $this->fill_in_additional_detail_fields();
+    }
 
-	function fill_in_additional_detail_fields() {
-		parent::fill_in_additional_detail_fields();
-		//TODO:  Seems odd we need to clear out these values so that list views don't show the previous rows value if current value is blank
-		$this->getRelatedFields('Contacts', $this->contact_id, array('name'=>'contact_name', 'phone_work'=>'contact_phone') );
-		if(!empty($this->contact_name)){
+    function fill_in_additional_detail_fields() {
+        parent::fill_in_additional_detail_fields();
+        //TODO:  Seems odd we need to clear out these values so that list views don't show the previous rows value if current value is blank
+        $this->getRelatedFields('Contacts', $this->contact_id, array('name'=>'contact_name', 'phone_work'=>'contact_phone') );
+        if(!empty($this->contact_name)){
 
-			$emailAddress = new SugarEmailAddress();
-			$this->contact_email = $emailAddress->getPrimaryAddress(false, $this->contact_id, 'Contacts');
-		}
+            $emailAddress = new SugarEmailAddress();
+            $this->contact_email = $emailAddress->getPrimaryAddress(false, $this->contact_id, 'Contacts');
+        }
 
-		if(isset($this->contact_id) && $this->contact_id != '') {
-		    $contact = new Contact();
-		    $contact->retrieve($this->contact_id);
-		    if(isset($contact->id)) {
-		        $this->contact_name = $contact->full_name;
-		    }
-		}
-	}
+        if(isset($this->contact_id) && $this->contact_id != '') {
+            $contact = new Contact();
+            $contact->retrieve($this->contact_id);
+            if(isset($contact->id)) {
+                $this->contact_name = $contact->full_name;
+            }
+        }
+    }
 
 
-	function get_list_view_data()
-	{
-		$note_fields = $this->get_list_view_array();
-		global $app_list_strings, $focus, $action, $currentModule,$mod_strings, $sugar_config;
+    function get_list_view_data()
+    {
+        $note_fields = $this->get_list_view_array();
+        global $app_list_strings, $focus, $action, $currentModule,$mod_strings, $sugar_config;
 
-		if(isset($this->parent_type)) {
-			$note_fields['PARENT_MODULE'] = $this->parent_type;
-		}
+        if(isset($this->parent_type)) {
+            $note_fields['PARENT_MODULE'] = $this->parent_type;
+        }
 
-		if(!empty($this->filename)) {
+        if(!empty($this->filename)) {
             if(file_exists("upload://{$this->id}")){
                 $note_fields['FILENAME'] = $this->filename;
                 $note_fields['FILE_URL'] = UploadFile::get_upload_url($this);
             }
         }
         if(isset($this->contact_id) && $this->contact_id != '') {
-			$contact = new Contact();
-			$contact->retrieve($this->contact_id);
-			if(isset($contact->id)) {
-			    $this->contact_name = $contact->full_name;
-			}
-		}
+            $contact = new Contact();
+            $contact->retrieve($this->contact_id);
+            if(isset($contact->id)) {
+                $this->contact_name = $contact->full_name;
+            }
+        }
         if(isset($this->contact_name)){
-        	$note_fields['CONTACT_NAME'] = $this->contact_name;
+            $note_fields['CONTACT_NAME'] = $this->contact_name;
         }
 
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Notes');
-		$note_fields['STATUS']=$mod_strings['LBL_NOTE_STATUS'];
-
-
-		return $note_fields;
-	}
-
-	function listviewACLHelper() {
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)) {
-			if(!empty($this->parent_name_owner)) {
-				global $current_user;
-				$is_owner = $current_user->id == $this->parent_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
-				global $current_user;
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Notes');
+        $note_fields['STATUS']=$mod_strings['LBL_NOTE_STATUS'];
+
+
+        return $note_fields;
+    }
+
+    function listviewACLHelper() {
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->parent_name)) {
+            if(!empty($this->parent_name_owner)) {
+                global $current_user;
+                $is_owner = $current_user->id == $this->parent_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //parent_name_owner not being set for whatever reason so we need to figure this out
+            else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-		/* BEGIN - SECURITY GROUPS */
-		/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess($this->parent_type, $this->parent_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+        /* BEGIN - SECURITY GROUPS */
+        /**
 		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)) {
-		*/
-		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+         */
+        if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
         /* END - SECURITY GROUPS */
-			$array_assign['PARENT'] = 'a';
-		} else {
-			$array_assign['PARENT'] = 'span';
-		}
-
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)) {
-			if(!empty($this->contact_name_owner)) {
-				global $current_user;
-				$is_owner = $current_user->id == $this->contact_name_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			//contact_name_owner not being set for whatever reason so we need to figure this out
-			else {
-				global $current_user;
+            $array_assign['PARENT'] = 'a';
+        } else {
+            $array_assign['PARENT'] = 'span';
+        }
+
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->contact_name)) {
+            if(!empty($this->contact_name_owner)) {
+                global $current_user;
+                $is_owner = $current_user->id == $this->contact_name_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            //contact_name_owner not being set for whatever reason so we need to figure this out
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
                 if($parent_bean !== false) {
-                	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
+                    $is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
-			}
-			require_once("modules/SecurityGroups/SecurityGroup.php");
-			$in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-
-		/* BEGIN - SECURITY GROUPS */
-		/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Contacts', $this->contact_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+
+        /* BEGIN - SECURITY GROUPS */
+        /**
 		if( ACLController::checkAccess('Contacts', 'view', $is_owner)) {
-		*/
-		if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
+         */
+        if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
-			$array_assign['CONTACT'] = 'a';
-		} else {
-			$array_assign['CONTACT'] = 'span';
-		}
+            $array_assign['CONTACT'] = 'a';
+        } else {
+            $array_assign['CONTACT'] = 'span';
+        }
 
-		return $array_assign;
-	}
+        return $array_assign;
+    }
 
-	function bean_implements($interface) {
-		switch($interface) {
-			case 'ACL':return true;
+    function bean_implements($interface) {
+        switch($interface) {
+            case 'ACL':return true;
             case 'FILE' : return true;
-		}
-		return false;
-	}
+        }
+        return false;
+    }
 }
 
 ?>

Spacing +46 added lines, -46 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -89,7 +89,7 @@ 
 	var $importable = true;
 
 	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array('contact_name', 'contact_phone', 'contact_email', 'parent_name','first_name','last_name');
+	var $additional_column_fields = Array('contact_name', 'contact_phone', 'contact_email', 'parent_name', 'first_name', 'last_name');
 
 
 
@@ -100,9 +100,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function Note(){
+    public function Note() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -120,17 +120,17 @@ 
 		$file_ext = "";
 
 		//get file extension
-		if($file_ext_beg !== false) {
+		if ($file_ext_beg !== false) {
 			$file_ext = substr($this->filename, $file_ext_beg + 1);
 		}
 
 		//check to see if this is a file with extension located in "badext"
-		foreach($sugar_config['upload_badext'] as $badExt) {
-			if(strtolower($file_ext) == strtolower($badExt)) {
+		foreach ($sugar_config['upload_badext'] as $badExt) {
+			if (strtolower($file_ext) == strtolower($badExt)) {
 				//if found, then append with .txt and break out of lookup
-				$this->name = $this->name . ".txt";
+				$this->name = $this->name.".txt";
 				$this->file_mime_type = 'text/';
-				$this->filename = $this->filename . ".txt";
+				$this->filename = $this->filename.".txt";
 				break; // no need to look for more
 			}
 		}
@@ -146,11 +146,11 @@ 
 	function mark_deleted($id) {
 		global $sugar_config;
 
-		if($this->parent_type == 'Emails') {
-			if(isset($sugar_config['email_default_delete_attachments']) && $sugar_config['email_default_delete_attachments'] == true) {
+		if ($this->parent_type == 'Emails') {
+			if (isset($sugar_config['email_default_delete_attachments']) && $sugar_config['email_default_delete_attachments'] == true) {
 				$removeFile = "upload://$id";
-				if(file_exists($removeFile)) {
-					if(!unlink($removeFile)) {
+				if (file_exists($removeFile)) {
+					if (!unlink($removeFile)) {
 						$GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
 					}
 				}
@@ -161,18 +161,18 @@ 
 		parent::mark_deleted($id);
 	}
 
-	function deleteAttachment($isduplicate="false"){
-		if($this->ACLAccess('edit')){
-			if($isduplicate=="true"){
+	function deleteAttachment($isduplicate = "false") {
+		if ($this->ACLAccess('edit')) {
+			if ($isduplicate == "true") {
 				return true;
 			}
 			$removeFile = "upload://{$this->id}";
 		}
 
-		if(file_exists($removeFile)) {
-			if(!unlink($removeFile)) {
+		if (file_exists($removeFile)) {
+			if (!unlink($removeFile)) {
 				$GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
-			}else{
+			} else {
 				$this->filename = '';
 				$this->file_mime_type = '';
 				$this->file = '';
@@ -194,7 +194,7 @@ 
 		return "$this->name";
 	}
 
-    function create_export_query($order_by, $where, $relate_link_join='')
+    function create_export_query($order_by, $where, $relate_link_join = '')
     {
         $custom_join = $this->getCustomJoin(true, true, $where);
         $custom_join['join'] .= $relate_link_join;
@@ -211,7 +211,7 @@ 
 
 		$where_auto = " notes.deleted=0 AND (contacts.deleted IS NULL OR contacts.deleted=0)";
 
-        if($where != "")
+        if ($where != "")
 			$query .= "where $where AND ".$where_auto;
         else
 			$query .= "where ".$where_auto;
@@ -220,7 +220,7 @@ 
         if (empty($order_by)) {
             $order_by = 'notes.name';
         }
-        $query .= ' ORDER BY ' . $order_by;
+        $query .= ' ORDER BY '.$order_by;
 
 		return $query;
 	}
@@ -232,17 +232,17 @@ 
 	function fill_in_additional_detail_fields() {
 		parent::fill_in_additional_detail_fields();
 		//TODO:  Seems odd we need to clear out these values so that list views don't show the previous rows value if current value is blank
-		$this->getRelatedFields('Contacts', $this->contact_id, array('name'=>'contact_name', 'phone_work'=>'contact_phone') );
-		if(!empty($this->contact_name)){
+		$this->getRelatedFields('Contacts', $this->contact_id, array('name'=>'contact_name', 'phone_work'=>'contact_phone'));
+		if (!empty($this->contact_name)) {
 
 			$emailAddress = new SugarEmailAddress();
 			$this->contact_email = $emailAddress->getPrimaryAddress(false, $this->contact_id, 'Contacts');
 		}
 
-		if(isset($this->contact_id) && $this->contact_id != '') {
+		if (isset($this->contact_id) && $this->contact_id != '') {
 		    $contact = new Contact();
 		    $contact->retrieve($this->contact_id);
-		    if(isset($contact->id)) {
+		    if (isset($contact->id)) {
 		        $this->contact_name = $contact->full_name;
 		    }
 		}
@@ -252,32 +252,32 @@ 
 	function get_list_view_data()
 	{
 		$note_fields = $this->get_list_view_array();
-		global $app_list_strings, $focus, $action, $currentModule,$mod_strings, $sugar_config;
+		global $app_list_strings, $focus, $action, $currentModule, $mod_strings, $sugar_config;
 
-		if(isset($this->parent_type)) {
+		if (isset($this->parent_type)) {
 			$note_fields['PARENT_MODULE'] = $this->parent_type;
 		}
 
-		if(!empty($this->filename)) {
-            if(file_exists("upload://{$this->id}")){
+		if (!empty($this->filename)) {
+            if (file_exists("upload://{$this->id}")) {
                 $note_fields['FILENAME'] = $this->filename;
                 $note_fields['FILE_URL'] = UploadFile::get_upload_url($this);
             }
         }
-        if(isset($this->contact_id) && $this->contact_id != '') {
+        if (isset($this->contact_id) && $this->contact_id != '') {
 			$contact = new Contact();
 			$contact->retrieve($this->contact_id);
-			if(isset($contact->id)) {
+			if (isset($contact->id)) {
 			    $this->contact_name = $contact->full_name;
 			}
 		}
-        if(isset($this->contact_name)){
+        if (isset($this->contact_name)) {
         	$note_fields['CONTACT_NAME'] = $this->contact_name;
         }
 
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Notes');
-		$note_fields['STATUS']=$mod_strings['LBL_NOTE_STATUS'];
+		$note_fields['STATUS'] = $mod_strings['LBL_NOTE_STATUS'];
 
 
 		return $note_fields;
@@ -287,17 +287,17 @@ 
 		$array_assign = parent::listviewACLHelper();
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->parent_name)) {
-			if(!empty($this->parent_name_owner)) {
+		if (!empty($this->parent_name)) {
+			if (!empty($this->parent_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->parent_name_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			//parent_name_owner not being set for whatever reason so we need to figure this out
-			else if(!empty($this->parent_type) && !empty($this->parent_id)) {
+			else if (!empty($this->parent_type) && !empty($this->parent_id)) {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean($this->parent_type,$this->parent_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean($this->parent_type, $this->parent_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -310,7 +310,7 @@ 
 		/**
 		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner)) {
 		*/
-		if(!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)){
+		if (!ACLController::moduleSupportsACL($this->parent_type) || ACLController::checkAccess($this->parent_type, 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
 			$array_assign['PARENT'] = 'a';
 		} else {
@@ -319,8 +319,8 @@ 
 
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->contact_name)) {
-			if(!empty($this->contact_name_owner)) {
+		if (!empty($this->contact_name)) {
+			if (!empty($this->contact_name_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->contact_name_owner;
 			}
@@ -328,8 +328,8 @@ 
 			//contact_name_owner not being set for whatever reason so we need to figure this out
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Contacts',$this->contact_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Contacts', $this->contact_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -342,7 +342,7 @@ 
 		/**
 		if( ACLController::checkAccess('Contacts', 'view', $is_owner)) {
 		*/
-		if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
+		if (ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
 			$array_assign['CONTACT'] = 'a';
 		} else {
@@ -353,7 +353,7 @@ 
 	}
 
 	function bean_implements($interface) {
-		switch($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
             case 'FILE' : return true;
 		}

Braces +10 added lines, -8 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -104,8 +106,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -172,7 +173,7 @@ 
 		if(file_exists($removeFile)) {
 			if(!unlink($removeFile)) {
 				$GLOBALS['log']->error("*** Could not unlink() file: [ {$removeFile} ]");
-			}else{
+			} else{
 				$this->filename = '';
 				$this->file_mime_type = '';
 				$this->file = '';
@@ -211,10 +212,11 @@ 
 
 		$where_auto = " notes.deleted=0 AND (contacts.deleted IS NULL OR contacts.deleted=0)";
 
-        if($where != "")
-			$query .= "where $where AND ".$where_auto;
-        else
-			$query .= "where ".$where_auto;
+        if($where != "") {
+        			$query .= "where $where AND ".$where_auto;
+        } else {
+        			$query .= "where ".$where_auto;
+        }
 
         $order_by = $this->process_order_by($order_by);
         if (empty($order_by)) {

modules/DynamicFields/FieldViewer.php

Indentation +78 added lines, -78 removed lines

@@ -38,9 +38,9 @@ 
  ********************************************************************************/
 
 class FieldViewer{
-	function __construct(){
-		$this->ss = new Sugar_Smarty();
-	}
+    function __construct(){
+        $this->ss = new Sugar_Smarty();
+    }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
@@ -56,83 +56,83 @@ 
         self::__construct();
     }
 
-	function getLayout($vardef){
+    function getLayout($vardef){
 
-		if(empty($vardef['type']))$vardef['type'] = 'varchar';
-		$mod = return_module_language($GLOBALS['current_language'], 'DynamicFields');
-		$this->ss->assign('vardef', $vardef);
-		$this->ss->assign('MOD', $mod);
-		$this->ss->assign('APP', $GLOBALS['app_strings']);
-		//Only display range search option if in Studio, not ModuleBuilder
-		$this->ss->assign('range_search_option_enabled', empty($_REQUEST['view_package']));
+        if(empty($vardef['type']))$vardef['type'] = 'varchar';
+        $mod = return_module_language($GLOBALS['current_language'], 'DynamicFields');
+        $this->ss->assign('vardef', $vardef);
+        $this->ss->assign('MOD', $mod);
+        $this->ss->assign('APP', $GLOBALS['app_strings']);
+        //Only display range search option if in Studio, not ModuleBuilder
+        $this->ss->assign('range_search_option_enabled', empty($_REQUEST['view_package']));
 
-		$GLOBALS['log']->debug('FieldViewer.php->getLayout() = '.$vardef['type']);
-		switch($vardef['type']){
-			case 'address':
+        $GLOBALS['log']->debug('FieldViewer.php->getLayout() = '.$vardef['type']);
+        switch($vardef['type']){
+            case 'address':
                 return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/address.tpl');
-			case 'bool':
-				return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/bool.tpl');
-			case 'int':
-				return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/int.tpl');
-			case 'float':
-				return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/float.tpl');
-			case 'decimal':
-				return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/float.tpl');
-			case 'date':
-			    require_once('modules/DynamicFields/templates/Fields/Forms/date.php');
-				return get_body($this->ss, $vardef);
-			case 'datetimecombo':
-			case 'datetime':
-			    require_once('modules/DynamicFields/templates/Fields/Forms/datetimecombo.php');
-				return get_body($this->ss, $vardef);
-			case 'enum':
-				require_once('modules/DynamicFields/templates/Fields/Forms/enum2.php');
-				return get_body($this->ss, $vardef);
-			case 'multienum':
-				require_once('modules/DynamicFields/templates/Fields/Forms/multienum.php');
-				return get_body($this->ss, $vardef);
-			case 'radioenum':
-				require_once('modules/DynamicFields/templates/Fields/Forms/radioenum.php');
-				return get_body($this->ss, $vardef);
-			case 'html':
-				require_once('modules/DynamicFields/templates/Fields/Forms/html.php');
-				return get_body($this->ss, $vardef);
-			case 'currency':
-				return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/currency.tpl');
-			case 'relate':
-				require_once('modules/DynamicFields/templates/Fields/Forms/relate.php');
-				return get_body($this->ss, $vardef);
-			case 'parent':
-				require_once('modules/DynamicFields/templates/Fields/Forms/parent.php');
-				return get_body($this->ss, $vardef);
-			case 'text':
-				return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/text.tpl');
-			case 'encrypt':
-				require_once('modules/DynamicFields/templates/Fields/Forms/encrypt.php');
-				return get_body($this->ss, $vardef);
-			case 'iframe':
-				require_once('modules/DynamicFields/templates/Fields/Forms/iframe.php');
-				return get_body($this->ss, $vardef);
-			case 'url':
-				require_once('modules/DynamicFields/templates/Fields/Forms/url.php');
-				return get_body($this->ss, $vardef);
-			case 'phone:':
-				require_once('modules/DynamicFields/templates/Fields/Forms/phone.php');
-				return get_body($this->ss, $vardef);
-			default:
-				$file = false;
-				if(file_exists('custom/modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php')){
-					$file = 'custom/modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php';
-				} elseif(file_exists('modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php')){
-					$file = 'modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php';
-				}
-				if(!empty($file)){
-					require_once($file);
-					return get_body($this->ss, $vardef);
-				}else{
-					return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/varchar.tpl');
-				}
-		}
-	}
+            case 'bool':
+                return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/bool.tpl');
+            case 'int':
+                return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/int.tpl');
+            case 'float':
+                return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/float.tpl');
+            case 'decimal':
+                return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/float.tpl');
+            case 'date':
+                require_once('modules/DynamicFields/templates/Fields/Forms/date.php');
+                return get_body($this->ss, $vardef);
+            case 'datetimecombo':
+            case 'datetime':
+                require_once('modules/DynamicFields/templates/Fields/Forms/datetimecombo.php');
+                return get_body($this->ss, $vardef);
+            case 'enum':
+                require_once('modules/DynamicFields/templates/Fields/Forms/enum2.php');
+                return get_body($this->ss, $vardef);
+            case 'multienum':
+                require_once('modules/DynamicFields/templates/Fields/Forms/multienum.php');
+                return get_body($this->ss, $vardef);
+            case 'radioenum':
+                require_once('modules/DynamicFields/templates/Fields/Forms/radioenum.php');
+                return get_body($this->ss, $vardef);
+            case 'html':
+                require_once('modules/DynamicFields/templates/Fields/Forms/html.php');
+                return get_body($this->ss, $vardef);
+            case 'currency':
+                return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/currency.tpl');
+            case 'relate':
+                require_once('modules/DynamicFields/templates/Fields/Forms/relate.php');
+                return get_body($this->ss, $vardef);
+            case 'parent':
+                require_once('modules/DynamicFields/templates/Fields/Forms/parent.php');
+                return get_body($this->ss, $vardef);
+            case 'text':
+                return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/text.tpl');
+            case 'encrypt':
+                require_once('modules/DynamicFields/templates/Fields/Forms/encrypt.php');
+                return get_body($this->ss, $vardef);
+            case 'iframe':
+                require_once('modules/DynamicFields/templates/Fields/Forms/iframe.php');
+                return get_body($this->ss, $vardef);
+            case 'url':
+                require_once('modules/DynamicFields/templates/Fields/Forms/url.php');
+                return get_body($this->ss, $vardef);
+            case 'phone:':
+                require_once('modules/DynamicFields/templates/Fields/Forms/phone.php');
+                return get_body($this->ss, $vardef);
+            default:
+                $file = false;
+                if(file_exists('custom/modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php')){
+                    $file = 'custom/modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php';
+                } elseif(file_exists('modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php')){
+                    $file = 'modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php';
+                }
+                if(!empty($file)){
+                    require_once($file);
+                    return get_body($this->ss, $vardef);
+                }else{
+                    return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/varchar.tpl');
+                }
+        }
+    }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -37,17 +37,17 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
-class FieldViewer{
-	function __construct(){
+class FieldViewer {
+	function __construct() {
 		$this->ss = new Sugar_Smarty();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function FieldViewer(){
+    function FieldViewer() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -56,9 +56,9 @@ 
         self::__construct();
     }
 
-	function getLayout($vardef){
+	function getLayout($vardef) {
 
-		if(empty($vardef['type']))$vardef['type'] = 'varchar';
+		if (empty($vardef['type']))$vardef['type'] = 'varchar';
 		$mod = return_module_language($GLOBALS['current_language'], 'DynamicFields');
 		$this->ss->assign('vardef', $vardef);
 		$this->ss->assign('MOD', $mod);
@@ -67,7 +67,7 @@ 
 		$this->ss->assign('range_search_option_enabled', empty($_REQUEST['view_package']));
 
 		$GLOBALS['log']->debug('FieldViewer.php->getLayout() = '.$vardef['type']);
-		switch($vardef['type']){
+		switch ($vardef['type']) {
 			case 'address':
                 return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/address.tpl');
 			case 'bool':
@@ -121,15 +121,15 @@ 
 				return get_body($this->ss, $vardef);
 			default:
 				$file = false;
-				if(file_exists('custom/modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php')){
-					$file = 'custom/modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php';
-				} elseif(file_exists('modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php')){
-					$file = 'modules/DynamicFields/templates/Fields/Forms/' . $vardef['type'] . '.php';
+				if (file_exists('custom/modules/DynamicFields/templates/Fields/Forms/'.$vardef['type'].'.php')) {
+					$file = 'custom/modules/DynamicFields/templates/Fields/Forms/'.$vardef['type'].'.php';
+				} elseif (file_exists('modules/DynamicFields/templates/Fields/Forms/'.$vardef['type'].'.php')) {
+					$file = 'modules/DynamicFields/templates/Fields/Forms/'.$vardef['type'].'.php';
 				}
-				if(!empty($file)){
+				if (!empty($file)) {
 					require_once($file);
 					return get_body($this->ss, $vardef);
-				}else{
+				} else {
 					return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/varchar.tpl');
 				}
 		}

Braces +5 added lines, -4 removed lines

@@ -49,8 +49,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();
@@ -58,7 +57,9 @@ 
 
 	function getLayout($vardef){
 
-		if(empty($vardef['type']))$vardef['type'] = 'varchar';
+		if(empty($vardef['type'])) {
+		    $vardef['type'] = 'varchar';
+		}
 		$mod = return_module_language($GLOBALS['current_language'], 'DynamicFields');
 		$this->ss->assign('vardef', $vardef);
 		$this->ss->assign('MOD', $mod);
@@ -129,7 +130,7 @@ 
 				if(!empty($file)){
 					require_once($file);
 					return get_body($this->ss, $vardef);
-				}else{
+				} else{
 					return $this->ss->fetch('modules/DynamicFields/templates/Fields/Forms/varchar.tpl');
 				}
 		}

modules/DynamicFields/templates/Fields/TemplateCronSchedule.php

Spacing +7 added lines, -7 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 require_once('modules/DynamicFields/templates/Fields/TemplateText.php');
-class TemplateCronSchedule extends TemplateText{
-    var $type='CronSchedule';
+class TemplateCronSchedule extends TemplateText {
+    var $type = 'CronSchedule';
 
-    function __construct(){
+    function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function TemplateCronSchedule(){
+    function TemplateCronSchedule() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -24,7 +24,7 @@ 
     }
 
 
-    function get_field_def(){
+    function get_field_def() {
         $def = parent::get_field_def();
         $def['dbType'] = 'varchar';
         return $def;

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/DynamicFields/templates/Fields/TemplateDecimal.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,21 +39,21 @@ 
  ********************************************************************************/
 
 
-class TemplateDecimal extends TemplateFloat{
+class TemplateDecimal extends TemplateFloat {
 	var $type = 'decimal';
 	var $default = null;
 	var $default_value = null;
 
-	function __construct(){
+	function __construct() {
     	parent::__construct();
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function TemplateDecimal(){
+    function TemplateDecimal() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -65,7 +65,7 @@ 
 
     function get_db_type()
 	{
-		if(empty($this->len)) {
+		if (empty($this->len)) {
 			return parent::get_db_type();
 		}
 		$precision = (!empty($this->precision)) ? $this->precision : 6;

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();

modules/DynamicFields/templates/Fields/TemplateDynamicenum.php

Spacing +4 added lines, -4 removed lines

@@ -54,9 +54,9 @@ 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function TemplateDynamicenum(){
+    function TemplateDynamicenum() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -86,7 +86,7 @@ 
             }
         }
         if (!empty($this->help)) {
-            $returnXTPL[strtoupper($this->name . '_help')] = translate($this->help, $this->bean->module_dir);
+            $returnXTPL[strtoupper($this->name.'_help')] = translate($this->help, $this->bean->module_dir);
         }
 
         global $app_list_strings;
@@ -95,7 +95,7 @@ 
         if (empty($this->ext1)) {
             $this->ext1 = $this->options;
         }
-        $returnXTPL[strtoupper('options_' . $this->name)] = get_select_options_with_id($app_list_strings[$this->ext1], $value);
+        $returnXTPL[strtoupper('options_'.$this->name)] = get_select_options_with_id($app_list_strings[$this->ext1], $value);
 
         return $returnXTPL;
 

Braces +4 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 
-if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class MeetingsJjwg_MapsLogicHook
 {
@@ -19,8 +21,7 @@ 
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();

modules/DynamicFields/templates/Fields/TemplateFloat.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,18 +48,18 @@ 
 	var $len = '18';
 	var $precision = '8';
 
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
-		$this->vardef_map['precision']='ext1';
+		$this->vardef_map['precision'] = 'ext1';
 		//$this->vardef_map['precision']='precision';
 	}
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    public function TemplateFloat(){
+    public function TemplateFloat() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -69,15 +69,15 @@ 
     }
 
 
-    function get_field_def(){
+    function get_field_def() {
     	$def = parent::get_field_def();
 		$def['precision'] = isset($this->ext1) && $this->ext1 != '' ? $this->ext1 : $this->precision;
     	return $def;
     }
 
-    function get_db_type(){
-		$precision = (!empty($this->precision))? $this->precision: 6;
-    	if(empty($this->len)) {
+    function get_db_type() {
+		$precision = (!empty($this->precision)) ? $this->precision : 6;
+    	if (empty($this->len)) {
 			return parent::get_db_type();
 		}
 		return " ".sprintf($GLOBALS['db']->getColumnType("decimal_tpl"), $this->len, $precision);

Braces +4 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
  * Date: 06/03/15
  * Comments
  */
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class CasesController extends SugarController {
 
@@ -90,8 +92,7 @@ 
                 $count++;
             }
             echo '</table>';
-        }
-        else {
+        } else {
             echo $mod_strings['LBL_NO_SUGGESTIONS'];
         }
         die();