adamjakab / SuiteCRM

modules/Relationships/Relationship.php

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;

Indentation +161 added lines, -161 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;
+    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;
 
     public function __construct() {
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	/*returns true if the relationship is self referencing. equality check is performed for both table and
+    /*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;
-		}
-
-		sugar_mkdir($this->cache_file_dir(), null, true);
+        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);
         $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
+    }
 
 
 

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

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.

Indentation +8 added lines, -8 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewGeocoding_Test extends SugarView {
 
- 	function __construct() {
- 		parent::__construct();
- 	}
+        function __construct() {
+            parent::__construct();
+        }
 
-	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

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

Indentation +6 added lines, -6 removed lines

@@ -4,18 +4,18 @@ 
 
 class Jjwg_MapsViewMap_Display extends SugarView {
 
-  function __construct() {
+    function __construct() {
     parent::__construct();
-  }
+    }
 
-  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
 
-  }
+    }
 }

modules/jjwg_Maps/views/view.map_markers.php

Spacing +3 added lines, -3 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_Markers extends SugarView {
 
@@ -139,7 +139,7 @@ 
     // Define Custom Markers Dir and Common Icons
     $custom_markers_dir = 'custom/themes/default/images/jjwg_Markers/';
     $custom_markers_icons = array();
-    foreach($this->bean->custom_markers as $marker) {
+    foreach ($this->bean->custom_markers as $marker) {
       $custom_markers_icons[] = $marker['image'];
     }
     $num_custom_markers = count($this->bean->custom_markers);
@@ -904,7 +904,7 @@ 
 ?>
   <!-- <b><?php echo $GLOBALS['mod_strings']['LBL_MAP_USER_GROUPS']; ?> </b><br/> -->
 <?php
-  foreach($group_name_to_num as $group_name => $group_number) {
+  foreach ($group_name_to_num as $group_name => $group_number) {
 ?>
     <img src="<?php echo './'.$icons_dir.'/marker_'.$group_number.'.png'; ?>" 
          rel="<?php echo $group_number; ?>" align="middle" />

Braces +12 added lines, -4 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_MapsViewMap_Markers extends SugarView {
 
@@ -98,8 +100,12 @@ 
         // Define default point as map center
         $this->bean->map_center['lat'] = $GLOBALS['jjwg_config']['map_default_center_latitude'];
         $this->bean->map_center['lng'] = $GLOBALS['jjwg_config']['map_default_center_longitude'];
-        if (!isset($this->bean->map_center['html'])) $this->bean->map_center['html'] = $GLOBALS['mod_strings']['LBL_DEFAULT'];
-        if (!isset($this->bean->map_center['name'])) $this->bean->map_center['name'] = $GLOBALS['mod_strings']['LBL_DEFAULT'];
+        if (!isset($this->bean->map_center['html'])) {
+            $this->bean->map_center['html'] = $GLOBALS['mod_strings']['LBL_DEFAULT'];
+        }
+        if (!isset($this->bean->map_center['name'])) {
+            $this->bean->map_center['name'] = $GLOBALS['mod_strings']['LBL_DEFAULT'];
+        }
     }
 }
 ?>
@@ -112,7 +118,9 @@ 
     // Define Map Data
     $num_markers = count($this->bean->map_markers);
     $num_groups = count($this->bean->map_markers_groups);
-    if ($num_groups > 216) $num_groups = 216;
+    if ($num_groups > 216) {
+        $num_groups = 216;
+    }
     $group_name_to_num = array();
     $i = 1;
     // Define Group Name to Icon Number Mapping 1-216(max)

Indentation +20 added lines, -20 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewMap_Markers extends SugarView {
 
-  function __construct() {
+    function __construct() {
     parent::__construct();
-  }
+    }
 
-  function display() {
+    function display() {
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
@@ -125,22 +125,22 @@ 
     // Define Dir of Group Icons
     $icons_dir_base = 'themes/default/images/jjwg_Maps/';
     if ($num_groups <= 10) {
-      $icons_dir = $icons_dir_base.'0-10/';
+        $icons_dir = $icons_dir_base.'0-10/';
     } elseif ($num_groups <= 25) {
-      $icons_dir = $icons_dir_base.'0-25/';
+        $icons_dir = $icons_dir_base.'0-25/';
     } elseif ($num_groups <= 100) {
-      $icons_dir = $icons_dir_base.'0-100/';
+        $icons_dir = $icons_dir_base.'0-100/';
     } elseif ($num_groups <= 216) {
-      $icons_dir = $icons_dir_base.'0-216/';
+        $icons_dir = $icons_dir_base.'0-216/';
     } else {
-      $icons_dir = $icons_dir_base.'0-10/'; // Demo Version
+        $icons_dir = $icons_dir_base.'0-10/'; // Demo Version
     }
 
     // Define Custom Markers Dir and Common Icons
     $custom_markers_dir = 'custom/themes/default/images/jjwg_Markers/';
     $custom_markers_icons = array();
     foreach($this->bean->custom_markers as $marker) {
-      $custom_markers_icons[] = $marker['image'];
+        $custom_markers_icons[] = $marker['image'];
     }
     $num_custom_markers = count($this->bean->custom_markers);
     $custom_markers_icons = array_unique($custom_markers_icons);
@@ -890,21 +890,21 @@ 
   <br clear="all" />
 
 <?php
-  if (!empty($this->bean->map_center) || $num_markers > 0) {
+    if (!empty($this->bean->map_center) || $num_markers > 0) {
 ?>
   <div id="legend">
   <b><?php echo $GLOBALS['mod_strings']['LBL_MAP_LEGEND']; ?></b><br/>
 <?php
-  if (!empty($this->bean->map_center)) {
+    if (!empty($this->bean->map_center)) {
 ?>
     <img src="<?php echo './'.$icons_dir.'/marker_0.png'; ?>" align="middle" />
     <?php echo $this->bean->map_center['name']; ?><br/>
 <?php
-  }
+    }
 ?>
   <!-- <b><?php echo $GLOBALS['mod_strings']['LBL_MAP_USER_GROUPS']; ?> </b><br/> -->
 <?php
-  foreach($group_name_to_num as $group_name => $group_number) {
+    foreach($group_name_to_num as $group_name => $group_number) {
 ?>
     <img src="<?php echo './'.$icons_dir.'/marker_'.$group_number.'.png'; ?>"
          rel="<?php echo $group_number; ?>" align="middle" />
@@ -916,15 +916,15 @@ 
     }
     ?><br/>
 <?php
-  }
+    }
 ?>
   </div>
 <?php
-  }
+    }
 ?>
 
 <?php
-  if ($num_markers > 0) {
+    if ($num_markers > 0) {
 ?>
     <div id="DataTable">
         <table cellpadding="3" cellspacing="0" border="1" width="100%" class="list view" id="displayDataTable">
@@ -947,11 +947,11 @@ 
         </table>
     </div>
 <?php
-  }
+    }
 ?>
 
 <?php
-  if (in_array($this->bean->display_object->module_name, array('Accounts', 'Contacts', 'Leads', 'Prospects', 'Users')) &&
+    if (in_array($this->bean->display_object->module_name, array('Accounts', 'Contacts', 'Leads', 'Prospects', 'Users')) &&
           ($GLOBALS['current_user']->isAdmin() || $this->bean->ACLAccess('list')) &&
           empty($_REQUEST['list_id']) && !empty($this->bean->list_array)) {
 ?>
@@ -972,7 +972,7 @@ 
     </form>
 </div>
 <?php
-  }
+    }
 ?>
 
 </body>
@@ -992,5 +992,5 @@ 
 </html>
 <?php
 
-   }
+    }
 }

modules/jjwg_Maps/views/view.quick_radius.php

Braces +13 added lines, -5 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_MapsViewQuick_Radius extends SugarView {
 
@@ -10,8 +12,10 @@ 
 
 	function display() {
 	
-        if (!isset($_REQUEST['quick_address'])) $_REQUEST['quick_address'] = '';
-?>
+        if (!isset($_REQUEST['quick_address'])) {
+            $_REQUEST['quick_address'] = '';
+        }
+        ?>
 
 <div class="moduleTitle"><h2><?php echo $GLOBALS['mod_strings']['LBL_MAP_QUICK_RADIUS']; ?><div class="clear"></div></h2></div>
 <div class="clear"></div>
@@ -38,7 +42,9 @@ 
             <select id="display_module" tabindex="111" title="<?php echo $GLOBALS['mod_strings']['LBL_MODULE_TYPE']; ?>" name="display_module">
                 <?php foreach ($GLOBALS['jjwg_config']['valid_geocode_modules'] as $module) { ?>
                     <option value="<?php echo htmlspecialchars($module); ?>" <?php 
-                    if (!empty($_REQUEST['display_module']) && $module == $_REQUEST['display_module']) echo 'selected="selected"';
+                    if (!empty($_REQUEST['display_module']) && $module == $_REQUEST['display_module']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($GLOBALS['app_list_strings']['moduleList'][$module]); ?>
                 <?php } ?>
             </select>
@@ -54,7 +60,9 @@ 
             <select id="unit_type" tabindex="131" title="<?php echo $GLOBALS['mod_strings']['LBL_DISTANCE']; ?>" name="unit_type">
                 <?php foreach ($GLOBALS['app_list_strings']['map_unit_type_list'] as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $_REQUEST['unit_type']) echo 'selected="selected"';
+                    if ($key == $_REQUEST['unit_type']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?>
                 <?php } ?>
             </select>

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.

Indentation +5 added lines, -5 removed lines

@@ -4,11 +4,11 @@ 
 
 class Jjwg_MapsViewQuick_Radius extends SugarView {
 
- 	function __construct() {
- 		parent::__construct();
- 	}
+        function __construct() {
+            parent::__construct();
+        }
 
-	function display() {
+    function display() {
 
         if (!isset($_REQUEST['quick_address'])) $_REQUEST['quick_address'] = '';
 ?>
@@ -66,5 +66,5 @@ 
 </form>
 
 <?php
-  }
+    }
 }

modules/jjwg_Maps/views/view.config.php

Braces +45 added lines, -15 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_MapsViewConfig extends SugarView {
 
@@ -113,7 +115,9 @@ 
                 name="address_type_Accounts" title="">
                 <?php foreach ($address_types_billing_or_shipping as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Accounts']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Accounts']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -130,7 +134,9 @@ 
                 name="address_type_Contacts" title="">
                 <?php foreach ($address_types_primary_or_alt as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Contacts']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Contacts']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -147,7 +153,9 @@ 
                 name="address_type_Leads" title="">
                 <?php foreach ($address_types_primary_or_alt as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Leads']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Leads']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -164,7 +172,9 @@ 
                 name="address_type_Opportunities" title="">
                 <?php foreach ($address_types_billing_or_shipping as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Opportunities']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Opportunities']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -182,7 +192,9 @@ 
                 name="address_type_Cases" title="">
                 <?php foreach ($address_types_billing_or_shipping as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Cases']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Cases']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -200,7 +212,9 @@ 
                 name="address_type_Project" title="">
                 <?php foreach ($address_types_billing_or_shipping as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Project']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Project']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -218,7 +232,9 @@ 
                 name="address_type_Meetings" title="">
                 <?php foreach ($address_types_flex_relate as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Meetings']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Meetings']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -234,7 +250,9 @@ 
                 name="address_type_Prospects" title="">
                 <?php foreach ($address_types_primary_or_alt as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Prospects']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type']['Prospects']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -255,7 +273,9 @@ 
                 name="address_type_<?php echo $module; ?>" title="">
                 <?php foreach ($address_types_all as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type'][$module]) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['geocode_modules_to_address_type'][$module]) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?></option>
                 <?php } ?>
             </select>
@@ -449,7 +469,9 @@ 
                 name="allow_approximate_location_type" title="">
                 <?php foreach ($enabled_disabled as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $enabled) echo 'selected="selected"';
+                    if ($key == $enabled) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?>
                 <?php } ?>
             </select>
@@ -493,7 +515,9 @@ 
                 name="address_cache_get_enabled" title="">
                 <?php foreach ($enabled_disabled as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $enabled) echo 'selected="selected"';
+                    if ($key == $enabled) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?>
                 <?php } ?>
             </select>
@@ -511,7 +535,9 @@ 
                 name="address_cache_save_enabled" title="">
                 <?php foreach ($enabled_disabled as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $enabled) echo 'selected="selected"';
+                    if ($key == $enabled) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?>
                 <?php } ?>
             </select>
@@ -541,7 +567,9 @@ 
                 name="logic_hooks_enabled" title="">
                 <?php foreach ($enabled_disabled as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $enabled) echo 'selected="selected"';
+                    if ($key == $enabled) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?>
                 <?php } ?>
             </select>
@@ -609,7 +637,9 @@ 
                 name="map_default_unit_type" title="">
                 <?php foreach ($unit_types as $key=>$value) { ?>
                     <option value="<?php echo htmlspecialchars($key); ?>" <?php 
-                    if ($key == $GLOBALS['jjwg_config']['map_default_unit_type']) echo 'selected="selected"';
+                    if ($key == $GLOBALS['jjwg_config']['map_default_unit_type']) {
+                        echo 'selected="selected"';
+                    }
                     ?>><?php echo htmlspecialchars($value); ?>
                 <?php } ?>
             </select>

Spacing +24 added lines, -47 removed lines

@@ -81,8 +81,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_VALID_GEOCODE_MODULES']; ?> </strong></td>
         <td><input type="text" name="valid_geocode_modules" id="valid_geocode_modules"
             value="<?php echo (isset($GLOBALS['jjwg_config']['valid_geocode_modules'])) ?
-                htmlspecialchars(implode(', ', $GLOBALS['jjwg_config']['valid_geocode_modules'])) :
-                htmlspecialchars(implode(', ', $GLOBALS['jjwg_config_defaults']['valid_geocode_modules'])); ?>"
+                htmlspecialchars(implode(', ', $GLOBALS['jjwg_config']['valid_geocode_modules'])) : htmlspecialchars(implode(', ', $GLOBALS['jjwg_config_defaults']['valid_geocode_modules'])); ?>"
             title='' tabindex='107' size="100" maxlength="999"><br />
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                 <?php echo htmlspecialchars(implode(', ', $GLOBALS['jjwg_config_defaults']['valid_geocode_modules'])); ?>
@@ -92,8 +91,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_VALID_GEOCODE_TABLES']; ?> </strong></td>
         <td><input type="text" name="valid_geocode_tables" id="valid_geocode_tables"
             value="<?php echo (isset($GLOBALS['jjwg_config']['valid_geocode_tables'])) ?
-                htmlspecialchars(implode(', ', $GLOBALS['jjwg_config']['valid_geocode_tables'])) :
-                htmlspecialchars(implode(', ', $GLOBALS['jjwg_config_defaults']['valid_geocode_tables'])); ?>"
+                htmlspecialchars(implode(', ', $GLOBALS['jjwg_config']['valid_geocode_tables'])) : htmlspecialchars(implode(', ', $GLOBALS['jjwg_config_defaults']['valid_geocode_tables'])); ?>"
             title='' tabindex='108' size="100" maxlength="999"><br />
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                 <?php echo htmlspecialchars(implode(', ', $GLOBALS['jjwg_config_defaults']['valid_geocode_tables'])); ?>
@@ -280,8 +278,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_ACCOUNTS']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Accounts" id="grouping_field_Accounts"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Accounts'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Accounts']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Accounts']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Accounts']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Accounts']); ?>"
             title='' tabindex='121' size="25" maxlength="75">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Accounts']); ?>
         </td>
@@ -290,18 +287,16 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_CONTACTS']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Contacts" id="grouping_field_Contacts"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Contacts'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Contacts']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Contacts']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Contacts']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Contacts']); ?>"
             title='' tabindex='122' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Contacts']); ?>
         </td>
     </tr>
     <tr>
-        <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_LEADS'];?> </strong></td>
+        <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_LEADS']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Leads" id="grouping_field_Leads"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Leads'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Leads']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Leads']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Leads']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Leads']); ?>"
             title='' tabindex='123' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Leads']); ?>
         </td>
@@ -310,8 +305,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_OPPORTUNITIES']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Opportunities" id="grouping_field_Opportunities"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Opportunities'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Opportunities']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Opportunities']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Opportunities']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Opportunities']); ?>"
             title='' tabindex='124' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Opportunities']); ?>
         </td>
@@ -320,8 +314,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_CASES']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Cases" id="grouping_field_Cases"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Cases'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Cases']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Cases']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Cases']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Cases']); ?>"
             title='' tabindex='125' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Cases']); ?>
         </td>
@@ -330,8 +323,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_PROJECTS']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Project" id="grouping_field_Project"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Project'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Project']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Project']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Project']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Project']); ?>"
             title='' tabindex='126' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Project']); ?>
         </td>
@@ -340,8 +332,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_MEETINGS']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Meetings" id="grouping_field_Meetings"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Meetings'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Meetings']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Meetings']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Meetings']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Meetings']); ?>"
             title='' tabindex='127' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Meetings']); ?>
             &nbsp; (Limited to Meetings Module Fields)
@@ -351,8 +342,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR_PROSPECTS']; ?> </strong></td>
         <td><input type="text" name="grouping_field_Prospects" id="grouping_field_Prospects"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field']['Prospects'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Prospects']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Prospects']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field']['Prospects']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Prospects']); ?>"
             title='' tabindex='128' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Prospects']); ?>
         </td>
@@ -365,8 +355,7 @@ 
             <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GROUP_FIELD_FOR'].' '.$module.':'; ?> </strong></td>
             <td><input type="text" name="grouping_field_<?php echo $module; ?>" id="grouping_field_<?php echo $module; ?>"
                 value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_grouping_field'][$module])) ?
-                    htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field'][$module]) :
-                    htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Contacts']); ?>"
+                    htmlspecialchars($GLOBALS['jjwg_config']['map_markers_grouping_field'][$module]) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Contacts']); ?>"
                 title='' tabindex='128' size="25" maxlength="32">
                 &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                     <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_grouping_field']['Contacts']); ?>
@@ -388,8 +377,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GEOCODING_API_URL_TITLE']; ?> </strong></td>
         <td><input type="text" name="geocoding_api_url" id="geocoding_api_url"
             value="<?php echo (isset($GLOBALS['jjwg_config']['geocoding_api_url'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['geocoding_api_url']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_api_url']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['geocoding_api_url']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_api_url']); ?>"
             title='' tabindex='139' size="70" maxlength="255">
             <br />
             <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
@@ -403,8 +391,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GEOCODING_API_SECRET_TITLE']; ?> </strong></td>
         <td><input type="text" name="geocoding_api_secret" id="geocoding_api_secret"
             value="<?php echo (isset($GLOBALS['jjwg_config']['geocoding_api_secret'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['geocoding_api_secret']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_api_secret']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['geocoding_api_secret']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_api_secret']); ?>"
             title='' tabindex='140' size="25" maxlength="32">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                 <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_api_secret']) ?>
@@ -417,8 +404,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GEOCODING_LIMIT_TITLE']; ?> </strong></td>
         <td><input type="text" name="geocoding_limit" id="geocoding_limit"
             value="<?php echo (isset($GLOBALS['jjwg_config']['geocoding_limit'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['geocoding_limit']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_limit']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['geocoding_limit']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_limit']); ?>"
             title='' tabindex='141' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                 <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['geocoding_limit']) ?>
@@ -431,8 +417,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GOOGLE_GEOCODING_LIMIT_TITLE']; ?> </strong></td>
         <td><input type="text" name="google_geocoding_limit" id="google_geocoding_limit"
             value="<?php echo (isset($GLOBALS['jjwg_config']['google_geocoding_limit'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['google_geocoding_limit']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['google_geocoding_limit']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['google_geocoding_limit']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['google_geocoding_limit']); ?>"
             title='' tabindex='142' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                 <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['google_geocoding_limit']) ?>
@@ -463,8 +448,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_EXPORT_ADDRESSES_LIMIT_TITLE']; ?> </strong></td>
         <td><input type="text" name="export_addresses_limit" id="export_addresses_limit"
             value="<?php echo (isset($GLOBALS['jjwg_config']['export_addresses_limit'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['export_addresses_limit']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['export_addresses_limit']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['export_addresses_limit']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['export_addresses_limit']); ?>"
             title='' tabindex='144' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?>
                 <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['export_addresses_limit']) ?>
@@ -567,8 +551,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_MARKERS_LIMIT_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_markers_limit" id="map_markers_limit"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_markers_limit'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_limit']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_limit']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_markers_limit']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_limit']); ?>"
             title='' tabindex='150' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_markers_limit']) ?>
         </td>
@@ -580,8 +563,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_DEFAULT_CENTER_LATITUDE_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_default_center_latitude" id="map_default_center_latitude"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_default_center_latitude'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_default_center_latitude']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_center_latitude']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_default_center_latitude']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_center_latitude']); ?>"
             title='' tabindex='151' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_center_latitude']) ?>
         </td>
@@ -593,8 +575,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_DEFAULT_CENTER_LONGITUDE_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_default_center_longitude" id="map_default_center_longitude"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_default_center_longitude'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_default_center_longitude']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_center_longitude']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_default_center_longitude']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_center_longitude']); ?>"
             title='' tabindex='152' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_center_longitude']) ?>
         </td>
@@ -623,8 +604,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_DEFAULT_DISTANCE_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_default_distance" id="map_default_distance"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_default_distance'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_default_distance']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_distance']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_default_distance']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_distance']); ?>"
             title='' tabindex='154' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_default_distance']) ?>
         </td>
@@ -636,8 +616,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_DUPLICATE_MARKER_ADJUSTMENT_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_duplicate_marker_adjustment" id="map_duplicate_marker_adjustment"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_duplicate_marker_adjustment'])) ?
-                rtrim(number_format($GLOBALS['jjwg_config']['map_duplicate_marker_adjustment'], 8), '0.') :
-                rtrim(number_format($GLOBALS['jjwg_config_defaults']['map_duplicate_marker_adjustment'], 8), '0.'); ?>"
+                rtrim(number_format($GLOBALS['jjwg_config']['map_duplicate_marker_adjustment'], 8), '0.') : rtrim(number_format($GLOBALS['jjwg_config_defaults']['map_duplicate_marker_adjustment'], 8), '0.'); ?>"
             title='' tabindex='155' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo rtrim(number_format($GLOBALS['jjwg_config_defaults']['map_duplicate_marker_adjustment'], 8), '0.'); ?>
         </td>
@@ -649,8 +628,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_CLUSTER_GRID_SIZE_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_clusterer_grid_size" id="map_clusterer_grid_size"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_clusterer_grid_size'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_clusterer_grid_size']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_clusterer_grid_size']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_clusterer_grid_size']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_clusterer_grid_size']); ?>"
             title='' tabindex='156' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_clusterer_grid_size']) ?>
         </td>
@@ -662,8 +640,7 @@ 
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_MAP_MARKERS_CLUSTERER_MAX_ZOOM_TITLE']; ?> </strong></td>
         <td><input type="text" name="map_clusterer_max_zoom" id="map_clusterer_max_zoom"
             value="<?php echo (isset($GLOBALS['jjwg_config']['map_clusterer_max_zoom'])) ?
-                htmlspecialchars($GLOBALS['jjwg_config']['map_clusterer_max_zoom']) :
-                htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_clusterer_max_zoom']); ?>"
+                htmlspecialchars($GLOBALS['jjwg_config']['map_clusterer_max_zoom']) : htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_clusterer_max_zoom']); ?>"
             title='' tabindex='157' size="10" maxlength="25">
             &nbsp; <?php echo $GLOBALS['mod_strings']['LBL_CONFIG_DEFAULT']; ?> <?php echo htmlspecialchars($GLOBALS['jjwg_config_defaults']['map_clusterer_max_zoom']) ?>
         </td>

modules/SecurityGroups/VersionCheck.php

Indentation +23 added lines, -23 removed lines

@@ -4,30 +4,30 @@ 
 
 class VersionCheck {
 
-	function version_check($event, $arguments)
-	{
-		global $current_user;
+    function version_check($event, $arguments)
+    {
+        global $current_user;
 	
-		require_once('include/utils.php');
-		if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
-			//require_once('modules/SecurityGroups/SecurityGroup.php');
+        require_once('include/utils.php');
+        if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
+            //require_once('modules/SecurityGroups/SecurityGroup.php');
 			
-			//check to see if the securitysuite version
-			//matches the sugar version. If not then display an error messag
+            //check to see if the securitysuite version
+            //matches the sugar version. If not then display an error messag
 			
-			global $sugar_config;
-			if(empty($sugar_config['securitysuite_version'])
-				|| $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
-			) {
-				$securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "
-					. "SecuritySuite will not work correctly until updated to ".$sugar_config['sugar_version'].". "
-					. "Upgrade now to  ";
+            global $sugar_config;
+            if(empty($sugar_config['securitysuite_version'])
+                || $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
+            ) {
+                $securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "
+                    . "SecuritySuite will not work correctly until updated to ".$sugar_config['sugar_version'].". "
+                    . "Upgrade now to  ";
 					
-				global $sugar_config;
-				$upgrade_url = "http://www.eggsurplus.com/version.php?version=".$sugar_config['sugar_version'];
-				$upgrade_text = "SecuritySuite for ".$sugar_config['sugar_version'];
-				$GLOBALS['log']->fatal($securitysuite_warning."<a href='$upgrade_url'>$upgrade_text</a>");
-				//echo $display_warning;
+                global $sugar_config;
+                $upgrade_url = "http://www.eggsurplus.com/version.php?version=".$sugar_config['sugar_version'];
+                $upgrade_text = "SecuritySuite for ".$sugar_config['sugar_version'];
+                $GLOBALS['log']->fatal($securitysuite_warning."<a href='$upgrade_url'>$upgrade_text</a>");
+                //echo $display_warning;
 
 
 ?>
@@ -50,10 +50,10 @@ 
 </script>
 <?php
 
-			}
+            }
 		
-		} //end if admin
-	} 
+        } //end if admin
+    } 
 
 
 }

Spacing +3 added lines, -3 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');
 
 
 class VersionCheck {
@@ -9,14 +9,14 @@ 
 		global $current_user;
 	
 		require_once('include/utils.php');
-		if(is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
+		if (is_admin($current_user) && empty($_REQUEST['to_pdf']) && empty($_REQUEST['sugar_body_only'])) {
 			//require_once('modules/SecurityGroups/SecurityGroup.php');
 			
 			//check to see if the securitysuite version
 			//matches the sugar version. If not then display an error messag
 			
 			global $sugar_config;
-			if(empty($sugar_config['securitysuite_version'])
+			if (empty($sugar_config['securitysuite_version'])
 				|| $sugar_config['securitysuite_version'] != $sugar_config['sugar_version']
 			) {
 				$securitysuite_warning = "Warning! SecuritySuite no longer matches the version of Sugar that you are running. "

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/SecurityGroups/SaveSecurityGroupUserRelationship.php

Spacing +6 added lines, -6 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('modules/SecurityGroups/SecurityGroupUserRelationship.php');
 
@@ -10,29 +10,29 @@ 
 
 $focus->retrieve($_REQUEST['record']);
 
-foreach($focus->column_fields as $field)
+foreach ($focus->column_fields as $field)
 {
     safe_map($field, $focus, true);
 }
 
-foreach($focus->additional_column_fields as $field)
+foreach ($focus->additional_column_fields as $field)
 {
     safe_map($field, $focus, true);
 }
 
 // send them to the edit screen.
-if(isset($_REQUEST['record']) && $_REQUEST['record'] != "")
+if (isset($_REQUEST['record']) && $_REQUEST['record'] != "")
 {
     $recordID = $_REQUEST['record'];
 }
 
-    if( isset($_POST['noninheritable']) && $_POST['noninheritable'] == '1') {
+    if (isset($_POST['noninheritable']) && $_POST['noninheritable'] == '1') {
         $focus->noninheritable = 1;
     } else {
         $focus->noninheritable = 0;
     }
 
-    if( isset($_POST['primary_group']) && $_POST['primary_group'] == '1') {
+    if (isset($_POST['primary_group']) && $_POST['primary_group'] == '1') {
         $focus->primary_group = 1;
         //unset all other primary groups for this user
         global $db;

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.