adamjakab / SuiteCRM

include/generic/SugarWidgets/SugarWidgetFielduser_name.php

Indentation +5 added lines, -5 removed lines

@@ -43,12 +43,12 @@
 
 class SugarWidgetFielduser_name extends SugarWidgetFieldname
 {
- function displayInput(&$layout_def) 
- {
+    function displayInput(&$layout_def) 
+    {
         $selected_users = empty($layout_def['input_name0']) ? '' : $layout_def['input_name0'];
- 		$str = '<select multiple="true" size="3" name="' . $layout_def['name'] . '[]">' . get_select_options_with_id(get_user_array(false), $selected_users) . '</select>';
- 		return $str;
- }
+            $str = '<select multiple="true" size="3" name="' . $layout_def['name'] . '[]">' . get_select_options_with_id(get_user_array(false), $selected_users) . '</select>';
+            return $str;
+    }
 }
 
 ?>

include/generic/SugarWidgets/SugarWidgetSubPanelIcon.php

Indentation +93 added lines, -93 removed lines

@@ -45,77 +45,77 @@ 
 
 class SugarWidgetSubPanelIcon extends SugarWidgetField
 {
-	function displayHeaderCell($layout_def)
-	{
-		return ' ';
-	}
-
-	function displayList($layout_def)
-	{
-		global $app_strings;
-		global $app_list_strings;
-		global $current_user;
-
-		if(isset($layout_def['varname']))
-		{
-			$key = strtoupper($layout_def['varname']);
-		}
-		else
-		{
-			$key = $this->_get_column_alias($layout_def);
-			$key = strtoupper($key);
-		}
+    function displayHeaderCell($layout_def)
+    {
+        return ' ';
+    }
+
+    function displayList($layout_def)
+    {
+        global $app_strings;
+        global $app_list_strings;
+        global $current_user;
+
+        if(isset($layout_def['varname']))
+        {
+            $key = strtoupper($layout_def['varname']);
+        }
+        else
+        {
+            $key = $this->_get_column_alias($layout_def);
+            $key = strtoupper($key);
+        }
 //add module image
-		//add module image
-		if(!empty($layout_def['target_module_key'])) {
-			if (!empty($layout_def['fields'][strtoupper($layout_def['target_module_key'])])) {
-				$module=$layout_def['fields'][strtoupper($layout_def['target_module_key'])];
-			}
-		}
+        //add module image
+        if(!empty($layout_def['target_module_key'])) {
+            if (!empty($layout_def['fields'][strtoupper($layout_def['target_module_key'])])) {
+                $module=$layout_def['fields'][strtoupper($layout_def['target_module_key'])];
+            }
+        }
 
         if (empty($module)) {
-			if(empty($layout_def['target_module']))
-			{
-				$module = $layout_def['module'];
-			}
-		else
-			{
-				$module = $layout_def['target_module'];
-			}
-		}
-		$action = 'DetailView';
-		if(empty($layout_def['target_record_key']))
-		{
-			$record = $layout_def['fields']['ID'];
-		}
-		else
-		{
-			$record_key = strtoupper($layout_def['target_record_key']);
-			$record = $layout_def['fields'][$record_key];
-		}
-		$action_access = false;
-		if(!empty($record) &&
-			($layout_def[$action] && !$layout_def['owner_module']
-			||  $layout_def[$action] && !ACLController::moduleSupportsACL($layout_def['owner_module'])
-			|| ACLController::checkAccess($layout_def['owner_module'], 'view', $layout_def['owner_id'] == $current_user->id))) {
-			$action_access = true;
-		}
-		$icon_img_html = SugarThemeRegistry::current()->getImage( $module . '', 'border="0"',null,null,'.gif',$app_list_strings['moduleList'][$module]);
-		if (!empty($layout_def['attachment_image_only']) && $layout_def['attachment_image_only'] == true) {
-			$ret="";
-		} else {
-			if ($action_access) {
-				$ret = '<a href="index.php?module=' . $module . '&action=' . $action . '&record=' . $record	. '" >' . $icon_img_html . "</a>";
-			} else {
-				$ret = $icon_img_html;
-			}
-		}
-
-		if(!empty($layout_def['image2']) &&  !empty($layout_def['image2_ext_url_field'])){
-
-			if (!empty($layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])])) {
-				$link_url  = $layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])];
-			}
+            if(empty($layout_def['target_module']))
+            {
+                $module = $layout_def['module'];
+            }
+        else
+            {
+                $module = $layout_def['target_module'];
+            }
+        }
+        $action = 'DetailView';
+        if(empty($layout_def['target_record_key']))
+        {
+            $record = $layout_def['fields']['ID'];
+        }
+        else
+        {
+            $record_key = strtoupper($layout_def['target_record_key']);
+            $record = $layout_def['fields'][$record_key];
+        }
+        $action_access = false;
+        if(!empty($record) &&
+            ($layout_def[$action] && !$layout_def['owner_module']
+            ||  $layout_def[$action] && !ACLController::moduleSupportsACL($layout_def['owner_module'])
+            || ACLController::checkAccess($layout_def['owner_module'], 'view', $layout_def['owner_id'] == $current_user->id))) {
+            $action_access = true;
+        }
+        $icon_img_html = SugarThemeRegistry::current()->getImage( $module . '', 'border="0"',null,null,'.gif',$app_list_strings['moduleList'][$module]);
+        if (!empty($layout_def['attachment_image_only']) && $layout_def['attachment_image_only'] == true) {
+            $ret="";
+        } else {
+            if ($action_access) {
+                $ret = '<a href="index.php?module=' . $module . '&action=' . $action . '&record=' . $record	. '" >' . $icon_img_html . "</a>";
+            } else {
+                $ret = $icon_img_html;
+            }
+        }
+
+        if(!empty($layout_def['image2']) &&  !empty($layout_def['image2_ext_url_field'])){
+
+            if (!empty($layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])])) {
+                $link_url  = $layout_def['fields'][strtoupper($layout_def['image2_ext_url_field'])];
+            }
 
             $imagePath = '';
             if ( $layout_def['image2'] == '__VARIABLE' ) {
@@ -132,34 +132,34 @@ 
             }
         }
 //if requested, add attachment icon.
-		if(!empty($layout_def['image2']) && !empty($layout_def['image2_url_field'])){
+        if(!empty($layout_def['image2']) && !empty($layout_def['image2_url_field'])){
 
-			if (is_array($layout_def['image2_url_field'])) {
-				//Generate file url.
-				if (!empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])])
-				and !empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])]) ) {
+            if (is_array($layout_def['image2_url_field'])) {
+                //Generate file url.
+                if (!empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])])
+                and !empty($layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])]) ) {
 
-					$key=$layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])];
+                    $key=$layout_def['fields'][strtoupper($layout_def['image2_url_field']['id_field'])];
                     $file=$layout_def['fields'][strtoupper($layout_def['image2_url_field']['filename_field'])];
                     $filepath="index.php?entryPoint=download&id=".$key."&type=".$layout_def['module'];
