adamjakab / SuiteCRM

data/Relationships/One2OneBeanRelationship.php

Braces +9 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.
@@ -72,11 +74,13 @@ 
     protected function updateLinks($lhs, $lhsLinkName, $rhs, $rhsLinkName)
     {
         //RHS and LHS only ever have one bean
-        if (isset($lhs->$lhsLinkName))
-            $lhs->$lhsLinkName->beans = array($rhs->id => $rhs);
+        if (isset($lhs->$lhsLinkName)) {
+                    $lhs->$lhsLinkName->beans = array($rhs->id => $rhs);
+        }
 
-        if (isset($rhs->$rhsLinkName))
-            $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        if (isset($rhs->$rhsLinkName)) {
+                    $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        }
     }
 
     public function getJoin($link, $params = array(), $return_array = false)

data/Relationships/One2MBeanRelationship.php

Braces +39 added lines, -25 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.
@@ -66,7 +68,9 @@ 
         // test to see if the relationship exist if the relationship between the two beans
         // exist then we just fail out with false as we don't want to re-trigger this
         // the save and such as it causes problems with the related() in sugarlogic
-        if($this->relationship_exists($lhs, $rhs) && !empty($GLOBALS['resavingRelatedBeans'])) return false;
+        if($this->relationship_exists($lhs, $rhs) && !empty($GLOBALS['resavingRelatedBeans'])) {
+            return false;
+        }
 
         $lhsLinkName = $this->lhsLink;
         $rhsLinkName = $this->rhsLink;
@@ -79,8 +83,9 @@ 
             $prevRelated = $oldLink->getBeans(null);
             foreach($prevRelated as $oldLHS)
             {
-                if ($oldLHS->id != $lhs->id)
-                    $this->remove($oldLHS, $rhs, false);
+                if ($oldLHS->id != $lhs->id) {
+                                    $this->remove($oldLHS, $rhs, false);
+                }
             }
         }
 
@@ -111,19 +116,22 @@ 
 
         //One2MBean relationships require that the RHS bean be saved or else the relationship will not be saved.
         //If we aren't already in a relationship save, intitiate a save now.
-        if (empty($GLOBALS['resavingRelatedBeans']))
-            SugarRelationship::resaveRelatedBeans();
+        if (empty($GLOBALS['resavingRelatedBeans'])) {
+                    SugarRelationship::resaveRelatedBeans();
+        }
         
         return true;
     }
 
     protected function updateLinks($lhs, $lhsLinkName, $rhs, $rhsLinkName)
     {
-        if (isset($lhs->$lhsLinkName))
-            $lhs->$lhsLinkName->addBean($rhs);
+        if (isset($lhs->$lhsLinkName)) {
+                    $lhs->$lhsLinkName->addBean($rhs);
+        }
         //RHS only has one bean ever, so we don't need to preload the relationship
-        if (isset($rhs->$rhsLinkName))
-            $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        if (isset($rhs->$rhsLinkName)) {
+                    $rhs->$rhsLinkName->beans = array($lhs->id => $lhs);
+        }
     }
 
     protected function updateFields($lhs, $rhs, $additionalFields)
@@ -148,8 +156,9 @@ 
         $rhsID = $this->def['rhs_key'];
 
         //If this relationship has already been removed, we can just return
-        if ($rhs->$rhsID != $lhs->id)
-            return false;
+        if ($rhs->$rhsID != $lhs->id) {
+                    return false;
+        }
 
         $rhs->$rhsID = '';
 
@@ -192,8 +201,7 @@ 
             {
                 $rows[$id] = array('id' => $id);
             }
-        }
-        else //If the link is LHS, we need to query to get the full list and load all the beans.
+        } else //If the link is LHS, we need to query to get the full list and load all the beans.
         {
             $db = DBManagerFactory::getInstance();
             $query = $this->getQuery($link, $params);
@@ -241,8 +249,9 @@ 
             //Add any optional where clause
             if (!empty($params['where'])) {
                 $add_where = is_string($params['where']) ? $params['where'] : "$rhsTable." . $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
@@ -255,7 +264,9 @@ 
             if (empty($params['return_as_array'])) {
                 //Limit is not compatible with return_as_array
                 $query = "SELECT id FROM $from $where";
-                if (!empty($order_by)) $query .= ' ORDER BY '.$order_by;
+                if (!empty($order_by)) {
+                    $query .= ' ORDER BY '.$order_by;
+                }
                 if (!empty($params['limit']) && $params['limit'] > 0) {
                     $offset = isset($params['offset']) ? $params['offset'] : 0;
                     $query = DBManagerFactory::getInstance()->limitQuery($query, $offset, $params['limit'], false, "", false);
@@ -276,8 +287,9 @@ 
     {
         $linkIsLHS = $link->getSide() == REL_LHS;
         $startingTable = (empty($params['left_join_table_alias']) ? $this->def['lhs_table'] : $params['left_join_table_alias']);
-        if (!$linkIsLHS)
-            $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        if (!$linkIsLHS) {
+                    $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        }
         $startingKey = $linkIsLHS ? $this->def['lhs_key'] : $this->def['rhs_key'];
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetTableWithAlias = $targetTable;
@@ -315,8 +327,9 @@ 
 
         $linkIsLHS = $link->getSide() == REL_RHS;
         $startingTable = (empty($params['left_join_table_alias']) ? $this->def['lhs_table'] : $params['left_join_table_alias']);
-        if (!$linkIsLHS)
-            $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        if (!$linkIsLHS) {
+                    $startingTable = (empty($params['right_join_table_alias']) ? $this->def['rhs_table'] : $params['right_join_table_alias']);
+        }
         $startingKey = $linkIsLHS ? $this->def['lhs_key'] : $this->def['rhs_key'];
         $targetTable = $linkIsLHS ? $this->def['rhs_table'] : $this->def['lhs_table'];
         $targetKey = $linkIsLHS ? $this->def['rhs_key'] : $this->def['lhs_key'];
@@ -393,9 +406,10 @@ 
 
     public function getRelationshipTable()
     {
-        if (isset($this->def['table']))
-            return $this->def['table'];
-        else
-            return $this->def['rhs_table'];
+        if (isset($this->def['table'])) {
+                    return $this->def['table'];
+        } else {
+                    return $this->def['rhs_table'];
+        }
     }
 }

data/Relationships/M2MRelationship.php

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'),

data/Relationships/One2MRelationship.php

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")

data/Relationships/RelationshipFactory.php

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

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");

themes/Suite7/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']['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

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.