adamjakab / SuiteCRM

modules/ACLActions/ACLAction.php

Indentation +185 added lines, -185 removed lines

@@ -39,7 +39,7 @@ 
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
 if(file_exists("modules/ACLActions/actiondefs.override.php")){
-	require_once("modules/ACLActions/actiondefs.override.php");
+    require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
@@ -55,12 +55,12 @@ 
     }
 
     /**
-    * static addActions($category, $type='module')
-    * Adds all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static addActions($category, $type='module')
+     * Adds all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     static function addActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -91,12 +91,12 @@ 
     }
 
     /**
-    * static removeActions($category, $type='module')
-    * Removes all default actions for a category/type
-    *
-    * @param STRING $category - the category (e.g module name - Accounts, Contacts)
-    * @param STRING $type - the type (e.g. 'module', 'field')
-    */
+     * static removeActions($category, $type='module')
+     * Removes all default actions for a category/type
+     *
+     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
+     * @param STRING $type - the type (e.g. 'module', 'field')
+     */
     public static function removeActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
@@ -118,13 +118,13 @@ 
     }
 
     /**
-    * static AccessColor($access)
-    *
-    * returns the color associated with an access level
-    * these colors exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the color either name or hex representation or false if the level does not exist
-    */
+     * static AccessColor($access)
+     *
+     * returns the color associated with an access level
+     * these colors exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the color either name or hex representation or false if the level does not exist
+     */
     protected static function AccessColor($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -136,13 +136,13 @@ 
     }
 
     /**
-    * static AccessName($access)
-    *
-    * returns the translated name  associated with an access level
-    * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
-    * @param INT $access - the access level you want the color for
-    * @return the translated access level name or false if the level does not exist
-    */
+     * static AccessName($access)
+     *
+     * returns the translated name  associated with an access level
+     * these label definitions  exist in the definitions in modules/ACLActions/actiondefs.php
+     * @param INT $access - the access level you want the color for
+     * @return the translated access level name or false if the level does not exist
+     */
     static function AccessName($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
@@ -172,10 +172,10 @@ 
     }
 
     /**
-    * static getAccessOptions()
-    * this is used for building select boxes
-    * @return array containg access levels (ints) as keys and access names as values
-    */
+     * static getAccessOptions()
+     * this is used for building select boxes
+     * @return array containg access levels (ints) as keys and access names as values
+     */
     protected static function getAccessOptions( $action, $type='module'){
         global $ACLActions;
         $options = array();
@@ -189,11 +189,11 @@ 
     }
 
     /**
-    * function static getDefaultActions()
-    * This function will return a list of acl actions with their default access levels
-    *
-    *
-    */
+     * function static getDefaultActions()
+     * This function will return a list of acl actions with their default access levels
+     *
+     *
+     */
     public static function getDefaultActions($type='module', $action=''){
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
         if(!empty($type)){
@@ -217,14 +217,14 @@ 
 
 
     /**
-    * static getUserActions($user_id,$refresh=false, $category='', $action='')
-    * returns a list of user actions
-    * @param GUID $user_id
-    * @param BOOLEAN $refresh
-    * @param STRING $category
-    * @param STRING $action
-    * @return ARRAY of ACLActionsArray
-    */
+     * static getUserActions($user_id,$refresh=false, $category='', $action='')
+     * returns a list of user actions
+     * @param GUID $user_id
+     * @param BOOLEAN $refresh
+     * @param STRING $category
+     * @param STRING $action
+     * @return ARRAY of ACLActionsArray
+     */
 
     static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
         //check in the session if we already have it loaded
@@ -256,15 +256,15 @@ 
         if(!empty($type)){
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
-		/* BEGIN - SECURITY GROUPS */ 
-		/**
+        /* BEGIN - SECURITY GROUPS */ 
+        /**
         $query = "SELECT acl_actions .*, acl_roles_actions.access_override
                     FROM acl_actions
                     LEFT JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
                     LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
                     WHERE acl_actions.deleted=0 $additional_where ORDER BY category,name";
-		*/
-		$query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
+         */
+        $query = "(SELECT acl_actions .*, acl_roles_actions.access_override, 1 as user_role
 				FROM acl_actions
 				INNER JOIN acl_roles_users ON acl_roles_users.user_id = '$user_id' AND  acl_roles_users.deleted = 0
 				LEFT JOIN acl_roles_actions ON acl_roles_actions.role_id = acl_roles_users.role_id AND acl_roles_actions.action_id = acl_actions.id AND acl_roles_actions.deleted=0
@@ -286,34 +286,34 @@ 
 				WHERE acl_actions.deleted = 0 )
 
 				ORDER BY user_role desc, category,name,access_override desc"; //want non-null to show first
-		 /* END - SECURITY GROUPS */
+            /* END - SECURITY GROUPS */
         $result = $db->query($query);
         $selected_actions = array();
-		/* BEGIN - SECURITY GROUPS */ 
-		global $sugar_config;
-		$has_user_role = false; //used for user_role_precedence
-		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
-		/* END - SECURITY GROUPS */
+        /* BEGIN - SECURITY GROUPS */ 
+        global $sugar_config;
+        $has_user_role = false; //used for user_role_precedence
+        $has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
+        /* END - SECURITY GROUPS */
         while($row = $db->fetchByAssoc($result, FALSE) ){
-			/* BEGIN - SECURITY GROUPS */ 
-			if($has_user_role == false && $row['user_role'] == 1) {
-				$has_user_role = true;
-			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
-				$has_role = true;
-			}
-			//if user roles should take precedence over group roles and we have a user role 
-			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0 
-					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true ) 
-			{
-				break; 
-			}
-			if($row['user_role'] == -1 && $has_role == true) {
-				break; //no need for default actions when a role is assigned to the user or user's group already
-			}
-			/* END - SECURITY GROUPS */
+            /* BEGIN - SECURITY GROUPS */ 
+            if($has_user_role == false && $row['user_role'] == 1) {
+                $has_user_role = true;
+            }
+            if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+                $has_role = true;
+            }
+            //if user roles should take precedence over group roles and we have a user role 
+            //break when we get to processing the group roles
+            if($has_user_role == true && $row['user_role'] == 0 
+                    && isset($sugar_config['securitysuite_user_role_precedence'])
+                    && $sugar_config['securitysuite_user_role_precedence'] == true ) 
+            {
+                break; 
+            }
+            if($row['user_role'] == -1 && $has_role == true) {
+                break; //no need for default actions when a role is assigned to the user or user's group already
+            }
+            /* END - SECURITY GROUPS */
             $acl = new ACLAction();
             $isOverride  = false;
             $acl->populateFromRow($row);
@@ -326,16 +326,16 @@ 
 
             }
             if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
-				|| (
-					/* BEGIN - SECURITY GROUPS - additive security*/
-					(
-						(isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
-					||
-						((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
-						&& $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
-					)
-					/* END - SECURITY GROUPS */
+                || (
+                    /* BEGIN - SECURITY GROUPS - additive security*/
+                    (
+                        (isset($sugar_config['securitysuite_additive']) && $sugar_config['securitysuite_additive'] == true
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] < $acl->aclaccess) 
+                    ||
+                        ((!isset($sugar_config['securitysuite_additive']) || $sugar_config['securitysuite_additive'] == false)
+                        && $selected_actions[$acl->category][$acl->acltype][$acl->name]['aclaccess'] > $acl->aclaccess) 
+                    )
+                    /* END - SECURITY GROUPS */
                     && $isOverride
                     )
                 ||
@@ -388,70 +388,70 @@ 
     }
     
     /**
-    * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
-    * checks if a user has access to this acl if the user is an owner it will check if owners have access
-    *
-    * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
-    * @param boolean $is_owner
-    * @param int $access
-    * @return true or false
-    */
-	/* BEGIN - SECURITY GROUPS */
-	/**
+     * (static/ non-static)function hasAccess($is_owner= false , $access = 0)
+     * checks if a user has access to this acl if the user is an owner it will check if owners have access
+     *
+     * This function may either be used statically or not. If used staticlly a user must pass in an access level not equal to zero
+     * @param boolean $is_owner
+     * @param int $access
+     * @return true or false
+     */
+    /* BEGIN - SECURITY GROUPS */
+    /**
     static function hasAccess($is_owner=false, $access = 0){
-	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
-		/**
+     */
+    static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
+        /**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
         if(isset($this) && isset($this->aclaccess)){
             if($this->aclaccess == ACL_ALLOW_ALL || ($is_owner && $this->aclaccess == ACL_ALLOW_OWNER))
             return true;
         }
-		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL 
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
-			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-		)) {
-			return true;
-		}
+         */
+        if($access != 0 && ($access == ACL_ALLOW_ALL 
+            || ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+            || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+        )) {
+            return true;
+        }
         if(!is_null($action) && isset($action->aclaccess)){
-			if($action->aclaccess == ACL_ALLOW_ALL
-				|| ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
-				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
-			) {
-            	return true;
-        	}
-		}
+            if($action->aclaccess == ACL_ALLOW_ALL
+                || ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
+                || ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
+            ) {
+                return true;
+            }
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */
-
-	/* BEGIN - SECURITY GROUPS */
-	/**
-	 * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
-	 * checks if a user should have ownership to do an action
-	 *
-	 * @param GUID $user_id
-	 * @param STRING $category
-	 * @param STRING $action
-	 * @param STRING $type
-	 * @return boolean
-	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
-		//check if we don't have it set in the cache if not lets reload the cache
+    /* END - SECURITY GROUPS */
+
+    /* BEGIN - SECURITY GROUPS */
+    /**
+     * STATIC function userNeedsSecurityGroup($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
+    static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+        //check if we don't have it set in the cache if not lets reload the cache
 		
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			ACLAction::getUserActions($user_id, false);
+        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            ACLAction::getUserActions($user_id, false);
 			
-		}
+        }
 		
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
-			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
-		}
+        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
+        }
         return false;
     }
-	/* END - SECURITY GROUPS */	
+    /* END - SECURITY GROUPS */	
 
 
 
@@ -461,20 +461,20 @@ 
 
 
     /**
-    * static function userHasAccess($user_id, $category, $action, $is_owner = false)
-    *
-    * @param GUID $user_id the user id who you want to check access for
-    * @param STRING $category the category you would like to check access for
-    * @param STRING $action the action of that category you would like to check access for
-    * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
-    */
-	/* BEGIN - SECURITY GROUPS - added $in_group */
-	/**
+     * static function userHasAccess($user_id, $category, $action, $is_owner = false)
+     *
+     * @param GUID $user_id the user id who you want to check access for
+     * @param STRING $category the category you would like to check access for
+     * @param STRING $action the action of that category you would like to check access for
+     * @param BOOLEAN OPTIONAL $is_owner if the object is owned by the user you are checking access for
+     */
+    /* BEGIN - SECURITY GROUPS - added $in_group */
+    /**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
-	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
-       global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+     */
+    public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+        global $current_user;
+        if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
@@ -488,22 +488,22 @@ 
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
-			return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
+            return ACLAction::hasAccess($is_owner, $in_group, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
         }
         return false;
 
     }
-	/* END - SECURITY GROUPS */
+    /* END - SECURITY GROUPS */
     /**
-    * function getUserAccessLevel($user_id, $category, $action,$type='module')
-    * returns the access level for a given category and action
-    *
-    * @param GUID  $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return INT (ACCESS LEVEL)
-    */
+     * function getUserAccessLevel($user_id, $category, $action,$type='module')
+     * returns the access level for a given category and action
+     *
+     * @param GUID  $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return INT (ACCESS LEVEL)
+     */
     public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
         if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
             ACLAction::getUserActions($user_id, false);
@@ -520,15 +520,15 @@ 
     }
 
     /**
-    * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
-    * checks if a user should have ownership to do an action
-    *
-    * @param GUID $user_id
-    * @param STRING $category
-    * @param STRING $action
-    * @param STRING $type
-    * @return boolean
-    */
+     * STATIC function userNeedsOwnership($user_id, $category, $action,$type='module')
+     * checks if a user should have ownership to do an action
+     *
+     * @param GUID $user_id
+     * @param STRING $category
+     * @param STRING $action
+     * @param STRING $type
+     * @return boolean
+     */
     public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
         //check if we don't have it set in the cache if not lets reload the cache
 