-				}
-			} else {
-				if (!empty($layout_def['fields'][strtoupper($layout_def['image2_url_field'])])) {
-					$filepath="index.php?entryPoint=download&id=".$layout_def['fields']['ID']."&type=".$layout_def['module'];
-				}
-			}
-			$icon_img_html = SugarThemeRegistry::current()->getImage( $layout_def['image2'] . '', 'border="0"',null,null,'.gif',$layout_def['image2']);
-			if ($action_access && !empty($filepath)) {
-				$ret .= '<a href="' . $filepath. '" >' . "$icon_img_html</a>";
-			} elseif (!empty($filepath)) {
-				$ret .= $icon_img_html;
-			}
-		}
-		// now handle attachments for Emails
-		else if(!empty($layout_def['module']) && $layout_def['module'] == 'Emails' && !empty($layout_def['fields']['ATTACHMENT_IMAGE'])) {
-			$ret.= $layout_def['fields']['ATTACHMENT_IMAGE'];
-		}
-		return $ret;
-	}
+                }
+            } else {
+                if (!empty($layout_def['fields'][strtoupper($layout_def['image2_url_field'])])) {
+                    $filepath="index.php?entryPoint=download&id=".$layout_def['fields']['ID']."&type=".$layout_def['module'];
+                }
+            }
+            $icon_img_html = SugarThemeRegistry::current()->getImage( $layout_def['image2'] . '', 'border="0"',null,null,'.gif',$layout_def['image2']);
+            if ($action_access && !empty($filepath)) {
+                $ret .= '<a href="' . $filepath. '" >' . "$icon_img_html</a>";
+            } elseif (!empty($filepath)) {
+                $ret .= $icon_img_html;
+            }
+        }
+        // now handle attachments for Emails
+        else if(!empty($layout_def['module']) && $layout_def['module'] == 'Emails' && !empty($layout_def['fields']['ATTACHMENT_IMAGE'])) {
+            $ret.= $layout_def['fields']['ATTACHMENT_IMAGE'];
+        }
+        return $ret;
+    }
 }
 ?>

include/generic/SugarWidgets/SugarWidgetSubPanelConcat.php

Indentation +14 added lines, -14 removed lines

@@ -45,21 +45,21 @@
 
 class SugarWidgetSubPanelConcat extends SugarWidgetField
 {
-	function displayList(&$layout_def)
-	{
-		$value='';
-		if (isset($layout_def['source']) and is_array($layout_def['source']) and isset($layout_def['fields']) and is_array($layout_def['fields'])) {
+    function displayList(&$layout_def)
+    {
+        $value='';
+        if (isset($layout_def['source']) and is_array($layout_def['source']) and isset($layout_def['fields']) and is_array($layout_def['fields'])) {
 			
-			foreach ($layout_def['source'] as $field) {
+            foreach ($layout_def['source'] as $field) {
 			
-				if (isset($layout_def['fields'][strtoupper($field)])) {
-					$value.=$layout_def['fields'][strtoupper($field)];
-				} else {
-					$value.=$field;
-				}	
-			}
-		}
-		return $value;
-	}
+                if (isset($layout_def['fields'][strtoupper($field)])) {
+                    $value.=$layout_def['fields'][strtoupper($field)];
+                } else {
+                    $value.=$field;
+                }	
+            }
+        }
+        return $value;
+    }
 }
 ?>
\ No newline at end of file

include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php

Indentation +60 added lines, -60 removed lines

@@ -45,81 +45,81 @@
 
 class SugarWidgetSubPanelRemoveButton extends SugarWidgetField
 {
-	function displayHeaderCell($layout_def)
-	{
-		return ' ';
-	}
+    function displayHeaderCell($layout_def)
+    {
+        return ' ';
+    }
 
-	function displayList($layout_def)
-	{
+    function displayList($layout_def)
+    {
 		
-		global $app_strings;
+        global $app_strings;
         global $subpanel_item_count;
 
-		$unique_id = $layout_def['subpanel_id']."_remove_".$subpanel_item_count; //bug 51512
+        $unique_id = $layout_def['subpanel_id']."_remove_".$subpanel_item_count; //bug 51512
 		
-		$parent_record_id = $_REQUEST['record'];
-		$parent_module = $_REQUEST['module'];
+        $parent_record_id = $_REQUEST['record'];
+        $parent_module = $_REQUEST['module'];
 
-		$action = 'DeleteRelationship';
-		$record = $layout_def['fields']['ID'];
-		$current_module=$layout_def['module'];
-		//in document revisions subpanel ,users are now allowed to 
-		//delete the latest revsion of a document. this will be tested here
-		//and if the condition is met delete button will be removed.
-		$hideremove=false;
-		if ($current_module=='DocumentRevisions') {
-			if ($layout_def['fields']['ID']==$layout_def['fields']['LATEST_REVISION_ID']) {
-				$hideremove=true;
-			}
-		}
-		// Implicit Team-memberships are not "removeable" 
-		elseif ($_REQUEST['module'] == 'Teams' && $current_module == 'Users') {
-			if($layout_def['fields']['UPLINE'] != translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
-				$hideremove = true;
-			}	
+        $action = 'DeleteRelationship';
+        $record = $layout_def['fields']['ID'];
+        $current_module=$layout_def['module'];
+        //in document revisions subpanel ,users are now allowed to 
+        //delete the latest revsion of a document. this will be tested here
+        //and if the condition is met delete button will be removed.
+        $hideremove=false;
+        if ($current_module=='DocumentRevisions') {
+            if ($layout_def['fields']['ID']==$layout_def['fields']['LATEST_REVISION_ID']) {
+                $hideremove=true;
+            }
+        }
+        // Implicit Team-memberships are not "removeable" 
+        elseif ($_REQUEST['module'] == 'Teams' && $current_module == 'Users') {
+            if($layout_def['fields']['UPLINE'] != translate('LBL_TEAM_UPLINE_EXPLICIT', 'Users')) {
+                $hideremove = true;
+            }	
 			
-			//We also cannot remove the user whose private team is set to the parent_record_id value
-			$user = new User();
-			$user->retrieve($layout_def['fields']['ID']);
-			if($parent_record_id == $user->getPrivateTeamID())
-			{
-			    $hideremove = true;
-			}
-		}
+            //We also cannot remove the user whose private team is set to the parent_record_id value
+            $user = new User();
+            $user->retrieve($layout_def['fields']['ID']);
+            if($parent_record_id == $user->getPrivateTeamID())
+            {
+                $hideremove = true;
+            }
+        }
 		
 		
-		$return_module = $_REQUEST['module'];
-		$return_action = 'SubPanelViewer';
-		$subpanel = $layout_def['subpanel_id'];
-		$return_id = $_REQUEST['record'];
-		if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
-			$linked_field= $layout_def['linked_field_set'] ;
-		} else {
-			$linked_field = $layout_def['linked_field'];
-		}
-		$refresh_page = 0;
-		if(!empty($layout_def['refresh_page'])){
-			$refresh_page = 1;
-		}
-		$return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
+        $return_module = $_REQUEST['module'];
+        $return_action = 'SubPanelViewer';
+        $subpanel = $layout_def['subpanel_id'];
+        $return_id = $_REQUEST['record'];
+        if (isset($layout_def['linked_field_set']) && !empty($layout_def['linked_field_set'])) {
+            $linked_field= $layout_def['linked_field_set'] ;
+        } else {
+            $linked_field = $layout_def['linked_field'];
+        }
+        $refresh_page = 0;
+        if(!empty($layout_def['refresh_page'])){
+            $refresh_page = 1;
+        }
+        $return_url = "index.php?module=$return_module&action=$return_action&subpanel=$subpanel&record=$return_id&sugar_body_only=1&inline=1";
 
-		$icon_remove_text = mb_strtolower($app_strings['LBL_ID_FF_REMOVE'], 'UTF-8');
+        $icon_remove_text = mb_strtolower($app_strings['LBL_ID_FF_REMOVE'], 'UTF-8');
 		
-         if($linked_field == 'get_emails_by_assign_or_link')
+            if($linked_field == 'get_emails_by_assign_or_link')
             $linked_field = 'emails';
-		//based on listview since that lets you select records
-		if($layout_def['ListView'] && !$hideremove) {
+        //based on listview since that lets you select records
+        if($layout_def['ListView'] && !$hideremove) {
             $retStr = "<a href=\"javascript:sub_p_rem('$subpanel', '$linked_field'" 
                     .", '$record', $refresh_page);\"" 
-			. ' class="listViewTdToolsS1"'
+            . ' class="listViewTdToolsS1"'
             . "id=$unique_id"
-			. " onclick=\"return sp_rem_conf();\""
-			. ">$icon_remove_text</a>";
+            . " onclick=\"return sp_rem_conf();\""
+            . ">$icon_remove_text</a>";
         return $retStr;
             
-		}else{
-			return '';
-		}
-	}
+        }else{
+            return '';
+        }
+    }
 }

