adamjakab / SuiteCRM

modules/Import/maps/ImportMapOther.php

Indentation +12 added lines, -12 removed lines

@@ -47,11 +47,11 @@ 
 
 class ImportMapOther
 {
-	/**
+    /**
      * String identifier for this import
      */
     public $name = 'other';
-	/**
+    /**
      * Field delimiter
      */
     public $delimiter;
@@ -59,18 +59,18 @@ 
      * Field enclosure
      */
     public $enclosure;
-	/**
+    /**
      * Do we have a header?
      */
     public $has_header = true;
 
-	/**
+    /**
      * Gets the default mapping for a module
      *
      * @param  string $module
      * @return array field mappings
      */
-	public function getMapping(
+    public function getMapping(
         $module
         )
     {
@@ -142,18 +142,18 @@ 
         }
     }
 	
-	/**
+    /**
      * Returns a list of fields that should be ignorred for the module during import
      *
      * @param  string $module
      * @return array of fields to ignor
      */
-	public function getIgnoredFields(
-		$module
-		)
-	{
-		return array();
-	}
+    public function getIgnoredFields(
+        $module
+        )
+    {
+        return array();
+    }
 }
 
 

Switch Indentation +64 added lines, -64 removed lines

@@ -75,70 +75,70 @@
         )
     {
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return array(
-                "Salutation"=>"salutation",
-                "Full Name"=>"full_name",
-                "Company"=>"company",
-                "First Name"=>"first_name",
-                "Last Name"=>"last_name",
-                "Title"=>"title",
-                "Department"=>"department",
-                "Birthday"=>"birthdate",
-                "Home Phone"=>"phone_home",
-                "Mobile Phone"=>"phone_mobile",
-                "Business Phone"=>"phone_work",
-                "Other Phone"=>"phone_other",
-                "Business Fax"=>"phone_fax",
-                "E-mail Address"=>"email1",
-                "E-mail 2"=>"email2",
-                "Assistant's Name"=>"assistant",
-                "Assistant's Phone"=>"assistant_phone",
-                "Business Street"=>"primary_address_street",
-                "Business Street 2"=>"primary_address_street_2",
-                "Business Street 3"=>"primary_address_street_3",
-                "Business City"=>"primary_address_city",
-                "Business State"=>"primary_address_state",
-                "Business Postal Code"=>"primary_address_postalcode",
-                "Business Country/Region"=>"primary_address_country",
-                "Home Street"=>"alt_address_street",
-                "Home Street 2"=>"alt_address_street_2",
-                "Home Street 3"=>"alt_address_street_3",
-                "Home City"=>"alt_address_city",
-                "Home State"=>"alt_address_state",
-                "Home Postal Code"=>"alt_address_postalcode",
-                "Home Country/Region"=>"alt_address_country",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Company"=>"name",
-                "Business Street"=>"billing_address_street",
-                "Business City"=>"billing_address_city",
-                "Business State"=>"billing_address_state",
-                "Business Country"=>"billing_address_country",
-                "Business Postal Code"=>"billing_address_postalcode",
-                "Business Fax"=>"phone_fax",
-                "Company Main Phone"=>"phone_office",
-                "Web Page"=>"website",
-                );
-            break;
-        case 'Opportunities':
-            return array(
-                "Opportunity Name"=>"name" ,
-                "Type"=>"opportunity_type",
-                "Lead Source"=>"lead_source",
-                "Amount"=>"amount",
-                "Created Date"=>"date_entered",
-                "Close Date"=>"date_closed",
-                "Next Step"=>"next_step",
-                "Stage"=>"sales_stage",
-                "Probability (%)"=>"probability",
-                "Account Name"=>"account_name");
-            break;
-        default:
-            return array();
+            case 'Contacts':
+            case 'Leads':
+                return array(
+                    "Salutation"=>"salutation",
+                    "Full Name"=>"full_name",
+                    "Company"=>"company",
+                    "First Name"=>"first_name",
+                    "Last Name"=>"last_name",
+                    "Title"=>"title",
+                    "Department"=>"department",
+                    "Birthday"=>"birthdate",
+                    "Home Phone"=>"phone_home",
+                    "Mobile Phone"=>"phone_mobile",
+                    "Business Phone"=>"phone_work",
+                    "Other Phone"=>"phone_other",
+                    "Business Fax"=>"phone_fax",
+                    "E-mail Address"=>"email1",
+                    "E-mail 2"=>"email2",
+                    "Assistant's Name"=>"assistant",
+                    "Assistant's Phone"=>"assistant_phone",
+                    "Business Street"=>"primary_address_street",
+                    "Business Street 2"=>"primary_address_street_2",
+                    "Business Street 3"=>"primary_address_street_3",
+                    "Business City"=>"primary_address_city",
+                    "Business State"=>"primary_address_state",
+                    "Business Postal Code"=>"primary_address_postalcode",
+                    "Business Country/Region"=>"primary_address_country",
+                    "Home Street"=>"alt_address_street",
+                    "Home Street 2"=>"alt_address_street_2",
+                    "Home Street 3"=>"alt_address_street_3",
+                    "Home City"=>"alt_address_city",
+                    "Home State"=>"alt_address_state",
+                    "Home Postal Code"=>"alt_address_postalcode",
+                    "Home Country/Region"=>"alt_address_country",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Company"=>"name",
+                    "Business Street"=>"billing_address_street",
+                    "Business City"=>"billing_address_city",
+                    "Business State"=>"billing_address_state",
+                    "Business Country"=>"billing_address_country",
+                    "Business Postal Code"=>"billing_address_postalcode",
+                    "Business Fax"=>"phone_fax",
+                    "Company Main Phone"=>"phone_office",
+                    "Web Page"=>"website",
+                    );
+                break;
+            case 'Opportunities':
+                return array(
+                    "Opportunity Name"=>"name" ,
+                    "Type"=>"opportunity_type",
+                    "Lead Source"=>"lead_source",
+                    "Amount"=>"amount",
+                    "Created Date"=>"date_entered",
+                    "Close Date"=>"date_closed",
+                    "Next Step"=>"next_step",
+                    "Stage"=>"sales_stage",
+                    "Probability (%)"=>"probability",
+                    "Account Name"=>"account_name");
+                break;
+            default:
+                return array();
         }
     }
 	