@@ -545,12 +545,12 @@ 
 
     }
     /**
-    *
-    * static pass by ref setupCategoriesMatrix(&$categories)
-    * takes in an array of categories and modifes them adding display information
-    *
-    * @param unknown_type $categories
-    */
+     *
+     * static pass by ref setupCategoriesMatrix(&$categories)
+     * takes in an array of categories and modifes them adding display information
+     *
+     * @param unknown_type $categories
+     */
     public static function setupCategoriesMatrix(&$categories){
         global $ACLActions, $current_user;
         $names = array();
@@ -593,11 +593,11 @@ 
 
 
     /**
-    * function toArray()
-    * returns this acl as an array
-    *
-    * @return array of fields with id, name, access and category
-    */
+     * function toArray()
+     * returns this acl as an array
+     *
+     * @return array of fields with id, name, access and category
+     */
     function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
         $array_fields = array('id', 'aclaccess');
         $arr = array();
@@ -608,11 +608,11 @@ 
     }
 
     /**
-    * function fromArray($arr)
-    * converts an array into an acl mapping name value pairs into files
-    *
-    * @param Array $arr
-    */
+     * function fromArray($arr)
+     * converts an array into an acl mapping name value pairs into files
+     *
+     * @param Array $arr
+     */
     function fromArray($arr){
         foreach($arr as $name=>$value){
             $this->$name = $value;
@@ -620,10 +620,10 @@ 
     }
 
     /**
-    * function clearSessionCache()
-    * clears the session variable storing the cache information for acls
-    *
-    */
+     * function clearSessionCache()
+     * clears the session variable storing the cache information for acls
+     *
+     */
     function clearSessionCache(){
         unset($_SESSION['ACL']);
     }

Spacing +96 added lines, -96 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.
@@ -38,19 +38,19 @@ 
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 /* BEGIN - SECURITY GROUPS */
-if(file_exists("modules/ACLActions/actiondefs.override.php")){
+if (file_exists("modules/ACLActions/actiondefs.override.php")) {
 	require_once("modules/ACLActions/actiondefs.override.php");
 } else {
 require_once('modules/ACLActions/actiondefs.php');
 }
 /* END - SECURITY GROUPS */
-class ACLAction  extends SugarBean{
+class ACLAction  extends SugarBean {
     var $module_dir = 'ACLActions';
     var $object_name = 'ACLAction';
     var $table_name = 'acl_actions';
     var $new_schema = true;
     var $disable_custom_fields = true;
-    function ACLAction(){
+    function ACLAction() {
         parent::SugarBean();
     }
 
@@ -61,17 +61,17 @@ 
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    static function addActions($category, $type='module'){
+    static function addActions($category, $type = 'module') {
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
-        if(isset($ACLActions[$type])){
-            foreach($ACLActions[$type]['actions'] as $action_name =>$action_def){
+        if (isset($ACLActions[$type])) {
+            foreach ($ACLActions[$type]['actions'] as $action_name =>$action_def) {
 
                 $action = new ACLAction();
-                $query = "SELECT * FROM " . $action->table_name . " WHERE name='$action_name' AND category = '$category' AND acltype='$type' AND deleted=0 ";
+                $query = "SELECT * FROM ".$action->table_name." WHERE name='$action_name' AND category = '$category' AND acltype='$type' AND deleted=0 ";
                 $result = $db->query($query);
                 //only add if an action with that name and category don't exist
-                $row=$db->fetchByAssoc($result);
+                $row = $db->fetchByAssoc($result);
                 if ($row == null) {
                     $action->name = $action_name;
                     $action->category = $category;
@@ -84,7 +84,7 @@ 
                 }
             }
 
-        }else{
+        } else {
             sugar_die("FAILED TO ADD: $category - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
 
@@ -97,22 +97,22 @@ 
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    public static function removeActions($category, $type='module'){
+    public static function removeActions($category, $type = 'module') {
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
-        if(isset($ACLActions[$type])){
-            foreach($ACLActions[$type]['actions'] as $action_name =>$action_def){
+        if (isset($ACLActions[$type])) {
+            foreach ($ACLActions[$type]['actions'] as $action_name =>$action_def) {
 
                 $action = new ACLAction();
-                $query = "SELECT * FROM " . $action->table_name . " WHERE name='$action_name' AND category = '$category' AND acltype='$type' and deleted=0";
+                $query = "SELECT * FROM ".$action->table_name." WHERE name='$action_name' AND category = '$category' AND acltype='$type' and deleted=0";
                 $result = $db->query($query);
                 //only add if an action with that name and category don't exist
-                $row=$db->fetchByAssoc($result);
+                $row = $db->fetchByAssoc($result);
                 if ($row != null) {
                     $action->mark_deleted($row['id']);
                 }
             }
-        }else{
+        } else {
             sugar_die("FAILED TO REMOVE: $category : $name - TYPE $type NOT DEFINED IN modules/ACLActions/actiondefs.php");
         }
     }
@@ -125,9 +125,9 @@ 
     * @param INT $access - the access level you want the color for
     * @return the color either name or hex representation or false if the level does not exist
     */
-    protected static function AccessColor($access){
+    protected static function AccessColor($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
+        if (isset($ACLActionAccessLevels[$access])) {
 
             return $ACLActionAccessLevels[$access]['color'];
         }
@@ -143,9 +143,9 @@ 
     * @param INT $access - the access level you want the color for
     * @return the translated access level name or false if the level does not exist
     */
-    static function AccessName($access){
+    static function AccessName($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
+        if (isset($ACLActionAccessLevels[$access])) {
             return translate($ACLActionAccessLevels[$access]['label'], 'ACLActions');
         }
         return false;
@@ -160,10 +160,10 @@ 
      * @param INT $access - the access level you want the color for
      * @return the access level label or false if the level does not exist
      */
-    protected static function AccessLabel($access){
+    protected static function AccessLabel($access) {
         global $ACLActionAccessLevels;
-        if(isset($ACLActionAccessLevels[$access])){
-            $label=preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
+        if (isset($ACLActionAccessLevels[$access])) {
+            $label = preg_replace('/(LBL_ACCESS_)(.*)/', '$2', $ACLActionAccessLevels[$access]['label']);
             return strtolower($label);
 
         }
@@ -176,12 +176,12 @@ 
     * this is used for building select boxes
     * @return array containg access levels (ints) as keys and access names as values
     */
-    protected static function getAccessOptions( $action, $type='module'){
+    protected static function getAccessOptions($action, $type = 'module') {
         global $ACLActions;
         $options = array();
 
-        if(empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
-        foreach($ACLActions[$type]['actions'][$action]['aclaccess'] as $action){
+        if (empty($ACLActions[$type]['actions'][$action]['aclaccess']))return $options;
+        foreach ($ACLActions[$type]['actions'][$action]['aclaccess'] as $action) {
             $options[$action] = ACLAction::AccessName($action);
         }
         return $options;
@@ -194,12 +194,12 @@ 
     *
     *
     */
-    public static function getDefaultActions($type='module', $action=''){
+    public static function getDefaultActions($type = 'module', $action = '') {
         $query = "SELECT * FROM acl_actions WHERE deleted=0 ";
-        if(!empty($type)){
+        if (!empty($type)) {
             $query .= " AND acltype='$type'";
         }
-        if(!empty($action)){
+        if (!empty($action)) {
             $query .= "AND name='$action'";
         }
         $query .= " ORDER BY category";
@@ -207,7 +207,7 @@ 
         $db = DBManagerFactory::getInstance();
         $result = $db->query($query);
         $default_actions = array();
-        while($row = $db->fetchByAssoc($result) ){
+        while ($row = $db->fetchByAssoc($result)) {
             $acl = new ACLAction();
             $acl->populateFromRow($row);
             $default_actions[] = $acl;
@@ -226,19 +226,19 @@ 
     * @return ARRAY of ACLActionsArray
     */
 
-    static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
+    static function getUserActions($user_id, $refresh = false, $category = '', $type = '', $action = '') {
         //check in the session if we already have it loaded
-        if(!$refresh && !empty($_SESSION['ACL'][$user_id])){
-            if(empty($category) && empty($action)){
+        if (!$refresh && !empty($_SESSION['ACL'][$user_id])) {
+            if (empty($category) && empty($action)) {
                 return $_SESSION['ACL'][$user_id];
-            }else{
-                if(!empty($category) && isset($_SESSION['ACL'][$user_id][$category])){
-                    if(empty($action)){
-                        if(empty($type)){
+            } else {
+                if (!empty($category) && isset($_SESSION['ACL'][$user_id][$category])) {
+                    if (empty($action)) {
+                        if (empty($type)) {
                             return $_SESSION['ACL'][$user_id][$category];
                         }
                         return $_SESSION['ACL'][$user_id][$category][$type];
-                    }else if(!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])){
+                    } else if (!empty($type) && isset($_SESSION['ACL'][$user_id][$category][$type][$action])) {
                         return $_SESSION['ACL'][$user_id][$category][$type][$action];
                     }
                 }
@@ -247,13 +247,13 @@ 
         //if we don't have it loaded then lets check against the db
         $additional_where = '';
         $db = DBManagerFactory::getInstance();
-        if(!empty($category)){
+        if (!empty($category)) {
             $additional_where .= " AND acl_actions.category = '$category' ";
         }
-        if(!empty($action)){
+        if (!empty($action)) {
             $additional_where .= " AND acl_actions.name = '$action' ";
         }
-        if(!empty($type)){
+        if (!empty($type)) {
             $additional_where .= " AND acl_actions.acltype = '$type' ";
         }
 		/* BEGIN - SECURITY GROUPS */ 
@@ -294,38 +294,38 @@ 
 		$has_user_role = false; //used for user_role_precedence
 		$has_role = false; //used to determine if default actions can be ignored. If a user has a defined role don't use the defaults
 		/* END - SECURITY GROUPS */
-        while($row = $db->fetchByAssoc($result, FALSE) ){
+        while ($row = $db->fetchByAssoc($result, FALSE)) {
 			/* BEGIN - SECURITY GROUPS */ 
-			if($has_user_role == false && $row['user_role'] == 1) {
+			if ($has_user_role == false && $row['user_role'] == 1) {
 				$has_user_role = true;
 			}
-			if($has_role == false && ($row['user_role'] == 1 || $row['user_role'] ==0)) {
+			if ($has_role == false && ($row['user_role'] == 1 || $row['user_role'] == 0)) {
 				$has_role = true;
 			}
 			//if user roles should take precedence over group roles and we have a user role 
 			//break when we get to processing the group roles
-			if($has_user_role == true && $row['user_role'] == 0 
+			if ($has_user_role == true && $row['user_role'] == 0 
 					&& isset($sugar_config['securitysuite_user_role_precedence'])
-					&& $sugar_config['securitysuite_user_role_precedence'] == true ) 
+					&& $sugar_config['securitysuite_user_role_precedence'] == true) 
 			{
 				break; 
 			}
-			if($row['user_role'] == -1 && $has_role == true) {
+			if ($row['user_role'] == -1 && $has_role == true) {
 				break; //no need for default actions when a role is assigned to the user or user's group already
 			}
 			/* END - SECURITY GROUPS */
             $acl = new ACLAction();
-            $isOverride  = false;
+            $isOverride = false;
             $acl->populateFromRow($row);
-            if(!empty($row['access_override'])){
+            if (!empty($row['access_override'])) {
                 $acl->aclaccess = $row['access_override'];
                 $isOverride = true;
             }
-            if(!isset($selected_actions[$acl->category])){
+            if (!isset($selected_actions[$acl->category])) {
                 $selected_actions[$acl->category] = array();
 
             }
-            if(!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
+            if (!isset($selected_actions[$acl->category][$acl->acltype][$acl->name])
 				|| (
 					/* BEGIN - SECURITY GROUPS - additive security*/
 					(
@@ -353,18 +353,18 @@ 
         }
 
         //only set the session variable if it was a full list;
-        if(empty($category) && empty($action)){
-            if(!isset($_SESSION['ACL'])){
+        if (empty($category) && empty($action)) {
+            if (!isset($_SESSION['ACL'])) {
                 $_SESSION['ACL'] = array();
             }
             $_SESSION['ACL'][$user_id] = $selected_actions;
-        }else{
-            if(empty($action) && !empty($category)){
-                if(!empty($type)){
-                    $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type];}
+        } else {
+            if (empty($action) && !empty($category)) {
+                if (!empty($type)) {
+                    $_SESSION['ACL'][$user_id][$category][$type] = $selected_actions[$category][$type]; }
                 $_SESSION['ACL'][$user_id][$category] = $selected_actions[$category];
-            }else{
-                if(!empty($action) && !empty($category) && !empty($type)){
+            } else {
+                if (!empty($action) && !empty($category) && !empty($type)) {
                 $_SESSION['ACL'][$user_id][$category][$type][$action] = $selected_actions[$category][$action];
 
             }
@@ -400,7 +400,7 @@ 
 	/**
     static function hasAccess($is_owner=false, $access = 0){
 	*/
-	static function hasAccess($is_owner=false, $in_group=false, $access = 0, ACLAction $action = null){
+	static function hasAccess($is_owner = false, $in_group = false, $access = 0, ACLAction $action = null) {
 		/**
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
        //if this exists, then this function is not static, so check the aclaccess parameter
@@ -409,14 +409,14 @@ 
             return true;
         }
 		*/
-		if($access != 0 && ($access == ACL_ALLOW_ALL 
-			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP) )  //if owner that's better than in group so count it...better way to clean this up?
+		if ($access != 0 && ($access == ACL_ALLOW_ALL 
+			|| ($is_owner && ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))  //if owner that's better than in group so count it...better way to clean this up?
 			|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
 		)) {
 			return true;
 		}
-        if(!is_null($action) && isset($action->aclaccess)){
-			if($action->aclaccess == ACL_ALLOW_ALL
+        if (!is_null($action) && isset($action->aclaccess)) {
+			if ($action->aclaccess == ACL_ALLOW_ALL
 				|| ($is_owner && $action->aclaccess == ($access == ACL_ALLOW_OWNER || $access == ACL_ALLOW_GROUP))
 				|| ($in_group && $access == ACL_ALLOW_GROUP) //need to pass if in group with access somehow
 			) {
@@ -438,15 +438,15 @@ 
 	 * @param STRING $type
 	 * @return boolean
 	 */
-	static function userNeedsSecurityGroup($user_id, $category, $action,$type='module'){
+	static function userNeedsSecurityGroup($user_id, $category, $action, $type = 'module') {
 		//check if we don't have it set in the cache if not lets reload the cache
 		
-		if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+		if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 			ACLAction::getUserActions($user_id, false);
 			
 		}
 		
-		if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+		if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 			return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_GROUP;
 		}
         return false;
@@ -472,19 +472,19 @@ 
 	/**
     public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false){
 	*/
-	public static function userHasAccess($user_id, $category, $action,$type='module', $is_owner = false, $in_group = false){
+	public static function userHasAccess($user_id, $category, $action, $type = 'module', $is_owner = false, $in_group = false) {
        global $current_user;
-       if($current_user->isAdminForModule($category)&& !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])){
+       if ($current_user->isAdminForModule($category) && !isset($_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'])) {
         return true;
         }
         //check if we don't have it set in the cache if not lets reload the cache
-        if(ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (ACLAction::getUserAccessLevel($user_id, $category, 'access', $type) < ACL_ALLOW_ENABLED) return false;
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
 
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
 /**
             return ACLAction::hasAccess($is_owner, $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess']);
 */
@@ -504,12 +504,12 @@ 
     * @param STRING $type
     * @return INT (ACCESS LEVEL)
     */
-    public static function getUserAccessLevel($user_id, $category, $action,$type='module'){
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+    public static function getUserAccessLevel($user_id, $category, $action, $type = 'module') {
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             if (!empty($_SESSION['ACL'][$user_id][$category][$type]['admin']) && $_SESSION['ACL'][$user_id][$category][$type]['admin']['aclaccess'] >= ACL_ALLOW_ADMIN)
             {
                 // If you have admin access for a module, all ACL's are allowed
@@ -529,16 +529,16 @@ 
     * @param STRING $type
     * @return boolean
     */
-    public static function userNeedsOwnership($user_id, $category, $action,$type='module'){
+    public static function userNeedsOwnership($user_id, $category, $action, $type = 'module') {
         //check if we don't have it set in the cache if not lets reload the cache
 
-        if(empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             ACLAction::getUserActions($user_id, false);
 
         }
 
 
-        if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+        if (!empty($_SESSION['ACL'][$user_id][$category][$type][$action])) {
             return $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'] == ACL_ALLOW_OWNER;
         }
         return false;
@@ -551,18 +551,18 @@ 
     *
     * @param unknown_type $categories
     */
-    public static function setupCategoriesMatrix(&$categories){
+    public static function setupCategoriesMatrix(&$categories) {
         global $ACLActions, $current_user;
         $names = array();
         $disabled = array();
-        foreach($categories as $cat_name=>$category){
-            foreach($category as $type_name=>$type){
-                foreach($type as $act_name=>$action){
+        foreach ($categories as $cat_name=>$category) {
+            foreach ($category as $type_name=>$type) {
+                foreach ($type as $act_name=>$action) {
                     $names[$act_name] = translate($ACLActions[$type_name]['actions'][$act_name]['label'], 'ACLActions');
                     $categories[$cat_name][$type_name][$act_name]['accessColor'] = ACLAction::AccessColor($action['aclaccess']);
-                    if($type_name== 'module'){
+                    if ($type_name == 'module') {
 
-                        if($act_name != 'aclaccess' && $categories[$cat_name]['module']['access']['aclaccess'] == ACL_ALLOW_DISABLED){
+                        if ($act_name != 'aclaccess' && $categories[$cat_name]['module']['access']['aclaccess'] == ACL_ALLOW_DISABLED) {
                             $categories[$cat_name][$type_name][$act_name]['accessColor'] = 'darkgray';
                             $disabled[] = $cat_name;
                         }
@@ -571,19 +571,19 @@ 
                     $categories[$cat_name][$type_name][$act_name]['accessName'] = ACLAction::AccessName($action['aclaccess']);
                     $categories[$cat_name][$type_name][$act_name]['accessLabel'] = ACLAction::AccessLabel($action['aclaccess']);
 
-                    if($cat_name=='Users'&& $act_name=='admin'){
-                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT]=ACLAction::AccessName(ACL_ALLOW_DEFAULT);;
-                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV]=ACLAction::AccessName(ACL_ALLOW_DEV);;
+                    if ($cat_name == 'Users' && $act_name == 'admin') {
+                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEFAULT] = ACLAction::AccessName(ACL_ALLOW_DEFAULT); ;
+                        $categories[$cat_name][$type_name][$act_name]['accessOptions'][ACL_ALLOW_DEV] = ACLAction::AccessName(ACL_ALLOW_DEV); ;
                     }
-                    else{
-                    $categories[$cat_name][$type_name][$act_name]['accessOptions'] =  ACLAction::getAccessOptions($act_name, $type_name);
+                    else {
+                    $categories[$cat_name][$type_name][$act_name]['accessOptions'] = ACLAction::getAccessOptions($act_name, $type_name);
                     }
                 }
             }
         }
 
-        if(!is_admin($current_user)){
-            foreach($disabled as $cat_name){
+        if (!is_admin($current_user)) {
+            foreach ($disabled as $cat_name) {
                 unset($categories[$cat_name]);
             }
         }
@@ -598,10 +598,10 @@ 
     *
     * @return array of fields with id, name, access and category
     */
-    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false){
+    function toArray($dbOnly = false, $stringOnly = false, $upperKeys = false) {
         $array_fields = array('id', 'aclaccess');
         $arr = array();
-        foreach($array_fields as $field){
+        foreach ($array_fields as $field) {
             $arr[$field] = $this->$field;
         }
         return $arr;
@@ -613,8 +613,8 @@ 
     *
     * @param Array $arr
     */
-    function fromArray($arr){
-        foreach($arr as $name=>$value){
+    function fromArray($arr) {
+        foreach ($arr as $name=>$value) {
             $this->$name = $value;
         }
     }
@@ -624,7 +624,7 @@ 
     * clears the session variable storing the cache information for acls
     *
     */
-    function clearSessionCache(){
+    function clearSessionCache() {
         unset($_SESSION['ACL']);
     }
 

modules/AOS_Products_Quotes/Line_Items.php

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
  * @author SalesAgility <info@salesagility.com>
  */
 
-function display_lines($focus, $field, $value, $view){
+function display_lines($focus, $field, $value, $view) {
 
     global $sugar_config, $locale, $app_list_strings, $mod_strings;
 
@@ -31,10 +31,10 @@ 
 
     $html = '';
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
 
         $html .= '<script src="modules/AOS_Products_Quotes/line_items.js"></script>';
-        if(file_exists('custom/modules/AOS_Products_Quotes/line_items.js')){
+        if (file_exists('custom/modules/AOS_Products_Quotes/line_items.js')) {
             $html .= '<script src="custom/modules/AOS_Products_Quotes/line_items.js"></script>';
         }
         $html .= '<script language="javascript">var sig_digits = '.$locale->getPrecision().';';
@@ -45,18 +45,18 @@ 
 
         $html .= "<table border='0' cellspacing='4' width='37.5%' id='lineItems'></table>";
 
-        if($enable_groups){
+        if ($enable_groups) {
             $html .= "<div style='padding-top: 10px; padding-bottom:10px;'>";
             $html .= "<input type=\"button\" tabindex=\"116\" class=\"button\" value=\"".$mod_strings['LBL_ADD_GROUP']."\" id=\"addGroup\" onclick=\"insertGroup(0)\" />";
             $html .= "</div>";
         }
         $html .= '<input type="hidden" name="vathidden" id="vathidden" value="'.get_select_options_with_id($app_list_strings['vat_list'], '').'">
 				  <input type="hidden" name="discounthidden" id="discounthidden" value="'.get_select_options_with_id($app_list_strings['discount_list'], '').'">';
-        if($focus->id != '') {
+        if ($focus->id != '') {
             require_once('modules/AOS_Products_Quotes/AOS_Products_Quotes.php');
             require_once('modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups.php');
 
-            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '" . $focus->object_name . "' AND pg.parent_id = '" . $focus->id . "' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
+            $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
 
             $result = $focus->db->query($sql);
             $html .= "<script>
@@ -75,17 +75,17 @@ 
                     $group_item = json_encode($group_item->toArray());
                 }
                 $html .= "<script>
-                        insertLineItems(" . $line_item . "," . $group_item . ");
+                        insertLineItems(" . $line_item.",".$group_item.");
                     </script>";
 
             }
         }
-        if(!$enable_groups){
+        if (!$enable_groups) {
             $html .= '<script>insertGroup();</script>';
         }
 
     }
-    else if($view == 'DetailView'){
+    else if ($view == 'DetailView') {
         $params = array('currency_id' => $focus->currency_id);
 
         $sql = "SELECT pg.id, pg.group_id FROM aos_products_quotes pg LEFT JOIN aos_line_item_groups lig ON pg.group_id = lig.id WHERE pg.parent_type = '".$focus->object_name."' AND pg.parent_id = '".$focus->id."' AND pg.deleted = 0 ORDER BY lig.number ASC, pg.number ASC";
@@ -109,9 +109,9 @@ 
             $line_item->retrieve($row['id']);
 
 
-            if($enable_groups && ($group_id != $row['group_id'] || $i == 0)){
+            if ($enable_groups && ($group_id != $row['group_id'] || $i == 0)) {
                 $html .= $groupStart.$product.$service.$groupEnd;
-                if($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
+                if ($i != 0)$html .= "<tr><td colspan='9' nowrap='nowrap'><br></td></tr>";
                 $groupStart = '';
                 $groupEnd = '';
                 $product = '';
@@ -152,8 +152,8 @@ 
                 $groupEnd .= "<td class='tabDetailViewDL' style='text-align: right;padding:2px;'>".currency_format_number($group_item->total_amount, $params)."</td>";
                 $groupEnd .= "</tr>";
             }
-            if($line_item->product_id != '0' && $line_item->product_id != null){
-                if($productCount == 0)
+            if ($line_item->product_id != '0' && $line_item->product_id != null) {
+                if ($productCount == 0)
                 {
                     $product .= "<tr>";
                     $product .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -169,26 +169,26 @@ 
                 }
 
                 $product .= "<tr>";
-                $product_note = wordwrap($line_item->description,40,"<br />\n");
+                $product_note = wordwrap($line_item->description, 40, "<br />\n");
                 $product .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$productCount."</td>";
-                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty),$sep[1])."</td>";
+                $product .= "<td class='tabDetailViewDF' style='padding:2px;'>".stripDecimalPointsAndTrailingZeroes(format_number($line_item->product_qty), $sep[1])."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='padding:2px;'><a href='index.php?module=AOS_Products&action=DetailView&record=".$line_item->product_id."' class='tabDetailViewDFLink'>".$line_item->name."</a><br />".$product_note."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params )."</td>";
-                if($locale->getPrecision()){
-                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'),$sep[1])."%</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
+                if ($locale->getPrecision()) {
+                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
                 } else {
                     $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".format_number($line_item->vat)."%</td>";
                 }
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $product .= "</tr>";
             } else {
-                if($serviceCount == 0)
+                if ($serviceCount == 0)
                 {
                     $service .= "<tr>";
                     $service .= "<td width='5%' class='tabDetailViewDL' style='text-align: left;padding:2px;' scope='row'>&nbsp;</td>";
@@ -205,15 +205,15 @@ 
                 $service .= "<tr>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: left; padding:2px;'>".++$serviceCount."</td>";
                 $service .= "<td class='tabDetailViewDF' style='padding:2px;' colspan='2'>".$line_item->name."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
 
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price,$params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt,$params )."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price,$params )."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $service .= "</tr>";
 
             }
@@ -230,22 +230,22 @@ 
 //field was 0.
 //The approach below will strip off the fractional part if it is only zeroes (and in this case the decimal separator
 //will also be stripped off) The custom decimal separator is passed in to the function from the locale settings
-function stripDecimalPointsAndTrailingZeroes($inputString,$decimalSeparator)
+function stripDecimalPointsAndTrailingZeroes($inputString, $decimalSeparator)
 {
-    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/','',$inputString);
+    return preg_replace('/'.preg_quote($decimalSeparator).'[0]+$/', '', $inputString);
 }
 
-function get_discount_string($type, $amount, $params, $locale, $sep){
-    if($amount != '' && $amount != '0.00')
+function get_discount_string($type, $amount, $params, $locale, $sep) {
+    if ($amount != '' && $amount != '0.00')
     {
-        if($type == 'Amount')
+        if ($type == 'Amount')
         {
-            return currency_format_number($amount,$params )."</td>";
+            return currency_format_number($amount, $params)."</td>";
         }
-        else if($locale->getPrecision())
+        else if ($locale->getPrecision())
         {
-            return rtrim(rtrim(format_number($amount), '0'),$sep[1])."%";
-        } else{
+            return rtrim(rtrim(format_number($amount), '0'), $sep[1])."%";
+        } else {
             return format_number($amount)."%";
         }
     }
@@ -255,12 +255,12 @@ 
     }
 }
 
-function display_shipping_vat($focus, $field, $value, $view){
+function display_shipping_vat($focus, $field, $value, $view) {
 
-    if($view == 'EditView'){
+    if ($view == 'EditView') {
         global $app_list_strings;
 
-        if($value != '') $value = format_number($value);
+        if ($value != '') $value = format_number($value);
 
         $html = "<input id='shipping_tax_amt' type='text' tabindex='0' title='' value='".$value."' maxlength='26,6' size='22' name='shipping_tax_amt' onblur='calculateTotal(\"lineItems\");'>";
         $html .= "<select name='shipping_tax' id='shipping_tax' onchange='calculateTotal(\"lineItems\");' >".get_select_options_with_id($app_list_strings['vat_list'], (isset($focus->shipping_tax) ? $focus->shipping_tax : ''))."</select>";

modules/AOS_Products_Quotes/AOS_Products_Quotes.php

Spacing +8 added lines, -8 removed lines

@@ -51,22 +51,22 @@ 
     function save_lines($post_data, $parent, $groups = array(), $key = '')
     {
 
-        $line_count = isset($post_data[$key . 'name']) ? count($post_data[$key . 'name']) : 0;
+        $line_count = isset($post_data[$key.'name']) ? count($post_data[$key.'name']) : 0;
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $product_quote = new AOS_Products_Quotes();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        $product_quote->$field_name = $post_data[$key . $field_name][$i];
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        $product_quote->$field_name = $post_data[$key.$field_name][$i];
                     }
                 }
-                if (isset($post_data[$key . 'group_number'][$i])) {
-                    $product_quote->group_id = $groups[$post_data[$key . 'group_number'][$i]];
+                if (isset($post_data[$key.'group_number'][$i])) {
+                    $product_quote->group_id = $groups[$post_data[$key.'group_number'][$i]];
                 }
                 if (trim($product_quote->product_id) != '' && trim($product_quote->name) != '' && trim($product_quote->product_unit_price) != '') {
                     $product_quote->number = ++$j;
@@ -75,7 +75,7 @@ 
                     $product_quote->currency_id = $parent->currency_id;
                     $product_quote->parent_type = $parent->object_name;
                     $product_quote->save();
-                    $_POST[$key . 'id'][$i] = $product_quote->id;
+                    $_POST[$key.'id'][$i] = $product_quote->id;
                 }
             }
         }

modules/Reminders/Reminder.php

Spacing +9 added lines, -9 removed lines

@@ -322,7 +322,7 @@ 
                             $timeRemind = $popupReminder->timer_popup;
                             $timeStart -= $timeRemind;
 
-                            $url = 'index.php?action=DetailView&module=' . $popupReminder->related_event_module . '&record=' . $popupReminder->related_event_module_id;
+                            $url = 'index.php?action=DetailView&module='.$popupReminder->related_event_module.'&record='.$popupReminder->related_event_module_id;
                             $instructions = $app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING_MSG'];
 
                             if ($popupReminder->related_event_module == 'Meetings') {
@@ -342,8 +342,8 @@ 
 
                             $relatedToMeeting = $alert->getRelatedName($popupReminder->related_event_module, $popupReminder->related_event_module_id);
 
-                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'] . $desc1 . "\n";
-                            $description = $description . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'] . (isset($relatedEvent->status) ? $relatedEvent->status : '') . "\n" . $app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'] . $relatedToMeeting;
+                            $description = empty($desc1) ? '' : $app_strings['MSG_JS_ALERT_MTG_REMINDER_AGENDA'].$desc1."\n";
+                            $description = $description."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_STATUS'].(isset($relatedEvent->status) ? $relatedEvent->status : '')."\n".$app_strings['MSG_JS_ALERT_MTG_REMINDER_RELATED_TO'].$relatedToMeeting;
 
 
                             if (isset($relatedEvent->date_start)) {
@@ -361,9 +361,9 @@ 
 
                             // standard functionality
                             $alert->addAlert($app_strings['MSG_JS_ALERT_MTG_REMINDER_MEETING'], $meetingName,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'] . $time,
-                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'] . $location .
-                                $description .
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_TIME'].$time,
+                                $app_strings['MSG_JS_ALERT_MTG_REMINDER_LOC'].$location.
+                                $description.
                                 $instructions,
                                 $timeStart - strtotime($alertDateTimeNow),
                                 $url
@@ -426,7 +426,7 @@ 
 
     private function upgradeEventPersonQuery(SugarBean $event, $person_table)
     {
-        $eventIdField = strtolower($event->object_name) . '_id';
+        $eventIdField = strtolower($event->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person_table}
 			WHERE
@@ -440,9 +440,9 @@ 
     {
         $eventIdField = array_search($event->table_name, $event->relationship_fields);
         if (!$eventIdField) {
-            $eventIdField = strtolower($event->object_name . '_id');
+            $eventIdField = strtolower($event->object_name.'_id');
         }
-        $personIdField = strtolower($person->object_name) . '_id';
+        $personIdField = strtolower($person->object_name).'_id';
         $query = "
 			SELECT * FROM {$event->table_name}_{$person->table_name}
 			WHERE

Braces +6 added lines, -2 removed lines

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

modules/AOR_Reports/AOR_Report.php

Indentation +35 added lines, -35 removed lines

@@ -23,42 +23,42 @@ 
  */
 
 class AOR_Report extends Basic {
-	var $new_schema = true;
-	var $module_dir = 'AOR_Reports';
-	var $object_name = 'AOR_Report';
-	var $table_name = 'aor_reports';
-	var $importable = true;
-	var $disable_row_level_security = true ;
-
-	var $id;
-	var $name;
-	var $date_entered;
-	var $date_modified;
-	var $modified_user_id;
-	var $modified_by_name;
-	var $created_by;
-	var $created_by_name;
-	var $description;
-	var $deleted;
-	var $created_by_link;
-	var $modified_user_link;
-	var $assigned_user_id;
-	var $assigned_user_name;
-	var $assigned_user_link;
-	var $report_module;
-
-	function AOR_Report(){
-		parent::Basic();
+    var $new_schema = true;
+    var $module_dir = 'AOR_Reports';
+    var $object_name = 'AOR_Report';
+    var $table_name = 'aor_reports';
+    var $importable = true;
+    var $disable_row_level_security = true ;
+
+    var $id;
+    var $name;
+    var $date_entered;
+    var $date_modified;
+    var $modified_user_id;
+    var $modified_by_name;
+    var $created_by;
+    var $created_by_name;
+    var $description;
+    var $deleted;
+    var $created_by_link;
+    var $modified_user_link;
+    var $assigned_user_id;
+    var $assigned_user_name;
+    var $assigned_user_link;
+    var $report_module;
+
+    function AOR_Report(){
+        parent::Basic();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
-	}
+    }
 
-	function bean_implements($interface){
-		switch($interface){
-			case 'ACL': return true;
-		}
-		return false;
-	}
+    function bean_implements($interface){
+        switch($interface){
+            case 'ACL': return true;
+        }
+        return false;
+    }
 
     function save($check_notify = FALSE){
 
@@ -121,7 +121,7 @@ 
     function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART){
         global $beanList;
         $linkedCharts = $this->get_linked_beans('aor_charts','AOR_Charts');
-	if(!$linkedCharts){
+    if(!$linkedCharts){
             //No charts to display
             return '';
         }
@@ -478,7 +478,7 @@ 
             while ($row = $this->db->fetchByAssoc($result)) {
                 if($html != '') $html .= '<br />';
 
-               $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
+                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }

Spacing +257 added lines, -257 removed lines

@@ -28,7 +28,7 @@ 
 	var $object_name = 'AOR_Report';
 	var $table_name = 'aor_reports';
 	var $importable = true;
-	var $disable_row_level_security = true ;
+	var $disable_row_level_security = true;
 
 	var $id;
 	var $name;
@@ -47,25 +47,25 @@ 
 	var $assigned_user_link;
 	var $report_module;
 
-	function AOR_Report(){
+	function AOR_Report() {
 		parent::Basic();
         $this->load_report_beans();
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 	}
 
-	function bean_implements($interface){
-		switch($interface){
+	function bean_implements($interface) {
+		switch ($interface) {
 			case 'ACL': return true;
 		}
 		return false;
 	}
 
-    function save($check_notify = FALSE){
+    function save($check_notify = FALSE) {
 
         // TODO: process of saveing the fields and conditions is too long so we will have to make some optimization on save_lines functions
         set_time_limit(3600);
 
-        if (empty($this->id)){
+        if (empty($this->id)) {
             unset($_POST['aor_conditions_id']);
             unset($_POST['aor_fields_id']);
         }
@@ -85,13 +85,13 @@ 
         $chart->save_lines($_POST, $this, 'aor_chart_');
     }
 
-    function load_report_beans(){
+    function load_report_beans() {
         global $beanList, $app_list_strings;
 
         $app_list_strings['aor_moduleList'] = $app_list_strings['moduleList'];
 
-        foreach($app_list_strings['aor_moduleList'] as $mkey => $mvalue){
-            if(!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')){
+        foreach ($app_list_strings['aor_moduleList'] as $mkey => $mvalue) {
+            if (!isset($beanList[$mkey]) || str_begin($mkey, 'AOR_') || str_begin($mkey, 'AOW_')) {
                 unset($app_list_strings['aor_moduleList'][$mkey]);
             }
         }
@@ -102,12 +102,12 @@ 
     }
 
 
-    function getReportFields(){
+    function getReportFields() {
         $fields = array();
-        foreach($this->get_linked_beans('aor_fields','AOR_Fields') as $field){
+        foreach ($this->get_linked_beans('aor_fields', 'AOR_Fields') as $field) {
             $fields[] = $field;
         }
-        usort($fields,function($a,$b){
+        usort($fields, function($a, $b) {
             return $a->field_order - $b->field_order;
         });
         return $fields;
@@ -118,10 +118,10 @@ 
     const CHART_TYPE_RGRAPH = 'rgraph';
 
 
-    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART){
+    function build_report_chart($chartIds = null, $chartType = self::CHART_TYPE_PCHART) {
         global $beanList;
-        $linkedCharts = $this->get_linked_beans('aor_charts','AOR_Charts');
-	if(!$linkedCharts){
+        $linkedCharts = $this->get_linked_beans('aor_charts', 'AOR_Charts');
+	if (!$linkedCharts) {
             //No charts to display
             return '';
         }
@@ -145,16 +145,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -169,10 +169,10 @@ 
 
             // get the main group
 
-            if($field->group_display) {
+            if ($field->group_display) {
 
                 // if we have a main group already thats wrong cause only one main grouping field possible
-                if(!is_null($mainGroupField)) {
+                if (!is_null($mainGroupField)) {
                     $GLOBALS['log']->fatal('main group already found');
                 }
 
@@ -187,18 +187,18 @@ 
         $query = $this->build_report_query();
         $result = $this->db->query($query);
         $data = array();
-        while($row = $this->db->fetchByAssoc($result, false))
+        while ($row = $this->db->fetchByAssoc($result, false))
         {
-            foreach($fields as $name => $att){
+            foreach ($fields as $name => $att) {
 
                 $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                switch ($att['function']){
+                switch ($att['function']) {
                     case 'COUNT':
                         break;
                     default:
-                        if(!is_numeric($row[$name])) {
-                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id,$att['params'])));
+                        if (!is_numeric($row[$name])) {
+                            $row[$name] = trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params'])));
 
                         }
                         break;
@@ -208,7 +208,7 @@ 
         }
         $fields = $this->getReportFields();
 
-        switch($chartType) {
+        switch ($chartType) {
             case self::CHART_TYPE_PCHART:
                 $html = '<script src="modules/AOR_Charts/lib/pChart/imagemap.js"></script>';
                 break;
@@ -216,17 +216,17 @@ 
                 $html = '<script src="modules/AOR_Reports/js/Chart.js"></script>';
                 break;
             case self::CHART_TYPE_RGRAPH:
-                if($_REQUEST['module']!= 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
+                if ($_REQUEST['module'] != 'Home')//Need the require_once for the rgraphincludes as they are only loaded when the home page is hit
                     require_once('include/SuiteGraphs/RGraphIncludes.php');
 
                 break;
         }
         $x = 0;
-        foreach($linkedCharts as $chart){
-            if($chartIds !== null && !in_array($chart->id,$chartIds)){
+        foreach ($linkedCharts as $chart) {
+            if ($chartIds !== null && !in_array($chart->id, $chartIds)) {
                 continue;
             }
-            $html .= $chart->buildChartHTML($data,$fields,$x, $chartType, $mainGroupField);
+            $html .= $chart->buildChartHTML($data, $fields, $x, $chartType, $mainGroupField);
             $x++;
         }
         return $html;
@@ -238,12 +238,12 @@ 
 
         $rows = $this->getGroupDisplayFieldByReportId($this->id, $level);
 
-        if(count($rows) > 1) {
-            $GLOBALS['log']->fatal('ambiguous group display for report ' . $this->id);
+        if (count($rows) > 1) {
+            $GLOBALS['log']->fatal('ambiguous group display for report '.$this->id);
         }
-        else if(count($rows) == 1){
+        else if (count($rows) == 1) {
             $rows[0]['module_path'] = unserialize(base64_decode($rows[0]['module_path']));
-            if(!$rows[0]['module_path'][0]) {
+            if (!$rows[0]['module_path'][0]) {
                 $module = new $beanList[$this->report_module]();
                 $rows[0]['field_id_name'] = $module->field_defs[$rows[0]['field']]['id_name'] ? $module->field_defs[$rows[0]['field']]['id_name'] : $module->field_defs[$rows[0]['field']]['name'];
                 $rows[0]['module_path'][0] = $module->table_name;
@@ -253,23 +253,23 @@ 
             }
             $path[] = $rows[0];
 
-            if($level>10) {
+            if ($level > 10) {
                 $msg = 'Too many nested groups';
                 $GLOBALS['log']->fatal($msg);
                 return null;
             }
 
-            return $this->buildMultiGroupReport($offset, $links, $level+1, $path);
+            return $this->buildMultiGroupReport($offset, $links, $level + 1, $path);
         }
-        else if(!$rows) {
-            if($path) {
+        else if (!$rows) {
+            if ($path) {
                 $html = '';
                 foreach ($path as $pth) {
                     $_fieldIdName = $this->db->quoteIdentifier($pth['field_id_name']);
-                    $query = "SELECT $_fieldIdName FROM " . $this->db->quoteIdentifier($pth['module_path'][0]) . " GROUP BY $_fieldIdName;";
+                    $query = "SELECT $_fieldIdName FROM ".$this->db->quoteIdentifier($pth['module_path'][0])." GROUP BY $_fieldIdName;";
                     $values = $this->dbSelect($query);
 
-                    foreach($values as $value) {
+                    foreach ($values as $value) {
 
                         //$where = [ $this->db->quote($pth['module_path'][0]) . '.' . $_fieldIdName . ' = \'' . $this->db->quote($value[$pth['field_id_name']]) . '\'' ];
 
@@ -305,7 +305,7 @@ 
         // escape values for query
 
         $_id = $this->db->quote($reportId);
-        $_level = (int) $level;
+        $_level = (int)$level;
 
         // get results array
 
@@ -320,7 +320,7 @@ 
         $results = $this->db->query($query);
 
         $rows = array();
-        while($row = $this->db->fetchByAssoc($results)) {
+        while ($row = $this->db->fetchByAssoc($results)) {
             $rows[] = $row;
         }
 
@@ -329,20 +329,20 @@ 
 
     private function getMultiGroupFrameHTML($header, $body) {
         $html = '<div class="multi-group-list" style="border: 1px solid black; padding: 10px;">
-                    <h3>' . $header . '</h3>
-                    <div class="multi-group-list-inner">' . $body . '</div>
+                    <h3>' . $header.'</h3>
+                    <div class="multi-group-list-inner">' . $body.'</div>
                 </div>';
         return $html;
     }
 
     private function addDataIdValueToInnertext($html) {
         preg_match('/\sdata-id-value\s*=\s*"([^"]*)"/', $html, $match);
-        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2' . $match[1] . '$3', $html);
+        $html = preg_replace('/(>)([^<]*)(<\/\w+>$)/', '$1$2'.$match[1].'$3', $html);
         return $html;
     }
 
 
-    function build_group_report($offset = -1, $links = true, $extra = array()){
+    function build_group_report($offset = -1, $links = true, $extra = array()) {
         global $beanList;
 
         $html = '';
@@ -353,23 +353,23 @@ 
         $sql = "SELECT id FROM aor_fields WHERE aor_report_id = '".$this->id."' AND group_display = 1 AND deleted = 0 ORDER BY field_order ASC";
         $field_id = $this->db->getOne($sql);
 
-        if(!$field_id) {
-            $query_array['select'][] = $module->table_name . ".id AS '" . $module->table_name . "_id'";
+        if (!$field_id) {
+            $query_array['select'][] = $module->table_name.".id AS '".$module->table_name."_id'";
         }
 
-        if($field_id != ''){
+        if ($field_id != '') {
             $field = new AOR_Field();
             $field->retrieve($field_id);
 
-            $field_label = str_replace(' ','_',$field->label);
+            $field_label = str_replace(' ', '_', $field->label);
 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $module;
             $table_alias = $field_module->table_name;
-            if(!empty($path[0]) && $path[0] != $module->module_dir){
-                foreach($path as $rel){
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+            if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                foreach ($path as $rel) {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                     $oldAlias = $table_alias;
                     $table_alias = $table_alias.":".$rel;
 
@@ -383,71 +383,71 @@ 
 
             $data = $field_module->field_defs[$field->field];
 
-            if($data['type'] == 'relate' && isset($data['id_name'])) {
+            if ($data['type'] == 'relate' && isset($data['id_name'])) {
                 $field->field = $data['id_name'];
             }
 
-            if($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
-                if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+            if ($data['type'] == 'currency' && !stripos($field->field, '_USD') && isset($field_module->field_defs['currency_id'])) {
+                if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                     $query['select'][$table_alias.'_currency_id'] = $table_alias.'_cstm'.".currency_id AS '".$table_alias."_currency_id'";
                 } else {
-                    $query_array['select'][$table_alias . '_currency_id'] = $table_alias . ".currency_id AS '" . $table_alias . "_currency_id'";
+                    $query_array['select'][$table_alias.'_currency_id'] = $table_alias.".currency_id AS '".$table_alias."_currency_id'";
                 }
             }
 
-            if(  (isset($data['source']) && $data['source'] == 'custom_fields')) {
+            if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                 $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
                 // ? $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',$table_alias, $field_module, 'custom', $query);
                 $query_array = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $field_module, 'custom', $query);
             } else {
-                $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
             }
 
-            if($field->sort_by != ''){
+            if ($field->sort_by != '') {
                 $query_array['sort_by'][] = $field_label.' '.$field->sort_by;
             }
 
-            if($field->group_by == 1){
+            if ($field->group_by == 1) {
                 $query_array['group_by'][] = $select_field;
             }
 
-            if($field->field_function != null){
+            if ($field->field_function != null) {
                 $select_field = $field->field_function.'('.$select_field.')';
             }
 
-            $query_array['select'][] = $select_field ." AS '".$field_label."'";
-            if(isset($extra['select']) && $extra['select']) {
-                foreach($extra['select'] as $selectField => $selectAlias) {
-                    if($selectAlias) {
-                        $query_array['select'][] = $selectField . " AS " . $selectAlias;
+            $query_array['select'][] = $select_field." AS '".$field_label."'";
+            if (isset($extra['select']) && $extra['select']) {
+                foreach ($extra['select'] as $selectField => $selectAlias) {
+                    if ($selectAlias) {
+                        $query_array['select'][] = $selectField." AS ".$selectAlias;
                     }
                     else {
                         $query_array['select'][] = $selectField;
                     }
                 }
             }
-            $query_array['where'][] = $select_field ." IS NOT NULL AND ";
-            if(isset($extra['where']) && $extra['where']) {
-                $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+            $query_array['where'][] = $select_field." IS NOT NULL AND ";
+            if (isset($extra['where']) && $extra['where']) {
+                $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
             }
 
             $query_array = $this->build_report_query_where($query_array);
 
-            foreach ($query_array['select'] as $select){
-                $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+            foreach ($query_array['select'] as $select) {
+                $query .= ($query == '' ? 'SELECT ' : ', ').$select;
             }
 
             $query .= ' FROM '.$module->table_name.' ';
 
-            if(isset($query_array['join'])){
-                foreach ($query_array['join'] as $join){
+            if (isset($query_array['join'])) {
+                foreach ($query_array['join'] as $join) {
                     $query .= $join;
                 }
             }
-            if(isset($query_array['where'])){
+            if (isset($query_array['where'])) {
                 $query_where = '';
-                foreach ($query_array['where'] as $where){
-                    $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+                foreach ($query_array['where'] as $where) {
+                    $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
                 }
 
                 $query_where = $this->queryWhereRepair($query_where);
@@ -455,41 +455,41 @@ 
                 $query .= ' '.$query_where;
             }
 
-            if(isset($query_array['group_by'])){
+            if (isset($query_array['group_by'])) {
                 $query_group_by = '';
-                foreach ($query_array['group_by'] as $group_by){
-                    $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+                foreach ($query_array['group_by'] as $group_by) {
+                    $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
                 }
                 $query .= ' '.$query_group_by;
             }
 
-            if(isset($query_array['sort_by'])){
+            if (isset($query_array['sort_by'])) {
                 $query_sort_by = '';
-                foreach ($query_array['sort_by'] as $sort_by){
-                    $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+                foreach ($query_array['sort_by'] as $sort_by) {
+                    $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
                 }
                 $query .= ' '.$query_sort_by;
             }
 
-            $query .= ' group by ' . $field_label;
+            $query .= ' group by '.$field_label;
 
             $result = $this->db->query($query);
 
             while ($row = $this->db->fetchByAssoc($result)) {
-                if($html != '') $html .= '<br />';
+                if ($html != '') $html .= '<br />';
 
                $html .= $this->build_report_html($offset, $links, $row[$field_label], '', $extra);
 
             }
         }
 
-        if($html == '') $html = $this->build_report_html($offset, $links);
+        if ($html == '') $html = $this->build_report_html($offset, $links);
         return $html;
 
     }
 
 
-    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()){
+    function build_report_html($offset = -1, $links = true, $group_value = '', $tableIdentifier = '', $extra = array()) {
 
         global $beanList, $sugar_config;
 
@@ -502,22 +502,22 @@ 
         // We have a count query.  Run it and get the results.
         $result = $this->db->query($count_query);
         $assoc = $this->db->fetchByAssoc($result);
-        if(!empty($assoc['c']))
+        if (!empty($assoc['c']))
         {
             $total_rows = $assoc['c'];
         }
 
         $html = "<table class='list' id='report_table".$group_value."' width='100%' cellspacing='0' cellpadding='0' border='0' repeat_header='1'>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $start = 0;
             $end = 0;
             $previous_offset = 0;
             $next_offset = 0;
             $last_offset = 0;
 
-            if($total_rows > 0){
-                $start = $offset +1;
+            if ($total_rows > 0) {
+                $start = $offset + 1;
                 $end = (($offset + $max_rows) < $total_rows) ? $offset + $max_rows : $total_rows;
                 $previous_offset = ($offset - $max_rows) < 0 ? 0 : $offset - $max_rows;
                 $next_offset = $offset + $max_rows;
@@ -529,36 +529,36 @@ 
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
-            $html .="<td colspan='18'>
+            $html .= "<td colspan='18'>
                        <table class='paginationTable' border='0' cellpadding='0' cellspacing='0' width='100%'>
                         <td style='text-align:left' ><H3><a href=\"javascript:void(0)\" class=\"collapseLink\" onclick=\"groupedReportToggler.toggleList(this);\"><img border=\"0\" id=\"detailpanel_1_img_hide\" src=\"themes/SuiteR/images/basic_search.gif\"></a>$moduleFieldByGroupValue</H3></td>
                         <td class='paginationChangeButtons' align='right' nowrap='nowrap' width='1%'>";
 
-            if($offset == 0){
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
+            if ($offset == 0) {
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start_off.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' disabled='disabled'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous_off.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             } else {
-                $html .="<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
+                $html .= "<button type='button' id='listViewStartButton_top' name='listViewStartButton' title='Start' class='button' onclick='changeReportPage(\"".$this->id."\",0,\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('start.gif')."' alt='Start' align='absmiddle' border='0'>
                 </button>
                 <button type='button' id='listViewPrevButton_top' name='listViewPrevButton' class='button' title='Previous' onclick='changeReportPage(\"".$this->id."\",".$previous_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                     <img src='".SugarThemeRegistry::current()->getImageURL('previous.gif')."' alt='Previous' align='absmiddle' border='0'>
                 </button>";
             }
-            $html .=" <span class='pageNumbers'>(".$start ." - ".$end ." of ". $total_rows .")</span>";
-            if($next_offset < $total_rows){
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
+            $html .= " <span class='pageNumbers'>(".$start." - ".$end." of ".$total_rows.")</span>";
+            if ($next_offset < $total_rows) {
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button' onclick='changeReportPage(\"".$this->id."\",".$next_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button' onclick='changeReportPage(\"".$this->id."\",".$last_offset.",\"".$group_value."\",\"".$tableIdentifier."\")'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('end.gif')."' alt='End' align='absmiddle' border='0'>
                     </button>";
             } else {
-                $html .="<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
+                $html .= "<button type='button' id='listViewNextButton_top' name='listViewNextButton' title='Next' class='button'  disabled='disabled'>
                         <img src='".SugarThemeRegistry::current()->getImageURL('next_off.gif')."' alt='Next' align='absmiddle' border='0'>
                     </button>
                      <button type='button' id='listViewEndButton_top' name='listViewEndButton' title='End' class='button'  disabled='disabled'>
@@ -567,12 +567,12 @@ 
 
             }
 
-            $html .="</td>
+            $html .= "</td>
                        </table>
                       </td>";
 
-            $html .="</tr></thead>";
-        } else{
+            $html .= "</tr></thead>";
+        } else {
 
             $moduleFieldByGroupValue = $this->getModuleFieldByGroupValue($beanList, $group_value);
 
@@ -598,16 +598,16 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['label'] = $field->label;
             $fields[$label]['display'] = $field->display;
@@ -620,7 +620,7 @@ 
             $fields[$label]['params'] = array("date_format" => $field->format);
 
 
-            if($fields[$label]['display']){
+            if ($fields[$label]['display']) {
                 $html .= "<th scope='col'>";
                 $html .= "<div style='white-space: normal;' width='100%' align='left'>";
                 $html .= $field->label;
@@ -633,7 +633,7 @@ 
         $html .= "</thead>";
         $html .= "<tbody>";
 
-        if($offset >= 0){
+        if ($offset >= 0) {
             $result = $this->db->limitQuery($report_sql, $offset, $max_rows);
         } else {
             $result = $this->db->query($report_sql);
@@ -646,39 +646,39 @@ 
         while ($row = $this->db->fetchByAssoc($result)) {
             $html .= "<tr class='".$row_class."' height='20'>";
 
-            foreach($fields as $name => $att){
-                if($att['display']){
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
                     $html .= "<td class='' valign='top' align='left'>";
-                    if($att['link'] && $links){
-                        $html .= "<a href='" . $sugar_config['site_url'] . "/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
+                    if ($att['link'] && $links) {
+                        $html .= "<a href='".$sugar_config['site_url']."/index.php?module=".$att['module']."&action=DetailView&record=".$row[$att['alias'].'_id']."'>";
                     }
 
                     $currency_id = isset($row[$att['alias'].'_currency_id']) ? $row[$att['alias'].'_currency_id'] : '';
 
-                    switch ($att['function']){
+                    switch ($att['function']) {
                         case 'COUNT':
                         //case 'SUM':
                             $html .= $row[$name];
                             break;
                         default:
 
-                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name],'',$currency_id, $att['params']);
+                            $html .= getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name], '', $currency_id, $att['params']);
                             break;
                     }
-                    if($att['total']){
+                    if ($att['total']) {
                         $totals[$name][] = $row[$name];
                     }
-                    if($att['link'] && $links) $html .= "</a>";
+                    if ($att['link'] && $links) $html .= "</a>";
                     $html .= "</td>";
                 }
             }
             $html .= "</tr>";
 
-            $row_class = $row_class == 'oddListRowS1' ?  'evenListRowS1':'oddListRowS1';
+            $row_class = $row_class == 'oddListRowS1' ? 'evenListRowS1' : 'oddListRowS1';
         }
         $html .= "</tbody>";
 
-        $html .= $this->getTotalHtml($fields,$totals);
+        $html .= $this->getTotalHtml($fields, $totals);
 
         $html .= "</table>";
 
@@ -721,13 +721,13 @@ 
 
             $field_module = $this->report_module;
             $field_alias = $field_bean->table_name;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    if(empty($rel)){
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    if (empty($rel)) {
                         continue;
                     }
-                    $field_module = getRelatedModule($field_module,$rel);
-                    $field_alias = $field_alias . ':'.$rel;
+                    $field_module = getRelatedModule($field_module, $rel);
+                    $field_alias = $field_alias.':'.$rel;
                 }
             }
 
@@ -740,31 +740,31 @@ 
         return $moduleFieldByGroupValue;
     }
 
-    function getTotalHTML($fields,$totals){
+    function getTotalHTML($fields, $totals) {
         global $app_list_strings;
         $html = '';
         $html .= "<tbody>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total']){
-                $totalLabel = $field['label'] ." ".$app_list_strings['aor_total_options'][$field['total']];
+            if ($field['total']) {
+                $totalLabel = $field['label']." ".$app_list_strings['aor_total_options'][$field['total']];
                 $html .= "<th>{$totalLabel}</th>";
-            }else{
+            } else {
                 $html .= "<th></th>";
             }
         }
         $html .= "</tr>";
         $html .= "<tr>";
-        foreach($fields as $label => $field){
-            if(!$field['display']){
+        foreach ($fields as $label => $field) {
+            if (!$field['display']) {
                 continue;
             }
-            if($field['total'] && isset($totals[$label])){
-                $html .= "<td>".$this->calculateTotal($field['total'],$totals[$label])."</td>";
-            }else{
+            if ($field['total'] && isset($totals[$label])) {
+                $html .= "<td>".$this->calculateTotal($field['total'], $totals[$label])."</td>";
+            } else {
                 $html .= "<td></td>";
             }
         }
@@ -773,24 +773,24 @@ 
         return $html;
     }
 
-    function calculateTotal($type, $totals){
-        switch($type){
+    function calculateTotal($type, $totals) {
+        switch ($type) {
             case 'SUM':
                 return array_sum($totals);
             case 'COUNT':
                 return count($totals);
             case 'AVG':
-                return array_sum($totals)/count($totals);
+                return array_sum($totals) / count($totals);
             default:
                 return '';
         }
     }
 
-    private function encloseForCSV($field){
+    private function encloseForCSV($field) {
         return '"'.$field.'"';
     }
 
-    function build_report_csv(){
+    function build_report_csv() {
 
         ini_set('zlib.output_compression', 'Off');
 
@@ -814,20 +814,20 @@ 
             $path = unserialize(base64_decode($field->module_path));
 
             $field_module = $this->report_module;
-            if($path[0] != $this->report_module){
-                foreach($path as $rel){
-                    $field_module = getRelatedModule($field_module,$rel);
+            if ($path[0] != $this->report_module) {
+                foreach ($path as $rel) {
+                    $field_module = getRelatedModule($field_module, $rel);
                 }
             }
-            $label = str_replace(' ','_',$field->label).$i;
+            $label = str_replace(' ', '_', $field->label).$i;
             $fields[$label]['field'] = $field->field;
             $fields[$label]['display'] = $field->display;
             $fields[$label]['function'] = $field->field_function;
             $fields[$label]['module'] = $field_module;
 
 
-            if($field->display){
-                $csv.= $this->encloseForCSV($field->label);
+            if ($field->display) {
+                $csv .= $this->encloseForCSV($field->label);
                 $csv .= $delimiter;
             }
             ++$i;
@@ -838,30 +838,30 @@ 
 
         while ($row = $this->db->fetchByAssoc($result)) {
             $csv .= "\r\n";
-            foreach($fields as $name => $att){
-                if($att['display']){
-                    if($att['function'] != '' )
+            foreach ($fields as $name => $att) {
+                if ($att['display']) {
+                    if ($att['function'] != '')
                         $csv .= $this->encloseForCSV($row[$name]);
                     else
-                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView',$row[$name]))));
+                        $csv .= $this->encloseForCSV(trim(strip_tags(getModuleField($att['module'], $att['field'], $att['field'], 'DetailView', $row[$name]))));
                     $csv .= $delimiter;
                 }
             }
         }
 
-        $csv= $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
+        $csv = $GLOBALS['locale']->translateCharset($csv, 'UTF-8', $GLOBALS['locale']->getExportCharset());
 
         ob_clean();
         header("Pragma: cache");
         header("Content-type: text/comma-separated-values; charset=".$GLOBALS['locale']->getExportCharset());
         header("Content-Disposition: attachment; filename=\"{$this->name}.csv\"");
         header("Content-transfer-encoding: binary");
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
-        header("Last-Modified: " . TimeDate::httpTime() );
-        header("Cache-Control: post-check=0, pre-check=0", false );
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Last-Modified: ".TimeDate::httpTime());
+        header("Cache-Control: post-check=0, pre-check=0", false);
         header("Content-Length: ".mb_strlen($csv, '8bit'));
         if (!empty($sugar_config['export_excel_compatible'])) {
-            $csv==chr(255) . chr(254) . mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
+            $csv == chr(255).chr(254).mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
         }
         print $csv;
 
@@ -870,7 +870,7 @@ 
 
 
 
-    function build_report_query($group_value ='', $extra = array()){
+    function build_report_query($group_value = '', $extra = array()) {
         global $beanList;
 
         $module = new $beanList[$this->report_module]();
@@ -879,26 +879,26 @@ 
         $query_array = array();
 
         $query_array = $this->build_report_query_select($query_array, $group_value);
-        if(isset($extra['where']) && $extra['where']) {
-            $query_array['where'][] = implode(' AND ', $extra['where']) . ' AND ';
+        if (isset($extra['where']) && $extra['where']) {
+            $query_array['where'][] = implode(' AND ', $extra['where']).' AND ';
         }
         $query_array = $this->build_report_query_where($query_array);
 
-        foreach ($query_array['select'] as $select){
-            $query .=  ($query == '' ? 'SELECT ' : ', ').$select;
+        foreach ($query_array['select'] as $select) {
+            $query .= ($query == '' ? 'SELECT ' : ', ').$select;
         }
 
         $query .= ' FROM '.$this->db->quoteIdentifier($module->table_name).' ';
 
-        if(isset($query_array['join'])){
-            foreach ($query_array['join'] as $join){
+        if (isset($query_array['join'])) {
+            foreach ($query_array['join'] as $join) {
                 $query .= $join;
             }
         }
-        if(isset($query_array['where'])){
+        if (isset($query_array['where'])) {
             $query_where = '';
-            foreach ($query_array['where'] as $where){
-                $query_where .=  ($query_where == '' ? 'WHERE ' : ' ').$where;
+            foreach ($query_array['where'] as $where) {
+                $query_where .= ($query_where == '' ? 'WHERE ' : ' ').$where;
             }
 
             $query_where = $this->queryWhereRepair($query_where);
@@ -906,18 +906,18 @@ 
             $query .= ' '.$query_where;
         }
 
-        if(isset($query_array['group_by'])){
+        if (isset($query_array['group_by'])) {
             $query_group_by = '';
-            foreach ($query_array['group_by'] as $group_by){
-                $query_group_by .=  ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
+            foreach ($query_array['group_by'] as $group_by) {
+                $query_group_by .= ($query_group_by == '' ? 'GROUP BY ' : ', ').$group_by;
             }
             $query .= ' '.$query_group_by;
         }
 
-        if(isset($query_array['sort_by'])){
+        if (isset($query_array['sort_by'])) {
             $query_sort_by = '';
-            foreach ($query_array['sort_by'] as $sort_by){
-                $query_sort_by .=  ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
+            foreach ($query_array['sort_by'] as $sort_by) {
+                $query_sort_by .= ($query_sort_by == '' ? 'ORDER BY ' : ', ').$sort_by;
             }
             $query .= ' '.$query_sort_by;
         }
@@ -931,11 +931,11 @@ 
 
         $safe = 0;
         $query_where_clean = '';
-        while($query_where_clean != $query_where) {
+        while ($query_where_clean != $query_where) {
             $query_where_clean = $query_where;
             $query_where = preg_replace('/\b(AND|OR)\s*\(\s*\)|[^\w+\s*]\(\s*\)/i', '', $query_where_clean);
             $safe++;
-            if($safe>100){
+            if ($safe > 100) {
                 $GLOBALS['log']->fatal('Invalid report query conditions');
                 break;
             }
@@ -944,10 +944,10 @@ 
         return $query_where;
     }
 
-    function build_report_query_select($query = array(), $group_value =''){
+    function build_report_query_select($query = array(), $group_value = '') {
         global $beanList;
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $query['select'][] = $this->db->quoteIdentifier($module->table_name).".id AS '".$module->table_name."_id'";
@@ -960,16 +960,16 @@ 
                 $field = new AOR_Field();
                 $field->retrieve($row['id']);
 
-                $field->label = str_replace(' ','_',$field->label).$i;
+                $field->label = str_replace(' ', '_', $field->label).$i;
 
                 $path = unserialize(base64_decode($field->module_path));
 
                 $field_module = $module;
                 $table_alias = $field_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$rel)];
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
@@ -980,54 +980,54 @@ 
 
                 $data = $field_module->field_defs[$field->field];
 
-                if($data['type'] == 'relate' && isset($data['id_name'])) {
+                if ($data['type'] == 'relate' && isset($data['id_name'])) {
                     $field->field = $data['id_name'];
                     $data_new = $field_module->field_defs[$field->field];
-                    if(isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])){
+                    if (isset($data_new['source']) && $data_new['source'] == 'non-db' && $data_new['type'] != 'link' && isset($data['link'])) {
                         $data_new['type'] = 'link';
                         $data_new['relationship'] = $data['link'];
                     }
                     $data = $data_new;
                 }
 
-                if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir,$data['relationship'])];
+                if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                    $new_field_module = new $beanList[getRelatedModule($field_module->module_dir, $data['relationship'])];
                     $table_alias = $data['relationship'];
-                    $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
+                    $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $field_module, 'relationship', $query, $new_field_module);
                     $field_module = $new_field_module;
                     $field->field = 'id';
                 }
 
-                if($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
-                    if((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
+                if ($data['type'] == 'currency' && isset($field_module->field_defs['currency_id'])) {
+                    if ((isset($field_module->field_defs['currency_id']['source']) && $field_module->field_defs['currency_id']['source'] == 'custom_fields')) {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias.'_cstm').".currency_id AS '".$table_alias."_currency_id'";
                     } else {
                         $query['select'][$table_alias.'_currency_id'] = $this->db->quoteIdentifier($table_alias).".currency_id AS '".$table_alias."_currency_id'";
                     }
                 }
 
-                if((isset($data['source']) && $data['source'] == 'custom_fields')) {
+                if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
                     $select_field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$field->field;
-                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm',$table_alias, $field_module, 'custom', $query);
+                    $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $table_alias, $field_module, 'custom', $query);
                 } else {
-                    $select_field= $this->db->quoteIdentifier($table_alias).'.'.$field->field;
+                    $select_field = $this->db->quoteIdentifier($table_alias).'.'.$field->field;
                 }
 
-                if($field->sort_by != ''){
+                if ($field->sort_by != '') {
                     $query['sort_by'][] = $select_field." ".$field->sort_by;
                 }
 
-                if($field->group_by == 1){
-                    $query['group_by'][] = $field->format ? str_replace('(%1)', '(' . $select_field . ')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
+                if ($field->group_by == 1) {
+                    $query['group_by'][] = $field->format ? str_replace('(%1)', '('.$select_field.')', preg_replace(array('/\s+/', '/Y/', '/m/', '/d/'), array(', ', 'YEAR(%1)', 'MONTH(%1)', 'DAY(%1)'), trim(preg_replace('/[^Ymd]/', ' ', $field->format)))) : $select_field;
                 }
 
-                if($field->field_function != null){
+                if ($field->field_function != null) {
                     $select_field = $field->field_function.'('.$select_field.')';
                 }
 
-                $query['select'][] = $select_field ." AS '".$field->label."'";
+                $query['select'][] = $select_field." AS '".$field->label."'";
 
-                if($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
+                if ($field->group_display == 1 && $group_value) $query['where'][] = $select_field." = '".$group_value."' AND ";
                     ++$i;
             }
         }
@@ -1035,30 +1035,30 @@ 
     }
 
 
-    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(),SugarBean $rel_module = null ){
+    function build_report_query_join($name, $alias, $parentAlias, SugarBean $module, $type, $query = array(), SugarBean $rel_module = null) {
 
-        if(!isset($query['join'][$alias])){
+        if (!isset($query['join'][$alias])) {
 
-            switch ($type){
+            switch ($type) {
                 case 'custom':
-                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '. $this->db->quoteIdentifier($name).'.id_c ';
+                    $query['join'][$alias] = 'LEFT JOIN '.$this->db->quoteIdentifier($module->get_custom_table_name()).' '.$this->db->quoteIdentifier($name).' ON '.$this->db->quoteIdentifier($parentAlias).'.id = '.$this->db->quoteIdentifier($name).'.id_c ';
                     break;
 
                 case 'relationship':
-                    if($module->load_relationship($name)){
+                    if ($module->load_relationship($name)) {
                         $params['join_type'] = 'LEFT JOIN';
-                        if($module->$name->relationship_type != 'one-to-many'){
-                            if($module->$name->getSide() == REL_LHS){
+                        if ($module->$name->relationship_type != 'one-to-many') {
+                            if ($module->$name->getSide() == REL_LHS) {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
-                            }else{
+                            } else {
                                 $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                                 $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                                 $params['left_join_table_alias'] = $this->db->quoteIdentifier($alias);
                             }
 
-                        }else{
+                        } else {
                             $params['right_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
                             $params['join_table_alias'] = $this->db->quoteIdentifier($alias);
                             $params['left_join_table_alias'] = $this->db->quoteIdentifier($parentAlias);
@@ -1067,7 +1067,7 @@ 
                         $params['join_table_link_alias'] = $this->db->quoteIdentifier($linkAlias);
                         $join = $module->$name->getJoin($params, true);
                         $query['join'][$alias] = $join['join'];
-                        if($rel_module != null) {
+                        if ($rel_module != null) {
                             $query['join'][$alias] .= $this->build_report_access_query($rel_module, $name);
                         }
                         $query['select'][] = $join['select']." AS '".$alias."_id'";
@@ -1082,11 +1082,11 @@ 
         return $query;
     }
 
-    function build_report_access_query(SugarBean $module, $alias){
+    function build_report_access_query(SugarBean $module, $alias) {
 
         $module->table_name = $alias;
         $where = '';
-        if($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list') )
+        if ($module->bean_implements('ACL') && ACLController::requireOwner($module->module_dir, 'list'))
         {
             global $current_user;
             $owner_where = $module->getOwnerWhere($current_user->id);
@@ -1094,18 +1094,18 @@ 
 
         }
 
-        if(file_exists('modules/SecurityGroups/SecurityGroup.php')){
+        if (file_exists('modules/SecurityGroups/SecurityGroup.php')) {
             /* BEGIN - SECURITY GROUPS */
-            if($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list') )
+            if ($module->bean_implements('ACL') && ACLController::requireSecurityGroup($module->module_dir, 'list'))
             {
                 require_once('modules/SecurityGroups/SecurityGroup.php');
                 global $current_user;
                 $owner_where = $module->getOwnerWhere($current_user->id);
-                $group_where = SecurityGroup::getGroupWhere($alias,$module->module_dir,$current_user->id);
-                if(!empty($owner_where)){
-                    $where .= " AND (".  $owner_where." or ".$group_where.") ";
+                $group_where = SecurityGroup::getGroupWhere($alias, $module->module_dir, $current_user->id);
+                if (!empty($owner_where)) {
+                    $where .= " AND (".$owner_where." or ".$group_where.") ";
                 } else {
-                    $where .= ' AND '.  $group_where;
+                    $where .= ' AND '.$group_where;
                 }
             }
             /* END - SECURITY GROUPS */
@@ -1118,16 +1118,16 @@ 
      * @param array $query
      * @return array
      */
-    function build_report_query_where($query = array()){
+    function build_report_query_where($query = array()) {
         global $beanList, $app_list_strings, $sugar_config;
 
         $closure = false;
-        if(!empty($query['where'])) {
+        if (!empty($query['where'])) {
             $query['where'][] = '(';
             $closure = true;
         }
 
-        if($beanList[$this->report_module]){
+        if ($beanList[$this->report_module]) {
             $module = new $beanList[$this->report_module]();
 
             $sql = "SELECT id FROM aor_conditions WHERE aor_report_id = '".$this->id."' AND deleted = 0 ORDER BY condition_order ASC";
@@ -1144,21 +1144,21 @@ 
                 $condition_module = $module;
                 $table_alias = $condition_module->table_name;
                 $oldAlias = $table_alias;
-                if(!empty($path[0]) && $path[0] != $module->module_dir){
-                    foreach($path as $rel){
-                        if(empty($rel)){
+                if (!empty($path[0]) && $path[0] != $module->module_dir) {
+                    foreach ($path as $rel) {
+                        if (empty($rel)) {
                             continue;
                         }
                         // Bug: Prevents relationships from loading.
                         //$rel = strtolower($rel);
-                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir,$rel)];
+                        $new_condition_module = new $beanList[getRelatedModule($condition_module->module_dir, $rel)];
                         $oldAlias = $table_alias;
                         $table_alias = $table_alias.":".$rel;
                         $query = $this->build_report_query_join($rel, $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_condition_module);
                         $condition_module = $new_condition_module;
                     }
                 }
-                if(isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
+                if (isset($app_list_strings['aor_sql_operator_list'][$condition->operator])) {
                     $where_set = false;
 
                     $data = $condition_module->field_defs[$condition->field];
@@ -1173,24 +1173,24 @@ 
                         $data = $data_new;
                     }
 
-                    if($data['type'] == 'link' && $data['source'] == 'non-db') {
-                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir,$data['relationship'])];
+                    if ($data['type'] == 'link' && $data['source'] == 'non-db') {
+                        $new_field_module = new $beanList[getRelatedModule($condition_module->module_dir, $data['relationship'])];
                         $table_alias = $data['relationship'];
-                        $query = $this->build_report_query_join($data['relationship'],$table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
+                        $query = $this->build_report_query_join($data['relationship'], $table_alias, $oldAlias, $condition_module, 'relationship', $query, $new_field_module);
                         $condition_module = $new_field_module;
 
                         // Debugging: security groups conditions - It's a hack to just get the query working
-                        if($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
+                        if ($condition_module->module_dir = 'SecurityGroups' && count($path) > 1) {
 //                            $table_alias = 'opportunities:assigned_user_link:SecurityGroups' ;
-                            $table_alias = $oldAlias. ':' .$rel;
+                            $table_alias = $oldAlias.':'.$rel;
                         }
                         $condition->field = 'id';
                     }
                     if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                        $field = $this->db->quoteIdentifier($table_alias . '_cstm') . '.' . $condition->field;
-                        $query = $this->build_report_query_join($table_alias . '_cstm', $table_alias . '_cstm', $oldAlias, $condition_module, 'custom', $query);
+                        $field = $this->db->quoteIdentifier($table_alias.'_cstm').'.'.$condition->field;
+                        $query = $this->build_report_query_join($table_alias.'_cstm', $table_alias.'_cstm', $oldAlias, $condition_module, 'custom', $query);
                     } else {
-                        $field = $this->db->quoteIdentifier($table_alias) . '.' . $condition->field;
+                        $field = $this->db->quoteIdentifier($table_alias).'.'.$condition->field;
                     }
 
                     if (!empty($this->user_parameters[$condition->id]) && $condition->parameter) {
@@ -1222,10 +1222,10 @@ 
                                 $condition->field = 'id';
                             }
                             if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                $value = $condition_module->table_name . '_cstm.' . $condition->value;
-                                $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                $value = $condition_module->table_name.'_cstm.'.$condition->value;
+                                $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                             } else {
-                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name) . '.' . $condition->value;
+                                $value = ($table_alias ? "`$table_alias`" : $condition_module->table_name).'.'.$condition->value;
                             }
                             break;
 
@@ -1237,10 +1237,10 @@ 
                                 } else {
                                     $value = 'NOW()';
                                 }
-                            } else if($params[0] == 'today'){
-                                if($sugar_config['dbconfig']['db_type'] == 'mssql'){
+                            } else if ($params[0] == 'today') {
+                                if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
                                     //$field =
-                                    $value  = 'CAST(GETDATE() AS DATE)';
+                                    $value = 'CAST(GETDATE() AS DATE)';
                                 } else {
                                     $field = 'DATE('.$field.')';
                                     $value = 'Curdate()';
@@ -1248,10 +1248,10 @@ 
                             } else {
                                 $data = $condition_module->field_defs[$params[0]];
                                 if ((isset($data['source']) && $data['source'] == 'custom_fields')) {
-                                    $value = $condition_module->table_name . '_cstm.' . $params[0];
-                                    $query = $this->build_report_query_join($condition_module->table_name . '_cstm', $table_alias . '_cstm', $table_alias, $condition_module, 'custom', $query);
+                                    $value = $condition_module->table_name.'_cstm.'.$params[0];
+                                    $query = $this->build_report_query_join($condition_module->table_name.'_cstm', $table_alias.'_cstm', $table_alias, $condition_module, 'custom', $query);
                                 } else {
-                                    $value = $condition_module->table_name . '.' . $params[0];
+                                    $value = $condition_module->table_name.'.'.$params[0];
                                 }
                             }
 
@@ -1262,9 +1262,9 @@ 
                                         $params[3] = 'hours';
                                     default:
                                         if ($sugar_config['dbconfig']['db_type'] == 'mssql') {
-                                            $value = "DATEADD(" . $params[3] . ",  " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2], $value)";
+                                            $value = "DATEADD(".$params[3].",  ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2], $value)";
                                         } else {
-                                            $value = "DATE_ADD($value, INTERVAL " . $app_list_strings['aor_date_operator'][$params[1]] . " $params[2] " . $params[3] . ")";
+                                            $value = "DATE_ADD($value, INTERVAL ".$app_list_strings['aor_date_operator'][$params[1]]." $params[2] ".$params[3].")";
                                         }
                                         break;
                                 }
@@ -1279,11 +1279,11 @@ 
                                 $value = '(';
                                 foreach ($multi_values as $multi_value) {
                                     if ($value != '(') $value .= $sep;
-                                    $value .= $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . " '" . $multi_value . "'";
+                                    $value .= $field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator]." '".$multi_value."'";
                                 }
                                 $value .= ')';
                             }
-                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $value;
+                            $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$value;
                             $where_set = true;
                             break;
                         case "Period":
@@ -1292,20 +1292,20 @@ 
                             } else {
                                 $params = base64_decode($condition->value);
                             }
-                            $value = '"' . getPeriodDate($params)->format('Y-m-d H:i:s') . '"';
+                            $value = '"'.getPeriodDate($params)->format('Y-m-d H:i:s').'"';
                             break;
                         case "CurrentUserID":
                             global $current_user;
-                            $value = '"' . $current_user->id . '"';
+                            $value = '"'.$current_user->id.'"';
                             break;
                         case 'Value':
                         default:
-                            $value = "'" . $this->db->quote($condition->value) . "'";
+                            $value = "'".$this->db->quote($condition->value)."'";
                             break;
                     }
 
                     //handle like conditions
-                    Switch($condition->operator) {
+                    Switch ($condition->operator) {
                         case 'Contains':
                             $value = "CONCAT('%', ".$value." ,'%')";
                             break;
@@ -1317,17 +1317,17 @@ 
                             break;
                     }
 
-                    if($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
+                    if ($condition->value_type == 'Value' && !$condition->value && $condition->operator == 'Equal_To') {
                         $value = "{$value} OR {$field} IS NULL";
                     }
 
-                    if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ': 'AND ')) . $field . ' ' . $app_list_strings['aor_sql_operator_list'][$condition->operator] . ' ' . $value;
+                    if (!$where_set) $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).$field.' '.$app_list_strings['aor_sql_operator_list'][$condition->operator].' '.$value;
 
                     $tiltLogicOp = false;
                 }
-                else if($condition->parenthesis) {
-                    if($condition->parenthesis == 'START') {
-                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op . ' ' : 'AND ')) .  '(';
+                else if ($condition->parenthesis) {
+                    if ($condition->parenthesis == 'START') {
+                        $query['where'][] = ($tiltLogicOp ? '' : ($condition->logic_op ? $condition->logic_op.' ' : 'AND ')).'(';
                         $tiltLogicOp = true;
                     }
                     else {
@@ -1341,7 +1341,7 @@ 
 
             }
 
-            if(isset($query['where']) && $query['where']) {
+            if (isset($query['where']) && $query['where']) {
                 array_unshift($query['where'], '(');
                 $query['where'][] = ') AND ';
             }
@@ -1349,7 +1349,7 @@ 
 
         }
 
-        if($closure) {
+        if ($closure) {
             $query['where'][] = ')';
         }
 

modules/AOR_Conditions/AOR_Condition.php

Spacing +13 added lines, -13 removed lines

@@ -79,40 +79,40 @@
 
         require_once('modules/AOW_WorkFlow/aow_utils.php');
 
-        $line_count = count($post_data[$key . 'field']);
+        $line_count = count($post_data[$key.'field']);
         $j = 0;
         for ($i = 0; $i < $line_count; ++$i) {
 
-            if ($post_data[$key . 'deleted'][$i] == 1) {
-                $this->mark_deleted($post_data[$key . 'id'][$i]);
+            if ($post_data[$key.'deleted'][$i] == 1) {
+                $this->mark_deleted($post_data[$key.'id'][$i]);
             } else {
                 $condition = new AOR_Condition();
                 foreach ($this->field_defs as $field_def) {
                     $field_name = $field_def['name'];
-                    if (isset($post_data[$key . $field_name][$i])) {
-                        if (is_array($post_data[$key . $field_name][$i])) {
+                    if (isset($post_data[$key.$field_name][$i])) {
+                        if (is_array($post_data[$key.$field_name][$i])) {
 
                             switch ($condition->value_type) {
                                 case 'Date':
-                                    $post_data[$key . $field_name][$i] = base64_encode(serialize($post_data[$key . $field_name][$i]));
+                                    $post_data[$key.$field_name][$i] = base64_encode(serialize($post_data[$key.$field_name][$i]));
                                     break;
                                 default:
-                                    $post_data[$key . $field_name][$i] = encodeMultienumValue($post_data[$key . $field_name][$i]);
+                                    $post_data[$key.$field_name][$i] = encodeMultienumValue($post_data[$key.$field_name][$i]);
                             }
-                        } else if ($field_name == 'value' && $post_data[$key . 'value_type'][$i] === 'Value') {
-                            $post_data[$key . $field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key . $field_name][$i]);
+                        } else if ($field_name == 'value' && $post_data[$key.'value_type'][$i] === 'Value') {
+                            $post_data[$key.$field_name][$i] = fixUpFormatting($_REQUEST['report_module'], $condition->field, $post_data[$key.$field_name][$i]);
                         } else if ($field_name == 'parameter') {
-                            $post_data[$key . $field_name][$i] = isset($post_data[$key . $field_name][$i]);
+                            $post_data[$key.$field_name][$i] = isset($post_data[$key.$field_name][$i]);
                         } else if ($field_name == 'module_path') {
-                            $post_data[$key . $field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key . $field_name][$i])));
+                            $post_data[$key.$field_name][$i] = base64_encode(serialize(explode(":", $post_data[$key.$field_name][$i])));
                         }
-                        if ($field_name == 'parenthesis' && $post_data[$key . $field_name][$i] == 'END') {
+                        if ($field_name == 'parenthesis' && $post_data[$key.$field_name][$i] == 'END') {
                             if (!isset($lastParenthesisStartConditionId)) {
                                 throw new Exception('a closure parenthesis has no starter pair');
                             }
                             $condition->parenthesis = $lastParenthesisStartConditionId;
                         } else {
-                            $condition->$field_name = $post_data[$key . $field_name][$i];
+                            $condition->$field_name = $post_data[$key.$field_name][$i];
                         }
                     } else if ($field_name == 'parameter') {
                         $condition->$field_name = 0;

modules/AOR_Conditions/vardefs.php

Indentation +29 added lines, -29 removed lines

@@ -23,12 +23,12 @@ 
  */
 
 $dictionary['AOR_Condition'] = array(
-	'table'=>'aor_conditions',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
-  'aor_report_id' =>
-  array (
+    'table'=>'aor_conditions',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
+    'aor_report_id' =>
+    array (
     'required' => false,
     'name' => 'aor_report_id',
     'vname' => 'LBL_AOR_REPORT_ID',
@@ -45,9 +45,9 @@ 
     'merge_filter' => 'disabled',
     'len' => 36,
     'size' => '20',
-  ),
-  'condition_order' => 
-  array (
+    ),
+    'condition_order' => 
+    array (
     'required' => false,
     'name' => 'condition_order',
     'vname' => 'LBL_ORDER',
@@ -66,7 +66,7 @@ 
     'size' => '20',
     'enable_range_search' => false,
     'disable_num_format' => '',
-  ),
+    ),
         'logic_op' => array(
             'name' => 'logic_op',
             'vname' => 'LBL_LOGIC_OP',
@@ -78,15 +78,15 @@ 
             'vname' => 'LBL_PARENTHESIS',
             'type' => 'varchar',
         ),
-  'module_path' =>
-  array (
+    'module_path' =>
+    array (
     'name' => 'module_path',
     'type' => 'longtext',
     'vname' => 'LBL_MODULE_PATH',
     'isnull' => true,
-  ),
-  'field' => 
-  array (
+    ),
+    'field' => 
+    array (
     'required' => false,
     'name' => 'field',
     'vname' => 'LBL_FIELD',
@@ -106,9 +106,9 @@ 
     'options' => 'user_type_dom',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'operator' => 
-  array (
+    ),
+    'operator' => 
+    array (
     'required' => false,
     'name' => 'operator',
     'vname' => 'LBL_OPERATOR',
@@ -129,7 +129,7 @@ 
     'options' => 'aor_operator_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
+    ),
     'value_type' =>
     array (
     'required' => false,
@@ -152,9 +152,9 @@ 
     'options' => 'aor_condition_type_list',
     'studio' => 'visible',
     'dependency' => false,
-  ),
-  'value' => 
-  array (
+    ),
+    'value' => 
+    array (
     'required' => false,
     'name' => 'value',
     'vname' => 'LBL_VALUE',
@@ -171,7 +171,7 @@ 
     'merge_filter' => 'disabled',
     'len' => '255',
     'size' => '20',
-  ),
+    ),
         'parameter' =>
             array (
                 'required' => false,
@@ -190,17 +190,17 @@ 
                 'merge_filter' => 'disabled',
                 'studio' => 'visible',
             ),
-  'aor_reports' =>
-  array (
+    'aor_reports' =>
+    array (
     'name' => 'aor_reports',
     'type' => 'link',
     'relationship' => 'aor_report_aor_conditions',
     'module'=>'AOR_Reports',
     'bean_name'=>'AOR_Reports',
     'source'=>'non-db',
-  ),
+    ),
 ),
-	'relationships'=>array (
+    'relationships'=>array (
 ),
     'indices' => array(
         array(
@@ -209,8 +209,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-	'unified_search'=>true,
+    'optimistic_locking'=>true,
+    'unified_search'=>true,
 );
 
 if (!class_exists('VardefManager')){

modules/UpgradeWizard/end.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     if (file_exists($file)) {
         require_once $file;
         unset($GLOBALS['dictionary'][$bean]);
-        $focus = new $bean ();
+        $focus = new $bean();
         if (($focus instanceof SugarBean)) {
             if (!isset($repairedTables[$focus->table_name])) {
                 $sql = $GLOBALS['db']->repairTable($focus, true);
@@ -248,7 +248,7 @@ 
 $mod_strings = return_module_language($current_language, 'UpgradeWizard');
 $stop = false;
 
-$httpHost = $_SERVER['HTTP_HOST'];  // cn: 8472 - HTTP_HOST includes port in some cases
+$httpHost = $_SERVER['HTTP_HOST']; // cn: 8472 - HTTP_HOST includes port in some cases
 if ($colon = strpos($httpHost, ':')) {
     $httpHost = substr($httpHost, 0, $colon);
 }

modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.php

Spacing +29 added lines, -29 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.
@@ -59,8 +59,8 @@ 
     {
         $this->getSeedBean()->disable_row_level_security = false;
 
-        $campaigns = $this->getSeedBean()->get_full_list("","");
-        if ( $campaigns != null )
+        $campaigns = $this->getSeedBean()->get_full_list("", "");
+        if ($campaigns != null)
             foreach ($campaigns as $c)
                 $this->_searchFields['campaign_id']['options'][$c->id] = $c->name;
         else
@@ -77,10 +77,10 @@ 
         $rawData = $this->constructQuery(
             $GLOBALS['app_list_strings']['roi_type_dom'],
             $GLOBALS['app_list_strings']['roi_type_dom'],
-            $this->campaign_id[0],null,true,true,true,$this->id);
+            $this->campaign_id[0], null, true, true, true, $this->id);
 
         $currency_symbol = $GLOBALS['sugar_config']['default_currency_symbol'];
-        if ($GLOBALS['current_user']->getPreference('currency')){
+        if ($GLOBALS['current_user']->getPreference('currency')) {
 
             $currency = new Currency();
             $currency->retrieve($GLOBALS['current_user']->getPreference('currency'));
@@ -93,7 +93,7 @@ 
         $chartHeight    = 500;
         $autoRefresh = $this->processAutoRefresh();
 
-        $chartReadyData = $this->prepareChartData($rawData,$currency_symbol,$thousands_symbol);
+        $chartReadyData = $this->prepareChartData($rawData, $currency_symbol, $thousands_symbol);
 
         //$chartReadyData['data'] = [[1.1,2.2],[3.3,4.4]];
         $jsonData = json_encode($chartReadyData['data']);
@@ -107,7 +107,7 @@ 
         //$colours = "['red','blue','green','orange','yellow','pink']";
         $colours = "['#a6cee3','#1f78b4','#b2df8a','#33a02c','#fb9a99','#e31a1c','#fdbf6f','#ff7f00','#cab2d6','#6a3d9a','#ffff99','#b15928']";
 
-        if(!is_array($chartReadyData['data'])||count($chartReadyData['data']) < 1)
+        if (!is_array($chartReadyData['data']) || count($chartReadyData['data']) < 1)
         {
             return "<h3 class='noGraphDataPoints'>$this->noDataMessage</h3>";
         }
@@ -216,12 +216,12 @@ 
         //   return $this->getTitle('<div align="center"></div>') . '<div align="center">' . $returnStr . '</div>'. $this->processAutoRefresh();
     }
 
-    protected function constructQuery($datay= array(),$targets=array(),$campaign_id = null, $cache_file_name='a_file', $refresh=false,$marketing_id='',$is_dashlet=false,$dashlet_id='') {
+    protected function constructQuery($datay = array(), $targets = array(), $campaign_id = null, $cache_file_name = 'a_file', $refresh = false, $marketing_id = '', $is_dashlet = false, $dashlet_id = '') {
         //global $app_strings,$mod_strings, $current_module_strings, $charset, $lang, $app_list_strings, $current_language,$sugar_config;
         global $mod_strings;
 
-        $campaign_id = (int) $campaign_id;
-        if(!$campaign_id) {
+        $campaign_id = (int)$campaign_id;
+        if (!$campaign_id) {
             $GLOBALS['log']->debug('roi chart need a campaign id');
             return false;
         }
@@ -232,18 +232,18 @@ 
 
         $focus = new Campaign();
         $focus->retrieve($campaign_id);
-        $opp_count=0;
-        $opp_query  = "select count(*) opp_count,sum(" . db_convert("amount_usdollar","IFNULL",array(0)).")  total_value";
+        $opp_count = 0;
+        $opp_query  = "select count(*) opp_count,sum(".db_convert("amount_usdollar", "IFNULL", array(0)).")  total_value";
         $opp_query .= " from opportunities";
         $opp_query .= " where campaign_id='$campaign_id'";
         $opp_query .= " and sales_stage='Prospecting'";
         $opp_query .= " and deleted=0";
 
-        $opp_result=$focus->db->query($opp_query);
-        $opp_data=$focus->db->fetchByAssoc($opp_result);
-        if (empty($opp_data['total_value'])) $opp_data['total_value']=0;
+        $opp_result = $focus->db->query($opp_query);
+        $opp_data = $focus->db->fetchByAssoc($opp_result);
+        if (empty($opp_data['total_value'])) $opp_data['total_value'] = 0;
 
-        $chartData['Total Value']= $opp_data['total_value'];
+        $chartData['Total Value'] = $opp_data['total_value'];
 
         //report query
         $opp_query1  = "select SUM(opp.amount) as revenue";
@@ -252,28 +252,28 @@ 
         $opp_query1 .= " where opp.sales_stage = 'Closed Won'and camp.id='$campaign_id' and opp.deleted=0";
         $opp_query1 .= " group by camp.name";
 
-        $opp_result1=$focus->db->query($opp_query1);
-        $opp_data1=$focus->db->fetchByAssoc($opp_result1);
+        $opp_result1 = $focus->db->query($opp_query1);
+        $opp_data1 = $focus->db->fetchByAssoc($opp_result1);
 
         //if (empty($opp_data1[]))
-        if (empty($opp_data1['revenue'])){
+        if (empty($opp_data1['revenue'])) {
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = 0;
             unset($opp_data1['revenue']);
-        }else{
+        } else {
             $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']] = $opp_data1['revenue'];
             unset($opp_data1['revenue']);
             $not_empty = true;
         }
 
-        $chartData['Revenue']= $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']];
+        $chartData['Revenue'] = $opp_data1[$mod_strings['LBL_ROI_CHART_REVENUE']];
 
         $camp_query1  = "select camp.name, SUM(camp.actual_cost) as investment,SUM(camp.budget) as budget,SUM(camp.expected_revenue) as expected_revenue";
         $camp_query1 .= " from campaigns camp";
         $camp_query1 .= " where camp.id='$campaign_id'";
         $camp_query1 .= " group by camp.name";
 
-        $camp_result1=$focus->db->query($camp_query1);
-        $camp_data1=$focus->db->fetchByAssoc($camp_result1);
+        $camp_result1 = $focus->db->query($camp_query1);
+        $camp_data1 = $focus->db->fetchByAssoc($camp_result1);
 
 
         if (empty($camp_data1['investment']))
@@ -289,9 +289,9 @@ 
         else
             $not_empty = true;
 
-        $chartData['Investment']= $camp_data1['investment'];
-        $chartData['Budget']= $camp_data1['budget'];
-        $chartData['Expected Revenue']= $camp_data1['expected_revenue'];
+        $chartData['Investment'] = $camp_data1['investment'];
+        $chartData['Budget'] = $camp_data1['budget'];
+        $chartData['Expected Revenue'] = $camp_data1['expected_revenue'];
 
         /*
             $opp_data1[$mod_strings['LBL_ROI_CHART_INVESTMENT']]=$camp_data1['investment'];
@@ -313,16 +313,16 @@ 
         return $chartData;
     }
 
-    protected function prepareChartData($data,$currency_symbol, $thousands_symbol)
+    protected function prepareChartData($data, $currency_symbol, $thousands_symbol)
     {
         //Use the  lead_source to categorise the data for the charts
         $chart['labels'] = array();
         $chart['data'] = array();
         //Need to add all elements into the key, as they are stacked (even though the category is not present, the value could be)
         $chart['key'] = array();
-        $chart['tooltips']= array();
+        $chart['tooltips'] = array();
 
-        foreach($data as $key=>$value)
+        foreach ($data as $key=>$value)
         {
             $formattedFloat = (float)number_format((float)$value, 2, '.', '');
             $chart['labels'][] = $key;