include/generic/SugarWidgets/SugarWidgetFieldcurrency.php

Indentation +44 added lines, -44 removed lines

@@ -52,7 +52,7 @@ 
         if (empty($global_currency_obj))
         {
         $global_currency_obj = new Currency();
-      //  $global_currency_symbol = '$';
+        //  $global_currency_symbol = '$';
                                                                                        
         if($current_user->getPreference('currency') )
         {
@@ -106,18 +106,18 @@ 
             $record = $layout_def['fields'][strtoupper($layout_def['table_alias']."_id")];
         }
         if (!empty($record)) {
-	        $field_name = $layout_def['name'];
-	        $field_type = $field_def['type'];
-	        $module = $field_def['module'];
+            $field_name = $layout_def['name'];
+            $field_type = $field_def['type'];
+            $module = $field_def['module'];
 	
-	        $div_id = $module ."&$record&$field_name";
-	        $str = "<div id='$div_id'>".$display;
+            $div_id = $module ."&$record&$field_name";
+            $str = "<div id='$div_id'>".$display;
             global $sugar_config;
             if (isset ($sugar_config['enable_inline_reports_edit']) && $sugar_config['enable_inline_reports_edit']) {
                 $str .= "&nbsp;" .SugarThemeRegistry::current()->getImage("edit_inline","border='0' alt='Edit Layout' align='bottom' onClick='SUGAR.reportsInlineEdit.inlineEdit(\"$div_id\",\"$value\",\"$module\",\"$record\",\"$field_name\",\"$field_type\",\"$currency_id\",\"$symbol\");'");
             }
-	        $str .= "</div>";
-	        return $str;
+            $str .= "</div>";
+            return $str;
         }
         else
             return $display;
@@ -135,61 +135,61 @@ 
         );
         return $value;
     }                                                          