Spacing +2 added lines, -2 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.
@@ -126,7 +126,7 @@ 
             break;
         case 'Opportunities':
             return array(
-                "Opportunity Name"=>"name" ,
+                "Opportunity Name"=>"name",
                 "Type"=>"opportunity_type",
                 "Lead Source"=>"lead_source",
                 "Amount"=>"amount",

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Import/maps/ImportMap.php

Indentation +13 added lines, -13 removed lines

@@ -175,19 +175,19 @@ 
      * @see SugarBean::retrieve()
      */
     public function retrieve($id = -1, $encode=true,$deleted=true)
-	{
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
+    {
+        $returnVal = parent::retrieve($id,$encode,$deleted);
 
-	    if ( !($returnVal instanceOf $this) ) {
-	        return $returnVal;
-	    }
+        if ( !($returnVal instanceOf $this) ) {
+            return $returnVal;
+        }
 
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
-	        $this->delimiter = "\t";
-	    }
+        if ( $this->source == 'tab' && $this->delimiter == '' ) {
+            $this->delimiter = "\t";
+        }
 
-	    return $this;
-	}
+        return $this;
+    }
 
     /**
      * Save
@@ -372,10 +372,10 @@ 
         //list of field values we track during import wizard
         $import_step_fields = array(
         //step1
-          //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
+            //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
         //step2
-           // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
-         //step3
+            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
+            //step3
             'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',

Spacing +38 added lines, -38 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.
@@ -107,11 +107,11 @@ 
     public function getMapping()
     {
         $mapping_arr = array();
-        if ( !empty($this->content) )
+        if (!empty($this->content))
         {
-            $pairs = explode("&",$this->content);
-            foreach ($pairs as $pair){
-                list($name,$value) = explode("=",$pair);
+            $pairs = explode("&", $this->content);
+            foreach ($pairs as $pair) {
+                list($name, $value) = explode("=", $pair);
                 $mapping_arr[trim($name)] = $value;
             }
         }
@@ -128,7 +128,7 @@ 
         $mapping_arr
         )
     {
-        $output = array ();
+        $output = array();
         foreach ($mapping_arr as $key => $item) {
             $output[] = "$key=$item";
         }
@@ -143,11 +143,11 @@ 
     public function getDefaultValues()
     {
         $defa_arr = array();
-        if ( !empty($this->default_values) )
+        if (!empty($this->default_values))
         {
-            $pairs = explode("&",$this->default_values);
-            foreach ($pairs as $pair){
-                list($name,$value) = explode("=",$pair);
+            $pairs = explode("&", $this->default_values);
+            foreach ($pairs as $pair) {
+                list($name, $value) = explode("=", $pair);
                 $defa_arr[trim($name)] = $value;
             }
         }
@@ -164,7 +164,7 @@ 
         $defa_arr
         )
     {
-        $output = array ();
+        $output = array();
         foreach ($defa_arr as $key => $item) {
             $output[] = "$key=$item";
         }
@@ -174,15 +174,15 @@ 
     /**
      * @see SugarBean::retrieve()
      */
-    public function retrieve($id = -1, $encode=true,$deleted=true)
+    public function retrieve($id = -1, $encode = true, $deleted = true)
 	{
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
+	    $returnVal = parent::retrieve($id, $encode, $deleted);
 
-	    if ( !($returnVal instanceOf $this) ) {
+	    if (!($returnVal instanceOf $this)) {
 	        return $returnVal;
 	    }
 
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
+	    if ($this->source == 'tab' && $this->delimiter == '') {
 	        $this->delimiter = "\t";
 	    }
 
@@ -227,7 +227,7 @@ 
 
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
         // it is an empty string, instead of as a null
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
+        if (strlen($enclosure) <= 0) $enclosure = ' ';
 
         $this->assigned_user_id = $owner_id;
         $this->name             = $name;
@@ -242,7 +242,7 @@ 
         parent::save();
 
         // Bug 29365 - The enclosure character isn't saved correctly if it's a tab using MssqlManager, so resave it
-        if ( $enclosure == '\\t' && $this->db instanceOf MssqlManager ) {
+        if ($enclosure == '\\t' && $this->db instanceOf MssqlManager) {
             $this->enclosure = $enclosure;
             parent::save();
         }
@@ -262,11 +262,11 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) ) {
+        if (!is_admin($current_user)) {
             $other_map = new ImportMap();
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
 
-            if ( $other_map->assigned_user_id != $current_user->id )
+            if ($other_map->assigned_user_id != $current_user->id)
                 return false;
         }
 
@@ -287,7 +287,7 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) )
+        if (!is_admin($current_user))
             return false;
 
         // check for problems
@@ -313,16 +313,16 @@ 
         $other_map->retrieve_by_string_fields($query_arr, false);
 
         // if we find this other map, quit
-        if ( isset($other_map->id) )
+        if (isset($other_map->id))
             return false;
 
         // otherwise update the is_published flag
         $query = "UPDATE $this->table_name
-                    SET is_published = '". ($flag?'yes':'no') . "',
+                    SET is_published = '".($flag ? 'yes' : 'no')."',
                         assigned_user_id = '$user_id'
                     WHERE id = '{$this->id}'";
 
-        $this->db->query($query,true,"Error marking import map published: ");
+        $this->db->query($query, true, "Error marking import map published: ");
 
         return true;
     }
