adamjakab / SuiteCRM

modules/DynamicFields/FieldsMetaData.php

Indentation +77 added lines, -77 removed lines

@@ -51,95 +51,95 @@
 
 
 class FieldsMetaData extends SugarBean {
-	// database table columns
-	var $id;
-	var $name;
-	var $vname;
-  	var $custom_module;
-  	var $type;
-  	var $len;
-  	var $required;
-  	var $default_value;
-  	var $deleted;
-  	var $ext1;
-  	var $ext2;
-  	var $ext3;
-	var $audited;
-	var $inline_edit;
+    // database table columns
+    var $id;
+    var $name;
+    var $vname;
+        var $custom_module;
+        var $type;
+        var $len;
+        var $required;
+        var $default_value;
+        var $deleted;
+        var $ext1;
+        var $ext2;
+        var $ext3;
+    var $audited;
+    var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
-
-	var $table_name = 'fields_meta_data';
-	var $object_name = 'FieldsMetaData';
-	var $module_dir = 'DynamicFields';
-	var $column_fields = array(
-		'id',
-		'name',
-		'vname',
-		'custom_module',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'deleted',
-		'ext1',
-		'ext2',
-		'ext3',
-		'audited',
-		'inline_edit',
-		'massupdate',
+    var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+
+    var $table_name = 'fields_meta_data';
+    var $object_name = 'FieldsMetaData';
+    var $module_dir = 'DynamicFields';
+    var $column_fields = array(
+        'id',
+        'name',
+        'vname',
+        'custom_module',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'deleted',
+        'ext1',
+        'ext2',
+        'ext3',
+        'audited',
+        'inline_edit',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
-
-	var $list_fields = array(
-		'id',
-		'name',
-		'vname',
-		'type',
-		'len',
-		'required',
-		'default_value',
-		'audited',
+    );
+
+    var $list_fields = array(
+        'id',
+        'name',
+        'vname',
+        'type',
+        'len',
+        'required',
+        'default_value',
+        'audited',
         'inline_edit',
-		'massupdate',
+        'massupdate',
         'duplicate_merge',
         'reportable',
-	);
+    );
 
-	var $field_name_map;
-	var $new_schema = true;
+    var $field_name_map;
+    var $new_schema = true;
 
-	//////////////////////////////////////////////////////////////////
-	// METHODS
-	//////////////////////////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////
+    // METHODS
+    //////////////////////////////////////////////////////////////////
 
-	function FieldsMetaData()
-	{
-		parent::SugarBean();
-		$this->disable_row_level_security = true;
-	}
+    function FieldsMetaData()
+    {
+        parent::SugarBean();
+        $this->disable_row_level_security = true;
+    }
 	
-	function mark_deleted($id)
-	{
-		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
-		$this->mark_relationships_deleted($id);
+    function mark_deleted($id)
+    {
+        $query = "DELETE FROM $this->table_name WHERE  id='$id'";
+        $this->db->query($query, true,"Error deleting record: ");
+        $this->mark_relationships_deleted($id);
 
-	}
+    }
 	
-	function get_list_view_data(){
-	    $data = parent::get_list_view_data();
-	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
-	    return $data;
-	}
-
-
-	function get_summary_text()
-	{
-		return $this->name;
-	}
+    function get_list_view_data(){
+        $data = parent::get_list_view_data();
+        $data['VNAME'] = translate($this->vname, $this->custom_module);
+        $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+        return $data;
+    }
+
+
+    function get_summary_text()
+    {
+        return $this->name;
+    }
 }
 ?>

Spacing +5 added lines, -5 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.
@@ -68,7 +68,7 @@ 
 	var $inline_edit;
     var $duplicate_merge;
     var $reportable;
-	var $required_fields =  array("name"=>1, "date_start"=>2, "time_start"=>3,);
+	var $required_fields = array("name"=>1, "date_start"=>2, "time_start"=>3,);
 
 	var $table_name = 'fields_meta_data';
 	var $object_name = 'FieldsMetaData';
@@ -124,15 +124,15 @@ 
 	function mark_deleted($id)
 	{
 		$query = "DELETE FROM $this->table_name WHERE  id='$id'";
-		$this->db->query($query, true,"Error deleting record: ");
+		$this->db->query($query, true, "Error deleting record: ");
 		$this->mark_relationships_deleted($id);
 
 	}
 	
-	function get_list_view_data(){
+	function get_list_view_data() {
 	    $data = parent::get_list_view_data();
 	    $data['VNAME'] = translate($this->vname, $this->custom_module);
-	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="' . $this->id . '">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record=' . $this->id . '" >';
+	    $data['NAMELINK'] = '<input class="checkbox" type="checkbox" name="remove[]" value="'.$this->id.'">&nbsp;&nbsp;<a href="index.php?module=Studio&action=wizard&wizard=EditCustomFieldsWizard&option=EditCustomField&record='.$this->id.'" >';
 	    return $data;
 	}
 

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/DynamicFields/UpgradeFields.php

Indentation +74 added lines, -74 removed lines

@@ -40,95 +40,95 @@ 
 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
- global $db;
- if(!isset($db)){
- 	$db = DBManagerFactory::getInstance();
- }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
- $modules = array();
- /*
+    global $db;
+    if(!isset($db)){
+        $db = DBManagerFactory::getInstance();
+    }
+    $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+    $modules = array();
+    /*
   * get the real field_meta_data
   */
- while($row = $db->fetchByAssoc($result)){
- 	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
- 		$modules[$the_modules] = array();	
- 	}
- 	$modules[$the_modules][$row['name']] = $row['name'];
- }
+    while($row = $db->fetchByAssoc($result)){
+        $the_modules = $row['custom_module'];
+        if(!isset($modules[$the_modules])){
+            $modules[$the_modules] = array();	
+        }
+        $modules[$the_modules][$row['name']] = $row['name'];
+    }
  	
- $simulate = false;
- if(!isset($_REQUEST['run'])){
- 	$simulate = true;
- 	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
- }	
+    $simulate = false;
+    if(!isset($_REQUEST['run'])){
+        $simulate = true;
+        echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
+    }	
 
- foreach($modules as $the_module=>$fields){
-         if(isset($beanList[$the_module]))
-         {
- 	$class_name = $beanList[$the_module];
- 	echo "<br><br>Scanning $the_module <br>";
+    foreach($modules as $the_module=>$fields){
+            if(isset($beanList[$the_module]))
+            {
+        $class_name = $beanList[$the_module];
+        echo "<br><br>Scanning $the_module <br>";
 		
-		require_once($beanFiles[$class_name]);
-		$mod = new $class_name();
-		if(!$db->tableExists($mod->table_name . "_cstm")){
-			$mod->custom_fields = new DynamicField();
-			$mod->custom_fields->setup($mod);
-		$mod->custom_fields->createCustomTable();
-		}
+        require_once($beanFiles[$class_name]);
+        $mod = new $class_name();
+        if(!$db->tableExists($mod->table_name . "_cstm")){
+            $mod->custom_fields = new DynamicField();
+            $mod->custom_fields->setup($mod);
+        $mod->custom_fields->createCustomTable();
+        }
 
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
+        $result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
 		
-		while($row = $db->fetchByAssoc($result)){
+        while($row = $db->fetchByAssoc($result)){
 			
 			
-			$col = $row['Field'];
-			$type = $row['Type'];
-			$fieldDef = $mod->getFieldDefinition($col);
-			$the_field = get_widget($fieldDef['type']);
-			$the_field->set($fieldDef);
+            $col = $row['Field'];
+            $type = $row['Type'];
+            $fieldDef = $mod->getFieldDefinition($col);
+            $the_field = get_widget($fieldDef['type']);
+            $the_field->set($fieldDef);
 				
-				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
-					unset($fields[$col]);
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
-					if($col != 'id_c'){
-					if(trim($the_field->get_db_type()) != trim($type)){
+                if(!isset($fields[$col]) && $col != 'id_c'){
+                    if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+                    unset($fields[$col]);
+                    echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
+                }	else{
+                    if($col != 'id_c'){
+                    if(trim($the_field->get_db_type()) != trim($type)){
 						
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
-					}
-					}
+                    echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
+                    if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+                    }
+                    }
 					
-					unset($fields[$col]);
-				}
+                    unset($fields[$col]);
+                }
 			
-		}
+        }
 			
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
-			foreach($fields as $field){
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
-				if(!$simulate){
-					$the_field = $mod->getFieldDefinition($field);
-					$field = get_widget($the_field['type']);
-					$field->set($the_field);
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
-					echo $query;
-            		if(!empty($query)){
-                		$mod->db->query($query);
-            		}
-				}
-			}
-         }
-	}
+            echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
+            foreach($fields as $field){
+                echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
+                if(!$simulate){
+                    $the_field = $mod->getFieldDefinition($field);
+                    $field = get_widget($the_field['type']);
+                    $field->set($the_field);
+                    $query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
+                    echo $query;
+                    if(!empty($query)){
+                        $mod->db->query($query);
+                    }
+                }
+            }
+            }
+    }
 	
 	
-	DynamicField::deleteCache();	
-	echo '<br>Done<br>';
-	if($simulate){
-		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
-	}
+    DynamicField::deleteCache();	
+    echo '<br>Done<br>';
+    if($simulate){
+        echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
+    }
 		
 		
  