- function queryFilterEquals(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)."=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterEquals(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                        
- function queryFilterNot_Equals(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)."!=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterNot_Equals(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)."!=".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                        
- function queryFilterGreater(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterGreater(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
                                                                                        
- function queryFilterLess(&$layout_def)
- {
-     return $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
- }
+    function queryFilterLess(&$layout_def)
+    {
+        return $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0']))."\n";
+    }
 
- function queryFilterBetween(&$layout_def){
-     return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND ". $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
- }
+    function queryFilterBetween(&$layout_def){
+        return $this->_get_column_select($layout_def)." > ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name0'])). " AND ". $this->_get_column_select($layout_def)." < ".$GLOBALS['db']->quote(unformat_number($layout_def['input_name1']))."\n";
+    }
 
- function isSystemCurrency(&$layout_def)
- {
-     if (strpos($layout_def['name'],'_usdoll') === false) {
-         return false;
-     } else {
-         return true;
-     }
- }
+    function isSystemCurrency(&$layout_def)
+    {
+        if (strpos($layout_def['name'],'_usdoll') === false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 
- function querySelect(&$layout_def)
- {
+    function querySelect(&$layout_def)
+    {
     // add currency column to select
     $table = $this->getCurrencyIdTable($layout_def);
     if($table) {
         return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)." , ".$table.".currency_id ". $this->getTruncatedColumnAlias($this->_get_column_alias($layout_def)."_currency") . "\n";
     }
     return $this->_get_column_select($layout_def)." ".$this->_get_column_alias($layout_def)."\n";
- }
+    }
 
- function queryGroupBy($layout_def)
- {
+    function queryGroupBy($layout_def)
+    {
     // add currency column to group by
     $table = $this->getCurrencyIdTable($layout_def);
     if($table) {
         return $this->_get_column_select($layout_def)." , ".$table.".currency_id \n";
     }
     return $this->_get_column_select($layout_def)." \n";
- }
+    }
 
- function getCurrencyIdTable($layout_def)
- {
+    function getCurrencyIdTable($layout_def)
+    {
     // We need to fetch the currency id as well
     if ( !$this->isSystemCurrency($layout_def) && empty($layout_def['group_function'])) {
 
@@ -219,7 +219,7 @@ 
         }
     }
     return false;
- }
+    }
 
     /**
      * Return currency for layout_def

include/generic/DeleteRelationship.php

Indentation +43 added lines, -43 removed lines

@@ -66,55 +66,55 @@ 
 
 require_once('include/formbase.php');
 
- global $beanFiles,$beanList;
- $bean_name = $beanList[$_REQUEST['module']];
- require_once($beanFiles[$bean_name]);
- $focus = new $bean_name();
- if (  empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field'])  || empty($_REQUEST['record']))
- {
-	die("need linked_field, linked_id and record fields");
- }
- $linked_field = $_REQUEST['linked_field'];
- $record = $_REQUEST['record'];
- $linked_id = $_REQUEST['linked_id'];
- if($bean_name == 'Team')
- {
- 	$focus->retrieve($record);
- 	$focus->remove_user_from_team($linked_id);
- }
- else
- {
- 	// cut it off:
- 	$focus->load_relationship($linked_field);
- 	if($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto')
- 		unset($focus->$linked_field->_relationship->relationship_role_column);
- 	$focus->$linked_field->delete($record,$linked_id);
- }
- if ($bean_name == 'Campaign' and $linked_field=='prospectlists' ) {
+    global $beanFiles,$beanList;
+    $bean_name = $beanList[$_REQUEST['module']];
+    require_once($beanFiles[$bean_name]);
+    $focus = new $bean_name();
+    if (  empty($_REQUEST['linked_id']) || empty($_REQUEST['linked_field'])  || empty($_REQUEST['record']))
+    {
+    die("need linked_field, linked_id and record fields");
+    }
+    $linked_field = $_REQUEST['linked_field'];
+    $record = $_REQUEST['record'];
+    $linked_id = $_REQUEST['linked_id'];
+    if($bean_name == 'Team')
+    {
+        $focus->retrieve($record);
+        $focus->remove_user_from_team($linked_id);
+    }
+    else
+    {
+        // cut it off:
+        $focus->load_relationship($linked_field);
+        if($focus->$linked_field->_relationship->relationship_name == 'quotes_contacts_shipto')
+            unset($focus->$linked_field->_relationship->relationship_role_column);
+        $focus->$linked_field->delete($record,$linked_id);
+    }
+    if ($bean_name == 'Campaign' and $linked_field=='prospectlists' ) {
 
- 	$query="SELECT email_marketing_prospect_lists.id from email_marketing_prospect_lists ";
- 	$query.=" left join email_marketing on email_marketing.id=email_marketing_prospect_lists.email_marketing_id";
-	$query.=" where email_marketing.campaign_id='$record'";
- 	$query.=" and email_marketing_prospect_lists.prospect_list_id='$linked_id'";
+        $query="SELECT email_marketing_prospect_lists.id from email_marketing_prospect_lists ";
+        $query.=" left join email_marketing on email_marketing.id=email_marketing_prospect_lists.email_marketing_id";
+    $query.=" where email_marketing.campaign_id='$record'";
+        $query.=" and email_marketing_prospect_lists.prospect_list_id='$linked_id'";
 
- 	$result=$focus->db->query($query);
-	while (($row=$focus->db->fetchByAssoc($result)) != null) {
-			$del_query =" update email_marketing_prospect_lists set email_marketing_prospect_lists.deleted=1, email_marketing_prospect_lists.date_modified=".$focus->db->convert("'".TimeDate::getInstance()->nowDb()."'",'datetime');
- 			$del_query.=" WHERE  email_marketing_prospect_lists.id='{$row['id']}'";
-		 	$focus->db->query($del_query);
-	}
- 	$focus->db->query($query);
- }
+        $result=$focus->db->query($query);
+    while (($row=$focus->db->fetchByAssoc($result)) != null) {
+            $del_query =" update email_marketing_prospect_lists set email_marketing_prospect_lists.deleted=1, email_marketing_prospect_lists.date_modified=".$focus->db->convert("'".TimeDate::getInstance()->nowDb()."'",'datetime');
+                $del_query.=" WHERE  email_marketing_prospect_lists.id='{$row['id']}'";
+                $focus->db->query($del_query);
+    }
+        $focus->db->query($query);
+    }
 if ($bean_name == "Meeting") {
     $focus->retrieve($record);
     $user = new User();
     $user->retrieve($linked_id);
     if (!empty($user->id)) {  //make sure that record exists. we may have a contact on our hands.
 
-    	if($focus->update_vcal)
-    	{
-        	vCal::cache_sugar_vcal($user);
-    	}
+        if($focus->update_vcal)
+        {
+            vCal::cache_sugar_vcal($user);
+        }
     }
 }
 if ($bean_name == "User" && $linked_field == 'eapm') {
@@ -123,11 +123,11 @@ 
 }
 
 if(!empty($_REQUEST['return_url'])){
-	$_REQUEST['return_url'] =urldecode($_REQUEST['return_url']);
+    $_REQUEST['return_url'] =urldecode($_REQUEST['return_url']);
 }
 $GLOBALS['log']->debug("deleted relationship: bean: $bean_name, linked_field: $linked_field, linked_id:$linked_id" );
 if(empty($_REQUEST['refresh_page'])){
-	handleRedirect();
+    handleRedirect();
 }
 
 

include/SugarTheme/SugarTheme.php

Indentation +181 added lines, -181 removed lines

@@ -246,12 +246,12 @@ 
      */
     private $_templateCache = array();
 
-	/**
-	 * Cache built of sprite meta data
-	 *
-	 * @var array
-	 */
-	private $_spriteCache = array();
+    /**
+     * Cache built of sprite meta data
+     *
+     * @var array
+     */
+    private $_spriteCache = array();
 
     /**
      * Size of the caches after the are initialized in the constructor
@@ -263,7 +263,7 @@ 
         'imageCache'    => 0,
         'jsCache'       => 0,
         'templateCache' => 0,
-		'spriteCache'	=> 0,
+        'spriteCache'	=> 0,
         );
 
     /**
@@ -329,21 +329,21 @@ 
                     $this->_templateCache = $caches['templateCache'];
             }
             $cachedfile = sugar_cached($this->getFilePath().'/spriteCache.php');
-			if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
-				$this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
-			}
+            if(!empty($GLOBALS['sugar_config']['use_sprites']) && sugar_is_file($cachedfile)) {
+                $this->_spriteCache = unserialize(sugar_file_get_contents($cachedfile));
+            }
         }
         $this->_initialCacheSize = array(
             'jsCache'       => count($this->_jsCache),
             'cssCache'      => count($this->_cssCache),
             'imageCache'    => count($this->_imageCache),
             'templateCache' => count($this->_templateCache),
-			'spriteCache' 	=> count($this->_spriteCache),
+            'spriteCache' 	=> count($this->_spriteCache),
             );
     }
 
     /**
-	 * This is needed to prevent unserialize vulnerability
+     * This is needed to prevent unserialize vulnerability
      */
     public function __wakeup()
     {
@@ -380,8 +380,8 @@ 
 
             if (is_file("$cachedir/pathCache.php"))
                 unlink("$cachedir/pathCache.php");
-			if (is_file("$cachedir/spriteCache.php"))
-				unlink("$cachedir/spriteCache.php");
+            if (is_file("$cachedir/spriteCache.php"))
+                unlink("$cachedir/spriteCache.php");
 
         }
         elseif ( !inDeveloperMode() ) {
@@ -404,12 +404,12 @@ 
                     );
 
             }
-			if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
-				sugar_file_put_contents(
-					"$cachedir/spriteCache.php",
-					serialize($this->_spriteCache)
-				);
-			}
+            if ( count($this->_spriteCache) != $this->_initialCacheSize['spriteCache']) {
+                sugar_file_put_contents(
+                    "$cachedir/spriteCache.php",
+                    serialize($this->_spriteCache)
+                );
+            }
         }
     }
 
@@ -438,7 +438,7 @@ 
     }
 
     public function __isset($key){
-    	return isset($this->$key);
+        return isset($this->$key);
 
     }
 
@@ -603,27 +603,27 @@ 
         $html .= '<link rel="stylesheet" type="text/css" href="'.$this->getCSSURL('style.css').'" />';
 
 
-		// sprites
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+        // sprites
+        if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
 
-			// system wide sprites
-			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
+            // system wide sprites
+            if(file_exists("cache/sprites/default/sprites.css"))
+                $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
 
-			// theme specific sprites
-			if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
+            // theme specific sprites
+            if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
+                $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
 
-			// parent sprites
-			if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
-					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
-			}
+            // parent sprites
+            if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+                if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
+                    $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
+            }
 