@@ -339,21 +339,21 @@ 
     {
         $query = "SELECT *
                     FROM {$this->table_name}
-                    " . $this->get_where($fields_array);
+                    ".$this->get_where($fields_array);
 
-        $result = $this->db->query($query,true," Error: ");
+        $result = $this->db->query($query, true, " Error: ");
         $obj_arr = array();
 
-        while ($row = $this->db->fetchByAssoc($result,FALSE) ) {
+        while ($row = $this->db->fetchByAssoc($result, FALSE)) {
             $focus = new ImportMap();
 
-            foreach($this->column_fields as $field) {
-                if(isset($row[$field])) {
+            foreach ($this->column_fields as $field) {
+                if (isset($row[$field])) {
                     $focus->$field = $row[$field];
                 }
             }
             $focus->fill_in_additional_detail_fields();
-            $obj_arr[]=$focus;
+            $obj_arr[] = $focus;
         }
 
         return $obj_arr;
@@ -376,37 +376,37 @@ 
         //step2
            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
          //step3
-            'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
+            'display_tabs_def', 'custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',
         '   importlocale_default_locale_name_format');
 
         //retrieve user preferences and populate preference array
         $preference_values_str = $current_user->getPreference('field_values', 'import');
-        $preference_values = json_decode($preference_values_str,true);
+        $preference_values = json_decode($preference_values_str, true);
 
-        foreach ($import_step_fields as $val){
+        foreach ($import_step_fields as $val) {
             //overwrite preference array with new values from request if the value is different or new
-            if((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])){
+            if ((isset($_REQUEST[$val]) && !isset($preference_values[$val])) || (isset($_REQUEST[$val]) && $preference_values[$val] != $_REQUEST[$val])) {
                 $preference_values[$val] = $_REQUEST[$val];
                 $set = true;
             }
         }
 
         //force the values to passed in array if array is set
-        if(!empty($ForceValsArr) && is_array($ForceValsArr)){
-            foreach ($ForceValsArr as $forceKey=>$forceVal){
+        if (!empty($ForceValsArr) && is_array($ForceValsArr)) {
+            foreach ($ForceValsArr as $forceKey=>$forceVal) {
                 $preference_values[$forceKey] = $forceVal;
                 $set = true;
             }
         }
 
         //set preferences if any changes were made and return the new array
-        if($set){
-            $preference_values_str =  json_encode($preference_values);
+        if ($set) {
+            $preference_values_str = json_encode($preference_values);
             $current_user->setPreference('field_values', $preference_values_str, 0, 'import');
         }
-        if(empty($preference_values)){
+        if (empty($preference_values)) {
             return array();
         }
 

Braces +16 added lines, -10 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -227,7 +229,9 @@ 
 
         // Bug 23354 - Make sure enclosure gets saved as an empty string if
         // it is an empty string, instead of as a null
-        if ( strlen($enclosure) <= 0 ) $enclosure = ' ';
+        if ( strlen($enclosure) <= 0 ) {
+            $enclosure = ' ';
+        }
 
         $this->assigned_user_id = $owner_id;
         $this->name             = $name;
@@ -266,8 +270,9 @@ 
             $other_map = new ImportMap();
             $other_map->retrieve_by_string_fields(array('id'=> $id), false);
 
-            if ( $other_map->assigned_user_id != $current_user->id )
-                return false;
+            if ( $other_map->assigned_user_id != $current_user->id ) {
+                            return false;
+            }
         }
 
         return parent::mark_deleted($id);
@@ -287,8 +292,9 @@ 
     {
         global $current_user;
 
-        if ( !is_admin($current_user) )
-            return false;
+        if ( !is_admin($current_user) ) {
+                    return false;
+        }
 
         // check for problems
         if ($flag) {
@@ -299,8 +305,7 @@ 
                 'name'         =>$this->name,
                 'is_published' =>'yes'
                 );
-        }
-        else {
+        } else {
             // if you are trying to unpublish a map
             // but you own an unpublished map by the same name
             $query_arr = array(
@@ -313,8 +318,9 @@ 
         $other_map->retrieve_by_string_fields($query_arr, false);
 
         // if we find this other map, quit
-        if ( isset($other_map->id) )
-            return false;
+        if ( isset($other_map->id) ) {
+                    return false;
+        }
 
         // otherwise update the is_published flag
         $query = "UPDATE $this->table_name

modules/Import/ImportDuplicateCheck.php

Spacing +63 added lines, -63 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
@@ -56,7 +56,7 @@ 
     /*
      * holds current field when a duplicate has been found
      */
-    public $_dupedFields =array();
+    public $_dupedFields = array();
 
     /**
      * Constructor
@@ -78,18 +78,18 @@ 
         $indexes = $this->_focus->getIndices();
 
         //grab any custom indexes if they exist
-        if($this->_focus->hasCustomFields()){
+        if ($this->_focus->hasCustomFields()) {
             $custmIndexes = $this->_focus->db->helper->get_indices($this->_focus->table_name.'_cstm');
-            $indexes = array_merge($custmIndexes,$indexes);
+            $indexes = array_merge($custmIndexes, $indexes);
         }
 
-        if ( $this->_focus->getFieldDefinition('email1') )
+        if ($this->_focus->getFieldDefinition('email1'))
             $indexes[] = array(
                 'name' => 'special_idx_email1',
                 'type' => 'index',
                 'fields' => array('email1')
                 );
-        if ( $this->_focus->getFieldDefinition('email2') )
+        if ($this->_focus->getFieldDefinition('email2'))
             $indexes[] = array(
                 'name' => 'special_idx_email2',
                 'type' => 'index',
@@ -112,18 +112,18 @@ 
             );
 
         $index_array = array();
-        foreach ($this->_getIndexVardefs() as $index){
-            if ($index['type'] == "index"){
+        foreach ($this->_getIndexVardefs() as $index) {
+            if ($index['type'] == "index") {
                 $labelsArray = array();
-                foreach ($index['fields'] as $field){
+                foreach ($index['fields'] as $field) {
                     if ($field == 'deleted') continue;
                     $fieldDef = $this->_focus->getFieldDefinition($field);
-                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) )
+                    if (isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]))
                         $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
                     else
                         $labelsArray[$fieldDef['name']] = $fieldDef['name'];
                 }
-                $index_array[$index['name']] = str_replace(":", "",implode(", ",$labelsArray));
+                $index_array[$index['name']] = str_replace(":", "", implode(", ", $labelsArray));
             }
         }
 
@@ -138,21 +138,21 @@ 
      */
     public function isADuplicateRecordByFields($fieldList)
     {
-        foreach($fieldList as $field)
+        foreach ($fieldList as $field)
         {
-            if ( $field == 'email1' || $field == 'email2' )
+            if ($field == 'email1' || $field == 'email2')
             {
                 $emailAddress = new SugarEmailAddress();
                 $email = $field;
-                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 )
+                if ($emailAddress->getCountEmailAddressByBean($this->_focus->$email, $this->_focus, ($field == 'email1')) > 0)
                     return true;
             }
             else
             {
                 $index_fields = array('deleted' => '0');
-                if( is_array($field) )
+                if (is_array($field))
                 {
-                    foreach($field as $tmpField)
+                    foreach ($field as $tmpField)
                     {
                         if ($tmpField == 'deleted')
                             continue;
@@ -160,16 +160,16 @@ 
                             $index_fields[$tmpField] = $this->_focus->$tmpField;
                     }
                 }
-                elseif($field != 'deleted' && strlen($this->_focus->$field) > 0)
+                elseif ($field != 'deleted' && strlen($this->_focus->$field) > 0)
                     $index_fields[$field] = $this->_focus->$field;
 
-                if ( count($index_fields) <= 1 )
+                if (count($index_fields) <= 1)
                     continue;
 
                 $newfocus = loadBean($this->_focus->module_dir);
-                $result = $newfocus->retrieve_by_string_fields($index_fields,true);
+                $result = $newfocus->retrieve_by_string_fields($index_fields, true);
 
-                if ( !is_null($result) )
+                if (!is_null($result))
                     return true;
             }
         }
@@ -183,15 +183,15 @@ 
      * @param  array $indexlist
      * @return bool true if this bean is a duplicate or false if it isn't
      */
-    public function isADuplicateRecord( $indexlist )
+    public function isADuplicateRecord($indexlist)
     {
         // Bug #51264 : Importing updates to rows prevented by duplicates check
-        if ( !empty($this->_focus) && ($this->_focus instanceof SugarBean) && !empty($this->_focus->id) )
+        if (!empty($this->_focus) && ($this->_focus instanceof SugarBean) && !empty($this->_focus->id))
         {
             $_focus = clone $this->_focus;
             $_focus->id = null;
             $_focus->retrieve($this->_focus->id);
-            if ( !empty($_focus->id) )
+            if (!empty($_focus->id))
             {
                 return false;
             }
@@ -200,20 +200,20 @@ 
 
         //lets strip the indexes of the name field in the value and leave only the index name
         $origIndexList = $indexlist;
-        $indexlist=array();
-        $fieldlist=array();
-        $customIndexlist=array();
-        foreach($origIndexList as $iv){
-            if(empty($iv)) continue;
-            $field_index_array = explode('::',$iv);
-            if($field_index_array[0] == 'customfield'){
+        $indexlist = array();
+        $fieldlist = array();
+        $customIndexlist = array();
+        foreach ($origIndexList as $iv) {
+            if (empty($iv)) continue;
+            $field_index_array = explode('::', $iv);
+            if ($field_index_array[0] == 'customfield') {
                 //this is a custom field, so place in custom array
                 $customIndexlist[] = $field_index_array[1];
 
-            }else{
+            } else {
                 //this is not a custom field, so place in index list
                 $indexlist[] = $field_index_array[0];
-                if(isset($field_index_array[1])) {
+                if (isset($field_index_array[1])) {
                     $fieldlist[] = $field_index_array[1];
                 }
             }
@@ -221,11 +221,11 @@ 
 
         //if full_name is set, then manually search on the first and last name fields before iterating through rest of fields
         //this is a special handling of the name fields on people objects, the rest of the fields are checked individually
-        if(in_array('full_name',$indexlist)){
+        if (in_array('full_name', $indexlist)) {
             $newfocus = loadBean($this->_focus->module_dir);
-            $result = $newfocus->retrieve_by_string_fields(array('deleted' =>'0', 'first_name'=>$this->_focus->first_name, 'last_name'=>$this->_focus->last_name),true);
+            $result = $newfocus->retrieve_by_string_fields(array('deleted' =>'0', 'first_name'=>$this->_focus->first_name, 'last_name'=>$this->_focus->last_name), true);
 
-            if ( !is_null($result) ){
+            if (!is_null($result)) {
                 //set dupe field to full_name and name fields
                 $this->_dupedFields[] = 'full_name';
                 $this->_dupedFields[] = 'first_name';
@@ -235,61 +235,61 @@ 
         }
 
         // loop through var def indexes and compare with selected indexes
-        foreach ($this->_getIndexVardefs() as $index){
+        foreach ($this->_getIndexVardefs() as $index) {
             // if we get an index not in the indexlist, loop
-            if ( !in_array($index['name'],$indexlist) )
+            if (!in_array($index['name'], $indexlist))
                 continue;
 
             // This handles the special case of duplicate email checking
-            if ( $index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2' ) {
+            if ($index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2') {
                 $emailAddress = new SugarEmailAddress();
                 $email = $index['fields'][0];
-                if ( $emailAddress->getCountEmailAddressByBean(
+                if ($emailAddress->getCountEmailAddressByBean(
                         $this->_focus->$email,
                         $this->_focus,
                         ($index['name'] == 'special_idx_email1')
-                        ) > 0 ){ foreach($index['fields'] as $field){
-                        if($field !='deleted')
+                        ) > 0) { foreach ($index['fields'] as $field) {
+                        if ($field != 'deleted')
                             $this->_dupedFields[] = $field;
                     }
                 }
             }
             // Adds a hook so you can define a method in the bean to handle dupe checking
-            elseif ( isset($index['dupeCheckFunction']) ) {
-                $functionName = substr_replace($index['dupeCheckFunction'],'',0,9);
-                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true)
+            elseif (isset($index['dupeCheckFunction'])) {
+                $functionName = substr_replace($index['dupeCheckFunction'], '', 0, 9);
+                if (method_exists($this->_focus, $functionName) && $this->_focus->$functionName($index) === true)
                     return $this->_focus->$functionName($index);
             }
             else {
                 $index_fields = array('deleted' => '0');
                 //search only for the field we have selected
-                foreach($index['fields'] as $field){
-                    if ($field == 'deleted' ||  !in_array($field,$fieldlist))
+                foreach ($index['fields'] as $field) {
+                    if ($field == 'deleted' || !in_array($field, $fieldlist))
                         continue;
-                    if (!in_array($field,$index_fields))
+                    if (!in_array($field, $index_fields))
                         if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
                             $index_fields[$field] = $this->_focus->$field;
                 }
 
                 // if there are no valid fields in the index field list, loop
-                if ( count($index_fields) <= 1 )
+                if (count($index_fields) <= 1)
                     continue;
 
                 $newfocus = loadBean($this->_focus->module_dir);
-                $result = $newfocus->retrieve_by_string_fields($index_fields,true);
+                $result = $newfocus->retrieve_by_string_fields($index_fields, true);
 
-                if ( !is_null($result) ){
+                if (!is_null($result)) {
                     //remove deleted as a duped field
                     unset($index_fields['deleted']);
 
                     //create string based on array of dupe fields
-                    $this->_dupedFields = array_merge(array_keys($index_fields),$this->_dupedFields);
+                    $this->_dupedFields = array_merge(array_keys($index_fields), $this->_dupedFields);
                 }
             }
         }
 
         //return true if any dupes were found
-        if(!empty($this->_dupedFields)){
+        if (!empty($this->_dupedFields)) {
             return true;
         }
 
@@ -301,33 +301,33 @@ 
     {
         require_once('include/export_utils.php');
         $import_fields = $this->_focus->get_importable_fields();
-        $importable_keys = array_keys($import_fields);//
+        $importable_keys = array_keys($import_fields); //
 
         $index_array = array();
         $fields_used = array();
-        $mstr_exclude_array = array('all'=>array('team_set_id','id','deleted'),'contacts'=>array('email2'), array('leads'=>'reports_to_id'), array('prospects'=>'tracker_key'));
+        $mstr_exclude_array = array('all'=>array('team_set_id', 'id', 'deleted'), 'contacts'=>array('email2'), array('leads'=>'reports_to_id'), array('prospects'=>'tracker_key'));
 
         //create exclude array from subset of applicable mstr_exclude_array elements
-        $exclude_array =  isset($mstr_exclude_array[strtolower($this->_focus->module_dir)])?array_merge($mstr_exclude_array[strtolower($this->_focus->module_dir)], $mstr_exclude_array['all']) : $mstr_exclude_array['all'];
+        $exclude_array = isset($mstr_exclude_array[strtolower($this->_focus->module_dir)]) ? array_merge($mstr_exclude_array[strtolower($this->_focus->module_dir)], $mstr_exclude_array['all']) : $mstr_exclude_array['all'];
 
 
 
         //process all fields belonging to indexes
-        foreach ($this->_getIndexVardefs() as $index){
-            if ($index['type'] == "index"){
+        foreach ($this->_getIndexVardefs() as $index) {
+            if ($index['type'] == "index") {
 
-                foreach ($index['fields'] as $field){
-                    $fieldName='';
+                foreach ($index['fields'] as $field) {
+                    $fieldName = '';
 
                     //skip this field if it is the deleted field, not in the importable keys array, or a field in the exclude array
                     if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) continue;
                     $fieldDef = $this->_focus->getFieldDefinition($field);
 
                     //skip if this field is already defined (from another index)
-                    if (in_array($fieldDef['name'],$fields_used)) continue;
+                    if (in_array($fieldDef['name'], $fields_used)) continue;
 
                     //get the proper export label
-                    $fieldName = translateForExport($fieldDef['name'],$this->_focus);
+                    $fieldName = translateForExport($fieldDef['name'], $this->_focus);
 
 
                     $index_array[$index['name'].'::'.$fieldDef['name']] = $fieldName;
@@ -338,9 +338,9 @@ 
         }
 
         //special handling for beans with first_name and last_name
-        if(in_array('first_name', $fields_used) && in_array('last_name', $fields_used)){
+        if (in_array('first_name', $fields_used) && in_array('last_name', $fields_used)) {
             //since both full name and last name fields have been mapped, add full name index
-            $index_array['full_name::full_name'] = translateForExport('full_name',$this->_focus);
+            $index_array['full_name::full_name'] = translateForExport('full_name', $this->_focus);
             $fields_used[] = 'full_name';
         }
 

Braces +64 added lines, -42 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
@@ -83,18 +85,20 @@ 
             $indexes = array_merge($custmIndexes,$indexes);
         }
 
-        if ( $this->_focus->getFieldDefinition('email1') )
-            $indexes[] = array(
+        if ( $this->_focus->getFieldDefinition('email1') ) {
+                    $indexes[] = array(
                 'name' => 'special_idx_email1',
                 'type' => 'index',
                 'fields' => array('email1')
                 );
-        if ( $this->_focus->getFieldDefinition('email2') )
-            $indexes[] = array(
+        }
+        if ( $this->_focus->getFieldDefinition('email2') ) {
+                    $indexes[] = array(
                 'name' => 'special_idx_email2',
                 'type' => 'index',
                 'fields' => array('email2')
                 );
+        }
 
         return $indexes;
     }
@@ -116,12 +120,15 @@ 
             if ($index['type'] == "index"){
                 $labelsArray = array();
                 foreach ($index['fields'] as $field){
-                    if ($field == 'deleted') continue;
+                    if ($field == 'deleted') {
+                        continue;
+                    }
                     $fieldDef = $this->_focus->getFieldDefinition($field);
-                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) )
-                        $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
-                    else
-                        $labelsArray[$fieldDef['name']] = $fieldDef['name'];
+                    if ( isset($fieldDef['vname']) && isset($super_language_pack[$fieldDef['vname']]) ) {
+                                            $labelsArray[$fieldDef['name']] = $super_language_pack[$fieldDef['vname']];
+                    } else {
+                                            $labelsArray[$fieldDef['name']] = $fieldDef['name'];
+                    }
                 }
                 $index_array[$index['name']] = str_replace(":", "",implode(", ",$labelsArray));
             }
@@ -144,33 +151,37 @@ 
             {
                 $emailAddress = new SugarEmailAddress();
                 $email = $field;
-                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 )
-                    return true;
-            }
-            else
+                if ( $emailAddress->getCountEmailAddressByBean($this->_focus->$email,$this->_focus,($field == 'email1')) > 0 ) {
+                                    return true;
+                }
+            } else
             {
                 $index_fields = array('deleted' => '0');
                 if( is_array($field) )
                 {
                     foreach($field as $tmpField)
                     {
-                        if ($tmpField == 'deleted')
-                            continue;
-                        if (strlen($this->_focus->$tmpField) > 0)
-                            $index_fields[$tmpField] = $this->_focus->$tmpField;
+                        if ($tmpField == 'deleted') {
+                                                    continue;
+                        }
+                        if (strlen($this->_focus->$tmpField) > 0) {
+                                                    $index_fields[$tmpField] = $this->_focus->$tmpField;
+                        }
                     }
+                } elseif($field != 'deleted' && strlen($this->_focus->$field) > 0) {
+                                    $index_fields[$field] = $this->_focus->$field;
                 }
-                elseif($field != 'deleted' && strlen($this->_focus->$field) > 0)
-                    $index_fields[$field] = $this->_focus->$field;
 
-                if ( count($index_fields) <= 1 )
-                    continue;
+                if ( count($index_fields) <= 1 ) {
+                                    continue;
+                }
 
                 $newfocus = loadBean($this->_focus->module_dir);
                 $result = $newfocus->retrieve_by_string_fields($index_fields,true);
 
-                if ( !is_null($result) )
-                    return true;
+                if ( !is_null($result) ) {
+                                    return true;
+                }
             }
         }
 
@@ -204,13 +215,15 @@ 
         $fieldlist=array();
         $customIndexlist=array();
         foreach($origIndexList as $iv){
-            if(empty($iv)) continue;
+            if(empty($iv)) {
+                continue;
+            }
             $field_index_array = explode('::',$iv);
             if($field_index_array[0] == 'customfield'){
                 //this is a custom field, so place in custom array
                 $customIndexlist[] = $field_index_array[1];
 
-            }else{
+            } else{
                 //this is not a custom field, so place in index list
                 $indexlist[] = $field_index_array[0];
                 if(isset($field_index_array[1])) {
@@ -237,8 +250,9 @@ 
         // loop through var def indexes and compare with selected indexes
         foreach ($this->_getIndexVardefs() as $index){
             // if we get an index not in the indexlist, loop
-            if ( !in_array($index['name'],$indexlist) )
-                continue;
+            if ( !in_array($index['name'],$indexlist) ) {
+                            continue;
+            }
 
             // This handles the special case of duplicate email checking
             if ( $index['name'] == 'special_idx_email1' || $index['name'] == 'special_idx_email2' ) {
@@ -249,31 +263,35 @@ 
                         $this->_focus,
                         ($index['name'] == 'special_idx_email1')
                         ) > 0 ){ foreach($index['fields'] as $field){
-                        if($field !='deleted')
-                            $this->_dupedFields[] = $field;
+                        if($field !='deleted') {
+                                                    $this->_dupedFields[] = $field;
+                        }
                     }
                 }
             }
             // Adds a hook so you can define a method in the bean to handle dupe checking
             elseif ( isset($index['dupeCheckFunction']) ) {
                 $functionName = substr_replace($index['dupeCheckFunction'],'',0,9);
-                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true)
-                    return $this->_focus->$functionName($index);
-            }
-            else {
+                if ( method_exists($this->_focus,$functionName) && $this->_focus->$functionName($index) === true) {
+                                    return $this->_focus->$functionName($index);
+                }
+            } else {
                 $index_fields = array('deleted' => '0');
                 //search only for the field we have selected
                 foreach($index['fields'] as $field){
-                    if ($field == 'deleted' ||  !in_array($field,$fieldlist))
-                        continue;
-                    if (!in_array($field,$index_fields))
-                        if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
+                    if ($field == 'deleted' ||  !in_array($field,$fieldlist)) {
+                                            continue;
+                    }
+                    if (!in_array($field,$index_fields)) {
+                                            if (isset($this->_focus->$field) && strlen($this->_focus->$field) > 0)
                             $index_fields[$field] = $this->_focus->$field;
+                    }
                 }
 
                 // if there are no valid fields in the index field list, loop
-                if ( count($index_fields) <= 1 )
-                    continue;
+                if ( count($index_fields) <= 1 ) {
+                                    continue;
+                }
 
                 $newfocus = loadBean($this->_focus->module_dir);
                 $result = $newfocus->retrieve_by_string_fields($index_fields,true);
@@ -320,11 +338,15 @@ 
                     $fieldName='';
 
                     //skip this field if it is the deleted field, not in the importable keys array, or a field in the exclude array
-                    if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) continue;
+                    if (!in_array($field, $importable_keys) || in_array($field, $exclude_array)) {
+                        continue;
+                    }
                     $fieldDef = $this->_focus->getFieldDefinition($field);
 
                     //skip if this field is already defined (from another index)
-                    if (in_array($fieldDef['name'],$fields_used)) continue;
+                    if (in_array($fieldDef['name'],$fields_used)) {
+                        continue;
+                    }
 
                     //get the proper export label
                     $fieldName = translateForExport($fieldDef['name'],$this->_focus);

modules/Cases/vardefs.php

Spacing +1 added lines, -1 removed lines

@@ -245,7 +245,7 @@
             array(
                 'name' => 'emails',
                 'type' => 'link',
-                'relationship' => 'emails_cases_rel',/* reldef in emails */
+                'relationship' => 'emails_cases_rel', /* reldef in emails */
                 'source' => 'non-db',
                 'vname' => 'LBL_EMAILS',
             ),

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Cases/metadata/accountsquickcreatedefs.php

Indentation +13 added lines, -13 removed lines

@@ -40,39 +40,39 @@
 $viewdefs['Cases']['AccountsQuickCreate'] = array(
 'templateMeta' => array('form' => 
                             array (
-                              'hidden' => 
-                              array (
+                                'hidden' => 
+                                array (
                                 0 => '<input type="hidden" name="account_id" value="{$smarty.request.account_id}">',
                                 1 => '<input type="hidden" name="account_name" value="{$smarty.request.account_name}">',
-                              ),
+                                ),
                             ),
                         'maxColumns' => '2', 
                         'widths' => array(
                                         array('label' => '10', 'field' => '30'), 
                                         array('label' => '10', 'field' => '30')
                                         ),
-                       ),
+                        ),
 'panels' =>
 
 array (
   
-  array (
+    array (
     array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
     'priority'
-  ),
+    ),
   
-  array (
+    array (
     'status',
     array('name'=>'account_name', 'type'=>'readonly'),
-  ),
+    ),
   
-  array (
     array (
-      'name' => 'description',
-      'displayParams' => array ('rows' => '4','cols' => '60'),
-      'nl2br' => true,
+    array (
+        'name' => 'description',
+        'displayParams' => array ('rows' => '4','cols' => '60'),
+        'nl2br' => true,
+    ),
     ),
-  ),
 
 ),
 

Spacing +9 added lines, -9 removed lines

@@ -39,9 +39,9 @@ 
 
 $viewdefs['Cases']['AccountsQuickCreate'] = array(
 'templateMeta' => array('form' => 
-                            array (
+                            array(
                               'hidden' => 
-                              array (
+                              array(
                                 0 => '<input type="hidden" name="account_id" value="{$smarty.request.account_id}">',
                                 1 => '<input type="hidden" name="account_name" value="{$smarty.request.account_name}">',
                               ),
@@ -54,22 +54,22 @@ 
                        ),
 'panels' =>
 
-array (
+array(
   
-  array (
-    array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
+  array(
+    array('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
     'priority'
   ),
   
-  array (
+  array(
     'status',
     array('name'=>'account_name', 'type'=>'readonly'),
   ),
   
-  array (
-    array (
+  array(
+    array(
       'name' => 'description',
-      'displayParams' => array ('rows' => '4','cols' => '60'),
+      'displayParams' => array('rows' => '4', 'cols' => '60'),
       'nl2br' => true,
     ),
   ),

modules/Cases/metadata/additionalDetails.php

Indentation +21 added lines, -21 removed lines

@@ -42,31 +42,31 @@
     return additionalDetailsaCase($fields);
 }
 function additionalDetailsaCase($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Cases');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Cases');
+    }
 		
-	$overlib_string = '';
+    $overlib_string = '';
 		
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-		$overlib_string .= '<br>';
-	}
-	if(!empty($fields['RESOLUTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
-	}		
+    if(!empty($fields['DESCRIPTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+        $overlib_string .= '<br>';
+    }
+    if(!empty($fields['RESOLUTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
+        if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+    }		
 	
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'width' => '400',
-				 'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'width' => '400',
+                    'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  
  
\ No newline at end of file

Spacing +8 added lines, -8 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.
@@ -43,21 +43,21 @@ 
 }
 function additionalDetailsaCase($fields) {
 	static $mod_strings;
-	if(empty($mod_strings)) {
+	if (empty($mod_strings)) {
 		global $current_language;
 		$mod_strings = return_module_language($current_language, 'Cases');
 	}
 		
 	$overlib_string = '';
 		
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['DESCRIPTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
+		if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
 		$overlib_string .= '<br>';
 	}
-	if(!empty($fields['RESOLUTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+	if (!empty($fields['RESOLUTION'])) { 
+		$overlib_string .= '<b>'.$mod_strings['LBL_RESOLUTION'].'</b> '.substr($fields['RESOLUTION'], 0, 300);
+		if (strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
 	}		
 	
 	return array('fieldToAddTo' => 'NAME', 

Braces +9 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -52,12 +54,16 @@ 
 		
 	if(!empty($fields['DESCRIPTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['DESCRIPTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 		$overlib_string .= '<br>';
 	}
 	if(!empty($fields['RESOLUTION'])) { 
 		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
+		if(strlen($fields['RESOLUTION']) > 300) {
+		    $overlib_string .= '...';
+		}
 	}		
 	
 	return array('fieldToAddTo' => 'NAME', 

modules/Cases/metadata/editviewdefs.php

Indentation +66 added lines, -66 removed lines

@@ -39,143 +39,143 @@
 
 $viewdefs ['Cases'] =
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
-      ),
-      'includes' => 
-      array (
-          0 =>
-              array (
-                  'file' => 'include/javascript/bindWithDelay.js',
-              ),
+        ),
+        'includes' => 
+        array (
+            0 =>
+                array (
+                    'file' => 'include/javascript/bindWithDelay.js',
+                ),
         1 =>
         array (
-          'file' => 'modules/AOK_KnowledgeBase/AOK_KnowledgeBase_SuggestionBox.js',
+            'file' => 'modules/AOK_KnowledgeBase/AOK_KnowledgeBase_SuggestionBox.js',
+        ),
+            2 =>
+                array (
+                    'file' => 'include/javascript/qtip/jquery.qtip.min.js',
+                ),
         ),
-          2 =>
-              array (
-                  'file' => 'include/javascript/qtip/jquery.qtip.min.js',
-              ),
-      ),
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'LBL_CASE_INFORMATION' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
         ),
-      ),
-      'form' => 
-      array (
+        ),
+        'form' => 
+        array (
         'enctype' => 'multipart/form-data',
-      ),
+        ),
     ),
     'panels' => 
     array (
-      'lbl_case_information' => 
-      array (
+        'lbl_case_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'case_number',
             'type' => 'readonly',
-          ),
-          1 => 'priority',
+            ),
+            1 => 'priority',
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'state',
             'comment' => 'The state of the case (i.e. open/closed)',
             'label' => 'LBL_STATE',
-          ),
-          1 => 'status',
+            ),
+            1 => 'status',
         ),
         2 => 
         array (
-          0 => 'type',
-          1 => 'account_name',
+            0 => 'type',
+            1 => 'account_name',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'displayParams' => 
             array (
-              //'size' => 75,
+                //'size' => 75,
+            ),
             ),
-          ),
             1 =>
                 array (
                     'name' => 'suggestion_box',
-                  //'studio' => 'visible',
+                    //'studio' => 'visible',
                     'label' => 'LBL_SUGGESTION_BOX'
                 ),
         ),
         4 =>
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
             'nl2br' => true,
-          ),
+            ),
         ),
         5 =>
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'resolution',
             'nl2br' => true,
-          ),
+            ),
         ),
         6 =>
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'update_text',
             'studio' => 'visible',
             'label' => 'LBL_UPDATE_TEXT',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'internal',
             'studio' => 'visible',
             'label' => 'LBL_INTERNAL',
-          ),
+            ),
         ),
         7 =>
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'case_update_form',
             'studio' => 'visible',
-          ),
+            ),
         ),
         8 =>
         array (
-          0 => 'assigned_user_name',
+            0 => 'assigned_user_name',
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Spacing +34 added lines, -34 removed lines

@@ -38,71 +38,71 @@ 
  ********************************************************************************/
 
 $viewdefs ['Cases'] =
-array (
+array(
   'EditView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'includes' => 
-      array (
+      array(
           0 =>
-              array (
+              array(
                   'file' => 'include/javascript/bindWithDelay.js',
               ),
         1 =>
-        array (
+        array(
           'file' => 'modules/AOK_KnowledgeBase/AOK_KnowledgeBase_SuggestionBox.js',
         ),
           2 =>
-              array (
+              array(
                   'file' => 'include/javascript/qtip/jquery.qtip.min.js',
               ),
       ),
       'useTabs' => false,
       'tabDefs' => 
-      array (
+      array(
         'LBL_CASE_INFORMATION' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
       ),
       'form' => 
-      array (
+      array(
         'enctype' => 'multipart/form-data',
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_case_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'case_number',
             'type' => 'readonly',
           ),
           1 => 'priority',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'state',
             'comment' => 'The state of the case (i.e. open/closed)',
             'label' => 'LBL_STATE',
@@ -110,68 +110,68 @@ 
           1 => 'status',
         ),
         2 => 
-        array (
+        array(
           0 => 'type',
           1 => 'account_name',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'name',
             'displayParams' => 
-            array (
+            array(
               //'size' => 75,
             ),
           ),
             1 =>
-                array (
+                array(
                     'name' => 'suggestion_box',
                   //'studio' => 'visible',
                     'label' => 'LBL_SUGGESTION_BOX'
                 ),
         ),
         4 =>
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'description',
             'nl2br' => true,
           ),
         ),
         5 =>
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'resolution',
             'nl2br' => true,
           ),
         ),
         6 =>
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'update_text',
             'studio' => 'visible',
             'label' => 'LBL_UPDATE_TEXT',
           ),
           1 => 
-          array (
+          array(
             'name' => 'internal',
             'studio' => 'visible',
             'label' => 'LBL_INTERNAL',
           ),
         ),
         7 =>
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'case_update_form',
             'studio' => 'visible',
           ),
         ),
         8 =>
-        array (
+        array(
           0 => 'assigned_user_name',
         ),
       ),

modules/Cases/metadata/SearchFields.php

Indentation +54 added lines, -54 removed lines

@@ -40,110 +40,110 @@
 global $current_user;
 $module_name = "Cases";
 $searchFields['Cases'] = array (
-  'name' => 
-  array (
+    'name' => 
+    array (
     'query_type' => 'default',
-  ),
-  'account_name' => 
-  array (
+    ),
+    'account_name' => 
+    array (
     'query_type' => 'default',
     'db_field' => 
     array (
-      0 => 'accounts.name',
+        0 => 'accounts.name',
+    ),
     ),
-  ),
-  'status' => 
-  array (
+    'status' => 
+    array (
     'query_type' => 'default',
     'options' => 'case_status_dom',
     'template_var' => 'STATUS_OPTIONS',
-  ),
-  'priority' => 
-  array (
+    ),
+    'priority' => 
+    array (
     'query_type' => 'default',
     'options' => 'case_priority_dom',
     'template_var' => 'PRIORITY_OPTIONS',
     'options_add_blank' => true,
-  ),
-  'case_number' => 
-  array (
+    ),
+    'case_number' => 
+    array (
     'query_type' => 'default',
     'operator' => 'in',
-  ),
-  'current_user_only' => 
-  array (
+    ),
+    'current_user_only' => 
+    array (
     'query_type' => 'default',
     'db_field' => 
     array (
-      0 => 'assigned_user_id',
+        0 => 'assigned_user_id',
     ),
     'my_items' => true,
     'vname' => 'LBL_CURRENT_USER_FILTER',
     'type' => 'bool',
-  ),
-  'assigned_user_id' => 
-  array (
+    ),
+    'assigned_user_id' => 
+    array (
     'query_type' => 'default',
-  ),
-  'open_only' => 
-  array (
+    ),
+    'open_only' => 
+    array (
     'query_type' => 'default',
     'db_field' => 
     array (
-      0 => 'status',
+        0 => 'status',
     ),
     'operator' => 'not in',
     'closed_values' => 
     array (
-      0 => 'Closed',
-      1 => 'Rejected',
-      2 => 'Duplicate',
-      3 => 'Closed_Closed',
-      4 => 'Closed_Rejected',
-      5 => 'Closed_Duplicate',
+        0 => 'Closed',
+        1 => 'Rejected',
+        2 => 'Duplicate',
+        3 => 'Closed_Closed',
+        4 => 'Closed_Rejected',
+        5 => 'Closed_Duplicate',
     ),
     'type' => 'bool',
-  ),
-  'range_date_entered' => 
-  array (
+    ),
+    'range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'start_range_date_entered' => 
-  array (
+    ),
+    'start_range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'end_range_date_entered' => 
-  array (
+    ),
+    'end_range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'range_date_modified' => 
-  array (
+    ),
+    'range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'start_range_date_modified' => 
-  array (
+    ),
+    'start_range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'end_range_date_modified' => 
-  array (
+    ),
+    'end_range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'state' => 
-  array (
+    ),
+    'state' => 
+    array (
     'query_type' => 'default',
-  ),
+    ),
     'favorites_only' => array(
         'query_type'=>'format',
         'operator' => 'subquery',

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

Spacing +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,42 +39,42 @@ 
  ********************************************************************************/
 global $current_user;
 $module_name = "Cases";
-$searchFields['Cases'] = array (
+$searchFields['Cases'] = array(
   'name' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'account_name' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'accounts.name',
     ),
   ),
   'status' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'case_status_dom',
     'template_var' => 'STATUS_OPTIONS',
   ),
   'priority' => 
-  array (
+  array(
     'query_type' => 'default',
     'options' => 'case_priority_dom',
     'template_var' => 'PRIORITY_OPTIONS',
     'options_add_blank' => true,
   ),
   'case_number' => 
-  array (
+  array(
     'query_type' => 'default',
     'operator' => 'in',
   ),
   'current_user_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'assigned_user_id',
     ),
     'my_items' => true,
@@ -82,19 +82,19 @@ 
     'type' => 'bool',
   ),
   'assigned_user_id' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
   'open_only' => 
-  array (
+  array(
     'query_type' => 'default',
     'db_field' => 
-    array (
+    array(
       0 => 'status',
     ),
     'operator' => 'not in',
     'closed_values' => 
-    array (
+    array(
       0 => 'Closed',
       1 => 'Rejected',
       2 => 'Duplicate',
@@ -105,43 +105,43 @@ 
     'type' => 'bool',
   ),
   'range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_entered' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'start_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'end_range_date_modified' => 
-  array (
+  array(
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
   ),
   'state' => 
-  array (
+  array(
     'query_type' => 'default',
   ),
     'favorites_only' => array(
@@ -150,6 +150,6 @@ 
         'subquery' => "SELECT favorites.parent_id FROM favorites
 			                    WHERE favorites.deleted = 0
 			                        and favorites.parent_type = '".$module_name."'
-			                        and favorites.assigned_user_id = '" .$current_user->id . "') OR NOT ({0}",
+			                        and favorites.assigned_user_id = '" .$current_user->id."') OR NOT ({0}",
         'db_field'=>array('id')),
 );
\ No newline at end of file

modules/Cases/metadata/detailviewdefs.php

Indentation +59 added lines, -59 removed lines

@@ -39,129 +39,129 @@
 
 $viewdefs ['Cases'] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
-          3 => 'FIND_DUPLICATES',
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+            3 => 'FIND_DUPLICATES',
         ),
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
-      ),
-      'useTabs' => true,
-      'tabDefs' => 
-      array (
+        ),
+        'useTabs' => true,
+        'tabDefs' => 
+        array (
         'LBL_CASE_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_AOP_CASE_UPDATES' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_case_information' => 
-      array (
+        'lbl_case_information' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'case_number',
             'label' => 'LBL_CASE_NUMBER',
-          ),
-          1 => 'priority',
+            ),
+            1 => 'priority',
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'state',
             'comment' => 'The state of the case (i.e. open/closed)',
             'label' => 'LBL_STATE',
-          ),
-          1 => 'status',
+            ),
+            1 => 'status',
         ),
         2 => 
         array (
-          0 => 'type',
-          1 => 'account_name',
+            0 => 'type',
+            1 => 'account_name',
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 'description',
+            0 => 'description',
         ),
         5 => 
         array (
-          0 => 'resolution',
+            0 => 'resolution',
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
+            ),
         ),
         7 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_AOP_CASE_UPDATES' => 
-      array (
+        'LBL_AOP_CASE_UPDATES' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'aop_case_updates_threaded',
             'studio' => 'visible',
             'label' => 'LBL_AOP_CASE_UPDATES_THREADED',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

Spacing +30 added lines, -30 removed lines

@@ -38,15 +38,15 @@ 
  ********************************************************************************/
 
 $viewdefs ['Cases'] = 
-array (
+array(
   'DetailView' => 
-  array (
+  array(
     'templateMeta' => 
-    array (
+    array(
       'form' => 
-      array (
+      array(
         'buttons' => 
-        array (
+        array(
           0 => 'EDIT',
           1 => 'DUPLICATE',
           2 => 'DELETE',
@@ -55,50 +55,50 @@ 
       ),
       'maxColumns' => '2',
       'widths' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
         1 => 
-        array (
+        array(
           'label' => '10',
           'field' => '30',
         ),
       ),
       'useTabs' => true,
       'tabDefs' => 
-      array (
+      array(
         'LBL_CASE_INFORMATION' => 
-        array (
+        array(
           'newTab' => true,
           'panelDefault' => 'expanded',
         ),
         'LBL_AOP_CASE_UPDATES' => 
-        array (
+        array(
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
     'panels' => 
-    array (
+    array(
       'lbl_case_information' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'case_number',
             'label' => 'LBL_CASE_NUMBER',
           ),
           1 => 'priority',
         ),
         1 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'state',
             'comment' => 'The state of the case (i.e. open/closed)',
             'label' => 'LBL_STATE',
@@ -106,43 +106,43 @@ 
           1 => 'status',
         ),
         2 => 
-        array (
+        array(
           0 => 'type',
           1 => 'account_name',
         ),
         3 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
           ),
         ),
         4 => 
-        array (
+        array(
           0 => 'description',
         ),
         5 => 
-        array (
+        array(
           0 => 'resolution',
         ),
         6 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
           ),
         ),
         7 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
           ),
           1 => 
-          array (
+          array(
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
@@ -150,11 +150,11 @@ 
         ),
       ),
       'LBL_AOP_CASE_UPDATES' => 
-      array (
+      array(
         0 => 
-        array (
+        array(
           0 => 
-          array (
+          array(
             'name' => 'aop_case_updates_threaded',
             'studio' => 'visible',
             'label' => 'LBL_AOP_CASE_UPDATES_THREADED',