@@ -137,4 +137,4 @@ 
  
  
  
- ?>
\ No newline at end of file
+    ?>
\ No newline at end of file

Spacing +26 added lines, -26 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.
@@ -41,45 +41,45 @@ 
 require_once('modules/DynamicFields/FieldCases.php');
 require_once('modules/DynamicFields/DynamicField.php');
  global $db;
- if(!isset($db)){
+ if (!isset($db)) {
  	$db = DBManagerFactory::getInstance();
  }
- $result = $db->query( 'SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
+ $result = $db->query('SELECT * FROM fields_meta_data WHERE deleted = 0 ORDER BY custom_module');
  $modules = array();
  /*
   * get the real field_meta_data
   */
- while($row = $db->fetchByAssoc($result)){
+ while ($row = $db->fetchByAssoc($result)) {
  	$the_modules = $row['custom_module'];
- 	if(!isset($modules[$the_modules])){
+ 	if (!isset($modules[$the_modules])) {
  		$modules[$the_modules] = array();	
  	}
  	$modules[$the_modules][$row['name']] = $row['name'];
  }
  	
  $simulate = false;
- if(!isset($_REQUEST['run'])){
+ if (!isset($_REQUEST['run'])) {
  	$simulate = true;
  	echo "SIMULATION MODE - NO CHANGES WILL BE MADE EXCEPT CLEARING CACHE";
  }	
 
- foreach($modules as $the_module=>$fields){
-         if(isset($beanList[$the_module]))
+ foreach ($modules as $the_module=>$fields) {
+         if (isset($beanList[$the_module]))
          {
  	$class_name = $beanList[$the_module];
  	echo "<br><br>Scanning $the_module <br>";
 		
 		require_once($beanFiles[$class_name]);
 		$mod = new $class_name();
-		if(!$db->tableExists($mod->table_name . "_cstm")){
+		if (!$db->tableExists($mod->table_name."_cstm")) {
 			$mod->custom_fields = new DynamicField();
 			$mod->custom_fields->setup($mod);
 		$mod->custom_fields->createCustomTable();
 		}
 
-		$result = $db->query("DESCRIBE $mod->table_name" . "_cstm");
+		$result = $db->query("DESCRIBE $mod->table_name"."_cstm");
 		
-		while($row = $db->fetchByAssoc($result)){
+		while ($row = $db->fetchByAssoc($result)) {
 			
 			
 			$col = $row['Field'];
@@ -88,16 +88,16 @@ 
 			$the_field = get_widget($fieldDef['type']);
 			$the_field->set($fieldDef);
 				
-				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+				if (!isset($fields[$col]) && $col != 'id_c') {
+					if (!$simulate)$db->query("ALTER TABLE $mod->table_name"."_cstm DROP COLUMN $col");
 					unset($fields[$col]);
-					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
-					if($col != 'id_c'){
-					if(trim($the_field->get_db_type()) != trim($type)){
+					echo "Dropping Column $col from $mod->table_name"."_cstm for module $the_module<br>";
+				} else {
+					if ($col != 'id_c') {
+					if (trim($the_field->get_db_type()) != trim($type)) {
 						
-					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+					echo "Fixing Column Type for $col changing $type to ".$the_field->get_db_type()."<br>";
+					if (!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name.'_cstm'));		
 					}
 					}
 					
@@ -106,16 +106,16 @@ 
 			
 		}
 			
-			echo sizeof($fields) . " field(s) missing from $mod->table_name" . "_cstm<br>";
-			foreach($fields as $field){
-				echo "Adding Column $field to $mod->table_name" . "_cstm<br>";
-				if(!$simulate){
+			echo sizeof($fields)." field(s) missing from $mod->table_name"."_cstm<br>";
+			foreach ($fields as $field) {
+				echo "Adding Column $field to $mod->table_name"."_cstm<br>";
+				if (!$simulate) {
 					$the_field = $mod->getFieldDefinition($field);
 					$field = get_widget($the_field['type']);
 					$field->set($the_field);
-					$query = $field->get_db_add_alter_table($mod->table_name . '_cstm');
+					$query = $field->get_db_add_alter_table($mod->table_name.'_cstm');
 					echo $query;
-            		if(!empty($query)){
+            		if (!empty($query)) {
                 		$mod->db->query($query);
             		}
 				}
@@ -126,7 +126,7 @@ 
 	
 	DynamicField::deleteCache();	
 	echo '<br>Done<br>';
-	if($simulate){
+	if ($simulate) {
 		echo '<a href="index.php?module=Administration&action=UpgradeFields&run=true">Execute non-simulation mode</a>';	
 	}
 		

Braces +10 added lines, -4 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point'); 
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -89,15 +91,19 @@ 
 			$the_field->set($fieldDef);
 				
 				if(!isset($fields[$col]) && $col != 'id_c'){
-					if(!$simulate)$db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					if(!$simulate) {
+					    $db->query("ALTER TABLE $mod->table_name" . "_cstm DROP COLUMN $col");
+					}
 					unset($fields[$col]);
 					echo "Dropping Column $col from $mod->table_name" . "_cstm for module $the_module<br>";
-				}	else{
+				} else{
 					if($col != 'id_c'){
 					if(trim($the_field->get_db_type()) != trim($type)){
 						
 					echo "Fixing Column Type for $col changing $type to ". $the_field->get_db_type() . "<br>";
-					if(!$simulate)$db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));		
+					if(!$simulate) {
+					    $db->query($the_field->get_db_modify_alter_table($mod->table_name . '_cstm'));
+					}
 					}
 					}
 					

modules/Relationships/field_arrays.php

Indentation +32 added lines, -32 removed lines

@@ -46,39 +46,39 @@
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 $fields_array['Relationship'] = array ('column_fields' => Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
         'list_fields' =>  Array(
-		'id',
-		'relationship_name',
-		'lhs_module',
-		'lhs_table',
-		'lhs_key',
-		'rhs_module',
-		'rhs_table',
-		'rhs_key',
-		'join_table',
-		'join_key_lhs',
-		'join_key_rhs',
-		'relationship_type',
-		'relationship_role_column',
-		'relationship_role_column_value',
-		'reverse',
-	),
+        'id',
+        'relationship_name',
+        'lhs_module',
+        'lhs_table',
+        'lhs_key',
+        'rhs_module',
+        'rhs_table',
+        'rhs_key',
+        'join_table',
+        'join_key_lhs',
+        'join_key_rhs',
+        'relationship_type',
+        'relationship_role_column',
+        'relationship_role_column_value',
+        'reverse',
+    ),
     'required_fields' =>   array("relationship_name"=>1),
 );
 ?>
\ No newline at end of file

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.
@@ -45,7 +45,7 @@ 
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-$fields_array['Relationship'] = array ('column_fields' => Array(
+$fields_array['Relationship'] = array('column_fields' => Array(
 		'id',
 		'relationship_name',
 		'lhs_module',

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/Relationships/RelationshipHandler.php

Indentation +213 added lines, -213 removed lines

@@ -48,30 +48,30 @@ 
 
 class RelationshipHandler extends Relationship {
 	
-	var $db;							//Database link by reference
+    var $db;							//Database link by reference
 	
-	var $base_module;					//name of module
-	var $base_bean;						//actual object
-	var $base_vardef_field;				//base's vardef field name of relationship with rel1
+    var $base_module;					//name of module
+    var $base_bean;						//actual object
+    var $base_vardef_field;				//base's vardef field name of relationship with rel1
 	
-	var $rel1_module;					//name of related module
-	var $rel1_bean;						//actual related object
-	var $rel1_relationship_name;		//Relationship name between base and rel1 
-	var $rel1_vardef_field;				//rel1's vardef field name of relationship with rel2
-	var $rel1_vardef_field_base;		//rel1's vardef field name of relationship with base
+    var $rel1_module;					//name of related module
+    var $rel1_bean;						//actual related object
+    var $rel1_relationship_name;		//Relationship name between base and rel1 
+    var $rel1_vardef_field;				//rel1's vardef field name of relationship with rel2
+    var $rel1_vardef_field_base;		//rel1's vardef field name of relationship with base
 	
-	var $rel2_module;					//name of related related module
-	var $rel2_bean;						//actual related related object
-	var $rel2_relationship_name;		//Relationship name between rel1 and rel2 
-	var $rel2_vardef_field;				//rel2's vardef field name of relationship with rel1
+    var $rel2_module;					//name of related related module
+    var $rel2_bean;						//actual related related object
+    var $rel2_relationship_name;		//Relationship name between rel1 and rel2 
+    var $rel2_vardef_field;				//rel2's vardef field name of relationship with rel1
 	
 	
-	var $base_array;					//Info array
-	var $rel1_array;					//Info array
-	var $rel2_array;					//Info array
+    var $base_array;					//Info array
+    var $rel1_array;					//Info array
+    var $rel2_array;					//Info array
 	
 	
-	/*
+    /*
 	
 	info arrays contain:
 	
@@ -85,33 +85,33 @@ 
 	
 ///////////////////////////Setup and populate functions//////////////////////////////
 
-	function RelationshipHandler(& $db, $base_module=""){
+    function RelationshipHandler(& $db, $base_module=""){
 		
-		$this->db = $db;
-		$this->base_module = $base_module;
+        $this->db = $db;
+        $this->base_module = $base_module;
 		
-	//end function RelationshipHandler	
-	}	
+    //end function RelationshipHandler	
+    }	
 
-	function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field=""){
+    function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field=""){
 		
-		$this->base_vardef_field = $base_vardef_field;
-		$this->rel1_vardef_field = $rel1_vardef_field;
+        $this->base_vardef_field = $base_vardef_field;
+        $this->rel1_vardef_field = $rel1_vardef_field;
 		
-	//end function set_rel_vardef_fields	
-	}	
+    //end function set_rel_vardef_fields	
+    }	
 
 
-	function set_rel_relationship_names($build_rel2=false){
+    function set_rel_relationship_names($build_rel2=false){
 
-		$this->rel1_relationship_name = $this->base_bean->field_defs[$this->base_vardef_field]['relationship'];
+        $this->rel1_relationship_name = $this->base_bean->field_defs[$this->base_vardef_field]['relationship'];
 
-	if($build_rel2==true){
-		$this->rel2_relationship_name = $this->rel1_bean->field_defs[$this->rel1_vardef_field]['relationship'];	
-	}	
+    if($build_rel2==true){
+        $this->rel2_relationship_name = $this->rel1_bean->field_defs[$this->rel1_vardef_field]['relationship'];	
+    }	
 	
-	//end function set_rel_relationship_names
-	}
+    //end function set_rel_relationship_names
+    }
 
 
 
@@ -119,131 +119,131 @@ 
 ///////////////////////////////END Setup and populate functions/////////////////////
 	
 	
-	/*
+    /*
 	set the build_rel2 to true if you want the rel2 info array as well
 	This function will build all the relationship info it can based on values set in the setup functions
 	When you use the info arrays (rel1_array) or (rel2_array), make sure you always check for empty values
 	*/
-	function build_info($build_rel2=false){
-		if($this->base_bean == null){
-			$this->base_bean = get_module_info($this->base_module);
-		}	
+    function build_info($build_rel2=false){
+        if($this->base_bean == null){
+            $this->base_bean = get_module_info($this->base_module);
+        }	
 		
-		if(empty($this->rel1_bean)){
-			$this->build_rel1_info();
-			$this->rel1_module = $this->rel1_bean->module_dir;
-		}
+        if(empty($this->rel1_bean)){
+            $this->build_rel1_info();
+            $this->rel1_module = $this->rel1_bean->module_dir;
+        }
 		
-		if($build_rel2==true && $this->rel2_bean==""){
-			$this->build_rel2_info();	
-			$this->rel2_module = $this->rel2_bean->module_dir;
-		}	
+        if($build_rel2==true && $this->rel2_bean==""){
+            $this->build_rel2_info();	
+            $this->rel2_module = $this->rel2_bean->module_dir;
+        }	
 		
-		//translate the module titles to the proper language
-		$this->build_module_labels($build_rel2);
+        //translate the module titles to the proper language
+        $this->build_module_labels($build_rel2);
 
-	//end function build_info
-	}
+    //end function build_info
+    }
 
-	function build_rel1_info(){
+    function build_rel1_info(){
 
-			$this->rel1_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field);	
+            $this->rel1_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field);	
 
-	//end function build_rel1_info
-	}	
+    //end function build_rel1_info
+    }	
 	
-	function build_rel2_info(){
+    function build_rel2_info(){
 
-			$this->rel2_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field, $this->rel1_vardef_field);
+            $this->rel2_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field, $this->rel1_vardef_field);
 
-	//end function build_rel1_info
-	}		
+    //end function build_rel1_info
+    }		
 	
-	/*
+    /*
 	Translates the module names to their singular and plural label and puts them in 
 	the info arrays.  Does it for base, rel1, and rel2 if specified
 	*/
 	
-	function build_module_labels($build_rel2=false){
-		global $app_list_strings;
-
-		///Base Module Labels
-		if(!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])){
-			$this->base_array['plabel'] = $app_list_strings['moduleList'][$this->base_bean->module_dir];
-		} else {
-			$this->base_array['plabel'] = $this->base_bean->module_dir;
-		}	
-		if(!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])){
-			$this->base_array['slabel'] = $app_list_strings['moduleListSingular'][$this->base_bean->module_dir];
-		} else {
-			$this->base_array['slabel'] = $this->base_bean->object_name;
-		}	
-
-		///Rel1 Module Labels	
-		if(!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])){
-			$this->rel1_array['plabel'] = $app_list_strings['moduleList'][$this->rel1_bean->module_dir];
-		} else {
-			$this->rel1_array['plabel'] = $this->rel1_bean->module_dir;
-		}
+    function build_module_labels($build_rel2=false){
+        global $app_list_strings;
+
+        ///Base Module Labels
+        if(!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])){
+            $this->base_array['plabel'] = $app_list_strings['moduleList'][$this->base_bean->module_dir];
+        } else {
+            $this->base_array['plabel'] = $this->base_bean->module_dir;
+        }	
+        if(!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])){
+            $this->base_array['slabel'] = $app_list_strings['moduleListSingular'][$this->base_bean->module_dir];
+        } else {
+            $this->base_array['slabel'] = $this->base_bean->object_name;
+        }	
+
+        ///Rel1 Module Labels	
+        if(!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])){
+            $this->rel1_array['plabel'] = $app_list_strings['moduleList'][$this->rel1_bean->module_dir];
+        } else {
+            $this->rel1_array['plabel'] = $this->rel1_bean->module_dir;
+        }
 		
-		if(!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])){
-			$this->rel1_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir];
-		} else {
-			$this->rel1_array['slabel'] = $this->rel1_bean->object_name;
-		}	
+        if(!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])){
+            $this->rel1_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir];
+        } else {
+            $this->rel1_array['slabel'] = $this->rel1_bean->object_name;
+        }	
 			
 		
-		//Rel2 Module Labels
-		if($build_rel2==true){
+        //Rel2 Module Labels
+        if($build_rel2==true){
 			
-			if(!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])){
-				$this->rel2_array['plabel'] = $app_list_strings['moduleList'][$this->rel2_bean->module_dir];
-			} else {
-				$this->rel2_array['plabel'] = $this->rel2_bean->module_dir;
-			}
-			if(!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])){
-				$this->rel2_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir];
-			} else {
-				$this->rel2_array['slabel'] = $this->rel2_bean->module_dir;
-			}	
-		//end if build_rel2 is true		
-		}			
+            if(!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])){
+                $this->rel2_array['plabel'] = $app_list_strings['moduleList'][$this->rel2_bean->module_dir];
+            } else {
+                $this->rel2_array['plabel'] = $this->rel2_bean->module_dir;
+            }
+            if(!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])){
+                $this->rel2_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir];
+            } else {
+                $this->rel2_array['slabel'] = $this->rel2_bean->module_dir;
+            }	
+        //end if build_rel2 is true		
+        }			
 