-			// repeatable sprites
-			if(file_exists("cache/sprites/Repeatable/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
-		}
+            // repeatable sprites
+            if(file_exists("cache/sprites/Repeatable/sprites.css"))
+                $html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
+        }
 
         // for BC during upgrade
         if ( !empty($this->colors) ) {
@@ -700,180 +700,180 @@ 
      *
      * @param  string $image image name
      * @param  string $other_attributes optional, other attributes to add to the image tag, not cached
-	 * @param  string $width optional, defaults to the actual image's width
-	 * @param  string $height optional, defaults to the actual image's height
-	 * @param  string $ext optional, image extension (TODO can we deprecate this one ?)
+     * @param  string $width optional, defaults to the actual image's width
+     * @param  string $height optional, defaults to the actual image's height
+     * @param  string $ext optional, image extension (TODO can we deprecate this one ?)
      * @param  string $alt optional, only used when image contains something useful, i.e. "Sally's profile pic"
      * @return string HTML image tag or sprite
      */
     public function getImage(
         $imageName,
         $other_attributes = '',
-		$width = null,
-		$height = null,
-		$ext = null,
+        $width = null,
+        $height = null,
+        $ext = null,
         $alt = ''
     )
     {
 
         static $cached_results = array();
 
-		// trap deprecated use of image extension
-		if(is_null($ext)) {
-			$imageNameExp = explode('.',$imageName);
-			if(count($imageNameExp) == 1)
-				$imageName .= '.gif';
-		} else {
-			$imageName .= $ext;
-		}
-
-		// trap alt attributes in other_attributes
-		if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
-			$GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
-		// sprite handler, makes use of own caching mechanism
-		if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
-			// get sprite metadata
-			if($sp = $this->getSpriteMeta($imageName)) {
-				// requested size should match
-				if( (!is_null($width) && $sp['width'] == $width) || (is_null($width)) &&
-					(!is_null($height) && $sp['height'] == $height) || (is_null($height)) )
-				{
+        // trap deprecated use of image extension
+        if(is_null($ext)) {
+            $imageNameExp = explode('.',$imageName);
+            if(count($imageNameExp) == 1)
+                $imageName .= '.gif';
+        } else {
+            $imageName .= $ext;
+        }
+
+        // trap alt attributes in other_attributes
+        if(preg_match('/alt=["\']([^\'"]+)["\']/i', $other_attributes))
+            $GLOBALS['log']->debug("Sprites: alt attribute detected for $imageName");
+        // sprite handler, makes use of own caching mechanism
+        if(!empty($GLOBALS['sugar_config']['use_sprites']) && $GLOBALS['sugar_config']['use_sprites']) {
+            // get sprite metadata
+            if($sp = $this->getSpriteMeta($imageName)) {
+                // requested size should match
+                if( (!is_null($width) && $sp['width'] == $width) || (is_null($width)) &&
+                    (!is_null($height) && $sp['height'] == $height) || (is_null($height)) )
+                {
                     $other_attributes .= ' data-orig="'.$imageName.'"';
 
-                     if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
-                     {
-                         return $sprite;
-                     }
-				}
-			}
-		}
-
-		// img caching
-		if(empty($cached_results[$imageName])) {
-			$imageURL = $this->getImageURL($imageName,false);
-			if ( empty($imageURL) )
-				return false;
+                        if($sprite = $this->getSprite($sp['class'], $other_attributes, $alt))
+                        {
+                            return $sprite;
+                        }
+                }
+            }
+        }
+
+        // img caching
+        if(empty($cached_results[$imageName])) {
+            $imageURL = $this->getImageURL($imageName,false);
+            if ( empty($imageURL) )
+                return false;
             if(strpos($imageURL, '.svg', strlen($imageURL)-4)){
                 $cached_results[$imageName] = file_get_contents($imageURL);
             } else {
                 $cached_results[$imageName] = '<img src="'.getJSPath($imageURL).'" ';
             }
 
-		}
+        }
 
-		$attr_width = (is_null($width)) ? "" : "width=\"$width\"";
-		$attr_height = (is_null($height)) ? "" : "height=\"$height\"";
+        $attr_width = (is_null($width)) ? "" : "width=\"$width\"";
+        $attr_height = (is_null($height)) ? "" : "height=\"$height\"";
 
         if(strpos($cached_results[$imageName], 'svg') !== false){
             return $cached_results[$imageName];
         }
-		return $cached_results[$imageName] . " $attr_width $attr_height $other_attributes alt=\"$alt\" />";
+        return $cached_results[$imageName] . " $attr_width $attr_height $other_attributes alt=\"$alt\" />";
+    }
+
+    /**
+     * Returns sprite meta data
+     *
+     * @param  string $imageName Image filename including extension
+     * @return array  Sprite meta data
+     */
+    public function getSpriteMeta($imageName) {
+
+        // return from cache
+        if(isset($this->_spriteCache[$imageName]))
+            return $this->_spriteCache[$imageName];
+
+            // sprite keys are base on imageURL
+        $imageURL = $this->getImageURL($imageName,false);
+        if(empty($imageURL)) {
+            $this->_spriteCache[$imageName] = false;
+            return false;
+        }
+
+        // load meta data, includes default images
+        require_once("include/SugarTheme/SugarSprites.php");
+        $meta = SugarSprites::getInstance();
+        // add current theme dir
+        $meta->loadSpriteMeta($this->dirName);
+        // add parent theme dir
+        if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
+            $meta->loadSpriteMeta($parent->dirName);
+        }
+
+        // add to cache
+        if(isset($meta->sprites[$imageURL])) {
+            $this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
+            // add imageURL to cache
+            //$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
+        } else {
+            $this->_spriteCache[$imageName] = false;
+            $GLOBALS['log']->debug("Sprites: miss for $imageURL");
+        }
+        return $this->_spriteCache[$imageName];
+    }
+
+    /**
+     * Returns sprite HTML span tag
+     *
+     * @param  string class The md5 id used in the CSS sprites class
+     * @param  string attr  optional, list of additional html attributes
+     * @param  string title optional, the title (equivalent to alt on img)
+     * @return string HTML span tag
+     */
+    public function getSprite($class, $attr, $title) {
+
+        // handle multiple class tags
+        $class_regex = '/class=["\']([^\'"]+)["\']/i';
+        preg_match($class_regex, $attr, $match);
+        if(isset($match[1])) {
+            $attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
+
+        // single class
+        } else {
+            $attr .= ' class="spr_'.$class.'"';
+        }
+
+        if($title)
+            $attr .= ' title="'.$title.'"';
+
+        // use </span> instead of /> to prevent weird UI results
+        $GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
+        return "<span {$attr}></span>";
     }
 
