adamjakab / SuiteCRM

include/Smarty/Smarty_Compiler.class.php

Indentation +31 added lines, -31 removed lines

@@ -130,7 +130,7 @@ 
 
         // matches all valid variables (no quotes, no modifiers)
         $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
+            . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
 
         // matches valid variable syntax:
         // $foo
@@ -172,7 +172,7 @@ 
         // |foo|bar
         // |foo:$foo->bar
         $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
+            . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
 
         // matches valid function name:
         // foo123
@@ -193,7 +193,7 @@ 
         // "text"|bar
         // $foo->bar
         $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+            . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -210,7 +210,7 @@ 
         // _foo_bar($foo,"bar")
         // foo123($foo,$foo->bar(),"foo")
         $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
+            . $this->_parenth_param_regexp . '))';
     }
 
     /**
@@ -263,11 +263,11 @@ 
 
         /* replace special blocks by "{php}" */
         $source_content = preg_replace_callback($search, create_function ('$matches', "return '"
-                                       . $this->_quote_replace($this->left_delimiter) . 'php'
-                                       . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
-                                       . $this->_quote_replace($this->right_delimiter)
-                                       . "';")
-                                       , $source_content);
+                                        . $this->_quote_replace($this->left_delimiter) . 'php'
+                                        . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'"
+                                        . $this->_quote_replace($this->right_delimiter)
+                                        . "';")
+                                        , $source_content);
 
         /* Gather all template tags. */
         preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match);
@@ -388,7 +388,7 @@ 
                 if ($postfilter === false) continue;
                 if ($postfilter[3] || is_callable($postfilter[0])) {
                     $compiled_content = call_user_func_array($postfilter[0],
-                                                              array($compiled_content, &$this));
+                                                                array($compiled_content, &$this));
                     $this->_plugins['postfilter'][$filter_name][3] = true;
                 } else {
                     $this->_trigger_fatal_error("Smarty plugin error: postfilter '$filter_name' is not implemented");
@@ -649,8 +649,8 @@ 
                 $output = call_user_func_array($plugin_func, array($tag_args, &$this));
                 if($output != '') {
                 $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
-                                   . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
+                                    . $output
+                                    . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
                 }
             } else {
                 $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
@@ -1115,7 +1115,7 @@ 
             $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
         else
             $output .= "if ({$section_props}['max'] < 0)\n" .
-                       "    {$section_props}['max'] = {$section_props}['loop'];\n";
+                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
 
         if (!isset($attrs['step']))
             $output .= "{$section_props}['step'] = 1;\n";
@@ -1124,9 +1124,9 @@ 
             $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
         else {
             $output .= "if ({$section_props}['start'] < 0)\n" .
-                       "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
-                       "else\n" .
-                       "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+                        "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
+                        "else\n" .
+                        "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
         }
 
         $output .= "if ({$section_props}['show']) {\n";
@@ -1136,9 +1136,9 @@ 
             $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
         }
         $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
-                   "    {$section_props}['total'] = 0;\n";
+                    "        {$section_props}['show'] = false;\n" .
+                    "} else\n" .
+                    "    {$section_props}['total'] = 0;\n";
 
         $output .= "if ({$section_props}['show']):\n";
         $output .= "
@@ -1987,8 +1987,8 @@ 
         }
         if (!isset($this->_plugin_info[$type][$name])) {
             $this->_plugin_info[$type][$name] = array($this->_current_file,
-                                                      $this->_current_line_no,
-                                                      $delayed_loading);
+                                                        $this->_current_line_no,
+                                                        $delayed_loading);
         }
     }
 
@@ -2056,7 +2056,7 @@ 
             case 'get':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_GET";
@@ -2065,7 +2065,7 @@ 
             case 'post':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_POST";
@@ -2074,7 +2074,7 @@ 
             case 'cookies':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_COOKIE";
@@ -2083,7 +2083,7 @@ 
             case 'env':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_ENV";