-	//end function buld_module_lables
-	}	
+    //end function buld_module_lables
+    }	
 	
 	
 	
 	
 	
-	function build_related_list($type="base"){
-		//type can be base, rel1
+    function build_related_list($type="base"){
+        //type can be base, rel1
 		
-		$target_list = "";
+        $target_list = "";
 		
-		if($type=="base"){
-			$target_list = $this->base_bean->get_linked_beans($this->base_vardef_field, $this->rel1_bean->object_name);	
-		//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
-				$target_list = search_filter_rel_info($this->base_bean, $this->rel1_bean->module_dir, $this->base_vardef_field);
-			//end if the target list is empty	
-			}	
-		}	
+        if($type=="base"){
+            $target_list = $this->base_bean->get_linked_beans($this->base_vardef_field, $this->rel1_bean->object_name);	
+        //Possibility exists that this is a new relationship, so capture via relationship fields
+            if(empty($target_list)){
+                $target_list = search_filter_rel_info($this->base_bean, $this->rel1_bean->module_dir, $this->base_vardef_field);
+            //end if the target list is empty	
+            }	
+        }	
 		
-		if($type=="rel1"){
-			$target_list = $this->rel1_bean->get_linked_beans($this->rel1_vardef_field, $this->rel2_bean->object_name);	
+        if($type=="rel1"){
+            $target_list = $this->rel1_bean->get_linked_beans($this->rel1_vardef_field, $this->rel2_bean->object_name);	
 			
-			//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
-				$target_list = search_filter_rel_info($this->rel1_bean, $this->rel2_bean->module_dir, $this->rel1_vardef_field);
-			//end if the target list is empty	
-			}	
-		}		
-
-		return $target_list;
+            //Possibility exists that this is a new relationship, so capture via relationship fields
+            if(empty($target_list)){
+                $target_list = search_filter_rel_info($this->rel1_bean, $this->rel2_bean->module_dir, $this->rel1_vardef_field);
+            //end if the target list is empty	
+            }	
+        }		
+
+        return $target_list;
 		
-	//end function build_related_list	
-	}	
+    //end function build_related_list	
+    }	
 	
 	
 