-	/**
-	 * Returns sprite meta data
-	 *
-	 * @param  string $imageName Image filename including extension
-	 * @return array  Sprite meta data
-	 */
-	public function getSpriteMeta($imageName) {
-
-		// return from cache
-	    if(isset($this->_spriteCache[$imageName]))
-			return $this->_spriteCache[$imageName];
-
-			// sprite keys are base on imageURL
-		$imageURL = $this->getImageURL($imageName,false);
-		if(empty($imageURL)) {
-			$this->_spriteCache[$imageName] = false;
-			return false;
-		}
-
-		// load meta data, includes default images
-		require_once("include/SugarTheme/SugarSprites.php");
-		$meta = SugarSprites::getInstance();
-		// add current theme dir
-		$meta->loadSpriteMeta($this->dirName);
-		// add parent theme dir
-		if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
-			$meta->loadSpriteMeta($parent->dirName);
-		}
-
-		// add to cache
-		if(isset($meta->sprites[$imageURL])) {
-			$this->_spriteCache[$imageName] = $meta->sprites[$imageURL];
-			// add imageURL to cache
-			//$this->_spriteCache[$imageName]['imageURL'] = $imageURL;
-		} else {
-			$this->_spriteCache[$imageName] = false;
-			$GLOBALS['log']->debug("Sprites: miss for $imageURL");
-		}
-		return $this->_spriteCache[$imageName];
-	}
-
-	/**
-	 * Returns sprite HTML span tag
-	 *
-	 * @param  string class The md5 id used in the CSS sprites class
-	 * @param  string attr  optional, list of additional html attributes
-	 * @param  string title optional, the title (equivalent to alt on img)
-	 * @return string HTML span tag
-	 */
-	public function getSprite($class, $attr, $title) {
-
-		// handle multiple class tags
-		$class_regex = '/class=["\']([^\'"]+)["\']/i';
-		preg_match($class_regex, $attr, $match);
-		if(isset($match[1])) {
-			$attr = preg_replace($class_regex, 'class="spr_'.$class.' ${1}"', $attr);
-
-		// single class
-		} else {
-			$attr .= ' class="spr_'.$class.'"';
-		}
-
-		if($title)
-			$attr .= ' title="'.$title.'"';
-
-		// use </span> instead of /> to prevent weird UI results
-		$GLOBALS['log']->debug("Sprites: generated sprite -> $attr");
-		return "<span {$attr}></span>";
-	}
-
-	/**
-	 * Returns a link HTML tag with or without an embedded image
-	 */
+    /**
+     * Returns a link HTML tag with or without an embedded image
+     */
     public function getLink(
-		$url,
-		$title,
-		$other_attributes = '',
+        $url,
+        $title,
+        $other_attributes = '',
         $img_name = '',
         $img_other_attributes = '',
-		$img_width = null,
-		$img_height = null,
-		$img_alt = '',
-		$img_placement = 'imageonly'
+        $img_width = null,
+        $img_height = null,
+        $img_alt = '',
+        $img_placement = 'imageonly'
     )
     {
 
-		if($img_name) {
-			$img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
-			if($img == false) {
-				$GLOBALS['log']->debug('Sprites: unknown image getLink');
-				$img = 'unknown';
-			}
-			switch($img_placement) {
-				case 'left': 	$inner_html = $img."<span class='title'>".$title."</span>"; break;
-				case 'right':	$inner_html = "<span class='title'>".$title."</span>".$img; break;
-				default:		$inner_html = $img; break;
-			}
-		} else {
-			$inner_html = $title;
-		}
+        if($img_name) {
+            $img = $this->getImage($img_name, $img_other_attributes, $img_width, $img_height, null, $img_alt);
+            if($img == false) {
+                $GLOBALS['log']->debug('Sprites: unknown image getLink');
+                $img = 'unknown';
+            }
+            switch($img_placement) {
+                case 'left': 	$inner_html = $img."<span class='title'>".$title."</span>"; break;
+                case 'right':	$inner_html = "<span class='title'>".$title."</span>".$img; break;
+                default:		$inner_html = $img; break;
+            }
+        } else {
+            $inner_html = $title;
+        }
 
-		return '<a href="'.$url.'" title="'.$title.'" '.$other_attributes.'>'.$inner_html.'</a>';
+        return '<a href="'.$url.'" title="'.$title.'" '.$other_attributes.'>'.$inner_html.'</a>';
 
-	}
+    }
 
     /**
      * Returns the URL for an image in the current theme. If not found in the current theme, will revert
@@ -905,8 +905,8 @@ 
             $imagePath = $filename;
         elseif (($filename = $this->_getImageFileName($this->getDefaultImagePath().'/'.$imageName)) != '')
             $imagePath = $filename;
-		elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
-			$imagePath = $filename;
+        elseif (($filename = $this->_getImageFileName('include/images/'.$imageName)) != '')
+            $imagePath = $filename;
         else {
             $GLOBALS['log']->warn("Image $imageName not found");
             return false;
@@ -1040,8 +1040,8 @@ 
         if (isset($this->parentTheme)
                 && SugarThemeRegistry::get($this->parentTheme) instanceOf SugarTheme
                 && ($filename = SugarThemeRegistry::get($this->parentTheme)->getJSURL($jsFileName,false)) != ''    && !in_array($jsFileName,$this->ignoreParentFiles)) {
-           $jsFileContents .= file_get_contents($filename);
-       } else {
+            $jsFileContents .= file_get_contents($filename);
+        } else {
             if (sugar_is_file($defaultFileName))
                 $jsFileContents .= file_get_contents($defaultFileName);
             if (sugar_is_file('custom/'.$defaultFileName))

include/SugarObjects/LanguageManager.php

Indentation +201 added lines, -201 removed lines

@@ -44,226 +44,226 @@ 
 class LanguageManager
 {
 
-	/**
-	 * Called from VardefManager to allow for caching a lang file for a module
-	 * @param module - the name of the module we are working with
-	 * @param templates - an array of templates this module uses
-	 */
-	static function createLanguageFile($module , $templates=array('default'), $refresh = false){
-		global $mod_strings, $current_language;
-		if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
-        	$refresh = true;
-    	}
-		$temp_mod_strings = $mod_strings;
-		$lang = $current_language;
+    /**
+     * Called from VardefManager to allow for caching a lang file for a module
+     * @param module - the name of the module we are working with
+     * @param templates - an array of templates this module uses
+     */
+    static function createLanguageFile($module , $templates=array('default'), $refresh = false){
+        global $mod_strings, $current_language;
+        if(inDeveloperMode() || !empty($_SESSION['developerMode'])){
+            $refresh = true;
+        }
+        $temp_mod_strings = $mod_strings;
+        $lang = $current_language;
         if(empty($lang))
             $lang = $GLOBALS['sugar_config']['default_language'];
-		static $createdModules = array();
-		if(empty($createdModules[$module]) && ($refresh || !file_exists(sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php'))){
-			$loaded_mod_strings = array();
-			$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
-			$createdModules[$module] = true;
-			LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
-		}
-	}
+        static $createdModules = array();
+        if(empty($createdModules[$module]) && ($refresh || !file_exists(sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php'))){
+            $loaded_mod_strings = array();
+            $loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+            $createdModules[$module] = true;
+            LanguageManager::refreshLanguage($module,$lang, $loaded_mod_strings);
+        }
+    }
 
-	/**
-	 * Load the module  tempalte lauguage files
-	 * @param module - the name of the module we are working with
-	 * @param templates - an array of templates this module uses
-	 * @param lang - current language this module use
-	 * @param loaded_mod_strings - the string that we will add the module template language  into
-	 */
-	static function loadTemplateLanguage($module , $templates , $lang, $loaded_mod_strings){
-		$templates = array_reverse($templates);
-		foreach($templates as $template){
-			$temp = LanguageManager::addTemplate($module,$lang, $template);
-			$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $temp);
-		}
-		return $loaded_mod_strings;
-	}
+    /**
+     * Load the module  tempalte lauguage files
+     * @param module - the name of the module we are working with
+     * @param templates - an array of templates this module uses
+     * @param lang - current language this module use
+     * @param loaded_mod_strings - the string that we will add the module template language  into
+     */
+    static function loadTemplateLanguage($module , $templates , $lang, $loaded_mod_strings){
+        $templates = array_reverse($templates);
+        foreach($templates as $template){
+            $temp = LanguageManager::addTemplate($module,$lang, $template);
+            $loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $temp);
+        }
+        return $loaded_mod_strings;
+    }
 
-	static function addTemplate($module, $lang, $template){
-		if($template == 'default')$template = 'basic';
-		$templates = array();
-		$fields = array();
-		if(empty($templates[$template])){
-			$path = 'include/SugarObjects/templates/' . $template . '/language/'.$lang.'.lang.php';
-			if(file_exists($path)){
-				require($path);
-				$templates[$template] = $mod_strings;
-			}else{
-				$path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
-				if(file_exists($path)){
-					require($path);
-					$templates[$template] = $mod_strings;
-				}
-			}
-		}
-		if(!empty($templates[$template])){
-			return $templates[$template];
-		}
-	}
+    static function addTemplate($module, $lang, $template){
+        if($template == 'default')$template = 'basic';
+        $templates = array();
+        $fields = array();
+        if(empty($templates[$template])){
+            $path = 'include/SugarObjects/templates/' . $template . '/language/'.$lang.'.lang.php';
+            if(file_exists($path)){
+                require($path);
+                $templates[$template] = $mod_strings;
+            }else{
+                $path = 'include/SugarObjects/implements/' . $template . '/language/'.$lang.'.lang.php';
+                if(file_exists($path)){
+                    require($path);
+                    $templates[$template] = $mod_strings;
+                }
+            }
+        }
+        if(!empty($templates[$template])){
+            return $templates[$template];
+        }
+    }
 
-	static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
-		if(empty($lang))
-			$lang = $GLOBALS['sugar_config']['default_language'];
+    static function saveCache($module,$lang, $loaded_mod_strings, $additonal_objects= array()){
+        if(empty($lang))
+            $lang = $GLOBALS['sugar_config']['default_language'];
 
-		$file = create_cache_directory('modules/' . $module . '/language/'.$lang.'.lang.php');
-		write_array_to_file('mod_strings',$loaded_mod_strings, $file);
-		include($file);
+        $file = create_cache_directory('modules/' . $module . '/language/'.$lang.'.lang.php');
+        write_array_to_file('mod_strings',$loaded_mod_strings, $file);
+        include($file);
 
-		// put the item in the sugar cache.
-		$key = self::getLanguageCacheKey($module,$lang);
-		sugar_cache_put($key,$loaded_mod_strings);
-	}
+        // put the item in the sugar cache.
+        $key = self::getLanguageCacheKey($module,$lang);
+        sugar_cache_put($key,$loaded_mod_strings);
+    }
 