@@ -2092,7 +2092,7 @@ 
             case 'server':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_SERVER";
@@ -2101,7 +2101,7 @@ 
             case 'session':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_SESSION";
@@ -2114,7 +2114,7 @@ 
             case 'request':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 if ($this->request_use_auto_globals) {
@@ -2141,7 +2141,7 @@ 
             case 'const':
                 if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) {
                     $this->_syntax_error("(secure mode) constants not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 array_shift($indexes);
@@ -2197,7 +2197,7 @@ 
                 return ((is_object($this->_plugins[$type][$name][0][0])) ?
                         "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
                         : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
+                        ). $this->_plugins[$type][$name][0][1];
 
             } else {
                 /* function callback */
@@ -2342,7 +2342,7 @@ 
             $message = " expected {/$_open_tag} (opened line $_line_no).";
         }
         $this->_syntax_error("mismatched tag {/$close_tag}.$message",
-                             E_USER_ERROR, __FILE__, __LINE__);
+                                E_USER_ERROR, __FILE__, __LINE__);
     }
 
 }

data/Relationships/One2OneBeanRelationship.php

Indentation +2 added lines, -2 removed lines

@@ -102,9 +102,9 @@
 
         //join the related module's table
         $join .= "$join_type $targetTableWithAlias ON $targetTable.$targetKey=$startingTable.$startingKey"
-               . " AND $targetTable.deleted=$deleted\n"
+                . " AND $targetTable.deleted=$deleted\n"
         //Next add any role filters