@@ -252,92 +252,92 @@ 
 	
 function get_relationship_information(& $target_bean, $get_upstream_rel_field_name = false){
 	
-	$target_module_name = $target_bean->module_dir;
-	$current_module_name = $this->base_module;
+    $target_module_name = $target_bean->module_dir;
+    $current_module_name = $this->base_module;
 	
-	//Look for downstream connection
-	$rel_array = $this->retrieve_by_sides($current_module_name, $target_module_name, $this->db);
+    //Look for downstream connection
+    $rel_array = $this->retrieve_by_sides($current_module_name, $target_module_name, $this->db);
 
 	
-	//Does a downstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
-			$target_bean->$rel_array['join_key_lhs'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
-			}				
-		//end if many-to-many	
-		}	
+    //Does a downstream relationship exist
+    if($rel_array!=null){
+        if($rel_array['relationship_type']=="many-to-many"){
+            $target_bean->$rel_array['join_key_lhs'] = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
+            }				
+        //end if many-to-many	
+        }	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
-			$target_bean->$rel_array['rhs_key'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
-			}
-		//end if one-to-many
-		}
+        if($rel_array['relationship_type']=="one-to-many"){
+            $target_bean->$rel_array['rhs_key'] = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
+            }
+        //end if one-to-many
+        }
 		
-		return;		
-	//end if downstream relationship exists
-	}
+        return;		
+    //end if downstream relationship exists
+    }
 	
 	
 	
-	//Look for upstream connection
-	$rel_array = $this->retrieve_by_sides($target_module_name, $current_module_name, $this->db);
+    //Look for upstream connection
+    $rel_array = $this->retrieve_by_sides($target_module_name, $current_module_name, $this->db);
 	
-	//Does an upstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
-			$target_bean->$rel_array['join_key_rhs'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
-			}				
-		//end if many-to-many	
-		}	
+    //Does an upstream relationship exist
+    if($rel_array!=null){
+        if($rel_array['relationship_type']=="many-to-many"){
+            $target_bean->$rel_array['join_key_rhs'] = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
+            }				
+        //end if many-to-many	
+        }	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
-			$this->$rel_array['rhs_key'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
-				$this->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
-			}
-		//end if one-to-many
-		}
+        if($rel_array['relationship_type']=="one-to-many"){
+            $this->$rel_array['rhs_key'] = $this->base_bean->id;
+            if($rel_array['relationship_role_column']!=""){
+                $this->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
+            }
+        //end if one-to-many
+        }
 		
 		
-		///Fill additional id field if necessary
-		if(($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null){
-			$target_bean->$id_name = $this->base_bean->id;
+        ///Fill additional id field if necessary
+        if(($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null){
+            $target_bean->$id_name = $this->base_bean->id;
             if($get_upstream_rel_field_name) {
                 $target_bean->new_rel_relname = $id_name;
                 $target_bean->new_rel_id = $this->base_bean->id;
             }
-		}
+        }
 	
-	//end if an upstream relationship exists
-	}		
+    //end if an upstream relationship exists
+    }		
 	
 //end function get_relationship_information
 }	
 
 function traverse_rel_meta($base_module, & $target_bean, $target_rel_name){
-	$id_name = null;
+    $id_name = null;
 
-	//returns name of variable to store id in
-	//if none exists, then returns null
-	foreach($target_bean->field_defs as $field_array){
+    //returns name of variable to store id in
+    //if none exists, then returns null
+    foreach($target_bean->field_defs as $field_array){
 		
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$target_rel_name){
+        if(!empty($field_array['relationship']) && $field_array['relationship']==$target_rel_name){
 			
-			$id_name = $this->get_id_name($target_bean, $field_array['name']);
-			return $id_name;
-		//end if rel name match		
-		}	
+            $id_name = $this->get_id_name($target_bean, $field_array['name']);
+            return $id_name;
+        //end if rel name match		
+        }	
 
-	//end foreach field def
-	}
+    //end foreach field def
+    }
 	
-	return null;
+    return null;
 	
 //end function traverse_rel_meta
 }	
@@ -345,17 +345,17 @@ 
 
 function get_id_name(& $target_bean, $field_name){
 	
-	foreach($target_bean->relationship_fields as $target_id => $rel_name){
+    foreach($target_bean->relationship_fields as $target_id => $rel_name){
 		
-		if($rel_name == $field_name){
-			//relationship id found
-			return $target_id;
-		//end if match		
-		}	
-	//end foreach	
-	}	
-	
-	return null;
+        if($rel_name == $field_name){
+            //relationship id found
+            return $target_id;
+        //end if match		
+        }	
+    //end foreach	
+    }	
+	
+    return null;
 //end function get_id_name	
 }	
 
@@ -364,27 +364,27 @@ 
 
 function process_by_rel_bean($rel1_module){
 	
-	$this->rel1_relationship_name = $this::retrieve_by_modules($this->base_module, $rel1_module, $this->db);
-	$this->rel1_module = $rel1_module;
-	$this->rel1_bean = get_module_info($this->rel1_module);
+    $this->rel1_relationship_name = $this::retrieve_by_modules($this->base_module, $rel1_module, $this->db);
+    $this->rel1_module = $rel1_module;
+    $this->rel1_bean = get_module_info($this->rel1_module);
 	
 //end function process_by_rel_bean	
 }	
 
 
 function get_rel1_vardef_field_base($field_defs){
-	foreach($field_defs as $field_array){
+    foreach($field_defs as $field_array){
 		
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$this->rel1_relationship_name){
+        if(!empty($field_array['relationship']) && $field_array['relationship']==$this->rel1_relationship_name){
 			
-			$this->rel1_vardef_field_base = $field_array['name'];
-		//end if rel name match		
-		}	
+            $this->rel1_vardef_field_base = $field_array['name'];
+        //end if rel name match		
+        }	
 
-	//end foreach field def
-	}
+    //end foreach field def
+    }
 	
-	return null;
+    return null;
 	
 	
 //end get_rel1_vardef_field_base
@@ -393,15 +393,15 @@ 
 
 function get_farthest_reach(){
 	
-	if($this->rel1_vardef_field!=""){
-		//the farthest reach is rel2
-		$this->build_info(true);
-		return $this->rel2_bean;
-	} 
+    if($this->rel1_vardef_field!=""){
+        //the farthest reach is rel2
+        $this->build_info(true);
+        return $this->rel2_bean;
+    } 
 
-	//the farthest reach is rel1	
-	$this->build_info(false);
-	return $this->rel1_bean;		
+    //the farthest reach is rel1	
+    $this->build_info(false);
+    return $this->rel1_bean;		
 	
 //end function get_farthest_reach	
 }