-	/**
-	 * clear out the language cache.
-	 * @param string module_dir the module_dir to clear, if not specified then clear
-	 *                      clear language cache for all modules.
-	 * @param string lang the name of the object we are clearing this is for sugar_cache
-	 */
-	static function clearLanguageCache($module_dir = '', $lang = ''){
-		if(empty($lang)) {
-			$languages = array_keys($GLOBALS['sugar_config']['languages']);
-		} else {
-			$languages = array($lang);
-		}
-		//if we have a module name specified then just remove that language file
-		//otherwise go through each module and clean up the language
-		if(!empty($module_dir)) {
-			foreach($languages as $clean_lang) {
-				LanguageManager::_clearCache($module_dir, $clean_lang);
-			}
-		} else {
-			$cache_dir = sugar_cached('modules/');
-			if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
-				while(($entry = readdir($dir)) !== false) {
-					if ($entry == "." || $entry == "..") continue;
-						foreach($languages as $clean_lang) {
-							LanguageManager::_clearCache($entry, $clean_lang);
-						}
-				}
-				closedir($dir);
-			}
-		}
-	}
+    /**
+     * clear out the language cache.
+     * @param string module_dir the module_dir to clear, if not specified then clear
+     *                      clear language cache for all modules.
+     * @param string lang the name of the object we are clearing this is for sugar_cache
+     */
+    static function clearLanguageCache($module_dir = '', $lang = ''){
+        if(empty($lang)) {
+            $languages = array_keys($GLOBALS['sugar_config']['languages']);
+        } else {
+            $languages = array($lang);
+        }
+        //if we have a module name specified then just remove that language file
+        //otherwise go through each module and clean up the language
+        if(!empty($module_dir)) {
+            foreach($languages as $clean_lang) {
+                LanguageManager::_clearCache($module_dir, $clean_lang);
+            }
+        } else {
+            $cache_dir = sugar_cached('modules/');
+            if(file_exists($cache_dir) && $dir = @opendir($cache_dir)) {
+                while(($entry = readdir($dir)) !== false) {
+                    if ($entry == "." || $entry == "..") continue;
+                        foreach($languages as $clean_lang) {
+                            LanguageManager::_clearCache($entry, $clean_lang);
+                        }
+                }
+                closedir($dir);
+            }
+        }
+    }
 
-	/**
-	 * PRIVATE function used within clearLanguageCache so we do not repeat logic
-	 * @param string module_dir the module_dir to clear
-	 * @param string lang the name of the language file we are clearing this is for sugar_cache
-	 */
-	static function _clearCache($module_dir = '', $lang){
-		if(!empty($module_dir) && !empty($lang)){
-			$file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
-			if(file_exists($file)){
-				unlink($file);
-				$key = self::getLanguageCacheKey($module_dir,$lang);
-				sugar_cache_clear($key);
-			}
-		}
-	}
+    /**
+     * PRIVATE function used within clearLanguageCache so we do not repeat logic
+     * @param string module_dir the module_dir to clear
+     * @param string lang the name of the language file we are clearing this is for sugar_cache
+     */
+    static function _clearCache($module_dir = '', $lang){
+        if(!empty($module_dir) && !empty($lang)){
+            $file = sugar_cached('modules/').$module_dir.'/language/'.$lang.'.lang.php';
+            if(file_exists($file)){
+                unlink($file);
+                $key = self::getLanguageCacheKey($module_dir,$lang);
+                sugar_cache_clear($key);
+            }
+        }
+    }
 
-	/**
-	 * Given a module, search all of the specified locations, and any others as specified
-	 * in order to refresh the cache file
-	 *
-	 * @param string $module the given module we want to load the vardefs for
-	 * @param string $lang the given language we wish to load
-	 * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
-	 */
-	static function refreshLanguage($module, $lang, $loaded_mod_strings = array(), $additional_search_paths = null){
-		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
-		$lang_paths = array(
-					'modules/'.$module.'/language/'.$lang.'.lang.php',
-					'modules/'.$module.'/language/'.$lang.'.lang.override.php',
-					'custom/modules/'.$module.'/language/'.$lang.'.lang.php',
-					'custom/modules/'.$module.'/Ext/Language/'.$lang.'.lang.ext.php',
-				 );
+    /**
+     * Given a module, search all of the specified locations, and any others as specified
+     * in order to refresh the cache file
+     *
+     * @param string $module the given module we want to load the vardefs for
+     * @param string $lang the given language we wish to load
+     * @param array $additional_search_paths an array which allows a consumer to pass in additional vardef locations to search
+     */
+    static function refreshLanguage($module, $lang, $loaded_mod_strings = array(), $additional_search_paths = null){
+        // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
+        $lang_paths = array(
+                    'modules/'.$module.'/language/'.$lang.'.lang.php',
+                    'modules/'.$module.'/language/'.$lang.'.lang.override.php',
+                    'custom/modules/'.$module.'/language/'.$lang.'.lang.php',
+                    'custom/modules/'.$module.'/Ext/Language/'.$lang.'.lang.ext.php',
+                    );
 
-		#27023, if this module template language file was not attached , get the template from this module vardef cache file if exsits and load the template language files.
-		static $createdModules;
-		if(empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])){
-				$object = $GLOBALS['beanList'][$module];
+        #27023, if this module template language file was not attached , get the template from this module vardef cache file if exsits and load the template language files.
+        static $createdModules;
+        if(empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])){
+                $object = $GLOBALS['beanList'][$module];
 
-				if ($object == 'aCase')
-		            $object = 'Case';
+                if ($object == 'aCase')
+                    $object = 'Case';
 
-		        if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
-		        	$templates = $GLOBALS["dictionary"]["$object"]["templates"];
-					$loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
-					$createdModules[$module] = true;
-		        }
-		}
-		//end of fix #27023
+                if(!empty($GLOBALS["dictionary"]["$object"]["templates"])){
+                    $templates = $GLOBALS["dictionary"]["$object"]["templates"];
+                    $loaded_mod_strings = LanguageManager::loadTemplateLanguage($module , $templates, $lang , $loaded_mod_strings);
+                    $createdModules[$module] = true;
+                }
+        }
+        //end of fix #27023
 
