adamjakab / SuiteCRM

modules/Tasks/Dashlets/MyTasksDashlet/MyTasksDashlet.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.
@@ -52,7 +52,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_TASKS', 'Tasks');
+        if (empty($def['title'])) $this->title = translate('LBL_LIST_MY_TASKS', 'Tasks');
 
         $this->searchFields = $dashletData['MyTasksDashlet']['searchFields'];
         $this->columns = $dashletData['MyTasksDashlet']['columns'];
@@ -63,9 +63,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 MyTasksDashlet($id, $def = null){
+    function MyTasksDashlet($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.
@@ -52,7 +54,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_LIST_MY_TASKS', 'Tasks');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_LIST_MY_TASKS', 'Tasks');
+        }
 
         $this->searchFields = $dashletData['MyTasksDashlet']['searchFields'];
         $this->columns = $dashletData['MyTasksDashlet']['columns'];
@@ -67,8 +71,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/Tasks/Task.php

Spacing +52 added lines, -52 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.
@@ -92,9 +92,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 Task(){
+    public function Task() {
         $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 {
@@ -108,7 +108,7 @@ 
 
     function save($check_notify = FALSE)
     {
-        if (empty($this->status) ) {
+        if (empty($this->status)) {
             $this->status = $this->getDefaultStatus();
         }
         return parent::save($check_notify);
@@ -119,12 +119,12 @@ 
 		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;
-                $contact_required = stristr($where,"contacts");
-                if($contact_required)
+                $contact_required = stristr($where, "contacts");
+                if ($contact_required)
                 {
                         $query = "SELECT tasks.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
                         $query .= $custom_join['select'];
@@ -143,7 +143,7 @@ 
         $query .= $custom_join['join'];
 		$query .= "  LEFT JOIN users ON tasks.assigned_user_id=users.id ";
 
-                if($where != "")
+                if ($where != "")
                         $query .= "where $where AND ".$where_auto;
                 else
                         $query .= "where ".$where_auto;
@@ -152,7 +152,7 @@ 
         if (empty($order_by)) {
             $order_by = 'tasks.name';
         }
-        $query .= ' ORDER BY ' . $order_by;
+        $query .= ' ORDER BY '.$order_by;
 
                 return $query;
 
@@ -175,7 +175,7 @@ 
 			$contact = new Contact();
 			$contact->retrieve($this->contact_id);
 
-			if($contact->id != "") {
+			if ($contact->id != "") {
 				$this->contact_name = $contact->full_name;
 				$this->contact_name_owner = $contact->assigned_user_id;
 				$this->contact_name_mod = 'Contacts';
@@ -184,9 +184,9 @@ 
 			} else {
 				$this->contact_name_mod = '';
 				$this->contact_name_owner = '';
-				$this->contact_name='';
+				$this->contact_name = '';
 				$this->contact_email = '';
-				$this->contact_id='';
+				$this->contact_id = '';
 			}
 
 		}
@@ -199,7 +199,7 @@ 
 
 		$this->parent_name = '';
 		global $app_strings, $beanFiles, $beanList, $locale;
-		if ( ! isset($beanList[$this->parent_type]))
+		if (!isset($beanList[$this->parent_type]))
 		{
 			$this->parent_name = '';
 			return;
@@ -218,19 +218,19 @@ 
 		else {
 
 			$query = "SELECT name ";
-			if(isset($parent->field_defs['assigned_user_id'])){
+			if (isset($parent->field_defs['assigned_user_id'])) {
 				$query .= " , assigned_user_id parent_name_owner ";
-			}else{
+			} else {
 				$query .= " , created_by parent_name_owner ";
 			}
 			$query .= " from $parent->table_name where id = '$this->parent_id'";
 		}
-		$result = $this->db->query($query,true," Error filling in additional detail fields: ");
+		$result = $this->db->query($query, true, " Error filling in additional detail fields: ");
 
 		// Get the id and the name.
 		$row = $this->db->fetchByAssoc($result);
 
-		if ($row && !empty($row['parent_name_owner'])){
+		if ($row && !empty($row['parent_name_owner'])) {
 			$this->parent_name_owner = $row['parent_name_owner'];
 			$this->parent_name_mod = $this->parent_type;
 		}
@@ -241,7 +241,7 @@ 
 		else if (is_subclass_of($parent, 'File') && $row != null) {
 			$this->parent_name = $row['document_name'];
 		}
-		elseif($row != null)
+		elseif ($row != null)
 		{
 			$this->parent_name = stripslashes($row['name']);
 		}
@@ -255,7 +255,7 @@ 
     {
         global $timedate;
 
-        if(empty($dbtime)) return;
+        if (empty($dbtime)) return;
 
         $today = $timedate->nowDbDate();
 
@@ -266,22 +266,22 @@ 
 
         $dd = $timedate->to_db_date($date_due, false);
         $taskClass = 'futureTask';
-		if ($dd < $today){
+		if ($dd < $today) {
             $taskClass = 'overdueTask';
-		}else if( $dd	== $today ){
+		} else if ($dd == $today) {
             $taskClass = 'todaysTask';
 		}
-        $task_fields['DATE_DUE']= "<font class='$taskClass'>$date_due</font>";
-        if($override_date_for_subpanel){
-            $task_fields['DATE_START']= "<font class='$taskClass'>$date_due</font>";
+        $task_fields['DATE_DUE'] = "<font class='$taskClass'>$date_due</font>";
+        if ($override_date_for_subpanel) {
+            $task_fields['DATE_START'] = "<font class='$taskClass'>$date_due</font>";
         }
     }
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		global $action, $currentModule, $focus, $current_module_strings, $app_list_strings, $timedate;
 
 		$override_date_for_subpanel = false;
-		if(!empty($_REQUEST['module']) && $_REQUEST['module'] !='Calendar' && $_REQUEST['module'] !='Tasks' && $_REQUEST['module'] !='Home'){
+		if (!empty($_REQUEST['module']) && $_REQUEST['module'] != 'Calendar' && $_REQUEST['module'] != 'Tasks' && $_REQUEST['module'] != 'Home') {
 			//this is a subpanel list view, so override the due date with start date so that collections subpanel works as expected
 			$override_date_for_subpanel = true;
 		}
@@ -289,11 +289,11 @@ 
 		$today = $timedate->nowDb();
 		$task_fields = $this->get_list_view_array();
 		$dbtime = $timedate->to_db($task_fields['DATE_DUE']);
-		if($override_date_for_subpanel){
+		if ($override_date_for_subpanel) {
 			$dbtime = $timedate->to_db($task_fields['DATE_START']);
 		}
 
-        if(!empty($dbtime))
+        if (!empty($dbtime))
         {
             $task_fields['TIME_DUE'] = $timedate->to_display_time($dbtime);
             $task_fields['DATE_DUE'] = $timedate->to_display_date($dbtime);
@@ -304,10 +304,10 @@ 
 			$task_fields['PRIORITY'] = $app_list_strings['task_priority_dom'][$this->priority];
 		if (isset($this->parent_type))
 			$task_fields['PARENT_MODULE'] = $this->parent_type;
-		if ($this->status != "Completed" && $this->status != "Deferred" )
+		if ($this->status != "Completed" && $this->status != "Deferred")
 		{
 			$setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Completed\",\"listview\",\"1\");'>";
-		    $task_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline","title=".translate('LBL_LIST_CLOSE','Tasks')." border='0'",null,null,'.gif',translate('LBL_LIST_CLOSE','Tasks'))."</a>";
+		    $task_fields['SET_COMPLETE'] = $setCompleteUrl.SugarThemeRegistry::current()->getImage("close_inline", "title=".translate('LBL_LIST_CLOSE', 'Tasks')." border='0'", null, null, '.gif', translate('LBL_LIST_CLOSE', 'Tasks'))."</a>";
 		}
 
         // make sure we grab the localized version of the contact name, if a contact is provided
@@ -323,15 +323,15 @@ 
             }
         }
 
-		$task_fields['CONTACT_NAME']= $this->contact_name;
-		$task_fields['CONTACT_PHONE']= $this->contact_phone;
+		$task_fields['CONTACT_NAME'] = $this->contact_name;
+		$task_fields['CONTACT_PHONE'] = $this->contact_phone;
 		$task_fields['TITLE'] = '';
 		if (!empty($task_fields['CONTACT_NAME'])) {
 			$task_fields['TITLE'] .= $current_module_strings['LBL_LIST_CONTACT'].": ".$task_fields['CONTACT_NAME'];
 		}
 		if (!empty($this->parent_name)) {
 			$task_fields['TITLE'] .= "\n".$app_list_strings['parent_type_display'][$this->parent_type].": ".$this->parent_name;
-			$task_fields['PARENT_NAME']=$this->parent_name;
+			$task_fields['PARENT_NAME'] = $this->parent_name;
 		}
 
 		return $task_fields;
@@ -345,9 +345,9 @@ 
         $prefDate = $notifyUser->getUserDateTimePreferences();
 		$xtpl->assign("TASK_SUBJECT", $task->name);
 		//MFH #13507
-		$xtpl->assign("TASK_PRIORITY", (isset($task->priority)?$app_list_strings['task_priority_dom'][$task->priority]:""));
+		$xtpl->assign("TASK_PRIORITY", (isset($task->priority) ? $app_list_strings['task_priority_dom'][$task->priority] : ""));
 
-        if(!empty($task->date_due))
+        if (!empty($task->date_due))
         {
 		    $duedate = $timedate->fromDb($task->date_due);
             $xtpl->assign("TASK_DUEDATE", $timedate->asUser($duedate, $notifyUser)." ".TimeDate::userTimezoneSuffix($duedate, $notifyUser));
@@ -355,33 +355,33 @@ 
             $xtpl->assign("TASK_DUEDATE", '');
         }
 
-		$xtpl->assign("TASK_STATUS", (isset($task->status)?$app_list_strings['task_status_dom'][$task->status]:""));
+		$xtpl->assign("TASK_STATUS", (isset($task->status) ? $app_list_strings['task_status_dom'][$task->status] : ""));
 		$xtpl->assign("TASK_DESCRIPTION", $task->description);
 
 		return $xtpl;
 	}
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
 	}
-	function listviewACLHelper(){
+	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)){
+		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;
                 }
 			}
@@ -394,16 +394,16 @@ 
 			/**
 			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{
+			} else {
 				$array_assign['PARENT'] = 'span';
 			}
 		$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;
 			}
@@ -411,8 +411,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;
                 }
 			}
@@ -425,10 +425,10 @@ 
 		/**
 		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{
+		} else {
 				$array_assign['CONTACT'] = 'span';
 		}
 

Braces +28 added lines, -28 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.
@@ -96,8 +98,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();
@@ -130,8 +131,7 @@ 
                         $query .= $custom_join['select'];
                         $query .= " FROM contacts, tasks ";
                         $where_auto = "tasks.contact_id = contacts.id AND tasks.deleted=0 AND contacts.deleted=0";
-                }
-                else
+                } else
                 {
                         $query = 'SELECT tasks.*, users.user_name as assigned_user_name ';
                         $query .= $custom_join['select'];
@@ -143,10 +143,11 @@ 
         $query .= $custom_join['join'];
 		$query .= "  LEFT JOIN users ON tasks.assigned_user_id=users.id ";
 
-                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)) {
@@ -211,16 +212,14 @@ 
 
 		if (is_subclass_of($parent, 'Person')) {
 			$query = "SELECT first_name, last_name, assigned_user_id parent_name_owner from $parent->table_name where id = '$this->parent_id'";
-		}
-		else if (is_subclass_of($parent, 'File')) {
+		} else if (is_subclass_of($parent, 'File')) {
 			$query = "SELECT document_name, assigned_user_id parent_name_owner from $parent->table_name where id = '$this->parent_id'";
-		}
-		else {
+		} else {
 
 			$query = "SELECT name ";
 			if(isset($parent->field_defs['assigned_user_id'])){
 				$query .= " , assigned_user_id parent_name_owner ";
-			}else{
+			} else{
 				$query .= " , created_by parent_name_owner ";
 			}
 			$query .= " from $parent->table_name where id = '$this->parent_id'";
@@ -237,15 +236,12 @@ 
 		if (is_subclass_of($parent, 'Person') and $row != null)
 		{
 			$this->parent_name = $locale->getLocaleFormattedName(stripslashes($row['first_name']), stripslashes($row['last_name']));
-		}
-		else if (is_subclass_of($parent, 'File') && $row != null) {
+		} else if (is_subclass_of($parent, 'File') && $row != null) {
 			$this->parent_name = $row['document_name'];
-		}
-		elseif($row != null)
+		} elseif($row != null)
 		{
 			$this->parent_name = stripslashes($row['name']);
-		}
-		else {
+		} else {
 			$this->parent_name = '';
 		}
 	}
@@ -255,7 +251,9 @@ 
     {
         global $timedate;
 
-        if(empty($dbtime)) return;
+        if(empty($dbtime)) {
+            return;
+        }
 
         $today = $timedate->nowDbDate();
 
@@ -268,7 +266,7 @@ 
         $taskClass = 'futureTask';
 		if ($dd < $today){
             $taskClass = 'overdueTask';
-		}else if( $dd	== $today ){
+		} else if( $dd	== $today ){
             $taskClass = 'todaysTask';
 		}
         $task_fields['DATE_DUE']= "<font class='$taskClass'>$date_due</font>";
@@ -300,10 +298,12 @@ 
             $this->formatStartAndDueDates($task_fields, $dbtime, $override_date_for_subpanel);
         }
 
-		if (!empty($this->priority))
-			$task_fields['PRIORITY'] = $app_list_strings['task_priority_dom'][$this->priority];
-		if (isset($this->parent_type))
-			$task_fields['PARENT_MODULE'] = $this->parent_type;
+		if (!empty($this->priority)) {
+					$task_fields['PRIORITY'] = $app_list_strings['task_priority_dom'][$this->priority];
+		}
+		if (isset($this->parent_type)) {
+					$task_fields['PARENT_MODULE'] = $this->parent_type;
+		}
 		if ($this->status != "Completed" && $this->status != "Deferred" )
 		{
 			$setCompleteUrl = "<a id='{$this->id}' onclick='SUGAR.util.closeActivityPanel.show(\"{$this->module_dir}\",\"{$this->id}\",\"Completed\",\"listview\",\"1\");'>";
@@ -397,7 +397,7 @@ 
 			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{
+			} else{
 				$array_assign['PARENT'] = 'span';
 			}
 		$is_owner = false;
@@ -428,7 +428,7 @@ 
 		if( ACLController::checkAccess('Contacts', 'view', $is_owner, 'module', $in_group)) {
         /* END - SECURITY GROUPS */
 				$array_assign['CONTACT'] = 'a';
-		}else{
+		} else{
 				$array_assign['CONTACT'] = 'span';
 		}
 

modules/AM_TaskTemplates/Dashlets/AM_TaskTemplatesDashlet/AM_TaskTemplatesDashlet.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.
@@ -53,7 +53,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_TaskTemplates');
+        if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_TaskTemplates');
 
         $this->searchFields = $dashletData['AM_TaskTemplatesDashlet']['searchFields'];
         $this->columns = $dashletData['AM_TaskTemplatesDashlet']['columns'];
@@ -64,9 +64,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 AM_TaskTemplatesDashlet($id, $def = null){
+    function AM_TaskTemplatesDashlet($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.
@@ -53,7 +55,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_TaskTemplates');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_HOMEPAGE_TITLE', 'AM_TaskTemplates');
+        }
 
         $this->searchFields = $dashletData['AM_TaskTemplatesDashlet']['searchFields'];
         $this->columns = $dashletData['AM_TaskTemplatesDashlet']['columns'];
@@ -68,8 +72,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/Opportunities/Opportunity.php

Indentation +320 added lines, -320 removed lines

@@ -57,91 +57,91 @@ 
 
 // Opportunity is used to store customer information.
 class Opportunity extends SugarBean {
-	var $field_name_map;
-	// Stored fields
-	var $id;
-	var $lead_source;
-	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 $opportunity_type;
-	var $amount;
-	var $amount_usdollar;
-	var $currency_id;
-	var $date_closed;
-	var $next_step;
-	var $sales_stage;
-	var $probability;
-	var $campaign_id;
-
-	// These are related
-	var $account_name;
-	var $account_id;
-	var $contact_id;
-	var $task_id;
-	var $note_id;
-	var $meeting_id;
-	var $call_id;
-	var $email_id;
-	var $assigned_user_name;
-
-	var $table_name = "opportunities";
-	var $rel_account_table = "accounts_opportunities";
-	var $rel_contact_table = "opportunities_contacts";
-	var $module_dir = "Opportunities";
-
-	var $importable = true;
-	var $object_name = "Opportunity";
-
-	// This is used to retrieve related fields from form posts.
-	var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'account_name', 'account_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id'
-	);
-
-	var $relationship_fields = Array('task_id'=>'tasks', 'note_id'=>'notes', 'account_id'=>'accounts',
-									'meeting_id'=>'meetings', 'call_id'=>'calls', 'email_id'=>'emails', 'project_id'=>'project',
-									// Bug 38529 & 40938
-									'currency_id' => 'currencies',
-									);
+    var $field_name_map;
+    // Stored fields
+    var $id;
+    var $lead_source;
+    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 $opportunity_type;
+    var $amount;
+    var $amount_usdollar;
+    var $currency_id;
+    var $date_closed;
+    var $next_step;
+    var $sales_stage;
+    var $probability;
+    var $campaign_id;
+
+    // These are related
+    var $account_name;
+    var $account_id;
+    var $contact_id;
+    var $task_id;
+    var $note_id;
+    var $meeting_id;
+    var $call_id;
+    var $email_id;
+    var $assigned_user_name;
+
+    var $table_name = "opportunities";
+    var $rel_account_table = "accounts_opportunities";
+    var $rel_contact_table = "opportunities_contacts";
+    var $module_dir = "Opportunities";
+
+    var $importable = true;
+    var $object_name = "Opportunity";
+
+    // This is used to retrieve related fields from form posts.
+    var $additional_column_fields = Array('assigned_user_name', 'assigned_user_id', 'account_name', 'account_id', 'contact_id', 'task_id', 'note_id', 'meeting_id', 'call_id', 'email_id'
+    );
+
+    var $relationship_fields = Array('task_id'=>'tasks', 'note_id'=>'notes', 'account_id'=>'accounts',
+                                    'meeting_id'=>'meetings', 'call_id'=>'calls', 'email_id'=>'emails', 'project_id'=>'project',
+                                    // Bug 38529 & 40938
+                                    'currency_id' => 'currencies',
+                                    );
 
     public function __construct() {
-		parent::__construct();
-		global $sugar_config;
-		if(!$sugar_config['require_accounts']){
-			unset($this->required_fields['account_name']);
-		}
-	}
-
-	/**
-	 * @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 Opportunity(){
-		$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 {
-			trigger_error($deprecatedMessage, E_USER_DEPRECATED);
-		}
-		self::__construct();
-	}
-
-	var $new_schema = true;
-
-
-
-	function get_summary_text()
-	{
-		return "$this->name";
-	}
-
-	function create_list_query($order_by, $where, $show_deleted = 0)
-	{
+        parent::__construct();
+        global $sugar_config;
+        if(!$sugar_config['require_accounts']){
+            unset($this->required_fields['account_name']);
+        }
+    }
+
+    /**
+     * @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 Opportunity(){
+        $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 {
+            trigger_error($deprecatedMessage, E_USER_DEPRECATED);
+        }
+        self::__construct();
+    }
+
+    var $new_schema = true;
+
+
+
+    function get_summary_text()
+    {
+        return "$this->name";
+    }
+
+    function create_list_query($order_by, $where, $show_deleted = 0)
+    {
 
         $custom_join = $this->getCustomJoin();
                 $query = "SELECT ";
@@ -163,28 +163,28 @@ 
                             LEFT JOIN accounts
                             ON $this->rel_account_table.account_id=accounts.id ";
         $query .= $custom_join['join'];
-		$where_auto = '1=1';
-		if($show_deleted == 0){
-			$where_auto = "
+        $where_auto = '1=1';
+        if($show_deleted == 0){
+            $where_auto = "
 			($this->rel_account_table.deleted is null OR $this->rel_account_table.deleted=0)
 			AND (accounts.deleted is null OR accounts.deleted=0)
 			AND opportunities.deleted=0";
-		}else 	if($show_deleted == 1){
-				$where_auto = " opportunities.deleted=1";
-		}
+        }else 	if($show_deleted == 1){
+                $where_auto = " opportunities.deleted=1";
+        }
 
-		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;
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY opportunities.name";
+        if($order_by != "")
+            $query .= " ORDER BY $order_by";
+        else
+            $query .= " ORDER BY opportunities.name";
 
-		return $query;
-	}
+        return $query;
+    }
 
 
     function create_export_query($order_by, $where, $relate_link_join='')
@@ -196,15 +196,15 @@ 
                                 accounts.name as account_name,
                                 users.user_name as assigned_user_name ";
         $query .= $custom_join['select'];
-	                            $query .= " FROM opportunities ";
-		$query .= 				"LEFT JOIN users
+                                $query .= " FROM opportunities ";
+        $query .= 				"LEFT JOIN users
                                 ON opportunities.assigned_user_id=users.id";
                                 $query .= " LEFT JOIN $this->rel_account_table
                                 ON opportunities.id=$this->rel_account_table.opportunity_id
                                 LEFT JOIN accounts
                                 ON $this->rel_account_table.account_id=accounts.id ";
         $query .= $custom_join['join'];
-		$where_auto = "
+        $where_auto = "
 			($this->rel_account_table.deleted is null OR $this->rel_account_table.deleted=0)
 			AND (accounts.deleted is null OR accounts.deleted=0)
 			AND opportunities.deleted=0";
@@ -221,138 +221,138 @@ 
         return $query;
     }
 
-	function fill_in_additional_list_fields()
-	{
+    function fill_in_additional_list_fields()
+    {
                 if ( $this->force_load_details == true)
                 {
                         $this->fill_in_additional_detail_fields();
                 }
-	}
-
-	function fill_in_additional_detail_fields()
-	{
-		parent::fill_in_additional_detail_fields();
-
-		if(!empty($this->currency_id)) {
-		    $currency = new Currency();
-		    $currency->retrieve($this->currency_id);
-    		if($currency->id != $this->currency_id || $currency->deleted == 1){
-    				$this->amount = $this->amount_usdollar;
-    				$this->currency_id = $currency->id;
-    		}
-		}
-       //get campaign name
+    }
+
+    function fill_in_additional_detail_fields()
+    {
+        parent::fill_in_additional_detail_fields();
+
+        if(!empty($this->currency_id)) {
+            $currency = new Currency();
+            $currency->retrieve($this->currency_id);
+            if($currency->id != $this->currency_id || $currency->deleted == 1){
+                    $this->amount = $this->amount_usdollar;
+                    $this->currency_id = $currency->id;
+            }
+        }
+        //get campaign name
         if(!empty($this->campaign_id)) {
-    		$camp = new Campaign();
-    		$camp->retrieve($this->campaign_id);
+            $camp = new Campaign();
+            $camp->retrieve($this->campaign_id);
             $this->campaign_name = $camp->name;
         }
-		$this->account_name = '';
-		$this->account_id = '';
-		if(!empty($this->id)) {
-    		$ret_values=Opportunity::get_account_detail($this->id);
-    		if (!empty($ret_values)) {
-    			$this->account_name=$ret_values['name'];
-    			$this->account_id=$ret_values['id'];
-    			$this->account_id_owner =$ret_values['assigned_user_id'];
-    		}
-		}
-	}
-
-	/** Returns a list of the associated contacts
-	 * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
-	 * All Rights Reserved..
-	 * Contributor(s): ______________________________________..
-	*/
-	function get_contacts()
-	{
-		$this->load_relationship('contacts');
-		$query_array=$this->contacts->getQuery(true);
-
-		//update the select clause in the retruned query.
-		$query_array['select']="SELECT contacts.id, contacts.first_name, contacts.last_name, contacts.title, contacts.email1, contacts.phone_work, opportunities_contacts.contact_role as opportunity_role, opportunities_contacts.id as opportunity_rel_id ";
-
-		$query='';
-		foreach ($query_array as $qstring) {
-			$query.=' '.$qstring;
-		}
-	    $temp = Array('id', 'first_name', 'last_name', 'title', 'email1', 'phone_work', 'opportunity_role', 'opportunity_rel_id');
-		return $this->build_related_list2($query, new Contact(), $temp);
-	}
-
-	function update_currency_id($fromid, $toid){
-		$idequals = '';
-
-		$currency = new Currency();
-		$currency->retrieve($toid);
-		foreach($fromid as $f){
-			if(!empty($idequals)){
-				$idequals .=' or ';
-			}
-			$idequals .= "currency_id='$f'";
-		}
-
-		if(!empty($idequals)){
-			$query = "select amount, id from opportunities where (". $idequals. ") and deleted=0 and opportunities.sales_stage <> 'Closed Won' AND opportunities.sales_stage <> 'Closed Lost';";
-			$result = $this->db->query($query);
-			while($row = $this->db->fetchByAssoc($result)){
-
-				$query = "update opportunities set currency_id='".$currency->id."', amount_usdollar='".$currency->convertToDollar($row['amount'])."' where id='".$row['id']."';";
-				$this->db->query($query);
-
-			}
-
-	}
-	}
-
-	function get_list_view_data(){
-		global $locale, $current_language, $current_user, $mod_strings, $app_list_strings, $sugar_config;
-		$app_strings = return_application_language($current_language);
+        $this->account_name = '';
+        $this->account_id = '';
+        if(!empty($this->id)) {
+            $ret_values=Opportunity::get_account_detail($this->id);
+            if (!empty($ret_values)) {
+                $this->account_name=$ret_values['name'];
+                $this->account_id=$ret_values['id'];
+                $this->account_id_owner =$ret_values['assigned_user_id'];
+            }
+        }
+    }
+
+    /** Returns a list of the associated contacts
+     * Portions created by SugarCRM are Copyright (C) SugarCRM, Inc..
+     * All Rights Reserved..
+     * Contributor(s): ______________________________________..
+     */
+    function get_contacts()
+    {
+        $this->load_relationship('contacts');
+        $query_array=$this->contacts->getQuery(true);
+
+        //update the select clause in the retruned query.
+        $query_array['select']="SELECT contacts.id, contacts.first_name, contacts.last_name, contacts.title, contacts.email1, contacts.phone_work, opportunities_contacts.contact_role as opportunity_role, opportunities_contacts.id as opportunity_rel_id ";
+
+        $query='';
+        foreach ($query_array as $qstring) {
+            $query.=' '.$qstring;
+        }
+        $temp = Array('id', 'first_name', 'last_name', 'title', 'email1', 'phone_work', 'opportunity_role', 'opportunity_rel_id');
+        return $this->build_related_list2($query, new Contact(), $temp);
+    }
+
+    function update_currency_id($fromid, $toid){
+        $idequals = '';
+
+        $currency = new Currency();
+        $currency->retrieve($toid);
+        foreach($fromid as $f){
+            if(!empty($idequals)){
+                $idequals .=' or ';
+            }
+            $idequals .= "currency_id='$f'";
+        }
+
+        if(!empty($idequals)){
+            $query = "select amount, id from opportunities where (". $idequals. ") and deleted=0 and opportunities.sales_stage <> 'Closed Won' AND opportunities.sales_stage <> 'Closed Lost';";
+            $result = $this->db->query($query);
+            while($row = $this->db->fetchByAssoc($result)){
+
+                $query = "update opportunities set currency_id='".$currency->id."', amount_usdollar='".$currency->convertToDollar($row['amount'])."' where id='".$row['id']."';";
+                $this->db->query($query);
+
+            }
+
+    }
+    }
+
+    function get_list_view_data(){
+        global $locale, $current_language, $current_user, $mod_strings, $app_list_strings, $sugar_config;
+        $app_strings = return_application_language($current_language);
         $params = array();
 
-		$temp_array = $this->get_list_view_array();
-		$temp_array['SALES_STAGE'] = empty($temp_array['SALES_STAGE']) ? '' : $temp_array['SALES_STAGE'];
-		$temp_array["ENCODED_NAME"]=$this->name;
-		return $temp_array;
-	}
+        $temp_array = $this->get_list_view_array();
+        $temp_array['SALES_STAGE'] = empty($temp_array['SALES_STAGE']) ? '' : $temp_array['SALES_STAGE'];
+        $temp_array["ENCODED_NAME"]=$this->name;
+        return $temp_array;
+    }
 
     function get_currency_symbol(){
-           if(isset($this->currency_id)){
-               $cur_qry = "select * from currencies where id ='".$this->currency_id."'";
-               $cur_res = $this->db->query($cur_qry);
-               if(!empty($cur_res)){
+            if(isset($this->currency_id)){
+                $cur_qry = "select * from currencies where id ='".$this->currency_id."'";
+                $cur_res = $this->db->query($cur_qry);
+                if(!empty($cur_res)){
                     $cur_row = $this->db->fetchByAssoc($cur_res);
                         if(isset($cur_row['symbol'])){
-                         return $cur_row['symbol'];
+                            return $cur_row['symbol'];
                         }
-               }
-           }
-           return '';
+                }
+            }
+            return '';
     }
 
 
-	/**
+    /**
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
-	*/
-	function build_generic_where_clause ($the_query_string) {
-	$where_clauses = Array();
-	$the_query_string = $GLOBALS['db']->quote($the_query_string);
-	array_push($where_clauses, "opportunities.name like '$the_query_string%'");
-	array_push($where_clauses, "accounts.name like '$the_query_string%'");
-
-	$the_where = "";
-	foreach($where_clauses as $clause)
-	{
-		if($the_where != "") $the_where .= " or ";
-		$the_where .= $clause;
-	}
-
-
-	return $the_where;
+     */
+    function build_generic_where_clause ($the_query_string) {
+    $where_clauses = Array();
+    $the_query_string = $GLOBALS['db']->quote($the_query_string);
+    array_push($where_clauses, "opportunities.name like '$the_query_string%'");
+    array_push($where_clauses, "accounts.name like '$the_query_string%'");
+
+    $the_where = "";
+    foreach($where_clauses as $clause)
+    {
+        if($the_where != "") $the_where .= " or ";
+        $the_where .= $clause;
+    }
+
+
+    return $the_where;
 }
 
-	function save($check_notify = FALSE)
+    function save($check_notify = FALSE)
     {
         // Bug 32581 - Make sure the currency_id is set to something
         global $current_user, $app_list_strings;
@@ -366,119 +366,119 @@ 
         if (!isset($this->probability) && !empty($this->sales_stage))
         {
             $prob_arr = $app_list_strings['sales_probability_dom'];
-        	if (isset($prob_arr[$this->sales_stage]))
-        		$this->probability = $prob_arr[$this->sales_stage];
+            if (isset($prob_arr[$this->sales_stage]))
+                $this->probability = $prob_arr[$this->sales_stage];
+        }
+
+        require_once('modules/Opportunities/SaveOverload.php');
+
+        perform_save($this);
+        return parent::save($check_notify);
+
+    }
+
+    function save_relationship_changes($is_update, $exclude = array())
+    {
+        //if account_id was replaced unlink the previous account_id.
+        //this rel_fields_before_value is populated by sugarbean during the retrieve call.
+        if (!empty($this->account_id) and !empty($this->rel_fields_before_value['account_id']) and
+                (trim($this->account_id) != trim($this->rel_fields_before_value['account_id']))) {
+                //unlink the old record.
+                $this->load_relationship('accounts');
+                $this->accounts->delete($this->id,$this->rel_fields_before_value['account_id']);
         }
+        // Bug 38529 & 40938 - exclude currency_id
+        parent::save_relationship_changes($is_update, array('currency_id'));
 
-		require_once('modules/Opportunities/SaveOverload.php');
-
-		perform_save($this);
-		return parent::save($check_notify);
-
-	}
-
-	function save_relationship_changes($is_update, $exclude = array())
-	{
-		//if account_id was replaced unlink the previous account_id.
-		//this rel_fields_before_value is populated by sugarbean during the retrieve call.
-		if (!empty($this->account_id) and !empty($this->rel_fields_before_value['account_id']) and
-				(trim($this->account_id) != trim($this->rel_fields_before_value['account_id']))) {
-				//unlink the old record.
-				$this->load_relationship('accounts');
-				$this->accounts->delete($this->id,$this->rel_fields_before_value['account_id']);
-		}
-		// Bug 38529 & 40938 - exclude currency_id
-		parent::save_relationship_changes($is_update, array('currency_id'));
-
-		if (!empty($this->contact_id)) {
-			$this->set_opportunity_contact_relationship($this->contact_id);
-		}
-	}
-
-	function set_opportunity_contact_relationship($contact_id)
-	{
-		global $app_list_strings;
-		$default = $app_list_strings['opportunity_relationship_type_default_key'];
-		$this->load_relationship('contacts');
-		$this->contacts->add($contact_id,array('contact_role'=>$default));
-	}
-
-	function set_notification_body($xtpl, $oppty)
-	{
-		global $app_list_strings;
-
-		$xtpl->assign("OPPORTUNITY_NAME", $oppty->name);
-		$xtpl->assign("OPPORTUNITY_AMOUNT", $oppty->amount);
-		$xtpl->assign("OPPORTUNITY_CLOSEDATE", $oppty->date_closed);
-		$xtpl->assign("OPPORTUNITY_STAGE", (isset($oppty->sales_stage)?$app_list_strings['sales_stage_dom'][$oppty->sales_stage]:""));
-		$xtpl->assign("OPPORTUNITY_DESCRIPTION", $oppty->description);
-
-		return $xtpl;
-	}
-
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL':return true;
-		}
-		return false;
-	}
-	function listviewACLHelper(){
-		$array_assign = parent::listviewACLHelper();
-		$is_owner = false;
-		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->account_id)){
-
-			if(!empty($this->account_id_owner)){
-				global $current_user;
-				$is_owner = $current_user->id == $this->account_id_owner;
-			}
-			/* BEGIN - SECURITY GROUPS */
-			else {
-				global $current_user;
+        if (!empty($this->contact_id)) {
+            $this->set_opportunity_contact_relationship($this->contact_id);
+        }
+    }
+
+    function set_opportunity_contact_relationship($contact_id)
+    {
+        global $app_list_strings;
+        $default = $app_list_strings['opportunity_relationship_type_default_key'];
+        $this->load_relationship('contacts');
+        $this->contacts->add($contact_id,array('contact_role'=>$default));
+    }
+
+    function set_notification_body($xtpl, $oppty)
+    {
+        global $app_list_strings;
+
+        $xtpl->assign("OPPORTUNITY_NAME", $oppty->name);
+        $xtpl->assign("OPPORTUNITY_AMOUNT", $oppty->amount);
+        $xtpl->assign("OPPORTUNITY_CLOSEDATE", $oppty->date_closed);
+        $xtpl->assign("OPPORTUNITY_STAGE", (isset($oppty->sales_stage)?$app_list_strings['sales_stage_dom'][$oppty->sales_stage]:""));
+        $xtpl->assign("OPPORTUNITY_DESCRIPTION", $oppty->description);
+
+        return $xtpl;
+    }
+
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL':return true;
+        }
+        return false;
+    }
+    function listviewACLHelper(){
+        $array_assign = parent::listviewACLHelper();
+        $is_owner = false;
+        $in_group = false; //SECURITY GROUPS
+        if(!empty($this->account_id)){
+
+            if(!empty($this->account_id_owner)){
+                global $current_user;
+                $is_owner = $current_user->id == $this->account_id_owner;
+            }
+            /* BEGIN - SECURITY GROUPS */
+            else {
+                global $current_user;
                 $parent_bean = BeanFactory::getBean('Accounts',$this->account_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('Accounts', $this->account_id, 'view');
-        	/* END - SECURITY GROUPS */
-		}
-			/* BEGIN - SECURITY GROUPS */
-			/**
+            }
+            require_once("modules/SecurityGroups/SecurityGroup.php");
+            $in_group = SecurityGroup::groupHasAccess('Accounts', $this->account_id, 'view');
+            /* END - SECURITY GROUPS */
+        }
+            /* BEGIN - SECURITY GROUPS */
+            /**
 			if(!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner)){
-			*/
-			if(!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
-        	/* END - SECURITY GROUPS */
-				$array_assign['ACCOUNT'] = 'a';
-			}else{
-				$array_assign['ACCOUNT'] = 'span';
-			}
-
-		return $array_assign;
-	}
-
-	/**
-	 * Static helper function for getting releated account info.
-	 */
-	function get_account_detail($opp_id) {
-		$ret_array = array();
-		$db = DBManagerFactory::getInstance();
-		$query = "SELECT acc.id, acc.name, acc.assigned_user_id "
-			. "FROM accounts acc, accounts_opportunities a_o "
-			. "WHERE acc.id=a_o.account_id"
-			. " AND a_o.opportunity_id='$opp_id'"
-			. " AND a_o.deleted=0"
-			. " AND acc.deleted=0";
-		$result = $db->query($query, true,"Error filling in opportunity account details: ");
-		$row = $db->fetchByAssoc($result);
-		if($row != null) {
-			$ret_array['name'] = $row['name'];
-			$ret_array['id'] = $row['id'];
-			$ret_array['assigned_user_id'] = $row['assigned_user_id'];
-		}
-		return $ret_array;
-	}
+             */
+            if(!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
+            /* END - SECURITY GROUPS */
+                $array_assign['ACCOUNT'] = 'a';
+            }else{
+                $array_assign['ACCOUNT'] = 'span';
+            }
+
+        return $array_assign;
+    }
+
+    /**
+     * Static helper function for getting releated account info.
+     */
+    function get_account_detail($opp_id) {
+        $ret_array = array();
+        $db = DBManagerFactory::getInstance();
+        $query = "SELECT acc.id, acc.name, acc.assigned_user_id "
+            . "FROM accounts acc, accounts_opportunities a_o "
+            . "WHERE acc.id=a_o.account_id"
+            . " AND a_o.opportunity_id='$opp_id'"
+            . " AND a_o.deleted=0"
+            . " AND acc.deleted=0";
+        $result = $db->query($query, true,"Error filling in opportunity account details: ");
+        $row = $db->fetchByAssoc($result);
+        if($row != null) {
+            $ret_array['name'] = $row['name'];
+            $ret_array['id'] = $row['id'];
+            $ret_array['assigned_user_id'] = $row['assigned_user_id'];
+        }
+        return $ret_array;
+    }
 }
 function getCurrencyType(){
 

Spacing +59 added lines, -59 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.
@@ -112,7 +112,7 @@ 
     public function __construct() {
 		parent::__construct();
 		global $sugar_config;
-		if(!$sugar_config['require_accounts']){
+		if (!$sugar_config['require_accounts']) {
 			unset($this->required_fields['account_name']);
 		}
 	}
@@ -120,9 +120,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 Opportunity(){
+	function Opportunity() {
 		$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 {
@@ -156,7 +156,7 @@ 
                             FROM opportunities ";
 
 
-$query .= 			"LEFT JOIN users
+$query .= "LEFT JOIN users
                             ON opportunities.assigned_user_id=users.id ";
                             $query .= "LEFT JOIN $this->rel_account_table
                             ON opportunities.id=$this->rel_account_table.opportunity_id
@@ -164,21 +164,21 @@ 
                             ON $this->rel_account_table.account_id=accounts.id ";
         $query .= $custom_join['join'];
 		$where_auto = '1=1';
-		if($show_deleted == 0){
+		if ($show_deleted == 0) {
 			$where_auto = "
 			($this->rel_account_table.deleted is null OR $this->rel_account_table.deleted=0)
 			AND (accounts.deleted is null OR accounts.deleted=0)
 			AND opportunities.deleted=0";
-		}else 	if($show_deleted == 1){
+		} else 	if ($show_deleted == 1) {
 				$where_auto = " opportunities.deleted=1";
 		}
 
-		if($where != "")
+		if ($where != "")
 			$query .= "where ($where) AND ".$where_auto;
 		else
 			$query .= "where ".$where_auto;
 
-		if($order_by != "")
+		if ($order_by != "")
 			$query .= " ORDER BY $order_by";
 		else
 			$query .= " ORDER BY opportunities.name";
@@ -187,7 +187,7 @@ 
 	}
 
 
-    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;
@@ -197,7 +197,7 @@ 
                                 users.user_name as assigned_user_name ";
         $query .= $custom_join['select'];
 	                            $query .= " FROM opportunities ";
-		$query .= 				"LEFT JOIN users
+		$query .= "LEFT JOIN users
                                 ON opportunities.assigned_user_id=users.id";
                                 $query .= " LEFT JOIN $this->rel_account_table
                                 ON opportunities.id=$this->rel_account_table.opportunity_id
@@ -209,12 +209,12 @@ 
 			AND (accounts.deleted is null OR accounts.deleted=0)
 			AND opportunities.deleted=0";
 
-        if($where != "")
+        if ($where != "")
                 $query .= "where $where AND ".$where_auto;
         else
                 $query .= "where ".$where_auto;
 
-        if($order_by != "")
+        if ($order_by != "")
                 $query .= " ORDER BY opportunities.$order_by";
         else
                 $query .= " ORDER BY opportunities.name";
@@ -223,7 +223,7 @@ 
 
 	function fill_in_additional_list_fields()
 	{
-                if ( $this->force_load_details == true)
+                if ($this->force_load_details == true)
                 {
                         $this->fill_in_additional_detail_fields();
                 }
@@ -233,28 +233,28 @@ 
 	{
 		parent::fill_in_additional_detail_fields();
 
-		if(!empty($this->currency_id)) {
+		if (!empty($this->currency_id)) {
 		    $currency = new Currency();
 		    $currency->retrieve($this->currency_id);
-    		if($currency->id != $this->currency_id || $currency->deleted == 1){
+    		if ($currency->id != $this->currency_id || $currency->deleted == 1) {
     				$this->amount = $this->amount_usdollar;
     				$this->currency_id = $currency->id;
     		}
 		}
        //get campaign name
-        if(!empty($this->campaign_id)) {
+        if (!empty($this->campaign_id)) {
     		$camp = new Campaign();
     		$camp->retrieve($this->campaign_id);
             $this->campaign_name = $camp->name;
         }
 		$this->account_name = '';
 		$this->account_id = '';
-		if(!empty($this->id)) {
-    		$ret_values=Opportunity::get_account_detail($this->id);
+		if (!empty($this->id)) {
+    		$ret_values = Opportunity::get_account_detail($this->id);
     		if (!empty($ret_values)) {
-    			$this->account_name=$ret_values['name'];
-    			$this->account_id=$ret_values['id'];
-    			$this->account_id_owner =$ret_values['assigned_user_id'];
+    			$this->account_name = $ret_values['name'];
+    			$this->account_id = $ret_values['id'];
+    			$this->account_id_owner = $ret_values['assigned_user_id'];
     		}
 		}
 	}
@@ -267,35 +267,35 @@ 
 	function get_contacts()
 	{
 		$this->load_relationship('contacts');
-		$query_array=$this->contacts->getQuery(true);
+		$query_array = $this->contacts->getQuery(true);
 
 		//update the select clause in the retruned query.
-		$query_array['select']="SELECT contacts.id, contacts.first_name, contacts.last_name, contacts.title, contacts.email1, contacts.phone_work, opportunities_contacts.contact_role as opportunity_role, opportunities_contacts.id as opportunity_rel_id ";
+		$query_array['select'] = "SELECT contacts.id, contacts.first_name, contacts.last_name, contacts.title, contacts.email1, contacts.phone_work, opportunities_contacts.contact_role as opportunity_role, opportunities_contacts.id as opportunity_rel_id ";
 
-		$query='';
+		$query = '';
 		foreach ($query_array as $qstring) {
-			$query.=' '.$qstring;
+			$query .= ' '.$qstring;
 		}
 	    $temp = Array('id', 'first_name', 'last_name', 'title', 'email1', 'phone_work', 'opportunity_role', 'opportunity_rel_id');
 		return $this->build_related_list2($query, new Contact(), $temp);
 	}
 
-	function update_currency_id($fromid, $toid){
+	function update_currency_id($fromid, $toid) {
 		$idequals = '';
 
 		$currency = new Currency();
 		$currency->retrieve($toid);
-		foreach($fromid as $f){
-			if(!empty($idequals)){
-				$idequals .=' or ';
+		foreach ($fromid as $f) {
+			if (!empty($idequals)) {
+				$idequals .= ' or ';
 			}
 			$idequals .= "currency_id='$f'";
 		}
 
-		if(!empty($idequals)){
-			$query = "select amount, id from opportunities where (". $idequals. ") and deleted=0 and opportunities.sales_stage <> 'Closed Won' AND opportunities.sales_stage <> 'Closed Lost';";
+		if (!empty($idequals)) {
+			$query = "select amount, id from opportunities where (".$idequals.") and deleted=0 and opportunities.sales_stage <> 'Closed Won' AND opportunities.sales_stage <> 'Closed Lost';";
 			$result = $this->db->query($query);
-			while($row = $this->db->fetchByAssoc($result)){
+			while ($row = $this->db->fetchByAssoc($result)) {
 
 				$query = "update opportunities set currency_id='".$currency->id."', amount_usdollar='".$currency->convertToDollar($row['amount'])."' where id='".$row['id']."';";
 				$this->db->query($query);
@@ -305,24 +305,24 @@ 
 	}
 	}
 
-	function get_list_view_data(){
+	function get_list_view_data() {
 		global $locale, $current_language, $current_user, $mod_strings, $app_list_strings, $sugar_config;
 		$app_strings = return_application_language($current_language);
         $params = array();
 
 		$temp_array = $this->get_list_view_array();
 		$temp_array['SALES_STAGE'] = empty($temp_array['SALES_STAGE']) ? '' : $temp_array['SALES_STAGE'];
-		$temp_array["ENCODED_NAME"]=$this->name;
+		$temp_array["ENCODED_NAME"] = $this->name;
 		return $temp_array;
 	}
 
-    function get_currency_symbol(){
-           if(isset($this->currency_id)){
+    function get_currency_symbol() {
+           if (isset($this->currency_id)) {
                $cur_qry = "select * from currencies where id ='".$this->currency_id."'";
                $cur_res = $this->db->query($cur_qry);
-               if(!empty($cur_res)){
+               if (!empty($cur_res)) {
                     $cur_row = $this->db->fetchByAssoc($cur_res);
-                        if(isset($cur_row['symbol'])){
+                        if (isset($cur_row['symbol'])) {
                          return $cur_row['symbol'];
                         }
                }
@@ -335,16 +335,16 @@ 
 		builds a generic search based on the query string using or
 		do not include any $this-> because this is called on without having the class instantiated
 	*/
-	function build_generic_where_clause ($the_query_string) {
+	function build_generic_where_clause($the_query_string) {
 	$where_clauses = Array();
 	$the_query_string = $GLOBALS['db']->quote($the_query_string);
 	array_push($where_clauses, "opportunities.name like '$the_query_string%'");
 	array_push($where_clauses, "accounts.name like '$the_query_string%'");
 
 	$the_where = "";
-	foreach($where_clauses as $clause)
+	foreach ($where_clauses as $clause)
 	{
-		if($the_where != "") $the_where .= " or ";
+		if ($the_where != "") $the_where .= " or ";
 		$the_where .= $clause;
 	}
 
@@ -357,9 +357,9 @@ 
         // Bug 32581 - Make sure the currency_id is set to something
         global $current_user, $app_list_strings;
 
-        if ( empty($this->currency_id) )
+        if (empty($this->currency_id))
             $this->currency_id = $current_user->getPreference('currency');
-        if ( empty($this->currency_id) )
+        if (empty($this->currency_id))
             $this->currency_id = -99;
 
         //if probablity isn't set, set it based on the sales stage
@@ -385,7 +385,7 @@ 
 				(trim($this->account_id) != trim($this->rel_fields_before_value['account_id']))) {
 				//unlink the old record.
 				$this->load_relationship('accounts');
-				$this->accounts->delete($this->id,$this->rel_fields_before_value['account_id']);
+				$this->accounts->delete($this->id, $this->rel_fields_before_value['account_id']);
 		}
 		// Bug 38529 & 40938 - exclude currency_id
 		parent::save_relationship_changes($is_update, array('currency_id'));
@@ -400,7 +400,7 @@ 
 		global $app_list_strings;
 		$default = $app_list_strings['opportunity_relationship_type_default_key'];
 		$this->load_relationship('contacts');
-		$this->contacts->add($contact_id,array('contact_role'=>$default));
+		$this->contacts->add($contact_id, array('contact_role'=>$default));
 	}
 
 	function set_notification_body($xtpl, $oppty)
@@ -410,33 +410,33 @@ 
 		$xtpl->assign("OPPORTUNITY_NAME", $oppty->name);
 		$xtpl->assign("OPPORTUNITY_AMOUNT", $oppty->amount);
 		$xtpl->assign("OPPORTUNITY_CLOSEDATE", $oppty->date_closed);
-		$xtpl->assign("OPPORTUNITY_STAGE", (isset($oppty->sales_stage)?$app_list_strings['sales_stage_dom'][$oppty->sales_stage]:""));
+		$xtpl->assign("OPPORTUNITY_STAGE", (isset($oppty->sales_stage) ? $app_list_strings['sales_stage_dom'][$oppty->sales_stage] : ""));
 		$xtpl->assign("OPPORTUNITY_DESCRIPTION", $oppty->description);
 
 		return $xtpl;
 	}
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL':return true;
 		}
 		return false;
 	}
-	function listviewACLHelper(){
+	function listviewACLHelper() {
 		$array_assign = parent::listviewACLHelper();
 		$is_owner = false;
 		$in_group = false; //SECURITY GROUPS
-		if(!empty($this->account_id)){
+		if (!empty($this->account_id)) {
 
-			if(!empty($this->account_id_owner)){
+			if (!empty($this->account_id_owner)) {
 				global $current_user;
 				$is_owner = $current_user->id == $this->account_id_owner;
 			}
 			/* BEGIN - SECURITY GROUPS */
 			else {
 				global $current_user;
-                $parent_bean = BeanFactory::getBean('Accounts',$this->account_id);
-                if($parent_bean !== false) {
+                $parent_bean = BeanFactory::getBean('Accounts', $this->account_id);
+                if ($parent_bean !== false) {
                 	$is_owner = $current_user->id == $parent_bean->assigned_user_id;
                 }
 			}
@@ -448,10 +448,10 @@ 
 			/**
 			if(!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner)){
 			*/
-			if(!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
+			if (!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)) {
         	/* END - SECURITY GROUPS */
 				$array_assign['ACCOUNT'] = 'a';
-			}else{
+			} else {
 				$array_assign['ACCOUNT'] = 'span';
 			}
 
@@ -470,9 +470,9 @@ 
 			. " AND a_o.opportunity_id='$opp_id'"
 			. " AND a_o.deleted=0"
 			. " AND acc.deleted=0";
-		$result = $db->query($query, true,"Error filling in opportunity account details: ");
+		$result = $db->query($query, true, "Error filling in opportunity account details: ");
 		$row = $db->fetchByAssoc($result);
-		if($row != null) {
+		if ($row != null) {
 			$ret_array['name'] = $row['name'];
 			$ret_array['id'] = $row['id'];
 			$ret_array['assigned_user_id'] = $row['assigned_user_id'];
@@ -480,7 +480,7 @@ 
 		return $ret_array;
 	}
 }
-function getCurrencyType(){
+function getCurrencyType() {
 
 }
 

Braces +38 added lines, -28 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.
@@ -124,8 +126,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();
@@ -169,19 +170,21 @@ 
 			($this->rel_account_table.deleted is null OR $this->rel_account_table.deleted=0)
 			AND (accounts.deleted is null OR accounts.deleted=0)
 			AND opportunities.deleted=0";
-		}else 	if($show_deleted == 1){
+		} else 	if($show_deleted == 1){
 				$where_auto = " opportunities.deleted=1";
 		}
 
-		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;
+		}
 
-		if($order_by != "")
-			$query .= " ORDER BY $order_by";
-		else
-			$query .= " ORDER BY opportunities.name";
+		if($order_by != "") {
+					$query .= " ORDER BY $order_by";
+		} else {
+					$query .= " ORDER BY opportunities.name";
+		}
 
 		return $query;
 	}
@@ -209,15 +212,17 @@ 
 			AND (accounts.deleted is null OR accounts.deleted=0)
 			AND opportunities.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;
+        }
 
-        if($order_by != "")
-                $query .= " ORDER BY opportunities.$order_by";
-        else
-                $query .= " ORDER BY opportunities.name";
+        if($order_by != "") {
+                        $query .= " ORDER BY opportunities.$order_by";
+        } else {
+                        $query .= " ORDER BY opportunities.name";
+        }
         return $query;
     }
 
@@ -344,7 +349,9 @@ 
 	$the_where = "";
 	foreach($where_clauses as $clause)
 	{
-		if($the_where != "") $the_where .= " or ";
+		if($the_where != "") {
+		    $the_where .= " or ";
+		}
 		$the_where .= $clause;
 	}
 
@@ -357,17 +364,20 @@ 
         // Bug 32581 - Make sure the currency_id is set to something
         global $current_user, $app_list_strings;
 
-        if ( empty($this->currency_id) )
-            $this->currency_id = $current_user->getPreference('currency');
-        if ( empty($this->currency_id) )
-            $this->currency_id = -99;
+        if ( empty($this->currency_id) ) {
+                    $this->currency_id = $current_user->getPreference('currency');
+        }
+        if ( empty($this->currency_id) ) {
+                    $this->currency_id = -99;
+        }
 
         //if probablity isn't set, set it based on the sales stage
         if (!isset($this->probability) && !empty($this->sales_stage))
         {
             $prob_arr = $app_list_strings['sales_probability_dom'];
-        	if (isset($prob_arr[$this->sales_stage]))
-        		$this->probability = $prob_arr[$this->sales_stage];
+        	if (isset($prob_arr[$this->sales_stage])) {
+        	        		$this->probability = $prob_arr[$this->sales_stage];
+        	}
         }
 
 		require_once('modules/Opportunities/SaveOverload.php');
@@ -451,7 +461,7 @@ 
 			if(!ACLController::moduleSupportsACL('Accounts') || ACLController::checkAccess('Accounts', 'view', $is_owner, 'module', $in_group)){
         	/* END - SECURITY GROUPS */
 				$array_assign['ACCOUNT'] = 'a';
-			}else{
+			} else{
 				$array_assign['ACCOUNT'] = 'span';
 			}
 

modules/Opportunities/views/view.detail.php

Spacing +11 added lines, -11 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
@@ -53,16 +53,16 @@ 
 
 class OpportunitiesViewDetail extends ViewDetail {
 
- 	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 OpportunitiesViewDetail(){
+    function OpportunitiesViewDetail() {
         $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 {
@@ -75,16 +75,16 @@ 
  	function display() {
 
 	    $currency = new Currency();
-	    if(isset($this->bean->currency_id) && !empty($this->bean->currency_id))
+	    if (isset($this->bean->currency_id) && !empty($this->bean->currency_id))
 	    {
 	    	$currency->retrieve($this->bean->currency_id);
-	    	if( $currency->deleted != 1){
-	    		$this->ss->assign('CURRENCY', $currency->iso4217 .' '.$currency->symbol);
-	    	}else {
-	    	    $this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
+	    	if ($currency->deleted != 1) {
+	    		$this->ss->assign('CURRENCY', $currency->iso4217.' '.$currency->symbol);
+	    	} else {
+	    	    $this->ss->assign('CURRENCY', $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
 	    	}
-	    }else{
-	    	$this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
+	    } else {
+	    	$this->ss->assign('CURRENCY', $currency->getDefaultISO4217().' '.$currency->getDefaultCurrencySymbol());
 	    }
 
  		parent::display();

Braces +6 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
@@ -64,8 +66,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();
@@ -80,10 +81,10 @@ 
 	    	$currency->retrieve($this->bean->currency_id);
 	    	if( $currency->deleted != 1){
 	    		$this->ss->assign('CURRENCY', $currency->iso4217 .' '.$currency->symbol);
-	    	}else {
+	    	} else {
 	    	    $this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
 	    	}
-	    }else{
+	    } else{
 	    	$this->ss->assign('CURRENCY', $currency->getDefaultISO4217() .' '.$currency->getDefaultCurrencySymbol());
 	    }
 

modules/Opportunities/views/view.edit.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
@@ -50,7 +50,7 @@ 
 
 class OpportunitiesViewEdit extends ViewEdit {
 
- 	function __construct(){
+ 	function __construct() {
  		parent::__construct();
  		$this->useForSubpanel = true;
  	}
@@ -58,9 +58,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 OpportunitiesViewEdit(){
+    function OpportunitiesViewEdit() {
         $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 {
@@ -75,11 +75,11 @@ 
 		$json = getJSONobj();
 		$prob_array = $json->encode($app_list_strings['sales_probability_dom']);
 		$prePopProb = '';
- 		if(empty($this->bean->id) && empty($_REQUEST['probability'])) {
+ 		if (empty($this->bean->id) && empty($_REQUEST['probability'])) {
 		   $prePopProb = 'document.getElementsByName(\'sales_stage\')[0].onchange();';
 		}
 
-$probability_script=<<<EOQ
+$probability_script = <<<EOQ
 	<script>
 	prob_array = $prob_array;
 	document.getElementsByName('sales_stage')[0].onchange = function() {

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/Opportunities/views/view.list.php

Spacing +4 added lines, -4 removed lines

@@ -5,16 +5,16 @@ 
 
 class OpportunitiesViewList extends ViewList {
 
-	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 OpportunitiesViewList(){
+    function OpportunitiesViewList() {
         $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 preDisplay(){
+	function preDisplay() {
 		$this->lv = new OpportunitiesListViewSmarty();
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,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($seed, $module, $subPanel, $options);

modules/Opportunities/Dashlets/MyOpportunitiesDashlet/MyOpportunitiesDashlet.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.
@@ -52,7 +52,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_TOP_OPPORTUNITIES', 'Opportunities');
+        if (empty($def['title'])) $this->title = translate('LBL_TOP_OPPORTUNITIES', 'Opportunities');
 
         $this->searchFields = $dashletData['MyOpportunitiesDashlet']['searchFields'];
         $this->columns = $dashletData['MyOpportunitiesDashlet']['columns'];
@@ -63,9 +63,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 MyOpportunitiesDashlet($id, $def = null){
+    function MyOpportunitiesDashlet($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.
@@ -52,7 +54,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_TOP_OPPORTUNITIES', 'Opportunities');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_TOP_OPPORTUNITIES', 'Opportunities');
+        }
 
         $this->searchFields = $dashletData['MyOpportunitiesDashlet']['searchFields'];
         $this->columns = $dashletData['MyOpportunitiesDashlet']['columns'];
@@ -67,8 +71,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/jjwg_Markers/Dashlets/jjwg_MarkersDashlet/jjwg_MarkersDashlet.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');
 
 require_once('include/Dashlets/DashletGeneric.php');
 require_once('modules/jjwg_Markers/jjwg_Markers.php');
@@ -12,7 +12,7 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'jjwg_Markers');
+        if (empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'jjwg_Markers');
 
         $this->searchFields = $dashletData['jjwg_MarkersDashlet']['searchFields'];
         $this->columns = $dashletData['jjwg_MarkersDashlet']['columns'];
@@ -23,9 +23,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 jjwg_MarkersDashlet($id, $def = null){
+    function jjwg_MarkersDashlet($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');
+}
 
 require_once('include/Dashlets/DashletGeneric.php');
 require_once('modules/jjwg_Markers/jjwg_Markers.php');
@@ -12,7 +14,9 @@ 
 
         parent::__construct($id, $def);
 
-        if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'jjwg_Markers');
+        if(empty($def['title'])) {
+            $this->title = translate('LBL_HOMEPAGE_TITLE', 'jjwg_Markers');
+        }
 
         $this->searchFields = $dashletData['jjwg_MarkersDashlet']['searchFields'];
         $this->columns = $dashletData['jjwg_MarkersDashlet']['columns'];
@@ -27,8 +31,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);