-               . $this->getRoleWhere();
+                . $this->getRoleWhere();
 
         if($return_array){
             return array(

data/Relationships/One2MBeanRelationship.php

Indentation +2 added lines, -2 removed lines

@@ -295,7 +295,7 @@ 
         //First join the relationship table
         $join .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
+                . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n";
 
         if($return_array){
             return array(
@@ -354,7 +354,7 @@ 
 
         $query .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere($tableInRoleFilter) . "\n";
+                . $this->getRoleWhere($tableInRoleFilter) . "\n";
 
         if (!empty($params['return_as_array'])) {
             $return_array = true;

data/Relationships/M2MRelationship.php

Indentation +66 added lines, -66 removed lines

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

data/Relationships/One2MRelationship.php

Indentation +26 added lines, -26 removed lines

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

soap.php

Indentation +5 added lines, -5 removed lines

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

modules/Connectors/InstallDefaultConnectors.php

Indentation +20 added lines, -20 removed lines

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

modules/Prospects/ProspectFormBase.php

Indentation +165 added lines, -165 removed lines

@@ -49,95 +49,95 @@ 
 class ProspectFormBase  {
 
 function checkForDuplicates($prefix){
-	global $local_log;
-	require_once('include/formbase.php');
+    global $local_log;
+    require_once('include/formbase.php');
 	
-	$focus = new Prospect();
-	if(!checkRequired($prefix, array_keys($focus->required_fields))){
-		return null;
-	}
-	$query = '';
-	$baseQuery = 'select id,first_name, last_name, title, email1, email2  from prospects where deleted!=1 and (';
-	if(!empty($_POST[$prefix.'first_name']) && !empty($_POST[$prefix.'last_name'])){
-		$query = $baseQuery ."  (first_name like '". $_POST[$prefix.'first_name'] . "%' and last_name = '". $_POST[$prefix.'last_name'] ."')";
-	}else{
-			$query = $baseQuery ."  last_name = '". $_POST[$prefix.'last_name'] ."'";
-	}
-	if(!empty($_POST[$prefix.'email1'])){
-		if(empty($query)){
-		$query = $baseQuery. "  email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
-		}else {
-			$query .= "or email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
-		}
-	}
-	if(!empty($_POST[$prefix.'email2'])){
-		if(empty($query))	{
-			$query = $baseQuery. "  email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
-		}else{
-			$query .= "or email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
-		}
-
-	}
-
-	if(!empty($query)){
-		$rows = array();
+    $focus = new Prospect();
+    if(!checkRequired($prefix, array_keys($focus->required_fields))){
+        return null;
+    }
+    $query = '';
+    $baseQuery = 'select id,first_name, last_name, title, email1, email2  from prospects where deleted!=1 and (';
+    if(!empty($_POST[$prefix.'first_name']) && !empty($_POST[$prefix.'last_name'])){
+        $query = $baseQuery ."  (first_name like '". $_POST[$prefix.'first_name'] . "%' and last_name = '". $_POST[$prefix.'last_name'] ."')";
+    }else{
+            $query = $baseQuery ."  last_name = '". $_POST[$prefix.'last_name'] ."'";
+    }
+    if(!empty($_POST[$prefix.'email1'])){
+        if(empty($query)){
+        $query = $baseQuery. "  email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
+        }else {
+            $query .= "or email1='". $_POST[$prefix.'email1'] . "' or email2 = '". $_POST[$prefix.'email1'] ."'";
+        }
+    }
+    if(!empty($_POST[$prefix.'email2'])){
+        if(empty($query))	{
+            $query = $baseQuery. "  email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
+        }else{
+            $query .= "or email1='". $_POST[$prefix.'email2'] . "' or email2 = '". $_POST[$prefix.'email2'] ."'";
+        }
+
+    }
+
+    if(!empty($query)){
+        $rows = array();
 		
-		$db = DBManagerFactory::getInstance();
-		$result = $db->query($query.');');
+        $db = DBManagerFactory::getInstance();
+        $result = $db->query($query.');');
         while($row = $db->fetchByAssoc($result)) {
             $rows[] = $row;
-		}
-		if(count($rows) > 0) return $rows;
-		}
-	return null;
+        }
+        if(count($rows) > 0) return $rows;
+        }
+    return null;
 }
 
 
 function buildTableForm($rows, $mod=''){
-	global $action;
-	if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
-	}else global $mod_strings;
-	global $app_strings;
-	$cols = sizeof($rows[0]) * 2 + 1;
-	if ($action != 'ShowDuplicates') 
-	{
-		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_DUPLICATE']. '</td></tr><tr><td height="20"></td></tr></table>';
-		$form .= "<form action='index.php' method='post' name='dupProspects'><input type='hidden' name='selectedProspect' value=''>";
-	}
-	else 
-	{
-		$form = '<table width="100%"><tr><td>'.$mod_strings['MSG_SHOW_DUPLICATES']. '</td></tr><tr><td height="20"></td></tr></table>';
-	}
-	$form .= get_form_header($mod_strings['LBL_DUPLICATE'],"", '');
-	$form .= "<table width='100%' cellpadding='0' cellspacing='0'>	<tr >	";
-	if ($action != 'ShowDuplicates') 
-	{
-		$form .= "<td > &nbsp;</td>";
-	}
-
-	require_once('include/formbase.php');
-	$form .= getPostToForm();
-
-	if(isset($rows[0])){
-		foreach ($rows[0] as $key=>$value){
-			if($key != 'id'){
-					$form .= "<td scope='col' >". $mod_strings[$mod_strings['db_'.$key]]. "</td>";
-			}
-		}
-		$form .= "</tr>";
-	}
-	$rowColor = 'oddListRowS1';
-	foreach($rows as $row){
-
-		$form .= "<tr class='$rowColor'>";
-		if ($action != 'ShowDuplicates') 
-			$form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
+    global $action;
+    if(!empty($mod)){
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
+    }else global $mod_strings;
+    global $app_strings;
+    $cols = sizeof($rows[0]) * 2 + 1;
+    if ($action != 'ShowDuplicates') 
+    {
+        $form = '<table width="100%"><tr><td>'.$mod_strings['MSG_DUPLICATE']. '</td></tr><tr><td height="20"></td></tr></table>';
+        $form .= "<form action='index.php' method='post' name='dupProspects'><input type='hidden' name='selectedProspect' value=''>";
+    }
+    else 
+    {
+        $form = '<table width="100%"><tr><td>'.$mod_strings['MSG_SHOW_DUPLICATES']. '</td></tr><tr><td height="20"></td></tr></table>';
+    }
+    $form .= get_form_header($mod_strings['LBL_DUPLICATE'],"", '');
+    $form .= "<table width='100%' cellpadding='0' cellspacing='0'>	<tr >	";
+    if ($action != 'ShowDuplicates') 
+    {
+        $form .= "<td > &nbsp;</td>";
+    }
+
+    require_once('include/formbase.php');
+    $form .= getPostToForm();
+
+    if(isset($rows[0])){
+        foreach ($rows[0] as $key=>$value){
+            if($key != 'id'){
+                    $form .= "<td scope='col' >". $mod_strings[$mod_strings['db_'.$key]]. "</td>";
+            }
+        }
+        $form .= "</tr>";
+    }
+    $rowColor = 'oddListRowS1';
+    foreach($rows as $row){
+
+        $form .= "<tr class='$rowColor'>";
+        if ($action != 'ShowDuplicates') 
+            $form .= "<td width='1%' nowrap='nowrap' ><a href='#' onClick=\"document.dupProspects.selectedProspect.value='${row['id']}';document.dupProspects.submit() \">[${app_strings['LBL_SELECT_BUTTON_LABEL']}]</a>&nbsp;&nbsp;</td>\n";
 		
-		$wasSet = false;
+        $wasSet = false;
 
-		foreach ($row as $key=>$value) {
+        foreach ($row as $key=>$value) {
             if($key != 'id') {
                 if(!$wasSet) {
                     $form .= "<td scope='row' ><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
@@ -147,25 +147,25 @@ 
                     $form .= "<td><a target='_blank' href='index.php?module=Prospects&action=DetailView&record=${row['id']}'>$value</a></td>\n";
                 }
             }
-		}
-
-		if($rowColor == 'evenListRowS1'){
-			$rowColor = 'oddListRowS1';
-		}else{
-			 $rowColor = 'evenListRowS1';
-		}
-		$form .= "</tr>";
-	}
-	$form .= "<tr ><td colspan='$cols' class='blackline'></td></tr>";
-	if ($action == 'ShowDuplicates') 
-	{
-		$form .= "</table><br><input title='${app_strings['LBL_SAVE_BUTTON_TITLE']}' accessKey='${app_strings['LBL_SAVE_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='Save';\" type='submit' name='button' value='  ${app_strings['LBL_SAVE_BUTTON_LABEL']}  '> <input title='${app_strings['LBL_CANCEL_BUTTON_TITLE']}' accessKey='${app_strings['LBL_CANCEL_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='ListView'; this.form.module.value='Prospects';\" type='submit' name='button' value='  ${app_strings['LBL_CANCEL_BUTTON_LABEL']}  '></form>";
-	}
-	else 
-	{
-		$form .= "</table><br><input type='submit' class='button' name='ContinueProspect' value='${mod_strings['LNK_NEW_PROSPECT']}'></form>";
-	}
-	return $form;
+        }
+
+        if($rowColor == 'evenListRowS1'){
+            $rowColor = 'oddListRowS1';
+        }else{
+                $rowColor = 'evenListRowS1';
+        }
+        $form .= "</tr>";
+    }
+    $form .= "<tr ><td colspan='$cols' class='blackline'></td></tr>";
+    if ($action == 'ShowDuplicates') 
+    {
+        $form .= "</table><br><input title='${app_strings['LBL_SAVE_BUTTON_TITLE']}' accessKey='${app_strings['LBL_SAVE_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='Save';\" type='submit' name='button' value='  ${app_strings['LBL_SAVE_BUTTON_LABEL']}  '> <input title='${app_strings['LBL_CANCEL_BUTTON_TITLE']}' accessKey='${app_strings['LBL_CANCEL_BUTTON_KEY']}' class='button' onclick=\"this.form.action.value='ListView'; this.form.module.value='Prospects';\" type='submit' name='button' value='  ${app_strings['LBL_CANCEL_BUTTON_LABEL']}  '></form>";
+    }
+    else 
+    {
+        $form .= "</table><br><input type='submit' class='button' name='ContinueProspect' value='${mod_strings['LNK_NEW_PROSPECT']}'></form>";
+    }
+    return $form;
 
 
 
@@ -173,31 +173,31 @@ 
 
 }
 function getWideFormBody($prefix, $mod='',$formname='',  $prospect = ''){
-	if(!ACLController::checkAccess('Prospects', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('Prospects', 'edit', true)){
+        return '';
+    }
 	
-	if(empty($prospect)){
-		$prospect = new Prospect();
-	}
-	global $mod_strings;
+    if(empty($prospect)){
+        $prospect = new Prospect();
+    }
+    global $mod_strings;
 $temp_strings = $mod_strings;
 if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
 }
-		global $app_strings;
-		global $current_user;
-		global $app_list_strings;
-		$primary_address_country_options = get_select_options_with_id($app_list_strings['countries_dom'], $prospect->primary_address_country);
-		$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-		$lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
-		$lbl_last_name = $mod_strings['LBL_LAST_NAME'];
-		$lbl_phone = $mod_strings['LBL_OFFICE_PHONE'];
-		$lbl_address =  $mod_strings['LBL_PRIMARY_ADDRESS'];
-		$user_id = $current_user->id;
-		$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
-		$form = <<<EOQ
+        global $app_strings;
+        global $current_user;
+        global $app_list_strings;
+        $primary_address_country_options = get_select_options_with_id($app_list_strings['countries_dom'], $prospect->primary_address_country);
+        $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+        $lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
+        $lbl_last_name = $mod_strings['LBL_LAST_NAME'];
+        $lbl_phone = $mod_strings['LBL_OFFICE_PHONE'];
+        $lbl_address =  $mod_strings['LBL_PRIMARY_ADDRESS'];
+        $user_id = $current_user->id;
+        $lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
+        $form = <<<EOQ
 		<input type="hidden" name="${prefix}record" value="">
 		<input type="hidden" name="${prefix}assigned_user_id" value='${user_id}'>
 		<table border='0' celpadding="0" cellspacing="0" width='100%'>
@@ -304,26 +304,26 @@ 
 }
 
 function getFormBody($prefix, $mod='', $formname=''){
-	if(!ACLController::checkAccess('Prospects', 'edit', true)){
-		return '';
-	}
+    if(!ACLController::checkAccess('Prospects', 'edit', true)){
+        return '';
+    }
 global $mod_strings;
 $temp_strings = $mod_strings;
 if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
 }
-		global $app_strings;
-		global $current_user;
-		$lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
-		$lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
-		$lbl_last_name = $mod_strings['LBL_LAST_NAME'];
-		$lbl_phone = $mod_strings['LBL_PHONE'];
-		$user_id = $current_user->id;
-		$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
+        global $app_strings;
+        global $current_user;
+        $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
+        $lbl_first_name = $mod_strings['LBL_FIRST_NAME'];
+        $lbl_last_name = $mod_strings['LBL_LAST_NAME'];
+        $lbl_phone = $mod_strings['LBL_PHONE'];
+        $user_id = $current_user->id;
+        $lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
 if ($formname == 'EmailEditView')
 {
-		$form = <<<EOQ
+        $form = <<<EOQ
 		<input type="hidden" name="${prefix}record" value="">
 		<input type="hidden" name="${prefix}email2" value="">
 		<input type="hidden" name="${prefix}phone_work" value="">
@@ -339,7 +339,7 @@ 
 }
 else
 {
-		$form = <<<EOQ
+        $form = <<<EOQ
 		<input type="hidden" name="${prefix}record" value="">
 		<input type="hidden" name="${prefix}email2" value="">
 		<input type="hidden" name="${prefix}assigned_user_id" value='${user_id}'>
@@ -369,11 +369,11 @@ 
 }
 function getForm($prefix, $mod=''){
 if(!ACLController::checkAccess('Prospects', 'edit', true)){
-		return '';
-	}
+        return '';
+    }
 if(!empty($mod)){
-	global $current_language;
-	$mod_strings = return_module_language($current_language, $mod);
+    global $current_language;
+    $mod_strings = return_module_language($current_language, $mod);
 }else global $mod_strings;
 global $app_strings;
 
@@ -405,31 +405,31 @@ 
 
 
 function handleSave($prefix,$redirect=true, $useRequired=false){
-	global $theme;
+    global $theme;
 	
 	
 	
 	
-	require_once('include/formbase.php');
+    require_once('include/formbase.php');
 	
-	global $timedate;
+    global $timedate;
 	
 	
-	$focus = new Prospect();
-	if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
-		return null;
-	}
-	$focus = populateFromPost($prefix, $focus);
-	if(!$focus->ACLAccess('Save')){
-		return null;
-	}
-	if (!isset($GLOBALS['check_notify'])) $GLOBALS['check_notify']=false;
+    $focus = new Prospect();
+    if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
+        return null;
+    }
+    $focus = populateFromPost($prefix, $focus);
+    if(!$focus->ACLAccess('Save')){
+        return null;
+    }
+    if (!isset($GLOBALS['check_notify'])) $GLOBALS['check_notify']=false;
 	
-	if (!isset($_POST[$prefix.'email_opt_out'])) $focus->email_opt_out = 0;
-	if (!isset($_POST[$prefix.'do_not_call'])) $focus->do_not_call = 0;
+    if (!isset($_POST[$prefix.'email_opt_out'])) $focus->email_opt_out = 0;
+    if (!isset($_POST[$prefix.'do_not_call'])) $focus->do_not_call = 0;
 	
-	if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
-		/*
+    if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
+        /*
 		// we don't check dupes on Prospects - this is the dirtiest data in the system
 		//$duplicateProspects = $this->checkForDuplicates($prefix);
 		if(isset($duplicateProspects)){
@@ -473,13 +473,13 @@ 
 			header("Location: index.php?$get");
 			return null;
 		}*/
-	}
-	global $current_user;
+    }
+    global $current_user;
 
-	$focus->save($GLOBALS['check_notify']);
-	$return_id = $focus->id;
+    $focus->save($GLOBALS['check_notify']);
+    $return_id = $focus->id;
     
-	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
+    $GLOBALS['log']->debug("Saved record with id of ".$return_id);
     if(isset($_POST['popup']) && $_POST['popup'] == 'true') {
         $get = '&module=';
         if(!empty($_POST['return_module'])) $get .= $_POST['return_module'];
@@ -497,12 +497,12 @@ 
         header("Location: index.php?$get");
         return;
     }
-	if($redirect){
-	    require_once('include/formbase.php');
-	    handleRedirect($return_id, 'Prospects');
-	}else{
-		return $focus;
-	}
+    if($redirect){
+        require_once('include/formbase.php');
+        handleRedirect($return_id, 'Prospects');
+    }else{
+        return $focus;
+    }
 }
 
 }

