[Vtigercrm-commits] [vtiger-commits] r5012 - in /vtigercrm/branches/4.2_postgresql_integration: ./ data/ include/ include/language/ install/ jpgraph/ modules/Potentials/ modules/Quotes/ modules/Reports/ schema/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri Apr 7 15:52:38 EDT 2006
Author: jeffk
Date: Fri Apr 7 13:52:18 2006
New Revision: 5012
Log:
refs #62 and #17. merging source:vtigercrm/branches/4.2 r4358 through r5011 to source:vtigercrm/branches/4.2_postgresql_integration. clean merge, one trivial conflict in source:vtigercrm/branches/4.2_postgresql_integration/install/4createConfigFile.php#4328 resolved.
Modified:
vtigercrm/branches/4.2_postgresql_integration/config.inc.php
vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php
vtigercrm/branches/4.2_postgresql_integration/include/CustomFieldUtil.php
vtigercrm/branches/4.2_postgresql_integration/include/RelatedListView.php
vtigercrm/branches/4.2_postgresql_integration/include/language/en_us.lang.php
vtigercrm/branches/4.2_postgresql_integration/include/utils.php
vtigercrm/branches/4.2_postgresql_integration/install.php
vtigercrm/branches/4.2_postgresql_integration/install/0welcome.php
vtigercrm/branches/4.2_postgresql_integration/install/1checkSystem.php
vtigercrm/branches/4.2_postgresql_integration/install/2setConfig.php
vtigercrm/branches/4.2_postgresql_integration/install/3confirmConfig.php
vtigercrm/branches/4.2_postgresql_integration/install/4createConfigFile.php
vtigercrm/branches/4.2_postgresql_integration/install/5createTables.php
vtigercrm/branches/4.2_postgresql_integration/install/populateSeedData.php
vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpg-config.inc
vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpgraph.php
vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Charts.php
vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/RenderRelatedListUI.php
vtigercrm/branches/4.2_postgresql_integration/modules/Quotes/Save.php
vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php
vtigercrm/branches/4.2_postgresql_integration/schema/DatabaseSchema.xml
Modified: vtigercrm/branches/4.2_postgresql_integration/config.inc.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/config.inc.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/config.inc.php Fri Apr 7 13:52:18 2006
@@ -1,7 +1,7 @@
<?php
/*********************************************************************************
* The contents of this file are subject to the SugarCRM Public License Version 1.1.2
- * ("License"); You may not use this file except in compliance with the
+ * ("License"); You may not use this file except in compliance with the
* License. You may obtain a copy of the License at http://www.sugarcrm.com/SPL
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
@@ -13,59 +13,169 @@
* Contributor(s): ______________________________________.
********************************************************************************/
-require_once("connection.php");
+include('vtigerversion.php');
-// make MySQL run in desired port
-$sock_path=":" .$mysql_port;
-$H_NAME=gethostbyaddr($_SERVER['SERVER_ADDR']);
+// more than 8MB memory needed for graphics
+// memory limit default value = 16M
+ini_set('memory_limit','16M');
+
+// show or hide world clock and calculator
+// world_clock_display default value = true
+// calculator_clock_display default value = true
+$WORLD_CLOCK_DISPLAY = 'true';
+$CALCULATOR_DISPLAY = 'true';
+
+// url for customer portal (Example: http://vtiger.com/portal)
+$PORTAL_URL = 'http://your-domain.com/customerportal';
+
+// helpdesk support email id and support name (Example: 'support at vtiger.com' and 'vtiger support')
+$HELPDESK_SUPPORT_EMAIL_ID = 'support at your-domain.com';
+$HELPDESK_SUPPORT_NAME = 'your-domain name';
/* database configuration
+ db_server
+ db_port
db_hostname
db_username
db_password
db_name
*/
-// all of these commented values get populated by install.php
-//$dbconfig['db_hostname'] = '$H_NAME.$sock_path';
-//$dbconfig['db_username'] = 'vtigercrm';
-//$dbconfig['db_password'] = '';
-//$dbconfig['db_name'] = 'vtigercrm';
-//$host_name = '';
-//$site_URL = '';
-//$root_directory = '';
+$dbconfig['db_server'] = 'localhost:5432';
+$dbconfig['db_port'] = ':3306';
+$dbconfig['db_username'] = 'vtigercrm';
+$dbconfig['db_password'] = 'vtigercrm';
+$dbconfig['db_name'] = 'vtigercrm';
+$dbconfig['db_type'] = 'pgsql';
+$dbconfig['db_status'] = 'true';
-// full path to the include directory including the trailing slash
-//$includeDirectory = $root_directory.'include/';
+// TODO: test if port is empty
+// TODO: set db_hostname dependending on db_type
+$dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port'];
+// log_sql default value = false
+$dbconfig['log_sql'] = false;
+
+// persistent default value = true
+$dbconfigoption['persistent'] = true;
+
+// autofree default value = false
+$dbconfigoption['autofree'] = false;
+
+// debug default value = 0
+$dbconfigoption['debug'] = 0;
+
+// seqname_format default value = '%s_seq'
+$dbconfigoption['seqname_format'] = '%s_seq';
+
+// portability default value = 0
+$dbconfigoption['portability'] = 0;
+
+// ssl default value = false
+$dbconfigoption['ssl'] = false;
+
+$host_name = $dbconfig['db_hostname'];
+
+$site_URL = 'http://localhost/vtigercrm';
+
+// root directory path
+$root_directory = '/software/vtigercrm42/';
+
+// cache direcory path
+$cache_dir = 'cache/';
+
+// tmp_dir default value prepended by cache_dir = images/
+$tmp_dir = 'cache/images/';
+
+// import_dir default value prepended by cache_dir = import/
+$import_dir = 'cache/import/';
+
+// upload_dir default value prepended by cache_dir = upload/
+$upload_dir = 'cache/upload/';
+
+// mail server parameters
+$mail_server = '';
+$mail_server_username = '';
+$mail_server_password = '';
+
+// maximum file size for uploaded files in bytes also used when uploading import files
+// upload_maxsize default value = 3000000
+$upload_maxsize = 3000000;
+
+// flag to allow export functionality
+// 'all' to allow anyone to use exports
+// 'admin' to only allow admins to export
+// 'none' to block exports completely
+// allow_exports default value = all
+$allow_exports = 'all';
+
+// files with one of these extensions will have '.txt' appended to their filename on upload
+// upload_badext default value = php, php3, php4, php5, pl, cgi, py, asp, cfm, js, vbs, html, htm
+$upload_badext = array('php', 'php3', 'php4', 'php5', 'pl', 'cgi', 'py', 'asp', 'cfm', 'js', 'vbs', 'html', 'htm');
+
+// full path to include directory including the trailing slash
+// includeDirectory default value = $root_directory..'include/
+$includeDirectory = $root_directory.'include/';
+
+// list_max_entries_per_page default value = 20
$list_max_entries_per_page = '20';
+
+// history_max_viewed default value = 5
$history_max_viewed = '5';
// define list of menu tabs
-//$moduleList = Array('Home', 'Dashboard', 'Leads', 'Contacts', 'Accounts', 'Opportunities', 'Cases', 'Notes', 'Calls', 'Emails', 'Meetings', 'Tasks');
+//$moduleList = Array('Home', 'Dashboard', 'Contacts', 'Accounts', 'Opportunities', 'Cases', 'Notes', 'Calls', 'Emails', 'Meetings', 'Tasks','MessageBoard');
+// map sugar language codes to jscalendar language codes
+// unimplemented until jscalendar language files are fixed
+// $cal_codes = array('en_us'=>'en', 'ja'=>'jp', 'sp_ve'=>'sp', 'it_it'=>'it', 'tw_zh'=>'zh', 'pt_br'=>'pt', 'se'=>'sv', 'cn_zh'=>'zh', 'ge_ge'=>'de', 'ge_ch'=>'de', 'fr'=>'fr');
+
+// default_module default value = Home
$default_module = 'Home';
+
+// default_action default value = index
$default_action = 'index';
// set default theme
+// default_theme default value = blue
$default_theme = 'blue';
-$databasetype = 'mysql';
// show or hide time to compose each page
+// calculate_response_time default value = true
$calculate_response_time = true;
// default text that is placed initially in the login form for user name
+// no default_user_name default value
$default_user_name = '';
// default text that is placed initially in the login form for password
+// no default_password default value
$default_password = '';
// create user with default username and password
+// create_default_user default value = false
$create_default_user = false;
+// default_user_is_admin default value = false
+$default_user_is_admin = false;
-// login message
-// if a message is provided, it will be placed on the login screen
-// this is for site specific special instructions
-$login_message = 'Please login to the application.';
+// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown
+// disable_persistent_connections default value = false
+$disable_persistent_connections = false;
+
+// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file)
+// languages default value = en_us=>US English
+$languages = Array('en_us'=>'US English',);
+
+// default charset
+// default charset default value = ISO-8859-1
+$default_charset = 'ISO-8859-1';
+
+// default language
+// default_language default value = en_us
+$default_language = 'en_us';
+
+// add the language pack name to every translation string in the display.
+// translation_string_prefix default value = false
+$translation_string_prefix = false;
?>
Modified: vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/data/CRMEntity.php Fri Apr 7 13:52:18 2006
@@ -677,6 +677,9 @@
$sql1 = "insert into ".$table_name." (".$column.") values(".$value.")";
$adb->query($sql1);
$groupname = $_REQUEST['assigned_group_name'];
+ //Fix ref to undefined variable during lead import -mikefedyk
+ if (isset($_REQUEST['assigntype']))
+ {
if($_REQUEST['assigntype'] == 'T' && $table_name == 'leaddetails')
{
if($table_name == 'leaddetails')
@@ -692,7 +695,7 @@
{
insert2TicketGroupRelation($this->id,$groupname);
}
-
+ }
}
}
Modified: vtigercrm/branches/4.2_postgresql_integration/include/CustomFieldUtil.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/include/CustomFieldUtil.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/include/CustomFieldUtil.php Fri Apr 7 13:52:18 2006
@@ -294,7 +294,7 @@
}
-function getCustomFieldTrans($module, $trans_array)
+function getCustomFieldTrans($module, &$trans_array)
{
global $adb;
$tab_id = getTabid($module);
Modified: vtigercrm/branches/4.2_postgresql_integration/include/RelatedListView.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/include/RelatedListView.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/include/RelatedListView.php Fri Apr 7 13:52:18 2006
@@ -300,7 +300,7 @@
$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
$list .= '<td width="15%" height="21" style="padding:0px 3px 0px 3px;">';
- $list .= '<a href = "index.php?module=uploads&action=downloadfile&return_module=Accounts&activity_type='.$row[1].'&fileid='.$row[5].'&filename='.$row[2].'">'.$row[2].'</a>';
+ $list .= '<a href = "index.php?module=uploads&action=downloadfile&return_module=Accounts&activity_type=' . $row[1] . '&fileid=' . $row[5] . '&filename=' . urlencode($row[2]) . '">' . $row[2] . '</a>';
$list .= '</td>';
$list .= '<td WIDTH="1" class="blackLine"><IMG SRC="themes/'.$theme.'/images/blank.gif">';
Modified: vtigercrm/branches/4.2_postgresql_integration/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/include/language/en_us.lang.php Fri Apr 7 13:52:18 2006
@@ -924,8 +924,35 @@
'Opportunities' => 'Opportunity'),
+// AlphabeticalSearch values for UTF-8-aware procedure
+// Allows multicharacter elements
+
+'alphabetical_search_values' => Array('A'
+ , 'B'
+ , 'C'
+ , 'D'
+ , 'E'
+ , 'F'
+ , 'G'
+ , 'H'
+ , 'I'
+ , 'J'
+ , 'K'
+ , 'L'
+ , 'M'
+ , 'N'
+ , 'O'
+ , 'P'
+ , 'Q'
+ , 'R'
+ , 'S'
+ , 'U'
+ , 'V'
+ , 'W'
+ , 'X'
+ , 'Y'
+ , 'Z'
+ ),
);
-
-
?>
Modified: vtigercrm/branches/4.2_postgresql_integration/include/utils.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/include/utils.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/include/utils.php Fri Apr 7 13:52:18 2006
@@ -4112,6 +4112,9 @@
//parameter $viewid added for customview 27/5
function AlphabeticalSearch($module,$action,$fieldname,$query,$type,$popuptype='',$recordid='',$return_module='',$append_url='',$viewid='')
{
+ /* for access to alphabetical_search values stored in /include/$lang.language.php */
+ global $app_list_strings;
+
if($type=='advanced')
$flag='&advanced=true';
@@ -4122,9 +4125,14 @@
$returnvalue = '&recordid='.$recordid;
if($return_module != '')
$returnvalue .= '&return_module='.$return_module;
-
- for($var='A',$i =1;$i<=26;$i++,$var++)
- $list .= '<td class="alphaBg"><a href="index.php?module='.$module.'&action='.$action.'&viewname='.$viewid.'&query='.$query.'&'.$fieldname.'='.$var.$flag.$popuptypevalue.$returnvalue.$append_url.'">'.$var.'</a></td>';
+ // gettin' values
+ $alphabetical_search_values = & $app_list_strings['alphabetical_search_values'];
+ /* world alphabets has different count of letters. Plus we can add "special" (multucharacter) values in alphabetical seach bar */
+ $count = count($alphabetical_search_values);
+
+ // building alphabetical search bar from array values
+ for($i =0;$i<=$count;$i++)
+ $list .= '<td class="alphaBg"><a href="index.php?module='.$module.'&action='.$action.'&viewname='.$viewid.'&query='.$query.'&'.$fieldname.'='.$alphabetical_search_values[$i].$flag.$popuptypevalue.$returnvalue.$append_url.'">'.$alphabetical_search_values[$i].'</a></td>';
return $list;
}
Modified: vtigercrm/branches/4.2_postgresql_integration/install.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install.php Fri Apr 7 13:52:18 2006
@@ -16,6 +16,14 @@
* $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install.php,v 1.2 2004/10/06 09:02:02 jack Exp $
* Description: Starts the installation process.
********************************************************************************/
+
+if (is_file('config.php')) {
+ require_once('config.php');
+ if (isset($dbconfig['db_hostname']) & is_file('install_lock')) {
+ header("Location: index.php");
+ exit();
+ }
+}
if (substr(phpversion(), 0, 1) == "5") {
ini_set("zend.ze1_compatibility_mode", "1");
Modified: vtigercrm/branches/4.2_postgresql_integration/install/0welcome.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/0welcome.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/0welcome.php Fri Apr 7 13:52:18 2006
@@ -16,6 +16,11 @@
* $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/0welcome.php,v 1.10 2004/08/26 11:44:30 sarajkumar Exp $
* Description: Executes a step in the installation process.
********************************************************************************/
+
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
//get php configuration settings. requires elaborate parsing of phpinfo() output
ob_start();
Modified: vtigercrm/branches/4.2_postgresql_integration/install/1checkSystem.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/1checkSystem.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/1checkSystem.php Fri Apr 7 13:52:18 2006
@@ -16,6 +16,11 @@
* $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/1checkSystem.php,v 1.16 2005/03/08 12:01:36 samk Exp $
* Description: Executes a step in the installation process.
********************************************************************************/
+
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
//get php configuration settings. requires elaborate parsing of phpinfo() output
ob_start();
Modified: vtigercrm/branches/4.2_postgresql_integration/install/2setConfig.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/2setConfig.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/2setConfig.php Fri Apr 7 13:52:18 2006
@@ -16,6 +16,11 @@
* $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/2setConfig.php,v 1.41 2005/04/29 06:44:13 samk Exp $
* Description: Executes a step in the installation process.
********************************************************************************/
+
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
// TODO: deprecate connection.php file
//require_once("connection.php");
Modified: vtigercrm/branches/4.2_postgresql_integration/install/3confirmConfig.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/3confirmConfig.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/3confirmConfig.php Fri Apr 7 13:52:18 2006
@@ -16,6 +16,11 @@
* $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/3confirmConfig.php,v 1.14 2005/04/25 09:41:26 samk Exp $
* Description: Executes a step in the installation process.
********************************************************************************/
+
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
if (isset($_REQUEST['db_hostname']))
$db_hostname = $_REQUEST['db_hostname'];
Modified: vtigercrm/branches/4.2_postgresql_integration/install/4createConfigFile.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/4createConfigFile.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/4createConfigFile.php Fri Apr 7 13:52:18 2006
@@ -19,7 +19,12 @@
* Description: Executes a step in the installation process.
********************************************************************************/
-include('vtigerversion.php');
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
+
+require_once('include/utils.php');
session_start();
Modified: vtigercrm/branches/4.2_postgresql_integration/install/5createTables.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/5createTables.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/5createTables.php Fri Apr 7 13:52:18 2006
@@ -17,6 +17,11 @@
* $Header: /advent/projects/wesat/vtiger_crm/sugarcrm/install/5createTables.php,v 1.58 2005/04/19 16:57:08 ray Exp $
* Description: Executes a step in the installation process.
********************************************************************************/
+
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
set_time_limit(600);
@@ -81,6 +86,23 @@
require_once('install/5createTables.inc.php');
+if (is_file('install_lock'))
+ $is_writable = is_writable('install_lock');
+else
+ $is_writable = is_writable('.');
+
+$config_lock = "/*\n\nInstallation Lock File\n\n";
+$config_lock .= "This File is Used to Prevent\n";
+$config_lock .= "Changes to An Existing Configuration\n";
+$config_lock .= "of vtiger.\n\n";
+$config_lock .= "To re-enable the installation mode,\n";
+$config_lock .= "delete this file, and use the\n";
+$config_lock .= "install.php file to restart the configuration.\n\n*/";
+
+if ($is_writable && ($install_lock_file = @ fopen("install_lock", "w"))) {
+ fputs($install_lock_file, $config_lock, strlen($config_lock));
+ fclose($install_lock_file);
+}
?>
<HR></HR>
total time: <?php echo "$deltaTime"; ?> seconds.<BR />
Modified: vtigercrm/branches/4.2_postgresql_integration/install/populateSeedData.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/install/populateSeedData.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/install/populateSeedData.php Fri Apr 7 13:52:18 2006
@@ -17,6 +17,11 @@
* Description: Executes a step in the installation process.
********************************************************************************/
+if (is_file('../install_lock')) {
+ header("Location: ../index.php");
+ exit();
+}
+
require_once('config.php');
require_once('modules/Leads/Lead.php');
Modified: vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpg-config.inc
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpg-config.inc (original)
+++ vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpg-config.inc Fri Apr 7 13:52:18 2006
@@ -64,6 +64,10 @@
// either FF_CHINESE or FF_BIG5
DEFINE('CHINESE_TTF_FONT','bkai00mp.ttf');
+// For Traditional Chinese with UTF-8 encode
+// Download from http://twpug.net/modules/wfdownloads/visit.php?cid=33&lid=566
+DEFINE('TCHINESE_UTF8_FONT','fireflysung.ttf');
+
// Special unicode cyrillic language support
DEFINE("LANGUAGE_CYRILLIC",false);
Modified: vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpgraph.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpgraph.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/jpgraph/jpgraph.php Fri Apr 7 13:52:18 2006
@@ -83,6 +83,7 @@
DEFINE("FF_SIMSUN",30);
DEFINE("FF_CHINESE",31);
DEFINE("FF_BIG5",31);
+DEFINE("FF_TCHINESE_UTF8",32);
// Japanese font
DEFINE("FF_MINCHO",40);
@@ -3087,6 +3088,7 @@
FF_VERASERIF => array(FS_NORMAL=>'VeraSe.ttf', FS_BOLD=>'VeraSeBd.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ) ,
FF_SIMSUN => array(FS_NORMAL=>'simsun.ttc', FS_BOLD=>'simhei.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
FF_CHINESE => array(FS_NORMAL=>CHINESE_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
+ FF_TCHINESE_UTF8 => array(FS_NORMAL=>TCHINESE_UTF8_FONT, FS_BOLD=>TCHINESE_UTF8_FONT, FS_ITALIC=>TCHINESE_UTF8_FONT, FS_BOLDITALIC=>TCHINESE_UTF8_FONT ),
FF_MINCHO => array(FS_NORMAL=>MINCHO_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
FF_PMINCHO => array(FS_NORMAL=>PMINCHO_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
FF_GOTHIC => array(FS_NORMAL=>GOTHIC_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Charts.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Charts.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/Charts.php Fri Apr 7 13:52:18 2006
@@ -40,6 +40,7 @@
DEFINE("FF_SIMSUN",30);
DEFINE("FF_CHINESE",31);
DEFINE("FF_BIG5",31);
+DEFINE("FF_TCHINESE_UTF8",32);
function calculate_font_family($locale)
@@ -50,6 +51,8 @@
{
case 'cn_zh':
return FF_SIMSUN;
+ case 'zh-tw':
+ return FF_TCHINESE_UTF8;
case 'tw_zh':
if(!function_exists('iconv')){
echo " Unable to display traditional Chinese on the graphs.<BR>The function iconv does not exists please read more about <a href='http://us4.php.net/iconv'>iconv here</a><BR>";
Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/RenderRelatedListUI.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/RenderRelatedListUI.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/modules/Potentials/RenderRelatedListUI.php Fri Apr 7 13:52:18 2006
@@ -18,7 +18,8 @@
$hidden .= '<input type="hidden" name="module">';
$hidden .= '<input type="hidden" name="mode">';
$hidden .= '<input type="hidden" name="potential_id" value="'.$id.'">';
- $hidden .= '<input type="hidden" name="contact_id" value="'.$id.'">';
+ //2-21-06 arodes - removed contact_id value = $id since the id passed in is not a contact id value
+ $hidden .= '<input type="hidden" name="contact_id" value="">';
$hidden .= '<input type="hidden" name="return_module" value="Potentials">';
$hidden .= '<input type="hidden" name="return_action" value="DetailView">';
$hidden .= '<input type="hidden" name="return_id" value="'.$id.'">';
Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Quotes/Save.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/modules/Quotes/Save.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/modules/Quotes/Save.php Fri Apr 7 13:52:18 2006
@@ -53,6 +53,12 @@
if(isset($_REQUEST[$fieldname]))
{
$value = $_REQUEST[$fieldname];
+ $match = stristr($fieldname,'id'); // adding this to try and set only foreign keys.
+ if(empty($value) && $match != '0') // we dont want ALL blank values set to null
+ {
+ $value = 'null';
+ }
+
//echo '<BR>';
//echo $fieldname." ".$value;
//echo '<BR>';
Modified: vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/4.2_postgresql_integration/modules/Reports/ReportRun.php Fri Apr 7 13:52:18 2006
@@ -1385,7 +1385,7 @@
$y=$adb->num_fields($result);
$custom_field_values = $adb->fetch_array($result);
- $coltotalhtml .= "<table width='60%' cellpadding='0' cellspacing='0' border='0' class='formOuterBorder'><tr><td class='rptHead'>Totals</td><td class='rptHead'>SUM</td><td class='rptHead'>AVG</td><td class='rptHead'>MIN</td><td class='rptHead'>MAX</td></tr>";
+ $coltotalhtml .= "<table width='60%' cellpadding='0' cellspacing='0' border='0' class='formOuterBorder'><tr><td class='rptHead'>{$mod_strings['LBL_COLUMNS']}</td><td class='rptHead'>{$mod_strings['LBL_COLUMNS_SUM']}</td><td class='rptHead'>{$mod_strings['LBL_COLUMNS_AVERAGE']}</td><td class='rptHead'>{$mod_strings['LBL_COLUMNS_LOW_VALUE']}</td><td class='rptHead'>{$mod_strings['LBL_COLUMNS_LARGE_VALUE']}</td></tr>";
foreach($this->totallist as $key=>$value)
{
Modified: vtigercrm/branches/4.2_postgresql_integration/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/branches/4.2_postgresql_integration/schema/DatabaseSchema.xml (original)
+++ vtigercrm/branches/4.2_postgresql_integration/schema/DatabaseSchema.xml Fri Apr 7 13:52:18 2006
@@ -676,7 +676,7 @@
<field name="phone" type="C" size="50"></field>
<field name="mobile" type="C" size="50"></field>
<field name="fax" type="C" size="50"></field>
- <field name="lane" type="C" size="30"></field>
+ <field name="lane" type="C" size="250"></field>
<field name="leadaddresstype" type="C" size="30">
<DEFAULT value="Billing"/>
</field>
More information about the vtigercrm-commits
mailing list