-		// Add in additional search paths if they were provided.
-		if(!empty($additional_search_paths) && is_array($additional_search_paths))
-		{
-			$lang_paths = array_merge($lang_paths, $additional_search_paths);
-		}
+        // Add in additional search paths if they were provided.
+        if(!empty($additional_search_paths) && is_array($additional_search_paths))
+        {
+            $lang_paths = array_merge($lang_paths, $additional_search_paths);
+        }
 
-		//search a predefined set of locations for the vardef files
-		foreach($lang_paths as $path){
-			if(file_exists($path)){
-				require($path);
-				if(!empty($mod_strings)){
-					if (function_exists('sugarArrayMergeRecursive')){
-						$loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
-					}
-					else{
-						$loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
-					}
-				}
-			}
-		}
+        //search a predefined set of locations for the vardef files
+        foreach($lang_paths as $path){
+            if(file_exists($path)){
+                require($path);
+                if(!empty($mod_strings)){
+                    if (function_exists('sugarArrayMergeRecursive')){
+                        $loaded_mod_strings = sugarArrayMergeRecursive($loaded_mod_strings, $mod_strings);
+                    }
+                    else{
+                        $loaded_mod_strings = sugarLangArrayMerge($loaded_mod_strings, $mod_strings);
+                    }
+                }
+            }
+        }
 
-		//great! now that we have loaded all of our vardefs.
-		//let's go save them to the cache file.
-		if(!empty($loaded_mod_strings))
-			LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
-	}
+        //great! now that we have loaded all of our vardefs.
+        //let's go save them to the cache file.
+        if(!empty($loaded_mod_strings))
+            LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+    }
 
-	static function loadModuleLanguage($module, $lang, $refresh=false){
-		//here check if the cache file exists, if it does then load it, if it doesn't
-		//then call refreshVardef
-		//if either our session or the system is set to developerMode then refresh is set to true
+    static function loadModuleLanguage($module, $lang, $refresh=false){
+        //here check if the cache file exists, if it does then load it, if it doesn't
+        //then call refreshVardef
+        //if either our session or the system is set to developerMode then refresh is set to true
 
-		// Retrieve the vardefs from cache.
-		$key = self::getLanguageCacheKey($module,$lang);
+        // Retrieve the vardefs from cache.
+        $key = self::getLanguageCacheKey($module,$lang);
 
-		if(!$refresh)
-		{
-			$return_result = sugar_cache_retrieve($key);
-			if(!empty($return_result) && is_array($return_result)){
-				return $return_result;
-			}
-		}
+        if(!$refresh)
+        {
+            $return_result = sugar_cache_retrieve($key);
+            if(!empty($return_result) && is_array($return_result)){
+                return $return_result;
+            }
+        }
 
-		// Some of the vardefs do not correctly define dictionary as global.  Declare it first.
-		$cachedfile = sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php';
-		if($refresh || !file_exists($cachedfile)){
-			LanguageManager::refreshLanguage($module, $lang);
-		}
+        // Some of the vardefs do not correctly define dictionary as global.  Declare it first.
+        $cachedfile = sugar_cached('modules/').$module.'/language/'.$lang.'.lang.php';
+        if($refresh || !file_exists($cachedfile)){
+            LanguageManager::refreshLanguage($module, $lang);
+        }
 
-		//at this point we should have the cache/modules/... file
-		//which was created from the refreshVardefs so let's try to load it.
-		if(file_exists($cachedfile)){
-			global $mod_strings;
+        //at this point we should have the cache/modules/... file
+        //which was created from the refreshVardefs so let's try to load it.
+        if(file_exists($cachedfile)){
+            global $mod_strings;
 
-			require $cachedfile;
+            require $cachedfile;
 
-			// now that we hae loaded the data from disk, put it in the cache.
-			if(!empty($mod_strings))
-				sugar_cache_put($key,$mod_strings);
-			if(!empty($_SESSION['translation_mode'])){
-				$mod_strings = array_map('translated_prefix', $mod_strings);
-			}
-			return $mod_strings;
-		}
-	}
+            // now that we hae loaded the data from disk, put it in the cache.
+            if(!empty($mod_strings))
+                sugar_cache_put($key,$mod_strings);
+            if(!empty($_SESSION['translation_mode'])){
+                $mod_strings = array_map('translated_prefix', $mod_strings);
+            }
+            return $mod_strings;
+        }
+    }
 
     /**
      * Return the cache key for the module language definition
@@ -274,9 +274,9 @@ 
      * @return string
      */
     public static function getLanguageCacheKey($module, $lang)
-	{
-         return "LanguageManager.$module.$lang";
-	}
+    {
+            return "LanguageManager.$module.$lang";
+    }
 
     /**
      * Remove any cached js language strings.
@@ -302,5 +302,5 @@ 
 }
 
 function translated_prefix($key){
-	return '[translated]' . $key;
+    return '[translated]' . $key;
 }

include/SugarObjects/VardefManager.php

Indentation +7 added lines, -7 removed lines

@@ -89,9 +89,9 @@ 
      */
     public static function setCustomAllowedForModule($module, $enable) {
         if ($enable && isset($custom_disabled_modules[$module])) {
-              unset($custom_disabled_modules[$module]);
+                unset($custom_disabled_modules[$module]);
         } else if (!$enable) {
-              $custom_disabled_modules[$module] = true;
+                $custom_disabled_modules[$module] = true;
         }
     }
 
@@ -236,7 +236,7 @@ 
                     'modules/'.$module.'/vardefs.php',
                     'custom/modules/'.$module.'/Ext/Vardefs/vardefs.ext.php',
                     'custom/Extension/modules/'.$module.'/Ext/Vardefs/vardefs.php'
-                 );
+                    );
 
         // Add in additional search paths if they were provided.
         if(!empty($additional_search_paths) && is_array($additional_search_paths))
@@ -426,10 +426,10 @@ 
             //if the consumer has demanded a refresh or the cache/modules... file
             //does not exist, then we should do out and try to reload things
 
-			$cachedfile = sugar_cached('modules/'). $module . '/' . $object . 'vardefs.php';
-			if($refresh || !file_exists($cachedfile)){
-				VardefManager::refreshVardefs($module, $object, null, true, $params);
-			}
+            $cachedfile = sugar_cached('modules/'). $module . '/' . $object . 'vardefs.php';
+            if($refresh || !file_exists($cachedfile)){
+                VardefManager::refreshVardefs($module, $object, null, true, $params);
+            }
 
             //at this point we should have the cache/modules/... file
             //which was created from the refreshVardefs so let's try to load it.