modules/Prospects/metadata/additionalDetails.php

Indentation +46 added lines, -46 removed lines

@@ -40,58 +40,58 @@
 
 
 function additionalDetailsProspect($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'Prospects');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'Prospects');
+    }
 		
-	$overlib_string = '';
+    $overlib_string = '';
 	
-	if(!empty($fields['ACCOUNT_NAME'])) $overlib_string .= '<b>'. $mod_strings['LBL_EDIT_ACCOUNT_NAME'] . '</b> ' . $fields['ACCOUNT_NAME'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
-		!empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
-		!empty($fields['PRIMARY_ADDRESS_COUNTRY']))
-			$overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
-	if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
-	if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
-	if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
-	if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
-		$overlib_string .= '<br>';  
-	if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
-	if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
-	if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
+    if(!empty($fields['ACCOUNT_NAME'])) $overlib_string .= '<b>'. $mod_strings['LBL_EDIT_ACCOUNT_NAME'] . '</b> ' . $fields['ACCOUNT_NAME'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET']) || !empty($fields['PRIMARY_ADDRESS_CITY']) ||
+        !empty($fields['PRIMARY_ADDRESS_STATE']) || !empty($fields['PRIMARY_ADDRESS_POSTALCODE']) ||
+        !empty($fields['PRIMARY_ADDRESS_COUNTRY']))
+            $overlib_string .= '<b>' . $mod_strings['LBL_PRIMARY_ADDRESS'] . '</b><br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET_2'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_2'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_STREET_3'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STREET_3'] . '<br>';
+    if(!empty($fields['PRIMARY_ADDRESS_CITY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_CITY'] . ', ';
+    if(!empty($fields['PRIMARY_ADDRESS_STATE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_STATE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_POSTALCODE'])) $overlib_string .= $fields['PRIMARY_ADDRESS_POSTALCODE'] . ' ';
+    if(!empty($fields['PRIMARY_ADDRESS_COUNTRY'])) $overlib_string .= $fields['PRIMARY_ADDRESS_COUNTRY'] . '<br>';
+    if(strlen($overlib_string) > 0 && !(strrpos($overlib_string, '<br>') == strlen($overlib_string) - 4)) 
+        $overlib_string .= '<br>';  
+    if(!empty($fields['PHONE_MOBILE'])) $overlib_string .= '<b>'. $mod_strings['LBL_MOBILE_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_MOBILE'] . '</span><br>';
+    if(!empty($fields['PHONE_HOME'])) $overlib_string .= '<b>'. $mod_strings['LBL_HOME_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_HOME'] . '</span><br>';
+    if(!empty($fields['PHONE_OTHER'])) $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_PHONE'] . '</b> <span class="phone">' . $fields['PHONE_OTHER'] . '</span><br>';
 
-	if(!empty($fields['EMAIL1'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL1']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL1']}>") .
-								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL1']}</a><br>";
-	if(!empty($fields['EMAIL2'])) 
-		$overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
-								 "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
-								 "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
-								 "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
-								 "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
-								 "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
+    if(!empty($fields['EMAIL1'])) 
+        $overlib_string .= '<b>'. $mod_strings['LBL_EMAIL_ADDRESS'] . '</b> ' . 
+                                    "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
+                                    "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
+                                    "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL1']}&" .
+                                    "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL1']}>") .
+                                    "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL1']}</a><br>";
+    if(!empty($fields['EMAIL2'])) 
+        $overlib_string .= '<b>'. $mod_strings['LBL_OTHER_EMAIL_ADDRESS'] . '</b> ' . 
+                                    "<a href=index.php?module=Emails&action=Compose&contact_id={$fields['ID']}&" .
+                                    "parent_type=Contacts&parent_id={$fields['ID']}&to_addrs_ids={$fields['ID']}&to_addrs_names" .
+                                    "={$fields['FIRST_NAME']}&nbsp;{$fields['LAST_NAME']}&to_addrs_emails={$fields['EMAIL2']}&" .
+                                    "to_email_addrs=" . urlencode("{$fields['FIRST_NAME']} {$fields['LAST_NAME']} <{$fields['EMAIL2']}>") .
+                                    "&return_module=Contacts&return_action=ListView'>{$fields['EMAIL2']}</a><br>";
 	
-	if(!empty($fields['DESCRIPTION'])) { 
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-	}	
+    if(!empty($fields['DESCRIPTION'])) { 
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    }	
 	
-	return array('fieldToAddTo' => 'FULL_NAME', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=Prospects&return_module=Prospects&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=Prospects&return_module=Prospects&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'FULL_NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=Prospects&return_module=Prospects&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=Prospects&return_module=Prospects&record={$fields['ID']}");
 	
 }
  
- ?>
+    ?>