adamjakab / SuiteCRM

data/Relationships/M2MRelationship.php

Indentation +66 added lines, -66 removed lines

@@ -131,28 +131,28 @@ 
         $lhsLinkName = $this->lhsLink;
         $rhsLinkName = $this->rhsLink;
         
-    	/* BEGIN - SECURITY GROUPS */
-    	//Need to hijack this as security groups will not contain a link on the module side
-    	//due to the way the module works. Plus it would remove the relative ease of adding custom module support
+        /* BEGIN - SECURITY GROUPS */
+        //Need to hijack this as security groups will not contain a link on the module side
+        //due to the way the module works. Plus it would remove the relative ease of adding custom module support
     	
-    	if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') {
-			$rhs->$rhsLinkName->addBean($lhs);			
-			$this->callBeforeAdd($rhs, $lhs, $rhsLinkName);
-
-			$dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
-			$this->addRow($dataToInsert);
-    		$rhs->$rhsLinkName->addBean($lhs);
-    		$this->callAfterAdd($lhs, $rhs, $lhsLinkName);
-    	} else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') {
-			$lhs->$lhsLinkName->addBean($rhs);			
-			$this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
-
-			$dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
-			$this->addRow($dataToInsert);
-    		$lhs->$lhsLinkName->addBean($rhs);
-    		$this->callAfterAdd($rhs, $lhs, $rhsLinkName);
-    	} else {
-    	/* END - SECURITY GROUPS */
+        if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') {
+            $rhs->$rhsLinkName->addBean($lhs);			
+            $this->callBeforeAdd($rhs, $lhs, $rhsLinkName);
+
+            $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
+            $this->addRow($dataToInsert);
+            $rhs->$rhsLinkName->addBean($lhs);
+            $this->callAfterAdd($lhs, $rhs, $lhsLinkName);
+        } else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') {
+            $lhs->$lhsLinkName->addBean($rhs);			
+            $this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
+
+            $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
+            $this->addRow($dataToInsert);
+            $lhs->$lhsLinkName->addBean($rhs);
+            $this->callAfterAdd($rhs, $lhs, $rhsLinkName);
+        } else {
+        /* END - SECURITY GROUPS */
 
         if (empty($lhs->$lhsLinkName) && !$lhs->load_relationship($lhsLinkName))
         {
@@ -262,50 +262,50 @@ 
             return false;
         }
         
-    	/* BEGIN - SECURITY GROUPS */
-    	//Need to hijack this as security groups will not contain a link on the module side
-    	//due to the way the module works. Plus it would remove the relative ease of adding custom module support
+        /* BEGIN - SECURITY GROUPS */
+        //Need to hijack this as security groups will not contain a link on the module side
+        //due to the way the module works. Plus it would remove the relative ease of adding custom module support
     	
-    	if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') {
-			$dataToRemove = array(
-				$this->def['join_key_lhs'] => $lhs->id,
-				$this->def['join_key_rhs'] => $rhs->id
-			);
-
-
-              if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
-              {
-                  if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
-                  {
-                      $lhs->$lhsLinkName->load();
-                      $this->callBeforeDelete($lhs, $rhs, $lhsLinkName);
-                  }
-
-                  if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
-                  {
-                      $rhs->$rhsLinkName->load();
-                      $this->callBeforeDelete($rhs, $lhs, $rhsLinkName);
-                  }
-              }
-
-			$this->removeRow($dataToRemove);
+        if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') {
+            $dataToRemove = array(
+                $this->def['join_key_lhs'] => $lhs->id,
+                $this->def['join_key_rhs'] => $rhs->id
+            );
+
+
+                if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+                {
+                    if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
+                    {
+                        $lhs->$lhsLinkName->load();
+                        $this->callBeforeDelete($lhs, $rhs, $lhsLinkName);
+                    }
+
+                    if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
+                    {
+                        $rhs->$rhsLinkName->load();
+                        $this->callBeforeDelete($rhs, $lhs, $rhsLinkName);
+                    }
+                }
+
+            $this->removeRow($dataToRemove);
 			
-			if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
-			{
-				if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
-				{
-					$lhs->$lhsLinkName->load();
-					$this->callAfterDelete($lhs, $rhs, $lhsLinkName);
-				}
-
-				if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
-				{
-					$rhs->$rhsLinkName->load();
-					$this->callAfterDelete($rhs, $lhs, $rhsLinkName);
-				}
-			}
-		} else {
-    	/* END - SECURITY GROUPS */        
+            if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+            {
+                if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2)
+                {
+                    $lhs->$lhsLinkName->load();
+                    $this->callAfterDelete($lhs, $rhs, $lhsLinkName);
+                }
+
+                if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2)
+                {
+                    $rhs->$rhsLinkName->load();
+                    $this->callAfterDelete($rhs, $lhs, $rhsLinkName);
+                }
+            }
+        } else {
+        /* END - SECURITY GROUPS */        
         if (empty($lhs->$lhsLinkName) && !$lhs->load_relationship($lhsLinkName))
         {
             $GLOBALS['log']->fatal("could not load LHS $lhsLinkName");
@@ -512,9 +512,9 @@ 
         //First join the relationship table
         $join .= "$join_type $joinTableWithAlias ON $join1 AND $joinTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($joinTable) . "\n"
+                . $this->getRoleWhere($joinTable) . "\n"
         //Then finally join the related module's table
-               . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n";
+                . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n";
 
         if($return_array){
             return array(
@@ -566,7 +566,7 @@ 
         //First join the relationship table
         $query .= "$join_type $joinTableWithAlias ON $where AND $joinTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($joinTable, $ignoreRole) . "\n";
+                . $this->getRoleWhere($joinTable, $ignoreRole) . "\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;

Spacing +35 added lines, -35 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.
@@ -73,14 +73,14 @@ 
      */
     public function getLinkedDefForModuleByRelationship($module)
     {
-        $results = VardefManager::getLinkFieldForRelationship( $module, BeanFactory::getObjectName($module), $this->name);
+        $results = VardefManager::getLinkFieldForRelationship($module, BeanFactory::getObjectName($module), $this->name);
         //Only a single link was found
-        if( isset($results['name']) )
+        if (isset($results['name']))
         {
             return $results;
         }
         //Multiple links with same relationship name
-        else if( is_array($results) )
+        else if (is_array($results))
         {
             $GLOBALS['log']->error("Warning: Multiple links found for relationship {$this->name} within module {$module}");
             return $this->getMostAppropriateLinkedDefinition($results);
@@ -101,17 +101,17 @@ 
     protected function getMostAppropriateLinkedDefinition($links)
     {
         //First priority is to find a link name that matches the relationship name
-        foreach($links as $link)
+        foreach ($links as $link)
         {
-            if( isset($link['name']) && $link['name'] == $this->name )
+            if (isset($link['name']) && $link['name'] == $this->name)
             {
                 return $link;
             }
         }
         //Next would be a relationship that has a side defined
-        foreach($links as $link)
+        foreach ($links as $link)
         {
-            if( isset($link['id_name']))
+            if (isset($link['id_name']))
             {
                 return $link;
             }
@@ -135,7 +135,7 @@ 
     	//Need to hijack this as security groups will not contain a link on the module side
     	//due to the way the module works. Plus it would remove the relative ease of adding custom module support
     	
-    	if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') {
+    	if (get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') {
 			$rhs->$rhsLinkName->addBean($lhs);			
 			$this->callBeforeAdd($rhs, $lhs, $rhsLinkName);
 
@@ -143,7 +143,7 @@ 
 			$this->addRow($dataToInsert);
     		$rhs->$rhsLinkName->addBean($lhs);
     		$this->callAfterAdd($lhs, $rhs, $lhsLinkName);
-    	} else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') {
+    	} else if (get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') {
 			$lhs->$lhsLinkName->addBean($rhs);			
 			$this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
 
@@ -205,14 +205,14 @@ 
         );
 
 
-        if (!empty($this->def['relationship_role_column']) && !empty($this->def['relationship_role_column_value']) && !$this->ignore_role_filter )
+        if (!empty($this->def['relationship_role_column']) && !empty($this->def['relationship_role_column_value']) && !$this->ignore_role_filter)
         {
             $row[$this->relationship_role_column] = $this->relationship_role_column_value;
         }
 
         if (!empty($this->def['fields']))
         {
-            foreach($this->def['fields'] as $fieldDef)
+            foreach ($this->def['fields'] as $fieldDef)
             {
                 if (!empty($fieldDef['name']) && !isset($row[$fieldDef['name']]) && !empty($fieldDef['default']))
                 {
@@ -246,7 +246,7 @@ 
 
     public function remove($lhs, $rhs)
     {
-        if(!($lhs instanceof SugarBean) || !($rhs instanceof SugarBean)) {
+        if (!($lhs instanceof SugarBean) || !($rhs instanceof SugarBean)) {
             $GLOBALS['log']->fatal("LHS and RHS must be beans");
             return false;
         }
@@ -266,7 +266,7 @@ 
     	//Need to hijack this as security groups will not contain a link on the module side
     	//due to the way the module works. Plus it would remove the relative ease of adding custom module support
     	
-    	if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') {
+    	if (get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') {
 			$dataToRemove = array(
 				$this->def['join_key_lhs'] => $lhs->id,
 				$this->def['join_key_rhs'] => $rhs->id
@@ -426,12 +426,12 @@ 
         }
         $rel_table = $this->getRelationshipTable();
 
-        $where = "$rel_table.$knownKey = '{$link->getFocus()->id}'" . $this->getRoleWhere();
+        $where = "$rel_table.$knownKey = '{$link->getFocus()->id}'".$this->getRoleWhere();
         $order_by = '';
 
         //Add any optional where clause
         if (!empty($params['where'])) {
-            $add_where = is_string($params['where']) ? $params['where'] : "$whereTable." . $this->getOptionalWhereClause($params['where']);
+            $add_where = is_string($params['where']) ? $params['where'] : "$whereTable.".$this->getOptionalWhereClause($params['where']);
             if (!empty($add_where))
                 $where .= " AND $add_where";
         }
@@ -442,7 +442,7 @@ 
         }
 
         $deleted = !empty($params['deleted']) ? 1 : 0;
-        $from = $rel_table . " ";
+        $from = $rel_table." ";
         if (!empty($params['where']) || !empty($params['order_by'])) {
             $from .= ", $whereTable";
             if (isset($relatedSeed->custom_fields)) {
@@ -454,7 +454,7 @@ 
 
         if (empty($params['return_as_array'])) {
             $query = "SELECT $targetKey id FROM $from WHERE $where AND $rel_table.deleted=$deleted";
-            if(!empty($order_by)) $query .= ' ORDER BY '.$order_by;
+            if (!empty($order_by)) $query .= ' ORDER BY '.$order_by;
             //Limit is not compatible with return_as_array
             if (!empty($params['limit']) && $params['limit'] > 0) {
                 $offset = isset($params['offset']) ? $params['offset'] : 0;
@@ -488,19 +488,19 @@ 
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetTableWithAlias = $targetTable;
         $targetKey = $linkIsLHS ? $this->def['rhs_key'] : $this->def['lhs_key'];
-        $join_type= isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
+        $join_type = isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
 
         $join = '';
 
         //Set up any table aliases required
         if (!empty($params['join_table_link_alias']))
         {
-            $joinTableWithAlias = $joinTable . " ". $params['join_table_link_alias'];
+            $joinTableWithAlias = $joinTable." ".$params['join_table_link_alias'];
             $joinTable = $params['join_table_link_alias'];
         }
-        if ( ! empty($params['join_table_alias']))
+        if (!empty($params['join_table_alias']))
         {
-            $targetTableWithAlias = $targetTable . " ". $params['join_table_alias'];
+            $targetTableWithAlias = $targetTable." ".$params['join_table_alias'];
             $targetTable = $params['join_table_alias'];
         }
 
@@ -512,11 +512,11 @@ 
         //First join the relationship table
         $join .= "$join_type $joinTableWithAlias ON $join1 AND $joinTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($joinTable) . "\n"
+               . $this->getRoleWhere($joinTable)."\n"
         //Then finally join the related module's table
                . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n";
 
-        if($return_array){
+        if ($return_array) {
             return array(
                 'join' => $join,
                 'type' => $this->type,
@@ -526,7 +526,7 @@ 
                 'select' => "$targetTable.id",
             );
         }
-        return $join . $where;
+        return $join.$where;
     }
 
     /**
@@ -540,21 +540,21 @@ 
     public function getSubpanelQuery($link, $params = array(), $return_array = false)
     {
         $targetIsLHS = $link->getSide() == REL_RHS;
-        $startingTable = $targetIsLHS ? $this->def['lhs_table'] : $this->def['rhs_table'];;
+        $startingTable = $targetIsLHS ? $this->def['lhs_table'] : $this->def['rhs_table']; ;
         $startingKey = $targetIsLHS ? $this->def['lhs_key'] : $this->def['rhs_key'];
         $startingJoinKey = $targetIsLHS ? $this->def['join_key_lhs'] : $this->def['join_key_rhs'];
         $joinTable = $this->getRelationshipTable();
         $joinTableWithAlias = $joinTable;
         $joinKey = $targetIsLHS ? $this->def['join_key_rhs'] : $this->def['join_key_lhs'];
         $targetKey = $targetIsLHS ? $this->def['rhs_key'] : $this->def['lhs_key'];
-        $join_type= isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
+        $join_type = isset($params['join_type']) ? $params['join_type'] : ' INNER JOIN ';
 
         $query = '';
 
         //Set up any table aliases required
         if (!empty($params['join_table_link_alias']))
         {
-            $joinTableWithAlias = $joinTable . " ". $params['join_table_link_alias'];
+            $joinTableWithAlias = $joinTable." ".$params['join_table_link_alias'];
             $joinTable = $params['join_table_link_alias'];
         }
 
@@ -566,12 +566,12 @@ 
         //First join the relationship table
         $query .= "$join_type $joinTableWithAlias ON $where AND $joinTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($joinTable, $ignoreRole) . "\n";
+               . $this->getRoleWhere($joinTable, $ignoreRole)."\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;
         }
-        if($return_array){
+        if ($return_array) {
             return array(
                 'join' => $query,
                 'type' => $this->type,
@@ -594,11 +594,11 @@ 
             //role column value.
             if (empty($this->relationship_role_column_value))
             {
-                $ret.=' IS NULL';
+                $ret .= ' IS NULL';
             } else {
-                $ret.= "='".$this->relationship_role_column_value."'";
+                $ret .= "='".$this->relationship_role_column_value."'";
             }
-            $ret.= "\n";
+            $ret .= "\n";
         }
         return $ret;
     }
@@ -613,7 +613,7 @@ 
         $query = "SELECT id FROM {$this->getRelationshipTable()} WHERE {$this->join_key_lhs} = '{$lhs->id}' AND {$this->join_key_rhs} = '{$rhs->id}'";
 
         //Roles can allow for multiple links between two records with different roles
-        $query .= $this->getRoleWhere() . " and deleted = 0";
+        $query .= $this->getRoleWhere()." and deleted = 0";
 
         return $GLOBALS['db']->getOne($query);
     }
@@ -638,7 +638,7 @@ 
     {
         if (!empty($this->def['table']))
             return $this->def['table'];
-        else if(!empty($this->def['join_table']))
+        else if (!empty($this->def['join_table']))
             return $this->def['join_table'];
 
         return false;

Braces +33 added lines, -22 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.
@@ -84,8 +86,7 @@ 
         {
             $GLOBALS['log']->error("Warning: Multiple links found for relationship {$this->name} within module {$module}");
             return $this->getMostAppropriateLinkedDefinition($results);
-        }
-        else
+        } else
         {
             return FALSE;
         }
@@ -178,8 +179,9 @@ 
 
         $this->addRow($dataToInsert);
 
-        if ($this->self_referencing)
-            $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        if ($this->self_referencing) {
+                    $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        }
 
             $lhs->$lhsLinkName->addBean($rhs);
             $rhs->$rhsLinkName->addBean($lhs);
@@ -339,8 +341,9 @@ 
 
         $this->removeRow($dataToRemove);
 
-        if ($this->self_referencing)
-            $this->removeSelfReferencing($lhs, $rhs);
+        if ($this->self_referencing) {
+                    $this->removeSelfReferencing($lhs, $rhs);
+        }
 
         if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
         {
@@ -395,8 +398,9 @@ 
         $idField = $link->getSide() == REL_LHS ? $this->def['join_key_rhs'] : $this->def['join_key_lhs'];
         while ($row = $db->fetchByAssoc($result, FALSE))
         {
-            if (empty($row['id']) && empty($row[$idField]))
-                continue;
+            if (empty($row['id']) && empty($row[$idField])) {
+                            continue;
+            }
             $id = empty($row['id']) ? $row[$idField] : $row['id'];
             $rows[$id] = $row;
         }
@@ -414,15 +418,17 @@ 
             $targetKey = $this->def['join_key_rhs'];
             $relatedSeed = BeanFactory::getBean($this->getRHSModule());
             $relatedSeedKey = $this->def['rhs_key'];
-            if (!empty($params['where']) || !empty($params['order_by']))
-                $whereTable = (empty($params['right_join_table_alias']) ? $relatedSeed->table_name : $params['right_join_table_alias']);
+            if (!empty($params['where']) || !empty($params['order_by'])) {
+                            $whereTable = (empty($params['right_join_table_alias']) ? $relatedSeed->table_name : $params['right_join_table_alias']);
+            }
         } else {
             $knownKey = $this->def['join_key_rhs'];
             $targetKey = $this->def['join_key_lhs'];
             $relatedSeed = BeanFactory::getBean($this->getLHSModule());
             $relatedSeedKey = $this->def['lhs_key'];
-            if (!empty($params['where']) || !empty($params['order_by']))
-                $whereTable = (empty($params['left_join_table_alias']) ? $relatedSeed->table_name : $params['left_join_table_alias']);
+            if (!empty($params['where']) || !empty($params['order_by'])) {
+                            $whereTable = (empty($params['left_join_table_alias']) ? $relatedSeed->table_name : $params['left_join_table_alias']);
+            }
         }
         $rel_table = $this->getRelationshipTable();
 
@@ -432,8 +438,9 @@ 
         //Add any optional where clause
         if (!empty($params['where'])) {
             $add_where = is_string($params['where']) ? $params['where'] : "$whereTable." . $this->getOptionalWhereClause($params['where']);
-            if (!empty($add_where))
-                $where .= " AND $add_where";
+            if (!empty($add_where)) {
+                            $where .= " AND $add_where";
+            }
         }
 
         //Add any optional order clauses
@@ -454,7 +461,9 @@ 
 
         if (empty($params['return_as_array'])) {
             $query = "SELECT $targetKey id FROM $from WHERE $where AND $rel_table.deleted=$deleted";
-            if(!empty($order_by)) $query .= ' ORDER BY '.$order_by;
+            if(!empty($order_by)) {
+                $query .= ' ORDER BY '.$order_by;
+            }
             //Limit is not compatible with return_as_array
             if (!empty($params['limit']) && $params['limit'] > 0) {
                 $offset = isset($params['offset']) ? $params['offset'] : 0;
@@ -636,18 +645,20 @@ 
 
     public function getRelationshipTable()
     {
-        if (!empty($this->def['table']))
-            return $this->def['table'];
-        else if(!empty($this->def['join_table']))
-            return $this->def['join_table'];
+        if (!empty($this->def['table'])) {
+                    return $this->def['table'];
+        } else if(!empty($this->def['join_table'])) {
+                    return $this->def['join_table'];
+        }
 
         return false;
     }
 
     public function getFields()
     {
-        if (!empty($this->def['fields']))
-            return $this->def['fields'];
+        if (!empty($this->def['fields'])) {
+                    return $this->def['fields'];
+        }
         $fields = array(
             "id" => array('name' => 'id'),
             'date_modified' => array('name' => 'date_modified'),

Doc Comments +4 added lines, -4 removed lines

@@ -365,8 +365,8 @@ 
 
     /**
      * Removes the reversed version of this relationship
-     * @param $lhs
-     * @param $rhs
+     * @param SugarBean $lhs
+     * @param SugarBean $rhs
      * @param array $additionalFields
      * @return void
      */
@@ -383,7 +383,7 @@ 
     }
 
     /**
-     * @param  $link Link2 loads the relationship for this link.
+     * @param  Link2 $link Link2 loads the relationship for this link.
      * @return void
      */
     public function load($link, $params = array())
@@ -532,7 +532,7 @@ 
     /**
      * Similar to getQuery or Get join, except this time we are starting from the related table and
      * searching for items with id's matching the $link->focus->id
-     * @param  $link
+     * @param  Link2 $link
      * @param array $params
      * @param bool $return_array
      * @return String|Array

data/Relationships/One2MRelationship.php

Indentation +26 added lines, -26 removed lines

@@ -100,7 +100,7 @@ 
             );
             if (!isset($this->lhsLinkDef['name']) && isset($this->lhsLinkDef[0]))
             {
-              $this->lhsLinkDef = $this->lhsLinkDef[0];
+                $this->lhsLinkDef = $this->lhsLinkDef[0];
             }
             if (!isset($this->rhsLinkDef['name']) && isset($this->rhsLinkDef[0])) {
                 $this->rhsLinkDef = $this->rhsLinkDef[0];
@@ -128,35 +128,35 @@ 
         //If the current data matches the existing data, don't do anything
         if (!$this->checkExisting($dataToInsert))
         {
-			// Pre-load the RHS relationship, which is used later in the add() function and expects a Bean
-			// and we also use it for clearing relationships in case of non self-referencing O2M relations
-			// (should be preloaded because when using the relate_to field for updating/saving relationships,
-			// only the bean id is loaded into $rhs->$rhsLinkName)
-			$rhsLinkName = $this->rhsLink;
-			$rhs->load_relationship($rhsLinkName);
+            // Pre-load the RHS relationship, which is used later in the add() function and expects a Bean
+            // and we also use it for clearing relationships in case of non self-referencing O2M relations
+            // (should be preloaded because when using the relate_to field for updating/saving relationships,
+            // only the bean id is loaded into $rhs->$rhsLinkName)
+            $rhsLinkName = $this->rhsLink;
+            $rhs->load_relationship($rhsLinkName);
         	
-			// If it's a One2Many self-referencing relationship
-        	// the positions of the default One (LHS) and Many (RHS) are swaped
-        	// so we should clear the links from the many (left) side
-        	if ($this->selfReferencing) {
-        		// Load right hand side relationship name
-	            $linkName = $this->rhsLink;
-	            // Load the relationship into the left hand side bean
-	            $lhs->load_relationship($linkName);
+            // If it's a One2Many self-referencing relationship
+            // the positions of the default One (LHS) and Many (RHS) are swaped
+            // so we should clear the links from the many (left) side
+            if ($this->selfReferencing) {
+                // Load right hand side relationship name
+                $linkName = $this->rhsLink;
+                // Load the relationship into the left hand side bean
+                $lhs->load_relationship($linkName);
 	            
-	            // Pick the loaded link
-	            $link = $lhs->$linkName;
-	            // Get many (LHS) side bean
-	            $focus = $link->getFocus();
-	            // Get relations
-	        	$related = $link->getBeans();
+                // Pick the loaded link
+                $link = $lhs->$linkName;
+                // Get many (LHS) side bean
+                $focus = $link->getFocus();
+                // Get relations
+                $related = $link->getBeans();
 	        	
-        		// Clear the relations from many side bean
-	        	foreach($related as $relBean) {
-	        		$this->remove($focus, $relBean);
-	        	}
+                // Clear the relations from many side bean
+                foreach($related as $relBean) {
+                    $this->remove($focus, $relBean);
+                }
             } else { // For non self-referencing, remove all the relationships from the many (RHS) side
-            	$this->removeAll($rhs->$rhsLinkName);
+                $this->removeAll($rhs->$rhsLinkName);
             }
             
             // Add relationship

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.
@@ -152,7 +152,7 @@ 
 	        	$related = $link->getBeans();
 	        	
         		// Clear the relations from many side bean
-	        	foreach($related as $relBean) {
+	        	foreach ($related as $relBean) {
 	        		$this->remove($focus, $relBean);
 	        	}
             } else { // For non self-referencing, remove all the relationships from the many (RHS) side

Braces +7 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -67,13 +69,13 @@ 
             if (empty($links))
             {
                 $GLOBALS['log']->fatal("No Links found for relationship {$this->name}");
-            }
-            else {
-                if (!is_array($links)) //Only one link for a self referencing relationship, this is very bad.
+            } else {
+                if (!is_array($links)) {
+                    //Only one link for a self referencing relationship, this is very bad.
                 {
                     $this->lhsLinkDef = $this->rhsLinkDef = $links;
                 }
-                else if (!empty($links[0]) && !empty($links[1]))
+                } else if (!empty($links[0]) && !empty($links[1]))
                 {
 
                     if ((!empty($links[0]['side']) && $links[0]['side'] == "right")

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
      * @param  $lhs SugarBean left side bean to add to the relationship.
      * @param  $rhs SugarBean right side bean to add to the relationship.
      * @param  $additionalFields key=>value pairs of fields to save on the relationship
-     * @return boolean true if successful
+     * @return boolean|null true if successful
      */
     public function add($lhs, $rhs, $additionalFields = array())
     {

data/Relationships/RelationshipFactory.php

Indentation +3 added lines, -3 removed lines

@@ -213,9 +213,9 @@
         $buildingRelCache = false;
     }
 
-	protected function getCacheFile() {
-		return sugar_cached("Relationships/relationships.cache.php");
-	}
+    protected function getCacheFile() {
+        return sugar_cached("Relationships/relationships.cache.php");
+    }
 
 
 

Spacing +12 added lines, -12 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.
@@ -51,7 +51,7 @@ 
 
     protected $relationships;
 
-    protected function __construct(){
+    protected function __construct() {
         //Load the relationship definitions from the cache.
         $this->loadRelationships();
     }
@@ -75,7 +75,7 @@ 
     public static function deleteCache()
     {
         $file = self::getInstance()->getCacheFile();
-        if(sugar_is_file($file))
+        if (sugar_is_file($file))
         {
             unlink($file);
         }
@@ -98,7 +98,7 @@ 
         $def = $this->relationships[$relationshipName];
 
         $type = isset($def['true_relationship_type']) ? $def['true_relationship_type'] : $def['relationship_type'];
-        switch($type)
+        switch ($type)
         {
             case "many-to-many":
                 if (isset($def['rhs_module']) && $def['rhs_module'] == 'EmailAddresses')
@@ -112,7 +112,7 @@ 
             case "one-to-many":
                 require_once("data/Relationships/One2MBeanRelationship.php");
                 //If a relationship has no table or join keys, it must be bean based
-                if (empty($def['true_relationship_type']) || (empty($def['table']) && empty($def['join_table'])) || empty($def['join_key_rhs'])){
+                if (empty($def['true_relationship_type']) || (empty($def['table']) && empty($def['join_table'])) || empty($def['join_key_rhs'])) {
                     return new One2MBeanRelationship($def);
                 }
                 else {
@@ -120,7 +120,7 @@ 
                 }
                 break;
             case "one-to-one":
-                if (empty($def['true_relationship_type'])){
+                if (empty($def['true_relationship_type'])) {
                     require_once("data/Relationships/One2OneBeanRelationship.php");
                     return new One2OneBeanRelationship($def);
                 }
@@ -131,7 +131,7 @@ 
                 break;
         }
 
-        $GLOBALS['log']->fatal ("$relationshipName had an unknown type $type ");
+        $GLOBALS['log']->fatal("$relationshipName had an unknown type $type ");
 
         return false;
     }
@@ -149,7 +149,7 @@ 
 
     protected function loadRelationships()
     {
-        if(sugar_is_file($this->getCacheFile()))
+        if (sugar_is_file($this->getCacheFile()))
         {
             include($this->getCacheFile());
             $this->relationships = $relationships;
@@ -169,7 +169,7 @@ 
         if (empty($beanList))
             include("include/modules.php");
         //Reload ALL the module vardefs....
-        foreach($beanList as $moduleName => $beanName)
+        foreach ($beanList as $moduleName => $beanName)
         {
             VardefManager::loadVardef($moduleName, BeanFactory::getObjectName($moduleName), false, array(
                 //If relationships are not yet loaded, we can't figure out the rel_calc_fields.
@@ -184,13 +184,13 @@ 
         {
             if (!empty($def['relationships']))
             {
-                foreach($def['relationships'] as $relKey => $relDef)
+                foreach ($def['relationships'] as $relKey => $relDef)
                 {
                     if ($key == $relKey) //Relationship only entry, we need to capture everything
                         $relationships[$key] = array_merge(array('name' => $key), (array)$def, (array)$relDef);
                     else {
                         $relationships[$relKey] = array_merge(array('name' => $relKey), (array)$relDef);
-                        if(!empty($relationships[$relKey]['join_table']) && empty($relationships[$relKey]['fields'])
+                        if (!empty($relationships[$relKey]['join_table']) && empty($relationships[$relKey]['fields'])
                             && isset($dictionary[$relationships[$relKey]['join_table']]['fields'])) {
                             $relationships[$relKey]['fields'] = $dictionary[$relationships[$relKey]['join_table']]['fields'];
                         }
@@ -200,7 +200,7 @@ 
         }
         //Save it out
         sugar_mkdir(dirname($this->getCacheFile()), null, true);
-        $out = "<?php \n \$relationships = " . var_export($relationships, true) . ";";
+        $out = "<?php \n \$relationships = ".var_export($relationships, true).";";
         sugar_file_put_contents_atomic($this->getCacheFile(), $out);
 
         $this->relationships = $relationships;

Braces +17 added lines, -13 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.
@@ -62,8 +64,9 @@ 
      */
     public static function getInstance()
     {
-        if (is_null(self::$rfInstance))
-            self::$rfInstance = new SugarRelationshipFactory();
+        if (is_null(self::$rfInstance)) {
+                    self::$rfInstance = new SugarRelationshipFactory();
+        }
         return self::$rfInstance;
     }
 
@@ -114,8 +117,7 @@ 
                 //If a relationship has no table or join keys, it must be bean based
                 if (empty($def['true_relationship_type']) || (empty($def['table']) && empty($def['join_table'])) || empty($def['join_key_rhs'])){
                     return new One2MBeanRelationship($def);
-                }
-                else {
+                } else {
                     return new One2MRelationship($def);
                 }
                 break;
@@ -123,8 +125,7 @@ 
                 if (empty($def['true_relationship_type'])){
                     require_once("data/Relationships/One2OneBeanRelationship.php");
                     return new One2OneBeanRelationship($def);
-                }
-                else {
+                } else {
                     require_once("data/Relationships/One2OneRelationship.php");
                     return new One2OneRelationship($def);
                 }
@@ -161,13 +162,15 @@ 
     protected function buildRelationshipCache()
     {
         global $beanList, $dictionary, $buildingRelCache;
-        if ($buildingRelCache)
-            return;
+        if ($buildingRelCache) {
+                    return;
+        }
         $buildingRelCache = true;
         include("modules/TableDictionary.php");
 
-        if (empty($beanList))
-            include("include/modules.php");
+        if (empty($beanList)) {
+                    include("include/modules.php");
+        }
         //Reload ALL the module vardefs....
         foreach($beanList as $moduleName => $beanName)
         {
@@ -186,9 +189,10 @@ 
             {
                 foreach($def['relationships'] as $relKey => $relDef)
                 {
-                    if ($key == $relKey) //Relationship only entry, we need to capture everything
+                    if ($key == $relKey) {
+                        //Relationship only entry, we need to capture everything
                         $relationships[$key] = array_merge(array('name' => $key), (array)$def, (array)$relDef);
-                    else {
+                    } else {
                         $relationships[$relKey] = array_merge(array('name' => $relKey), (array)$relDef);
                         if(!empty($relationships[$relKey]['join_table']) && empty($relationships[$relKey]['fields'])
                             && isset($dictionary[$relationships[$relKey]['join_table']]['fields'])) {

data/Relationships/EmailAddressRelationship.php

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.
@@ -153,7 +153,7 @@ 
             } else {
                 $roleCheck .= " AND $table.bean_module";
             }
-            $roleCheck .= " = '" . $this->getLHSModule() . "'";
+            $roleCheck .= " = '".$this->getLHSModule()."'";
         }
 
         return $roleCheck;

Braces +15 added lines, -9 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.
@@ -65,8 +67,9 @@ 
             return false;
         }
 
-            if ($lhs->$lhsLinkName->beansAreLoaded())
-                $lhs->$lhsLinkName->addBean($rhs);
+            if ($lhs->$lhsLinkName->beansAreLoaded()) {
+                            $lhs->$lhsLinkName->addBean($rhs);
+            }
 
             $this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
 
@@ -75,11 +78,13 @@ 
 
         $this->addRow($dataToInsert);
 
-        if ($this->self_referencing)
-            $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        if ($this->self_referencing) {
+                    $this->addSelfReferencing($lhs, $rhs, $additionalFields);
+        }
 
-            if ($lhs->$lhsLinkName->beansAreLoaded())
-                $lhs->$lhsLinkName->addBean($rhs);
+            if ($lhs->$lhsLinkName->beansAreLoaded()) {
+                            $lhs->$lhsLinkName->addBean($rhs);
+            }
 
             $this->callAfterAdd($lhs, $rhs, $lhsLinkName);
 
@@ -120,8 +125,9 @@ 
 
         $this->removeRow($dataToRemove);
 
-        if ($this->self_referencing)
-            $this->removeSelfReferencing($lhs, $rhs);
+        if ($this->self_referencing) {
+                    $this->removeSelfReferencing($lhs, $rhs);
+        }
 
         if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
         {

themes/SuiteR/css/colourSelector.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['SuiteR'])) return;
+if(!isset($sugar_config['theme_settings']['SuiteR'])) {
+    return;
+}
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");

Spacing +9 added lines, -9 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 // config|_override.php
-if(is_file('../../../config.php')) {
+if (is_file('../../../config.php')) {
     require_once('../../../config.php');
 }
 
 // load up the config_override.php file.  This is used to provide default user settings
-if(is_file('../../../config_override.php')) {
+if (is_file('../../../config_override.php')) {
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['SuiteR'])) return;
+if (!isset($sugar_config['theme_settings']['SuiteR'])) return;
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");
@@ -33,21 +33,21 @@ 
 /* Dashlet CSS */
 
 .dashletPanel .h3Row{
-background: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet'];?>;
+background: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet']; ?>;
 }
 
 .dashletPanel .h3Row h3{
-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext'];?> !important;
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext']; ?> !important;
 }
 
 .dashletPanel .h3Row .dashletToolSet .icon{
-fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext'];?> !important;
+fill: #<?php echo $sugar_config['theme_settings']['SuiteR']['dashlet_headertext']; ?> !important;
 }
 
 /* Top navigation bar CSS */
 
 .navbar-inverse {
-background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar'];?> !important;
+background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar']; ?> !important;
 }
 
 .headerlinks a:link, .headerlinks a:visited, .navbar-inverse .navbar-brand, .moremenu a,  a[id^=grouptab], a[id^=moduleTab] {
@@ -75,8 +75,8 @@ 
 
 #searchform .btn
 {
-background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar'];?> !important;
-color: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon'];?> !important;
+background:#<?php echo $sugar_config['theme_settings']['SuiteR']['navbar']; ?> !important;
+color: #<?php echo $sugar_config['theme_settings']['SuiteR']['icon']; ?> !important;
 }
 
 #usermenu a{

themes/Suite7/css/colourSelector.php

Spacing +3 added lines, -3 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 // config|_override.php
-if(is_file('../../../config.php')) {
+if (is_file('../../../config.php')) {
     require_once('../../../config.php');
 }
 
 // load up the config_override.php file.  This is used to provide default user settings
-if(is_file('../../../config_override.php')) {
+if (is_file('../../../config_override.php')) {
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['Suite7'])) return;
+if (!isset($sugar_config['theme_settings']['Suite7'])) return;
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
     require_once('../../../config_override.php');
 }
 
-if(!isset($sugar_config['theme_settings']['Suite7'])) return;
+if(!isset($sugar_config['theme_settings']['Suite7'])) {
+    return;
+}
 
 //set file type back to css from php
 header("Content-type: text/css; charset: UTF-8");

soap.php

Indentation +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
+    if(!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -65,7 +65,7 @@ 
 
 //New API is in these files
 if(!empty($administrator->settings['portal_on'])) {
-	require_once('soap/SoapPortalUsers.php');
+    require_once('soap/SoapPortalUsers.php');
 }
 
 require_once('soap/SoapSugarUsers.php');
@@ -88,9 +88,9 @@ 
 $observers = $resourceManager->getObservers();
 //Call set_soap_server for SoapResourceObserver instance(s)
 foreach($observers as $observer) {
-   if(method_exists($observer, 'set_soap_server')) {
-   	  $observer->set_soap_server($server);
-   }
+    if(method_exists($observer, 'set_soap_server')) {
+            $observer->set_soap_server($server);
+    }
 }
 
 $HTTP_RAW_POST_DATA = isset($HTTP_RAW_POST_DATA) ? $HTTP_RAW_POST_DATA : '';

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
+ if (!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -64,7 +64,7 @@ 
 $server->configureWSDL('sugarsoap', $NAMESPACE, $sugar_config['site_url'].'/soap.php');
 
 //New API is in these files
-if(!empty($administrator->settings['portal_on'])) {
+if (!empty($administrator->settings['portal_on'])) {
 	require_once('soap/SoapPortalUsers.php');
 }
 
@@ -78,7 +78,7 @@ 
 /* Begin the HTTP listener service and exit. */
 ob_clean();
 
-if (!isset($HTTP_RAW_POST_DATA)){
+if (!isset($HTTP_RAW_POST_DATA)) {
     $HTTP_RAW_POST_DATA = file_get_contents('php://input');
 }
 
@@ -87,8 +87,8 @@ 
 $resourceManager->setup('Soap');
 $observers = $resourceManager->getObservers();
 //Call set_soap_server for SoapResourceObserver instance(s)
-foreach($observers as $observer) {
-   if(method_exists($observer, 'set_soap_server')) {
+foreach ($observers as $observer) {
+   if (method_exists($observer, 'set_soap_server')) {
    	  $observer->set_soap_server($server);
    }
 }

Braces +4 added lines, -2 removed lines

@@ -1,6 +1,8 @@
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
-/*********************************************************************************
+ if(!defined('sugarEntry')) {
+     define('sugarEntry', true);
+ }
+ /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
 

modules/Connectors/InstallDefaultConnectors.php

Indentation +20 added lines, -20 removed lines

@@ -40,26 +40,26 @@ 
 
 
 $default_modules_sources = array (
-  'Accounts' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Contacts' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Leads' =>
-  array (
-     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
-  'Prospects' =>
-  array (
+    'Accounts' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Contacts' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Leads' =>
+    array (
+        'ext_rest_insideview' => 'ext_rest_insideview',
+    ),
+    'Prospects' =>
+    array (
 
-  ),
-  'Opportunities' =>
-  array (
+    ),
+    'Opportunities' =>
+    array (
     'ext_rest_insideview' => 'ext_rest_insideview',
-  ),
+    ),
 );
 
 $previous_connectors = array();
@@ -103,11 +103,11 @@ 
 }
 
 if(!file_exists('custom/modules/Connectors/metadata')) {
-   mkdir_recursive('custom/modules/Connectors/metadata');
+    mkdir_recursive('custom/modules/Connectors/metadata');
 }
 
 if(!write_array_to_file('modules_sources', $default_modules_sources, 'custom/modules/Connectors/metadata/display_config.php')) {
-   $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
+    $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
 }
 
 ?>

Spacing +20 added lines, -20 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -39,34 +39,34 @@ 
  ********************************************************************************/
 
 
-$default_modules_sources = array (
+$default_modules_sources = array(
   'Accounts' =>
-  array (
+  array(
      'ext_rest_insideview' => 'ext_rest_insideview',
   ),
   'Contacts' =>
-  array (
+  array(
      'ext_rest_insideview' => 'ext_rest_insideview',
   ),
   'Leads' =>
-  array (
+  array(
      'ext_rest_insideview' => 'ext_rest_insideview',
   ),
   'Prospects' =>
-  array (
+  array(
 
   ),
   'Opportunities' =>
-  array (
+  array(
     'ext_rest_insideview' => 'ext_rest_insideview',
   ),
 );
 
 $previous_connectors = array();
-if(file_exists('custom/modules/Connectors/metadata/connectors.php')){
+if (file_exists('custom/modules/Connectors/metadata/connectors.php')) {
     require('custom/modules/Connectors/metadata/connectors.php');
 
-    foreach($connectors as $connector_array){
+    foreach ($connectors as $connector_array) {
         $connector_id = $connector_array['id'];
         $previous_connectors[$connector_id] = $connector_id;
     }
@@ -74,14 +74,14 @@ 
 
 // Merge in old modules the customer added instead of overriding it completely with defaults
 // If they have customized their connectors modules
-if(file_exists('custom/modules/Connectors/metadata/display_config.php')){
+if (file_exists('custom/modules/Connectors/metadata/display_config.php')) {
     require('custom/modules/Connectors/metadata/display_config.php');
 
     // Remove the default settings from being copied over since they already existed
-    foreach($default_modules_sources as $module => $sources){
-        foreach($sources as $source_key => $source){
-            foreach($previous_connectors as $previous_connector){
-                if(in_array($previous_connector, $default_modules_sources[$module])){
+    foreach ($default_modules_sources as $module => $sources) {
+        foreach ($sources as $source_key => $source) {
+            foreach ($previous_connectors as $previous_connector) {
+                if (in_array($previous_connector, $default_modules_sources[$module])) {
                     unset($default_modules_sources[$module][$previous_connector]);
                 }
             }
@@ -89,24 +89,24 @@ 
     }
 
     // Merge in the new connector default settings with the current settings
-    if ( isset($modules_sources) && is_array($modules_sources) ) {
-        foreach($modules_sources as $module => $sources){
-            if(!empty($default_modules_sources[$module])){
+    if (isset($modules_sources) && is_array($modules_sources)) {
+        foreach ($modules_sources as $module => $sources) {
+            if (!empty($default_modules_sources[$module])) {
                 $merged = array_merge($modules_sources[$module], $default_modules_sources[$module]);
                 $default_modules_sources[$module] = $merged;
             }
-            else{
+            else {
                 $default_modules_sources[$module] = $modules_sources[$module];
             }
         }
     }
 }
 
-if(!file_exists('custom/modules/Connectors/metadata')) {
+if (!file_exists('custom/modules/Connectors/metadata')) {
    mkdir_recursive('custom/modules/Connectors/metadata');
 }
 
-if(!write_array_to_file('modules_sources', $default_modules_sources, 'custom/modules/Connectors/metadata/display_config.php')) {
+if (!write_array_to_file('modules_sources', $default_modules_sources, 'custom/modules/Connectors/metadata/display_config.php')) {
    $GLOBALS['log']->fatal('Cannot write file custom/modules/Connectors/metadata/display_config.php');
 }
 

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.
@@ -94,8 +96,7 @@ 
             if(!empty($default_modules_sources[$module])){
                 $merged = array_merge($modules_sources[$module], $default_modules_sources[$module]);
                 $default_modules_sources[$module] = $merged;
-            }
-            else{
+            } else{
                 $default_modules_sources[$module] = $modules_sources[$module];
             }
         }

modules/Connectors/action_view_map.php

Spacing +4 added lines, -4 removed lines

@@ -38,16 +38,16 @@
  ********************************************************************************/
 
 
-$action_view_map['retrievesource']= 'retrievesource';
-$action_view_map['step1']= 'step1';
-$action_view_map['step2']= 'step2';
+$action_view_map['retrievesource'] = 'retrievesource';
+$action_view_map['step1'] = 'step1';
+$action_view_map['step2'] = 'step2';
 
 //Admin main page
 $action_view_map['connectorsettings'] = 'connectorsettings';
 
 //Admin pages for the connector properties
 $action_view_map['modifyproperties'] = 'modifyproperties';
-$action_view_map['sourceproperties']= 'sourceproperties';
+$action_view_map['sourceproperties'] = 'sourceproperties';
 
 //Admin pages to enable/disable connector for modules
 $action_view_map['modifydisplay'] = 'modifydisplay';