Spacing +65 added lines, -65 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -48,27 +48,27 @@ 
 
 class RelationshipHandler extends Relationship {
 	
-	var $db;							//Database link by reference
+	var $db; //Database link by reference
 	
-	var $base_module;					//name of module
-	var $base_bean;						//actual object
-	var $base_vardef_field;				//base's vardef field name of relationship with rel1
+	var $base_module; //name of module
+	var $base_bean; //actual object
+	var $base_vardef_field; //base's vardef field name of relationship with rel1
 	
-	var $rel1_module;					//name of related module
-	var $rel1_bean;						//actual related object
-	var $rel1_relationship_name;		//Relationship name between base and rel1 
-	var $rel1_vardef_field;				//rel1's vardef field name of relationship with rel2
-	var $rel1_vardef_field_base;		//rel1's vardef field name of relationship with base
+	var $rel1_module; //name of related module
+	var $rel1_bean; //actual related object
+	var $rel1_relationship_name; //Relationship name between base and rel1 
+	var $rel1_vardef_field; //rel1's vardef field name of relationship with rel2
+	var $rel1_vardef_field_base; //rel1's vardef field name of relationship with base
 	
-	var $rel2_module;					//name of related related module
-	var $rel2_bean;						//actual related related object
-	var $rel2_relationship_name;		//Relationship name between rel1 and rel2 
-	var $rel2_vardef_field;				//rel2's vardef field name of relationship with rel1
+	var $rel2_module; //name of related related module
+	var $rel2_bean; //actual related related object
+	var $rel2_relationship_name; //Relationship name between rel1 and rel2 
+	var $rel2_vardef_field; //rel2's vardef field name of relationship with rel1
 	
 	
-	var $base_array;					//Info array
-	var $rel1_array;					//Info array
-	var $rel2_array;					//Info array
+	var $base_array; //Info array
+	var $rel1_array; //Info array
+	var $rel2_array; //Info array
 	
 	
 	/*
@@ -85,7 +85,7 @@ 
 	
 ///////////////////////////Setup and populate functions//////////////////////////////
 
-	function RelationshipHandler(& $db, $base_module=""){
+	function RelationshipHandler(& $db, $base_module = "") {
 		
 		$this->db = $db;
 		$this->base_module = $base_module;
@@ -93,7 +93,7 @@ 
 	//end function RelationshipHandler	
 	}	
 
-	function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field=""){
+	function set_rel_vardef_fields($base_vardef_field, $rel1_vardef_field = "") {
 		
 		$this->base_vardef_field = $base_vardef_field;
 		$this->rel1_vardef_field = $rel1_vardef_field;
@@ -102,11 +102,11 @@ 
 	}	
 
 
-	function set_rel_relationship_names($build_rel2=false){
+	function set_rel_relationship_names($build_rel2 = false) {
 
 		$this->rel1_relationship_name = $this->base_bean->field_defs[$this->base_vardef_field]['relationship'];
 
-	if($build_rel2==true){
+	if ($build_rel2 == true) {
 		$this->rel2_relationship_name = $this->rel1_bean->field_defs[$this->rel1_vardef_field]['relationship'];	
 	}	
 	
@@ -124,17 +124,17 @@ 
 	This function will build all the relationship info it can based on values set in the setup functions
 	When you use the info arrays (rel1_array) or (rel2_array), make sure you always check for empty values
 	*/
-	function build_info($build_rel2=false){
-		if($this->base_bean == null){
+	function build_info($build_rel2 = false) {
+		if ($this->base_bean == null) {
 			$this->base_bean = get_module_info($this->base_module);
 		}	
 		
-		if(empty($this->rel1_bean)){
+		if (empty($this->rel1_bean)) {
 			$this->build_rel1_info();
 			$this->rel1_module = $this->rel1_bean->module_dir;
 		}
 		
-		if($build_rel2==true && $this->rel2_bean==""){
+		if ($build_rel2 == true && $this->rel2_bean == "") {
 			$this->build_rel2_info();	
 			$this->rel2_module = $this->rel2_bean->module_dir;
 		}	
@@ -145,14 +145,14 @@ 
 	//end function build_info
 	}
 
-	function build_rel1_info(){
+	function build_rel1_info() {
 
 			$this->rel1_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field);	
 
 	//end function build_rel1_info
 	}	
 	
-	function build_rel2_info(){
+	function build_rel2_info() {
 
 			$this->rel2_bean = $this->trace_relationship_module($this->base_module, $this->base_vardef_field, $this->rel1_vardef_field);
 
@@ -164,29 +164,29 @@ 
 	the info arrays.  Does it for base, rel1, and rel2 if specified
 	*/
 	
-	function build_module_labels($build_rel2=false){
+	function build_module_labels($build_rel2 = false) {
 		global $app_list_strings;
 
 		///Base Module Labels
-		if(!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])){
+		if (!empty($app_list_strings['moduleList'][$this->base_bean->module_dir])) {
 			$this->base_array['plabel'] = $app_list_strings['moduleList'][$this->base_bean->module_dir];
 		} else {
 			$this->base_array['plabel'] = $this->base_bean->module_dir;
 		}	
-		if(!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])){
+		if (!empty($app_list_strings['moduleListSingular'][$this->base_bean->module_dir])) {
 			$this->base_array['slabel'] = $app_list_strings['moduleListSingular'][$this->base_bean->module_dir];
 		} else {
 			$this->base_array['slabel'] = $this->base_bean->object_name;
 		}	
 
 		///Rel1 Module Labels	
-		if(!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])){
+		if (!empty($app_list_strings['moduleList'][$this->rel1_bean->module_dir])) {
 			$this->rel1_array['plabel'] = $app_list_strings['moduleList'][$this->rel1_bean->module_dir];
 		} else {
 			$this->rel1_array['plabel'] = $this->rel1_bean->module_dir;
 		}
 		
-		if(!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])){
+		if (!empty($app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir])) {
 			$this->rel1_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel1_bean->module_dir];
 		} else {
 			$this->rel1_array['slabel'] = $this->rel1_bean->object_name;
@@ -194,14 +194,14 @@ 
 			
 		
 		//Rel2 Module Labels
-		if($build_rel2==true){
+		if ($build_rel2 == true) {
 			
-			if(!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])){
+			if (!empty($app_list_strings['moduleList'][$this->rel2_bean->module_dir])) {
 				$this->rel2_array['plabel'] = $app_list_strings['moduleList'][$this->rel2_bean->module_dir];
 			} else {
 				$this->rel2_array['plabel'] = $this->rel2_bean->module_dir;
 			}
-			if(!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])){
+			if (!empty($app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir])) {
 				$this->rel2_array['slabel'] = $app_list_strings['moduleListSingular'][$this->rel2_bean->module_dir];
 			} else {
 				$this->rel2_array['slabel'] = $this->rel2_bean->module_dir;
@@ -216,25 +216,25 @@ 
 	
 	
 	
-	function build_related_list($type="base"){
+	function build_related_list($type = "base") {
 		//type can be base, rel1
 		
 		$target_list = "";
 		
-		if($type=="base"){
+		if ($type == "base") {
 			$target_list = $this->base_bean->get_linked_beans($this->base_vardef_field, $this->rel1_bean->object_name);	
 		//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
+			if (empty($target_list)) {
 				$target_list = search_filter_rel_info($this->base_bean, $this->rel1_bean->module_dir, $this->base_vardef_field);
 			//end if the target list is empty	
 			}	
 		}	
 		
-		if($type=="rel1"){
+		if ($type == "rel1") {
 			$target_list = $this->rel1_bean->get_linked_beans($this->rel1_vardef_field, $this->rel2_bean->object_name);	
 			
 			//Possibility exists that this is a new relationship, so capture via relationship fields
-			if(empty($target_list)){
+			if (empty($target_list)) {
 				$target_list = search_filter_rel_info($this->rel1_bean, $this->rel2_bean->module_dir, $this->rel1_vardef_field);
 			//end if the target list is empty	
 			}	
@@ -250,7 +250,7 @@ 
 	
 ///////BEGIN Functions to find relationships/////////////////////////////////	
 	
-function get_relationship_information(& $target_bean, $get_upstream_rel_field_name = false){
+function get_relationship_information(& $target_bean, $get_upstream_rel_field_name = false) {
 	
 	$target_module_name = $target_bean->module_dir;
 	$current_module_name = $this->base_module;
@@ -260,18 +260,18 @@ 
 
 	
 	//Does a downstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
+	if ($rel_array != null) {
+		if ($rel_array['relationship_type'] == "many-to-many") {
 			$target_bean->$rel_array['join_key_lhs'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
 			}				
 		//end if many-to-many	
 		}	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
+		if ($rel_array['relationship_type'] == "one-to-many") {
 			$target_bean->$rel_array['rhs_key'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
 			}
 		//end if one-to-many
@@ -287,18 +287,18 @@ 
 	$rel_array = $this->retrieve_by_sides($target_module_name, $current_module_name, $this->db);
 	
 	//Does an upstream relationship exist
-	if($rel_array!=null){
-		if($rel_array['relationship_type']=="many-to-many"){
+	if ($rel_array != null) {
+		if ($rel_array['relationship_type'] == "many-to-many") {
 			$target_bean->$rel_array['join_key_rhs'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$target_bean->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
 			}				
 		//end if many-to-many	
 		}	
 		
-		if($rel_array['relationship_type']=="one-to-many"){
+		if ($rel_array['relationship_type'] == "one-to-many") {
 			$this->$rel_array['rhs_key'] = $this->base_bean->id;
-			if($rel_array['relationship_role_column']!=""){
+			if ($rel_array['relationship_role_column'] != "") {
 				$this->$rel_array['relationship_role_column'] = $rel_array['relationship_role_column_value'];
 			}
 		//end if one-to-many
@@ -306,9 +306,9 @@ 
 		
 		
 		///Fill additional id field if necessary
-		if(($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null){
+		if (($id_name = $this->traverse_rel_meta($current_module_name, $target_bean, $rel_array['relationship_name'])) != null) {
 			$target_bean->$id_name = $this->base_bean->id;
-            if($get_upstream_rel_field_name) {
+            if ($get_upstream_rel_field_name) {
                 $target_bean->new_rel_relname = $id_name;
                 $target_bean->new_rel_id = $this->base_bean->id;
             }
@@ -320,14 +320,14 @@ 
 //end function get_relationship_information
 }	
 
-function traverse_rel_meta($base_module, & $target_bean, $target_rel_name){
+function traverse_rel_meta($base_module, & $target_bean, $target_rel_name) {
 	$id_name = null;
 
 	//returns name of variable to store id in
 	//if none exists, then returns null
-	foreach($target_bean->field_defs as $field_array){
+	foreach ($target_bean->field_defs as $field_array) {
 		
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$target_rel_name){
+		if (!empty($field_array['relationship']) && $field_array['relationship'] == $target_rel_name) {
 			
 			$id_name = $this->get_id_name($target_bean, $field_array['name']);
 			return $id_name;
@@ -343,11 +343,11 @@ 
 }	
 	
 
-function get_id_name(& $target_bean, $field_name){
+function get_id_name(& $target_bean, $field_name) {
 	
-	foreach($target_bean->relationship_fields as $target_id => $rel_name){
+	foreach ($target_bean->relationship_fields as $target_id => $rel_name) {
 		
-		if($rel_name == $field_name){
+		if ($rel_name == $field_name) {
 			//relationship id found
 			return $target_id;
 		//end if match		
@@ -362,7 +362,7 @@ 
 ///////////////////////////END functions to find relationships //////////////////////
 
 
-function process_by_rel_bean($rel1_module){
+function process_by_rel_bean($rel1_module) {
 	
 	$this->rel1_relationship_name = $this::retrieve_by_modules($this->base_module, $rel1_module, $this->db);
 	$this->rel1_module = $rel1_module;
@@ -372,10 +372,10 @@ 
 }	
 
 
-function get_rel1_vardef_field_base($field_defs){
-	foreach($field_defs as $field_array){
+function get_rel1_vardef_field_base($field_defs) {
+	foreach ($field_defs as $field_array) {
 		
-		if(!empty($field_array['relationship']) && $field_array['relationship']==$this->rel1_relationship_name){
+		if (!empty($field_array['relationship']) && $field_array['relationship'] == $this->rel1_relationship_name) {
 			
 			$this->rel1_vardef_field_base = $field_array['name'];
 		//end if rel name match		
@@ -391,9 +391,9 @@ 
 }
 
 
-function get_farthest_reach(){
+function get_farthest_reach() {
 	
-	if($this->rel1_vardef_field!=""){
+	if ($this->rel1_vardef_field != "") {
 		//the farthest reach is rel2
 		$this->build_info(true);
 		return $this->rel2_bean;

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.

Doc Comments +3 added lines

@@ -320,6 +320,9 @@
 //end function get_relationship_information
 }	
 
+/**
+ * @param string $base_module
+ */
 function traverse_rel_meta($base_module, & $target_bean, $target_rel_name){
 	$id_name = null;
 

modules/Relationships/Relationship.php

Indentation +163 added lines, -163 removed lines

@@ -49,115 +49,115 @@ 
 
 class Relationship extends SugarBean {
 
-	var $object_name='Relationship';
-	var $module_dir = 'Relationships';
-	var $new_schema = true;
-	var $table_name = 'relationships';
-
-	var $id;
-	var $relationship_name;
-	var $lhs_module;
-	var $lhs_table;
-	var $lhs_key;
-	var $rhs_module;
-	var $rhs_table;
-	var $rhs_key;
-	var $join_table;
-	var $join_key_lhs;
-	var $join_key_rhs;
-	var $relationship_type;
-	var $relationship_role_column;
-	var $relationship_role_column_value;
-	var $reverse;
-
-	var $_self_referencing;
-
-	function Relationship() {
-		parent::SugarBean();
-	}
-
-	/*returns true if the relationship is self referencing. equality check is performed for both table and
+    var $object_name='Relationship';
+    var $module_dir = 'Relationships';
+    var $new_schema = true;
+    var $table_name = 'relationships';
+
+    var $id;
+    var $relationship_name;
+    var $lhs_module;
+    var $lhs_table;
+    var $lhs_key;
+    var $rhs_module;
+    var $rhs_table;
+    var $rhs_key;
+    var $join_table;
+    var $join_key_lhs;
+    var $join_key_rhs;
+    var $relationship_type;
+    var $relationship_role_column;
+    var $relationship_role_column_value;
+    var $reverse;
+
+    var $_self_referencing;
+
+    function Relationship() {
+        parent::SugarBean();
+    }
+
+    /*returns true if the relationship is self referencing. equality check is performed for both table and
 	 * key names.
 	 */
-	function is_self_referencing() {
-		if (empty($this->_self_referencing)) {
-			$this->_self_referencing=false;
+    function is_self_referencing() {
+        if (empty($this->_self_referencing)) {
+            $this->_self_referencing=false;
 
-			//is it self referencing, both table and key name from lhs and rhs should  be equal.
-			if ($this->lhs_table == $this->rhs_table && $this->lhs_key == $this->rhs_key) {
-				$this->_self_referencing=true;
-			}
-		}
-		return $this->_self_referencing;
-	}
+            //is it self referencing, both table and key name from lhs and rhs should  be equal.
+            if ($this->lhs_table == $this->rhs_table && $this->lhs_key == $this->rhs_key) {
+                $this->_self_referencing=true;
+            }
+        }
+        return $this->_self_referencing;
+    }
 
-	/*returns true if a relationship with provided name exists*/
-	static function exists($relationship_name,&$db) {
-		$query = "SELECT relationship_name FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
-			return true;
-		}
+    /*returns true if a relationship with provided name exists*/
+    static function exists($relationship_name,&$db) {
+        $query = "SELECT relationship_name FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	static function delete($relationship_name,&$db) {
+    static function delete($relationship_name,&$db) {
 
-		$query = "UPDATE relationships SET deleted=1 WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error updating relationships table for ".$relationship_name);
+        $query = "UPDATE relationships SET deleted=1 WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
+        $result = $db->query($query,true," Error updating relationships table for ".$relationship_name);
 
-	}
+    }
 
 
-	function get_other_module($relationship_name, $base_module, &$db){
-	//give it the relationship_name and base module
-	//it will return the module name on the other side of the relationship
+    function get_other_module($relationship_name, $base_module, &$db){
+    //give it the relationship_name and base module
+    //it will return the module name on the other side of the relationship
 
-		$query = "SELECT relationship_name, rhs_module, lhs_module FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
+        $query = "SELECT relationship_name, rhs_module, lhs_module FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
 
-			if($row['rhs_module']==$base_module){
-				return $row['lhs_module'];
-			}
-			if($row['lhs_module']==$base_module){
-				return $row['rhs_module'];
-			}
-		}
+            if($row['rhs_module']==$base_module){
+                return $row['lhs_module'];
+            }
+            if($row['lhs_module']==$base_module){
+                return $row['rhs_module'];
+            }
+        }
 
-		return false;
+        return false;
 
 
-	//end function get_other_module
-	}
+    //end function get_other_module
+    }
 
-	function retrieve_by_sides($lhs_module, $rhs_module, &$db){
-	//give it the relationship_name and base module
-	//it will return the module name on the other side of the relationship
+    function retrieve_by_sides($lhs_module, $rhs_module, &$db){
+    //give it the relationship_name and base module
+    //it will return the module name on the other side of the relationship
 
-		$query = "SELECT * FROM relationships WHERE deleted=0 AND lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
+        $query = "SELECT * FROM relationships WHERE deleted=0 AND lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."'";
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
 
-			return $row;
+            return $row;
 
-		}
+        }
 
-		return null;
+        return null;
 
 
-	//end function retrieve_by_sides
-	}
+    //end function retrieve_by_sides
+    }
 
-	static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type =''){
-	//give it the relationship_name and base module
-	//it will return the module name on the other side of the relationship
+    static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type =''){
+    //give it the relationship_name and base module
+    //it will return the module name on the other side of the relationship
 
-		$query = "	SELECT * FROM relationships
+        $query = "	SELECT * FROM relationships
 					WHERE deleted=0
 					AND (
 					(lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."')
@@ -165,113 +165,113 @@ 
 					(lhs_module = '".$rhs_module."' AND rhs_module = '".$lhs_module."')
 					)
 					";
-		if(!empty($type)){
-			$query .= " AND relationship_type='$type'";
-		}
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
-		if ($row != null) {
+        if(!empty($type)){
+            $query .= " AND relationship_type='$type'";
+        }
+        $result = $db->query($query,true," Error searching relationships table..");
+        $row  =  $db->fetchByAssoc($result);
+        if ($row != null) {
 
-			return $row['relationship_name'];
+            return $row['relationship_name'];
 
-		}
+        }
 
-		return null;
+        return null;
 
 
-	//end function retrieve_by_sides
-	}
+    //end function retrieve_by_sides
+    }
 
 
-	function retrieve_by_name($relationship_name) {
+    function retrieve_by_name($relationship_name) {
 
-		if (empty($GLOBALS['relationships'])) {
-			$this->load_relationship_meta();
-		}
+        if (empty($GLOBALS['relationships'])) {
+            $this->load_relationship_meta();
+        }
 
 //		_ppd($GLOBALS['relationships']);
 
-		if (array_key_exists($relationship_name, $GLOBALS['relationships'])) {
-
-			foreach($GLOBALS['relationships'][$relationship_name] as $field=>$value)
-			{
-					$this->$field = $value;
-			}
-		}
-		else {
-			$GLOBALS['log']->fatal('Error fetching relationship from cache '.$relationship_name);
-			return false;
-		}
-	}
-
-	function load_relationship_meta() {
-		if (!file_exists(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only())) {
-			$this->build_relationship_cache();
-		}
-		include(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only());
-		$GLOBALS['relationships']=$relationships;
-	}
-
-	function build_relationship_cache() {
-		$query="SELECT * from relationships where deleted=0";
-		$result=$this->db->query($query);
-
-		while (($row=$this->db->fetchByAssoc($result))!=null) {
-			$relationships[$row['relationship_name']] = $row;
-		}
+        if (array_key_exists($relationship_name, $GLOBALS['relationships'])) {
+
+            foreach($GLOBALS['relationships'][$relationship_name] as $field=>$value)
+            {
+                    $this->$field = $value;
+            }
+        }
+        else {
+            $GLOBALS['log']->fatal('Error fetching relationship from cache '.$relationship_name);
+            return false;
+        }
+    }
+
+    function load_relationship_meta() {
+        if (!file_exists(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only())) {
+            $this->build_relationship_cache();
+        }
+        include(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only());
+        $GLOBALS['relationships']=$relationships;
+    }
+
+    function build_relationship_cache() {
+        $query="SELECT * from relationships where deleted=0";
+        $result=$this->db->query($query);
+
+        while (($row=$this->db->fetchByAssoc($result))!=null) {
+            $relationships[$row['relationship_name']] = $row;
+        }
 		
-		sugar_mkdir($this->cache_file_dir(), null, true);
+        sugar_mkdir($this->cache_file_dir(), null, true);
         $out = "<?php \n \$relationships = " . var_export($relationships, true) . ";";
         sugar_file_put_contents_atomic(Relationship::cache_file_dir() . '/' . Relationship::cache_file_name_only(), $out);
 		
         require_once("data/Relationships/RelationshipFactory.php");
         SugarRelationshipFactory::deleteCache();
-	}
+    }
 
 
-	public static function cache_file_dir() {
-		return sugar_cached("modules/Relationships");
-	}
-	public static function cache_file_name_only() {
-		return 'relationships.cache.php';
-	}
+    public static function cache_file_dir() {
+        return sugar_cached("modules/Relationships");
+    }
+    public static function cache_file_name_only() {
+        return 'relationships.cache.php';
+    }
 	
-	public static function delete_cache() {
-		$filename=Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
-		if (file_exists($filename)) {
-			unlink($filename);
-		}
+    public static function delete_cache() {
+        $filename=Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
+        if (file_exists($filename)) {
+            unlink($filename);
+        }
         require_once("data/Relationships/RelationshipFactory.php");
         SugarRelationshipFactory::deleteCache();
-	}
+    }
 
 
-	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
-		global $beanList;
-		global $dictionary;
+    function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
+        global $beanList;
+        global $dictionary;
 
-		$temp_module = get_module_info($base_module);
+        $temp_module = get_module_info($base_module);
 
-		$rel_attribute1_name = $temp_module->field_defs[strtolower($rel_module1_name)]['relationship'];
-		$rel_module1 = $this->get_other_module($rel_attribute1_name, $base_module, $temp_module->db);
-		$rel_module1_bean = get_module_info($rel_module1);
+        $rel_attribute1_name = $temp_module->field_defs[strtolower($rel_module1_name)]['relationship'];
+        $rel_module1 = $this->get_other_module($rel_attribute1_name, $base_module, $temp_module->db);
+        $rel_module1_bean = get_module_info($rel_module1);
 
-		if($rel_module2_name!=""){
-			if($rel_module2_name == 'ProjectTask'){
-				$rel_module2_name = strtolower($rel_module2_name);
-			}
-			$rel_attribute2_name = $rel_module1_bean->field_defs[strtolower($rel_module2_name)]['relationship'];
-			$rel_module2 = $this->get_other_module($rel_attribute2_name, $rel_module1_bean->module_dir, $rel_module1_bean->db);
-			$rel_module2_bean = get_module_info($rel_module2);
-			return $rel_module2_bean;
+        if($rel_module2_name!=""){
+            if($rel_module2_name == 'ProjectTask'){
+                $rel_module2_name = strtolower($rel_module2_name);
+            }
+            $rel_attribute2_name = $rel_module1_bean->field_defs[strtolower($rel_module2_name)]['relationship'];
+            $rel_module2 = $this->get_other_module($rel_attribute2_name, $rel_module1_bean->module_dir, $rel_module1_bean->db);
+            $rel_module2_bean = get_module_info($rel_module2);
+            return $rel_module2_bean;
 
-		} else {
-			//no rel_module2, so return rel_module2 bean
-			return $rel_module1_bean;
-		}
+        } else {
+            //no rel_module2, so return rel_module2 bean
+            return $rel_module1_bean;
+        }
 
-	//end function trace_relationship_module
-	}
+    //end function trace_relationship_module
+    }
 
 
 

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -49,7 +49,7 @@ 
 
 class Relationship extends SugarBean {
 
-	var $object_name='Relationship';
+	var $object_name = 'Relationship';
 	var $module_dir = 'Relationships';
 	var $new_schema = true;
 	var $table_name = 'relationships';
@@ -81,21 +81,21 @@ 
 	 */
 	function is_self_referencing() {
 		if (empty($this->_self_referencing)) {
-			$this->_self_referencing=false;
+			$this->_self_referencing = false;
 
 			//is it self referencing, both table and key name from lhs and rhs should  be equal.
 			if ($this->lhs_table == $this->rhs_table && $this->lhs_key == $this->rhs_key) {
-				$this->_self_referencing=true;
+				$this->_self_referencing = true;
 			}
 		}
 		return $this->_self_referencing;
 	}
 
 	/*returns true if a relationship with provided name exists*/
-	static function exists($relationship_name,&$db) {
+	static function exists($relationship_name, &$db) {
 		$query = "SELECT relationship_name FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 			return true;
 		}
@@ -103,27 +103,27 @@ 
 		return false;
 	}
 
-	static function delete($relationship_name,&$db) {
+	static function delete($relationship_name, &$db) {
 
 		$query = "UPDATE relationships SET deleted=1 WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error updating relationships table for ".$relationship_name);
+		$result = $db->query($query, true, " Error updating relationships table for ".$relationship_name);
 
 	}
 
 
-	function get_other_module($relationship_name, $base_module, &$db){
+	function get_other_module($relationship_name, $base_module, &$db) {
 	//give it the relationship_name and base module
 	//it will return the module name on the other side of the relationship
 
 		$query = "SELECT relationship_name, rhs_module, lhs_module FROM relationships WHERE deleted=0 AND relationship_name = '".$relationship_name."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 
-			if($row['rhs_module']==$base_module){
+			if ($row['rhs_module'] == $base_module) {
 				return $row['lhs_module'];
 			}
-			if($row['lhs_module']==$base_module){
+			if ($row['lhs_module'] == $base_module) {
 				return $row['rhs_module'];
 			}
 		}
@@ -134,13 +134,13 @@ 
 	//end function get_other_module
 	}
 
-	function retrieve_by_sides($lhs_module, $rhs_module, &$db){
+	function retrieve_by_sides($lhs_module, $rhs_module, &$db) {
 	//give it the relationship_name and base module
 	//it will return the module name on the other side of the relationship
 
 		$query = "SELECT * FROM relationships WHERE deleted=0 AND lhs_module = '".$lhs_module."' AND rhs_module = '".$rhs_module."'";
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 
 			return $row;
@@ -153,7 +153,7 @@ 
 	//end function retrieve_by_sides
 	}
 
-	static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type =''){
+	static function retrieve_by_modules($lhs_module, $rhs_module, &$db, $type = '') {
 	//give it the relationship_name and base module
 	//it will return the module name on the other side of the relationship
 
@@ -165,11 +165,11 @@ 
 					(lhs_module = '".$rhs_module."' AND rhs_module = '".$lhs_module."')
 					)
 					";
-		if(!empty($type)){
+		if (!empty($type)) {
 			$query .= " AND relationship_type='$type'";
 		}
-		$result = $db->query($query,true," Error searching relationships table..");
-		$row  =  $db->fetchByAssoc($result);
+		$result = $db->query($query, true, " Error searching relationships table..");
+		$row = $db->fetchByAssoc($result);
 		if ($row != null) {
 
 			return $row['relationship_name'];
@@ -193,7 +193,7 @@ 
 
 		if (array_key_exists($relationship_name, $GLOBALS['relationships'])) {
 
-			foreach($GLOBALS['relationships'][$relationship_name] as $field=>$value)
+			foreach ($GLOBALS['relationships'][$relationship_name] as $field=>$value)
 			{
 					$this->$field = $value;
 			}
@@ -209,20 +209,20 @@ 
 			$this->build_relationship_cache();
 		}
 		include(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only());
-		$GLOBALS['relationships']=$relationships;
+		$GLOBALS['relationships'] = $relationships;
 	}
 
 	function build_relationship_cache() {
-		$query="SELECT * from relationships where deleted=0";
-		$result=$this->db->query($query);
+		$query = "SELECT * from relationships where deleted=0";
+		$result = $this->db->query($query);
 
-		while (($row=$this->db->fetchByAssoc($result))!=null) {
+		while (($row = $this->db->fetchByAssoc($result)) != null) {
 			$relationships[$row['relationship_name']] = $row;
 		}
 		
 		sugar_mkdir($this->cache_file_dir(), null, true);
-        $out = "<?php \n \$relationships = " . var_export($relationships, true) . ";";
-        sugar_file_put_contents_atomic(Relationship::cache_file_dir() . '/' . Relationship::cache_file_name_only(), $out);
+        $out = "<?php \n \$relationships = ".var_export($relationships, true).";";
+        sugar_file_put_contents_atomic(Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only(), $out);
 		
         require_once("data/Relationships/RelationshipFactory.php");
         SugarRelationshipFactory::deleteCache();
@@ -237,7 +237,7 @@ 
 	}
 	
 	public static function delete_cache() {
-		$filename=Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
+		$filename = Relationship::cache_file_dir().'/'.Relationship::cache_file_name_only();
 		if (file_exists($filename)) {
 			unlink($filename);
 		}
@@ -246,7 +246,7 @@ 
 	}
 
 
-	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
+	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name = "") {
 		global $beanList;
 		global $dictionary;
 
@@ -256,8 +256,8 @@ 
 		$rel_module1 = $this->get_other_module($rel_attribute1_name, $base_module, $temp_module->db);
 		$rel_module1_bean = get_module_info($rel_module1);
 
-		if($rel_module2_name!=""){
-			if($rel_module2_name == 'ProjectTask'){
+		if ($rel_module2_name != "") {
+			if ($rel_module2_name == 'ProjectTask') {
 				$rel_module2_name = strtolower($rel_module2_name);
 			}
 			$rel_attribute2_name = $rel_module1_bean->field_defs[strtolower($rel_module2_name)]['relationship'];

Braces +4 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.
@@ -197,8 +199,7 @@ 
 			{
 					$this->$field = $value;
 			}
-		}
-		else {
+		} else {
 			$GLOBALS['log']->fatal('Error fetching relationship from cache '.$relationship_name);
 			return false;
 		}

Doc Comments +3 added lines

@@ -246,6 +246,9 @@
 	}
 
 
+	/**
+	 * @param string $base_module
+	 */
 	function trace_relationship_module($base_module, $rel_module1_name, $rel_module2_name=""){
 		global $beanList;
 		global $dictionary;

modules/jjwg_Maps/jjwg_Maps_Router.php

Indentation +24 added lines, -24 removed lines

@@ -11,21 +11,21 @@ 
 
 if (!empty($_REQUEST['cron'])) {
   
-  require_once('modules/jjwg_Maps/jjwg_Maps.php');
-  require_once('modules/jjwg_Maps/controller.php');
-  /*
+    require_once('modules/jjwg_Maps/jjwg_Maps.php');
+    require_once('modules/jjwg_Maps/controller.php');
+    /*
    * This script can be used as an entry point for a cron
    * job to run the address geocoding on a regular basis.
    * index.php?module=jjwg_Maps&entryPoint=jjwg_Maps&cron=1&limit=2500
    */
-  $controller = new jjwg_MapsController();
-  $controller->action_geocode_addresses();
+    $controller = new jjwg_MapsController();
+    $controller->action_geocode_addresses();
   
-  exit;
+    exit;
 
 } else {
   
-  /*
+    /*
    * This script is also used to pass selected records from 
    * a module list view to the Maps Module (jjwg_Maps).
    *
@@ -45,25 +45,25 @@ 
    * 4.) Parameter Search - Checked Records - Map
    *     Uses 'uid'(s) parameter to define search
    */
-  //echo 'Test:<pre>'."\n";
-  //foreach (array_keys($_REQUEST) as $key) {
-  //  echo 'Name: '.htmlspecialchars($key).'  Value: '.htmlspecialchars($_REQUEST[$key])."\n";
-  //}
+    //echo 'Test:<pre>'."\n";
+    //foreach (array_keys($_REQUEST) as $key) {
+    //  echo 'Name: '.htmlspecialchars($key).'  Value: '.htmlspecialchars($_REQUEST[$key])."\n";
+    //}
   
-  // Redirect parameters to view/action using Javascript form post.
-  echo '<html><head></head><body>';
-  echo '<form name="redirect" action="index.php" method="POST">'."\n";
-  echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
-  echo '<input type="hidden" name="action" value="map_display">'."\n";
-  foreach (array_keys($_REQUEST) as $key) {
+    // Redirect parameters to view/action using Javascript form post.
+    echo '<html><head></head><body>';
+    echo '<form name="redirect" action="index.php" method="POST">'."\n";
+    echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
+    echo '<input type="hidden" name="action" value="map_display">'."\n";
+    foreach (array_keys($_REQUEST) as $key) {
     if (!in_array($key, array('action','module','entryPoint','display_module', 'quick_address'))) {
-      echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
+        echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
     }
-  }
-  echo '<input type="hidden" name="display_module" value="'.htmlspecialchars($_REQUEST['display_module']).'">'."\n";
-  echo '</form>'."\n";
-  echo '<script language="javascript" type="text/javascript">document.redirect.submit();</script>'."\n"; 
-  echo '</body></html>';
+    }
+    echo '<input type="hidden" name="display_module" value="'.htmlspecialchars($_REQUEST['display_module']).'">'."\n";
+    echo '</form>'."\n";
+    echo '<script language="javascript" type="text/javascript">document.redirect.submit();</script>'."\n"; 
+    echo '</body></html>';
   
-  exit;
+    exit;
 }

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');
 
 require_once('include/utils.php');
 require_once('include/export_utils.php');
@@ -56,7 +56,7 @@ 
   echo '<input type="hidden" name="module" value="jjwg_Maps">'."\n";
   echo '<input type="hidden" name="action" value="map_display">'."\n";
   foreach (array_keys($_REQUEST) as $key) {
-    if (!in_array($key, array('action','module','entryPoint','display_module', 'quick_address'))) {
+    if (!in_array($key, array('action', 'module', 'entryPoint', 'display_module', 'quick_address'))) {
       echo '<input type="hidden" name="'.htmlspecialchars($key).'" value="'.htmlspecialchars($_REQUEST[$key]).'">'."\n";
     }
   }

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/jjwg_Maps/views/view.geocoding_test.php

Indentation +8 added lines, -8 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewGeocoding_Test extends SugarView {
 
- 	function Jjwg_MapsViewGeocoding_Test() {
- 		parent::SugarView();
- 	}
+        function Jjwg_MapsViewGeocoding_Test() {
+            parent::SugarView();
+        }
 
-	function display() {
+    function display() {
 		
         if (!isset($_REQUEST['geocoding_address'])) $_REQUEST['geocoding_address'] = '';
 ?>
@@ -30,13 +30,13 @@ 
 <?php
     if (!empty($_REQUEST['process_trigger'])) { 
     
-      echo '<br /><br /><pre>';
-      print_r($this->bean->geocoding_results);
-      echo '</pre><br /><br />';
+        echo '<br /><br /><pre>';
+        print_r($this->bean->geocoding_results);
+        echo '</pre><br /><br />';
     
     }
 
-  }
+    }
 }
 
 ?>
\ No newline at end of file

Braces +7 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 
 class Jjwg_MapsViewGeocoding_Test extends SugarView {
 
@@ -10,8 +12,10 @@ 
 
 	function display() {
 		
-        if (!isset($_REQUEST['geocoding_address'])) $_REQUEST['geocoding_address'] = '';
-?>
+        if (!isset($_REQUEST['geocoding_address'])) {
+            $_REQUEST['geocoding_address'] = '';
+        }
+        ?>
 
 <div class="moduleTitle"><h2><?php echo $GLOBALS['mod_strings']['LBL_MAP_ADDRESS_TEST']; ?></h2><div class="clear"></div></div>
 <div class="clear"></div>

Spacing +1 added lines, -1 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.

modules/jjwg_Maps/views/view.quick_radius_display.php

Indentation +7 added lines, -7 removed lines

@@ -4,18 +4,18 @@ 
 
 class Jjwg_MapsViewQuick_Radius_Display extends SugarView {
 
-  function Jjwg_MapsViewQuick_Radius_Display() {
+    function Jjwg_MapsViewQuick_Radius_Display() {
     parent::SugarView();
-  }
+    }
   
-  function display() {
+    function display() {
     
     $url = 'index.php?module='.$GLOBALS['currentModule'].'&action=map_markers';
     foreach (array_keys($_REQUEST) as $key) {
-      // Exclude certain request parameters
-      if (!in_array($key, array('action', 'module', 'entryPoint', 'record', 'relate_id'))) {
+        // Exclude certain request parameters
+        if (!in_array($key, array('action', 'module', 'entryPoint', 'record', 'relate_id'))) {
         $url .= '&'.$key.'='.urlencode($_REQUEST[$key]);
-      }
+        }
     }
     
 ?>
@@ -30,5 +30,5 @@ 
 
 <?php
 
- 	}
+        }
 }

Spacing +1 added lines, -1 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.

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/jjwg_Maps/views/view.map_display.php

Indentation +6 added lines, -6 removed lines

@@ -4,18 +4,18 @@ 
 
 class Jjwg_MapsViewMap_Display extends SugarView {
 
-  function Jjwg_MapsViewMap_Display() {
+    function Jjwg_MapsViewMap_Display() {
     parent::SugarView();
-  }
+    }
   
-  function display() {
+    function display() {
     // Limit URI query string parameters. Used to avoid URL length errors.
     $valid_names = array('action', 'module', 'entryPoint', 'submit', 'cron', 'geocoding_process', 'process_trigger', 'distance', 'unit_type', 'record', 'related_id', 'related_module', 'quick_address', 'display_module', 'list_id', 'uid', 'current_post');
     $url = $GLOBALS['sugar_config']['site_url'] . '/index.php?module=' . $GLOBALS['currentModule'] . '&action=map_markers';
     foreach (array_keys($_REQUEST) as $key) {
-      if (in_array($key, $valid_names) && !in_array($key, array('action', 'module', 'entryPoint'))) {
+        if (in_array($key, $valid_names) && !in_array($key, array('action', 'module', 'entryPoint'))) {
         $url .= '&'.$key.'='.urlencode($_REQUEST[$key]);
-      }
+        }
     }
     
 ?>
@@ -76,5 +76,5 @@ 
 
 <?php
 
-  }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 class Jjwg_MapsViewMap_Display extends SugarView {
 
@@ -11,7 +11,7 @@ 
   function display() {
     // Limit URI query string parameters. Used to avoid URL length errors.
     $valid_names = array('action', 'module', 'entryPoint', 'submit', 'cron', 'geocoding_process', 'process_trigger', 'distance', 'unit_type', 'record', 'related_id', 'related_module', 'quick_address', 'display_module', 'list_id', 'uid', 'current_post');
-    $url = $GLOBALS['sugar_config']['site_url'] . '/index.php?module=' . $GLOBALS['currentModule'] . '&action=map_markers';
+    $url = $GLOBALS['sugar_config']['site_url'].'/index.php?module='.$GLOBALS['currentModule'].'&action=map_markers';
     foreach (array_keys($_REQUEST) as $key) {
       if (in_array($key, $valid_names) && !in_array($key, array('action', 'module', 'entryPoint'))) {
         $url .= '&'.$key.'='.urlencode($_REQUEST[$key]);

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.