vtigerCRM 4.x Installer: Step 2

B'descriptionSpan -> Desc: removed $uitype == 19 and made an aditional elseif above { From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 02:36:48 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 10:36:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3893 - /vtigercrm/trunk/Smarty/templates/UserListView.tpl Message-ID: <20060223103648.6DE9049A59C@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 03:36:44 2006 New Revision: 3893 Log: Added line in UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Thu Feb 23 03:36:44 2006 @@ -23,6 +23,7 @@ + {foreach item=header from=$LIST_HEADER} {$header} From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 02:38:25 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 10:38:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3894 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060223103825.E5CD349A59C@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 03:38:21 2006 New Revision: 3894 Log: Created UserEditView.tpl for smartification of User Edit View in Settings with the New UI Added: vtigercrm/trunk/Smarty/templates/UserEditView.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 02:48:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 10:48:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3895 - in /vtigercrm/trunk: Smarty/templates/ListView.tpl include/js/general.js include/utils/SearchUtils.php modules/Leads/ListView.php themes/blue/style.css Message-ID: <20060223104838.290F349A4A9@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 03:48:26 2006 New Revision: 3895 Log: Dyanamic search fields for advance search added Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl vtigercrm/trunk/include/js/general.js vtigercrm/trunk/include/utils/SearchUtils.php vtigercrm/trunk/modules/Leads/ListView.php vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/Smarty/templates/ListView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/ListView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/ListView.tpl Thu Feb 23 03:48:26 2006 @@ -187,35 +187,42 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - -

General Details
Account name		Phone
Website URL		Fax
Ticket Symbol		Other Phone

- -

+ + + + + + + + + + + + + + + + +

Match All of the Following

Match Any of the Following

+ + + + + + +

+ +

Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Thu Feb 23 03:48:26 2006 @@ -1206,3 +1206,57 @@ } } +/* +* javascript function to add field rows +* @param option_values :: List of Field names +*/ +function fnAddSrch(option_values){ + + var tableName = document.getElementById('adSrc'); + + var prev = tableName.rows.length; + + var count = prev; + + var row = tableName.insertRow(prev); + + if(count%2) + + row.className = "dvtCellLabel"; + + else + + row.className = "dvtCellInfo"; + + var colone = row.insertCell(0); + + var coltwo = row.insertCell(1); + + var colthree = row.insertCell(2); + + //colone.innerHTML=""; + colone.innerHTML=""; + + coltwo.innerHTML=" "; + + colthree.innerHTML=""; + +} + +/* +* javascript function to delete field rows in advance search +* @param void :: void +*/ +function delRow() +{ + + var tableName = document.getElementById('adSrc'); + + var prev = tableName.rows.length; + + if(prev > 1) + + document.getElementById('adSrc').deleteRow(prev-1); + +} + Modified: vtigercrm/trunk/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/SearchUtils.php (original) +++ vtigercrm/trunk/include/utils/SearchUtils.php Thu Feb 23 03:48:26 2006 @@ -302,8 +302,77 @@ } return $where; } - - - +function getAdvSearchfields($module) + { + global $adb; + $tabid = getTabid($module); + global $profile_id; + + $sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid"; + $sql.= " where field.tabid=".$tabid." and"; + $sql.= " field.displaytype in (1,2) and profile2field.visible=0"; + $sql.= " and profile2field.profileid=".$profile_id." order by block,sequence"; + + $result = $adb->query($sql); + $noofrows = $adb->num_rows($result); + $block = ''; + //Added on 14-10-2005 -- added ticket id in list + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID'; + } + //Added to include activity type in activity customview list + if($module == 'Activities' && $block == 19) + { + $module_columnlist['activity:activitytype::Activities_Activity Type:C'] = 'Activity Type'; + } + + for($i=0; $i<$noofrows; $i++) + { + $fieldtablename = $adb->query_result($result,$i,"tablename"); + $fieldcolname = $adb->query_result($result,$i,"columnname"); + $fieldtype = explode("~",$fieldtype); + $fieldtypeofdata = $fieldtype[0]; + /*if($fieldcolname == "crmid" || $fieldcolname == "parent_id") + { + $fieldtablename = "crmentity"; + $fieldcolname = "setype"; + }*/ + $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); + if($fieldlabel == "Related To") + { + $fieldlabel = "Related to"; + } + if($fieldlabel == "Start Date & Time") + { + $fieldlabel = "Start Date"; + if($module == 'Activities' && $block == 19) + $module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time'; + + } + $fieldlabel1 = str_replace(" ","_",$fieldlabel); + //$module_columnlist[$optionvalue] = $fieldlabel; + if ($i==0) + $OPTION_SET .= ""; + else + $OPTION_SET .= ""; + } + return $OPTION_SET; + } + +function getcriteria_options() +{ + $CRIT_OPT = " + + + + + "; + return $CRIT_OPT; +} +function getSearch_criteria() +{ + $condition_array = Array(''=>'',''=>'',''=>'',''=>'',''=>'',''=>''); +} ?> Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Thu Feb 23 03:48:26 2006 @@ -256,6 +256,10 @@ $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Leads","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','lastname','true','basic',"","","","",$viewid); +$fieldnames = getAdvSearchfields($module); +$criteria = getcriteria_options(); +$smarty->assign("CRITERIA", $criteria); +$smarty->assign("FIELDNAMES", $fieldnames); $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Feb 23 03:48:26 2006 @@ -809,3 +809,30 @@ display:none; } +/*Added for Advance Seearch*/ +#scrollTab{ + position:relative; + width:100%; + height:350px; + overflow:auto; + border:0px solid #CCCCCC; + display:block; +} + +.dock{ + vertical-align:middle; + text-align:left; + padding-left:0px; +} + +.imgDoc{ + cursor:pointer; + border:0px; +} + +#one{ + position:relative; + display:block; + width:245px; +} + From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 02:51:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 10:51:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3896 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060223105146.452DA49A515@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 03:51:41 2006 New Revision: 3896 Log: property modified Modified: vtigercrm/trunk/modules/Users/Forms.php (contents, props changed) Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 03:16:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:16:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3897 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060223111644.C4B374988EB@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:16:39 2006 New Revision: 3897 Log: Incorporated field validations while creating new users for CRM Modified: vtigercrm/trunk/modules/Users/Forms.php Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Users/Forms.php (original) +++ vtigercrm/trunk/modules/Users/Forms.php Thu Feb 23 04:16:39 2006 @@ -34,6 +34,8 @@ $lbl_last_name = $mod_strings['LBL_LIST_LAST_NAME']; $lbl_user_name = $mod_strings['LBL_LIST_USER_NAME']; +$lbl_new_password = $mod_strings['LBL_LIST_PASSWORD']; +$lbl_confirm_new_password = $mod_strings['LBL_LIST_CONFIRM_PASSWORD']; $lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL']; $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; @@ -57,13 +59,21 @@ function verify_data(form) { var isError = false; var errorMessage = ""; + if (trim(form.user_name.value) == "") { + isError = true; + errorMessage += "\\n$lbl_user_name"; + } + if (trim(form.new_password.value) == "") { + isError = true; + errorMessage += "\\n$lbl_new_password"; + } + if (trim(form.confirm_new_password.value) == "") { + isError = true; + errorMessage += "\\n$lbl_confirm_new_password"; + } if (trim(form.last_name.value) == "") { isError = true; errorMessage += "\\n$lbl_last_name"; - } - if (trim(form.user_name.value) == "") { - isError = true; - errorMessage += "\\n$lbl_user_name"; } if (trim(form.email1.value) == "") { isError = true; From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 03:22:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:22:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3898 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060223112250.A156C49A3F6@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:22:46 2006 New Revision: 3898 Log: property modified Modified: vtigercrm/trunk/modules/Users/User.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 03:26:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:26:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3899 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060223112640.42DDC49A558@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:26:36 2006 New Revision: 3899 Log: property modified Modified: vtigercrm/trunk/modules/Users/EditView.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 03:28:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:28:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3900 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060223112824.F1FCC49A4B1@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:28:20 2006 New Revision: 3900 Log: Appended 'parenttab=Setting' in the User.php file Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Thu Feb 23 04:28:20 2006 @@ -585,7 +585,7 @@ { $entries=array(); $id=$this->db->query_result($result,$i-1,'id'); - $entries[]='

'; + $entries[]='

'; $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; $entries[]=$this->db->query_result($result,$i-1,'department'); From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 03:30:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:30:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3901 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060223113039.1B63B49A59B@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:30:35 2006 New Revision: 3901 Log: Smartised the EditView.php file Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Thu Feb 23 04:30:35 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/User.php'); require_once('include/utils/UserInfoUtil.php'); @@ -33,13 +33,16 @@ global $app_list_strings; global $mod_strings; + $focus = new User(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { + $mode='edit'; if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration."); $focus->retrieve($_REQUEST['record']); }else { + $mode='create'; $password=' *Password @@ -59,59 +62,66 @@ require_once($theme_path.'layout_utils.php'); $log->info("User edit view"); -$xtpl=new XTemplate ('modules/Users/EditView.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); - -if (isset($_REQUEST['error_string'])) $xtpl->assign("ERROR_STRING", "Error: ".$_REQUEST['error_string'].""); + +$smarty=new vtigerCRM_Smarty; + +$smarty->assign("UMOD", $mod_strings); +global $current_language; +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); + +$smarty->assign("APP", $app_strings); + +if (isset($_REQUEST['error_string'])) $smarty->assign("ERROR_STRING", "Error: ".$_REQUEST['error_string'].""); if (isset($_REQUEST['return_module'])) { - $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']); + $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); $RETURN_MODULE=$_REQUEST['return_module']; } if (isset($_REQUEST['return_action'])) { - $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']); + $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); $RETURN_ACTION = $_REQUEST['return_action']; } if(isset($_REQUEST['activity_mode'])) { - $xtpl->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); + $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); } if ($_REQUEST['isDuplicate'] != 'true' && isset($_REQUEST['return_id'])) { - $xtpl->assign("RETURN_ID", $_REQUEST['return_id']); + $smarty->assign("RETURN_ID", $_REQUEST['return_id']); $RETURN_ID = $_REQUEST['return_id']; } -$xtpl->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); -$xtpl->assign("IMAGE_PATH", $image_path);$xtpl->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$xtpl->assign("ID", $focus->id); -$xtpl->assign("USER_NAME", $focus->user_name); -$xtpl->assign("FIRST_NAME", $focus->first_name); -$xtpl->assign("LAST_NAME", $focus->last_name); -$xtpl->assign("TITLE", $focus->title); -$xtpl->assign("DEPARTMENT", $focus->department); -$xtpl->assign("REPORTS_TO_ID", $focus->reports_to_id); -$xtpl->assign("REPORTS_TO_NAME", $focus->reports_to_name); -$xtpl->assign("PHONE_HOME", $focus->phone_home); -$xtpl->assign("PHONE_MOBILE", $focus->phone_mobile); -$xtpl->assign("PHONE_WORK", $focus->phone_work); -$xtpl->assign("PHONE_OTHER", $focus->phone_other); -$xtpl->assign("PHONE_FAX", $focus->phone_fax); -$xtpl->assign("EMAIL1", $focus->email1); -$xtpl->assign("EMAIL2", $focus->email2); -$xtpl->assign("YAHOO_ID", $focus->yahoo_id); -if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $xtpl->assign("YAHOO_MESSENGER", "

"); -$xtpl->assign("ADDRESS_STREET", $focus->address_street); -$xtpl->assign("ADDRESS_CITY", $focus->address_city); -$xtpl->assign("ADDRESS_STATE", $focus->address_state); -$xtpl->assign("ADDRESS_POSTALCODE", $focus->address_postalcode); -$xtpl->assign("ADDRESS_COUNTRY", $focus->address_country); -$xtpl->assign("SIGNATURE", $focus->signature); -$xtpl->assign("DESCRIPTION", $focus->description); -$xtpl->assign("USERIMAGE", $focus->imagename); -$xtpl->assign("PASSWORD", $password); +$smarty->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); +$smarty->assign("IMAGE_PATH", $image_path);$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); +$smarty->assign("ID", $focus->id); +$smarty->assign("USER_NAME", $focus->user_name); +$smarty->assign("FIRST_NAME", $focus->first_name); +$smarty->assign("LAST_NAME", $focus->last_name); +$smarty->assign("TITLE", $focus->title); +$smarty->assign("DEPARTMENT", $focus->department); +$smarty->assign("REPORTS_TO_ID", $focus->reports_to_id); +$smarty->assign("REPORTS_TO_NAME", $focus->reports_to_name); +$smarty->assign("PHONE_HOME", $focus->phone_home); +$smarty->assign("PHONE_MOBILE", $focus->phone_mobile); +$smarty->assign("PHONE_WORK", $focus->phone_work); +$smarty->assign("PHONE_OTHER", $focus->phone_other); +$smarty->assign("PHONE_FAX", $focus->phone_fax); +$smarty->assign("EMAIL1", $focus->email1); +$smarty->assign("EMAIL2", $focus->email2); +$smarty->assign("YAHOO_ID", $focus->yahoo_id); +if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $smarty->assign("YAHOO_MESSENGER", "

"); +$smarty->assign("ADDRESS_STREET", $focus->address_street); +$smarty->assign("ADDRESS_CITY", $focus->address_city); +$smarty->assign("ADDRESS_STATE", $focus->address_state); +$smarty->assign("ADDRESS_POSTALCODE", $focus->address_postalcode); +$smarty->assign("ADDRESS_COUNTRY", $focus->address_country); +$smarty->assign("SIGNATURE", $focus->signature); +$smarty->assign("DESCRIPTION", $focus->description); +$smarty->assign("USERIMAGE", $focus->imagename); +$smarty->assign("MODE", $mode); +$smarty->assign("MODULE", 'Settings'); $DATE_FORMAT_SELECT_OPTION = ''; -$xtpl->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION); +$smarty->assign("DATE_FORMAT", $DATE_FORMAT_SELECT_OPTION); if (is_admin($current_user)) { - $status = "".$app_strings['LBL_REQUIRED_SYMBOL']."".$mod_strings['LBL_STATUS']."\n"; - $status .= "user_name @@ -153,7 +163,7 @@ $status .= ">"; $status .= get_select_options_with_id($app_list_strings['user_status_dom'], $focus->status); $status .= "\n"; - $xtpl->assign("USER_STATUS_OPTIONS", $status); + $smarty->assign("USER_STATUS_OPTIONS", $status); @@ -187,7 +197,7 @@ } $ROLE_SELECT_OPTION .= ' '; - $xtpl->assign("USER_ROLE", $ROLE_SELECT_OPTION); + $smarty->assign("USER_ROLE", $ROLE_SELECT_OPTION); @@ -217,7 +227,7 @@ $GROUP_SELECT_OPTION .= ' '; - $xtpl->assign("GROUP_NAME", $GROUP_SELECT_OPTION); + $smarty->assign("GROUP_NAME", $GROUP_SELECT_OPTION); $CURRENCY_SELECT_OPTION = ''; - $xtpl->assign("CURRENCY_NAME", $CURRENCY_SELECT_OPTION); - -} - -$xtpl->assign("ACTIVITY_VIEW", getActivityVIew($focus->activity_view)); -$xtpl->assign("CLOUD_TAG", $focus->tagcloud); - -$xtpl->assign("LEAD_VIEW", getLeadVIew($focus->lead_view)); + $smarty->assign("CURRENCY_NAME", $CURRENCY_SELECT_OPTION); + +} + +$smarty->assign("ACTIVITY_VIEW", getActivityVIew($focus->activity_view)); +$smarty->assign("CLOUD_TAG", $focus->tagcloud); + +$smarty->assign("LEAD_VIEW", getLeadVIew($focus->lead_view)); if($focus->cal_color == '') $focus->cal_color = '#E6FAD8'; - $xtpl->assign("CAL_COLOR",'

'); + $smarty->assign("CAL_COLOR",'

'); if (isset($default_user_name) && $default_user_name != "" @@ -258,29 +268,31 @@ && isset($lock_default_user_name) && $lock_default_user_name == true ) { $status .= " disabled "; - $xtpl->assign("DISABLED", "disabled"); + $smarty->assign("DISABLED", "disabled"); } if ($_REQUEST['Edit'] == ' Edit ') { - $xtpl->assign("READONLY", "readonly"); - $xtpl->assign("USERNAME_READONLY", "readonly"); + $smarty->assign("READONLY", "readonly"); + $smarty->assign("USERNAME_READONLY", "readonly"); } if(isset($_REQUEST['record']) && $_REQUEST['isDuplicate'] != 'true') { - $xtpl->assign("USERNAME_READONLY", "readonly"); -} - - - -if (is_admin($current_user) && $focus->is_admin == 'on') $xtpl->assign("IS_ADMIN", "checked"); + $smarty->assign("USERNAME_READONLY", "readonly"); +} + + + +if (is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "checked"); elseif (is_admin($current_user) && $focus->is_admin != 'on') ; -elseif (!is_admin($current_user) && $focus->is_admin == 'on') $xtpl->assign("IS_ADMIN", "disabled checked"); -else $xtpl->assign("IS_ADMIN", "disabled"); - -$xtpl->parse("main"); -$xtpl->out("main"); +elseif (!is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "disabled checked"); +else $smarty->assign("IS_ADMIN", "disabled"); + +//$smarty->assign("",$focus->getUserListViewHeader()); + +$smarty->display("UserEditView.tpl"); + /* echo "
"; if(is_admin($current_user) && ! isset($focus->id)) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 03:33:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:33:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3902 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060223113349.AB8E449A59B@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:33:45 2006 New Revision: 3902 Log: Modified the Language file to include new field labels from the New UI Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:20:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:20:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3903 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060223142055.32ED949A222@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:20:50 2006 New Revision: 3903 Log: Created UserDetailView.tpl file for smartification of My Preferences & User Settings Detail View Added: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:22:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:22:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3904 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060223142220.F39CD49A222@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:22:17 2006 New Revision: 3904 Log: Made changes in the language file for accessing field label in Detail View - Settings Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:26:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:26:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3905 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060223142617.6149E49A53B@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:26:12 2006 New Revision: 3905 Log: Appended 'parenttab=Settings' in getUserListViewEntries function's Detail View Entries Array Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Thu Feb 23 07:26:12 2006 @@ -587,7 +587,7 @@ $id=$this->db->query_result($result,$i-1,'id'); $entries[]='

'; $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); - $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; + $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; $entries[]=$this->db->query_result($result,$i-1,'department'); $entries[]=$this->db->query_result($result,$i-1,'email1'); $entries[]=fetchUserRole($this->db->query_result($result,$i-1,'id')); From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:32:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:32:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3906 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060223143211.0784549A5C1@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:32:08 2006 New Revision: 3906 Log: Smartised the DetailView PHP File Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 08:30:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:30:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3907 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060223163007.1E7BB49A583@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:30:00 2006 New Revision: 3907 Log: attachment contents and attachments size are removed from attachments table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Feb 23 09:30:00 2006 @@ -1074,14 +1074,6 @@ - - - - - - - - Type=InnoDB attachmentsid From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 08:30:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:30:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3908 - /vtigercrm/trunk/storage/ Message-ID: <20060223163056.7A7BF49A765@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:30:51 2006 New Revision: 3908 Log: folder added for uploads Added: vtigercrm/trunk/storage/ From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 08:32:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:32:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3909 - /vtigercrm/trunk/storage/vtiger.txt Message-ID: <20060223163222.A855349A765@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:32:18 2006 New Revision: 3909 Log: file added to make the folder a non-empty one Added: vtigercrm/trunk/storage/vtiger.txt From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 08:55:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:55:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3910 - in /vtigercrm/trunk: Smarty/templates/CreateView.tpl Smarty/templates/salesEditView.tpl include/RelatedListView.php modules/uploads/add2db.php modules/uploads/upload.php Message-ID: <20060223165531.E61FE49A752@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:55:20 2006 New Revision: 3910 Log: multipleuploads has been integrated for attachments and the storage location has been changed Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/include/RelatedListView.php vtigercrm/trunk/modules/uploads/add2db.php vtigercrm/trunk/modules/uploads/upload.php Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Thu Feb 23 09:55:20 2006 @@ -451,10 +451,27 @@ - {elseif $uitype eq 69 || $uitype eq 61} + {elseif $uitype eq 69} {$fldlabel} - {$fldvalue} - + + {if $MODULE eq 'Products'} + +

Files Maximum 6 + +

+ + + {else} + {$fldvalue} + {/if} + {elseif $uitype eq 61} + {$fldlabel} + {$fldvalue} {elseif $uitype eq 30} {$fldlabel} @@ -823,9 +840,27 @@ - {elseif $uitype eq 69 || $uitype eq 61} + {elseif $uitype eq 69} {$fldlabel} - {$fldvalue} + + {if $MODULE eq 'Products'} + +

Files Maximum 6 + +

+ + + {else} + {$fldvalue} + {/if} + {elseif $uitype eq 61} + {$fldlabel} + {$fldvalue} {elseif $uitype eq 30} {$fldlabel} @@ -865,7 +900,7 @@ {/if} - + @@ -884,6 +919,25 @@ + +{/if} + var fieldname = new Array({$VALIDATION_DATA_FIELDNAME}) @@ -892,5 +946,6 @@ var fielddatatype = new Array({$VALIDATION_DATA_FIELDDATATYPE}) + Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Thu Feb 23 09:55:20 2006 @@ -150,8 +150,8 @@

- - + +

@@ -453,9 +453,35 @@ - {elseif $uitype eq 69 || $uitype eq 61} + {elseif $uitype eq 69} {$fldlabel} - {$fldvalue} + + {if $MODULE eq 'Products'} + +

Files Maximum 6 + + {foreach key=num item=image from=$maindata[3]} + {if $image neq ''} +

[{$image}] +

+ {/if} + {/foreach} +

+ + + {else} + {$fldvalue} + {/if} + {elseif $uitype eq 61} + {$fldlabel} + + {$fldvalue} {elseif $uitype eq 30} {$fldlabel} @@ -495,7 +521,7 @@ {/if} - + @@ -514,12 +540,39 @@ ScrollEffect.limit = 201; ScrollEffect.closelimit= 200; - +{if ($MODULE eq 'Emails' || 'Notes') and ($FCKEDITOR_DISPLAY eq 'true')} + + Modified: vtigercrm/trunk/include/RelatedListView.php ============================================================================== Binary files - no diff available. Modified: vtigercrm/trunk/modules/uploads/add2db.php ============================================================================== --- vtigercrm/trunk/modules/uploads/add2db.php (original) +++ vtigercrm/trunk/modules/uploads/add2db.php Thu Feb 23 09:55:20 2006 @@ -11,105 +11,105 @@ require_once('include/database/PearDatabase.php'); require_once('include/utils/utils.php'); - +global $current_user; $vtigerpath = $_SERVER['REQUEST_URI']; $vtigerpath = str_replace("/index.php?module=uploads&action=add2db", "", $vtigerpath); -$uploaddir = $root_directory ."/test/upload/" ;// set this to wherever +$directory = $root_directory."/storage/user_".getUserName($current_user->id)."/attachments/"; -// Arbitrary File Upload Vulnerability fix - Philip -$binFile = $_FILES['binFile']['name']; +if(!is_dir($directory)) +{ + if(!mkdir($directory, 0777)) + { + echo "Access denined to create folder"; + die; + } +} +$uploaddir = $directory; +$crmid = $_REQUEST['return_id']; + +for ($filecount=0;$filecountgetUniqueID("crmentity"); + $desc = $_REQUEST['txtDescription']; + $description = addslashes($desc); + $date_var = date('YmdHis'); + + $query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')"; + $result = $adb->query($query); + + $sql = "insert into attachments values("; + $sql .= $current_id.",'".$filename."','".$description."','".$filetype."')"; + $result = $adb->query($sql); + + + $sql1 = "insert into seattachmentsrel values('"; + $sql1 .= $crmid."','".$current_id."')"; + $result = $adb->query($sql1); + + header("Location: index.php?action=".$_REQUEST['return_action']."&module=".$_REQUEST['return_module']."&record=".$_REQUEST['return_id']."&filename=".$filename.""); + } + else + { + include('themes/'.$theme.'/header.php'); + $errormessage = "Error Message
+
Invalid file OR +
File has no data +

" ; + echo $errormessage; + include "upload.php"; + } + } + else { - $current_id = $adb->getUniqueID("crmentity"); - $desc = $_REQUEST['txtDescription']; - $description = addslashes($desc); - $date_var = date('YmdHis'); + $errorCode = $_FILES['binFile']['error']; - $data = base64_encode(fread(fopen($uploaddir.$binFile, "r"), $filesize)); - //$data = addslashes(fread(fopen($uploaddir.$binFile, "r"), $filesize)); - - $query = "insert into crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."','".$date_var."')"; - $result = $adb->query($query); + if($errorCode == 4) + { + include('themes/'.$theme.'/header.php'); + $errormessage = "Kindly give a valid file for upload!
" ; + echo $errormessage; + include "upload.php"; + } + else if($errorCode == 2) + { + $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
"; + include('themes/'.$theme.'/header.php'); + echo $errormessage; + include "upload.php"; + //echo $errorCode; + } + else if($errorCode == 3 || $errorcode == '') + { + include('themes/'.$theme.'/header.php'); + echo "Problems in file upload. Please try again!
"; + include "upload.php"; + } - $sql = "insert into attachments values("; - $sql .= $current_id.",'".$filename."','".$description."','".$filetype."','".$filesize."','".$adb->getEmptyBlob()."')"; - $result = $adb->query($sql); - - if($result!=false) - $result = $adb->updateBlob('attachments','attachmentcontents',"attachmentsid='".$current_id."' and name='".$filename."'",$data); - + } - $crmid = $_REQUEST['return_id']; - - $sql1 = "insert into seattachmentsrel values('"; - $sql1 .= $crmid."','".$current_id."')"; - - $result = $adb->query($sql1); -header("Location: index.php?action=".$_REQUEST['return_action']."&module=".$_REQUEST['return_module']."&record=".$_REQUEST['return_id']."&filename=".$filename.""); - } - else - { - include('themes/'.$theme.'/header.php'); - $errormessage = "Error Message
-
Invalid file OR -
File has no data -

" ; - echo $errormessage; - deleteFile($uploaddir,$filename); - include "upload.php"; - } -} -else -{ - $errorCode = $_FILES['binFile']['error']; - - if($errorCode == 4) - { - include('themes/'.$theme.'/header.php'); - $errormessage = "Kindly give a valid file for upload!
" ; - echo $errormessage; - include "upload.php"; - } - else if($errorCode == 2) - { - $errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a file smaller than 1000000 bytes
"; - include('themes/'.$theme.'/header.php'); - echo $errormessage; - include "upload.php"; - //echo $errorCode; - } - else if($errorCode == 3 || $errorcode == '') - { - include('themes/'.$theme.'/header.php'); - echo "Problems in file upload. Please try again!
"; - include "upload.php"; - } - } - -function deleteFile($dir,$filename) -{ - unlink($dir.$filename); -} - ?> Modified: vtigercrm/trunk/modules/uploads/upload.php ============================================================================== --- vtigercrm/trunk/modules/uploads/upload.php (original) +++ vtigercrm/trunk/modules/uploads/upload.php Thu Feb 23 09:55:20 2006 @@ -10,6 +10,7 @@ --> +

- + + +

Files Maximum 6 + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 11:51:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 19:51:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3911 - in /vtigercrm/branches/4.2/adodb: ./ datadict/ drivers/ perf/ session/ session/old/ tests/ Message-ID: <20060223195129.DC84849A749@vtiger.fosslabs.com> Author: jeffk Date: Thu Feb 23 12:50:55 2006 New Revision: 3911 Log: refs #7. brings our snapshot to zero-diff with adodb-4.72 Added: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php vtigercrm/branches/4.2/adodb/adodb-error.inc.php vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php vtigercrm/branches/4.2/adodb/adodb-lib.inc.php vtigercrm/branches/4.2/adodb/adodb-pager.inc.php vtigercrm/branches/4.2/adodb/adodb-pear.inc.php vtigercrm/branches/4.2/adodb/adodb-perf.inc.php vtigercrm/branches/4.2/adodb/adodb-php4.inc.php vtigercrm/branches/4.2/adodb/adodb-time.inc.php vtigercrm/branches/4.2/adodb/adodb.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php vtigercrm/branches/4.2/adodb/pivottable.inc.php vtigercrm/branches/4.2/adodb/rsfilter.inc.php vtigercrm/branches/4.2/adodb/server.php vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/adodb-session.php vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/old/adodb-session.php vtigercrm/branches/4.2/adodb/tests/benchmark.php vtigercrm/branches/4.2/adodb/tests/pdo.php vtigercrm/branches/4.2/adodb/tests/test-datadict.php vtigercrm/branches/4.2/adodb/tests/test-php5.php vtigercrm/branches/4.2/adodb/tests/test.php vtigercrm/branches/4.2/adodb/tests/test3.php vtigercrm/branches/4.2/adodb/tests/test5.php vtigercrm/branches/4.2/adodb/tests/testcache.php vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php vtigercrm/branches/4.2/adodb/tests/testoci8.php vtigercrm/branches/4.2/adodb/tests/testoci8cursor.php vtigercrm/branches/4.2/adodb/tests/testpaging.php vtigercrm/branches/4.2/adodb/tests/testpear.php vtigercrm/branches/4.2/adodb/tests/testsessions.php vtigercrm/branches/4.2/adodb/toexport.inc.php vtigercrm/branches/4.2/adodb/tohtml.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php Thu Feb 23 12:50:55 2006 @@ -8,7 +8,7 @@ /* - V4.71 24 Jan 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved. + V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Thu Feb 23 12:50:55 2006 @@ -1,7 +1,7 @@ sql = $sql; $this->id = $id; @@ -70,7 +70,7 @@ $next_page = $id.'_next_page'; if (isset($_GET[$next_page])) { - $_SESSION[$curr_page] = $_GET[$next_page]; + $_SESSION[$curr_page] = (integer) $_GET[$next_page]; } if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page Modified: vtigercrm/branches/4.2/adodb/adodb-pear.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-pear.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-pear.inc.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ Testing date formating

"; - $fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C822 r s t U w y Y z Z 2003'; + $fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003'; $s1 = date($fmt,0); $s2 = adodb_date($fmt,0); if ($s1 != $s2) { @@ -977,6 +981,8 @@ $max = strlen($fmt); $dates = ''; + $isphp5 = PHP_VERSION >= 5; + /* at this point, we have the following integer vars to manipulate: $year, $month, $day, $hour, $min, $secs @@ -1000,7 +1006,11 @@ if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs; $gmt = adodb_get_gmt_diff(); - $dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; + if ($isphp5) + $dates .= sprintf(' %s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); + else + $dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); + break; case 'Y': $dates .= $year; break; case 'y': $dates .= substr($year,strlen($year)-2,2); break; @@ -1031,7 +1041,12 @@ $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break; case 'O': $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff(); - $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; + + if ($isphp5) + $dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); + else + $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); + break; case 'H': if ($hour < 10) $dates .= '0'.$hour; Modified: vtigercrm/branches/4.2/adodb/adodb.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb.inc.php Thu Feb 23 12:50:55 2006 @@ -14,7 +14,7 @@ /** \mainpage - @version V4.71 24 Jan 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. + @version V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. You can choose which license you prefer. @@ -171,7 +171,7 @@ /** * ADODB version as a string. */ - $ADODB_vers = 'V4.71 24 Jan 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; + $ADODB_vers = 'V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim#natsoft.com.my). All rights reserved. Released BSD & LGPL.'; /** * Determines whether recordset->RecordCount() is used. @@ -1506,11 +1506,11 @@ * Flush cached recordsets that match a particular $sql statement. * If $sql == false, then we purge all files in the cache. */ - function CacheFlush($sql=false,$inputarr=false) - { - global $ADODB_CACHE_DIR; - - if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) { + function CacheFlush($sql=false,$inputarr=false) + { + global $ADODB_CACHE_DIR; + + if (strlen($ADODB_CACHE_DIR) > 1 && !$sql) { /*if (strncmp(PHP_OS,'WIN',3) === 0) $dir = str_replace('/', '\\', $ADODB_CACHE_DIR); else */ @@ -1787,9 +1787,6 @@ return _adodb_getupdatesql($this,$rs,$arrFields,$forceUpdate,$magicq,$force); } - - - /** * Generates an Insert Query based on an existing recordset. * $arrFields is an associative array of fields with the value @@ -1911,8 +1908,8 @@ if (empty($this->_metars)) { $rsclass = $this->rsPrefix.$this->databaseType; $this->_metars =& new $rsclass(false,$this->fetchMode); - } - + $this->_metars->connection =& $this; + } return $this->_metars->MetaType($t,$len,$fieldobj); } @@ -3731,7 +3728,7 @@ $fakedsn = 'fake'.substr($db,$at); $dsna = @parse_url($fakedsn); $dsna['scheme'] = substr($db,0,$at); - + if (strncmp($db,'pdo',3) == 0) { $sch = explode('_',$dsna['scheme']); if (sizeof($sch)>1) { @@ -3764,7 +3761,6 @@ } } else $opt = array(); } - /* * phptype: Database backend used in PHP (mysql, odbc etc.) * dbsyntax: Database used with regards to SQL syntax etc. @@ -3814,6 +3810,8 @@ if (isset($dsna['port'])) $obj->port = $dsna['port']; foreach($opt as $k => $v) { switch(strtolower($k)) { + case 'new': + $nconnect = true; $persist = true; break; case 'persist': case 'persistent': $persist = $v; break; case 'debug': $obj->debug = (integer) $v; break; @@ -3837,8 +3835,10 @@ } if (empty($persist)) $ok = $obj->Connect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']); + else if (empty($nconnect)) + $ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']); else - $ok = $obj->PConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']); + $ok = $obj->NConnect($dsna['host'], $dsna['user'], $dsna['pass'], $dsna['path']); if (!$ok) return $false; } @@ -3873,6 +3873,7 @@ case 'oracle': $drivername = 'oci8'; break; case 'access': if ($perf) $drivername = ''; break; case 'db2' : break; + case 'odbc_db2': $drivername = 'db2'; break; case 'sapdb' : break; default: $drivername = 'generic'; @@ -3957,4 +3958,4 @@ } -?> +?> Modified: vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (original) +++ vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php Thu Feb 23 12:50:55 2006 @@ -1,7 +1,7 @@ curMode = SQL_CUR_USE_ODBC; -$db->Connect($dsn, $userid, $pwd); - - - -USING CLI INTERFACE -=================== - -I have had reports that the $host and $database params have to be reversed in -Connect() when using the CLI interface. From Halmai Csongor csongor.halmai#nexum.hu: - -> The symptom is that if I change the database engine from postgres or any other to DB2 then the following -> connection command becomes wrong despite being described this version to be correct in the docs. -> -> $connection_object->Connect( $DATABASE_HOST, $DATABASE_AUTH_USER_NAME, $DATABASE_AUTH_PASSWORD, $DATABASE_NAME ) -> -> In case of DB2 I had to swap the first and last arguments in order to connect properly. - - + V4.72 21 Feb 2006 (c) 2006 John Lim (jlim at natsoft.com.my). All rights reserved. + +This is a version of the ADODB driver for DB2. It uses the 'ibm_db2' PECL extension for PHP + (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2. + + Tested with PHP 5.1.1 and Apache 2.0.55 on Windows XP SP2. + + This file was ported from "adodb-odbc.inc.php" by Larry Menard, "larry.menard at rogers.com". + I ripped out what I believed to be a lot of redundant or obsolete code, but there are + probably still some remnants of the ODBC support in this file; I'm relying on reviewers + of this code to point out any other things that can be removed. */ // security - hide paths if (!defined('ADODB_DIR')) die(); -if (!defined('_ADODB_ODBC_LAYER')) { - include(ADODB_DIR."/drivers/adodb-odbc.inc.php"); -} -if (!defined('ADODB_DB2')){ -define('ADODB_DB2',1); - -class ADODB_DB2 extends ADODB_odbc { + define("_ADODB_DB2_LAYER", 2 ); + +/*-------------------------------------------------------------------------------------- +--------------------------------------------------------------------------------------*/ + + +class ADODB_db2 extends ADOConnection { var $databaseType = "db2"; - var $concat_operator = '||'; - var $sysDate = 'CURRENT_DATE'; - var $sysTimeStamp = 'CURRENT TIMESTAMP'; - // The complete string representation of a timestamp has the form - // yyyy-mm-dd-hh.mm.ss.nnnnnn. - var $fmtTimeStamp = "'Y-m-d-H.i.s'"; - var $ansiOuter = true; - var $identitySQL = 'values IDENTITY_VAL_LOCAL()'; - var $_bindInputArray = true; - var $hasInsertID = true; - - function ADODB_DB2() - { - if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC; - $this->ADODB_odbc(); - } - - function IfNull( $field, $ifNull ) - { - return " COALESCE($field, $ifNull) "; // if DB2 UDB - } + var $fmtDate = "'Y-m-d'"; + var $fmtTimeStamp = "'Y-m-d, h:i:sA'"; + var $replaceQuote = "''"; // string to use to replace quotes + var $dataProvider = "db2"; + var $hasAffectedRows = true; + + var $binmode = DB2_BINARY; + + var $useFetchArray = false; // setting this to true will make array elements in FETCH_ASSOC mode case-sensitive + // breaking backward-compat + var $_bindInputArray = false; + var $_genSeqSQL = "create table %s (id integer)"; + var $_autocommit = true; + var $_haserrorfunctions = true; + var $_lastAffectedRows = 0; + var $uCaseTables = true; // for meta* functions, uppercase table names + + function ADODB_db2() + { + $this->_haserrorfunctions = ADODB_PHPVER >= 0x4050; + } + + // returns true or false + function _connect($argDSN, $argUsername, $argPassword, $argDatabasename) + { + global $php_errormsg; + + if (!function_exists('db2_connect')) { + ADOConnection::outp("Warning: The old ODBC based DB2 driver has been renamed 'odbc_db2'. This ADOdb driver calls PHP's native db2 extension."); + return null; + } + // This needs to be set before the connect(). + // Replaces the odbc_binmode() call that was in Execute() + ini_set('ibm_db2.binmode', $this->binmode); + + if ($argDatabasename) { + $this->_connectionID = db2_connect($argDatabasename,$argUsername,$argPassword); + } else { + $this->_connectionID = db2_connect($argDSN,$argUsername,$argPassword); + } + if (isset($php_errormsg)) $php_errormsg = ''; + + // For db2_connect(), there is an optional 4th arg. If present, it must be + // an array of valid options. So far, we don't use them. + + $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + if (isset($this->connectStmt)) $this->Execute($this->connectStmt); + + return $this->_connectionID != false; + } + + // returns true or false + function _pconnect($argDSN, $argUsername, $argPassword, $argDatabasename) + { + global $php_errormsg; + + if (!function_exists('db2_connect')) return null; + + // This needs to be set before the connect(). + // Replaces the odbc_binmode() call that was in Execute() + ini_set('ibm_db2.binmode', $this->binmode); + + if (isset($php_errormsg)) $php_errormsg = ''; + $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + + if ($argDatabasename) { + $this->_connectionID = db2_pconnect($argDatabasename,$argUsername,$argPassword); + } else { + $this->_connectionID = db2_pconnect($argDSN,$argUsername,$argPassword); + } + if (isset($php_errormsg)) $php_errormsg = ''; + + $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + if ($this->_connectionID && $this->autoRollback) @db2_rollback($this->_connectionID); + if (isset($this->connectStmt)) $this->Execute($this->connectStmt); + + return $this->_connectionID != false; + } + function ServerInfo() { - //odbc_setoption($this->_connectionID,1,101 /*SQL_ATTR_ACCESS_MODE*/, 1 /*SQL_MODE_READ_ONLY*/); - $vers = $this->GetOne('select versionnumber from sysibm.sysversions'); - //odbc_setoption($this->_connectionID,1,101, 0 /*SQL_MODE_READ_WRITE*/); - return array('description'=>'DB2 ODBC driver', 'version'=>$vers); - } - - function _insertid() - { - return $this->GetOne($this->identitySQL); - } - - function RowLock($tables,$where,$flds='1 as ignore') - { - if ($this->_autocommit) $this->BeginTrans(); - return $this->GetOne("select $flds from $tables where $where for update"); - } - - function &MetaTables($ttype=false,$showSchema=false, $qtable="%", $qschema="%") + + if (!empty($this->host) && ADODB_PHPVER >= 0x4300) { + $dsn = strtoupper($this->host); + $first = true; + $found = false; + + if (!function_exists('db2_data_source')) return false; + + while(true) { + + $rez = @db2_data_source($this->_connectionID, + $first ? SQL_FETCH_FIRST : SQL_FETCH_NEXT); + $first = false; + if (!is_array($rez)) break; + if (strtoupper($rez['server']) == $dsn) { + $found = true; + break; + } + } + if (!$found) return ADOConnection::ServerInfo(); + if (!isset($rez['version'])) $rez['version'] = ''; + return $rez; + } else { + return ADOConnection::ServerInfo(); + } + } + + + function CreateSequence($seqname='adodbseq',$start=1) + { + if (empty($this->_genSeqSQL)) return false; + $ok = $this->Execute(sprintf($this->_genSeqSQL,$seqname)); + if (!$ok) return false; + $start -= 1; + return $this->Execute("insert into $seqname values($start)"); + } + + var $_dropSeqSQL = 'drop table %s'; + function DropSequence($seqname) + { + if (empty($this->_dropSeqSQL)) return false; + return $this->Execute(sprintf($this->_dropSeqSQL,$seqname)); + } + + /* + This algorithm is not very efficient, but works even if table locking + is not available. + + Will return false if unable to generate an ID after $MAXLOOPS attempts. + */ + function GenID($seq='adodbseq',$start=1) + { + // if you have to modify the parameter below, your database is overloaded, + // or you need to implement generation of id's yourself! + $MAXLOOPS = 100; + while (--$MAXLOOPS>=0) { + $num = $this->GetOne("select id from $seq"); + if ($num === false) { + $this->Execute(sprintf($this->_genSeqSQL ,$seq)); + $start -= 1; + $num = '0'; + $ok = $this->Execute("insert into $seq values($start)"); + if (!$ok) return false; + } + $this->Execute("update $seq set id=id+1 where id=$num"); + + if ($this->affected_rows() > 0) { + $num += 1; + $this->genID = $num; + return $num; + } + } + if ($fn = $this->raiseErrorFn) { + $fn($this->databaseType,'GENID',-32000,"Unable to generate unique id after $MAXLOOPS attempts",$seq,$num); + } + return false; + } + + + function ErrorMsg() + { + if ($this->_haserrorfunctions) { + if ($this->_errorMsg !== false) return $this->_errorMsg; + if (empty($this->_connectionID)) return @db2_errormsg(); + return @db2_errormsg($this->_connectionID); + } else return ADOConnection::ErrorMsg(); + } + + function ErrorNo() + { + + if ($this->_haserrorfunctions) { + if ($this->_errorCode !== false) { + // bug in 4.0.6, error number can be corrupted string (should be 6 digits) + return (strlen($this->_errorCode)<=2) ? 0 : $this->_errorCode; + } + + if (empty($this->_connectionID)) $e = @db2_error(); + else $e = @db2_error($this->_connectionID); + + // bug in 4.0.6, error number can be corrupted string (should be 6 digits) + // so we check and patch + if (strlen($e)<=2) return 0; + return $e; + } else return ADOConnection::ErrorNo(); + } + + + + function BeginTrans() + { + if (!$this->hasTransactions) return false; + if ($this->transOff) return true; + $this->transCnt += 1; + $this->_autocommit = false; + return db2_autocommit($this->_connectionID,false); + } + + function CommitTrans($ok=true) + { + if ($this->transOff) return true; + if (!$ok) return $this->RollbackTrans(); + if ($this->transCnt) $this->transCnt -= 1; + $this->_autocommit = true; + $ret = db2_commit($this->_connectionID); + db2_autocommit($this->_connectionID,true); + return $ret; + } + + function RollbackTrans() + { + if ($this->transOff) return true; + if ($this->transCnt) $this->transCnt -= 1; + $this->_autocommit = true; + $ret = db2_rollback($this->_connectionID); + db2_autocommit($this->_connectionID,true); + return $ret; + } + + function MetaPrimaryKeys($table) { global $ADODB_FETCH_MODE; + if ($this->uCaseTables) $table = strtoupper($table); + $schema = ''; + $this->_findschema($table,$schema); + $savem = $ADODB_FETCH_MODE; $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - $qid = odbc_tables($this->_connectionID, "", $qschema, $qtable, ""); - - $rs = new ADORecordSet_odbc($qid); + $qid = @db2_primarykeys($this->_connectionID,'',$schema,$table); + + if (!$qid) { + $ADODB_FETCH_MODE = $savem; + return false; + } + $rs = new ADORecordSet_db2($qid); + $ADODB_FETCH_MODE = $savem; + + if (!$rs) return false; + + $arr =& $rs->GetArray(); + $rs->Close(); + $arr2 = array(); + for ($i=0; $i < sizeof($arr); $i++) { + if ($arr[$i][3]) $arr2[] = $arr[$i][3]; + } + return $arr2; + } + + + + function &MetaTables($ttype=false) + { + global $ADODB_FETCH_MODE; + + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + $qid = db2_tables($this->_connectionID); + + $rs = new ADORecordSet_db2($qid); $ADODB_FETCH_MODE = $savem; if (!$rs) { $false = false; return $false; } - $rs->_has_stupid_odbc_fetch_api_change = $this->_has_stupid_odbc_fetch_api_change; $arr =& $rs->GetArray(); - //print_r($arr); $rs->Close(); $arr2 = array(); @@ -161,202 +302,386 @@ $isview = strncmp($ttype,'V',1) === 0; } for ($i=0; $i < sizeof($arr); $i++) { - if (!$arr[$i][2]) continue; - if (strncmp($arr[$i][1],'SYS',3) === 0) continue; - $type = $arr[$i][3]; - - if ($showSchema) $arr[$i][2] = $arr[$i][1].'.'.$arr[$i][2]; - if ($ttype) { if ($isview) { if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2]; - } else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2]; - } else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2]; + } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2]; + } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2]; } return $arr2; } - - function &MetaIndexes ($table, $primary = FALSE, $owner=false) - { - // save old fetch mode - global $ADODB_FETCH_MODE; - $save = $ADODB_FETCH_MODE; - $ADODB_FETCH_MODE = ADODB_FETCH_NUM; - if ($this->fetchMode !== FALSE) { - $savem = $this->SetFetchMode(FALSE); - } + +/* +See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/db2/htm/db2datetime_data_type_changes.asp +/ SQL data type codes / +#define SQL_UNKNOWN_TYPE 0 +#define SQL_CHAR 1 +#define SQL_NUMERIC 2 +#define SQL_DECIMAL 3 +#define SQL_INTEGER 4 +#define SQL_SMALLINT 5 +#define SQL_FLOAT 6 +#define SQL_REAL 7 +#define SQL_DOUBLE 8 +#if (DB2VER >= 0x0300) +#define SQL_DATETIME 9 +#endif +#define SQL_VARCHAR 12 + + +/ One-parameter shortcuts for date/time data types / +#if (DB2VER >= 0x0300) +#define SQL_TYPE_DATE 91 +#define SQL_TYPE_TIME 92 +#define SQL_TYPE_TIMESTAMP 93 + +#define SQL_UNICODE (-95) +#define SQL_UNICODE_VARCHAR (-96) +#define SQL_UNICODE_LONGVARCHAR (-97) +*/ + function DB2Types($t) + { + switch ((integer)$t) { + case 1: + case 12: + case 0: + case -95: + case -96: + return 'C'; + case -97: + case -1: //text + return 'X'; + case -4: //image + return 'B'; + + case 9: + case 91: + return 'D'; + + case 10: + case 11: + case 92: + case 93: + return 'T'; + + case 4: + case 5: + case -6: + return 'I'; + + case -11: // uniqidentifier + return 'R'; + case -7: //bit + return 'L'; + + default: + return 'N'; + } + } + + function &MetaColumns($table) + { + global $ADODB_FETCH_MODE; + $false = false; - // get index details - $table = strtoupper($table); - $SQL="SELECT NAME, UNIQUERULE, COLNAMES FROM SYSIBM.SYSINDEXES WHERE TBNAME='$table'"; - if ($primary) - $SQL.= " AND UNIQUERULE='P'"; - $rs = $this->Execute($SQL); - if (!is_object($rs)) { - if (isset($savem)) - $this->SetFetchMode($savem); - $ADODB_FETCH_MODE = $save; - return $false; - } - $indexes = array (); - // parse index data into array - while ($row = $rs->FetchRow()) { - $indexes[$row[0]] = array( - 'unique' => ($row[1] == 'U' || $row[1] == 'P'), - 'columns' => array() - ); - $cols = ltrim($row[2],'+'); - $indexes[$row[0]]['columns'] = explode('+', $cols); - } - if (isset($savem)) { - $this->SetFetchMode($savem); - $ADODB_FETCH_MODE = $save; - } - return $indexes; - } - - // Format date column in sql string given an input format that understands Y M D - function SQLDate($fmt, $col=false) - { - // use right() and replace() ? - if (!$col) $col = $this->sysDate; - $s = ''; - - $len = strlen($fmt); - for ($i=0; $i < $len; $i++) { - if ($s) $s .= '||'; - $ch = $fmt[$i]; - switch($ch) { - case 'Y': - case 'y': - $s .= "char(year($col))"; + if ($this->uCaseTables) $table = strtoupper($table); + $schema = ''; + $this->_findschema($table,$schema); + + $savem = $ADODB_FETCH_MODE; + $ADODB_FETCH_MODE = ADODB_FETCH_NUM; + + $colname = "%"; + $qid = db2_columns($this->_connectionID, "", $schema, $table, $colname); + if (empty($qid)) return $false; + + $rs =& new ADORecordSet_db2($qid); + $ADODB_FETCH_MODE = $savem; + + if (!$rs) return $false; + $rs->_fetch(); + + $retarr = array(); + + /* + $rs->fields indices + 0 TABLE_QUALIFIER + 1 TABLE_SCHEM + 2 TABLE_NAME + 3 COLUMN_NAME + 4 DATA_TYPE + 5 TYPE_NAME + 6 PRECISION + 7 LENGTH + 8 SCALE + 9 RADIX + 10 NULLABLE + 11 REMARKS + */ + while (!$rs->EOF) { + if (strtoupper(trim($rs->fields[2])) == $table && (!$schema || strtoupper($rs->fields[1]) == $schema)) { + $fld = new ADOFieldObject(); + $fld->name = $rs->fields[3]; + $fld->type = $this->DB2Types($rs->fields[4]); + + // ref: http://msdn.microsoft.com/library/default.asp?url=/archive/en-us/dnaraccgen/html/msdn_odk.asp + // access uses precision to store length for char/varchar + if ($fld->type == 'C' or $fld->type == 'X') { + if ($rs->fields[4] <= -95) // UNICODE + $fld->max_length = $rs->fields[7]/2; + else + $fld->max_length = $rs->fields[7]; + } else + $fld->max_length = $rs->fields[7]; + $fld->not_null = !empty($rs->fields[10]); + $fld->scale = $rs->fields[8]; + $retarr[strtoupper($fld->name)] = $fld; + } else if (sizeof($retarr)>0) break; - case 'M': - $s .= "substr(monthname($col),1,3)"; - break; - case 'm': - $s .= "right(digits(month($col)),2)"; - break; - case 'D': - case 'd': - $s .= "right(digits(day($col)),2)"; - break; - case 'H': - case 'h': - if ($col != $this->sysDate) $s .= "right(digits(hour($col)),2)"; - else $s .= "''"; - break; - case 'i': - case 'I': - if ($col != $this->sysDate) - $s .= "right(digits(minute($col)),2)"; - else $s .= "''"; - break; - case 'S': - case 's': - if ($col != $this->sysDate) - $s .= "right(digits(second($col)),2)"; - else $s .= "''"; - break; - default: - if ($ch == '\\') { - $i++; - $ch = substr($fmt,$i,1); + $rs->MoveNext(); + } + $rs->Close(); //-- crashes 4.03pl1 -- why? + + if (empty($retarr)) $retarr = false; + return $retarr; + } + + function Prepare($sql) + { + if (! $this->_bindInputArray) return $sql; // no binding + $stmt = db2_prepare($this->_connectionID,$sql); + if (!$stmt) { + // we don't know whether db2 driver is parsing prepared stmts, so just return sql + return $sql; + } + return array($sql,$stmt,false); + } + + /* returns queryID or false */ + function _query($sql,$inputarr=false) + { + GLOBAL $php_errormsg; + if (isset($php_errormsg)) $php_errormsg = ''; + $this->_error = ''; + + if ($inputarr) { + if (is_array($sql)) { + $stmtid = $sql[1]; + } else { + $stmtid = db2_prepare($this->_connectionID,$sql); + + if ($stmtid == false) { + $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + return false; } - $s .= $this->qstr($ch); - } - } - return $s; - } - - - function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false) - { - $nrows = (integer) $nrows; + } + + if (! db2_execute($stmtid,$inputarr)) { + if ($this->_haserrorfunctions) { + $this->_errorMsg = db2_errormsg(); + $this->_errorCode = db2_error(); + } + return false; + } + + } else if (is_array($sql)) { + $stmtid = $sql[1]; + if (!db2_execute($stmtid)) { + if ($this->_haserrorfunctions) { + $this->_errorMsg = db2_errormsg(); + $this->_errorCode = db2_error(); + } + return false; + } + } else + $stmtid = db2_exec($this->_connectionID,$sql); + + $this->_lastAffectedRows = 0; + if ($stmtid) { + if (@db2_num_fields($stmtid) == 0) { + $this->_lastAffectedRows = db2_num_rows($stmtid); + $stmtid = true; + } else { + $this->_lastAffectedRows = 0; + } + + if ($this->_haserrorfunctions) { + $this->_errorMsg = ''; + $this->_errorCode = 0; + } else + $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + } else { + if ($this->_haserrorfunctions) { + $this->_errorMsg = db2_stmt_errormsg(); + $this->_errorCode = db2_stmt_error(); + } else + $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : ''; + } + return $stmtid; + } + + /* + Insert a null into the blob field of the table first. + Then use UpdateBlob to store the blob. + + Usage: + + $conn->Execute('INSERT INTO blobtable (id, blobcol) VALUES (1, null)'); + $conn->UpdateBlob('blobtable','blobcol',$blob,'id=1'); + */ + function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB') + { + return $this->Execute("UPDATE $table SET $column=? WHERE $where",array($val)) != false; + } + + // returns true or false + function _close() + { + $ret = @db2_close($this->_connectionID); + $this->_connectionID = false; + return $ret; + } + + function _affectedrows() + { + return $this->_lastAffectedRows; + } + +} + +/*-------------------------------------------------------------------------------------- + Class Name: Recordset +--------------------------------------------------------------------------------------*/ + +class ADORecordSet_db2 extends ADORecordSet { + + var $bind = false; + var $databaseType = "db2"; + var $dataProvider = "db2"; + var $useFetchArray; + + function ADORecordSet_db2($id,$mode=false) + { + if ($mode === false) { + global $ADODB_FETCH_MODE; + $mode = $ADODB_FETCH_MODE; + } + $this->fetchMode = $mode; + + $this->_queryID = $id; + } + + + // returns the field object + function &FetchField($fieldOffset = -1) + { + + $off=$fieldOffset+1; // offsets begin at 1 + + $o= new ADOFieldObject(); + $o->name = @db2_field_name($this->_queryID,$off); + $o->type = @db2_field_type($this->_queryID,$off); + $o->max_length = db2_field_width($this->_queryID,$off); + if (ADODB_ASSOC_CASE == 0) $o->name = strtolower($o->name); + else if (ADODB_ASSOC_CASE == 1) $o->name = strtoupper($o->name); + return $o; + } + + /* Use associative array to get fields array */ + function Fields($colname) + { + if ($this->fetchMode & ADODB_FETCH_ASSOC) return $this->fields[$colname]; + if (!$this->bind) { + $this->bind = array(); + for ($i=0; $i < $this->_numOfFields; $i++) { + $o = $this->FetchField($i); + $this->bind[strtoupper($o->name)] = $i; + } + } + + return $this->fields[$this->bind[strtoupper($colname)]]; + } + + + function _initrs() + { + global $ADODB_COUNTRECS; + $this->_numOfRows = ($ADODB_COUNTRECS) ? @db2_num_rows($this->_queryID) : -1; + $this->_numOfFields = @db2_num_fields($this->_queryID); + // some silly drivers such as db2 as/400 and intersystems cache return _numOfRows = 0 + if ($this->_numOfRows == 0) $this->_numOfRows = -1; + } + + function _seek($row) + { + return false; + } + + // speed up SelectLimit() by switching to ADODB_FETCH_NUM as ADODB_FETCH_ASSOC is emulated + function &GetArrayLimit($nrows,$offset=-1) + { if ($offset <= 0) { - // could also use " OPTIMIZE FOR $nrows ROWS " - if ($nrows >= 0) $sql .= " FETCH FIRST $nrows ROWS ONLY "; - $rs =& $this->Execute($sql,$inputArr); - } else { - if ($offset > 0 && $nrows < 0); - else { - $nrows += $offset; - $sql .= " FETCH FIRST $nrows ROWS ONLY "; - } - $rs =& ADOConnection::SelectLimit($sql,-1,$offset,$inputArr); - } - - return $rs; - } - -}; - - -class ADORecordSet_db2 extends ADORecordSet_odbc { - - var $databaseType = "db2"; - - function ADORecordSet_db2($id,$mode=false) - { - $this->ADORecordSet_odbc($id,$mode); - } - - function MetaType($t,$len=-1,$fieldobj=false) - { - if (is_object($t)) { - $fieldobj = $t; - $t = $fieldobj->type; - $len = $fieldobj->max_length; - } - - switch (strtoupper($t)) { - case 'VARCHAR': - case 'CHAR': - case 'CHARACTER': - case 'C': - if ($len <= $this->blobSize) return 'C'; - - case 'LONGCHAR': - case 'TEXT': - case 'CLOB': - case 'DBCLOB': // double-byte - case 'X': - return 'X'; - - case 'BLOB': - case 'GRAPHIC': - case 'VARGRAPHIC': - return 'B'; - - case 'DATE': - case 'D': - return 'D'; - - case 'TIME': - case 'TIMESTAMP': - case 'T': - return 'T'; - - //case 'BOOLEAN': - //case 'BIT': - // return 'L'; - - //case 'COUNTER': - // return 'R'; - - case 'INT': - case 'INTEGER': - case 'BIGINT': - case 'SMALLINT': - case 'I': - return 'I'; - - default: return 'N'; - } - } + $rs =& $this->GetArray($nrows); + return $rs; + } + $savem = $this->fetchMode; + $this->fetchMode = ADODB_FETCH_NUM; + $this->Move($offset); + $this->fetchMode = $savem; + + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE); + } + + $results = array(); + $cnt = 0; + while (!$this->EOF && $nrows != $cnt) { + $results[$cnt++] = $this->fields; + $this->MoveNext(); + } + + return $results; + } + + + function MoveNext() + { + if ($this->_numOfRows != 0 && !$this->EOF) { + $this->_currentRow++; + + $this->fields = @db2_fetch_array($this->_queryID); + if ($this->fields) { + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE); + } + return true; + } + } + $this->fields = false; + $this->EOF = true; + return false; + } + + function _fetch() + { + + $this->fields = db2_fetch_array($this->_queryID); + if ($this->fields) { + if ($this->fetchMode & ADODB_FETCH_ASSOC) { + $this->fields =& $this->GetRowAssoc(ADODB_ASSOC_CASE); + } + return true; + } + $this->fields = false; + return false; + } + + function _close() + { + return @db2_free_result($this->_queryID); + } + } - -} //define ?> Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ Execute('BEGIN TRANSACTION adodbseq'); $start -= 1; $this->Execute("create table $seq (id float(53))"); $ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)"); Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ metaTablesSQL; $mask = $this->qstr(strtoupper($mask)); - $this->metaTablesSQL .= " AND table_name like $mask"; + $this->metaTablesSQL .= " AND upper(table_name) like $mask"; } $ret =& ADOConnection::MetaTables($ttype,$showSchema); @@ -1481,4 +1481,4 @@ return adodb_movenext($this); } } -?> +?> Modified: vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php (original) +++ vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ Connect($connstr,$u,$p) || die("CONNECT FAILED"); - - - echo "$connstr: Execute\n"; - - //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; - $rs = $DB->Execute("select * from ADOXYZ where id<3"); - echo "*** e=".$DB->ErrorNo() . " ".($DB->ErrorMsg())."\n"; - - - //print_r(get_class_methods($DB->_stmt)); - - if (!$rs) die("NO RS"); - - echo "Meta\n"; - for ($i=0; $i < $rs->NumCols(); $i++) { - var_dump($rs->FetchField($i)); - echo "
"; - } - - echo "FETCH\n"; - $cnt = 0; - while (!$rs->EOF) { - adodb_pr($rs->fields); - $rs->MoveNext(); - if ($cnt++ > 1000) break; - } - - echo "
--------------------------------------------------------
\n\n\n"; - - $stmt = $DB->PrepareStmt("select * from ADOXYZ"); - - $rs = $stmt->Execute(); - $cols = $stmt->NumCols(); // execute required - - echo "COLS = $cols"; - for($i=1;$i<=$cols;$i++) { - $v = $stmt->_stmt->getColumnMeta($i); - var_dump($v); - } - - echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n"; - while ($arr = $rs->FetchRow()) { - adodb_pr($arr); - } - die("DONE\n"); - -} catch (exception $e) { - echo "

";
-	echo $e;
-	echo "

"; -} - +"; +try { + echo "New Connection\n"; + + + $dsn = 'pdo_mysql://root:@localhost/northwind?persist'; + + if (!empty($dsn)) { + $DB =& NewADOConnection($dsn) || die("CONNECT FAILED"); + $connstr = $dsn; + } else { + + $DB = NewADOConnection('pdo'); + + echo "Connect\n"; + + $u = ''; $p = ''; + /* + $connstr = 'odbc:nwind'; + + $connstr = 'oci:'; + $u = 'scott'; + $p = 'natsoft'; + + + $connstr ="sqlite:d:\inetpub\adodb\sqlite.db"; + */ + + $connstr = "mysql:dbname=northwind"; + $u = 'root'; + + $connstr = "pgsql:dbname=test"; + $u = 'tester'; + $p = 'test'; + + $DB->Connect($connstr,$u,$p) || die("CONNECT FAILED"); + + } + + echo "connection string=$connstr\n Execute\n"; + + //$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; + $rs = $DB->Execute("select * from ADOXYZ where id<3"); + if ($DB->ErrorNo()) echo "*** errno=".$DB->ErrorNo() . " ".($DB->ErrorMsg())."\n"; + + + //print_r(get_class_methods($DB->_stmt)); + + if (!$rs) die("NO RS"); + + echo "Meta\n"; + for ($i=0; $i < $rs->NumCols(); $i++) { + var_dump($rs->FetchField($i)); + echo "
"; + } + + echo "FETCH\n"; + $cnt = 0; + while (!$rs->EOF) { + adodb_pr($rs->fields); + $rs->MoveNext(); + if ($cnt++ > 1000) break; + } + + echo "
--------------------------------------------------------
\n\n\n"; + + $stmt = $DB->PrepareStmt("select * from ADOXYZ"); + + $rs = $stmt->Execute(); + $cols = $stmt->NumCols(); // execute required + + echo "COLS = $cols"; + for($i=1;$i<=$cols;$i++) { + $v = $stmt->_stmt->getColumnMeta($i); + var_dump($v); + } + + echo "e=".$stmt->ErrorNo() . " ".($stmt->ErrorMsg())."\n"; + while ($arr = $rs->FetchRow()) { + adodb_pr($arr); + } + die("DONE\n"); + +} catch (exception $e) { + echo "

";
+	echo $e;
+	echo "

"; +} + ?> Modified: vtigercrm/branches/4.2/adodb/tests/test-datadict.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-datadict.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-datadict.php Thu Feb 23 12:50:55 2006 @@ -1,7 +1,7 @@ $dbType

"; $db = NewADOConnection($dbType); $dict = NewDataDictionary($db); Modified: vtigercrm/branches/4.2/adodb/tests/test-php5.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-php5.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-php5.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ Author: mfedyk Date: Thu Feb 23 17:00:50 2006 New Revision: 3912 Log: Fix Quotes/Invoices/Orders Do Not Support Negative Adjustments, by briand. close #30 Modified: vtigercrm/branches/4.2/modules/Invoice/EditView.html vtigercrm/branches/4.2/modules/Orders/EditView.html vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html vtigercrm/branches/4.2/modules/Quotes/EditView.html Modified: vtigercrm/branches/4.2/modules/Invoice/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Invoice/EditView.html Thu Feb 23 17:00:50 2006 @@ -500,7 +500,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } Modified: vtigercrm/branches/4.2/modules/Orders/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Orders/EditView.html Thu Feb 23 17:00:50 2006 @@ -493,7 +493,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html Thu Feb 23 17:00:50 2006 @@ -498,7 +498,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } Modified: vtigercrm/branches/4.2/modules/Quotes/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Quotes/EditView.html Thu Feb 23 17:00:50 2006 @@ -498,7 +498,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 16:14:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 00:14:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3913 - in /vtigercrm/branches/4.2: ./ adodb/ adodb/contrib/ adodb/datadict/ adodb/drivers/ adodb/lang/ adodb/pear/Auth/Container/ adodb/perf/ adodb/session/ adodb/session/old/ adodb/tests/ include/ include/ListView/ include/database/ include/fckeditor/ include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/ include/fckeditor/editor/filemanager/browser/default/connectors/php/ include/feedParser/ include/fpdf/ include/fpdf/font/ include/language/ include/lastrss/ include/nusoap/ include/php_writeexcel/ install/ jpgraph/ jpgraph/lang/ modules/Accounts/ modules/Accounts/language/ modules/Activities/ modules/Activities/language/ modules/Administration/ modules/Administration/language/ modules/Calendar/ modules/Calendar/admin/ modules/Calendar/language/ modules/Calls/ modules/Calls/language/ modules/Cases/ modules/Cases/language/ modules/Contacts/ modules/Contacts/language/ modules/CustomView/ modules/CustomView/language/ modules/Dashboard/ modules/Dashboard/language/ modules/Emails/ modules/Emails/language/ modules/Emails/templates/ modules/Faq/ modules/Faq/language/ modules/Help/ modules/Help/language/ modules/HelpDesk/ modules/HelpDesk/language/ modules/Home/ modules/Home/language/ modules/Import/ modules/Import/language/ modules/Invoice/ modules/Invoice/language/ modules/Leads/ modules/Leads/language/ modules/Meetings/ modules/Meetings/language/ modules/MessageBoard/ modules/MessageBoard/admin/ modules/MessageBoard/attach_mod/ modules/MessageBoard/attach_mod/includes/ modules/MessageBoard/cache/ modules/MessageBoard/db/ modules/MessageBoard/files/ modules/MessageBoard/includes/ modules/MessageBoard/language/ modules/MessageBoard/language/lang_english/ modules/MessageBoard/language/lang_german/ modules/MessageBoard/mods/phpbb_fetch_all/ modules/MessageBoard/spelling/ modules/Notes/ modules/Notes/language/ modules/Orders/ modules/Orders/language/ modules/Potentials/ modules/Potentials/language/ modules/Products/ modules/Products/language/ modules/Quotes/ modules/Quotes/language/ modules/Reports/ modules/Reports/language/ modules/Rss/ modules/Rss/language/ modules/Settings/ modules/Settings/language/ modules/System/ modules/System/includes/ modules/System/includes/lang/ modules/System/includes/mb/ modules/System/includes/os/ modules/System/includes/xml/ modules/System/language/ modules/Tasks/ modules/Tasks/language/ modules/Users/ modules/Users/language/ modules/Utilities/ modules/Yahoo/language/ modules/imports/ modules/imports/Excel/ modules/squirrelmail-1.4.4/ modules/squirrelmail-1.4.4/Mail/ modules/squirrelmail-1.4.4/class/ modules/squirrelmail-1.4.4/class/deliver/ modules/squirrelmail-1.4.4/class/helper/ modules/squirrelmail-1.4.4/class/mime/ modules/squirrelmail-1.4.4/config/ modules/squirrelmail-1.4.4/functions/ modules/squirrelmail-1.4.4/functions/decode/ modules/squirrelmail-1.4.4/functions/encode/ modules/squirrelmail-1.4.4/images/ modules/squirrelmail-1.4.4/include/ modules/squirrelmail-1.4.4/include/options/ modules/squirrelmail-1.4.4/language/ modules/squirrelmail-1.4.4/locale/ modules/squirrelmail-1.4.4/plugins/info/ modules/squirrelmail-1.4.4/plugins/mail_fetch/ modules/uploads/ modules/uploads/language/ themes/Aqua/ themes/blue/ themes/busthree/ themes/coolblue/ themes/coolblue/language/ themes/nature/ themes/orange/ Message-ID: <20060224001407.5978F3EBD1E@vtiger.fosslabs.com> Author: mfedyk Date: Thu Feb 23 17:10:34 2006 New Revision: 3913 Log: set text/plain mime type on all php files Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-error.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-pager.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-pear.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-perf.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-php4.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-time.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb.inc.php (props changed) vtigercrm/branches/4.2/adodb/contrib/toxmlrpc.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-sapdb.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ar.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-bg.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-bgutf8.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ca.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-cn.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-cz.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-da.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-de.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-en.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-es.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-esperanto.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-fr.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-hu.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-it.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-nl.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-pl.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-pt-br.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ro.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ru1251.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-sv.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-uk1251.inc.php (props changed) vtigercrm/branches/4.2/adodb/pear/Auth/Container/ADOdb.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php (props changed) vtigercrm/branches/4.2/adodb/pivottable.inc.php (props changed) vtigercrm/branches/4.2/adodb/rsfilter.inc.php (props changed) vtigercrm/branches/4.2/adodb/server.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-sha1.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-session.php (props changed) vtigercrm/branches/4.2/adodb/session/crypt.inc.php (props changed) vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php (props changed) vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php (props changed) vtigercrm/branches/4.2/adodb/session/old/adodb-session.php (props changed) vtigercrm/branches/4.2/adodb/session/old/crypt.inc.php (props changed) vtigercrm/branches/4.2/adodb/tests/benchmark.php (props changed) vtigercrm/branches/4.2/adodb/tests/client.php (props changed) vtigercrm/branches/4.2/adodb/tests/pdo.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-datadict.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-perf.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-pgblob.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-php5.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php (props changed) vtigercrm/branches/4.2/adodb/tests/test.php (props changed) vtigercrm/branches/4.2/adodb/tests/test2.php (props changed) vtigercrm/branches/4.2/adodb/tests/test3.php (props changed) vtigercrm/branches/4.2/adodb/tests/test4.php (props changed) vtigercrm/branches/4.2/adodb/tests/test5.php (props changed) vtigercrm/branches/4.2/adodb/tests/test_rs_array.php (props changed) vtigercrm/branches/4.2/adodb/tests/testcache.php (props changed) vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php (props changed) vtigercrm/branches/4.2/adodb/tests/testgenid.php (props changed) vtigercrm/branches/4.2/adodb/tests/testmssql.php (props changed) vtigercrm/branches/4.2/adodb/tests/testoci8.php (props changed) vtigercrm/branches/4.2/adodb/tests/testoci8cursor.php (props changed) vtigercrm/branches/4.2/adodb/tests/testpaging.php (props changed) vtigercrm/branches/4.2/adodb/tests/testpear.php (props changed) vtigercrm/branches/4.2/adodb/tests/testsessions.php (props changed) vtigercrm/branches/4.2/adodb/tests/time.php (props changed) vtigercrm/branches/4.2/adodb/tests/tmssql.php (props changed) vtigercrm/branches/4.2/adodb/toexport.inc.php (props changed) vtigercrm/branches/4.2/adodb/tohtml.inc.php (props changed) vtigercrm/branches/4.2/config.inc.php (props changed) vtigercrm/branches/4.2/include/Calc.php (props changed) vtigercrm/branches/4.2/include/Clock.php (props changed) vtigercrm/branches/4.2/include/ComboStrings.php (props changed) vtigercrm/branches/4.2/include/ComboUtil.php (props changed) vtigercrm/branches/4.2/include/CustomFieldUtil.php (props changed) vtigercrm/branches/4.2/include/FormValidationUtil.php (props changed) vtigercrm/branches/4.2/include/ListView/ListView.php (props changed) vtigercrm/branches/4.2/include/PopulateComboValues.php (props changed) vtigercrm/branches/4.2/include/PopulateCustomFieldTables.php (props changed) vtigercrm/branches/4.2/include/PopulatePhpBBtables.php (props changed) vtigercrm/branches/4.2/include/RelatedListView.php (props changed) vtigercrm/branches/4.2/include/RelatedTicketListUtil.php (props changed) vtigercrm/branches/4.2/include/backup.php (props changed) vtigercrm/branches/4.2/include/database/PearDatabase.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/config.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/io.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/util.php (props changed) vtigercrm/branches/4.2/include/fckeditor/fckeditor.php (props changed) vtigercrm/branches/4.2/include/feedParser/feedParser.php (props changed) vtigercrm/branches/4.2/include/feedParser/xmlParser.php (props changed) vtigercrm/branches/4.2/include/file.php (props changed) vtigercrm/branches/4.2/include/formbase.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/courier.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helvetica.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helveticab.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helveticabi.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helveticai.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/symbol.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/times.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/timesb.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/timesbi.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/timesi.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/zapfdingbats.php (props changed) vtigercrm/branches/4.2/include/fpdf/fpdf.php (props changed) vtigercrm/branches/4.2/include/ftp.php (props changed) vtigercrm/branches/4.2/include/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/include/lastrss/lastRSS.php (props changed) vtigercrm/branches/4.2/include/listview.php (props changed) vtigercrm/branches/4.2/include/logging.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.nusoap_base.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_fault.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_parser.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_server.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_transport_http.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_val.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soapclient.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.wsdl.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.wsdlcache.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.xmlschema.php (props changed) vtigercrm/branches/4.2/include/nusoap/nusoap.php (props changed) vtigercrm/branches/4.2/include/nusoap/nusoapmime.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.excel.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_biffwriter.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_olewriter.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_workbook.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_workbookbig.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_worksheet.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/functions.writeexcel_utility.inc.php (props changed) vtigercrm/branches/4.2/include/uifromdbutil.php (props changed) vtigercrm/branches/4.2/include/upload_file.php (props changed) vtigercrm/branches/4.2/install/config.template.php (props changed) vtigercrm/branches/4.2/jpgraph/jpgraph_antispam-digits.php (props changed) vtigercrm/branches/4.2/jpgraph/jpgraph_antispam.php (props changed) vtigercrm/branches/4.2/jpgraph/jpgraph_date.php (props changed) vtigercrm/branches/4.2/jpgraph/lang/en.inc.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Account.php (props changed) vtigercrm/branches/4.2/modules/Accounts/AccountFormBase.php (props changed) vtigercrm/branches/4.2/modules/Accounts/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/Accounts/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Delete.php (props changed) vtigercrm/branches/4.2/modules/Accounts/DeleteMemberAccountRelationship.php (props changed) vtigercrm/branches/4.2/modules/Accounts/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/EditView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Forms.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Import.php (props changed) vtigercrm/branches/4.2/modules/Accounts/ListView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Merge.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Popup.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Popup_picker.php (props changed) vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Save.php (props changed) vtigercrm/branches/4.2/modules/Accounts/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/index.php (props changed) vtigercrm/branches/4.2/modules/Accounts/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Activities/Activity.php (props changed) vtigercrm/branches/4.2/modules/Activities/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Activities/Delete.php (props changed) vtigercrm/branches/4.2/modules/Activities/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Activities/EditView.php (props changed) vtigercrm/branches/4.2/modules/Activities/Event.php (props changed) vtigercrm/branches/4.2/modules/Activities/Forms.php (props changed) vtigercrm/branches/4.2/modules/Activities/GroupAllocationView.php (props changed) vtigercrm/branches/4.2/modules/Activities/ListView.php (props changed) vtigercrm/branches/4.2/modules/Activities/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Activities/Save.php (props changed) vtigercrm/branches/4.2/modules/Activities/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Activities/index.php (props changed) vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Activities/sendreminder.php (props changed) vtigercrm/branches/4.2/modules/Activities/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Administration/Forms.php (props changed) vtigercrm/branches/4.2/modules/Administration/index.php (props changed) vtigercrm/branches/4.2/modules/Administration/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Authenticate.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Delete.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Forms.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Save.php (props changed) vtigercrm/branches/4.2/modules/Calendar/UserCalendar.php (props changed) vtigercrm/branches/4.2/modules/Calendar/admin/create_config.php (props changed) vtigercrm/branches/4.2/modules/Calendar/admin/scheme.php (props changed) vtigercrm/branches/4.2/modules/Calendar/admin/update.php (props changed) vtigercrm/branches/4.2/modules/Calendar/calendar.php (props changed) vtigercrm/branches/4.2/modules/Calendar/calendar_day.php (props changed) vtigercrm/branches/4.2/modules/Calendar/calendar_week.php (props changed) vtigercrm/branches/4.2/modules/Calendar/config.php (props changed) vtigercrm/branches/4.2/modules/Calendar/gettext.php (props changed) vtigercrm/branches/4.2/modules/Calendar/i18n.php (props changed) vtigercrm/branches/4.2/modules/Calendar/index.php (props changed) vtigercrm/branches/4.2/modules/Calendar/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Calendar/logout.php (props changed) vtigercrm/branches/4.2/modules/Calendar/minical.php (props changed) vtigercrm/branches/4.2/modules/Calendar/minitimer.php (props changed) vtigercrm/branches/4.2/modules/Calendar/mytutos.php (props changed) vtigercrm/branches/4.2/modules/Calls/Call.php (props changed) vtigercrm/branches/4.2/modules/Calls/CallFormBase.php (props changed) vtigercrm/branches/4.2/modules/Calls/Delete.php (props changed) vtigercrm/branches/4.2/modules/Calls/DeleteCallContactRelationship.php (props changed) vtigercrm/branches/4.2/modules/Calls/DeleteCallUserRelationship.php (props changed) vtigercrm/branches/4.2/modules/Calls/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Calls/EditView.php (props changed) vtigercrm/branches/4.2/modules/Calls/Forms.php (props changed) vtigercrm/branches/4.2/modules/Calls/ListView.php (props changed) vtigercrm/branches/4.2/modules/Calls/Save.php (props changed) vtigercrm/branches/4.2/modules/Calls/SubPanelViewInvitees.php (props changed) vtigercrm/branches/4.2/modules/Calls/index.php (props changed) vtigercrm/branches/4.2/modules/Calls/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Cases/Case.php (props changed) vtigercrm/branches/4.2/modules/Cases/Charts.php (props changed) vtigercrm/branches/4.2/modules/Cases/ContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Cases/ContactCaseRelationshipEdit.php (props changed) vtigercrm/branches/4.2/modules/Cases/Delete.php (props changed) vtigercrm/branches/4.2/modules/Cases/DeleteContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Cases/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Cases/EditView.php (props changed) vtigercrm/branches/4.2/modules/Cases/Forms.php (props changed) vtigercrm/branches/4.2/modules/Cases/ListView.php (props changed) vtigercrm/branches/4.2/modules/Cases/Popup.php (props changed) vtigercrm/branches/4.2/modules/Cases/Save.php (props changed) vtigercrm/branches/4.2/modules/Cases/SaveContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Cases/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Cases/index.php (props changed) vtigercrm/branches/4.2/modules/Cases/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Contacts/AddBusinessCard.php (props changed) vtigercrm/branches/4.2/modules/Contacts/BusinessCard.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Contact.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ContactFormBase.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationshipEdit.php (props changed) vtigercrm/branches/4.2/modules/Contacts/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/Contacts/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Delete.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DeleteContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DeleteContactOpportunityRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DeleteDirectReportRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/EditView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Forms.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Import.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ListView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Merge.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Popup.php (props changed) vtigercrm/branches/4.2/modules/Contacts/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Save.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SaveBusinessCard.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SaveContactOpportunityRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelViewCase.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelViewContactsAndUsers.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelViewOpportunity.php (props changed) vtigercrm/branches/4.2/modules/Contacts/contactSeedData.php (props changed) vtigercrm/branches/4.2/modules/Contacts/index.php (props changed) vtigercrm/branches/4.2/modules/Contacts/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/CustomView/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/CustomView/CustomView.php (props changed) vtigercrm/branches/4.2/modules/CustomView/Delete.php (props changed) vtigercrm/branches/4.2/modules/CustomView/EditView.php (props changed) vtigercrm/branches/4.2/modules/CustomView/Forms.php (props changed) vtigercrm/branches/4.2/modules/CustomView/ListViewTop.php (props changed) vtigercrm/branches/4.2/modules/CustomView/PopulateCustomView.php (props changed) vtigercrm/branches/4.2/modules/CustomView/Save.php (props changed) vtigercrm/branches/4.2/modules/CustomView/SaveAction.php (props changed) vtigercrm/branches/4.2/modules/CustomView/SendMailAction.php (props changed) vtigercrm/branches/4.2/modules/CustomView/index.php (props changed) vtigercrm/branches/4.2/modules/CustomView/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Forms.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/index.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Emails/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Emails/Delete.php (props changed) vtigercrm/branches/4.2/modules/Emails/DeleteEmailContactRelationship.php (props changed) vtigercrm/branches/4.2/modules/Emails/DeleteEmailUserRelationship.php (props changed) vtigercrm/branches/4.2/modules/Emails/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Emails/EditView.php (props changed) vtigercrm/branches/4.2/modules/Emails/Email.php (props changed) vtigercrm/branches/4.2/modules/Emails/Forms.php (props changed) vtigercrm/branches/4.2/modules/Emails/ListView.php (props changed) vtigercrm/branches/4.2/modules/Emails/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Emails/Save.php (props changed) vtigercrm/branches/4.2/modules/Emails/SubPanelViewRecipients.php (props changed) vtigercrm/branches/4.2/modules/Emails/add2db.php (props changed) vtigercrm/branches/4.2/modules/Emails/class.phpmailer.php (props changed) vtigercrm/branches/4.2/modules/Emails/class.smtp.php (props changed) vtigercrm/branches/4.2/modules/Emails/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Emails/gotodownload.php (props changed) vtigercrm/branches/4.2/modules/Emails/index.php (props changed) vtigercrm/branches/4.2/modules/Emails/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Emails/listemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Emails/lookupemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Emails/mailbox.php (props changed) vtigercrm/branches/4.2/modules/Emails/send_mail.php (props changed) vtigercrm/branches/4.2/modules/Emails/sendmail.php (props changed) vtigercrm/branches/4.2/modules/Emails/templates/testemailtemplateusage.php (props changed) vtigercrm/branches/4.2/modules/Emails/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Emails/upload.php (props changed) vtigercrm/branches/4.2/modules/Faq/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Faq/Delete.php (props changed) vtigercrm/branches/4.2/modules/Faq/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Faq/EditView.php (props changed) vtigercrm/branches/4.2/modules/Faq/Faq.php (props changed) vtigercrm/branches/4.2/modules/Faq/Forms.php (props changed) vtigercrm/branches/4.2/modules/Faq/ListView.php (props changed) vtigercrm/branches/4.2/modules/Faq/Save.php (props changed) vtigercrm/branches/4.2/modules/Faq/index.php (props changed) vtigercrm/branches/4.2/modules/Faq/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Help/Forms.php (props changed) vtigercrm/branches/4.2/modules/Help/index.php (props changed) vtigercrm/branches/4.2/modules/Help/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Convert.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/ConvertToEntities.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CreateFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CreateTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CumulStatistics.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CustomView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Delete.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/DeleteFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/DeleteTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/DetailView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/EditFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/EditView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/FaqInfoView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/FaqList.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Forms.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/HelpDesk.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/HelpDeskUtil.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/ListView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Merge.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Save.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/SaveFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/SaveTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/TicketHistory.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/TicketInfoView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/TicketStatisticsUtil.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/index.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Home/Forms.php (props changed) vtigercrm/branches/4.2/modules/Home/LastViewed.php (props changed) vtigercrm/branches/4.2/modules/Home/UnifiedSearch.php (props changed) vtigercrm/branches/4.2/modules/Home/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Import/Forms.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportAccount.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportButton.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportContact.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportLead.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportMap.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportOpportunity.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportProduct.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportSave.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep1.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep2.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep3.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep4.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportSteplast.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStepundo.php (props changed) vtigercrm/branches/4.2/modules/Import/SugarFile.php (props changed) vtigercrm/branches/4.2/modules/Import/UsersLastImport.php (props changed) vtigercrm/branches/4.2/modules/Import/error.php (props changed) vtigercrm/branches/4.2/modules/Import/index.php (props changed) vtigercrm/branches/4.2/modules/Import/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Import/parse_utils.php (props changed) vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Invoice/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Delete.php (props changed) vtigercrm/branches/4.2/modules/Invoice/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/EditView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Forms.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Invoice.php (props changed) vtigercrm/branches/4.2/modules/Invoice/ListTopInvoice.php (props changed) vtigercrm/branches/4.2/modules/Invoice/ListView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Popup.php (props changed) vtigercrm/branches/4.2/modules/Invoice/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Save.php (props changed) vtigercrm/branches/4.2/modules/Invoice/index.php (props changed) vtigercrm/branches/4.2/modules/Invoice/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Leads/ConvertLead.php (props changed) vtigercrm/branches/4.2/modules/Leads/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/Leads/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Leads/Delete.php (props changed) vtigercrm/branches/4.2/modules/Leads/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Leads/EditView.php (props changed) vtigercrm/branches/4.2/modules/Leads/Forms.php (props changed) vtigercrm/branches/4.2/modules/Leads/Headers.php (props changed) vtigercrm/branches/4.2/modules/Leads/Import.php (props changed) vtigercrm/branches/4.2/modules/Leads/Lead.php (props changed) vtigercrm/branches/4.2/modules/Leads/LeadConvertToEntities.php (props changed) vtigercrm/branches/4.2/modules/Leads/ListView.php (props changed) vtigercrm/branches/4.2/modules/Leads/Merge.php (props changed) vtigercrm/branches/4.2/modules/Leads/Popup.php (props changed) vtigercrm/branches/4.2/modules/Leads/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Leads/Save.php (props changed) vtigercrm/branches/4.2/modules/Leads/fetchfile.php (props changed) vtigercrm/branches/4.2/modules/Leads/index.php (props changed) vtigercrm/branches/4.2/modules/Leads/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Leads/result.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Delete.php (props changed) vtigercrm/branches/4.2/modules/Meetings/DeleteMeetingContactRelationship.php (props changed) vtigercrm/branches/4.2/modules/Meetings/DeleteMeetingUserRelationship.php (props changed) vtigercrm/branches/4.2/modules/Meetings/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Meetings/EditView.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Forms.php (props changed) vtigercrm/branches/4.2/modules/Meetings/ListView.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Meeting.php (props changed) vtigercrm/branches/4.2/modules/Meetings/MeetingFormBase.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Save.php (props changed) vtigercrm/branches/4.2/modules/Meetings/SubPanelViewInvitees.php (props changed) vtigercrm/branches/4.2/modules/Meetings/index.php (props changed) vtigercrm/branches/4.2/modules/Meetings/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/Forms.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/ListView.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/Menu.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/MessageBoard.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_approve.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_attach_cp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_attachments.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_board.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_db_utilities.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_disallow.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_extensions.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_faq_editor.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_forum_prune.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_forumauth.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_forums.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_groups.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_mass_email.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_ranks.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_smilies.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_spellcheck.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_styles.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_ug_auth.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_user_ban.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_users.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_categories.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_currently.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_edit.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_groups.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_management.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_mood.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_styles.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_words.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/index.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/page_footer_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/page_header_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/pagestart.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/attachment_mod.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/displaying.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/constants.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_delete.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_filetypes.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_includes.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_selects.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_thumbs.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/pm_attachments.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/posting_attachments.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_rules.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/cache/attach_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/common.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/db2.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/msaccess.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mssql-odbc.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mssql.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mysql.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mysql4.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/oracle.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/postgres7.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/download.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/faq.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/favorites.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/files/index.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/groupcp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/auth.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/bbcode.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/constants.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/db.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/emailer.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_post.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_search.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_selects.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_validate.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_weblog.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/page_header.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/page_tail.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/prune.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/sessions.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/smtp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/sql_parse.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/template.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/topic_review.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_activate.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_avatar.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_email.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_register.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_sendpasswd.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_viewprofile.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/weblogs_common.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/index.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_admin_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_admin_faq_editor.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_bbcode.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_faq.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_faq_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_main.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_main_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_topics_anywhere.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_weblog_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_weblog_main.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_german/lang_admin_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_german/lang_faq_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_german/lang_main_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/login.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/memberlist.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/modcp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/common.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/forums.before3update.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/forums.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/polls.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/posts.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/posts_14april.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/posts_weblog.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/stats.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/users.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/portal_home.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/posting.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/privmsg.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/profile.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/rss.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/search.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_English.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_Russian.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_diags.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_langtemplate.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_phpbb.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spellcheck.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/support_posting.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/topics_anywhere.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/uacp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/viewforum.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/viewonline.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/viewtopic.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/vtcrm_topicsanywhere.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/watched_topics.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog2.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_alltopics.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_category.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_config_bk.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_entry.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_posting.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_rss.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_search.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_users.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblogs.php (props changed) vtigercrm/branches/4.2/modules/Notes/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Notes/Delete.php (props changed) vtigercrm/branches/4.2/modules/Notes/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Notes/EditView.php (props changed) vtigercrm/branches/4.2/modules/Notes/Forms.php (props changed) vtigercrm/branches/4.2/modules/Notes/ListView.php (props changed) vtigercrm/branches/4.2/modules/Notes/Note.php (props changed) vtigercrm/branches/4.2/modules/Notes/NoteFormBase.php (props changed) vtigercrm/branches/4.2/modules/Notes/Save.php (props changed) vtigercrm/branches/4.2/modules/Notes/index.php (props changed) vtigercrm/branches/4.2/modules/Notes/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Orders/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php (props changed) vtigercrm/branches/4.2/modules/Orders/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Delete.php (props changed) vtigercrm/branches/4.2/modules/Orders/DeleteSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Orders/EditView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Forms.php (props changed) vtigercrm/branches/4.2/modules/Orders/ListTopSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/ListView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Order.php (props changed) vtigercrm/branches/4.2/modules/Orders/Popup.php (props changed) vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Save.php (props changed) vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/index.php (props changed) vtigercrm/branches/4.2/modules/Orders/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Charts.php (props changed) vtigercrm/branches/4.2/modules/Potentials/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Delete.php (props changed) vtigercrm/branches/4.2/modules/Potentials/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/EditView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Forms.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Import.php (props changed) vtigercrm/branches/4.2/modules/Potentials/ListView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Opportunity.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Popup.php (props changed) vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Save.php (props changed) vtigercrm/branches/4.2/modules/Potentials/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/index.php (props changed) vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Potentials/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Products/AddProductToPriceBooks.php (props changed) vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Products/Delete.php (props changed) vtigercrm/branches/4.2/modules/Products/DeletePriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/DeletePriceBookProductRel.php (props changed) vtigercrm/branches/4.2/modules/Products/DeleteProduct.php (props changed) vtigercrm/branches/4.2/modules/Products/DeleteVendor.php (props changed) vtigercrm/branches/4.2/modules/Products/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/EditListPrice.php (props changed) vtigercrm/branches/4.2/modules/Products/EditProduct.php (props changed) vtigercrm/branches/4.2/modules/Products/EditView.php (props changed) vtigercrm/branches/4.2/modules/Products/Forms.php (props changed) vtigercrm/branches/4.2/modules/Products/Import.php (props changed) vtigercrm/branches/4.2/modules/Products/ListView.php (props changed) vtigercrm/branches/4.2/modules/Products/Popup.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookDetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookEditView.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookListView.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php (props changed) vtigercrm/branches/4.2/modules/Products/Product.php (props changed) vtigercrm/branches/4.2/modules/Products/ProductDetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Products/Save.php (props changed) vtigercrm/branches/4.2/modules/Products/SavePriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/SaveVendor.php (props changed) vtigercrm/branches/4.2/modules/Products/UpdateListPrice.php (props changed) vtigercrm/branches/4.2/modules/Products/Vendor.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorDetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorEditView.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorListView.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorPopup.php (props changed) vtigercrm/branches/4.2/modules/Products/add2db.php (props changed) vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php (props changed) vtigercrm/branches/4.2/modules/Products/binaryfilelist.php (props changed) vtigercrm/branches/4.2/modules/Products/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Products/index.php (props changed) vtigercrm/branches/4.2/modules/Products/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Products/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Products/upload.php (props changed) vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Quotes/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Delete.php (props changed) vtigercrm/branches/4.2/modules/Quotes/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/EditView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Forms.php (props changed) vtigercrm/branches/4.2/modules/Quotes/ListTopQuotes.php (props changed) vtigercrm/branches/4.2/modules/Quotes/ListView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Popup.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Quote.php (props changed) vtigercrm/branches/4.2/modules/Quotes/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Save.php (props changed) vtigercrm/branches/4.2/modules/Quotes/index.php (props changed) vtigercrm/branches/4.2/modules/Quotes/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Reports/AdvancedFilter.php (props changed) vtigercrm/branches/4.2/modules/Reports/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Reports/CreateXL.php (props changed) vtigercrm/branches/4.2/modules/Reports/Delete.php (props changed) vtigercrm/branches/4.2/modules/Reports/DeleteReportFolder.php (props changed) vtigercrm/branches/4.2/modules/Reports/Forms.php (props changed) vtigercrm/branches/4.2/modules/Reports/ListView.php (props changed) vtigercrm/branches/4.2/modules/Reports/NewReport0.php (props changed) vtigercrm/branches/4.2/modules/Reports/NewReport1.php (props changed) vtigercrm/branches/4.2/modules/Reports/NewReportFolder.php (props changed) vtigercrm/branches/4.2/modules/Reports/PopulateReports.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportColumns.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportColumnsTotal.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportFilters.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportGrouping.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportRun.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportType.php (props changed) vtigercrm/branches/4.2/modules/Reports/Reports.php (props changed) vtigercrm/branches/4.2/modules/Reports/Save.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveAndRun.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveReport.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveReport0.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveReportFolder.php (props changed) vtigercrm/branches/4.2/modules/Reports/StandardFilter.php (props changed) vtigercrm/branches/4.2/modules/Reports/index.php (props changed) vtigercrm/branches/4.2/modules/Reports/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Rss/Forms.php (props changed) vtigercrm/branches/4.2/modules/Rss/ListView.php (props changed) vtigercrm/branches/4.2/modules/Rss/Popup.php (props changed) vtigercrm/branches/4.2/modules/Rss/Rss.php (props changed) vtigercrm/branches/4.2/modules/Rss/Save.php (props changed) vtigercrm/branches/4.2/modules/Rss/Star.php (props changed) vtigercrm/branches/4.2/modules/Rss/index.php (props changed) vtigercrm/branches/4.2/modules/Rss/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Settings/AddCustomFieldToDB.php (props changed) vtigercrm/branches/4.2/modules/Settings/AddMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/BackupServerConfig.php (props changed) vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php (props changed) vtigercrm/branches/4.2/modules/Settings/CreateCustomField.php (props changed) vtigercrm/branches/4.2/modules/Settings/CurrencyInfo.php (props changed) vtigercrm/branches/4.2/modules/Settings/CustomFieldList.php (props changed) vtigercrm/branches/4.2/modules/Settings/DeleteCustomField.php (props changed) vtigercrm/branches/4.2/modules/Settings/DeleteMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/EditComboField.php (props changed) vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php (props changed) vtigercrm/branches/4.2/modules/Settings/EmailConfig.php (props changed) vtigercrm/branches/4.2/modules/Settings/FileStorage.php (props changed) vtigercrm/branches/4.2/modules/Settings/Forms.php (props changed) vtigercrm/branches/4.2/modules/Settings/LeadCustomFieldMapping.php (props changed) vtigercrm/branches/4.2/modules/Settings/ListMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/OrganizationConfig.php (props changed) vtigercrm/branches/4.2/modules/Settings/Save.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveCompany.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveConvertLead.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveCurrencyInfo.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/UpdateComboValues.php (props changed) vtigercrm/branches/4.2/modules/Settings/add2db.php (props changed) vtigercrm/branches/4.2/modules/Settings/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Settings/fieldtypes.php (props changed) vtigercrm/branches/4.2/modules/Settings/index.php (props changed) vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Settings/test.php (props changed) vtigercrm/branches/4.2/modules/System/config.php (props changed) vtigercrm/branches/4.2/modules/System/includes/XPath.class.php (props changed) vtigercrm/branches/4.2/modules/System/includes/class.Template.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/common_functions.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ar_utf8.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/bg.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/big5.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/br.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ca.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/cn.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/cs.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ct.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/da.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/de.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/en.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/es.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/et.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/eu.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/fi.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/fr.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/gr.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/he.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/hu.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/id.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/is.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/it.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ja.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/jp.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ko.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/lt.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/lv.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/nl.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/no.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/pl.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/pt-br.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/pt.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ro.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ru.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/sk.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/sv.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/tr.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/tw.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.healthd.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.hwsensors.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.lmsensors.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.mbm5.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.mbmon.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.BSD.common.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.Darwin.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.FreeBSD.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.HP-UX.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.Linux.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.NetBSD.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.OpenBSD.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.SunOS.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.WINNT.inc.bak.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.WINNT.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/system_footer.php (props changed) vtigercrm/branches/4.2/modules/System/includes/system_header.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/filesystems.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/hardware.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/mbinfo.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/memory.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/network.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/vitals.php (props changed) vtigercrm/branches/4.2/modules/System/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/System/systemconfig.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Delete.php (props changed) vtigercrm/branches/4.2/modules/Tasks/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Tasks/EditView.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Forms.php (props changed) vtigercrm/branches/4.2/modules/Tasks/ListView.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Save.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Task.php (props changed) vtigercrm/branches/4.2/modules/Tasks/index.php (props changed) vtigercrm/branches/4.2/modules/Tasks/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Users/Authenticate.php (props changed) vtigercrm/branches/4.2/modules/Users/ChangePassword.php (props changed) vtigercrm/branches/4.2/modules/Users/CreateProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/DefaultFieldPermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/Delete.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteDemoData.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteRole.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteUser.php (props changed) vtigercrm/branches/4.2/modules/Users/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/EditDefOrgFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/EditFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/EditInventoryNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/EditNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/EditView.php (props changed) vtigercrm/branches/4.2/modules/Users/Error.php (props changed) vtigercrm/branches/4.2/modules/Users/Forms.php (props changed) vtigercrm/branches/4.2/modules/Users/HelpDesk.php (props changed) vtigercrm/branches/4.2/modules/Users/ListFieldPermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/ListFldProfiles.php (props changed) vtigercrm/branches/4.2/modules/Users/ListPermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/ListProfiles.php (props changed) vtigercrm/branches/4.2/modules/Users/ListView.php (props changed) vtigercrm/branches/4.2/modules/Users/Listhistory.php (props changed) vtigercrm/branches/4.2/modules/Users/Login.php (props changed) vtigercrm/branches/4.2/modules/Users/LoginHistory.php (props changed) vtigercrm/branches/4.2/modules/Users/Logout.php (props changed) vtigercrm/branches/4.2/modules/Users/MassDeleteUsers.php (props changed) vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/OrgSharingEditView.php (props changed) vtigercrm/branches/4.2/modules/Users/Popup.php (props changed) vtigercrm/branches/4.2/modules/Users/ProfileDeleteStep1.php (props changed) vtigercrm/branches/4.2/modules/Users/ProfileDetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/ProfileEditView.php (props changed) vtigercrm/branches/4.2/modules/Users/RoleDeleteStep1.php (props changed) vtigercrm/branches/4.2/modules/Users/RoleDetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/Save.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveInventoryNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveRole.php (props changed) vtigercrm/branches/4.2/modules/Users/Security.php (props changed) vtigercrm/branches/4.2/modules/Users/ShowHistory.php (props changed) vtigercrm/branches/4.2/modules/Users/TabCustomise.php (props changed) vtigercrm/branches/4.2/modules/Users/TabMenu.php (props changed) vtigercrm/branches/4.2/modules/Users/TemplateMerge.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateDefaultFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateTab.php (props changed) vtigercrm/branches/4.2/modules/Users/User.php (props changed) vtigercrm/branches/4.2/modules/Users/UserDeleteStep1.php (props changed) vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (props changed) vtigercrm/branches/4.2/modules/Users/about_us.php (props changed) vtigercrm/branches/4.2/modules/Users/add2db.php (props changed) vtigercrm/branches/4.2/modules/Users/binaryfilelist.php (props changed) vtigercrm/branches/4.2/modules/Users/createemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/createnewgroup.php (props changed) vtigercrm/branches/4.2/modules/Users/createrole.php (props changed) vtigercrm/branches/4.2/modules/Users/deleteemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/deletewordtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/detailviewemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Users/editemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/editpermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/forum_register.php (props changed) vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Users/listemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Users/listgroupmembers.php (props changed) vtigercrm/branches/4.2/modules/Users/listgroups.php (props changed) vtigercrm/branches/4.2/modules/Users/listinventorynotifications.php (props changed) vtigercrm/branches/4.2/modules/Users/listnotificationschedulers.php (props changed) vtigercrm/branches/4.2/modules/Users/listroles.php (props changed) vtigercrm/branches/4.2/modules/Users/listwordtemplates.php (props changed) vtigercrm/branches/4.2/modules/Users/lookupemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Users/massChangeStatus.php (props changed) vtigercrm/branches/4.2/modules/Users/massdelete.php (props changed) vtigercrm/branches/4.2/modules/Users/notify_detail.php (props changed) vtigercrm/branches/4.2/modules/Users/populatetemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php (props changed) vtigercrm/branches/4.2/modules/Users/updateNotificationSchedulers.php (props changed) vtigercrm/branches/4.2/modules/Users/updateRole.php (props changed) vtigercrm/branches/4.2/modules/Users/upload.php (props changed) vtigercrm/branches/4.2/modules/Utilities/Merge.php (props changed) vtigercrm/branches/4.2/modules/Yahoo/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/imports/Excel/reader.php (props changed) vtigercrm/branches/4.2/modules/imports/Headers.php (props changed) vtigercrm/branches/4.2/modules/imports/fetchfile.php (props changed) vtigercrm/branches/4.2/modules/imports/import.php (props changed) vtigercrm/branches/4.2/modules/imports/parseandstore.php (props changed) vtigercrm/branches/4.2/modules/imports/result.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/Mail/mime.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/Mail/mimeDecode.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/Mail/mimePart.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addrbook_popup.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addrbook_search.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addrbook_search_html.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addressbook.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver_IMAP.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver_SMTP.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver_SendMail.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/helper/VCard.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/html.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/AddressStructure.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/ContentType.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Disposition.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Language.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Message.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/MessageHeader.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Rfc822Header.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/SMimeMessage.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/compose.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/config/config.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/configtest.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/delete_message.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/download.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/empty_trash.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_create.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_delete.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_rename_do.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_rename_getname.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_subscribe.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/abook_database.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/abook_ldap_server.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/abook_local_file.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/addressbook.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/attachment_common.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/auth.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/constants.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/date.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/db_prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1250.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1251.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1252.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1253.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1254.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1255.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1256.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1257.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1258.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp855.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp866.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_1.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_10.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_11.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_13.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_14.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_15.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_16.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_2.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_3.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_4.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_5.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_6.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_7.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_8.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_9.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_ir_111.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/koi8_r.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/koi8_u.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/ns_4551_1.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/tis_620.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/us_ascii.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/utf_8.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/display_messages.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/cp1251.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/cp1255.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/cp1256.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_1.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_15.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_2.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_7.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_9.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/koi8_r.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/koi8_u.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/tis_620.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/us_ascii.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/utf_8.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/file_prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/forms.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/gettext.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/global.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/html.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/i18n.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/identity.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_general.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_mailbox.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_messages.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_search.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_utf7_local.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/mailbox_display.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/mime.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/page_header.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/plugin.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/strings.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/tree.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/url_parser.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/help.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/image.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/images/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/load_prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/display.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/folder.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/personal.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/validate.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/left_main.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/locale/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/login.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/mailfeed.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/move_messages.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options_highlight.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options_identities.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options_order.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/functions.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/setup.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/class.POP3.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/fetch.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/functions.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/setup.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/printer_friendly_bottom.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/printer_friendly_main.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/printer_friendly_top.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/read_body.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/redirect.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/right_main.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/search.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/signout.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/vcard.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/view_header.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/view_text.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/webmail.php (props changed) vtigercrm/branches/4.2/modules/uploads/Forms.php (props changed) vtigercrm/branches/4.2/modules/uploads/add.php (props changed) vtigercrm/branches/4.2/modules/uploads/add2db.php (props changed) vtigercrm/branches/4.2/modules/uploads/binaryfilelist.php (props changed) vtigercrm/branches/4.2/modules/uploads/deleteattachments.php (props changed) vtigercrm/branches/4.2/modules/uploads/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/uploads/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/uploads/myupload.php (props changed) vtigercrm/branches/4.2/modules/uploads/open_db.php (props changed) vtigercrm/branches/4.2/modules/uploads/upload.php (props changed) vtigercrm/branches/4.2/themes/Aqua/footer.php (props changed) vtigercrm/branches/4.2/themes/Aqua/header.php (props changed) vtigercrm/branches/4.2/themes/Aqua/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/Aqua/loginheader.php (props changed) vtigercrm/branches/4.2/themes/blue/footer.php (props changed) vtigercrm/branches/4.2/themes/blue/header.php (props changed) vtigercrm/branches/4.2/themes/blue/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/blue/loginheader.php (props changed) vtigercrm/branches/4.2/themes/busthree/config.php (props changed) vtigercrm/branches/4.2/themes/busthree/footer.php (props changed) vtigercrm/branches/4.2/themes/busthree/header.php (props changed) vtigercrm/branches/4.2/themes/busthree/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/coolblue/footer.php (props changed) vtigercrm/branches/4.2/themes/coolblue/header.php (props changed) vtigercrm/branches/4.2/themes/coolblue/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/themes/coolblue/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/nature/footer.php (props changed) vtigercrm/branches/4.2/themes/nature/header.php (props changed) vtigercrm/branches/4.2/themes/nature/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/nature/loginheader.php (props changed) vtigercrm/branches/4.2/themes/orange/footer.php (props changed) vtigercrm/branches/4.2/themes/orange/header.php (props changed) vtigercrm/branches/4.2/themes/orange/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/orange/loginheader.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 17:51:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 01:51:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3914 - /vtigercrm/branches/4.2/extractSchema.php Message-ID: <20060224015106.6E89D49A745@vtiger.fosslabs.com> Author: mfedyk Date: Thu Feb 23 18:51:04 2006 New Revision: 3914 Log: add file to extract adodb XML schema from database, from mikecrowe Added: vtigercrm/branches/4.2/extractSchema.php From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 17:54:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 01:54:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3915 - /vtigercrm/branches/4.2/extractSchema.php Message-ID: <20060224015416.BA34049A745@vtiger.fosslabs.com> Author: mfedyk Date: Thu Feb 23 18:54:15 2006 New Revision: 3915 Log: remove unused code in extractSchema Modified: vtigercrm/branches/4.2/extractSchema.php Modified: vtigercrm/branches/4.2/extractSchema.php ============================================================================== --- vtigercrm/branches/4.2/extractSchema.php (original) +++ vtigercrm/branches/4.2/extractSchema.php Thu Feb 23 18:54:15 2006 @@ -1,50 +1,8 @@ Author: saraj Date: Thu Feb 23 23:49:03 2006 New Revision: 3916 Log: function fnVis(obj) added in the general.js file for the new UI of Settings - New user/Edit User/Detail view Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Thu Feb 23 23:49:03 2006 @@ -1260,3 +1260,64 @@ } +function fnVis(obj){ + + var profTag = document.getElementById("prof"); + + var moreTag = document.getElementById("more"); + + var addrTag = document.getElementById("addr"); + + + if(obj == 'prof'){ + + document.getElementById('mnuTab').style.display = 'block'; + + document.getElementById('mnuTab1').style.display = 'none'; + + document.getElementById('mnuTab2').style.display = 'none'; + + profTag.className = 'dvtSelectedCell'; + + moreTag.className = 'dvtUnSelectedCell'; + + addrTag.className = 'dvtUnSelectedCell'; + + } + + + else if(obj == 'more'){ + + document.getElementById('mnuTab1').style.display = 'block'; + + document.getElementById('mnuTab').style.display = 'none'; + + document.getElementById('mnuTab2').style.display = 'none'; + + moreTag.className = 'dvtSelectedCell'; + + profTag.className = 'dvtUnSelectedCell'; + + addrTag.className = 'dvtUnSelectedCell'; + + } + + + else if(obj == 'addr'){ + + document.getElementById('mnuTab2').style.display = 'block'; + + document.getElementById('mnuTab').style.display = 'none'; + + document.getElementById('mnuTab1').style.display = 'none'; + + addrTag.className = 'dvtSelectedCell'; + + profTag.className = 'dvtUnSelectedCell'; + + moreTag.className = 'dvtUnSelectedCell'; + + } + +} + From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 23:49:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 07:49:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3917 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060224074913.8133949A738@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 00:49:09 2006 New Revision: 3917 Log: Changed the LBL_ADDRESS & LBL_YAHOO_ID Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Fri Feb 24 00:49:09 2006 @@ -147,7 +147,7 @@ - {$UMOD.LBL_YAHOO_MSN_ID} + {$UMOD.LBL_YAHOO_ID} {$UMOD.LBL_HOME_PHONE} @@ -174,7 +174,7 @@ {$UMOD.LBL_NEW_FORM_TITLE} - {$UMOD.LBL_STREET_ADDRESS} + {$UMOD.LBL_ADDRESS} {$ADDRESS_STREET} From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 00:26:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 08:26:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3918 - in /vtigercrm/trunk: include/utils/CommonUtils.php modules/uploads/add2db.php Message-ID: <20060224082658.25FEC49A76A@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 01:26:51 2006 New Revision: 3918 Log: upload folder changed for attachments Modified: vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/modules/uploads/add2db.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Feb 24 01:26:51 2006 @@ -1180,4 +1180,16 @@ return $count; } +function mkdirs($dir) { +if( is_null($dir) || $dir === "" ){ + return FALSE; +} +if( is_dir($dir) || $dir === "/" ){ + return TRUE; +} +if( mkdirs(dirname($dir), $mode, $recursive) ){ + return mkdir($dir, $mode); +} +return FALSE; +} ?> Modified: vtigercrm/trunk/modules/uploads/add2db.php ============================================================================== --- vtigercrm/trunk/modules/uploads/add2db.php (original) +++ vtigercrm/trunk/modules/uploads/add2db.php Fri Feb 24 01:26:51 2006 @@ -18,7 +18,7 @@ if(!is_dir($directory)) { - if(!mkdir($directory, 0777)) + if(!mkdirs($directory, 0777)) { echo "Access denined to create folder"; die; From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 03:43:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 11:43:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3919 - in /vtigercrm/trunk/modules: Activities/ Campaigns/ Emails/ Faq/ HelpDesk/ Invoice/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/ Message-ID: <20060224114308.02C9B49A1BF@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 04:42:46 2006 New Revision: 3919 Log: * IntialVersion Added: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Faq/FaqAjax.php vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php vtigercrm/trunk/modules/Invoice/InvoiceAjax.php vtigercrm/trunk/modules/Notes/NotesAjax.php vtigercrm/trunk/modules/Potentials/PotentialsAjax.php vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php vtigercrm/trunk/modules/Products/ProductsAjax.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php vtigercrm/trunk/modules/Quotes/QuotesAjax.php vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php vtigercrm/trunk/modules/Vendors/VendorsAjax.php From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 04:23:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:23:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3920 - in /vtigercrm/trunk/modules: Invoice/Invoice.js PurchaseOrder/PurchaseOrder.js Message-ID: <20060224122319.6FA1F49A51C@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:23:13 2006 New Revision: 3920 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Invoice/Invoice.js vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Modified: vtigercrm/trunk/modules/Invoice/Invoice.js ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.js (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.js Fri Feb 24 05:23:13 2006 @@ -337,8 +337,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.product_name.value = product_name; - window.opener.document.EditView.product_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("product_name"); + var fldId = getOpenerObj("product_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.product_name.value = product_name; + //window.opener.document.EditView.product_id.value = product_id; } function set_return_formname_specific(formname,product_id, product_name) { Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Fri Feb 24 05:23:13 2006 @@ -301,8 +301,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.purchaseorder_name.value = product_name; - window.opener.document.EditView.purchaseorder_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("purchaseorder_name"); + var fldId = getOpenerObj("purchaseorder_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.purchaseorder_name.value = product_name; + //window.opener.document.EditView.purchaseorder_id.value = product_id; } function set_return_formname_specific(formname, product_id, product_name) { window.opener.document.EditView1.purchaseorder_name.value = product_name; From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 04:31:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:31:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3921 - in /vtigercrm/trunk/modules: Quotes/Quote.js Vendors/Vendor.js Message-ID: <20060224123142.6927949A7B0@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:31:36 2006 New Revision: 3921 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Quotes/Quote.js vtigercrm/trunk/modules/Vendors/Vendor.js Modified: vtigercrm/trunk/modules/Quotes/Quote.js ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.js (original) +++ vtigercrm/trunk/modules/Quotes/Quote.js Fri Feb 24 05:31:36 2006 @@ -306,8 +306,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.quote_name.value = product_name; - window.opener.document.EditView.quote_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("quote_name"); + var fldId = getOpenerObj("quote_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.quote_name.value = product_name; + //window.opener.document.EditView.quote_id.value = product_id; window.opener.document.EditView.action.value = 'EditView'; window.opener.document.EditView.convertmode.value = 'update_quote_val'; window.opener.document.EditView.submit(); Modified: vtigercrm/trunk/modules/Vendors/Vendor.js ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.js (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.js Fri Feb 24 05:31:36 2006 @@ -115,8 +115,13 @@ function set_return_specific(vendor_id, vendor_name) { - window.opener.document.EditView.vendor_name.value = vendor_name; - window.opener.document.EditView.vendor_id.value = vendor_id; + //getOpenerObj used for DetailView + var fldName = getOpenerObj("vendor_name"); + var fldId = getOpenerObj("vendor_id"); + fldName.value = vendor_name; + fldId.value = vendor_id; + //window.opener.document.EditView.vendor_name.value = vendor_name; + //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_address(vendor_id, vendor_name, street, city, state, code, country,pobox ) From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 04:34:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:34:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3922 - /vtigercrm/trunk/modules/Potentials/Opportunity.js Message-ID: <20060224123442.BE82649A7BD@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:34:34 2006 New Revision: 3922 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js ============================================================================== --- vtigercrm/trunk/modules/Potentials/Opportunity.js (original) +++ vtigercrm/trunk/modules/Potentials/Opportunity.js Fri Feb 24 05:34:34 2006 @@ -75,8 +75,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.potential_name.value = product_name; - window.opener.document.EditView.potential_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("potential_name"); + var fldId = getOpenerObj("potential_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.potential_name.value = product_name; + //window.opener.document.EditView.potential_id.value = product_id; } function add_data_to_relatedlist(entity_id,recordid) { From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 04:38:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:38:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3923 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.js Message-ID: <20060224123836.DC0D049A809@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:38:31 2006 New Revision: 3923 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Fri Feb 24 05:38:31 2006 @@ -223,8 +223,13 @@ function set_return_specific(vendor_id, vendor_name) { - window.opener.document.EditView.vendor_name.value = vendor_name; - window.opener.document.EditView.vendor_id.value = vendor_id; + //getOpenerObj used for DetailView + var fldName = getOpenerObj("vendor_name"); + var fldId = getOpenerObj("vendor_id"); + fldName.value = vendor_name; + fldId.value = vendor_id; + //window.opener.document.EditView.vendor_name.value = vendor_name; + //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_inventory_pb(listprice, fldname) { From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 04:44:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:44:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3924 - in /vtigercrm/trunk/modules: Products/Product.js SalesOrder/SalesOrder.js Message-ID: <20060224124409.00B0049A1BF@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:44:04 2006 New Revision: 3924 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Products/Product.js vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/modules/Products/Product.js ============================================================================== --- vtigercrm/trunk/modules/Products/Product.js (original) +++ vtigercrm/trunk/modules/Products/Product.js Fri Feb 24 05:44:04 2006 @@ -124,8 +124,13 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.product_name.value = product_name; - window.opener.document.EditView.product_id.value = product_id; + //getOpenerObj used for DetailView + var fldName = getOpenerObj("product_name"); + var fldId = getOpenerObj("product_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.product_name.value = product_name; + //window.opener.document.EditView.product_id.value = product_id; } function set_return_formname_specific(formname,product_id, product_name) { Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Fri Feb 24 05:44:04 2006 @@ -307,8 +307,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.salesorder_name.value = product_name; - window.opener.document.EditView.salesorder_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("salesorder_name"); + var fldId = getOpenerObj("salesorder_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.salesorder_name.value = product_name; + //window.opener.document.EditView.salesorder_id.value = product_id; window.opener.document.EditView.action.value = 'EditView'; window.opener.document.EditView.convertmode.value = 'update_so_val'; window.opener.document.EditView.submit(); From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:32:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:32:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3925 - /vtigercrm/trunk/modules/Calendar/index.php Message-ID: <20060224143224.DDD0D49A782@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:32:16 2006 New Revision: 3925 Log: changes made to integrate dayview of calendar Modified: vtigercrm/trunk/modules/Calendar/index.php Modified: vtigercrm/trunk/modules/Calendar/index.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/index.php (original) +++ vtigercrm/trunk/modules/Calendar/index.php Fri Feb 24 07:32:16 2006 @@ -26,7 +26,7 @@ require_once ($theme_path."layout_utils.php"); global $mod_strings; -//include ('modules/Calendar/calendar_day.php'); -include ('modules/Calendar/new_calendar.php'); +include ('modules/Calendar/calendar_day.php'); +//include ('modules/Calendar/new_calendar.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:35:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:35:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3926 - /vtigercrm/trunk/modules/Calendar/index.php Message-ID: <20060224143530.4246749A823@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:35:24 2006 New Revision: 3926 Log: changes made to integrate dayview of calendar Modified: vtigercrm/trunk/modules/Calendar/index.php Modified: vtigercrm/trunk/modules/Calendar/index.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/index.php (original) +++ vtigercrm/trunk/modules/Calendar/index.php Fri Feb 24 07:35:24 2006 @@ -26,7 +26,7 @@ require_once ($theme_path."layout_utils.php"); global $mod_strings; -include ('modules/Calendar/calendar_day.php'); +include ('modules/Calendar/calendar_dayview.php'); //include ('modules/Calendar/new_calendar.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:37:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:37:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3927 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060224143747.BB5DB49A823@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:37:39 2006 New Revision: 3927 Log: calendar_dayview.php has been added for dayview of calendar Added: vtigercrm/trunk/modules/Calendar/calendar_dayview.php From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:46:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:46:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3928 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060224144619.AF0A649A5BC@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:46:14 2006 New Revision: 3928 Log: changes made to remove the link for hours Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Fri Feb 24 07:46:14 2006 @@ -1396,7 +1396,7 @@ } else { - $duration = "%s ". $start ." - ". $end; + $duration = "%s ". $start ." to ". $end; } } if ( $this->repeat != APP_NOREP ) @@ -1409,7 +1409,7 @@ } echo " \n"; - echo " ". $this->getLink($duration) ."\n"; + echo " ". $duration ."\n"; //added from Fredy's patch echo " ". $this->creator ." \n"; From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:53:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:53:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3929 - in /vtigercrm/trunk/themes/blue/images: Calls.gif Meetings.gif Message-ID: <20060224145321.F0F3549A754@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:53:16 2006 New Revision: 3929 Log: old images has been deleted Removed: vtigercrm/trunk/themes/blue/images/Calls.gif vtigercrm/trunk/themes/blue/images/Meetings.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:55:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:55:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3930 - in /vtigercrm/trunk/themes/blue/images: Calls.gif Meetings.gif Message-ID: <20060224145541.E3C6A49A7BC@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:55:31 2006 New Revision: 3930 Log: new images has been included Added: vtigercrm/trunk/themes/blue/images/Calls.gif (with props) vtigercrm/trunk/themes/blue/images/Meetings.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 20:20:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 04:20:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3931 - in /vtigercrm/branches/4.2/adodb: adodb-datadict.inc.php adodb-xmlschema.inc.php Message-ID: <20060225042040.D9A2049A516@vtiger.fosslabs.com> Author: mfedyk Date: Fri Feb 24 21:20:38 2006 New Revision: 3931 Log: port constraints & table type hack for AXMLS from 4.55 to 4.72. close #33 Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Fri Feb 24 21:20:38 2006 @@ -1,5 +1,4 @@ NameQuote($name); } + // temporary for debuging vtiger - GS + + function println($msg) + { + require_once('include/logging.php'); + $log1 =& LoggerManager::getLogger('VT'); + if(is_array($msg)) + { + $log1->fatal("Install ->".print_r($msg,true)); + } + else + { + $log1->fatal("Install ->".$msg); + } + return $msg; + } + + +//---------------- + + // Executes the sql array returned by GetTableSQL and GetIndexSQL function ExecuteSQLArray($sql, $continueOnError = true) { @@ -266,10 +286,18 @@ foreach($sql as $line) { if ($this->debug) $conn->debug = true; + $this->println($line); $ok = $conn->Execute($line); $conn->debug = $saved; if (!$ok) { - if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); + $this->println("Table Creation Error: Query Failed"); + $this->println(" "); + if ($this->debug) + { + + $this->println("InstallError: ".$conn->ErrorMsg()); + ADOConnection::outp($conn->ErrorMsg()); + } if (!$continueOnError) return 0; $rez = 1; } @@ -709,7 +737,7 @@ This function changes/adds new fields to your table. You don't have to know if the col is new or not. It will check on its own. */ - function ChangeTableSQL($tablename, $flds, $tableoptions = false) + function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter { global $ADODB_FETCH_MODE; @@ -726,7 +754,7 @@ if (isset($savem)) $this->connection->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - if ( empty($cols)) { + if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl return $this->CreateTableSQL($tablename, $flds, $tableoptions); } @@ -778,7 +806,33 @@ } } - return $sql; + // GS Fix for constraint impl -- start + if($forceAlter == false) return $sql; + $sqlarray = array(); + + $alter .= implode(",\n", $sql); + if (sizeof($pkey)>0) { + $alter .= ",\n PRIMARY KEY ("; + $alter .= implode(", ",$pkey).")"; + } + + if (isset($tableoptions['CONSTRAINTS'])) + $alter .= "\n".$tableoptions['CONSTRAINTS']; + + if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) + $alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; + + if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName]; + $sqlarray[] = $alter; + + + $taboptions = $this->_Options($tableoptions); + $tsql = $this->_Triggers($this->TableName($tablename),$taboptions); + foreach($tsql as $s) $sqlarray[] = $s; + + // GS Fix for constraint impl -- end + + return $sqlarray; } } // class ?> Modified: vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php Fri Feb 24 21:20:38 2006 @@ -241,6 +241,7 @@ * @access private */ var $drop_field = array(); + var $alter; // GS Fix for constraint impl /** * Iniitializes a new table object. @@ -251,6 +252,11 @@ function dbTable( &$parent, $attributes = NULL ) { $this->parent =& $parent; $this->name = $this->prefix($attributes['NAME']); + // GS Fix for constraint impl + if(isset($attributes['ALTER'])) + { + $this->alter = $attributes['ALTER']; + } } /** @@ -323,12 +329,12 @@ if( isset( $this->current_field ) ) { $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); } else { - $this->addTableOpt( $cdata ); + $this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl } break; // Table option case 'OPT': - $this->addTableOpt( $cdata ); + $this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl break; default: @@ -462,8 +468,9 @@ * @param string $opt Table option * @return array Options */ - function addTableOpt( $opt ) { - $this->opts[] = $opt; + function addTableOpt($key, $opt ) { // GS Fix for constraint impl + //$this->opts[] = $opt; + $this->opts[$key] = $opt; return $this->opts; } @@ -545,7 +552,7 @@ } } - if( empty( $legacy_fields ) ) { + if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl // Create the new table $sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts ); logMsg( end( $sql ), 'Generated CreateTableSQL' ); @@ -556,7 +563,7 @@ // Use ChangeTableSQL case 'ALTER': logMsg( 'Generated ChangeTableSQL (ALTERing table)' ); - $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts ); + $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl break; case 'REPLACE': logMsg( 'Doing upgrade REPLACE (testing)' ); @@ -2218,4 +2225,4 @@ echo ''; } } -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 23:42:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 07:42:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3932 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060225074205.6BCDC49A541@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 00:42:03 2006 New Revision: 3932 Log: Add indexes & fix FK name collisions in DB XML Schema Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sat Feb 25 00:42:03 2006 @@ -1873,19 +1873,7 @@ - ADD CONSTRAINT fk_VendorContactRel FOREIGN KEY (vendorid) REFERENCES vendor(vendorid) ON DELETE CASCADE - - Type=InnoDB - - - -
- - - - - - ADD CONSTRAINT fk_VendorContactRel FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE + ADD CONSTRAINT fk_VendorContactRel2contactid FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -3894,6 +3882,16 @@

+ + + ADD CONSTRAINT fk_VendorContactRel2vendorid FOREIGN KEY (vendorid) REFERENCES vendor(vendorid) ON DELETE CASCADE + + Type=InnoDB + + + +
+ @@ -4055,6 +4053,12 @@ quotestage + + potentialid + + + contactid + Type=InnoDB @@ -4223,7 +4227,15 @@ - + + vendorid + + + quoteid + + + contactid + Type=InnoDB @@ -4247,14 +4259,14 @@

- ADD CONSTRAINT fk_PO2 FOREIGN KEY (quoteid) REFERENCES quotes(quote) ON DELETE CASCADE + ADD CONSTRAINT fk_PO3 FOREIGN KEY (quoteid) REFERENCES quotes(quoteid) ON DELETE CASCADEType=InnoDB

- ADD CONSTRAINT fk_PO3 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE + ADD CONSTRAINT fk_PO4 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -4402,7 +4414,12 @@ - + + vendorid + + + contactid + Type=InnoDB @@ -4426,14 +4443,14 @@

- ADD CONSTRAINT fk_SO2 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE + ADD CONSTRAINT fk_SO3 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADEType=InnoDB

- ADD CONSTRAINT fk_SO3 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE + ADD CONSTRAINT fk_SO4 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -4579,7 +4596,9 @@ - + + purchaseorderid + Type=InnoDB @@ -4752,9 +4771,7 @@ - - cvid - + Type=InnoDB

@@ -4762,6 +4779,7 @@ + @@ -4843,6 +4861,7 @@

+ @@ -4861,8 +4880,7 @@

- ADD CONSTRAINT customaction_FK1 FOREIGN KEY (cvid) REFERENCES customview (cvid) ON DELETE CASCAD -E + ADD CONSTRAINT customaction_FK1 FOREIGN KEY (cvid) REFERENCES customview (cvid) ON DELETE CASCADEType=InnoDB

@@ -4877,12 +4895,14 @@ + Type=InnoDB + @@ -4899,13 +4919,14 @@

- ADD CONSTRAINT selectcolumn_FK1 FOREIGN KEY (QUERYID) REFERENCES selectquery (QUERYID) ON DELETE CASCADE + ADD CONSTRAINT selectcolumn_FK1 FOREIGN KEY (queryid) REFERENCES selectquery (queryid) ON DELETE CASCADEType=InnoDB

+ @@ -4927,7 +4948,7 @@

- ADD CONSTRAINT relcriteria_FK1 FOREIGN KEY (QUERYID) REFERENCES selectquery (QUERYID) ON DELETE CASCADE + ADD CONSTRAINT relcriteria_FK1 FOREIGN KEY (queryid) REFERENCES selectquery (queryid) ON DELETE CASCADEType=InnoDB

@@ -4947,6 +4968,7 @@ + Type=InnoDB @@ -4990,12 +5012,12 @@ - ADD CONSTRAINT report_FK1 FOREIGN KEY (QUERYID) REFERENCES selectquery (QUERYID) ON DELETE CASCADE + ADD CONSTRAINT report_FK1 FOREIGN KEY (queryid) REFERENCES selectquery (queryid) ON DELETE CASCADEType=InnoDB

- ADD CONSTRAINT report_FK2 FOREIGN KEY (FOLDERID) REFERENCES reportfolder (FOLDERID) ON DELETE CASCADE + ADD CONSTRAINT report_FK2 FOREIGN KEY (folderid) REFERENCES reportfolder (folderid) ON DELETE CASCADEType=InnoDB

From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 23:52:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 07:52:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3933 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060225075219.7896449A893@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 00:52:17 2006 New Revision: 3933 Log: Remove foreign keys that point to missing fields. see #34 Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sat Feb 25 00:52:17 2006 @@ -4443,13 +4443,6 @@ - ADD CONSTRAINT fk_SO3 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE - Type=InnoDB - - -
- - ADD CONSTRAINT fk_SO4 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -4615,13 +4608,6 @@

- - ADD CONSTRAINT fk_Invoice2 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE - Type=InnoDB - - -
- From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 00:22:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 08:22:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3934 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060225082221.24D0449A74C@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 01:22:19 2006 New Revision: 3934 Log: remove duplicate indexes in database Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sat Feb 25 01:22:19 2006 @@ -4773,9 +4773,6 @@ - - cvid - columnindex @@ -4897,9 +4894,6 @@ - - queryid - Type=InnoDB

@@ -4926,9 +4920,6 @@ - - queryid - Type=InnoDB @@ -5019,9 +5010,6 @@ - - reportmodulesid - Type=InnoDB From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 00:35:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 08:35:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3935 - /vtigercrm/branches/4.2/include/database/PearDatabase.php Message-ID: <20060225083538.2465749A8E4@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 01:35:31 2006 New Revision: 3935 Log: turn on adodb and AXMLS debugging during install Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Sat Feb 25 01:35:31 2006 @@ -799,12 +799,16 @@ //$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName)); $schema = new adoSchema( $db ); + //Debug Adodb XML Schema + $sehema->XMLS_DEBUG = TRUE; + //Debug Adodb + $sehema->debug = true; $sql = $schema->ParseSchema( $schemaFile ); $this->println("--------------Starting the table creation------------------"); //$this->println($sql); - + //integer ExecuteSchema ([array $sqlArray = NULL], [boolean $continueOnErr = NULL]) $result = $schema->ExecuteSchema( $sql, true ); if($result) print $db->errorMsg(); From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 13:05:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 21:05:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3936 - /vtigercrm/tags/vtigercrm-4.2.4rc1/ Message-ID: <20060225210546.90E0349B100@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 14:05:44 2006 New Revision: 3936 Log: tag vtigercrm-4.2.4rc1 Added: vtigercrm/tags/vtigercrm-4.2.4rc1/ - copied from r3935, vtigercrm/branches/4.2/ From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 08:49:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 16:49:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3937 - in /vtigercrm/branches/4.2/install: 2setConfig.php 4createConfigFile.php config.template.php Message-ID: <20060226164932.569C73D3D12@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 09:49:19 2006 New Revision: 3937 Log: installer use template file Modified: vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/config.template.php Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Sun Feb 26 09:49:19 2006 @@ -17,361 +17,383 @@ * Description: Executes a step in the installation process. ********************************************************************************/ -require_once("connection.php"); - -$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF']; +// TODO: deprecate connection.php file +//require_once("connection.php"); + +// TODO: introduce MySQL port as parameters to use non-default value 3306 +//$sock_path=":" .$mysql_port; +$hostname = $_SERVER['SERVER_NAME']; + +// TODO: introduce Apache port as parameters to use non-default value 80 +//$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF']; +$web_root = $hostname.$_SERVER['PHP_SELF']; $web_root = str_replace("/install.php", "", $web_root); -$web_root = "http://$web_root"; +$web_root = "http://".$web_root; + $current_dir = pathinfo(dirname(__FILE__)); -$current_dir=$current_dir['dirname']."/"; +$current_dir = $current_dir['dirname']."/"; $cache_dir = "cache/"; -// To make MySQL run in desired port -$sock_path=":" .$mysql_port; -$H_NAME=gethostbyaddr($_SERVER['SERVER_ADDR']); - if (is_file("config.php")) { - require_once("config.php"); - session_start(); - - if(isset($upload_maxsize)) - $_SESSION['upload_maxsize'] = $upload_maxsize; - - if(isset($allow_exports)) - $_SESSION['allow_exports'] = $allow_exports; - - if(isset($disable_persistent_connections)) - $_SESSION['disable_persistent_connections'] = $disable_persistent_connections; - - if(isset($default_language)) - $_SESSION['default_language'] = $default_language; - - if(isset($translation_string_prefix)) - $_SESSION['translation_string_prefix'] = $translation_string_prefix; - - if(isset($default_charset)) - $_SESSION['default_charset'] = $default_charset; - - if(isset($languages)) { - // We need to encode the languages in a way that can be retrieved later - $language_keys = Array(); - $language_values = Array(); - - foreach($languages as $key=>$value) { - $language_keys[] = $key; - $language_values[] = $value; - } - - $_SESSION['language_keys'] = urlencode(implode(",",$language_keys)); - $_SESSION['language_values'] = urlencode(implode(",",$language_values)); - } - - global $dbconfig; - - if (isset($_REQUEST['db_hostname'])) - $db_hostname = $_REQUEST['db_hostname']; - elseif (isset($dbconfig['db_hostname'])) - $db_hostname = $dbconfig['db_hostname']; - else - $db_hostname = $H_NAME.$sock_path; - - if (isset($_REQUEST['db_username'])) - $db_username = $_REQUEST['db_username']; - elseif (isset($dbconfig['db_username'])) - $db_username = $dbconfig['db_username']; - else - $db_username = $mysql_username; - - if (isset($_REQUEST['db_password'])) - $db_password = $_REQUEST['db_password']; - elseif (isset($dbconfig['db_password'])) - $db_password = $dbconfig['db_password']; - else - $db_password = $mysql_password; - - if (isset($_REQUEST['db_name'])) - $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name'])) - $db_name = $dbconfig['db_name']; - else - $db_name = 'vtigercrm'; - - !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; - - if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; - else $host_name = $_SERVER['SERVER_NAME']; - - if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL']; - else $site_URL = $web_root; - - if (isset($_REQUEST['root_directory'])) $root_directory = stripslashes($_REQUEST['root_directory']); - else $root_directory = $current_dir; - - if (isset($_REQUEST['cache_dir'])) - $cache_dir= $_REQUEST['cache_dir']; - - if (isset($_REQUEST['mail_server'])) - $mail_server= $_REQUEST['mail_server']; - - if (isset($_REQUEST['mail_server_username'])) - $mail_server_username= $_REQUEST['mail_server_username']; - - if (isset($_REQUEST['mail_server_password'])) - $mail_server_password= $_REQUEST['mail_server_password']; - - if (isset($_REQUEST['admin_email'])) - $admin_email = $_REQUEST['admin_email']; - - if (isset($_REQUEST['admin_password'])) - $admin_password = $_REQUEST['admin_password']; + require_once("config.php"); + session_start(); + + if(isset($upload_maxsize)) + $_SESSION['upload_maxsize'] = $upload_maxsize; + + if(isset($allow_exports)) + $_SESSION['allow_exports'] = $allow_exports; + + if(isset($disable_persistent_connections)) + $_SESSION['disable_persistent_connections'] = $disable_persistent_connections; + + if(isset($default_language)) + $_SESSION['default_language'] = $default_language; + + if(isset($translation_string_prefix)) + $_SESSION['translation_string_prefix'] = $translation_string_prefix; + + if(isset($default_charset)) + $_SESSION['default_charset'] = $default_charset; + + if(isset($languages)) { + // need to encode the languages in a way that can be retrieved later + $language_keys = Array(); + $language_values = Array(); + + foreach($languages as $key=>$value) { + $language_keys[] = $key; + $language_values[] = $value; + } + + $_SESSION['language_keys'] = urlencode(implode(",",$language_keys)); + $_SESSION['language_values'] = urlencode(implode(",",$language_values)); + } + + global $dbconfig; + + if (isset($_REQUEST['db_hostname'])) + $db_hostname = $_REQUEST['db_hostname']; + elseif (isset($dbconfig['db_hostname'])) + $db_hostname = $dbconfig['db_hostname']; + else + $db_hostname = $hostname; +// TODO: introduce MySQL port as parameters to use non-default value 3306 +// else +// $db_hostname = $hostname.$sock_path; + + if (isset($_REQUEST['db_username'])) + $db_username = $_REQUEST['db_username']; + elseif (isset($dbconfig['db_username'])) + $db_username = $dbconfig['db_username']; +// TODO: deprecate connection.php file parameters +// else +// $db_username = $mysql_username; + + if (isset($_REQUEST['db_password'])) + $db_password = $_REQUEST['db_password']; + elseif (isset($dbconfig['db_password'])) + $db_password = $dbconfig['db_password']; +// TODO: deprecate connection.php file parameters +// else +// $db_password = $mysql_password; + + if (isset($_REQUEST['db_name'])) + $db_name = $_REQUEST['db_name']; + elseif (isset($dbconfig['db_name'])) + $db_name = $dbconfig['db_name']; + else + $db_name = 'vtigercrm'; + + !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; + + if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; + else $host_name = $hostname; + + if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL']; + else $site_URL = $web_root; + + if (isset($_REQUEST['root_directory'])) $root_directory = stripslashes($_REQUEST['root_directory']); + else $root_directory = $current_dir; + + if (isset($_REQUEST['cache_dir'])) + $cache_dir= $_REQUEST['cache_dir']; + + if (isset($_REQUEST['mail_server'])) + $mail_server= $_REQUEST['mail_server']; + + if (isset($_REQUEST['mail_server_username'])) + $mail_server_username= $_REQUEST['mail_server_username']; + + if (isset($_REQUEST['mail_server_password'])) + $mail_server_password= $_REQUEST['mail_server_password']; + + if (isset($_REQUEST['admin_email'])) + $admin_email = $_REQUEST['admin_email']; + + if (isset($_REQUEST['admin_password'])) + $admin_password = $_REQUEST['admin_password']; } else { - !isset($_REQUEST['db_hostname']) ? $db_hostname = $H_NAME.$sock_path : $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; - !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; - !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; - !isset($_REQUEST['host_name']) ? $host_name= $_SERVER['SERVER_NAME'] : $host_name= $_REQUEST['host_name']; - !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; - !isset($_REQUEST['root_directory']) ? $root_directory = $current_dir : $root_directory = stripslashes($_REQUEST['root_directory']); - !isset($_REQUEST['cache_dir']) ? $cache_dir = $cache_dir : $cache_dir = stripslashes($_REQUEST['cache_dir']); - !isset($_REQUEST['mail_server']) ? $mail_server = $mail_server : $mail_server = stripslashes($_REQUEST['mail_server']); - !isset($_REQUEST['mail_server_username']) ? $mail_server_username = $mail_server_username : $mail_server_username = stripslashes($_REQUEST['mail_server_username']); - !isset($_REQUEST['mail_server_password']) ? $mail_server_password = $mail_server_password : $mail_server_password = stripslashes($_REQUEST['mail_server_password']); - !isset($_REQUEST['admin_email']) ? $admin_email = "" : $admin_email = $_REQUEST['admin_email']; + !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; + /* + TODO: introduce MySQL port as parameters to use non-default value 3306 + TODO: deprecate connection.php file parameters + !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname.$sock_path : $db_hostname = $_REQUEST['db_hostname']; + !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; + !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; + */ + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; + !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; + !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; + !isset($_REQUEST['root_directory']) ? $root_directory = $current_dir : $root_directory = stripslashes($_REQUEST['root_directory']); + !isset($_REQUEST['cache_dir']) ? $cache_dir = $cache_dir : $cache_dir = stripslashes($_REQUEST['cache_dir']); + !isset($_REQUEST['mail_server']) ? $mail_server = $mail_server : $mail_server = stripslashes($_REQUEST['mail_server']); + !isset($_REQUEST['mail_server_username']) ? $mail_server_username = $mail_server_username : $mail_server_username = stripslashes($_REQUEST['mail_server_username']); + !isset($_REQUEST['mail_server_password']) ? $mail_server_password = $mail_server_password : $mail_server_password = stripslashes($_REQUEST['mail_server_password']); + !isset($_REQUEST['admin_email']) ? $admin_email = "" : $admin_email = $_REQUEST['admin_email']; } ?> - + -vtigerCRM 4.x Installer: Step 2 - + vtigerCRM 4.x Installer: Step 2 + - - +
+ + -

Step 2 of 5

- - - + +
+ + + + - - - - - - + + + + + + +
- - - -
- - - - - -
System Configuration
-
-
-
Please enter your database configuration information below...
- - If you do not have root access to your database (for example you are installing in a virtual - hosting environment), you will need to have your database created for you before you proceed. - However, this installer will still be able to create the necessary database tables.
- -
If you unsure of your database host, username or password, we suggest that you use the default - values below.
-
- - -
* Required field
- - - - -
Database Configuration
- - - - - - - - - - - - - - - - - - + + + + + +
Host Name ^* " />
User Name ^* " />
Password ^* " />
Database Name ^* " />
+ + + + + + + +
System Configuration
+
+
+
Please enter your database configuration information below...
+
+ If you do not have root access to your database (for example you are installing in a virtual hosting environment),
+ you will need to have your database created for you before you proceed.
+ However, this installer will still be able to create the necessary database tables. +
+
If you unsure of your database host, username or password, we suggest that you use the default values below.
+
+ + +
* Required field
+ + + + + +
Database Configuration
+ + + + + + + + + + + + + + + + + + - -
Host Name ^* + " />
User Name ^* + " />
Password ^* + " />
Database Name ^* " />
+ ?>"> +
-
- - - +
Site Configuration
+ + +
Site Configuration

- + + value="" size="40" /> + - +

URL ^* URL ^* -
Path ^* " size="40" />
Path to Cache Directory ^*
(must be writable)

- - + +
Admin Configuration
Admin Configuration

- - +
+ - + - - + + -
username admin
password^*
password^* ">
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later in vtigerCRM
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later in vtigerCRM
+ - + -

+

Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 09:49:19 2006 @@ -28,52 +28,52 @@ $release_date = "23 December 2005"; if (isset($_REQUEST['db_hostname'])) - $db_hostname = $_REQUEST['db_hostname']; + $db_hostname = $_REQUEST['db_hostname']; if (isset($_REQUEST['db_username'])) - $db_username = $_REQUEST['db_username']; + $db_username = $_REQUEST['db_username']; if (isset($_REQUEST['db_password'])) - $db_password = $_REQUEST['db_password']; + $db_password = $_REQUEST['db_password']; if (isset($_REQUEST['db_name'])) - $db_name = $_REQUEST['db_name']; + $db_name = $_REQUEST['db_name']; if (isset($_REQUEST['db_drop_tables'])) - $db_drop_tables = $_REQUEST['db_drop_tables']; + $db_drop_tables = $_REQUEST['db_drop_tables']; if (isset($_REQUEST['db_create'])) - $db_create = $_REQUEST['db_create']; + $db_create = $_REQUEST['db_create']; if (isset($_REQUEST['db_populate'])) - $db_populate = $_REQUEST['db_populate']; + $db_populate = $_REQUEST['db_populate']; if (isset($_REQUEST['site_URL'])) - $site_URL = $_REQUEST['site_URL']; + $site_URL = $_REQUEST['site_URL']; if (isset($_REQUEST['admin_email'])) - $admin_email = $_REQUEST['admin_email']; + $admin_email = $_REQUEST['admin_email']; if (isset($_REQUEST['admin_password'])) - $admin_password = $_REQUEST['admin_password']; + $admin_password = $_REQUEST['admin_password']; if (isset($_REQUEST['mail_server'])) - $mail_server = $_REQUEST['mail_server']; + $mail_server = $_REQUEST['mail_server']; if (isset($_REQUEST['mail_server_username'])) - $mail_server_username = $_REQUEST['mail_server_username']; + $mail_server_username = $_REQUEST['mail_server_username']; if (isset($_REQUEST['mail_server_password'])) - $mail_server_password = $_REQUEST['mail_server_password']; + $mail_server_password = $_REQUEST['mail_server_password']; if (isset($_REQUEST['ftpserver'])) - $ftpserver = $_REQUEST['ftpserver']; + $ftpserver = $_REQUEST['ftpserver']; if (isset($_REQUEST['ftpuser'])) - $ftpuser = $_REQUEST['ftpuser']; + $ftpuser = $_REQUEST['ftpuser']; if (isset($_REQUEST['ftppassword'])) - $ftppassword = $_REQUEST['ftppassword']; + $ftppassword = $_REQUEST['ftppassword']; $cache_dir = 'cache/'; @@ -81,276 +81,139 @@ - - -vtigerCRM 4.x Installer: Step 4 - + + + vtigerCRM 4.x Installer: Step 4 + - - - - - +

Step 4 of 5

+ + + + + + + +

Step 4 of 5

+ + + + -

+ + + + + + +

+ + + + + + + +

Create configuration file

- - - - - - + + + + + +

- - -

- - - -

Create Config File

'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');\n"; -$config .= "\n"; -$config .= "// default_module default value = Home\n"; -$config .= "\$default_module = 'Home';\n"; -$config .= "\n"; -$config .= "// default_action default value = index\n"; -$config .= "\$default_action = 'index';\n"; -$config .= "\n"; -$config .= "// set default theme\n"; -$config .= "// default_theme default value = blue\n"; -$config .= "\$default_theme = 'blue';\n"; -$config .= "\n"; -$config .= "// show or hide time to compose each page\n"; -$config .= "// calculate_response_time default value = true\n"; -$config .= "\$calculate_response_time = true;\n"; -$config .= "\n"; -$config .= "// default text that is placed initially in the login form for user name\n"; -$config .= "// no default_user_name default value\n"; -$config .= "\$default_user_name = '';\n"; -$config .= "\n"; -$config .= "// default text that is placed initially in the login form for password\n"; -$config .= "// no default_password default value\n"; -$config .= "\$default_password = '';\n"; -$config .= "\n"; -$config .= "// create user with default username and password\n"; -$config .= "// create_default_user default value = false\n"; -$config .= "\$create_default_user = false;\n"; -$config .= "// default_user_is_admin default value = false\n"; -$config .= "\$default_user_is_admin = false;\n"; -$config .= "\n"; -$config .= "// if your MySQL/PHP configuration does not support persistent connections set this to true to avoid a large performance slowdown\n"; -$config .= "// disable_persistent_connections default value = false\n"; -$config .= "\$disable_persistent_connections = ".return_session_value_or_default('disable_persistent_connections', 'false').";\n"; -$config .= "\n"; -$config .= "// defined languages available. the key must be the language file prefix. (Example 'en_us' is the prefix for every 'en_us.lang.php' file)\n"; -$config .= "// languages default value = en_us=>US English\n"; - -$language_value = "Array('en_us'=>'US English',)"; - -if(isset($_SESSION['language_keys']) && isset($_SESSION['language_values'])) { - $language_value = 'Array('; - $language_keys = explode(',', urldecode($_SESSION['language_keys'])); - $language_values = explode(',', urldecode($_SESSION['language_values'])); - $size = count($language_keys); - - for($i = 0; $i < $size; $i+=1) - $language_value .= "'$language_keys[$i]'=>'$language_values[$i]',"; - - $language_value .= ')'; + $is_writable = is_writable('.'); + +/* open template configuration file read only */ +$templateFilename = $root_directory."install/config.template.php"; +$templateHandle = fopen($templateFilename, "r"); +if($templateHandle) { + /* open include configuration file write only */ + $includeFilename = $root_directory."config.php"; + $includeHandle = fopen($includeFilename, "w"); + if($includeHandle) { + while (!feof($templateHandle)) { + $buffer = fgets($templateHandle); + /* TODO: add missing parameters + $vtiger_version = '".$vtiger_version."';\n"; + $release_date = '".$release_date."';\n"; + $dbconfig['db_hostname'] = '".$db_hostname."';\n"; + $dbconfig['db_username'] = '".$db_username."';\n"; + $dbconfig['db_password'] = '".$db_password."';\n"; + $dbconfig['db_name'] = '".$db_name."';\n"; + $host_name = '".$db_hostname."';\n"; + $site_URL = '".$site_URL."';\n"; + $root_directory = '".$root_directory."';\n"; + $cache_dir = '$cache_dir';\n"; + $mail_server = '$mail_server';\n"; + $mail_server_username = '$mail_server_username';\n"; + $mail_server_password = '$mail_server_password';\n"; + $tmp_dir = '" . ($cache_dir . "images/") . "';\n"; + $import_dir = '" . ($cache_dir . "import/") . "';\n"; + $upload_dir = '" . ($cache_dir . "upload/") . "';\n"; + // includeDirectory default value = $root_directory.'include/\n"; + $languages = $language_value;\n"; + */ + /* replace _DBC_ variable */ + $buffer = str_replace( "_DBC_SERVER_", $db_hostname, $buffer); + $buffer = str_replace( "_DBC_PORT_", "3306", $buffer); + $buffer = str_replace( "_DBC_USER_", $db_username, $buffer); + $buffer = str_replace( "_DBC_PASS_", $db_password, $buffer); + $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); + $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); + + fwrite($includeHandle, $buffer); + } + + fclose($includeHandle); + } + + fclose($templateHandle); } -$config .= "\$languages = $language_value;\n"; -$config .= "\n"; -$config .= "// default charset\n"; -$config .= "// default charset default value = ISO-8859-1\n"; -$config .= "\$default_charset = '".return_session_value_or_default('default_charset','ISO-8859-1')."';\n"; -$config .= "\n"; -$config .= "// default language\n"; -$config .= "// default_language default value = en_us\n"; -$config .= "\$default_language = '".return_session_value_or_default('default_language','en_us')."';\n"; -$config .= "\n"; -$config .= "// add the language pack name to every translation string in the display.\n"; -$config .= "// translation_string_prefix default value = false\n"; -$config .= "\$translation_string_prefix = ".return_session_value_or_default('translation_string_prefix','false').";\n"; -$config .= "\n"; -//$config .= "// forum configurations\n"; -//$config .= "\$dbms = 'mysql';\n"; -//$config .= "\$dbhost = '".$db_hostname."';\n\n"; -//$config .= "\$dbuser = '".$db_username."';\n\n"; -//$config .= "\$dbpasswd = '".$db_password."';\n\n"; -//$config .= "\$dbname= '".$db_name."';\n\n"; -//$config .= "\$table_prefix = 'phpbb_';\n"; -//$config .= "define('PHPBB_INSTALLED', true);\n"; -$config .= "?>"; - -if ($is_writable && ($config_file = @ fopen("config.php", "w"))) { - fputs($config_file, $config, strlen($config)); - fclose($config_file); - - echo "
"; - echo "

"; - echo "

Successfully created config file (config.php) in :

".$root_directory."\n"; - echo "

"; +if ($templateHandle && $includeHandle) { + echo "
"; + echo "

"; + echo "

Successfully created configuration file (config.php) in :

".$root_directory."\n"; + echo "

"; } else { - echo ""; + echo "

"; - echo "Cannot write to config.php file in the directory ".$root_directory." file.\n"; - echo "

You can continue this installation by manually creating the config.php file and pasting the configuration information below into the config.php file. However, you must create the config.php file before you continue to the next step.

\n"; - echo "".$config.""; - echo "

Did you remember to create the config.php file?

"; } ?> - - -

"; + echo "Cannot write configuration file (config.php ) in the directory ".$root_directory.".\n"; + echo "

You can continue this installation by manually creating the config.php file and pasting the configuration information below inside.However, you must create the configuration file before you continue to the next step.

\n"; + echo "".$config.""; + echo "

Did you remember to create the config.php file?

- -

- + +

+ +

+ - Modified: vtigercrm/branches/4.2/install/config.template.php ============================================================================== --- vtigercrm/branches/4.2/install/config.template.php (original) +++ vtigercrm/branches/4.2/install/config.template.php Sun Feb 26 09:49:19 2006 @@ -43,7 +43,7 @@ */ $dbconfig['db_server'] = '_DBC_SERVER_'; -// TODO test if port is empty +// TODO: test if port is empty $dbconfig['db_port'] = ':_DBC_PORT_'; $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; $dbconfig['db_username'] = '_DBC_USER_'; @@ -51,7 +51,7 @@ $dbconfig['db_name'] = '_DBC_NAME_'; // db_type default value = mysql -$dbconfig['db_type'] = '_DBC_TYPE'; +$dbconfig['db_type'] = '_DBC_TYPE_'; // log_sql default value = false $dbconfig['log_sql'] = false; From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 10:38:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 18:38:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3938 - in /vtigercrm/branches/4.2: install/4createConfigFile.php install/config.template.php vtigerpatch.php vtigerversion.php Message-ID: <20060226183846.AEA1749E29F@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 11:38:42 2006 New Revision: 3938 Log: Put vtiger version and release date only in vtigerversion.php Modified: vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/config.template.php vtigercrm/branches/4.2/vtigerpatch.php vtigercrm/branches/4.2/vtigerversion.php Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 11:38:42 2006 @@ -20,12 +20,9 @@ ********************************************************************************/ require_once('include/utils.php'); +include('vtigerversion.php'); session_start(); - -// vtigerCRM version number; do not edit! -$vtiger_version = "4.2.3"; -$release_date = "23 December 2005"; if (isset($_REQUEST['db_hostname'])) $db_hostname = $_REQUEST['db_hostname']; @@ -131,11 +128,11 @@ $is_writable = is_writable('.'); /* open template configuration file read only */ -$templateFilename = $root_directory."install/config.template.php"; +$templateFilename = 'install/config.template.php'; $templateHandle = fopen($templateFilename, "r"); if($templateHandle) { /* open include configuration file write only */ - $includeFilename = $root_directory."config.php"; + $includeFilename = 'config.php'; $includeHandle = fopen($includeFilename, "w"); if($includeHandle) { while (!feof($templateHandle)) { Modified: vtigercrm/branches/4.2/install/config.template.php ============================================================================== --- vtigercrm/branches/4.2/install/config.template.php (original) +++ vtigercrm/branches/4.2/install/config.template.php Sun Feb 26 11:38:42 2006 @@ -1,4 +1,4 @@ - *** This Patch cannot be applied for vtiger CRM versions other than 4.2! *** "); } Modified: vtigercrm/branches/4.2/vtigerversion.php ============================================================================== --- vtigercrm/branches/4.2/vtigerversion.php (original) +++ vtigercrm/branches/4.2/vtigerversion.php Sun Feb 26 11:38:42 2006 @@ -11,5 +11,6 @@ $patch_version = ''; $modified_database = ''; -$vtiger_current_version = '4.2.3'; +$vtiger_version = '4.2.3'; +$release_date = '23 December 2005'; ?> From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 11:47:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 19:47:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3939 - in /vtigercrm/branches/4.2: config.db.php config.inc.php config.template.php install/4createConfigFile.php install/config.template.php Message-ID: <20060226194728.77EA1498302@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 12:47:23 2006 New Revision: 3939 Log: Introduce files needed for ticket #20 Added: vtigercrm/branches/4.2/config.db.php vtigercrm/branches/4.2/config.template.php - copied unchanged from r3938, vtigercrm/branches/4.2/install/config.template.php Removed: vtigercrm/branches/4.2/install/config.template.php Modified: vtigercrm/branches/4.2/config.inc.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/config.inc.php ============================================================================== --- vtigercrm/branches/4.2/config.inc.php (original) +++ vtigercrm/branches/4.2/config.inc.php Sun Feb 26 12:47:23 2006 @@ -3,5 +3,5 @@ * The configuration file for FHS system * is located at /etc/vtigercrm directory. */ - include('config.inc.php'); + include('config.inc.php'); ?> Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 12:47:23 2006 @@ -128,7 +128,7 @@ $is_writable = is_writable('.'); /* open template configuration file read only */ -$templateFilename = 'install/config.template.php'; +$templateFilename = 'config.template.php'; $templateHandle = fopen($templateFilename, "r"); if($templateHandle) { /* open include configuration file write only */ From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 13:04:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 21:04:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3940 - in /vtigercrm/branches/4.2: config.db.php config.inc.php config.php index.php install.php install/1checkSystem.php install/2setConfig.php install/4createConfigFile.php install/5createTables.php Message-ID: <20060226210424.0E78849E2A5@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 14:04:18 2006 New Revision: 3940 Log: config.inc.php is configuration file included by config.php Modified: vtigercrm/branches/4.2/config.db.php vtigercrm/branches/4.2/config.inc.php vtigercrm/branches/4.2/config.php vtigercrm/branches/4.2/index.php vtigercrm/branches/4.2/install.php vtigercrm/branches/4.2/install/1checkSystem.php vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/config.db.php ============================================================================== --- vtigercrm/branches/4.2/config.db.php (original) +++ vtigercrm/branches/4.2/config.db.php Sun Feb 26 14:04:18 2006 @@ -5,4 +5,6 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_' + + $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; ?> Modified: vtigercrm/branches/4.2/config.inc.php ============================================================================== --- vtigercrm/branches/4.2/config.inc.php (original) +++ vtigercrm/branches/4.2/config.inc.php Sun Feb 26 14:04:18 2006 @@ -1,7 +1,71 @@ Modified: vtigercrm/branches/4.2/config.php ============================================================================== --- vtigercrm/branches/4.2/config.php (original) +++ vtigercrm/branches/4.2/config.php Sun Feb 26 14:04:18 2006 @@ -1,71 +1,7 @@ Modified: vtigercrm/branches/4.2/index.php ============================================================================== --- vtigercrm/branches/4.2/index.php (original) +++ vtigercrm/branches/4.2/index.php Sun Feb 26 14:04:18 2006 @@ -350,24 +350,24 @@ // Create or reestablish the current session session_start(); -if (!is_file('config.php')) { - header("Location: install.php"); - exit(); -} - -require_once('config.php'); +if (!is_file('config.inc.php')) { + header("Location: install.php"); + exit(); +} + +require_once('config.inc.php'); if (!isset($dbconfig['db_hostname'])) { - header("Location: install.php"); - exit(); -} - -// load up the config_override.php file. This is used to provide default user settings -if (is_file('config_override.php')) -{ - require_once('config_override.php'); -} + header("Location: install.php"); + exit(); +} + +// load up the config.override.php file +// used to provide default user settings +if (is_file('config.override.php')) + require_once('config.override.php'); + $default_config_values = Array( "allow_exports"=>"all","upload_maxsize"=>"3000000" ); - + set_default_config($default_config_values); require_once('include/logging.php'); require_once('modules/Users/User.php'); Modified: vtigercrm/branches/4.2/install.php ============================================================================== --- vtigercrm/branches/4.2/install.php (original) +++ vtigercrm/branches/4.2/install.php Sun Feb 26 14:04:18 2006 @@ -18,24 +18,26 @@ ********************************************************************************/ if (substr(phpversion(), 0, 1) == "5") { - ini_set("zend.ze1_compatibility_mode", "1"); + ini_set("zend.ze1_compatibility_mode", "1"); } function stripslashes_checkstrings($value) { - if(is_string($value)) { - return stripslashes($value); - } - return $value; + if(is_string($value)) + return stripslashes($value); + + return $value; } if(get_magic_quotes_gpc() == 1) { - $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST); - $_POST = array_map("stripslashes_checkstrings", $_POST); - $_GET = array_map("stripslashes_checkstrings", $_GET); + $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST); + $_POST = array_map("stripslashes_checkstrings", $_POST); + $_GET = array_map("stripslashes_checkstrings", $_GET); } -if (isset($_POST['file'])) $the_file = $_POST['file']; -else $the_file = "0welcome.php"; +if (isset($_POST['file'])) + $the_file = $_POST['file']; +else + $the_file = "0welcome.php"; include("install/".$the_file); Modified: vtigercrm/branches/4.2/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/4.2/install/1checkSystem.php (original) +++ vtigercrm/branches/4.2/install/1checkSystem.php Sun Feb 26 14:04:18 2006 @@ -173,9 +173,9 @@ - config.php - - Writeable":"Not Writeable"; ?> + config.inc.php + + Writeable":"Not Writeable"; ?> Cache Directory (cache/) Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Sun Feb 26 14:04:18 2006 @@ -34,7 +34,7 @@ $current_dir = $current_dir['dirname']."/"; $cache_dir = "cache/"; -if (is_file("config.php")) { +if (is_file("config.php") && is_file("config.inc.php")) { require_once("config.php"); session_start(); Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 14:04:18 2006 @@ -122,8 +122,8 @@ if (isset($_REQUEST['root_directory'])) $root_directory = $_REQUEST['root_directory']; -if (is_file('config.php')) - $is_writable = is_writable('config.php'); +if (is_file('config.inc.php')) + $is_writable = is_writable('config.inc.php'); else $is_writable = is_writable('.'); @@ -132,7 +132,7 @@ $templateHandle = fopen($templateFilename, "r"); if($templateHandle) { /* open include configuration file write only */ - $includeFilename = 'config.php'; + $includeFilename = 'config.inc.php'; $includeHandle = fopen($includeFilename, "w"); if($includeHandle) { while (!feof($templateHandle)) { @@ -176,16 +176,16 @@ if ($templateHandle && $includeHandle) { echo "
"; + echo "

Successfully created configuration file (config.inc.php) in :

"; echo "

"; - echo "

Successfully created configuration file (config.php) in :

".$root_directory."\n"; echo "

"; } else { echo ""; + echo "

Did you remember to create the config.inc.php file ?"; } ?> Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Sun Feb 26 14:04:18 2006 @@ -61,9 +61,9 @@ require_once('include/utils.php'); require_once('modules/Users/Security.php'); -// load the config_override.php file to provide default user settings -if (is_file("config_override.php")) { - require_once("config_override.php"); +// load the config.override.php file to provide default user settings +if (is_file("config.override.php")) { + require_once("config.override.php"); } $db = new PearDatabase(); From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 14:17:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 22:17:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3941 - in /vtigercrm/branches/4.2: config.template.php install/4createConfigFile.php Message-ID: <20060226221739.DE51F3F325C@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 15:17:36 2006 New Revision: 3941 Log: added missing parameters in template file Modified: vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Sun Feb 26 15:17:36 2006 @@ -41,16 +41,14 @@ db_name */ +// TODO: test if port is empty $dbconfig['db_server'] = '_DBC_SERVER_'; -// TODO: test if port is empty $dbconfig['db_port'] = ':_DBC_PORT_'; -$dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; $dbconfig['db_username'] = '_DBC_USER_'; $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; - -// db_type default value = mysql $dbconfig['db_type'] = '_DBC_TYPE_'; +$dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; // log_sql default value = false $dbconfig['log_sql'] = false; @@ -75,20 +73,26 @@ $host_name = $dbconfig['db_hostname']; $site_URL = 'http://'.$dbconfig['db_server'].'/vtigercrm'; -$root_directory = '/var/www/vtigercrm'; -$cache_dir = 'cache/'; -$mail_server = ''; -$mail_server_username = ''; -$mail_server_password = ''; + +// root directory path +$root_directory = '_VT_ROOTDIR_'; + +// cache direcory path +$cache_dir = '_VT_CACHEDIR_'; // tmp_dir default value prepended by cache_dir = images/ -$tmp_dir = 'cache/images/'; +$tmp_dir = '_VT_TMPDIR_'; -// import_dir default value prepended by cache_dir = import/ -$import_dir = 'cache/import/'; +// import_dir default value prepended by cache_dir = import/ +$import_dir = '_VT_IMPORTDIR_'; // upload_dir default value prepended by cache_dir = upload/ -$upload_dir = 'cache/upload/'; +$upload_dir = '_VT_UPLOADDIR_'; + +// mail server parameters +$mail_server = '_MAIL_SERVER_'; +$mail_server_username = '_MAIL_USERNAME_'; +$mail_server_password = '_MAIL_PASSWORD_'; // maximum file size for uploaded files in bytes also used when uploading import files // upload_maxsize default value = 3000000 @@ -106,7 +110,7 @@ $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 = /var/www/vtigercrm/.'include/ +// includeDirectory default value = $root_directory..'include/ $includeDirectory = $root_directory.'include/'; // list_max_entries_per_page default value = 20 Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 15:17:36 2006 @@ -137,26 +137,7 @@ if($includeHandle) { while (!feof($templateHandle)) { $buffer = fgets($templateHandle); - /* TODO: add missing parameters - $vtiger_version = '".$vtiger_version."';\n"; - $release_date = '".$release_date."';\n"; - $dbconfig['db_hostname'] = '".$db_hostname."';\n"; - $dbconfig['db_username'] = '".$db_username."';\n"; - $dbconfig['db_password'] = '".$db_password."';\n"; - $dbconfig['db_name'] = '".$db_name."';\n"; - $host_name = '".$db_hostname."';\n"; - $site_URL = '".$site_URL."';\n"; - $root_directory = '".$root_directory."';\n"; - $cache_dir = '$cache_dir';\n"; - $mail_server = '$mail_server';\n"; - $mail_server_username = '$mail_server_username';\n"; - $mail_server_password = '$mail_server_password';\n"; - $tmp_dir = '" . ($cache_dir . "images/") . "';\n"; - $import_dir = '" . ($cache_dir . "import/") . "';\n"; - $upload_dir = '" . ($cache_dir . "upload/") . "';\n"; - // includeDirectory default value = $root_directory.'include/\n"; - $languages = $language_value;\n"; - */ + /* replace _DBC_ variable */ $buffer = str_replace( "_DBC_SERVER_", $db_hostname, $buffer); $buffer = str_replace( "_DBC_PORT_", "3306", $buffer); @@ -164,6 +145,16 @@ $buffer = str_replace( "_DBC_PASS_", $db_password, $buffer); $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); + /* replace dir variable */ + $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer); + $buffer = str_replace( "_VT_CACHEDIR_", $cache_dir, $buffer); + $buffer = str_replace( "_VT_TMPDIR_", $cache_dir."images/", $buffer); + $buffer = str_replace( "_VT_IMPORTDIR_", $cache_dir."import/", $buffer); + $buffer = str_replace( "_VT_UPLOADDIR_", $cache_dir."upload/", $buffer); + /* replace mail variable */ + $buffer = str_replace( "_MAIL_SERVER_", $mail_server, $buffer); + $buffer = str_replace( "_MAIL_USERNAME_", $mail_server_username, $buffer); + $buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer); fwrite($includeHandle, $buffer); } From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 20:57:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 04:57:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3942 - in /vtigercrm/branches/4.2: install.php install/5createTables.inc.php install/5createTables.php Message-ID: <20060227045730.7BA8649E34F@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 21:57:27 2006 New Revision: 3942 Log: create install/5createTables.inc.php and modify install.php to use it when called from the command line. see #28 Added: vtigercrm/branches/4.2/install/5createTables.inc.php - copied, changed from r3915, vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/install.php vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/install.php ============================================================================== --- vtigercrm/branches/4.2/install.php (original) +++ vtigercrm/branches/4.2/install.php Sun Feb 26 21:57:27 2006 @@ -34,6 +34,12 @@ $_GET = array_map("stripslashes_checkstrings", $_GET); } +//Run command line if no web var detected +if (!isset($_SERVER['REQUEST_METHOD'])) { + require("install/5createTables.inc.php"); + exit; +} + if (isset($_POST['file'])) $the_file = $_POST['file']; else Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Sun Feb 26 21:57:27 2006 @@ -37,170 +37,7 @@ if (isset($_REQUEST['admin_password'])) $admin_password = $_REQUEST['admin_password']; -$new_tables = 0; - -require_once('include/database/PearDatabase.php'); -require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Settings/FileStorage.php'); -//require_once('modules/imports/Headers.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Activities/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); -require_once('modules/Import/SugarFile.php'); -require_once('modules/Import/ImportMap.php'); -require_once('modules/Import/UsersLastImport.php'); -require_once('modules/Users/TabMenu.php'); -require_once('modules/Users/LoginHistory.php'); -require_once('modules/Settings/FileStorage.php'); -require_once('data/Tracker.php'); -require_once('include/utils.php'); -require_once('modules/Users/Security.php'); - -// load the config.override.php file to provide default user settings -if (is_file("config.override.php")) { - require_once("config.override.php"); -} - -$db = new PearDatabase(); - -$log =& LoggerManager::getLogger('create_table'); - -function createSchemaTable() { - global $log; - - // create the schema tables - $query = "CREATE TABLE modules (id int(11) NOT NULL auto_increment, name text,PRIMARY KEY ( ID ))"; - - $this->query($query); -} - -function createObjectTable() { - global $log; - - // create the object tables - $query = "CREATE TABLE objects (module_id int(11), name text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -function createAttributesTable() { - global $log; - - // create the attributes tables - $query = "CREATE TABLE attributes (module_id int(11), object_name text, name text, PRIMARY KEY ( module_id, object_name ))"; - // fk module_id, object_name -> object table. - - $this->query($query); -} - -function createLabelsTable() { - global $log; - - // create the translation tables - $query = "CREATE TABLE labels (module_id int(11), name text, value text, value_long text, value_popup text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -// drop old tables if table exists and told to drop it -function drop_table_install(&$focus) { - global $log, $db; - - $result = $db->requireSingleResult("SHOW TABLES LIKE '".$focus->table_name."'"); - - if (!empty($result)) { - $focus->drop_tables(); - $log->info("Dropped old ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Did not need to drop old ".$focus->table_name." table. It doesn't exist."); - return 0; - } -} - -// create new tables if they don't exist. -function create_table_install(&$focus) { - global $log, $db; - - $result = $db->query("SHOW TABLES LIKE '".$focus->table_name."'"); - - if ($db->getRowCount($result) == 0) { - $focus->create_tables(); - $log->info("Created ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Table ".$focus->table_name." already exists."); - return 0; - } -} - -function create_default_users() { - global $log, $db; - global $admin_email; - global $admin_password; - global $create_default_user; - global $default_user_name; - global $default_password; - global $default_user_is_admin; - - // create default admin user - $user = new User(); - $user->last_name = 'Administrator'; - $user->user_name = 'admin'; - $user->status = 'Active'; - $user->is_admin = 'on'; - $user->user_password = $user->encrypt_password($admin_password); - $user->tz = 'Europe/Berlin'; - $user->holidays = 'de,en_uk,fr,it,us,'; - $user->workdays = '0,1,2,3,4,5,6,'; - $user->weekstart = '1'; - $user->namedays = ''; - $user->date_format = 'yyyy-mm-dd'; - $user->email = $admin_email; - $user->save(); - - // we need to change the admin user to a fixed id of 1. - //$query = "update users set id='1' where user_name='$user->user_name'"; - //$result = $db->query($query, true, "Error updating admin user ID: "); - - $log->info("Created ".$user->table_name." table. for user $user->id"); - - if($create_default_user) { - $default_user = new User(); - $default_user->last_name = $default_user_name; - $default_user->user_name = $default_user_name; - $default_user->status = 'Active'; - - if (isset($default_user_is_admin) && $default_user_is_admin) - $default_user->is_admin = 'on'; - - $default_user->user_password = $default_user->encrypt_password($default_password); - $default_user->tz = 'Europe/Berlin'; - $default_user->holidays = 'de,en_uk,fr,it,us,'; - $default_user->workdays = '0,1,2,3,4,5,6,'; - $default_user->weekstart = '1'; - $default_user->namedays = ''; - $default_user->save(); - } - - // insert values into user2role table - $role_query = "select roleid from role where name='administrator'"; - $db->database->SetFetchMode(ADODB_FETCH_ASSOC); - $role_result = $db->query($role_query); - $role_id = $db->query_result($role_result,0,"roleid"); - - $sql_stmt1 = "insert into user2role values(".$user->id.",".$role_id.")"; - $db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); -} ?> - @@ -237,193 +74,14 @@

From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 20:58:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 04:58:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3943 - /vtigercrm/branches/4.2/install/5createTables.inc.php Message-ID: <20060227045858.3EE0D49E34F@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 21:58:56 2006 New Revision: 3943 Log: output one less line to compensate for create_default_users(). see #40 Modified: vtigercrm/branches/4.2/install/5createTables.inc.php Modified: vtigercrm/branches/4.2/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.inc.php (original) +++ vtigercrm/branches/4.2/install/5createTables.inc.php Sun Feb 26 21:58:56 2006 @@ -257,7 +257,7 @@ $focus->create_tables(); // inserts only rows eecho (", "); } -eecho ("Done.\n"); +eecho ("Done."); /* if ($new_tables) From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 21:19:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 05:19:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3944 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060227051909.236643F4703@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 22:19:07 2006 New Revision: 3944 Log: remove primary key markers on several fields and use indexes instead. Cought by briand and extended by mfedyk. closes #39 Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sun Feb 26 22:19:07 2006 @@ -4765,7 +4765,7 @@

"; - echo "Cannot write configuration file (config.php ) in the directory ".$root_directory.".\n"; - echo "

\n"; + echo "Cannot write configuration file (config.inc.php ) in the directory ".$root_directory.".\n"; + echo "

You can continue this installation by manually creating the config.inc.php file and pasting the configuration information below inside.However, you must create the configuration file before you continue to the next step.

\n"; echo "".$config.""; - echo "

Did you remember to create the config.php file?

createTables("schema/DatabaseSchema.xml"); - -// TODO HTML -if($success==0) - print("Tables not created"); -else if($success==1) - print("Tables partially created"); -else - print("Tables Successfully created"); - -foreach ( $modules as $module ) { - $focus = new $module(); - - /* - if ($db_drop_tables == true ) { - $existed = drop_table_install($focus); - - if ($existed) - echo "Dropped existing ".$focus->table_name." table
\n"; - else - echo "Table ".$focus->table_name." does not exist
\n"; - } - - $success = create_table_install($focus); - - if ( $success) { - echo "Created new ".$focus->table_name." table
\n"; - - if ( $module == "User") - $new_tables = 1; - } - else - echo "Table ".$focus->table_name." already exists
\n"; - */ - - $focus->create_tables(); // inserts only rows -} - -/* -if ($new_tables) - create_default_users(); -*/ - -/* -if($success==2) { -*/ - create_default_users(); -//} - -// populate users table -$uid = $db->getUniqueID("users"); -$sql_stmt1 = "insert into users(id,user_name,user_password,last_name,email1,date_format) values(".$uid.",'standarduser','stX/AHHNK/Gkw','standarduser','standarduser at standard.user.com','yyyy-mm-dd')"; -$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - -//$sql_stmt1 = "insert into user2role values(1,1)"; -//$db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - -$role_query = "select roleid from role where name='standard_user'"; -$db->database->SetFetchMode(ADODB_FETCH_ASSOC); -$role_result = $db->query($role_query); -$role_id = $db->query_result($role_result,0,"roleid"); - -$sql_stmt2 = "insert into user2role values(".$uid.",".$role_id.")"; -$db->query($sql_stmt2) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); - -// create and populate combo tables -require_once('include/PopulateComboValues.php'); -$combo = new PopulateComboValues(); -$combo->create_tables(); - -// create and populate custom field tables; -require_once('include/PopulateCustomFieldTables.php'); -create_custom_field_tables(); - -// default report population -require_once('modules/Reports/PopulateReports.php'); - -// default customview population -require_once('modules/CustomView/PopulateCustomView.php'); - -// create and Populate PHPBB tables and data -//require_once('include/PopulatePhpBBtables.php'); -//create_populate_phpbb(); - -// populate the db with seed data -if ($db_populate) { - echo "Populate seed data into $db_name"; - include("install/populateSeedData.php"); - echo "...done

\n"; -} - -// populate forums data -global $log, $db; -/* -$db->query("update phpbb_config set config_value='".$admin_email."' where config_name='board_email'"); -$db->query("update phpbb_config set config_value='modules/MessageBoard/images/smiles' where config_name='smilies_path'"); -$db->query("update phpbb_config set config_value='".$server_name."' where config_name='server_name'"); -$db->query("update phpbb_config set config_value='".$server_port."' where config_name='server_port'"); -$db->query("update phpbb_config set config_value='modules/MessageBoard' where config_name='script_path'"); -$curr_time=time(); -$db->query("insert phpbb_config values('board_startdate','".$curr_time."')"); -$db->query("insert phpbb_config values('default_lang', 'english')"); -*/ - -$endTime = microtime(); -$deltaTime = microtime_diff($startTime, $endTime); - -function populatePermissions4StandardUser() { - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Leads','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Leads','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Leads','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Accounts','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Accounts','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Accounts','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Contacts','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Contacts','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Contacts','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Opportunities','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Opportunities','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Opportunities','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Calls','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Calls','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Calls','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Emails','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Emails','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Emails','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Tasks','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Tasks','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Tasks','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Notes','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Notes','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Notes','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Meetings','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Meetings','Delete',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Cases','EditView',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Cases','Delete',1,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Cases','index',1,1,'')"); - - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','imports','fetchfile',0,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Contacts','BusinessCard',0,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Contacts','Import',0,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Accounts','Import',0,1,'')"); - mysql_query("insert into role2permission(roleid,permissionid,module,module_action,action_permission,module_permission,description) values (2,'','Opportunities','Import',0,1,'')"); -} - -// populate calendar data -//include("modules/Calendar/admin/scheme.php"); +require_once('install/5createTables.inc.php'); ?> -The database tables are now set up.

total time: seconds.

- + @@ -4776,6 +4776,9 @@ columnindex + + cvid + Type=InnoDB

@@ -4844,7 +4847,7 @@ - + @@ -4870,7 +4873,7 @@

- + @@ -4878,6 +4881,9 @@ + + queryid + Type=InnoDB @@ -4885,7 +4891,7 @@

- + @@ -4894,6 +4900,9 @@ + + queryid + Type=InnoDB

@@ -4906,7 +4915,7 @@ - + @@ -4920,6 +4929,9 @@ + + queryid + Type=InnoDB

From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 22:13:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 06:13:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3945 - /vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Message-ID: <20060227061329.4800C36B75F@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 23:13:27 2006 New Revision: 3945 Log: fix scope issue in getUserFldArray(), by kiang. Introduced in r3878 Modified: vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Modified: vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php ============================================================================== --- vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php (original) +++ vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Sun Feb 26 23:13:27 2006 @@ -216,6 +216,7 @@ function getUserFldArray($fld_module) { + global $adb; $user_fld = Array(); $query = "select * from field where generatedtype=2 and tabid=".fetchTabIDVal($fld_module)." and uitype IN (15,16)"; // echo $query; From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 22:17:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 06:17:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3946 - /vtigercrm/branches/4.2/modules/Potentials/Charts.php Message-ID: <20060227061757.47B5E41E64C@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 23:17:55 2006 New Revision: 3946 Log: Fix Graphs Labels Not Dispalyed Properly, by briand. closes #36 Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Sun Feb 26 23:17:55 2006 @@ -222,7 +222,7 @@ //$bplot->value->SetAlign('left','center'); $bplot[$index]->value->SetColor("white"); $bplot[$index]->value->SetFormat(getCurrencySymbol().'%d'); - $bplot[$index]->SetValuePos('max'); + $bplot[$index]->SetValuePos('center'); //set client side image map URL's $bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]); @@ -510,7 +510,7 @@ //$bplot->value->SetAlign('left','center'); $bplot[$index]->value->SetColor("white"); $bplot[$index]->value->SetFormat(getCurrencySymbol().'%d'); - $bplot[$index]->SetValuePos('max'); + $bplot[$index]->SetValuePos('center'); //set client side image map URL's $bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]); @@ -783,7 +783,7 @@ //$bplot->value->SetAlign('left','center'); $bplot[$index]->value->SetColor("white"); $bplot[$index]->value->SetFormat(getCurrencySymbol().'%d'); - $bplot[$index]->SetValuePos('max'); + $bplot[$index]->SetValuePos('center'); //set client side image map URL's $bplot[$index]->SetCSIMTargets($aTargets[$the_id],$aAlts[$the_id]); From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 22:34:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 06:34:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3947 - /vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Message-ID: <20060227063406.44E0349E388@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 23:34:04 2006 New Revision: 3947 Log: Fix Home Page Ticket List Status / Created / Assigned To are wrong, by briand. closes #38 Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Sun Feb 26 23:34:04 2006 @@ -102,8 +102,6 @@ $list.='

'; $list.=''.$current_module_strings['LBL_CREATED_DATE'].''; $list.='

'; -$list.=''.$current_module_strings['LBL_ASSIGNED_TO'].''; -$list.='

'; $list.=''; for ($i=1; $i<=$adb->num_rows($tktresult); $i++) @@ -131,19 +129,17 @@ $list .= ''.$parent_name.''; $list .= '

'; - $list .= ''.$adb->query_result($tktresult,$i,"status").''; + $list .= ''.$adb->query_result($tktresult,$i-1,"status").''; $list .= '

'; - $list .= ''.getDisplayDate($adb->query_result($tktresult,$i,"createdtime")).''; - $list .= '

'; - $list .= ''.$adb->query_result($tktresult,$i,"user_name").''; + $list .= ''.getDisplayDate($adb->query_result($tktresult,$i-1,"createdtime")).''; $list .= '

'; $list .= ''; } if($resultcount > 5) - $list .= '

'.$current_module_strings['LBL_MORE'].'...

'; + $list .= '

'.$current_module_strings['LBL_MORE'].'...

'; -$list.='

'; +$list.='

'; $list .= '

'; $list .= ' @@ -19,15 +18,15 @@ - - - @@ -36,16 +35,16 @@ - - + - - + @@ -67,14 +66,14 @@

${$MOD.LBL_CREATE_AND_MANAGE_USERS}$ {$MOD.LBL_USERS}	${$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}$ +	${$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}$ {$MOD.LBL_ROLES}	${$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}$ +	${$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}$ {$MOD.LBL_PROFILES}	${$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}$ +	${$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}$ {$MOD.USERGROUPLIST}
${$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}$ +	${$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}$ {$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}	${$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}$ -{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}	${$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}$ +{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}	${$MOD.LBL_SETTING_FIELD_ACCESSIBILITY}$ -{$MOD.LBL_FIELD_ACCESSIBILITY}	${$MOD.LBL_SETTING_ANNOUNCEMENT}$ +	${$MOD.LBL_SETTING_FIELD_ACCESSIBILITY}$ +{$MOD.LBL_FIELD_ACCESSIBILITY}	${$MOD.LBL_SETTING_ANNOUNCEMENT}$ {$MOD.LBL_ANNOUNCEMENT}

- + - + - + @@ -98,20 +97,20 @@ - - - - @@ -132,13 +131,13 @@ - - - @@ -147,22 +146,20 @@ - - - - - + {include file='SettingsSubMenu.tpl'} Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original) +++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Mon Feb 27 07:25:48 2006 @@ -1,3 +1,4 @@ + @@ -20,8 +21,8 @@ {$MOD.LBL_PROFILES}{$MOD.USERGROUPLIST}{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS} -{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS} -{$MOD.LBL_FIELD_ACCESSIBILITY} +{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS} +{$MOD.LBL_FIELD_ACCESSIBILITY}{$MOD.LBL_ANNOUNCEMENT} @@ -31,9 +32,9 @@

-{$MOD.LBL_CUSTOM_FIELD_SETTINGS} -{$MOD.LBL_PICKLIST_SETTINGS} -{$MOD.LBL_FIELD_ORDERING} +{$MOD.LBL_CUSTOM_FIELD_SETTINGS} +{$MOD.LBL_PICKLIST_SETTINGS} +{$MOD.LBL_FIELD_ORDERING}

@@ -79,6 +80,4 @@ ScrollEffect2.closelimit2= 120; ScrollEffect3.limit3 = 161; ScrollEffect3.closelimit3= 160; - - From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:26:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:26:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3955 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060227142625.8C51149E3B4@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:26:20 2006 New Revision: 3955 Log: Moved several fields from Basic Infn to Adv Infn & vice versa in Leads, Accounts, Contacts, Potential & Product Module based on the Inputs from Sales Team Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Mon Feb 27 07:26:20 2006 @@ -160,11 +160,11 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,'','ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,'','ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,'','ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,'','ADV')"); @@ -175,7 +175,7 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,'','ADV')"); //Added field emailoptout for accounts -- after 4.2 patch2 $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,'','BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); @@ -233,7 +233,7 @@ $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,'','ADV')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,'','ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,'','BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,'','BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,'','BAS')"); @@ -271,7 +271,7 @@ $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'accountid','contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,'','BAS')"); @@ -285,7 +285,7 @@ $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,'','ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,24,4,2,'T~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,25,4,2,'T~O',1,'','BAS')"); @@ -438,17 +438,17 @@ //Block 33 stock info - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,'','ADV')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,'','ADV')"); //ProductImageInformation - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,'','ADV')"); //Block 36 Description Info From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:27:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:27:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3956 - in /vtigercrm/trunk: Smarty/templates/ modules/Settings/ Message-ID: <20060227142700.83F2E49EEB0@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:26:51 2006 New Revision: 3956 Log: submenu integrated in settings Added: vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl vtigercrm/trunk/Smarty/templates/Organizationindex.tpl vtigercrm/trunk/Smarty/templates/PickListindex.tpl vtigercrm/trunk/modules/Settings/SettingsSubMenu.php From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:44:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:44:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3957 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060227144420.E912B2A8268@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:44:14 2006 New Revision: 3957 Log: changes made to return currency symbol ana conversion rate Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Feb 27 07:44:14 2006 @@ -813,9 +813,14 @@ elseif($uitype == 71 || $uitype == 72) { - $disp_currency = getDisplayCurrency(); - $editview_label[]=$mod_strings[$fieldlabel].': ('.$disp_currency.')'; - $fieldvalue[] = $value; + $currencyid=fetchCurrency($current_user->id); + $currency=getCurrencySymbol($currencyid); + $rate = getConversionRate($currencyid,$currency); + $editview_label[]=$mod_strings[$fieldlabel].': ('.$currency.')'; + if($value!='') + $fieldvalue[] = convertFromDollar($value,$rate); + else + $fieldvalue[] = $value; } elseif($uitype == 75 || $uitype ==81) { From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:46:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:46:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3958 - in /vtigercrm/trunk/themes/blue/images: left.gif right.gif Message-ID: <20060227144639.D375A49ABBA@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:46:34 2006 New Revision: 3958 Log: old images has been removed Removed: vtigercrm/trunk/themes/blue/images/left.gif vtigercrm/trunk/themes/blue/images/right.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:49:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:49:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3959 - in /vtigercrm/trunk/themes/blue/images: left.gif right.gif Message-ID: <20060227144959.F03DF49ABBA@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:49:54 2006 New Revision: 3959 Log: new images integrated for calendar Added: vtigercrm/trunk/themes/blue/images/left.gif (with props) vtigercrm/trunk/themes/blue/images/right.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:53:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:53:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3960 - in /vtigercrm/trunk: Smarty/templates/Header.tpl modules/Users/Announcements.php modules/Users/UsersAjax.php Message-ID: <20060227145334.D1B2349E316@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:53:28 2006 New Revision: 3960 Log: issue in announcement has been fixed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/modules/Users/Announcements.php vtigercrm/trunk/modules/Users/UsersAjax.php Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon Feb 27 07:53:28 2006 @@ -18,7 +18,7 @@ \n"; From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 07:51:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:51:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3965 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060227155100.AE95649E352@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:50:55 2006 New Revision: 3965 Log: New style added for product details Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Mon Feb 27 08:50:55 2006 @@ -239,11 +239,13 @@ padding-right:10px; border-bottom:1px solid #eaeaea; color:#737373; + white-space:nowrap; } .dvtCellInfo { padding-left:10px; border-bottom:1px solid #eaeaea; + white-space:nowrap; } .rightMailMerge { @@ -290,6 +292,16 @@ border:1px solid #bababa; padding-left:5px; width:90%; + background-color:#ffffff; +} + +.detailedViewProdTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:85%; background-color:#ffffff; } @@ -836,3 +848,48 @@ width:245px; } +.prdTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:100%; + border-left:1px solid #CCCCCC; + border-right:0px solid #CCCCCC; +} + +.prdTab tr th{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + border-right:1px solid #CCCCCC; + padding-left:5px; + background-color:#E5E5E5; + height:20px; + color:#000000; + font-weight:bold; + text-decoration:none; + border-bottom:1px solid #CCCCCC; +} + +.prdTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + border-right:1px solid #CCCCCC; + border-bottom:1px solid #CCCCCC; + padding-left:5px; + color:#000000; + text-decoration:none; + font-weight:normal; + height:20px; +} + +.delTxt{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:underline; + font-weight:normal; + color:#000099; + cursor:pointer; +} + From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 13:19:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:19:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3966 - in /vtigercrm/branches/4.2/modules: Calls/ Cases/ MessageBoard/ Message-ID: <20060227211906.AF6F042E1BA@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 14:19:03 2006 New Revision: 3966 Log: remove old unused modules: MessageBoard Calls Cases see #49 Removed: vtigercrm/branches/4.2/modules/Calls/ vtigercrm/branches/4.2/modules/Cases/ vtigercrm/branches/4.2/modules/MessageBoard/ From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 13:29:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:29:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3967 - in /vtigercrm/branches/4.2: config.db.php config.template.php install/4createConfigFile.php Message-ID: <20060227212937.C08E9188AE0@vtiger.fosslabs.com> Author: fathi Date: Mon Feb 27 14:29:31 2006 New Revision: 3967 Log: use site_URL previously removed by mistake Modified: vtigercrm/branches/4.2/config.db.php vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/config.db.php ============================================================================== --- vtigercrm/branches/4.2/config.db.php (original) +++ vtigercrm/branches/4.2/config.db.php Mon Feb 27 14:29:31 2006 @@ -5,6 +5,4 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_' - - $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; ?> Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Mon Feb 27 14:29:31 2006 @@ -41,13 +41,15 @@ db_name */ -// TODO: test if port is empty $dbconfig['db_server'] = '_DBC_SERVER_'; $dbconfig['db_port'] = ':_DBC_PORT_'; $dbconfig['db_username'] = '_DBC_USER_'; $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_'; + +// 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 @@ -72,7 +74,8 @@ $dbconfigoption['ssl'] = false; $host_name = $dbconfig['db_hostname']; -$site_URL = 'http://'.$dbconfig['db_server'].'/vtigercrm'; + +$site_URL = '_SITE_URL_'; // root directory path $root_directory = '_VT_ROOTDIR_'; Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Mon Feb 27 14:29:31 2006 @@ -145,6 +145,9 @@ $buffer = str_replace( "_DBC_PASS_", $db_password, $buffer); $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); + + $buffer = str_replace( "_SITE_URL_", "site_URL", $buffer); + /* replace dir variable */ $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer); $buffer = str_replace( "_VT_CACHEDIR_", $cache_dir, $buffer); From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 13:32:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:32:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3968 - /vtigercrm/branches/4.2/install/4createConfigFile.php Message-ID: <20060227213207.7814849EEFF@vtiger.fosslabs.com> Author: fathi Date: Mon Feb 27 14:32:04 2006 New Revision: 3968 Log: use site_URL previously removed by mistake Modified: vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Mon Feb 27 14:32:04 2006 @@ -146,7 +146,7 @@ $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); - $buffer = str_replace( "_SITE_URL_", "site_URL", $buffer); + $buffer = str_replace( "_SITE_URL_", $site_URL, $buffer); /* replace dir variable */ $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer); From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 13:47:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:47:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3969 - in /vtigercrm/branches/4.2: modules/Tasks/ modules/Tasks/language/ themes/Amazon/ themes/akodarkgem/ themes/busthree/ themes/busthree/images/ themes/coolblue/ themes/coolblue/images/ themes/coolblue/language/ Message-ID: <20060227214742.18D5C49CA6B@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 14:47:34 2006 New Revision: 3969 Log: remove more files to sync file list with 4.2.3. see #49 Removed: vtigercrm/branches/4.2/modules/Tasks/Delete.php vtigercrm/branches/4.2/modules/Tasks/DetailView.html vtigercrm/branches/4.2/modules/Tasks/DetailView.php vtigercrm/branches/4.2/modules/Tasks/EditView.html vtigercrm/branches/4.2/modules/Tasks/EditView.php vtigercrm/branches/4.2/modules/Tasks/Forms.php vtigercrm/branches/4.2/modules/Tasks/ListView.html vtigercrm/branches/4.2/modules/Tasks/ListView.php vtigercrm/branches/4.2/modules/Tasks/Save.php vtigercrm/branches/4.2/modules/Tasks/SearchForm.html vtigercrm/branches/4.2/modules/Tasks/Task.php vtigercrm/branches/4.2/modules/Tasks/index.php vtigercrm/branches/4.2/modules/Tasks/language/en_us.lang.php vtigercrm/branches/4.2/themes/Amazon/ vtigercrm/branches/4.2/themes/akodarkgem/ vtigercrm/branches/4.2/themes/busthree/config.php vtigercrm/branches/4.2/themes/busthree/footer.php vtigercrm/branches/4.2/themes/busthree/header.html vtigercrm/branches/4.2/themes/busthree/header.php vtigercrm/branches/4.2/themes/busthree/images/Accounts.gif vtigercrm/branches/4.2/themes/busthree/images/Calls.gif vtigercrm/branches/4.2/themes/busthree/images/Cases.gif vtigercrm/branches/4.2/themes/busthree/images/Contacts.gif vtigercrm/branches/4.2/themes/busthree/images/Emails.gif vtigercrm/branches/4.2/themes/busthree/images/Meetings.gif vtigercrm/branches/4.2/themes/busthree/images/Notes.gif vtigercrm/branches/4.2/themes/busthree/images/Opportunities.gif vtigercrm/branches/4.2/themes/busthree/images/SUGAR.jpg vtigercrm/branches/4.2/themes/busthree/images/Tasks.gif vtigercrm/branches/4.2/themes/busthree/images/Users.gif vtigercrm/branches/4.2/themes/busthree/images/blank.gif vtigercrm/branches/4.2/themes/busthree/images/logo.gif vtigercrm/branches/4.2/themes/busthree/images/paypal.gif vtigercrm/branches/4.2/themes/busthree/layout_utils.php vtigercrm/branches/4.2/themes/busthree/style.css vtigercrm/branches/4.2/themes/coolblue/footer.php vtigercrm/branches/4.2/themes/coolblue/header.html vtigercrm/branches/4.2/themes/coolblue/header.php vtigercrm/branches/4.2/themes/coolblue/images/Accounts.gif vtigercrm/branches/4.2/themes/coolblue/images/Calls.gif vtigercrm/branches/4.2/themes/coolblue/images/Cases.gif vtigercrm/branches/4.2/themes/coolblue/images/Contacts.gif vtigercrm/branches/4.2/themes/coolblue/images/Emails.gif vtigercrm/branches/4.2/themes/coolblue/images/HelpDesk.gif vtigercrm/branches/4.2/themes/coolblue/images/Leads.gif vtigercrm/branches/4.2/themes/coolblue/images/Meetings.gif vtigercrm/branches/4.2/themes/coolblue/images/Notes.gif vtigercrm/branches/4.2/themes/coolblue/images/Opportunities.gif vtigercrm/branches/4.2/themes/coolblue/images/Potentials.gif vtigercrm/branches/4.2/themes/coolblue/images/Products.gif vtigercrm/branches/4.2/themes/coolblue/images/SUGAR.jpg vtigercrm/branches/4.2/themes/coolblue/images/Tasks.gif vtigercrm/branches/4.2/themes/coolblue/images/Users.gif vtigercrm/branches/4.2/themes/coolblue/images/arrow_down.gif vtigercrm/branches/4.2/themes/coolblue/images/arrow_up.gif vtigercrm/branches/4.2/themes/coolblue/images/attachment.gif vtigercrm/branches/4.2/themes/coolblue/images/blank.gif vtigercrm/branches/4.2/themes/coolblue/images/calendar.gif vtigercrm/branches/4.2/themes/coolblue/images/high_priority.gif vtigercrm/branches/4.2/themes/coolblue/images/left_arc.gif vtigercrm/branches/4.2/themes/coolblue/images/paypal.gif vtigercrm/branches/4.2/themes/coolblue/images/print.gif vtigercrm/branches/4.2/themes/coolblue/images/right_arc.gif vtigercrm/branches/4.2/themes/coolblue/images/vtiger.jpg vtigercrm/branches/4.2/themes/coolblue/language/en_us.lang.php vtigercrm/branches/4.2/themes/coolblue/layout_utils.php vtigercrm/branches/4.2/themes/coolblue/style.css From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 15:57:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Feb 2006 23:57:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2351=3A_Q?= =?utf-8?q?uotes_are_not_created_correctly_form_Potentials_or_from_Quote_s?= =?utf-8?q?creen?= In-Reply-To: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> References: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> Message-ID: <085.548e9ec85aea1104ed576c3475043e62@vtiger.fosslabs.com> #51: Quotes are not created correctly form Potentials or from Quote screen -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: -----------------------------------------------+---------------------------- Changes (by onwealdandy ): * version: 5.0.0 => 4.2.4rc3 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 20:46:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 04:46:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2349=3A_R?= =?utf-8?q?emove_files_from_previous_versions_in_4=2E2?= In-Reply-To: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> References: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> Message-ID: <085.df36c2f2d3a27bc0a127a3fdeb828cae@vtiger.fosslabs.com> #49: Remove files from previous versions in 4.2 ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by briand): Quick checks to help with your list and cleanup: '''Keep Me!''' menu.php is needed. It is called in the theme files and is used to create the submenus. vtigerlogger.php is used by the system logging, it is required. '''Delete Me!''' The two squirrelmail folders are already empty and should be deleted... as should the themes/busthree, themes/coolblue, modules/Tasks, and pkg folders (which only contain empty folders). migrate.php refers to a non-existent php file. It should be deleted, as should the migration directory, which seems to migrate from vtiger 2.1 to 3.0). Additioanlly there are two datamigration (.sh & .bat) files in the bin folder (one linux, one windows) that point to migrate.php, which point to the non-existent datamigration.php file. migratorbackupconnection.php is another one that is only referenced in the non-working bin/linux/datamigration.sh -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 21:18:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 05:18:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2349=3A_R?= =?utf-8?q?emove_files_from_previous_versions_in_4=2E2?= In-Reply-To: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> References: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> Message-ID: <085.8fcd89486efa7cfcd643cad394d0b8a6@vtiger.fosslabs.com> #49: Remove files from previous versions in 4.2 ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [3970]) remove more empty directories. see #49 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:18:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:18:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3970 - in /vtigercrm/branches/4.2: modules/Tasks/ modules/squirrelmail-1.4.4/contrib/ modules/squirrelmail-1.4.4/themes/ pkg/ themes/busthree/ themes/coolblue/ Message-ID: <20060228051840.8950E438CA2@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 22:18:36 2006 New Revision: 3970 Log: remove more empty directories. see #49 Removed: vtigercrm/branches/4.2/modules/Tasks/ vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/contrib/ vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/themes/ vtigercrm/branches/4.2/pkg/ vtigercrm/branches/4.2/themes/busthree/ vtigercrm/branches/4.2/themes/coolblue/ From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:51:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:51:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3971 - /vtigercrm/trunk/include/utils/InventoryUtils.php Message-ID: <20060228055120.6BE5949E316@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:51:16 2006 New Revision: 3971 Log: Added the product details block in Inventory. Modified: vtigercrm/trunk/include/utils/InventoryUtils.php Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Mon Feb 27 22:51:16 2006 @@ -15,8 +15,9 @@ * column fields/ */ -function getProductDetailsBlockInfo($mode,$module,$focus,$num_of_products='',$associated_prod='') +function getProductDetailsBlockInfo($mode,$module,$focus='',$num_of_products='',$associated_prod='') { + $productDetails = Array(); $productBlock = Array(); if($num_of_products=='') @@ -32,12 +33,21 @@ { $productDetails['product_details'] = $associated_prod; } - $productBlock[] = Array('mode'=>$focus->mode); - $productBlock[] = $productDetails['product_details']; - $productBlock[] = Array('taxvalue' => $focus->column_fields['txtTax']); - $productBlock[] = Array('taxAdjustment' => $focus->column_fields['txtAdjustment']); - $productBlock[] = Array('hdnSubTotal' => $focus->column_fields['hdnSubTotal']); - $productBlock[] = Array('hdnGrandTotal' => $focus->column_fields['hdnGrandTotal']); + if($focus != '') + { + $productBlock[] = Array('mode'=>$focus->mode); + $productBlock[] = $productDetails['product_details']; + $productBlock[] = Array('taxvalue' => $focus->column_fields['txtTax']); + $productBlock[] = Array('taxAdjustment' => $focus->column_fields['txtAdjustment']); + $productBlock[] = Array('hdnSubTotal' => $focus->column_fields['hdnSubTotal']); + $productBlock[] = Array('hdnGrandTotal' => $focus->column_fields['hdnGrandTotal']); + } + else + { + $productBlock[] = Array('Product Details' => 'Product Details'); + + } + //echo '

';print_r($productBlock);echo '

'; return $productBlock; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:53:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:53:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3972 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060228055313.619BE49E31C@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:53:08 2006 New Revision: 3972 Log: Added get_product_details_label condition in commonutils. Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Feb 27 22:53:08 2006 @@ -777,16 +777,17 @@ $prev_header = ""; for($i=0; $i<$noofrows; $i++) { - $block_title = $mod_strings[$adb->query_result($result,$i,"blocklabel")]; + $block_title = $mod_strings[$adb->query_result($result,$i,"blocklabel")]; + $block_label = $adb->query_result($result,$i,"blocklabel"); if($block_title !='') { $prev_header = $block_title; if($disp_view == "detail_view") { - if($block_title=='LBL_RELATED_PRODUCTS') + if($block_label=='LBL_RELATED_PRODUCTS') { - $getBlockInfo=getProductDetails(); + $getBlockInfo=getProductDetailsBlockInfo($mode,$module); } else { @@ -794,13 +795,23 @@ } } else - { - $getBlockInfo=getBlockInformation($module,$adb->query_result($result,$i,"blockid"),$mode,$col_fields,$tabid,$info_type); + { + if($block_label=='LBL_RELATED_PRODUCTS') + { + $getBlockInfo=getProductDetailsBlockInfo($mode,$module); + //echo '

';print_r($getBlockInfo);echo '

'; + } + else + { + $getBlockInfo=getBlockInformation($module,$adb->query_result($result,$i,"blockid"),$mode,$col_fields,$tabid,$info_type); + //echo '

';print_r($getBlockInfo);echo '

'; + } } if(is_array($getBlockInfo)) { $block_detail[$block_title] = $getBlockInfo; + //echo '

';print_r($block_detail);echo '

'; } } else @@ -833,6 +844,7 @@ } } + //echo '

';print_r($block_detail);echo '

'; return $block_detail; } @@ -1180,16 +1192,4 @@ return $count; } -function mkdirs($dir) { -if( is_null($dir) || $dir === "" ){ - return FALSE; -} -if( is_dir($dir) || $dir === "/" ){ - return TRUE; -} -if( mkdirs(dirname($dir), $mode, $recursive) ){ - return mkdir($dir, $mode); -} -return FALSE; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:55:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:55:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3973 - /vtigercrm/trunk/Popup.php Message-ID: <20060228055510.BD94149EEC4@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:55:06 2006 New Revision: 3973 Log: Added the Curr_Row condition in the Products case statement. Modified: vtigercrm/trunk/Popup.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Mon Feb 27 22:55:06 2006 @@ -115,7 +115,14 @@ case 'Products': require_once("modules/$currentModule/Product.php"); $focus = new Product(); + echo '

';print_r($_REQUEST);echo '

'; $smarty->assign("SINGLE_MOD",'Product'); + if(isset($_REQUEST['curr_row'])) + { + $curr_row = $_REQUEST['curr_row']; + $smarty->assign("CURR_ROW", $curr_row); + $url_string .="&curr_row=".$_REQUEST['curr_row']; + } if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); if(isset($_REQUEST['smodule']) && $_REQUEST['smodule'] !='') @@ -329,7 +336,8 @@ $search_query .= " and unit_price like '%".$unitprice."%'"; $url_string .= "&unitprice=".$unitprice; $smarty->assign("UNITPRICE", $unitprice); - } + } + } if($currentModule == 'PurchaseOrder') From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:56:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:56:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3974 - /vtigercrm/trunk/Smarty/templates/Popup.tpl Message-ID: <20060228055616.0184949EEF0@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:56:13 2006 New Revision: 3974 Log: Added the hidden field Curr_Row. Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Mon Feb 27 22:56:13 2006 @@ -39,6 +39,7 @@ + {if $SELECT eq 'enable'} From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:58:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:58:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3975 - /vtigercrm/branches/4.2/install/gnuify-changelog.pl Message-ID: <20060228055821.ADFE249EEF0@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 22:58:19 2006 New Revision: 3975 Log: add changelog converter from subversion Added: vtigercrm/branches/4.2/install/gnuify-changelog.pl From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 21:59:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:59:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3976 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060228055906.6C63649EEF0@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:59:01 2006 New Revision: 3976 Log: Added the Product_Details Block in Quotes, Invoice, SalesOrder & PurchaseOrder Module. Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon Feb 27 22:59:01 2006 @@ -20,6 +20,7 @@ + +

{$MOD.LBL_COMMUNICATION_TEMPLATES}

- + {**}

RSS is not configured. Click here to configure

Modified: vtigercrm/trunk/modules/Users/Announcements.php ============================================================================== --- vtigercrm/trunk/modules/Users/Announcements.php (original) +++ vtigercrm/trunk/modules/Users/Announcements.php Mon Feb 27 07:53:28 2006 @@ -25,7 +25,7 @@ $html='

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/UsersAjax.php (original) +++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Feb 27 07:53:28 2006 @@ -16,7 +16,12 @@ $announcement=''; $sql="select * from announcement order by time"; $result=$adb->query($sql); - $announcement.=getUserName($adb->query_result($result,$i,'creatorid')).' : '.$adb->query_result($result,$i,'announcement').' '; + for($i=0;$i<$adb->num_rows($result);$i++) + { + $announce = getUserName($adb->query_result($result,$i,'creatorid')).' : '.$adb->query_result($result,$i,'announcement').' '; + if($adb->query_result($result,$i,'announcement')!='') + $announcement.=$announce; + } echo $announcement; }elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != '')) @@ -31,6 +36,6 @@ else $query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",".$adb->formatString("announcement","time",$date_var).",'".$date_var."')"; $result=$adb->query($query); - echo $query.$announcement; + echo $announcement; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 06:54:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:54:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3961 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060227145416.A1A6249E316@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:54:12 2006 New Revision: 3961 Log: js function check_form has been included Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Mon Feb 27 07:54:12 2006 @@ -80,3 +80,25 @@ } } + +function check_form() +{ + if(trim(document.appSave.subject.value) == "") + { + alert("Missing Event Name"); + document.appSave.subject.focus() + return false; + } + else + { + if (document.appSave.activitytype[0].checked==true) + { + document.appSave.duration_minutes.value = "15"; + } + else if (document.appSave.activitytype[1].checked == true) + { + document.appSave.duration_minutes.value = "45"; + } + return true; + } +} From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 07:03:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:03:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3962 - /vtigercrm/trunk/modules/Calendar/addEventUI.php Message-ID: <20060227150317.2082349EEC2@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:03:13 2006 New Revision: 3962 Log: hidden fields have been included Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Feb 27 08:03:13 2006 @@ -1,7 +1,27 @@ + +

@@ -15,15 +35,15 @@ - +

Add Event

Call

Meeting

Call

Meeting

Event Name :

@@ -76,7 +96,7 @@

From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 07:05:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:05:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3963 - /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Message-ID: <20060227150525.2547549EEFD@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:05:20 2006 New Revision: 3963 Log: LBL_DATE_TITLE has been modified Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Mon Feb 27 08:05:20 2006 @@ -56,7 +56,7 @@ 'LBL_SM_SAT' => 'Sat', 'LBL_SM_SUN' => 'Sun', -'LBL_DATE_TITLE' => '%A, %d. %B %Y', +'LBL_DATE_TITLE' => 'Day %d, %A', 'LBL_WEEK' => 'Week', 'LBL_WEEK_BUTTON_KEY' => 'W', From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 07:16:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:16:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3964 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060227151632.1189D3E1A74@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:16:26 2006 New Revision: 3964 Log: changes made to display event in hour list Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Mon Feb 27 08:16:26 2006 @@ -97,7 +97,6 @@ for ($c = 0 ; $c < $maxcol ; $c++ ) { if ( isset ( $table[$i][$c] ) ) { if ( is_object ( $table[$i][$c] ) ) { - //echo " "; @@ -332,17 +307,18 @@ echo "

@@ -271,7 +291,7 @@

- +

"; $color = ""; $username=$table[$i][$c]->creator; if ($username!=""){ @@ -157,28 +156,6 @@ return s; } - -function check_form() -{ - if(trim(document.appSave.subject.value) == "") - { - alert("Missing Subject"); - document.appSave.subject.focus() - return false; - } - else - { - if (document.appSave.activitytype[0].checked==true) - { - document.appSave.duration_minutes.value = "15"; - } - else if (document.appSave.activitytype[1].checked == true) - { - document.appSave.duration_minutes.value = "45"; - } - return true; - } -} "; echo "\n"; echo "

"; echo ""; - echo ""; + echo $image_path."calTopLeft.gif\">"; echo ""; - echo ""; - echo ""; + echo $image_path."calSep.gif\">"; echo ""; echo "

\n"; echo "

$\"Previous\"$

"; + echo $this->pref->menulink($callink ."calendar_dayview&t=".$last_day->getYYYYMMDD(),$this->pref->getImage(left,'list'),$last_day->getDate())."

Day "; - echo $day.", ".$day_in_words; + echo "

"; + echo " ". strftime($mod_strings['LBL_DATE_TITLE'],$from->ts) ." "; echo "

$\"Next\"$

"; + echo $this->pref->menulink($callink ."calendar_dayview&t=".$next_day->getYYYYMMDD(),$this->pref->getImage(right,'list'),$next_day->getDate())."

"; - echo "

"; - $this->getHourList('12am',$maxcol,$table,12); - for ($i=1;$i <=11; $i++) - { - $this->getHourList($i.'am',$maxcol,$table,$i); - } - $this->getHourList('12pm',$maxcol,$table,12); - for ($i=1;$i <=11; $i++) - { - $this->getHourList($i.'pm',$maxcol,$table,$i); - } + echo "

"; + for ($i = 0; $i <24 ; $i++ ) + { + if($i == 0) + $this->getHourList('12am',$maxcol,$table,12); + if($i>0 && $i<12) + $this->getHourList($i.'am',$maxcol,$table,$i); + if($i == 12) + $this->getHourList('12pm',$maxcol,$table,12); + if($i>12 && $i<24) + $this->getHourList(($i - 12).'pm',$maxcol,$table,$i); + } echo "

"; echo "

\n"; echo "

@@ -157,10 +160,15 @@ - + + + {foreach key=label item=subdata from=$data} - + {if $header eq 'Product Details'} + + {else} + + {/if} {foreach key=mainlabel item=maindata from=$subdata} {assign var="uitype" value="$maindata[0][0]"} {assign var="fldlabel" value="$maindata[1][0]"} @@ -169,7 +177,73 @@ {assign var="fldname" value="$maindata[2][0]"} {assign var="fldvalue" value="$maindata[3][0]"} {assign var="secondvalue" value="$maindata[3][1]"} - + + {if $header eq 'Product Details'} + + + {/if} {if $uitype eq 2} @@ -469,6 +543,7 @@ {else} {$fldvalue} {/if} + {elseif $uitype eq 61} @@ -503,8 +578,10 @@ {/foreach} {/foreach} +

{$header} -

+ + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + + + + {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'} + + {/if} + + + + + + + +

*Product	Qty In Stock	*Qty	Unit Price	*List Price	Total

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

		Sub Total
		Tax
		Adjusment
		Grand Total

+ + +

*{$fldlabel}

{$fldlabel}

{$fldvalue}

{if $MODULE eq 'Emails'} @@ -949,3 +1026,5 @@ + + From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 22:08:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:08:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3977 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060228060805.74BD249EF2B@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 23:08:01 2006 New Revision: 3977 Log: Added two function "fnAddRow & fnDel" in the general.js for the Product Details block. Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon Feb 27 23:08:01 2006 @@ -1349,3 +1349,38 @@ tagName.style.visibility = 'visible'; } + +// Add & Delete Row in a Table + +function fnAddRow(){ + var tableName = document.getElementById('proTab'); + var prev = tableName.rows.length; + var count = prev; + var row = tableName.insertRow(prev); + if(count%2) + row.className = "dvtCellLabel"; + else + row.className = "dvtCellInfo"; + var colone = row.insertCell(0); + var coltwo = row.insertCell(1); + var colthree = row.insertCell(2); + var colfour = row.insertCell(3); + var colfive = row.insertCell(4); + var colsix = row.insertCell(5); + var colseven = row.insertCell(6); + colone.innerHTML="

"; + coltwo.innerHTML=" "; + colthree.innerHTML=" "; + colfour.innerHTML=" "; + colfive.innerHTML="

"; + colsix.innerHTML=" "; + colseven.innerHTML="Del"; + +} + + +function deleteRow(i) +{ + document.getElementById('proTab').deleteRow(i); +} + From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 22:09:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:09:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3978 - /vtigercrm/branches/4.2/install/gnuify-changelog.pl Message-ID: <20060228060932.6AE2B2A8253@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 23:09:30 2006 New Revision: 3978 Log: modify names and comment out extra line generation in changelog script Modified: vtigercrm/branches/4.2/install/gnuify-changelog.pl Modified: vtigercrm/branches/4.2/install/gnuify-changelog.pl ============================================================================== --- vtigercrm/branches/4.2/install/gnuify-changelog.pl (original) +++ vtigercrm/branches/4.2/install/gnuify-changelog.pl Mon Feb 27 23:09:30 2006 @@ -13,72 +13,11 @@ use strict; my %hackers = ( - "svn" => 'Collab.net Subversion Team', - "jimb" => 'Jim Blandy ', - "sussman" => 'Ben Collins-Sussman ', - "kfogel" => 'Karl Fogel ', - "gstein" => 'Greg Stein ', - "brane" => 'Branko Cibej ', - "joe" => 'Joe Orton ', - "ghudson" => 'Greg Hudson ', - "lefty" => 'Lee P. W. Burgess ', - "fitz" => 'Brian Fitzpatrick ', - "mab" => 'Matthew Braithwaite ', - "daniel" => 'Daniel Stenberg ', - "mmurphy" => 'Mark Murphy ', - "cmpilato" => 'C. Michael Pilato ', - "kevin" => 'Kevin Pilch-Bisson ', - "philip" => 'Philip Martin ', - "jerenkrantz" => 'Justin Erenkrantz ', - "rooneg" => 'Garrett Rooney ', - "bcollins" => 'Ben Collins ', - "blair" => 'Blair Zajac ', - "striker" => 'Sander Striker ', - "XelaRellum" => 'Alexander Mueller ', - "yoshiki" => 'Yoshiki Hayashi ', - "david" => 'David Summers ', - "rassilon" => 'Bill Tutt ', - "kbohling" => 'Kirby C. Bohling ', - "breser" => 'Ben Reser ', - "bliss" => 'Tobias Ringstrom ', - "dionisos" => 'Erik Huelsmann ', - "josander" => 'Jostein Andersen ', - "julianfoad" => 'Julian Foad ', - "clkao" => 'Chia-Liang Kao ', - "xsteve" => 'Stefan Reich??r ', - "mbk" => 'Mark Benedetto King ', - "patrick" => 'Patrick Mayweg ', - "jrepenning" => 'Jack Repenning ', - "epg" => 'Eric Gillespie ', - "dwhedon" => 'David Kimdon ', - "djh" => 'D.J. Heap ', - "mprice" => 'Michael Price ', - "jszakmeister" => 'John Szakmeister ', - "bdenny" => 'Brian Denny ', - "rey4" => 'Russell Yanofsky ', - "maxb" => 'Max Bowsher ', - "dlr" => 'Daniel Rall ', - "jaa" => 'Jani Averbach ', - "pll" => 'Paul Lussier ', - "shlomif" => 'Shlomi Fish ', - "jpieper" => 'Josh Pieper ', - "dimentiy" => 'Dmitriy O. Popkov ', - "kellin" => 'Shamim Islam ', - "sergeyli" => 'Sergey A. Lipnevich ', - "kraai" => 'Matt Kraai ', - "ballbach" => 'Michael Ballbach ', - "kon" => 'Kalle Olavi Niemitalo ', - "knacke" => 'Kai Nacke ', - "gthompson" => 'Glenn A. Thompson ', - "jespersm" => 'Jesper Steen M??ller ', - "naked" => 'Nuutti Kotivuori ', - "niemeyer" => 'Gustavo Niemeyer ', - "trow" => 'Jon Trowbridge ', - "mmacek" => 'Marko Macek ', - "zbrown" => 'Zack Brown ', - "morten" => 'Morten Ludvigsen ', - "fmatias" => 'F??liciano Matias ', - "nsd" => 'Nick Duffek ', + "mfedyk" => 'Mike Fedyk', + "fathi" => 'Fathi Boudra', + "mmbrich" => 'Matt Brichacek', + "jeffk" => 'Jeff Kowalczyk', + "allanbush" => 'Allan Bush', ); my $parse_next_line = 0; @@ -107,7 +46,7 @@ # Check to see if the final line of the commit message was blank, # if not insert one - print "\n" if $last_rev ne "" and !$last_line_empty; + #Sprint "\n" if $last_rev ne "" and !$last_line_empty; } elsif ($parse_next_line) { @@ -126,7 +65,7 @@ } elsif ($this_line_empty) { - print "\n"; + #print "\n"; } else { From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 22:14:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:14:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3979 - /vtigercrm/trunk/modules/Calendar/index.php Message-ID: <20060228061428.89A323D1900@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:14:24 2006 New Revision: 3979 Log: new_calendar.php has been included Modified: vtigercrm/trunk/modules/Calendar/index.php Modified: vtigercrm/trunk/modules/Calendar/index.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/index.php (original) +++ vtigercrm/trunk/modules/Calendar/index.php Mon Feb 27 23:14:24 2006 @@ -26,7 +26,7 @@ require_once ($theme_path."layout_utils.php"); global $mod_strings; -include ('modules/Calendar/calendar_dayview.php'); -//include ('modules/Calendar/new_calendar.php'); +//include ('modules/Calendar/calendar_dayview.php'); +include ('modules/Calendar/new_calendar.php'); ?> From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 22:15:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 06:15:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2352=3A_V?= =?utf-8?q?ersion_4=2E2=2E4_Updates?= Message-ID: <076.21057f15b1e83e134121e50411e2e24e@vtiger.fosslabs.com> #52: Version 4.2.4 Updates --------------------------------+------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: new Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Keywords: version 4.2.4 tags | --------------------------------+------------------------------------------- Updates to the script to reflect the v4.2.4. This includes the modules/about_us.php, vtigerversion.php, and the changelog.txt. Additionally, the about_us.php window was not tall enough for the data it needed to display, so all themes had header.html updated to open pop-up slightly taller. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 22:16:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:16:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3980 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060228061617.45BA2498310@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:16:13 2006 New Revision: 3980 Log: calendar_dayview.php has been included Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Mon Feb 27 23:16:13 2006 @@ -21,8 +21,8 @@ */ $mysel= $_GET['sel']; - if ($mysel=="") { include "dayview.php"; } - if ($mysel=="day") { include "dayview.php"; } + if ($mysel=="") { include "calendar_dayview.php"; } + if ($mysel=="day") { include "calendar_dayview.php"; } if ($mysel=="week") { include "weekview.php"; } if ($mysel=="month") { include "monthview.php"; } if ($mysel=="year") { include "yearview.php"; } From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 22:28:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:28:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3981 - /vtigercrm/trunk/smiletag/data/messages.xml Message-ID: <20060228062803.002D249E385@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:28:00 2006 New Revision: 3981 Log: Removed the Junk Messages from ShoutBox Modified: vtigercrm/trunk/smiletag/data/messages.xml Modified: vtigercrm/trunk/smiletag/data/messages.xml ============================================================================== --- vtigercrm/trunk/smiletag/data/messages.xml (original) +++ vtigercrm/trunk/smiletag/data/messages.xml Mon Feb 27 23:28:00 2006 @@ -1,80 +1,11 @@ - - - - 1139933515 + + + + 1141107721 127.0.0.1 - - - - ]]> - 1139933234 - 127.0.0.1 - - - - - ]]> - 1139928863 - 127.0.0.1 - - - - - ]]> - 1139308277 - 127.0.0.1 - - - - - ]]> - 1139289670 - 127.0.0.1 - - - - Anwar]]> - - 1139238216 - 127.0.0.1 - - - - - - 1139238165 - 127.0.0.1 - - - - - - 1139236876 - 127.0.0.1 - - - - - - 1139219548 - 127.0.0.1 - - - - - - 1139219038 - 127.0.0.1 - - - - - - 1139217322 - 127.0.0.1 - + From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 22:53:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:53:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3982 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060228065335.7E74549E31C@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:53:31 2006 New Revision: 3982 Log: install.php and install folder has been renamed for security issues Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 23:05:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 07:05:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2353=3A_D?= =?utf-8?q?atabase_schema_constraints?= Message-ID: <076.4da8f425ef7ccba782e7d18f60076fde@vtiger.fosslabs.com> #53: Database schema constraints ----------------------------------------+----------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.4rc3 Keywords: constraint database schema | ----------------------------------------+----------------------------------- ON DELETE CASCADE constraints on foreign keys are not compatible with most of database systems. Deleting one record in crmentity table generates cascading loops. This is only an example. Workaround : replace all ON CACADE DELETE by ON CASCADE NO ACTION It supposes to manage return codes on delete actions. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 23:26:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 07:26:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3983 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl salesEditView.tpl Message-ID: <20060228072616.3C55C49EEE5@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 00:26:08 2006 New Revision: 3983 Log: issue in Fckditor has been fixed Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Tue Feb 28 00:26:08 2006 @@ -994,7 +994,6 @@

- @@ -1014,6 +1013,7 @@ {/if} + {/if} +'; - if($i>0) + $imagenamelists.=''; + $imagelists = $imagelists.$imagenamelists; + if($imagecount>0) return $imagelists; } From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 02:52:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 10:52:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3994 - in /vtigercrm/trunk: Smarty/templates/HomePage.tpl smiletag/smiletag-script.js smiletag/smiletag-style.css Message-ID: <20060228105259.8447449EDBD@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 03:52:42 2006 New Revision: 3994 Log: smiletag made into expand collapse mode Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/smiletag/smiletag-script.js vtigercrm/trunk/smiletag/smiletag-style.css Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Feb 28 03:52:42 2006 @@ -130,13 +130,16 @@ Pipeline chart comes here..

- - YOUR SHOUT!!! - +

- -

+ + +

YOUR SHOUT!!!

{if $TAGCLOUD_JS ne ''} @@ -187,8 +192,18 @@ -

+ Modified: vtigercrm/trunk/smiletag/smiletag-script.js ============================================================================== --- vtigercrm/trunk/smiletag/smiletag-script.js (original) +++ vtigercrm/trunk/smiletag/smiletag-script.js Tue Feb 28 03:52:42 2006 @@ -103,11 +103,11 @@ var smileyBox = document.getElementById('smiley_box'); smileyBox.style.display = 'block'; - var st = Math.max(document.body.scrollTop,document.documentElement.scrollTop); +/* var st = Math.max(document.body.scrollTop,document.documentElement.scrollTop); var leftPos = e.clientX - 100; if(leftPos<0)leftPos = 0; smileyBox.style.left = leftPos + 'px'; - smileyBox.style.top = e.clientY - smileyBox.offsetHeight -1 + st + 'px'; + smileyBox.style.top = e.clientY - smileyBox.offsetHeight -1 + st + 'px';*/ } function hideSmileyWindow() Modified: vtigercrm/trunk/smiletag/smiletag-style.css ============================================================================== --- vtigercrm/trunk/smiletag/smiletag-style.css (original) +++ vtigercrm/trunk/smiletag/smiletag-style.css Tue Feb 28 03:52:42 2006 @@ -64,7 +64,7 @@ #smiley_box{ width:95px; - position:absolute; + position:relative; display:none; margin-left: 55px; border: 0px; From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 03:04:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 11:04:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3995 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060228110400.9F64549EEF6@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 04:03:55 2006 New Revision: 3995 Log: added contact image Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Feb 28 04:03:55 2006 @@ -183,10 +183,14 @@ if($imagename != '') { $imgpath = "test/contact/".$imagename; - $label_fld[] ='

'.$mod_strings[$fieldlabel]; + $label_fld[] =$mod_strings[$fieldlabel]; + $label_fld["cntimage"] ='

'.$mod_strings[$fieldlabel]; } else - $label_fld[] =$mod_strings[$fieldlabel]; + { + $label_fld[] =$mod_strings[$fieldlabel]; + } + } else { @@ -929,7 +933,7 @@ $tabid = $adb->query_result($result,$i,"tabid"); $output .= ''; $custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid); - $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); + $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); $i++; if($i<$noofrows) { @@ -943,7 +947,7 @@ $tabid = $adb->query_result($result,$i,"tabid"); $custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid); - $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); + $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); } } From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 03:06:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 11:06:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3996 - /vtigercrm/trunk/Smarty/templates/DetailView.tpl Message-ID: <20060228110619.2064849EF67@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 04:06:13 2006 New Revision: 3996 Log: * modified for contact image Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Feb 28 04:06:13 2006 @@ -234,32 +234,37 @@ {assign var=keyseclink value=$data.link} {assign var=keycursymb value=$data.cursymb} {assign var=keysalut value=$data.salut} + {assign var=keycntimage value=$data.cntimage} {if $label ne ''} - {$label} + {if $keycntimage ne ''} + {$keycntimage} + {else} + {$label} + {/if} {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} - - {if $keyid eq '55'} + + {if $keyid eq '55'} {$keysalut} - {elseif $keyid eq '71' || $keyid eq '72'} + {elseif $keyid eq '71' || $keyid eq '72'} {$keycursymb} {/if} {$keyval} {elseif $keyid eq '13'} - {$keyval} + {$keyval} {elseif $keyid eq '15' || $keyid eq '16'} - {$keyval} + {$keyval} {elseif $keyid eq '17'} - {$keyval} + {$keyval} {elseif $keyid eq '19' || $keyid eq '20'} - {$keyval} + {$keyval} {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} - {$keyval} + {$keyval} {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} - {$keyval} -

Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Thu Feb 23 03:48:26 2006 @@ -1206,3 +1206,57 @@ } } +/* +* javascript function to add field rows +* @param option_values :: List of Field names +*/ +function fnAddSrch(option_values){ + + var tableName = document.getElementById('adSrc'); + + var prev = tableName.rows.length; + + var count = prev; + + var row = tableName.insertRow(prev); + + if(count%2) + + row.className = "dvtCellLabel"; + + else + + row.className = "dvtCellInfo"; + + var colone = row.insertCell(0); + + var coltwo = row.insertCell(1); + + var colthree = row.insertCell(2); + + //colone.innerHTML=""; + colone.innerHTML=""; + + coltwo.innerHTML=" "; + + colthree.innerHTML=""; + +} + +/* +* javascript function to delete field rows in advance search +* @param void :: void +*/ +function delRow() +{ + + var tableName = document.getElementById('adSrc'); + + var prev = tableName.rows.length; + + if(prev > 1) + + document.getElementById('adSrc').deleteRow(prev-1); + +} + Modified: vtigercrm/trunk/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/SearchUtils.php (original) +++ vtigercrm/trunk/include/utils/SearchUtils.php Thu Feb 23 03:48:26 2006 @@ -302,8 +302,77 @@ } return $where; } - - - +function getAdvSearchfields($module) + { + global $adb; + $tabid = getTabid($module); + global $profile_id; + + $sql = "select * from field inner join profile2field on profile2field.fieldid=field.fieldid"; + $sql.= " where field.tabid=".$tabid." and"; + $sql.= " field.displaytype in (1,2) and profile2field.visible=0"; + $sql.= " and profile2field.profileid=".$profile_id." order by block,sequence"; + + $result = $adb->query($sql); + $noofrows = $adb->num_rows($result); + $block = ''; + //Added on 14-10-2005 -- added ticket id in list + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['crmentity:crmid::HelpDesk_Ticket ID:I'] = 'Ticket ID'; + } + //Added to include activity type in activity customview list + if($module == 'Activities' && $block == 19) + { + $module_columnlist['activity:activitytype::Activities_Activity Type:C'] = 'Activity Type'; + } + + for($i=0; $i<$noofrows; $i++) + { + $fieldtablename = $adb->query_result($result,$i,"tablename"); + $fieldcolname = $adb->query_result($result,$i,"columnname"); + $fieldtype = explode("~",$fieldtype); + $fieldtypeofdata = $fieldtype[0]; + /*if($fieldcolname == "crmid" || $fieldcolname == "parent_id") + { + $fieldtablename = "crmentity"; + $fieldcolname = "setype"; + }*/ + $fieldlabel = $adb->query_result($result,$i,"fieldlabel"); + if($fieldlabel == "Related To") + { + $fieldlabel = "Related to"; + } + if($fieldlabel == "Start Date & Time") + { + $fieldlabel = "Start Date"; + if($module == 'Activities' && $block == 19) + $module_columnlist['activity:time_start::Activities_Start Time:I'] = 'Start Time'; + + } + $fieldlabel1 = str_replace(" ","_",$fieldlabel); + //$module_columnlist[$optionvalue] = $fieldlabel; + if ($i==0) + $OPTION_SET .= ""; + else + $OPTION_SET .= ""; + } + return $OPTION_SET; + } + +function getcriteria_options() +{ + $CRIT_OPT = " + + + + + "; + return $CRIT_OPT; +} +function getSearch_criteria() +{ + $condition_array = Array(''=>'',''=>'',''=>'',''=>'',''=>'',''=>''); +} ?> Modified: vtigercrm/trunk/modules/Leads/ListView.php ============================================================================== --- vtigercrm/trunk/modules/Leads/ListView.php (original) +++ vtigercrm/trunk/modules/Leads/ListView.php Thu Feb 23 03:48:26 2006 @@ -256,6 +256,10 @@ $navigationOutput = getTableHeaderNavigation($navigation_array, $url_string,"Leads","index",$viewid); $alphabetical = AlphabeticalSearch($currentModule,'index','lastname','true','basic',"","","","",$viewid); +$fieldnames = getAdvSearchfields($module); +$criteria = getcriteria_options(); +$smarty->assign("CRITERIA", $criteria); +$smarty->assign("FIELDNAMES", $fieldnames); $smarty->assign("ALPHABETICAL", $alphabetical); $smarty->assign("NAVIGATION", $navigationOutput); $smarty->assign("RECORD_COUNTS", $record_string); Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Thu Feb 23 03:48:26 2006 @@ -809,3 +809,30 @@ display:none; } +/*Added for Advance Seearch*/ +#scrollTab{ + position:relative; + width:100%; + height:350px; + overflow:auto; + border:0px solid #CCCCCC; + display:block; +} + +.dock{ + vertical-align:middle; + text-align:left; + padding-left:0px; +} + +.imgDoc{ + cursor:pointer; + border:0px; +} + +#one{ + position:relative; + display:block; + width:245px; +} + From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 05:51:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 10:51:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3896 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060223105146.452DA49A515@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 03:51:41 2006 New Revision: 3896 Log: property modified Modified: vtigercrm/trunk/modules/Users/Forms.php (contents, props changed) Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:16:44 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:16:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3897 - /vtigercrm/trunk/modules/Users/Forms.php Message-ID: <20060223111644.C4B374988EB@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:16:39 2006 New Revision: 3897 Log: Incorporated field validations while creating new users for CRM Modified: vtigercrm/trunk/modules/Users/Forms.php Modified: vtigercrm/trunk/modules/Users/Forms.php ============================================================================== --- vtigercrm/trunk/modules/Users/Forms.php (original) +++ vtigercrm/trunk/modules/Users/Forms.php Thu Feb 23 04:16:39 2006 @@ -34,6 +34,8 @@ $lbl_last_name = $mod_strings['LBL_LIST_LAST_NAME']; $lbl_user_name = $mod_strings['LBL_LIST_USER_NAME']; +$lbl_new_password = $mod_strings['LBL_LIST_PASSWORD']; +$lbl_confirm_new_password = $mod_strings['LBL_LIST_CONFIRM_PASSWORD']; $lbl_user_email1 = $mod_strings['LBL_LIST_EMAIL']; $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; @@ -57,13 +59,21 @@ function verify_data(form) { var isError = false; var errorMessage = ""; + if (trim(form.user_name.value) == "") { + isError = true; + errorMessage += "\\n$lbl_user_name"; + } + if (trim(form.new_password.value) == "") { + isError = true; + errorMessage += "\\n$lbl_new_password"; + } + if (trim(form.confirm_new_password.value) == "") { + isError = true; + errorMessage += "\\n$lbl_confirm_new_password"; + } if (trim(form.last_name.value) == "") { isError = true; errorMessage += "\\n$lbl_last_name"; - } - if (trim(form.user_name.value) == "") { - isError = true; - errorMessage += "\\n$lbl_user_name"; } if (trim(form.email1.value) == "") { isError = true; From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:22:50 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:22:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3898 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060223112250.A156C49A3F6@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:22:46 2006 New Revision: 3898 Log: property modified Modified: vtigercrm/trunk/modules/Users/User.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:26:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:26:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3899 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060223112640.42DDC49A558@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:26:36 2006 New Revision: 3899 Log: property modified Modified: vtigercrm/trunk/modules/Users/EditView.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:28:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:28:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3900 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060223112824.F1FCC49A4B1@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:28:20 2006 New Revision: 3900 Log: Appended 'parenttab=Setting' in the User.php file Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Thu Feb 23 04:28:20 2006 @@ -585,7 +585,7 @@ { $entries=array(); $id=$this->db->query_result($result,$i-1,'id'); - $entries[]='

'; + $entries[]='

'; $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; $entries[]=$this->db->query_result($result,$i-1,'department'); From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:30:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:30:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3901 - /vtigercrm/trunk/modules/Users/EditView.php Message-ID: <20060223113039.1B63B49A59B@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:30:35 2006 New Revision: 3901 Log: Smartised the EditView.php file Modified: vtigercrm/trunk/modules/Users/EditView.php Modified: vtigercrm/trunk/modules/Users/EditView.php ============================================================================== --- vtigercrm/trunk/modules/Users/EditView.php (original) +++ vtigercrm/trunk/modules/Users/EditView.php Thu Feb 23 04:30:35 2006 @@ -20,7 +20,7 @@ * Contributor(s): ______________________________________.. ********************************************************************************/ -require_once('XTemplate/xtpl.php'); +require_once('Smarty_setup.php'); require_once('data/Tracker.php'); require_once('modules/Users/User.php'); require_once('include/utils/UserInfoUtil.php'); @@ -33,13 +33,16 @@ global $app_list_strings; global $mod_strings; + $focus = new User(); if(isset($_REQUEST['record']) && isset($_REQUEST['record'])) { + $mode='edit'; if (!is_admin($current_user) && $_REQUEST['record'] != $current_user->id) die ("Unauthorized access to user administration."); $focus->retrieve($_REQUEST['record']); }else { + $mode='create'; $password=' *Password @@ -59,59 +62,66 @@ require_once($theme_path.'layout_utils.php'); $log->info("User edit view"); -$xtpl=new XTemplate ('modules/Users/EditView.html'); -$xtpl->assign("MOD", $mod_strings); -$xtpl->assign("APP", $app_strings); - -if (isset($_REQUEST['error_string'])) $xtpl->assign("ERROR_STRING", "Error: ".$_REQUEST['error_string'].""); + +$smarty=new vtigerCRM_Smarty; + +$smarty->assign("UMOD", $mod_strings); +global $current_language; +$smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("MOD", $smod_strings); + +$smarty->assign("APP", $app_strings); + +if (isset($_REQUEST['error_string'])) $smarty->assign("ERROR_STRING", "Error: ".$_REQUEST['error_string'].""); if (isset($_REQUEST['return_module'])) { - $xtpl->assign("RETURN_MODULE", $_REQUEST['return_module']); + $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']); $RETURN_MODULE=$_REQUEST['return_module']; } if (isset($_REQUEST['return_action'])) { - $xtpl->assign("RETURN_ACTION", $_REQUEST['return_action']); + $smarty->assign("RETURN_ACTION", $_REQUEST['return_action']); $RETURN_ACTION = $_REQUEST['return_action']; } if(isset($_REQUEST['activity_mode'])) { - $xtpl->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); + $smarty->assign("ACTIVITYMODE",$_REQUEST['activity_mode']); } if ($_REQUEST['isDuplicate'] != 'true' && isset($_REQUEST['return_id'])) { - $xtpl->assign("RETURN_ID", $_REQUEST['return_id']); + $smarty->assign("RETURN_ID", $_REQUEST['return_id']); $RETURN_ID = $_REQUEST['return_id']; } -$xtpl->assign("JAVASCRIPT", get_set_focus_js().get_validate_record_js()); -$xtpl->assign("IMAGE_PATH", $image_path);$xtpl->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']); -$xtpl->assign("ID", $focus->id); -$xtpl->assign("USER_NAME", $focus->user_name); -$xtpl->assign("FIRST_NAME", $focus->first_name); -$xtpl->assign("LAST_NAME", $focus->last_name); -$xtpl->assign("TITLE", $focus->title); -$xtpl->assign("DEPARTMENT", $focus->department); -$xtpl->assign("REPORTS_TO_ID", $focus->reports_to_id); -$xtpl->assign("REPORTS_TO_NAME", $focus->reports_to_name); -$xtpl->assign("PHONE_HOME", $focus->phone_home); -$xtpl->assign("PHONE_MOBILE", $focus->phone_mobile); -$xtpl->assign("PHONE_WORK", $focus->phone_work); -$xtpl->assign("PHONE_OTHER", $focus->phone_other); -$xtpl->assign("PHONE_FAX", $focus->phone_fax); -$xtpl->assign("EMAIL1", $focus->email1); -$xtpl->assign("EMAIL2", $focus->email2); -$xtpl->assign("YAHOO_ID", $focus->yahoo_id); -if (isset($focus->yahoo_id) && $focus->yahoo_id !== "") $xtpl->assign("YAHOO_MESSENGER", "

'); + $smarty->assign("CAL_COLOR",'

'); if (isset($default_user_name) && $default_user_name != "" @@ -258,29 +268,31 @@ && isset($lock_default_user_name) && $lock_default_user_name == true ) { $status .= " disabled "; - $xtpl->assign("DISABLED", "disabled"); + $smarty->assign("DISABLED", "disabled"); } if ($_REQUEST['Edit'] == ' Edit ') { - $xtpl->assign("READONLY", "readonly"); - $xtpl->assign("USERNAME_READONLY", "readonly"); + $smarty->assign("READONLY", "readonly"); + $smarty->assign("USERNAME_READONLY", "readonly"); } if(isset($_REQUEST['record']) && $_REQUEST['isDuplicate'] != 'true') { - $xtpl->assign("USERNAME_READONLY", "readonly"); -} - - - -if (is_admin($current_user) && $focus->is_admin == 'on') $xtpl->assign("IS_ADMIN", "checked"); + $smarty->assign("USERNAME_READONLY", "readonly"); +} + + + +if (is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "checked"); elseif (is_admin($current_user) && $focus->is_admin != 'on') ; -elseif (!is_admin($current_user) && $focus->is_admin == 'on') $xtpl->assign("IS_ADMIN", "disabled checked"); -else $xtpl->assign("IS_ADMIN", "disabled"); - -$xtpl->parse("main"); -$xtpl->out("main"); +elseif (!is_admin($current_user) && $focus->is_admin == 'on') $smarty->assign("IS_ADMIN", "disabled checked"); +else $smarty->assign("IS_ADMIN", "disabled"); + +//$smarty->assign("",$focus->getUserListViewHeader()); + +$smarty->display("UserEditView.tpl"); + /* echo "
"; if(is_admin($current_user) && ! isset($focus->id)) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 06:33:49 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 11:33:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3902 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060223113349.AB8E449A59B@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 04:33:45 2006 New Revision: 3902 Log: Modified the Language file to include new field labels from the New UI Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 09:20:54 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:20:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3903 - /vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Message-ID: <20060223142055.32ED949A222@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:20:50 2006 New Revision: 3903 Log: Created UserDetailView.tpl file for smartification of My Preferences & User Settings Detail View Added: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 09:22:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:22:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3904 - /vtigercrm/trunk/modules/Users/language/en_us.lang.php Message-ID: <20060223142220.F39CD49A222@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:22:17 2006 New Revision: 3904 Log: Made changes in the language file for accessing field label in Detail View - Settings Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Users/language/en_us.lang.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 09:26:17 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:26:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3905 - /vtigercrm/trunk/modules/Users/User.php Message-ID: <20060223142617.6149E49A53B@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:26:12 2006 New Revision: 3905 Log: Appended 'parenttab=Settings' in getUserListViewEntries function's Detail View Entries Array Modified: vtigercrm/trunk/modules/Users/User.php Modified: vtigercrm/trunk/modules/Users/User.php ============================================================================== --- vtigercrm/trunk/modules/Users/User.php (original) +++ vtigercrm/trunk/modules/Users/User.php Thu Feb 23 07:26:12 2006 @@ -587,7 +587,7 @@ $id=$this->db->query_result($result,$i-1,'id'); $entries[]='

'; $entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name'); - $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; + $entries[]=''.$this->db->query_result($result,$i-1,'user_name').''; $entries[]=$this->db->query_result($result,$i-1,'department'); $entries[]=$this->db->query_result($result,$i-1,'email1'); $entries[]=fetchUserRole($this->db->query_result($result,$i-1,'id')); From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 09:32:11 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 14:32:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3906 - /vtigercrm/trunk/modules/Users/DetailView.php Message-ID: <20060223143211.0784549A5C1@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 07:32:08 2006 New Revision: 3906 Log: Smartised the DetailView PHP File Modified: vtigercrm/trunk/modules/Users/DetailView.php Modified: vtigercrm/trunk/modules/Users/DetailView.php ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 11:30:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:30:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3907 - /vtigercrm/trunk/adodb/DatabaseSchema.xml Message-ID: <20060223163007.1E7BB49A583@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:30:00 2006 New Revision: 3907 Log: attachment contents and attachments size are removed from attachments table Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml Modified: vtigercrm/trunk/adodb/DatabaseSchema.xml ============================================================================== --- vtigercrm/trunk/adodb/DatabaseSchema.xml (original) +++ vtigercrm/trunk/adodb/DatabaseSchema.xml Thu Feb 23 09:30:00 2006 @@ -1074,14 +1074,6 @@ - - - - - - - - Type=InnoDB attachmentsid From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 11:30:56 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:30:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3908 - /vtigercrm/trunk/storage/ Message-ID: <20060223163056.7A7BF49A765@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:30:51 2006 New Revision: 3908 Log: folder added for uploads Added: vtigercrm/trunk/storage/ From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 11:32:22 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:32:22 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3909 - /vtigercrm/trunk/storage/vtiger.txt Message-ID: <20060223163222.A855349A765@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:32:18 2006 New Revision: 3909 Log: file added to make the folder a non-empty one Added: vtigercrm/trunk/storage/vtiger.txt From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 11:55:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 16:55:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3910 - in /vtigercrm/trunk: Smarty/templates/CreateView.tpl Smarty/templates/salesEditView.tpl include/RelatedListView.php modules/uploads/add2db.php modules/uploads/upload.php Message-ID: <20060223165531.E61FE49A752@vtiger.fosslabs.com> Author: saraj Date: Thu Feb 23 09:55:20 2006 New Revision: 3910 Log: multipleuploads has been integrated for attachments and the storage location has been changed Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl vtigercrm/trunk/include/RelatedListView.php vtigercrm/trunk/modules/uploads/add2db.php vtigercrm/trunk/modules/uploads/upload.php Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Thu Feb 23 09:55:20 2006 @@ -451,10 +451,27 @@ - {elseif $uitype eq 69 || $uitype eq 61} + {elseif $uitype eq 69} {$fldlabel} - {$fldvalue} - + + {if $MODULE eq 'Products'} + +

Files Maximum 6 + +

- - + +

@@ -453,9 +453,35 @@ - {elseif $uitype eq 69 || $uitype eq 61} + {elseif $uitype eq 69} {$fldlabel} - {$fldvalue} + + {if $MODULE eq 'Products'} + +

Files Maximum 6 + + {foreach key=num item=image from=$maindata[3]} + {if $image neq ''} +

[{$image}] +

+ {/if} + {/foreach} +

- + + +

Files Maximum 6 + + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 14:51:27 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 23 Feb 2006 19:51:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3911 - in /vtigercrm/branches/4.2/adodb: ./ datadict/ drivers/ perf/ session/ session/old/ tests/ Message-ID: <20060223195129.DC84849A749@vtiger.fosslabs.com> Author: jeffk Date: Thu Feb 23 12:50:55 2006 New Revision: 3911 Log: refs #7. brings our snapshot to zero-diff with adodb-4.72 Added: vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php vtigercrm/branches/4.2/adodb/adodb-error.inc.php vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php vtigercrm/branches/4.2/adodb/adodb-lib.inc.php vtigercrm/branches/4.2/adodb/adodb-pager.inc.php vtigercrm/branches/4.2/adodb/adodb-pear.inc.php vtigercrm/branches/4.2/adodb/adodb-perf.inc.php vtigercrm/branches/4.2/adodb/adodb-php4.inc.php vtigercrm/branches/4.2/adodb/adodb-time.inc.php vtigercrm/branches/4.2/adodb/adodb.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php vtigercrm/branches/4.2/adodb/pivottable.inc.php vtigercrm/branches/4.2/adodb/rsfilter.inc.php vtigercrm/branches/4.2/adodb/server.php vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/adodb-session.php vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php vtigercrm/branches/4.2/adodb/session/old/adodb-session.php vtigercrm/branches/4.2/adodb/tests/benchmark.php vtigercrm/branches/4.2/adodb/tests/pdo.php vtigercrm/branches/4.2/adodb/tests/test-datadict.php vtigercrm/branches/4.2/adodb/tests/test-php5.php vtigercrm/branches/4.2/adodb/tests/test.php vtigercrm/branches/4.2/adodb/tests/test3.php vtigercrm/branches/4.2/adodb/tests/test5.php vtigercrm/branches/4.2/adodb/tests/testcache.php vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php vtigercrm/branches/4.2/adodb/tests/testoci8.php vtigercrm/branches/4.2/adodb/tests/testoci8cursor.php vtigercrm/branches/4.2/adodb/tests/testpaging.php vtigercrm/branches/4.2/adodb/tests/testpear.php vtigercrm/branches/4.2/adodb/tests/testsessions.php vtigercrm/branches/4.2/adodb/toexport.inc.php vtigercrm/branches/4.2/adodb/tohtml.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php Thu Feb 23 12:50:55 2006 @@ -8,7 +8,7 @@ /* - V4.71 24 Jan 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved. + V4.72 21 Feb 2006 (c) 2000-2006 John Lim (jlim at natsoft.com.my). All rights reserved. Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, the BSD license will take precedence. See License.txt. Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Thu Feb 23 12:50:55 2006 @@ -1,7 +1,7 @@ sql = $sql; $this->id = $id; @@ -70,7 +70,7 @@ $next_page = $id.'_next_page'; if (isset($_GET[$next_page])) { - $_SESSION[$curr_page] = $_GET[$next_page]; + $_SESSION[$curr_page] = (integer) $_GET[$next_page]; } if (empty($_SESSION[$curr_page])) $_SESSION[$curr_page] = 1; ## at first page Modified: vtigercrm/branches/4.2/adodb/adodb-pear.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-pear.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-pear.inc.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ Testing date formating

";
-	echo $e;
-	echo "

";
+	echo $e;
+	echo "

"; $db = NewADOConnection($dbType); $dict = NewDataDictionary($db); Modified: vtigercrm/branches/4.2/adodb/tests/test-php5.php ============================================================================== --- vtigercrm/branches/4.2/adodb/tests/test-php5.php (original) +++ vtigercrm/branches/4.2/adodb/tests/test-php5.php Thu Feb 23 12:50:55 2006 @@ -1,6 +1,6 @@ Author: mfedyk Date: Thu Feb 23 17:00:50 2006 New Revision: 3912 Log: Fix Quotes/Invoices/Orders Do Not Support Negative Adjustments, by briand. close #30 Modified: vtigercrm/branches/4.2/modules/Invoice/EditView.html vtigercrm/branches/4.2/modules/Orders/EditView.html vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html vtigercrm/branches/4.2/modules/Quotes/EditView.html Modified: vtigercrm/branches/4.2/modules/Invoice/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Invoice/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Invoice/EditView.html Thu Feb 23 17:00:50 2006 @@ -500,7 +500,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } Modified: vtigercrm/branches/4.2/modules/Orders/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Orders/EditView.html Thu Feb 23 17:00:50 2006 @@ -493,7 +493,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } Modified: vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html (original) +++ vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.html Thu Feb 23 17:00:50 2006 @@ -498,7 +498,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } Modified: vtigercrm/branches/4.2/modules/Quotes/EditView.html ============================================================================== --- vtigercrm/branches/4.2/modules/Quotes/EditView.html (original) +++ vtigercrm/branches/4.2/modules/Quotes/EditView.html Thu Feb 23 17:00:50 2006 @@ -498,7 +498,7 @@ if (getObj("txtTax").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) if (!numValidate("txtTax","Tax","any")) return false if (getObj("txtAdjustment").value.replace(/^\s+/g, '').replace(/\s+$/g, '').length>0) - if (!numValidate("txtAdjustment","Adjustment","any")) return false + if (!numValidate("txtAdjustment","Adjustment","any",true)) return false return true } From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 19:14:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 00:14:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3913 - in /vtigercrm/branches/4.2: ./ adodb/ adodb/contrib/ adodb/datadict/ adodb/drivers/ adodb/lang/ adodb/pear/Auth/Container/ adodb/perf/ adodb/session/ adodb/session/old/ adodb/tests/ include/ include/ListView/ include/database/ include/fckeditor/ include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/ include/fckeditor/editor/filemanager/browser/default/connectors/php/ include/feedParser/ include/fpdf/ include/fpdf/font/ include/language/ include/lastrss/ include/nusoap/ include/php_writeexcel/ install/ jpgraph/ jpgraph/lang/ modules/Accounts/ modules/Accounts/language/ modules/Activities/ modules/Activities/language/ modules/Administration/ modules/Administration/language/ modules/Calendar/ modules/Calendar/admin/ modules/Calendar/language/ modules/Calls/ modules/Calls/language/ modules/Cases/ modules/Cases/language/ modules/Contacts/ modules/Contacts/language/ modules/CustomView/ modules/CustomView/language/ modules/Dashboard/ modules/Dashboard/language/ modules/Emails/ modules/Emails/language/ modules/Emails/templates/ modules/Faq/ modules/Faq/language/ modules/Help/ modules/Help/language/ modules/HelpDesk/ modules/HelpDesk/language/ modules/Home/ modules/Home/language/ modules/Import/ modules/Import/language/ modules/Invoice/ modules/Invoice/language/ modules/Leads/ modules/Leads/language/ modules/Meetings/ modules/Meetings/language/ modules/MessageBoard/ modules/MessageBoard/admin/ modules/MessageBoard/attach_mod/ modules/MessageBoard/attach_mod/includes/ modules/MessageBoard/cache/ modules/MessageBoard/db/ modules/MessageBoard/files/ modules/MessageBoard/includes/ modules/MessageBoard/language/ modules/MessageBoard/language/lang_english/ modules/MessageBoard/language/lang_german/ modules/MessageBoard/mods/phpbb_fetch_all/ modules/MessageBoard/spelling/ modules/Notes/ modules/Notes/language/ modules/Orders/ modules/Orders/language/ modules/Potentials/ modules/Potentials/language/ modules/Products/ modules/Products/language/ modules/Quotes/ modules/Quotes/language/ modules/Reports/ modules/Reports/language/ modules/Rss/ modules/Rss/language/ modules/Settings/ modules/Settings/language/ modules/System/ modules/System/includes/ modules/System/includes/lang/ modules/System/includes/mb/ modules/System/includes/os/ modules/System/includes/xml/ modules/System/language/ modules/Tasks/ modules/Tasks/language/ modules/Users/ modules/Users/language/ modules/Utilities/ modules/Yahoo/language/ modules/imports/ modules/imports/Excel/ modules/squirrelmail-1.4.4/ modules/squirrelmail-1.4.4/Mail/ modules/squirrelmail-1.4.4/class/ modules/squirrelmail-1.4.4/class/deliver/ modules/squirrelmail-1.4.4/class/helper/ modules/squirrelmail-1.4.4/class/mime/ modules/squirrelmail-1.4.4/config/ modules/squirrelmail-1.4.4/functions/ modules/squirrelmail-1.4.4/functions/decode/ modules/squirrelmail-1.4.4/functions/encode/ modules/squirrelmail-1.4.4/images/ modules/squirrelmail-1.4.4/include/ modules/squirrelmail-1.4.4/include/options/ modules/squirrelmail-1.4.4/language/ modules/squirrelmail-1.4.4/locale/ modules/squirrelmail-1.4.4/plugins/info/ modules/squirrelmail-1.4.4/plugins/mail_fetch/ modules/uploads/ modules/uploads/language/ themes/Aqua/ themes/blue/ themes/busthree/ themes/coolblue/ themes/coolblue/language/ themes/nature/ themes/orange/ Message-ID: <20060224001407.5978F3EBD1E@vtiger.fosslabs.com> Author: mfedyk Date: Thu Feb 23 17:10:34 2006 New Revision: 3913 Log: set text/plain mime type on all php files Modified: vtigercrm/branches/4.2/adodb/adodb-csvlib.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-error.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-errorhandler.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-errorpear.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-exceptions.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-iterator.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-lib.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-pager.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-pear.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-perf.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-php4.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-time.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php (props changed) vtigercrm/branches/4.2/adodb/adodb.inc.php (props changed) vtigercrm/branches/4.2/adodb/contrib/toxmlrpc.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-access.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-firebird.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-generic.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-ibase.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-informix.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-oci8.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-postgres.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-sapdb.inc.php (props changed) vtigercrm/branches/4.2/adodb/datadict/datadict-sybase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-access.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado5.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado_access.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ado_mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-borland_ibase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-csv.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-fbsql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-firebird.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ibase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-informix.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-informix72.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-ldap.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mssqlpo.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mysqli.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-mysqlt.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-netezza.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oci8.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oci805.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oci8po.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbc_oracle.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-odbtp_unicode.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-oracle.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_oci.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-pdo_pgsql.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres64.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres7.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-postgres8.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-proxy.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sapdb.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sqlanywhere.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sqlite.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sqlitepo.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sybase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-sybase_ase.inc.php (props changed) vtigercrm/branches/4.2/adodb/drivers/adodb-vfp.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ar.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-bg.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-bgutf8.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ca.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-cn.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-cz.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-da.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-de.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-en.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-es.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-esperanto.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-fr.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-hu.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-it.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-nl.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-pl.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-pt-br.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ro.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-ru1251.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-sv.inc.php (props changed) vtigercrm/branches/4.2/adodb/lang/adodb-uk1251.inc.php (props changed) vtigercrm/branches/4.2/adodb/pear/Auth/Container/ADOdb.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-db2.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-informix.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-mssql.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-mysql.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-oci8.inc.php (props changed) vtigercrm/branches/4.2/adodb/perf/perf-postgres.inc.php (props changed) vtigercrm/branches/4.2/adodb/pivottable.inc.php (props changed) vtigercrm/branches/4.2/adodb/rsfilter.inc.php (props changed) vtigercrm/branches/4.2/adodb/server.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-compress-bzip2.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-compress-gzip.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-cryptsession.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-mcrypt.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-md5.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-secret.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-encrypt-sha1.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-session-clob.php (props changed) vtigercrm/branches/4.2/adodb/session/adodb-session.php (props changed) vtigercrm/branches/4.2/adodb/session/crypt.inc.php (props changed) vtigercrm/branches/4.2/adodb/session/old/adodb-cryptsession.php (props changed) vtigercrm/branches/4.2/adodb/session/old/adodb-session-clob.php (props changed) vtigercrm/branches/4.2/adodb/session/old/adodb-session.php (props changed) vtigercrm/branches/4.2/adodb/session/old/crypt.inc.php (props changed) vtigercrm/branches/4.2/adodb/tests/benchmark.php (props changed) vtigercrm/branches/4.2/adodb/tests/client.php (props changed) vtigercrm/branches/4.2/adodb/tests/pdo.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-datadict.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-perf.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-pgblob.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-php5.php (props changed) vtigercrm/branches/4.2/adodb/tests/test-xmlschema.php (props changed) vtigercrm/branches/4.2/adodb/tests/test.php (props changed) vtigercrm/branches/4.2/adodb/tests/test2.php (props changed) vtigercrm/branches/4.2/adodb/tests/test3.php (props changed) vtigercrm/branches/4.2/adodb/tests/test4.php (props changed) vtigercrm/branches/4.2/adodb/tests/test5.php (props changed) vtigercrm/branches/4.2/adodb/tests/test_rs_array.php (props changed) vtigercrm/branches/4.2/adodb/tests/testcache.php (props changed) vtigercrm/branches/4.2/adodb/tests/testdatabases.inc.php (props changed) vtigercrm/branches/4.2/adodb/tests/testgenid.php (props changed) vtigercrm/branches/4.2/adodb/tests/testmssql.php (props changed) vtigercrm/branches/4.2/adodb/tests/testoci8.php (props changed) vtigercrm/branches/4.2/adodb/tests/testoci8cursor.php (props changed) vtigercrm/branches/4.2/adodb/tests/testpaging.php (props changed) vtigercrm/branches/4.2/adodb/tests/testpear.php (props changed) vtigercrm/branches/4.2/adodb/tests/testsessions.php (props changed) vtigercrm/branches/4.2/adodb/tests/time.php (props changed) vtigercrm/branches/4.2/adodb/tests/tmssql.php (props changed) vtigercrm/branches/4.2/adodb/toexport.inc.php (props changed) vtigercrm/branches/4.2/adodb/tohtml.inc.php (props changed) vtigercrm/branches/4.2/config.inc.php (props changed) vtigercrm/branches/4.2/include/Calc.php (props changed) vtigercrm/branches/4.2/include/Clock.php (props changed) vtigercrm/branches/4.2/include/ComboStrings.php (props changed) vtigercrm/branches/4.2/include/ComboUtil.php (props changed) vtigercrm/branches/4.2/include/CustomFieldUtil.php (props changed) vtigercrm/branches/4.2/include/FormValidationUtil.php (props changed) vtigercrm/branches/4.2/include/ListView/ListView.php (props changed) vtigercrm/branches/4.2/include/PopulateComboValues.php (props changed) vtigercrm/branches/4.2/include/PopulateCustomFieldTables.php (props changed) vtigercrm/branches/4.2/include/PopulatePhpBBtables.php (props changed) vtigercrm/branches/4.2/include/RelatedListView.php (props changed) vtigercrm/branches/4.2/include/RelatedTicketListUtil.php (props changed) vtigercrm/branches/4.2/include/backup.php (props changed) vtigercrm/branches/4.2/include/database/PearDatabase.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/config.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/io.php (props changed) vtigercrm/branches/4.2/include/fckeditor/editor/filemanager/browser/default/connectors/php/util.php (props changed) vtigercrm/branches/4.2/include/fckeditor/fckeditor.php (props changed) vtigercrm/branches/4.2/include/feedParser/feedParser.php (props changed) vtigercrm/branches/4.2/include/feedParser/xmlParser.php (props changed) vtigercrm/branches/4.2/include/file.php (props changed) vtigercrm/branches/4.2/include/formbase.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/courier.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helvetica.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helveticab.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helveticabi.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/helveticai.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/symbol.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/times.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/timesb.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/timesbi.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/timesi.php (props changed) vtigercrm/branches/4.2/include/fpdf/font/zapfdingbats.php (props changed) vtigercrm/branches/4.2/include/fpdf/fpdf.php (props changed) vtigercrm/branches/4.2/include/ftp.php (props changed) vtigercrm/branches/4.2/include/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/include/lastrss/lastRSS.php (props changed) vtigercrm/branches/4.2/include/listview.php (props changed) vtigercrm/branches/4.2/include/logging.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.nusoap_base.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_fault.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_parser.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_server.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_transport_http.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soap_val.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.soapclient.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.wsdl.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.wsdlcache.php (props changed) vtigercrm/branches/4.2/include/nusoap/class.xmlschema.php (props changed) vtigercrm/branches/4.2/include/nusoap/nusoap.php (props changed) vtigercrm/branches/4.2/include/nusoap/nusoapmime.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.excel.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_biffwriter.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_format.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_formula.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_olewriter.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_workbook.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_workbookbig.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/class.writeexcel_worksheet.inc.php (props changed) vtigercrm/branches/4.2/include/php_writeexcel/functions.writeexcel_utility.inc.php (props changed) vtigercrm/branches/4.2/include/uifromdbutil.php (props changed) vtigercrm/branches/4.2/include/upload_file.php (props changed) vtigercrm/branches/4.2/install/config.template.php (props changed) vtigercrm/branches/4.2/jpgraph/jpgraph_antispam-digits.php (props changed) vtigercrm/branches/4.2/jpgraph/jpgraph_antispam.php (props changed) vtigercrm/branches/4.2/jpgraph/jpgraph_date.php (props changed) vtigercrm/branches/4.2/jpgraph/lang/en.inc.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Account.php (props changed) vtigercrm/branches/4.2/modules/Accounts/AccountFormBase.php (props changed) vtigercrm/branches/4.2/modules/Accounts/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/Accounts/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Delete.php (props changed) vtigercrm/branches/4.2/modules/Accounts/DeleteMemberAccountRelationship.php (props changed) vtigercrm/branches/4.2/modules/Accounts/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/EditView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Forms.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Import.php (props changed) vtigercrm/branches/4.2/modules/Accounts/ListView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Merge.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Popup.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Popup_picker.php (props changed) vtigercrm/branches/4.2/modules/Accounts/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Accounts/Save.php (props changed) vtigercrm/branches/4.2/modules/Accounts/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Accounts/index.php (props changed) vtigercrm/branches/4.2/modules/Accounts/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Activities/Activity.php (props changed) vtigercrm/branches/4.2/modules/Activities/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Activities/Delete.php (props changed) vtigercrm/branches/4.2/modules/Activities/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Activities/EditView.php (props changed) vtigercrm/branches/4.2/modules/Activities/Event.php (props changed) vtigercrm/branches/4.2/modules/Activities/Forms.php (props changed) vtigercrm/branches/4.2/modules/Activities/GroupAllocationView.php (props changed) vtigercrm/branches/4.2/modules/Activities/ListView.php (props changed) vtigercrm/branches/4.2/modules/Activities/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Activities/Save.php (props changed) vtigercrm/branches/4.2/modules/Activities/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Activities/index.php (props changed) vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Activities/sendreminder.php (props changed) vtigercrm/branches/4.2/modules/Activities/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Administration/Forms.php (props changed) vtigercrm/branches/4.2/modules/Administration/index.php (props changed) vtigercrm/branches/4.2/modules/Administration/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Authenticate.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Delete.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Forms.php (props changed) vtigercrm/branches/4.2/modules/Calendar/Save.php (props changed) vtigercrm/branches/4.2/modules/Calendar/UserCalendar.php (props changed) vtigercrm/branches/4.2/modules/Calendar/admin/create_config.php (props changed) vtigercrm/branches/4.2/modules/Calendar/admin/scheme.php (props changed) vtigercrm/branches/4.2/modules/Calendar/admin/update.php (props changed) vtigercrm/branches/4.2/modules/Calendar/calendar.php (props changed) vtigercrm/branches/4.2/modules/Calendar/calendar_day.php (props changed) vtigercrm/branches/4.2/modules/Calendar/calendar_week.php (props changed) vtigercrm/branches/4.2/modules/Calendar/config.php (props changed) vtigercrm/branches/4.2/modules/Calendar/gettext.php (props changed) vtigercrm/branches/4.2/modules/Calendar/i18n.php (props changed) vtigercrm/branches/4.2/modules/Calendar/index.php (props changed) vtigercrm/branches/4.2/modules/Calendar/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Calendar/logout.php (props changed) vtigercrm/branches/4.2/modules/Calendar/minical.php (props changed) vtigercrm/branches/4.2/modules/Calendar/minitimer.php (props changed) vtigercrm/branches/4.2/modules/Calendar/mytutos.php (props changed) vtigercrm/branches/4.2/modules/Calls/Call.php (props changed) vtigercrm/branches/4.2/modules/Calls/CallFormBase.php (props changed) vtigercrm/branches/4.2/modules/Calls/Delete.php (props changed) vtigercrm/branches/4.2/modules/Calls/DeleteCallContactRelationship.php (props changed) vtigercrm/branches/4.2/modules/Calls/DeleteCallUserRelationship.php (props changed) vtigercrm/branches/4.2/modules/Calls/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Calls/EditView.php (props changed) vtigercrm/branches/4.2/modules/Calls/Forms.php (props changed) vtigercrm/branches/4.2/modules/Calls/ListView.php (props changed) vtigercrm/branches/4.2/modules/Calls/Save.php (props changed) vtigercrm/branches/4.2/modules/Calls/SubPanelViewInvitees.php (props changed) vtigercrm/branches/4.2/modules/Calls/index.php (props changed) vtigercrm/branches/4.2/modules/Calls/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Cases/Case.php (props changed) vtigercrm/branches/4.2/modules/Cases/Charts.php (props changed) vtigercrm/branches/4.2/modules/Cases/ContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Cases/ContactCaseRelationshipEdit.php (props changed) vtigercrm/branches/4.2/modules/Cases/Delete.php (props changed) vtigercrm/branches/4.2/modules/Cases/DeleteContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Cases/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Cases/EditView.php (props changed) vtigercrm/branches/4.2/modules/Cases/Forms.php (props changed) vtigercrm/branches/4.2/modules/Cases/ListView.php (props changed) vtigercrm/branches/4.2/modules/Cases/Popup.php (props changed) vtigercrm/branches/4.2/modules/Cases/Save.php (props changed) vtigercrm/branches/4.2/modules/Cases/SaveContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Cases/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Cases/index.php (props changed) vtigercrm/branches/4.2/modules/Cases/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Contacts/AddBusinessCard.php (props changed) vtigercrm/branches/4.2/modules/Contacts/BusinessCard.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Contact.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ContactFormBase.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ContactOpportunityRelationshipEdit.php (props changed) vtigercrm/branches/4.2/modules/Contacts/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/Contacts/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Delete.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DeleteContactCaseRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DeleteContactOpportunityRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DeleteDirectReportRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/EditView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Forms.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Import.php (props changed) vtigercrm/branches/4.2/modules/Contacts/ListView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Merge.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Popup.php (props changed) vtigercrm/branches/4.2/modules/Contacts/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Contacts/Save.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SaveBusinessCard.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SaveContactOpportunityRelationship.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelViewCase.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelViewContactsAndUsers.php (props changed) vtigercrm/branches/4.2/modules/Contacts/SubPanelViewOpportunity.php (props changed) vtigercrm/branches/4.2/modules/Contacts/contactSeedData.php (props changed) vtigercrm/branches/4.2/modules/Contacts/index.php (props changed) vtigercrm/branches/4.2/modules/Contacts/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/CustomView/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/CustomView/CustomView.php (props changed) vtigercrm/branches/4.2/modules/CustomView/Delete.php (props changed) vtigercrm/branches/4.2/modules/CustomView/EditView.php (props changed) vtigercrm/branches/4.2/modules/CustomView/Forms.php (props changed) vtigercrm/branches/4.2/modules/CustomView/ListViewTop.php (props changed) vtigercrm/branches/4.2/modules/CustomView/PopulateCustomView.php (props changed) vtigercrm/branches/4.2/modules/CustomView/Save.php (props changed) vtigercrm/branches/4.2/modules/CustomView/SaveAction.php (props changed) vtigercrm/branches/4.2/modules/CustomView/SendMailAction.php (props changed) vtigercrm/branches/4.2/modules/CustomView/index.php (props changed) vtigercrm/branches/4.2/modules/CustomView/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_lead_source_by_outcome.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_my_pipeline_by_sales_stage.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_outcome_by_month.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_lead_source.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Chart_pipeline_by_sales_stage.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/Forms.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/index.php (props changed) vtigercrm/branches/4.2/modules/Dashboard/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Emails/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Emails/Delete.php (props changed) vtigercrm/branches/4.2/modules/Emails/DeleteEmailContactRelationship.php (props changed) vtigercrm/branches/4.2/modules/Emails/DeleteEmailUserRelationship.php (props changed) vtigercrm/branches/4.2/modules/Emails/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Emails/EditView.php (props changed) vtigercrm/branches/4.2/modules/Emails/Email.php (props changed) vtigercrm/branches/4.2/modules/Emails/Forms.php (props changed) vtigercrm/branches/4.2/modules/Emails/ListView.php (props changed) vtigercrm/branches/4.2/modules/Emails/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Emails/Save.php (props changed) vtigercrm/branches/4.2/modules/Emails/SubPanelViewRecipients.php (props changed) vtigercrm/branches/4.2/modules/Emails/add2db.php (props changed) vtigercrm/branches/4.2/modules/Emails/class.phpmailer.php (props changed) vtigercrm/branches/4.2/modules/Emails/class.smtp.php (props changed) vtigercrm/branches/4.2/modules/Emails/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Emails/gotodownload.php (props changed) vtigercrm/branches/4.2/modules/Emails/index.php (props changed) vtigercrm/branches/4.2/modules/Emails/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Emails/listemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Emails/lookupemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Emails/mailbox.php (props changed) vtigercrm/branches/4.2/modules/Emails/send_mail.php (props changed) vtigercrm/branches/4.2/modules/Emails/sendmail.php (props changed) vtigercrm/branches/4.2/modules/Emails/templates/testemailtemplateusage.php (props changed) vtigercrm/branches/4.2/modules/Emails/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Emails/upload.php (props changed) vtigercrm/branches/4.2/modules/Faq/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Faq/Delete.php (props changed) vtigercrm/branches/4.2/modules/Faq/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Faq/EditView.php (props changed) vtigercrm/branches/4.2/modules/Faq/Faq.php (props changed) vtigercrm/branches/4.2/modules/Faq/Forms.php (props changed) vtigercrm/branches/4.2/modules/Faq/ListView.php (props changed) vtigercrm/branches/4.2/modules/Faq/Save.php (props changed) vtigercrm/branches/4.2/modules/Faq/index.php (props changed) vtigercrm/branches/4.2/modules/Faq/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Help/Forms.php (props changed) vtigercrm/branches/4.2/modules/Help/index.php (props changed) vtigercrm/branches/4.2/modules/Help/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Convert.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/ConvertToEntities.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CreateFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CreateTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CumulStatistics.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/CustomView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Delete.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/DeleteFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/DeleteTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/DetailView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/EditFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/EditTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/EditView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/FaqInfoView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/FaqList.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Forms.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/HelpDesk.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/HelpDeskUtil.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/ListView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Merge.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/Save.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/SaveFaq.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/SaveTicket.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/TicketHistory.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/TicketInfoView.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/TicketStatisticsUtil.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/index.php (props changed) vtigercrm/branches/4.2/modules/HelpDesk/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Home/Forms.php (props changed) vtigercrm/branches/4.2/modules/Home/LastViewed.php (props changed) vtigercrm/branches/4.2/modules/Home/UnifiedSearch.php (props changed) vtigercrm/branches/4.2/modules/Home/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Import/Forms.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportAccount.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportButton.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportContact.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportLead.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportMap.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportOpportunity.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportProduct.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportSave.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep1.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep2.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep3.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStep4.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportSteplast.php (props changed) vtigercrm/branches/4.2/modules/Import/ImportStepundo.php (props changed) vtigercrm/branches/4.2/modules/Import/SugarFile.php (props changed) vtigercrm/branches/4.2/modules/Import/UsersLastImport.php (props changed) vtigercrm/branches/4.2/modules/Import/error.php (props changed) vtigercrm/branches/4.2/modules/Import/index.php (props changed) vtigercrm/branches/4.2/modules/Import/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Import/parse_utils.php (props changed) vtigercrm/branches/4.2/modules/Invoice/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Invoice/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Delete.php (props changed) vtigercrm/branches/4.2/modules/Invoice/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/EditView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Forms.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Invoice.php (props changed) vtigercrm/branches/4.2/modules/Invoice/ListTopInvoice.php (props changed) vtigercrm/branches/4.2/modules/Invoice/ListView.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Popup.php (props changed) vtigercrm/branches/4.2/modules/Invoice/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Invoice/Save.php (props changed) vtigercrm/branches/4.2/modules/Invoice/index.php (props changed) vtigercrm/branches/4.2/modules/Invoice/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Leads/ConvertLead.php (props changed) vtigercrm/branches/4.2/modules/Leads/CustomAction.php (props changed) vtigercrm/branches/4.2/modules/Leads/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Leads/Delete.php (props changed) vtigercrm/branches/4.2/modules/Leads/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Leads/EditView.php (props changed) vtigercrm/branches/4.2/modules/Leads/Forms.php (props changed) vtigercrm/branches/4.2/modules/Leads/Headers.php (props changed) vtigercrm/branches/4.2/modules/Leads/Import.php (props changed) vtigercrm/branches/4.2/modules/Leads/Lead.php (props changed) vtigercrm/branches/4.2/modules/Leads/LeadConvertToEntities.php (props changed) vtigercrm/branches/4.2/modules/Leads/ListView.php (props changed) vtigercrm/branches/4.2/modules/Leads/Merge.php (props changed) vtigercrm/branches/4.2/modules/Leads/Popup.php (props changed) vtigercrm/branches/4.2/modules/Leads/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Leads/Save.php (props changed) vtigercrm/branches/4.2/modules/Leads/fetchfile.php (props changed) vtigercrm/branches/4.2/modules/Leads/index.php (props changed) vtigercrm/branches/4.2/modules/Leads/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Leads/result.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Delete.php (props changed) vtigercrm/branches/4.2/modules/Meetings/DeleteMeetingContactRelationship.php (props changed) vtigercrm/branches/4.2/modules/Meetings/DeleteMeetingUserRelationship.php (props changed) vtigercrm/branches/4.2/modules/Meetings/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Meetings/EditView.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Forms.php (props changed) vtigercrm/branches/4.2/modules/Meetings/ListView.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Meeting.php (props changed) vtigercrm/branches/4.2/modules/Meetings/MeetingFormBase.php (props changed) vtigercrm/branches/4.2/modules/Meetings/Save.php (props changed) vtigercrm/branches/4.2/modules/Meetings/SubPanelViewInvitees.php (props changed) vtigercrm/branches/4.2/modules/Meetings/index.php (props changed) vtigercrm/branches/4.2/modules/Meetings/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/Forms.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/ListView.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/Menu.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/MessageBoard.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_approve.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_attach_cp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_attachments.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_board.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_db_utilities.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_disallow.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_extensions.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_faq_editor.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_forum_prune.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_forumauth.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_forums.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_groups.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_mass_email.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_ranks.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_smilies.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_spellcheck.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_styles.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_ug_auth.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_user_ban.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_users.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_categories.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_currently.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_edit.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_groups.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_management.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_mood.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_weblog_styles.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/admin_words.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/index.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/page_footer_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/page_header_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/admin/pagestart.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/attachment_mod.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/displaying.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/constants.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_delete.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_filetypes.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_includes.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_selects.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/includes/functions_thumbs.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/pm_attachments.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_mod/posting_attachments.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/attach_rules.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/cache/attach_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/common.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/db2.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/msaccess.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mssql-odbc.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mssql.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mysql.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/mysql4.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/oracle.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/db/postgres7.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/download.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/faq.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/favorites.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/files/index.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/groupcp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/auth.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/bbcode.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/constants.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/db.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/emailer.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_post.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_search.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_selects.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_validate.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/functions_weblog.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/page_header.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/page_tail.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/prune.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/sessions.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/smtp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/sql_parse.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/template.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/topic_review.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_activate.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_avatar.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_email.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_register.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_sendpasswd.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/usercp_viewprofile.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/includes/weblogs_common.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/index.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_admin_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_admin_faq_editor.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_bbcode.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_faq.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_faq_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_main.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_main_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_topics_anywhere.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_weblog_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_english/lang_weblog_main.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_german/lang_admin_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_german/lang_faq_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/language/lang_german/lang_main_attach.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/login.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/memberlist.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/modcp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/common.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/forums.before3update.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/forums.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/polls.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/posts.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/posts_14april.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/posts_weblog.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/stats.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/mods/phpbb_fetch_all/users.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/portal_home.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/posting.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/privmsg.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/profile.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/rss.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/search.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_English.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_Russian.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_admin.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_diags.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_langtemplate.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spell_phpbb.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/spelling/spellcheck.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/support_posting.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/topics_anywhere.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/uacp.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/viewforum.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/viewonline.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/viewtopic.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/vtcrm_topicsanywhere.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/watched_topics.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog2.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_alltopics.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_category.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_config.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_config_bk.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_entry.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_posting.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_rss.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_search.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblog_users.php (props changed) vtigercrm/branches/4.2/modules/MessageBoard/weblogs.php (props changed) vtigercrm/branches/4.2/modules/Notes/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Notes/Delete.php (props changed) vtigercrm/branches/4.2/modules/Notes/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Notes/EditView.php (props changed) vtigercrm/branches/4.2/modules/Notes/Forms.php (props changed) vtigercrm/branches/4.2/modules/Notes/ListView.php (props changed) vtigercrm/branches/4.2/modules/Notes/Note.php (props changed) vtigercrm/branches/4.2/modules/Notes/NoteFormBase.php (props changed) vtigercrm/branches/4.2/modules/Notes/Save.php (props changed) vtigercrm/branches/4.2/modules/Notes/index.php (props changed) vtigercrm/branches/4.2/modules/Notes/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Orders/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Orders/CreateSOPDF.php (props changed) vtigercrm/branches/4.2/modules/Orders/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Delete.php (props changed) vtigercrm/branches/4.2/modules/Orders/DeleteSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Orders/EditView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Forms.php (props changed) vtigercrm/branches/4.2/modules/Orders/ListTopSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/ListView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Order.php (props changed) vtigercrm/branches/4.2/modules/Orders/Popup.php (props changed) vtigercrm/branches/4.2/modules/Orders/PopupSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrderDetailView.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrderEditView.php (props changed) vtigercrm/branches/4.2/modules/Orders/SalesOrderListView.php (props changed) vtigercrm/branches/4.2/modules/Orders/Save.php (props changed) vtigercrm/branches/4.2/modules/Orders/SaveSalesOrder.php (props changed) vtigercrm/branches/4.2/modules/Orders/index.php (props changed) vtigercrm/branches/4.2/modules/Orders/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Charts.php (props changed) vtigercrm/branches/4.2/modules/Potentials/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Delete.php (props changed) vtigercrm/branches/4.2/modules/Potentials/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/EditView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Forms.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Import.php (props changed) vtigercrm/branches/4.2/modules/Potentials/ListView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Opportunity.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Popup.php (props changed) vtigercrm/branches/4.2/modules/Potentials/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Potentials/Save.php (props changed) vtigercrm/branches/4.2/modules/Potentials/SubPanelView.php (props changed) vtigercrm/branches/4.2/modules/Potentials/index.php (props changed) vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Potentials/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Products/AddProductToPriceBooks.php (props changed) vtigercrm/branches/4.2/modules/Products/AddProductsToPriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Products/Delete.php (props changed) vtigercrm/branches/4.2/modules/Products/DeletePriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/DeletePriceBookProductRel.php (props changed) vtigercrm/branches/4.2/modules/Products/DeleteProduct.php (props changed) vtigercrm/branches/4.2/modules/Products/DeleteVendor.php (props changed) vtigercrm/branches/4.2/modules/Products/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/EditListPrice.php (props changed) vtigercrm/branches/4.2/modules/Products/EditProduct.php (props changed) vtigercrm/branches/4.2/modules/Products/EditView.php (props changed) vtigercrm/branches/4.2/modules/Products/Forms.php (props changed) vtigercrm/branches/4.2/modules/Products/Import.php (props changed) vtigercrm/branches/4.2/modules/Products/ListView.php (props changed) vtigercrm/branches/4.2/modules/Products/Popup.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookDetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookEditView.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookListView.php (props changed) vtigercrm/branches/4.2/modules/Products/PriceBookPopup.php (props changed) vtigercrm/branches/4.2/modules/Products/Product.php (props changed) vtigercrm/branches/4.2/modules/Products/ProductDetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Products/Save.php (props changed) vtigercrm/branches/4.2/modules/Products/SavePriceBook.php (props changed) vtigercrm/branches/4.2/modules/Products/SaveVendor.php (props changed) vtigercrm/branches/4.2/modules/Products/UpdateListPrice.php (props changed) vtigercrm/branches/4.2/modules/Products/Vendor.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorDetailView.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorEditView.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorListView.php (props changed) vtigercrm/branches/4.2/modules/Products/VendorPopup.php (props changed) vtigercrm/branches/4.2/modules/Products/add2db.php (props changed) vtigercrm/branches/4.2/modules/Products/addPbProductRelToDB.php (props changed) vtigercrm/branches/4.2/modules/Products/binaryfilelist.php (props changed) vtigercrm/branches/4.2/modules/Products/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Products/index.php (props changed) vtigercrm/branches/4.2/modules/Products/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Products/updateRelations.php (props changed) vtigercrm/branches/4.2/modules/Products/upload.php (props changed) vtigercrm/branches/4.2/modules/Quotes/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Quotes/CustomView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Delete.php (props changed) vtigercrm/branches/4.2/modules/Quotes/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/EditView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Forms.php (props changed) vtigercrm/branches/4.2/modules/Quotes/ListTopQuotes.php (props changed) vtigercrm/branches/4.2/modules/Quotes/ListView.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Popup.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Quote.php (props changed) vtigercrm/branches/4.2/modules/Quotes/RenderRelatedListUI.php (props changed) vtigercrm/branches/4.2/modules/Quotes/Save.php (props changed) vtigercrm/branches/4.2/modules/Quotes/index.php (props changed) vtigercrm/branches/4.2/modules/Quotes/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Reports/AdvancedFilter.php (props changed) vtigercrm/branches/4.2/modules/Reports/CreatePDF.php (props changed) vtigercrm/branches/4.2/modules/Reports/CreateXL.php (props changed) vtigercrm/branches/4.2/modules/Reports/Delete.php (props changed) vtigercrm/branches/4.2/modules/Reports/DeleteReportFolder.php (props changed) vtigercrm/branches/4.2/modules/Reports/Forms.php (props changed) vtigercrm/branches/4.2/modules/Reports/ListView.php (props changed) vtigercrm/branches/4.2/modules/Reports/NewReport0.php (props changed) vtigercrm/branches/4.2/modules/Reports/NewReport1.php (props changed) vtigercrm/branches/4.2/modules/Reports/NewReportFolder.php (props changed) vtigercrm/branches/4.2/modules/Reports/PopulateReports.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportColumns.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportColumnsTotal.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportFilters.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportGrouping.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportRun.php (props changed) vtigercrm/branches/4.2/modules/Reports/ReportType.php (props changed) vtigercrm/branches/4.2/modules/Reports/Reports.php (props changed) vtigercrm/branches/4.2/modules/Reports/Save.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveAndRun.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveReport.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveReport0.php (props changed) vtigercrm/branches/4.2/modules/Reports/SaveReportFolder.php (props changed) vtigercrm/branches/4.2/modules/Reports/StandardFilter.php (props changed) vtigercrm/branches/4.2/modules/Reports/index.php (props changed) vtigercrm/branches/4.2/modules/Reports/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Rss/Forms.php (props changed) vtigercrm/branches/4.2/modules/Rss/ListView.php (props changed) vtigercrm/branches/4.2/modules/Rss/Popup.php (props changed) vtigercrm/branches/4.2/modules/Rss/Rss.php (props changed) vtigercrm/branches/4.2/modules/Rss/Save.php (props changed) vtigercrm/branches/4.2/modules/Rss/Star.php (props changed) vtigercrm/branches/4.2/modules/Rss/index.php (props changed) vtigercrm/branches/4.2/modules/Rss/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Settings/AddCustomFieldToDB.php (props changed) vtigercrm/branches/4.2/modules/Settings/AddMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/BackupServerConfig.php (props changed) vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php (props changed) vtigercrm/branches/4.2/modules/Settings/CreateCustomField.php (props changed) vtigercrm/branches/4.2/modules/Settings/CurrencyInfo.php (props changed) vtigercrm/branches/4.2/modules/Settings/CustomFieldList.php (props changed) vtigercrm/branches/4.2/modules/Settings/DeleteCustomField.php (props changed) vtigercrm/branches/4.2/modules/Settings/DeleteMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/EditComboField.php (props changed) vtigercrm/branches/4.2/modules/Settings/EditCompanyDetails.php (props changed) vtigercrm/branches/4.2/modules/Settings/EmailConfig.php (props changed) vtigercrm/branches/4.2/modules/Settings/FileStorage.php (props changed) vtigercrm/branches/4.2/modules/Settings/Forms.php (props changed) vtigercrm/branches/4.2/modules/Settings/LeadCustomFieldMapping.php (props changed) vtigercrm/branches/4.2/modules/Settings/ListMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/OrganizationConfig.php (props changed) vtigercrm/branches/4.2/modules/Settings/Save.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveCompany.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveConvertLead.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveCurrencyInfo.php (props changed) vtigercrm/branches/4.2/modules/Settings/SaveMailAccount.php (props changed) vtigercrm/branches/4.2/modules/Settings/UpdateComboValues.php (props changed) vtigercrm/branches/4.2/modules/Settings/add2db.php (props changed) vtigercrm/branches/4.2/modules/Settings/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Settings/fieldtypes.php (props changed) vtigercrm/branches/4.2/modules/Settings/index.php (props changed) vtigercrm/branches/4.2/modules/Settings/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Settings/test.php (props changed) vtigercrm/branches/4.2/modules/System/config.php (props changed) vtigercrm/branches/4.2/modules/System/includes/XPath.class.php (props changed) vtigercrm/branches/4.2/modules/System/includes/class.Template.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/common_functions.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ar_utf8.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/bg.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/big5.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/br.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ca.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/cn.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/cs.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ct.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/da.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/de.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/en.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/es.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/et.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/eu.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/fi.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/fr.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/gr.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/he.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/hu.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/id.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/is.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/it.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ja.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/jp.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ko.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/lt.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/lv.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/nl.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/no.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/pl.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/pt-br.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/pt.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ro.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/ru.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/sk.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/sv.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/tr.php (props changed) vtigercrm/branches/4.2/modules/System/includes/lang/tw.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.healthd.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.hwsensors.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.lmsensors.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.mbm5.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/mb/class.mbmon.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.BSD.common.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.Darwin.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.FreeBSD.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.HP-UX.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.Linux.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.NetBSD.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.OpenBSD.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.SunOS.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.WINNT.inc.bak.php (props changed) vtigercrm/branches/4.2/modules/System/includes/os/class.WINNT.inc.php (props changed) vtigercrm/branches/4.2/modules/System/includes/system_footer.php (props changed) vtigercrm/branches/4.2/modules/System/includes/system_header.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/filesystems.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/hardware.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/mbinfo.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/memory.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/network.php (props changed) vtigercrm/branches/4.2/modules/System/includes/xml/vitals.php (props changed) vtigercrm/branches/4.2/modules/System/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/System/systemconfig.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Delete.php (props changed) vtigercrm/branches/4.2/modules/Tasks/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Tasks/EditView.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Forms.php (props changed) vtigercrm/branches/4.2/modules/Tasks/ListView.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Save.php (props changed) vtigercrm/branches/4.2/modules/Tasks/Task.php (props changed) vtigercrm/branches/4.2/modules/Tasks/index.php (props changed) vtigercrm/branches/4.2/modules/Tasks/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Users/Authenticate.php (props changed) vtigercrm/branches/4.2/modules/Users/ChangePassword.php (props changed) vtigercrm/branches/4.2/modules/Users/CreateProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/DefaultFieldPermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/Delete.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteDemoData.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteRole.php (props changed) vtigercrm/branches/4.2/modules/Users/DeleteUser.php (props changed) vtigercrm/branches/4.2/modules/Users/DetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/EditDefOrgFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/EditFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/EditInventoryNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/EditNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/EditView.php (props changed) vtigercrm/branches/4.2/modules/Users/Error.php (props changed) vtigercrm/branches/4.2/modules/Users/Forms.php (props changed) vtigercrm/branches/4.2/modules/Users/HelpDesk.php (props changed) vtigercrm/branches/4.2/modules/Users/ListFieldPermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/ListFldProfiles.php (props changed) vtigercrm/branches/4.2/modules/Users/ListPermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/ListProfiles.php (props changed) vtigercrm/branches/4.2/modules/Users/ListView.php (props changed) vtigercrm/branches/4.2/modules/Users/Listhistory.php (props changed) vtigercrm/branches/4.2/modules/Users/Login.php (props changed) vtigercrm/branches/4.2/modules/Users/LoginHistory.php (props changed) vtigercrm/branches/4.2/modules/Users/Logout.php (props changed) vtigercrm/branches/4.2/modules/Users/MassDeleteUsers.php (props changed) vtigercrm/branches/4.2/modules/Users/OrgSharingDetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/OrgSharingEditView.php (props changed) vtigercrm/branches/4.2/modules/Users/Popup.php (props changed) vtigercrm/branches/4.2/modules/Users/ProfileDeleteStep1.php (props changed) vtigercrm/branches/4.2/modules/Users/ProfileDetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/ProfileEditView.php (props changed) vtigercrm/branches/4.2/modules/Users/RoleDeleteStep1.php (props changed) vtigercrm/branches/4.2/modules/Users/RoleDetailView.php (props changed) vtigercrm/branches/4.2/modules/Users/Save.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveInventoryNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveNotification.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveOrgSharing.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/SaveRole.php (props changed) vtigercrm/branches/4.2/modules/Users/Security.php (props changed) vtigercrm/branches/4.2/modules/Users/ShowHistory.php (props changed) vtigercrm/branches/4.2/modules/Users/TabCustomise.php (props changed) vtigercrm/branches/4.2/modules/Users/TabMenu.php (props changed) vtigercrm/branches/4.2/modules/Users/TemplateMerge.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateDefaultFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateFieldLevelAccess.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateProfile.php (props changed) vtigercrm/branches/4.2/modules/Users/UpdateTab.php (props changed) vtigercrm/branches/4.2/modules/Users/User.php (props changed) vtigercrm/branches/4.2/modules/Users/UserDeleteStep1.php (props changed) vtigercrm/branches/4.2/modules/Users/UserInfoUtil.php (props changed) vtigercrm/branches/4.2/modules/Users/about_us.php (props changed) vtigercrm/branches/4.2/modules/Users/add2db.php (props changed) vtigercrm/branches/4.2/modules/Users/binaryfilelist.php (props changed) vtigercrm/branches/4.2/modules/Users/createemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/createnewgroup.php (props changed) vtigercrm/branches/4.2/modules/Users/createrole.php (props changed) vtigercrm/branches/4.2/modules/Users/deleteemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/deletewordtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/detailviewemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/Users/editemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/editpermissions.php (props changed) vtigercrm/branches/4.2/modules/Users/forum_register.php (props changed) vtigercrm/branches/4.2/modules/Users/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/Users/listemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Users/listgroupmembers.php (props changed) vtigercrm/branches/4.2/modules/Users/listgroups.php (props changed) vtigercrm/branches/4.2/modules/Users/listinventorynotifications.php (props changed) vtigercrm/branches/4.2/modules/Users/listnotificationschedulers.php (props changed) vtigercrm/branches/4.2/modules/Users/listroles.php (props changed) vtigercrm/branches/4.2/modules/Users/listwordtemplates.php (props changed) vtigercrm/branches/4.2/modules/Users/lookupemailtemplates.php (props changed) vtigercrm/branches/4.2/modules/Users/massChangeStatus.php (props changed) vtigercrm/branches/4.2/modules/Users/massdelete.php (props changed) vtigercrm/branches/4.2/modules/Users/notify_detail.php (props changed) vtigercrm/branches/4.2/modules/Users/populatetemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/saveemailtemplate.php (props changed) vtigercrm/branches/4.2/modules/Users/updateLeadDBStatus.php (props changed) vtigercrm/branches/4.2/modules/Users/updateNotificationSchedulers.php (props changed) vtigercrm/branches/4.2/modules/Users/updateRole.php (props changed) vtigercrm/branches/4.2/modules/Users/upload.php (props changed) vtigercrm/branches/4.2/modules/Utilities/Merge.php (props changed) vtigercrm/branches/4.2/modules/Yahoo/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/imports/Excel/reader.php (props changed) vtigercrm/branches/4.2/modules/imports/Headers.php (props changed) vtigercrm/branches/4.2/modules/imports/fetchfile.php (props changed) vtigercrm/branches/4.2/modules/imports/import.php (props changed) vtigercrm/branches/4.2/modules/imports/parseandstore.php (props changed) vtigercrm/branches/4.2/modules/imports/result.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/Mail/mime.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/Mail/mimeDecode.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/Mail/mimePart.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addrbook_popup.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addrbook_search.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addrbook_search_html.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/addressbook.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver_IMAP.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver_SMTP.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/Deliver_SendMail.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/deliver/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/helper/VCard.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/html.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/AddressStructure.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/ContentType.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Disposition.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Language.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Message.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/MessageHeader.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/Rfc822Header.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/SMimeMessage.class.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/class/mime/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/compose.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/config/config.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/configtest.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/delete_message.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/download.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/empty_trash.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_create.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_delete.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_rename_do.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_rename_getname.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/folders_subscribe.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/abook_database.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/abook_ldap_server.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/abook_local_file.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/addressbook.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/attachment_common.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/auth.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/constants.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/date.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/db_prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1250.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1251.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1252.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1253.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1254.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1255.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1256.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1257.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp1258.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp855.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/cp866.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_1.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_10.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_11.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_13.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_14.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_15.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_16.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_2.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_3.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_4.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_5.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_6.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_7.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_8.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_8859_9.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/iso_ir_111.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/koi8_r.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/koi8_u.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/ns_4551_1.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/tis_620.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/us_ascii.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/decode/utf_8.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/display_messages.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/cp1251.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/cp1255.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/cp1256.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_1.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_15.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_2.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_7.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/iso_8859_9.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/koi8_r.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/koi8_u.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/tis_620.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/us_ascii.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/encode/utf_8.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/file_prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/forms.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/gettext.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/global.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/html.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/i18n.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/identity.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_general.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_mailbox.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_messages.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_search.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/imap_utf7_local.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/mailbox_display.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/mime.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/page_header.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/plugin.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/strings.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/tree.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/functions/url_parser.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/help.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/image.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/images/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/load_prefs.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/display.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/folder.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/options/personal.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/include/validate.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/left_main.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/locale/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/login.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/mailfeed.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/move_messages.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options_highlight.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options_identities.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/options_order.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/functions.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/info/setup.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/class.POP3.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/fetch.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/functions.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/index.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/options.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/plugins/mail_fetch/setup.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/printer_friendly_bottom.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/printer_friendly_main.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/printer_friendly_top.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/read_body.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/redirect.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/right_main.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/search.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/signout.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/vcard.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/view_header.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/view_text.php (props changed) vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/webmail.php (props changed) vtigercrm/branches/4.2/modules/uploads/Forms.php (props changed) vtigercrm/branches/4.2/modules/uploads/add.php (props changed) vtigercrm/branches/4.2/modules/uploads/add2db.php (props changed) vtigercrm/branches/4.2/modules/uploads/binaryfilelist.php (props changed) vtigercrm/branches/4.2/modules/uploads/deleteattachments.php (props changed) vtigercrm/branches/4.2/modules/uploads/downloadfile.php (props changed) vtigercrm/branches/4.2/modules/uploads/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/modules/uploads/myupload.php (props changed) vtigercrm/branches/4.2/modules/uploads/open_db.php (props changed) vtigercrm/branches/4.2/modules/uploads/upload.php (props changed) vtigercrm/branches/4.2/themes/Aqua/footer.php (props changed) vtigercrm/branches/4.2/themes/Aqua/header.php (props changed) vtigercrm/branches/4.2/themes/Aqua/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/Aqua/loginheader.php (props changed) vtigercrm/branches/4.2/themes/blue/footer.php (props changed) vtigercrm/branches/4.2/themes/blue/header.php (props changed) vtigercrm/branches/4.2/themes/blue/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/blue/loginheader.php (props changed) vtigercrm/branches/4.2/themes/busthree/config.php (props changed) vtigercrm/branches/4.2/themes/busthree/footer.php (props changed) vtigercrm/branches/4.2/themes/busthree/header.php (props changed) vtigercrm/branches/4.2/themes/busthree/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/coolblue/footer.php (props changed) vtigercrm/branches/4.2/themes/coolblue/header.php (props changed) vtigercrm/branches/4.2/themes/coolblue/language/en_us.lang.php (props changed) vtigercrm/branches/4.2/themes/coolblue/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/nature/footer.php (props changed) vtigercrm/branches/4.2/themes/nature/header.php (props changed) vtigercrm/branches/4.2/themes/nature/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/nature/loginheader.php (props changed) vtigercrm/branches/4.2/themes/orange/footer.php (props changed) vtigercrm/branches/4.2/themes/orange/header.php (props changed) vtigercrm/branches/4.2/themes/orange/layout_utils.php (props changed) vtigercrm/branches/4.2/themes/orange/loginheader.php (props changed) From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 20:51:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 01:51:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3914 - /vtigercrm/branches/4.2/extractSchema.php Message-ID: <20060224015106.6E89D49A745@vtiger.fosslabs.com> Author: mfedyk Date: Thu Feb 23 18:51:04 2006 New Revision: 3914 Log: add file to extract adodb XML schema from database, from mikecrowe Added: vtigercrm/branches/4.2/extractSchema.php From vtigercrm-commits at vtiger.fosslabs.com Thu Feb 23 20:54:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 01:54:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3915 - /vtigercrm/branches/4.2/extractSchema.php Message-ID: <20060224015416.BA34049A745@vtiger.fosslabs.com> Author: mfedyk Date: Thu Feb 23 18:54:15 2006 New Revision: 3915 Log: remove unused code in extractSchema Modified: vtigercrm/branches/4.2/extractSchema.php Modified: vtigercrm/branches/4.2/extractSchema.php ============================================================================== --- vtigercrm/branches/4.2/extractSchema.php (original) +++ vtigercrm/branches/4.2/extractSchema.php Thu Feb 23 18:54:15 2006 @@ -1,50 +1,8 @@ Author: saraj Date: Thu Feb 23 23:49:03 2006 New Revision: 3916 Log: function fnVis(obj) added in the general.js file for the new UI of Settings - New user/Edit User/Detail view Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Thu Feb 23 23:49:03 2006 @@ -1260,3 +1260,64 @@ } +function fnVis(obj){ + + var profTag = document.getElementById("prof"); + + var moreTag = document.getElementById("more"); + + var addrTag = document.getElementById("addr"); + + + if(obj == 'prof'){ + + document.getElementById('mnuTab').style.display = 'block'; + + document.getElementById('mnuTab1').style.display = 'none'; + + document.getElementById('mnuTab2').style.display = 'none'; + + profTag.className = 'dvtSelectedCell'; + + moreTag.className = 'dvtUnSelectedCell'; + + addrTag.className = 'dvtUnSelectedCell'; + + } + + + else if(obj == 'more'){ + + document.getElementById('mnuTab1').style.display = 'block'; + + document.getElementById('mnuTab').style.display = 'none'; + + document.getElementById('mnuTab2').style.display = 'none'; + + moreTag.className = 'dvtSelectedCell'; + + profTag.className = 'dvtUnSelectedCell'; + + addrTag.className = 'dvtUnSelectedCell'; + + } + + + else if(obj == 'addr'){ + + document.getElementById('mnuTab2').style.display = 'block'; + + document.getElementById('mnuTab').style.display = 'none'; + + document.getElementById('mnuTab1').style.display = 'none'; + + addrTag.className = 'dvtSelectedCell'; + + profTag.className = 'dvtUnSelectedCell'; + + moreTag.className = 'dvtUnSelectedCell'; + + } + +} + From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 02:49:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 07:49:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3917 - /vtigercrm/trunk/Smarty/templates/UserEditView.tpl Message-ID: <20060224074913.8133949A738@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 00:49:09 2006 New Revision: 3917 Log: Changed the LBL_ADDRESS & LBL_YAHOO_ID Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Fri Feb 24 00:49:09 2006 @@ -147,7 +147,7 @@ - {$UMOD.LBL_YAHOO_MSN_ID} + {$UMOD.LBL_YAHOO_ID} {$UMOD.LBL_HOME_PHONE} @@ -174,7 +174,7 @@ {$UMOD.LBL_NEW_FORM_TITLE} - {$UMOD.LBL_STREET_ADDRESS} + {$UMOD.LBL_ADDRESS} {$ADDRESS_STREET} From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 03:26:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 08:26:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3918 - in /vtigercrm/trunk: include/utils/CommonUtils.php modules/uploads/add2db.php Message-ID: <20060224082658.25FEC49A76A@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 01:26:51 2006 New Revision: 3918 Log: upload folder changed for attachments Modified: vtigercrm/trunk/include/utils/CommonUtils.php vtigercrm/trunk/modules/uploads/add2db.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Fri Feb 24 01:26:51 2006 @@ -1180,4 +1180,16 @@ return $count; } +function mkdirs($dir) { +if( is_null($dir) || $dir === "" ){ + return FALSE; +} +if( is_dir($dir) || $dir === "/" ){ + return TRUE; +} +if( mkdirs(dirname($dir), $mode, $recursive) ){ + return mkdir($dir, $mode); +} +return FALSE; +} ?> Modified: vtigercrm/trunk/modules/uploads/add2db.php ============================================================================== --- vtigercrm/trunk/modules/uploads/add2db.php (original) +++ vtigercrm/trunk/modules/uploads/add2db.php Fri Feb 24 01:26:51 2006 @@ -18,7 +18,7 @@ if(!is_dir($directory)) { - if(!mkdir($directory, 0777)) + if(!mkdirs($directory, 0777)) { echo "Access denined to create folder"; die; From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 06:43:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 11:43:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3919 - in /vtigercrm/trunk/modules: Activities/ Campaigns/ Emails/ Faq/ HelpDesk/ Invoice/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/ Message-ID: <20060224114308.02C9B49A1BF@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 04:42:46 2006 New Revision: 3919 Log: * IntialVersion Added: vtigercrm/trunk/modules/Activities/ActivitiesAjax.php vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php vtigercrm/trunk/modules/Emails/EmailsAjax.php vtigercrm/trunk/modules/Faq/FaqAjax.php vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php vtigercrm/trunk/modules/Invoice/InvoiceAjax.php vtigercrm/trunk/modules/Notes/NotesAjax.php vtigercrm/trunk/modules/Potentials/PotentialsAjax.php vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php vtigercrm/trunk/modules/Products/ProductsAjax.php vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php vtigercrm/trunk/modules/Quotes/QuotesAjax.php vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php vtigercrm/trunk/modules/Vendors/VendorsAjax.php From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 07:23:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:23:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3920 - in /vtigercrm/trunk/modules: Invoice/Invoice.js PurchaseOrder/PurchaseOrder.js Message-ID: <20060224122319.6FA1F49A51C@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:23:13 2006 New Revision: 3920 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Invoice/Invoice.js vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Modified: vtigercrm/trunk/modules/Invoice/Invoice.js ============================================================================== --- vtigercrm/trunk/modules/Invoice/Invoice.js (original) +++ vtigercrm/trunk/modules/Invoice/Invoice.js Fri Feb 24 05:23:13 2006 @@ -337,8 +337,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.product_name.value = product_name; - window.opener.document.EditView.product_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("product_name"); + var fldId = getOpenerObj("product_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.product_name.value = product_name; + //window.opener.document.EditView.product_id.value = product_id; } function set_return_formname_specific(formname,product_id, product_name) { Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js ============================================================================== --- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (original) +++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Fri Feb 24 05:23:13 2006 @@ -301,8 +301,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.purchaseorder_name.value = product_name; - window.opener.document.EditView.purchaseorder_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("purchaseorder_name"); + var fldId = getOpenerObj("purchaseorder_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.purchaseorder_name.value = product_name; + //window.opener.document.EditView.purchaseorder_id.value = product_id; } function set_return_formname_specific(formname, product_id, product_name) { window.opener.document.EditView1.purchaseorder_name.value = product_name; From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 07:31:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:31:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3921 - in /vtigercrm/trunk/modules: Quotes/Quote.js Vendors/Vendor.js Message-ID: <20060224123142.6927949A7B0@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:31:36 2006 New Revision: 3921 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Quotes/Quote.js vtigercrm/trunk/modules/Vendors/Vendor.js Modified: vtigercrm/trunk/modules/Quotes/Quote.js ============================================================================== --- vtigercrm/trunk/modules/Quotes/Quote.js (original) +++ vtigercrm/trunk/modules/Quotes/Quote.js Fri Feb 24 05:31:36 2006 @@ -306,8 +306,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.quote_name.value = product_name; - window.opener.document.EditView.quote_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("quote_name"); + var fldId = getOpenerObj("quote_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.quote_name.value = product_name; + //window.opener.document.EditView.quote_id.value = product_id; window.opener.document.EditView.action.value = 'EditView'; window.opener.document.EditView.convertmode.value = 'update_quote_val'; window.opener.document.EditView.submit(); Modified: vtigercrm/trunk/modules/Vendors/Vendor.js ============================================================================== --- vtigercrm/trunk/modules/Vendors/Vendor.js (original) +++ vtigercrm/trunk/modules/Vendors/Vendor.js Fri Feb 24 05:31:36 2006 @@ -115,8 +115,13 @@ function set_return_specific(vendor_id, vendor_name) { - window.opener.document.EditView.vendor_name.value = vendor_name; - window.opener.document.EditView.vendor_id.value = vendor_id; + //getOpenerObj used for DetailView + var fldName = getOpenerObj("vendor_name"); + var fldId = getOpenerObj("vendor_id"); + fldName.value = vendor_name; + fldId.value = vendor_id; + //window.opener.document.EditView.vendor_name.value = vendor_name; + //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_address(vendor_id, vendor_name, street, city, state, code, country,pobox ) From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 07:34:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:34:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3922 - /vtigercrm/trunk/modules/Potentials/Opportunity.js Message-ID: <20060224123442.BE82649A7BD@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:34:34 2006 New Revision: 3922 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js ============================================================================== --- vtigercrm/trunk/modules/Potentials/Opportunity.js (original) +++ vtigercrm/trunk/modules/Potentials/Opportunity.js Fri Feb 24 05:34:34 2006 @@ -75,8 +75,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.potential_name.value = product_name; - window.opener.document.EditView.potential_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("potential_name"); + var fldId = getOpenerObj("potential_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.potential_name.value = product_name; + //window.opener.document.EditView.potential_id.value = product_id; } function add_data_to_relatedlist(entity_id,recordid) { From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 07:38:36 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:38:36 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3923 - /vtigercrm/trunk/modules/PriceBooks/PriceBook.js Message-ID: <20060224123836.DC0D049A809@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:38:31 2006 New Revision: 3923 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Fri Feb 24 05:38:31 2006 @@ -223,8 +223,13 @@ function set_return_specific(vendor_id, vendor_name) { - window.opener.document.EditView.vendor_name.value = vendor_name; - window.opener.document.EditView.vendor_id.value = vendor_id; + //getOpenerObj used for DetailView + var fldName = getOpenerObj("vendor_name"); + var fldId = getOpenerObj("vendor_id"); + fldName.value = vendor_name; + fldId.value = vendor_id; + //window.opener.document.EditView.vendor_name.value = vendor_name; + //window.opener.document.EditView.vendor_id.value = vendor_id; } function set_return_inventory_pb(listprice, fldname) { From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 07:44:09 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 12:44:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3924 - in /vtigercrm/trunk/modules: Products/Product.js SalesOrder/SalesOrder.js Message-ID: <20060224124409.00B0049A1BF@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 05:44:04 2006 New Revision: 3924 Log: * func set_return_specific changed to generic Modified: vtigercrm/trunk/modules/Products/Product.js vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Modified: vtigercrm/trunk/modules/Products/Product.js ============================================================================== --- vtigercrm/trunk/modules/Products/Product.js (original) +++ vtigercrm/trunk/modules/Products/Product.js Fri Feb 24 05:44:04 2006 @@ -124,8 +124,13 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.product_name.value = product_name; - window.opener.document.EditView.product_id.value = product_id; + //getOpenerObj used for DetailView + var fldName = getOpenerObj("product_name"); + var fldId = getOpenerObj("product_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.product_name.value = product_name; + //window.opener.document.EditView.product_id.value = product_id; } function set_return_formname_specific(formname,product_id, product_name) { Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js ============================================================================== --- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original) +++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Fri Feb 24 05:44:04 2006 @@ -307,8 +307,14 @@ window.opener.document.EditView.parent_id.value = product_id; } function set_return_specific(product_id, product_name) { - window.opener.document.EditView.salesorder_name.value = product_name; - window.opener.document.EditView.salesorder_id.value = product_id; + + //getOpenerObj used for DetailView + var fldName = getOpenerObj("salesorder_name"); + var fldId = getOpenerObj("salesorder_id"); + fldName.value = product_name; + fldId.value = product_id; + //window.opener.document.EditView.salesorder_name.value = product_name; + //window.opener.document.EditView.salesorder_id.value = product_id; window.opener.document.EditView.action.value = 'EditView'; window.opener.document.EditView.convertmode.value = 'update_so_val'; window.opener.document.EditView.submit(); From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 09:32:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:32:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3925 - /vtigercrm/trunk/modules/Calendar/index.php Message-ID: <20060224143224.DDD0D49A782@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:32:16 2006 New Revision: 3925 Log: changes made to integrate dayview of calendar Modified: vtigercrm/trunk/modules/Calendar/index.php Modified: vtigercrm/trunk/modules/Calendar/index.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/index.php (original) +++ vtigercrm/trunk/modules/Calendar/index.php Fri Feb 24 07:32:16 2006 @@ -26,7 +26,7 @@ require_once ($theme_path."layout_utils.php"); global $mod_strings; -//include ('modules/Calendar/calendar_day.php'); -include ('modules/Calendar/new_calendar.php'); +include ('modules/Calendar/calendar_day.php'); +//include ('modules/Calendar/new_calendar.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 09:35:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:35:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3926 - /vtigercrm/trunk/modules/Calendar/index.php Message-ID: <20060224143530.4246749A823@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:35:24 2006 New Revision: 3926 Log: changes made to integrate dayview of calendar Modified: vtigercrm/trunk/modules/Calendar/index.php Modified: vtigercrm/trunk/modules/Calendar/index.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/index.php (original) +++ vtigercrm/trunk/modules/Calendar/index.php Fri Feb 24 07:35:24 2006 @@ -26,7 +26,7 @@ require_once ($theme_path."layout_utils.php"); global $mod_strings; -include ('modules/Calendar/calendar_day.php'); +include ('modules/Calendar/calendar_dayview.php'); //include ('modules/Calendar/new_calendar.php'); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 09:37:47 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:37:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3927 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060224143747.BB5DB49A823@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:37:39 2006 New Revision: 3927 Log: calendar_dayview.php has been added for dayview of calendar Added: vtigercrm/trunk/modules/Calendar/calendar_dayview.php From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 09:46:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:46:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3928 - /vtigercrm/trunk/modules/Calendar/appointment.pinc Message-ID: <20060224144619.AF0A649A5BC@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:46:14 2006 New Revision: 3928 Log: changes made to remove the link for hours Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc Modified: vtigercrm/trunk/modules/Calendar/appointment.pinc ============================================================================== --- vtigercrm/trunk/modules/Calendar/appointment.pinc (original) +++ vtigercrm/trunk/modules/Calendar/appointment.pinc Fri Feb 24 07:46:14 2006 @@ -1396,7 +1396,7 @@ } else { - $duration = "%s ". $start ." - ". $end; + $duration = "%s ". $start ." to ". $end; } } if ( $this->repeat != APP_NOREP ) @@ -1409,7 +1409,7 @@ } echo " \n"; - echo " ". $this->getLink($duration) ."\n"; + echo " ". $duration ."\n"; //added from Fredy's patch echo " ". $this->creator ." \n"; From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 09:53:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:53:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3929 - in /vtigercrm/trunk/themes/blue/images: Calls.gif Meetings.gif Message-ID: <20060224145321.F0F3549A754@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:53:16 2006 New Revision: 3929 Log: old images has been deleted Removed: vtigercrm/trunk/themes/blue/images/Calls.gif vtigercrm/trunk/themes/blue/images/Meetings.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 09:55:41 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 24 Feb 2006 14:55:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3930 - in /vtigercrm/trunk/themes/blue/images: Calls.gif Meetings.gif Message-ID: <20060224145541.E3C6A49A7BC@vtiger.fosslabs.com> Author: saraj Date: Fri Feb 24 07:55:31 2006 New Revision: 3930 Log: new images has been included Added: vtigercrm/trunk/themes/blue/images/Calls.gif (with props) vtigercrm/trunk/themes/blue/images/Meetings.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Fri Feb 24 23:20:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 04:20:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3931 - in /vtigercrm/branches/4.2/adodb: adodb-datadict.inc.php adodb-xmlschema.inc.php Message-ID: <20060225042040.D9A2049A516@vtiger.fosslabs.com> Author: mfedyk Date: Fri Feb 24 21:20:38 2006 New Revision: 3931 Log: port constraints & table type hack for AXMLS from 4.55 to 4.72. close #33 Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php Modified: vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-datadict.inc.php Fri Feb 24 21:20:38 2006 @@ -1,5 +1,4 @@ NameQuote($name); } + // temporary for debuging vtiger - GS + + function println($msg) + { + require_once('include/logging.php'); + $log1 =& LoggerManager::getLogger('VT'); + if(is_array($msg)) + { + $log1->fatal("Install ->".print_r($msg,true)); + } + else + { + $log1->fatal("Install ->".$msg); + } + return $msg; + } + + +//---------------- + + // Executes the sql array returned by GetTableSQL and GetIndexSQL function ExecuteSQLArray($sql, $continueOnError = true) { @@ -266,10 +286,18 @@ foreach($sql as $line) { if ($this->debug) $conn->debug = true; + $this->println($line); $ok = $conn->Execute($line); $conn->debug = $saved; if (!$ok) { - if ($this->debug) ADOConnection::outp($conn->ErrorMsg()); + $this->println("Table Creation Error: Query Failed"); + $this->println(" "); + if ($this->debug) + { + + $this->println("InstallError: ".$conn->ErrorMsg()); + ADOConnection::outp($conn->ErrorMsg()); + } if (!$continueOnError) return 0; $rez = 1; } @@ -709,7 +737,7 @@ This function changes/adds new fields to your table. You don't have to know if the col is new or not. It will check on its own. */ - function ChangeTableSQL($tablename, $flds, $tableoptions = false) + function ChangeTableSQL($tablename, $flds, $tableoptions = false, $forceAlter = false) // GS Fix for constraint impl - forceAlter { global $ADODB_FETCH_MODE; @@ -726,7 +754,7 @@ if (isset($savem)) $this->connection->SetFetchMode($savem); $ADODB_FETCH_MODE = $save; - if ( empty($cols)) { + if ( $forceAlter == false && empty($cols)) { // GS Fix for constraint impl return $this->CreateTableSQL($tablename, $flds, $tableoptions); } @@ -778,7 +806,33 @@ } } - return $sql; + // GS Fix for constraint impl -- start + if($forceAlter == false) return $sql; + $sqlarray = array(); + + $alter .= implode(",\n", $sql); + if (sizeof($pkey)>0) { + $alter .= ",\n PRIMARY KEY ("; + $alter .= implode(", ",$pkey).")"; + } + + if (isset($tableoptions['CONSTRAINTS'])) + $alter .= "\n".$tableoptions['CONSTRAINTS']; + + if (isset($tableoptions[$this->upperName.'_CONSTRAINTS'])) + $alter .= "\n".$tableoptions[$this->upperName.'_CONSTRAINTS']; + + if (isset($tableoptions[$this->upperName])) $alter .= $tableoptions[$this->upperName]; + $sqlarray[] = $alter; + + + $taboptions = $this->_Options($tableoptions); + $tsql = $this->_Triggers($this->TableName($tablename),$taboptions); + foreach($tsql as $s) $sqlarray[] = $s; + + // GS Fix for constraint impl -- end + + return $sqlarray; } } // class ?> Modified: vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php ============================================================================== --- vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php (original) +++ vtigercrm/branches/4.2/adodb/adodb-xmlschema.inc.php Fri Feb 24 21:20:38 2006 @@ -241,6 +241,7 @@ * @access private */ var $drop_field = array(); + var $alter; // GS Fix for constraint impl /** * Iniitializes a new table object. @@ -251,6 +252,11 @@ function dbTable( &$parent, $attributes = NULL ) { $this->parent =& $parent; $this->name = $this->prefix($attributes['NAME']); + // GS Fix for constraint impl + if(isset($attributes['ALTER'])) + { + $this->alter = $attributes['ALTER']; + } } /** @@ -323,12 +329,12 @@ if( isset( $this->current_field ) ) { $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); } else { - $this->addTableOpt( $cdata ); + $this->addTableOpt('CONSTRAINTS', $cdata ); // GS Fix for constraint impl } break; // Table option case 'OPT': - $this->addTableOpt( $cdata ); + $this->addTableOpt('mysql', $cdata ); // GS Fix for constraint impl break; default: @@ -462,8 +468,9 @@ * @param string $opt Table option * @return array Options */ - function addTableOpt( $opt ) { - $this->opts[] = $opt; + function addTableOpt($key, $opt ) { // GS Fix for constraint impl + //$this->opts[] = $opt; + $this->opts[$key] = $opt; return $this->opts; } @@ -545,7 +552,7 @@ } } - if( empty( $legacy_fields ) ) { + if( empty( $legacy_fields ) && !isset($this->alter)) { // GS Fix for constraint impl // Create the new table $sql[] = $xmls->dict->CreateTableSQL( $this->name, $fldarray, $this->opts ); logMsg( end( $sql ), 'Generated CreateTableSQL' ); @@ -556,7 +563,7 @@ // Use ChangeTableSQL case 'ALTER': logMsg( 'Generated ChangeTableSQL (ALTERing table)' ); - $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts ); + $sql[] = $xmls->dict->ChangeTableSQL( $this->name, $fldarray, $this->opts, $this->alter ); // GS Fix for constraint impl break; case 'REPLACE': logMsg( 'Doing upgrade REPLACE (testing)' ); @@ -2218,4 +2225,4 @@ echo ''; } } -?> +?> From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 02:42:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 07:42:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3932 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060225074205.6BCDC49A541@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 00:42:03 2006 New Revision: 3932 Log: Add indexes & fix FK name collisions in DB XML Schema Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sat Feb 25 00:42:03 2006 @@ -1873,19 +1873,7 @@ - ADD CONSTRAINT fk_VendorContactRel FOREIGN KEY (vendorid) REFERENCES vendor(vendorid) ON DELETE CASCADE - - Type=InnoDB - - - -
- - - - - - ADD CONSTRAINT fk_VendorContactRel FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE + ADD CONSTRAINT fk_VendorContactRel2contactid FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -3894,6 +3882,16 @@

+ + + ADD CONSTRAINT fk_VendorContactRel2vendorid FOREIGN KEY (vendorid) REFERENCES vendor(vendorid) ON DELETE CASCADE + + Type=InnoDB + + + +
+ @@ -4055,6 +4053,12 @@ quotestage + + potentialid + + + contactid + Type=InnoDB @@ -4223,7 +4227,15 @@ - + + vendorid + + + quoteid + + + contactid + Type=InnoDB @@ -4247,14 +4259,14 @@

- ADD CONSTRAINT fk_PO2 FOREIGN KEY (quoteid) REFERENCES quotes(quote) ON DELETE CASCADE + ADD CONSTRAINT fk_PO3 FOREIGN KEY (quoteid) REFERENCES quotes(quoteid) ON DELETE CASCADEType=InnoDB

- ADD CONSTRAINT fk_PO3 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE + ADD CONSTRAINT fk_PO4 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -4402,7 +4414,12 @@ - + + vendorid + + + contactid + Type=InnoDB @@ -4426,14 +4443,14 @@

- ADD CONSTRAINT fk_SO2 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE + ADD CONSTRAINT fk_SO3 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADEType=InnoDB

- ADD CONSTRAINT fk_SO3 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADE + ADD CONSTRAINT fk_SO4 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -4579,7 +4596,9 @@ - + + purchaseorderid + Type=InnoDB @@ -4752,9 +4771,7 @@ - - cvid - + Type=InnoDB

@@ -4762,6 +4779,7 @@ + @@ -4843,6 +4861,7 @@

+ @@ -4861,8 +4880,7 @@

- ADD CONSTRAINT customaction_FK1 FOREIGN KEY (cvid) REFERENCES customview (cvid) ON DELETE CASCAD -E + ADD CONSTRAINT customaction_FK1 FOREIGN KEY (cvid) REFERENCES customview (cvid) ON DELETE CASCADEType=InnoDB

@@ -4877,12 +4895,14 @@ + Type=InnoDB + @@ -4899,13 +4919,14 @@

- ADD CONSTRAINT selectcolumn_FK1 FOREIGN KEY (QUERYID) REFERENCES selectquery (QUERYID) ON DELETE CASCADE + ADD CONSTRAINT selectcolumn_FK1 FOREIGN KEY (queryid) REFERENCES selectquery (queryid) ON DELETE CASCADEType=InnoDB

+ @@ -4927,7 +4948,7 @@

- ADD CONSTRAINT relcriteria_FK1 FOREIGN KEY (QUERYID) REFERENCES selectquery (QUERYID) ON DELETE CASCADE + ADD CONSTRAINT relcriteria_FK1 FOREIGN KEY (queryid) REFERENCES selectquery (queryid) ON DELETE CASCADEType=InnoDB

@@ -4947,6 +4968,7 @@ + Type=InnoDB @@ -4990,12 +5012,12 @@ - ADD CONSTRAINT report_FK1 FOREIGN KEY (QUERYID) REFERENCES selectquery (QUERYID) ON DELETE CASCADE + ADD CONSTRAINT report_FK1 FOREIGN KEY (queryid) REFERENCES selectquery (queryid) ON DELETE CASCADEType=InnoDB

- ADD CONSTRAINT report_FK2 FOREIGN KEY (FOLDERID) REFERENCES reportfolder (FOLDERID) ON DELETE CASCADE + ADD CONSTRAINT report_FK2 FOREIGN KEY (folderid) REFERENCES reportfolder (folderid) ON DELETE CASCADEType=InnoDB

From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 02:52:19 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 07:52:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3933 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060225075219.7896449A893@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 00:52:17 2006 New Revision: 3933 Log: Remove foreign keys that point to missing fields. see #34 Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sat Feb 25 00:52:17 2006 @@ -4443,13 +4443,6 @@ - ADD CONSTRAINT fk_SO3 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE - Type=InnoDB - - -
- - ADD CONSTRAINT fk_SO4 FOREIGN KEY (contactid) REFERENCES contactdetails(contactid) ON DELETE CASCADEType=InnoDB @@ -4615,13 +4608,6 @@

- - ADD CONSTRAINT fk_Invoice2 FOREIGN KEY (purchaseorderid) REFERENCES purchaseorder(purchaseorderid) ON DELETE CASCADE - Type=InnoDB - - -
- From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 03:22:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 08:22:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3934 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060225082221.24D0449A74C@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 01:22:19 2006 New Revision: 3934 Log: remove duplicate indexes in database Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sat Feb 25 01:22:19 2006 @@ -4773,9 +4773,6 @@ - - cvid - columnindex @@ -4897,9 +4894,6 @@ - - queryid - Type=InnoDB

@@ -4926,9 +4920,6 @@ - - queryid - Type=InnoDB @@ -5019,9 +5010,6 @@ - - reportmodulesid - Type=InnoDB From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 03:35:38 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 08:35:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3935 - /vtigercrm/branches/4.2/include/database/PearDatabase.php Message-ID: <20060225083538.2465749A8E4@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 01:35:31 2006 New Revision: 3935 Log: turn on adodb and AXMLS debugging during install Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php Modified: vtigercrm/branches/4.2/include/database/PearDatabase.php ============================================================================== --- vtigercrm/branches/4.2/include/database/PearDatabase.php (original) +++ vtigercrm/branches/4.2/include/database/PearDatabase.php Sat Feb 25 01:35:31 2006 @@ -799,12 +799,16 @@ //$this->println("ADODB createTables connect status=".$db->Connect($this->dbHostName, $this->userName, $this->userPassword, $this->dbName)); $schema = new adoSchema( $db ); + //Debug Adodb XML Schema + $sehema->XMLS_DEBUG = TRUE; + //Debug Adodb + $sehema->debug = true; $sql = $schema->ParseSchema( $schemaFile ); $this->println("--------------Starting the table creation------------------"); //$this->println($sql); - + //integer ExecuteSchema ([array $sqlArray = NULL], [boolean $continueOnErr = NULL]) $result = $schema->ExecuteSchema( $sql, true ); if($result) print $db->errorMsg(); From vtigercrm-commits at vtiger.fosslabs.com Sat Feb 25 16:05:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 25 Feb 2006 21:05:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3936 - /vtigercrm/tags/vtigercrm-4.2.4rc1/ Message-ID: <20060225210546.90E0349B100@vtiger.fosslabs.com> Author: mfedyk Date: Sat Feb 25 14:05:44 2006 New Revision: 3936 Log: tag vtigercrm-4.2.4rc1 Added: vtigercrm/tags/vtigercrm-4.2.4rc1/ - copied from r3935, vtigercrm/branches/4.2/ From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 11:49:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 16:49:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3937 - in /vtigercrm/branches/4.2/install: 2setConfig.php 4createConfigFile.php config.template.php Message-ID: <20060226164932.569C73D3D12@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 09:49:19 2006 New Revision: 3937 Log: installer use template file Modified: vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/config.template.php Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Sun Feb 26 09:49:19 2006 @@ -17,361 +17,383 @@ * Description: Executes a step in the installation process. ********************************************************************************/ -require_once("connection.php"); - -$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF']; +// TODO: deprecate connection.php file +//require_once("connection.php"); + +// TODO: introduce MySQL port as parameters to use non-default value 3306 +//$sock_path=":" .$mysql_port; +$hostname = $_SERVER['SERVER_NAME']; + +// TODO: introduce Apache port as parameters to use non-default value 80 +//$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF']; +$web_root = $hostname.$_SERVER['PHP_SELF']; $web_root = str_replace("/install.php", "", $web_root); -$web_root = "http://$web_root"; +$web_root = "http://".$web_root; + $current_dir = pathinfo(dirname(__FILE__)); -$current_dir=$current_dir['dirname']."/"; +$current_dir = $current_dir['dirname']."/"; $cache_dir = "cache/"; -// To make MySQL run in desired port -$sock_path=":" .$mysql_port; -$H_NAME=gethostbyaddr($_SERVER['SERVER_ADDR']); - if (is_file("config.php")) { - require_once("config.php"); - session_start(); - - if(isset($upload_maxsize)) - $_SESSION['upload_maxsize'] = $upload_maxsize; - - if(isset($allow_exports)) - $_SESSION['allow_exports'] = $allow_exports; - - if(isset($disable_persistent_connections)) - $_SESSION['disable_persistent_connections'] = $disable_persistent_connections; - - if(isset($default_language)) - $_SESSION['default_language'] = $default_language; - - if(isset($translation_string_prefix)) - $_SESSION['translation_string_prefix'] = $translation_string_prefix; - - if(isset($default_charset)) - $_SESSION['default_charset'] = $default_charset; - - if(isset($languages)) { - // We need to encode the languages in a way that can be retrieved later - $language_keys = Array(); - $language_values = Array(); - - foreach($languages as $key=>$value) { - $language_keys[] = $key; - $language_values[] = $value; - } - - $_SESSION['language_keys'] = urlencode(implode(",",$language_keys)); - $_SESSION['language_values'] = urlencode(implode(",",$language_values)); - } - - global $dbconfig; - - if (isset($_REQUEST['db_hostname'])) - $db_hostname = $_REQUEST['db_hostname']; - elseif (isset($dbconfig['db_hostname'])) - $db_hostname = $dbconfig['db_hostname']; - else - $db_hostname = $H_NAME.$sock_path; - - if (isset($_REQUEST['db_username'])) - $db_username = $_REQUEST['db_username']; - elseif (isset($dbconfig['db_username'])) - $db_username = $dbconfig['db_username']; - else - $db_username = $mysql_username; - - if (isset($_REQUEST['db_password'])) - $db_password = $_REQUEST['db_password']; - elseif (isset($dbconfig['db_password'])) - $db_password = $dbconfig['db_password']; - else - $db_password = $mysql_password; - - if (isset($_REQUEST['db_name'])) - $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name'])) - $db_name = $dbconfig['db_name']; - else - $db_name = 'vtigercrm'; - - !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; - - if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; - else $host_name = $_SERVER['SERVER_NAME']; - - if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL']; - else $site_URL = $web_root; - - if (isset($_REQUEST['root_directory'])) $root_directory = stripslashes($_REQUEST['root_directory']); - else $root_directory = $current_dir; - - if (isset($_REQUEST['cache_dir'])) - $cache_dir= $_REQUEST['cache_dir']; - - if (isset($_REQUEST['mail_server'])) - $mail_server= $_REQUEST['mail_server']; - - if (isset($_REQUEST['mail_server_username'])) - $mail_server_username= $_REQUEST['mail_server_username']; - - if (isset($_REQUEST['mail_server_password'])) - $mail_server_password= $_REQUEST['mail_server_password']; - - if (isset($_REQUEST['admin_email'])) - $admin_email = $_REQUEST['admin_email']; - - if (isset($_REQUEST['admin_password'])) - $admin_password = $_REQUEST['admin_password']; + require_once("config.php"); + session_start(); + + if(isset($upload_maxsize)) + $_SESSION['upload_maxsize'] = $upload_maxsize; + + if(isset($allow_exports)) + $_SESSION['allow_exports'] = $allow_exports; + + if(isset($disable_persistent_connections)) + $_SESSION['disable_persistent_connections'] = $disable_persistent_connections; + + if(isset($default_language)) + $_SESSION['default_language'] = $default_language; + + if(isset($translation_string_prefix)) + $_SESSION['translation_string_prefix'] = $translation_string_prefix; + + if(isset($default_charset)) + $_SESSION['default_charset'] = $default_charset; + + if(isset($languages)) { + // need to encode the languages in a way that can be retrieved later + $language_keys = Array(); + $language_values = Array(); + + foreach($languages as $key=>$value) { + $language_keys[] = $key; + $language_values[] = $value; + } + + $_SESSION['language_keys'] = urlencode(implode(",",$language_keys)); + $_SESSION['language_values'] = urlencode(implode(",",$language_values)); + } + + global $dbconfig; + + if (isset($_REQUEST['db_hostname'])) + $db_hostname = $_REQUEST['db_hostname']; + elseif (isset($dbconfig['db_hostname'])) + $db_hostname = $dbconfig['db_hostname']; + else + $db_hostname = $hostname; +// TODO: introduce MySQL port as parameters to use non-default value 3306 +// else +// $db_hostname = $hostname.$sock_path; + + if (isset($_REQUEST['db_username'])) + $db_username = $_REQUEST['db_username']; + elseif (isset($dbconfig['db_username'])) + $db_username = $dbconfig['db_username']; +// TODO: deprecate connection.php file parameters +// else +// $db_username = $mysql_username; + + if (isset($_REQUEST['db_password'])) + $db_password = $_REQUEST['db_password']; + elseif (isset($dbconfig['db_password'])) + $db_password = $dbconfig['db_password']; +// TODO: deprecate connection.php file parameters +// else +// $db_password = $mysql_password; + + if (isset($_REQUEST['db_name'])) + $db_name = $_REQUEST['db_name']; + elseif (isset($dbconfig['db_name'])) + $db_name = $dbconfig['db_name']; + else + $db_name = 'vtigercrm'; + + !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; + + if (isset($_REQUEST['host_name'])) $host_name = $_REQUEST['host_name']; + else $host_name = $hostname; + + if (isset($_REQUEST['site_URL'])) $site_URL = $_REQUEST['site_URL']; + else $site_URL = $web_root; + + if (isset($_REQUEST['root_directory'])) $root_directory = stripslashes($_REQUEST['root_directory']); + else $root_directory = $current_dir; + + if (isset($_REQUEST['cache_dir'])) + $cache_dir= $_REQUEST['cache_dir']; + + if (isset($_REQUEST['mail_server'])) + $mail_server= $_REQUEST['mail_server']; + + if (isset($_REQUEST['mail_server_username'])) + $mail_server_username= $_REQUEST['mail_server_username']; + + if (isset($_REQUEST['mail_server_password'])) + $mail_server_password= $_REQUEST['mail_server_password']; + + if (isset($_REQUEST['admin_email'])) + $admin_email = $_REQUEST['admin_email']; + + if (isset($_REQUEST['admin_password'])) + $admin_password = $_REQUEST['admin_password']; } else { - !isset($_REQUEST['db_hostname']) ? $db_hostname = $H_NAME.$sock_path : $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; - !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; - !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; - !isset($_REQUEST['host_name']) ? $host_name= $_SERVER['SERVER_NAME'] : $host_name= $_REQUEST['host_name']; - !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; - !isset($_REQUEST['root_directory']) ? $root_directory = $current_dir : $root_directory = stripslashes($_REQUEST['root_directory']); - !isset($_REQUEST['cache_dir']) ? $cache_dir = $cache_dir : $cache_dir = stripslashes($_REQUEST['cache_dir']); - !isset($_REQUEST['mail_server']) ? $mail_server = $mail_server : $mail_server = stripslashes($_REQUEST['mail_server']); - !isset($_REQUEST['mail_server_username']) ? $mail_server_username = $mail_server_username : $mail_server_username = stripslashes($_REQUEST['mail_server_username']); - !isset($_REQUEST['mail_server_password']) ? $mail_server_password = $mail_server_password : $mail_server_password = stripslashes($_REQUEST['mail_server_password']); - !isset($_REQUEST['admin_email']) ? $admin_email = "" : $admin_email = $_REQUEST['admin_email']; + !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; + /* + TODO: introduce MySQL port as parameters to use non-default value 3306 + TODO: deprecate connection.php file parameters + !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname.$sock_path : $db_hostname = $_REQUEST['db_hostname']; + !isset($_REQUEST['db_username']) ? $db_username = $mysql_username : $db_username = $_REQUEST['db_username']; + !isset($_REQUEST['db_password']) ? $db_password= $mysql_password : $db_password = $_REQUEST['db_password']; + */ + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm" : $db_name = $_REQUEST['db_name']; + !isset($_REQUEST['db_drop_tables']) ? $db_drop_tables = "0" : $db_drop_tables = $_REQUEST['db_drop_tables']; + !isset($_REQUEST['host_name']) ? $host_name= $hostname : $host_name= $_REQUEST['host_name']; + !isset($_REQUEST['site_URL']) ? $site_URL = $web_root : $site_URL = $_REQUEST['site_URL']; + !isset($_REQUEST['root_directory']) ? $root_directory = $current_dir : $root_directory = stripslashes($_REQUEST['root_directory']); + !isset($_REQUEST['cache_dir']) ? $cache_dir = $cache_dir : $cache_dir = stripslashes($_REQUEST['cache_dir']); + !isset($_REQUEST['mail_server']) ? $mail_server = $mail_server : $mail_server = stripslashes($_REQUEST['mail_server']); + !isset($_REQUEST['mail_server_username']) ? $mail_server_username = $mail_server_username : $mail_server_username = stripslashes($_REQUEST['mail_server_username']); + !isset($_REQUEST['mail_server_password']) ? $mail_server_password = $mail_server_password : $mail_server_password = stripslashes($_REQUEST['mail_server_password']); + !isset($_REQUEST['admin_email']) ? $admin_email = "" : $admin_email = $_REQUEST['admin_email']; } ?> - + -vtigerCRM 4.x Installer: Step 2 - + vtigerCRM 4.x Installer: Step 2 + - - +
+ + -

Step 2 of 5

- - - + +
+ + + + - - - - - - + + + + + + +
- - - -
- - - - - -
System Configuration
-
-
-
Please enter your database configuration information below...
- - If you do not have root access to your database (for example you are installing in a virtual - hosting environment), you will need to have your database created for you before you proceed. - However, this installer will still be able to create the necessary database tables.
- -
If you unsure of your database host, username or password, we suggest that you use the default - values below.
-
- - -
* Required field
- - - - -
Database Configuration
- - - - - - - - - - - - - - - - - - + + + + + +
Host Name ^* " />
User Name ^* " />
Password ^* " />
Database Name ^* " />
+ + + + + + + +
System Configuration
+
+
+
Please enter your database configuration information below...
+
+ If you do not have root access to your database (for example you are installing in a virtual hosting environment),
+ you will need to have your database created for you before you proceed.
+ However, this installer will still be able to create the necessary database tables. +
+
If you unsure of your database host, username or password, we suggest that you use the default values below.
+
+ + +
* Required field
+ + + + + +
Database Configuration
+ + + + + + + + + + + + + + + + + + - -
Host Name ^* + " />
User Name ^* + " />
Password ^* + " />
Database Name ^* " />
+ ?>"> +
-
- - - +
Site Configuration
+ + +
Site Configuration

- + + value="" size="40" /> + - +

URL ^* URL ^* -
Path ^* " size="40" />
Path to Cache Directory ^*
(must be writable)

- - + +
Admin Configuration
Admin Configuration

- - +
+ - + - - + + -
username admin
password^*
password^* ">
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later in vtigerCRM
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later in vtigerCRM
+ - + -

+

Step 4 of 5

+ + + + + + + +

Step 4 of 5

+ + + + -

+ + + + + + +

+ + + + + + + +

Create configuration file

- - - - - - + + + + + +

- - -

- - - -

Create Config File

"; - echo "

Successfully created config file (config.php) in :

".$root_directory."\n"; - echo "

"; +if ($templateHandle && $includeHandle) { + echo "
"; + echo "

"; + echo "

Successfully created configuration file (config.php) in :

".$root_directory."\n"; + echo "

"; } else { - echo ""; + echo "

"; - echo "Cannot write to config.php file in the directory ".$root_directory." file.\n"; - echo "

\n"; - echo "".$config.""; - echo "

Did you remember to create the config.php file?

"; } ?> - - -

"; + echo "Cannot write configuration file (config.php ) in the directory ".$root_directory.".\n"; + echo "

\n"; + echo "".$config.""; + echo "

Did you remember to create the config.php file?

- -

- + +

+ +

+ - Modified: vtigercrm/branches/4.2/install/config.template.php ============================================================================== --- vtigercrm/branches/4.2/install/config.template.php (original) +++ vtigercrm/branches/4.2/install/config.template.php Sun Feb 26 09:49:19 2006 @@ -43,7 +43,7 @@ */ $dbconfig['db_server'] = '_DBC_SERVER_'; -// TODO test if port is empty +// TODO: test if port is empty $dbconfig['db_port'] = ':_DBC_PORT_'; $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; $dbconfig['db_username'] = '_DBC_USER_'; @@ -51,7 +51,7 @@ $dbconfig['db_name'] = '_DBC_NAME_'; // db_type default value = mysql -$dbconfig['db_type'] = '_DBC_TYPE'; +$dbconfig['db_type'] = '_DBC_TYPE_'; // log_sql default value = false $dbconfig['log_sql'] = false; From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 13:38:46 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 18:38:46 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3938 - in /vtigercrm/branches/4.2: install/4createConfigFile.php install/config.template.php vtigerpatch.php vtigerversion.php Message-ID: <20060226183846.AEA1749E29F@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 11:38:42 2006 New Revision: 3938 Log: Put vtiger version and release date only in vtigerversion.php Modified: vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/config.template.php vtigercrm/branches/4.2/vtigerpatch.php vtigercrm/branches/4.2/vtigerversion.php Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 11:38:42 2006 @@ -20,12 +20,9 @@ ********************************************************************************/ require_once('include/utils.php'); +include('vtigerversion.php'); session_start(); - -// vtigerCRM version number; do not edit! -$vtiger_version = "4.2.3"; -$release_date = "23 December 2005"; if (isset($_REQUEST['db_hostname'])) $db_hostname = $_REQUEST['db_hostname']; @@ -131,11 +128,11 @@ $is_writable = is_writable('.'); /* open template configuration file read only */ -$templateFilename = $root_directory."install/config.template.php"; +$templateFilename = 'install/config.template.php'; $templateHandle = fopen($templateFilename, "r"); if($templateHandle) { /* open include configuration file write only */ - $includeFilename = $root_directory."config.php"; + $includeFilename = 'config.php'; $includeHandle = fopen($includeFilename, "w"); if($includeHandle) { while (!feof($templateHandle)) { Modified: vtigercrm/branches/4.2/install/config.template.php ============================================================================== --- vtigercrm/branches/4.2/install/config.template.php (original) +++ vtigercrm/branches/4.2/install/config.template.php Sun Feb 26 11:38:42 2006 @@ -1,4 +1,4 @@ - *** This Patch cannot be applied for vtiger CRM versions other than 4.2! *** "); } Modified: vtigercrm/branches/4.2/vtigerversion.php ============================================================================== --- vtigercrm/branches/4.2/vtigerversion.php (original) +++ vtigercrm/branches/4.2/vtigerversion.php Sun Feb 26 11:38:42 2006 @@ -11,5 +11,6 @@ $patch_version = ''; $modified_database = ''; -$vtiger_current_version = '4.2.3'; +$vtiger_version = '4.2.3'; +$release_date = '23 December 2005'; ?> From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 14:47:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 19:47:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3939 - in /vtigercrm/branches/4.2: config.db.php config.inc.php config.template.php install/4createConfigFile.php install/config.template.php Message-ID: <20060226194728.77EA1498302@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 12:47:23 2006 New Revision: 3939 Log: Introduce files needed for ticket #20 Added: vtigercrm/branches/4.2/config.db.php vtigercrm/branches/4.2/config.template.php - copied unchanged from r3938, vtigercrm/branches/4.2/install/config.template.php Removed: vtigercrm/branches/4.2/install/config.template.php Modified: vtigercrm/branches/4.2/config.inc.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/config.inc.php ============================================================================== --- vtigercrm/branches/4.2/config.inc.php (original) +++ vtigercrm/branches/4.2/config.inc.php Sun Feb 26 12:47:23 2006 @@ -3,5 +3,5 @@ * The configuration file for FHS system * is located at /etc/vtigercrm directory. */ - include('config.inc.php'); + include('config.inc.php'); ?> Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 12:47:23 2006 @@ -128,7 +128,7 @@ $is_writable = is_writable('.'); /* open template configuration file read only */ -$templateFilename = 'install/config.template.php'; +$templateFilename = 'config.template.php'; $templateHandle = fopen($templateFilename, "r"); if($templateHandle) { /* open include configuration file write only */ From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 16:04:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 21:04:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3940 - in /vtigercrm/branches/4.2: config.db.php config.inc.php config.php index.php install.php install/1checkSystem.php install/2setConfig.php install/4createConfigFile.php install/5createTables.php Message-ID: <20060226210424.0E78849E2A5@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 14:04:18 2006 New Revision: 3940 Log: config.inc.php is configuration file included by config.php Modified: vtigercrm/branches/4.2/config.db.php vtigercrm/branches/4.2/config.inc.php vtigercrm/branches/4.2/config.php vtigercrm/branches/4.2/index.php vtigercrm/branches/4.2/install.php vtigercrm/branches/4.2/install/1checkSystem.php vtigercrm/branches/4.2/install/2setConfig.php vtigercrm/branches/4.2/install/4createConfigFile.php vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/config.db.php ============================================================================== --- vtigercrm/branches/4.2/config.db.php (original) +++ vtigercrm/branches/4.2/config.db.php Sun Feb 26 14:04:18 2006 @@ -5,4 +5,6 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_' + + $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; ?> Modified: vtigercrm/branches/4.2/config.inc.php ============================================================================== --- vtigercrm/branches/4.2/config.inc.php (original) +++ vtigercrm/branches/4.2/config.inc.php Sun Feb 26 14:04:18 2006 @@ -1,7 +1,71 @@ Modified: vtigercrm/branches/4.2/config.php ============================================================================== --- vtigercrm/branches/4.2/config.php (original) +++ vtigercrm/branches/4.2/config.php Sun Feb 26 14:04:18 2006 @@ -1,71 +1,7 @@ Modified: vtigercrm/branches/4.2/index.php ============================================================================== --- vtigercrm/branches/4.2/index.php (original) +++ vtigercrm/branches/4.2/index.php Sun Feb 26 14:04:18 2006 @@ -350,24 +350,24 @@ // Create or reestablish the current session session_start(); -if (!is_file('config.php')) { - header("Location: install.php"); - exit(); -} - -require_once('config.php'); +if (!is_file('config.inc.php')) { + header("Location: install.php"); + exit(); +} + +require_once('config.inc.php'); if (!isset($dbconfig['db_hostname'])) { - header("Location: install.php"); - exit(); -} - -// load up the config_override.php file. This is used to provide default user settings -if (is_file('config_override.php')) -{ - require_once('config_override.php'); -} + header("Location: install.php"); + exit(); +} + +// load up the config.override.php file +// used to provide default user settings +if (is_file('config.override.php')) + require_once('config.override.php'); + $default_config_values = Array( "allow_exports"=>"all","upload_maxsize"=>"3000000" ); - + set_default_config($default_config_values); require_once('include/logging.php'); require_once('modules/Users/User.php'); Modified: vtigercrm/branches/4.2/install.php ============================================================================== --- vtigercrm/branches/4.2/install.php (original) +++ vtigercrm/branches/4.2/install.php Sun Feb 26 14:04:18 2006 @@ -18,24 +18,26 @@ ********************************************************************************/ if (substr(phpversion(), 0, 1) == "5") { - ini_set("zend.ze1_compatibility_mode", "1"); + ini_set("zend.ze1_compatibility_mode", "1"); } function stripslashes_checkstrings($value) { - if(is_string($value)) { - return stripslashes($value); - } - return $value; + if(is_string($value)) + return stripslashes($value); + + return $value; } if(get_magic_quotes_gpc() == 1) { - $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST); - $_POST = array_map("stripslashes_checkstrings", $_POST); - $_GET = array_map("stripslashes_checkstrings", $_GET); + $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST); + $_POST = array_map("stripslashes_checkstrings", $_POST); + $_GET = array_map("stripslashes_checkstrings", $_GET); } -if (isset($_POST['file'])) $the_file = $_POST['file']; -else $the_file = "0welcome.php"; +if (isset($_POST['file'])) + $the_file = $_POST['file']; +else + $the_file = "0welcome.php"; include("install/".$the_file); Modified: vtigercrm/branches/4.2/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/4.2/install/1checkSystem.php (original) +++ vtigercrm/branches/4.2/install/1checkSystem.php Sun Feb 26 14:04:18 2006 @@ -173,9 +173,9 @@ - config.php - - Writeable":"Not Writeable"; ?> + config.inc.php + + Writeable":"Not Writeable"; ?> Cache Directory (cache/) Modified: vtigercrm/branches/4.2/install/2setConfig.php ============================================================================== --- vtigercrm/branches/4.2/install/2setConfig.php (original) +++ vtigercrm/branches/4.2/install/2setConfig.php Sun Feb 26 14:04:18 2006 @@ -34,7 +34,7 @@ $current_dir = $current_dir['dirname']."/"; $cache_dir = "cache/"; -if (is_file("config.php")) { +if (is_file("config.php") && is_file("config.inc.php")) { require_once("config.php"); session_start(); Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 14:04:18 2006 @@ -122,8 +122,8 @@ if (isset($_REQUEST['root_directory'])) $root_directory = $_REQUEST['root_directory']; -if (is_file('config.php')) - $is_writable = is_writable('config.php'); +if (is_file('config.inc.php')) + $is_writable = is_writable('config.inc.php'); else $is_writable = is_writable('.'); @@ -132,7 +132,7 @@ $templateHandle = fopen($templateFilename, "r"); if($templateHandle) { /* open include configuration file write only */ - $includeFilename = 'config.php'; + $includeFilename = 'config.inc.php'; $includeHandle = fopen($includeFilename, "w"); if($includeHandle) { while (!feof($templateHandle)) { @@ -176,16 +176,16 @@ if ($templateHandle && $includeHandle) { echo "
"; + echo "

Successfully created configuration file (config.inc.php) in :

"; echo "

"; - echo "

Successfully created configuration file (config.php) in :

".$root_directory."\n"; echo "

"; } else { echo ""; + echo "

Did you remember to create the config.inc.php file ?"; } ?> Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Sun Feb 26 14:04:18 2006 @@ -61,9 +61,9 @@ require_once('include/utils.php'); require_once('modules/Users/Security.php'); -// load the config_override.php file to provide default user settings -if (is_file("config_override.php")) { - require_once("config_override.php"); +// load the config.override.php file to provide default user settings +if (is_file("config.override.php")) { + require_once("config.override.php"); } $db = new PearDatabase(); From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 17:17:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sun, 26 Feb 2006 22:17:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3941 - in /vtigercrm/branches/4.2: config.template.php install/4createConfigFile.php Message-ID: <20060226221739.DE51F3F325C@vtiger.fosslabs.com> Author: fathi Date: Sun Feb 26 15:17:36 2006 New Revision: 3941 Log: added missing parameters in template file Modified: vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Sun Feb 26 15:17:36 2006 @@ -41,16 +41,14 @@ db_name */ +// TODO: test if port is empty $dbconfig['db_server'] = '_DBC_SERVER_'; -// TODO: test if port is empty $dbconfig['db_port'] = ':_DBC_PORT_'; -$dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; $dbconfig['db_username'] = '_DBC_USER_'; $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; - -// db_type default value = mysql $dbconfig['db_type'] = '_DBC_TYPE_'; +$dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; // log_sql default value = false $dbconfig['log_sql'] = false; @@ -75,20 +73,26 @@ $host_name = $dbconfig['db_hostname']; $site_URL = 'http://'.$dbconfig['db_server'].'/vtigercrm'; -$root_directory = '/var/www/vtigercrm'; -$cache_dir = 'cache/'; -$mail_server = ''; -$mail_server_username = ''; -$mail_server_password = ''; + +// root directory path +$root_directory = '_VT_ROOTDIR_'; + +// cache direcory path +$cache_dir = '_VT_CACHEDIR_'; // tmp_dir default value prepended by cache_dir = images/ -$tmp_dir = 'cache/images/'; +$tmp_dir = '_VT_TMPDIR_'; -// import_dir default value prepended by cache_dir = import/ -$import_dir = 'cache/import/'; +// import_dir default value prepended by cache_dir = import/ +$import_dir = '_VT_IMPORTDIR_'; // upload_dir default value prepended by cache_dir = upload/ -$upload_dir = 'cache/upload/'; +$upload_dir = '_VT_UPLOADDIR_'; + +// mail server parameters +$mail_server = '_MAIL_SERVER_'; +$mail_server_username = '_MAIL_USERNAME_'; +$mail_server_password = '_MAIL_PASSWORD_'; // maximum file size for uploaded files in bytes also used when uploading import files // upload_maxsize default value = 3000000 @@ -106,7 +110,7 @@ $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 = /var/www/vtigercrm/.'include/ +// includeDirectory default value = $root_directory..'include/ $includeDirectory = $root_directory.'include/'; // list_max_entries_per_page default value = 20 Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Sun Feb 26 15:17:36 2006 @@ -137,26 +137,7 @@ if($includeHandle) { while (!feof($templateHandle)) { $buffer = fgets($templateHandle); - /* TODO: add missing parameters - $vtiger_version = '".$vtiger_version."';\n"; - $release_date = '".$release_date."';\n"; - $dbconfig['db_hostname'] = '".$db_hostname."';\n"; - $dbconfig['db_username'] = '".$db_username."';\n"; - $dbconfig['db_password'] = '".$db_password."';\n"; - $dbconfig['db_name'] = '".$db_name."';\n"; - $host_name = '".$db_hostname."';\n"; - $site_URL = '".$site_URL."';\n"; - $root_directory = '".$root_directory."';\n"; - $cache_dir = '$cache_dir';\n"; - $mail_server = '$mail_server';\n"; - $mail_server_username = '$mail_server_username';\n"; - $mail_server_password = '$mail_server_password';\n"; - $tmp_dir = '" . ($cache_dir . "images/") . "';\n"; - $import_dir = '" . ($cache_dir . "import/") . "';\n"; - $upload_dir = '" . ($cache_dir . "upload/") . "';\n"; - // includeDirectory default value = $root_directory.'include/\n"; - $languages = $language_value;\n"; - */ + /* replace _DBC_ variable */ $buffer = str_replace( "_DBC_SERVER_", $db_hostname, $buffer); $buffer = str_replace( "_DBC_PORT_", "3306", $buffer); @@ -164,6 +145,16 @@ $buffer = str_replace( "_DBC_PASS_", $db_password, $buffer); $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); + /* replace dir variable */ + $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer); + $buffer = str_replace( "_VT_CACHEDIR_", $cache_dir, $buffer); + $buffer = str_replace( "_VT_TMPDIR_", $cache_dir."images/", $buffer); + $buffer = str_replace( "_VT_IMPORTDIR_", $cache_dir."import/", $buffer); + $buffer = str_replace( "_VT_UPLOADDIR_", $cache_dir."upload/", $buffer); + /* replace mail variable */ + $buffer = str_replace( "_MAIL_SERVER_", $mail_server, $buffer); + $buffer = str_replace( "_MAIL_USERNAME_", $mail_server_username, $buffer); + $buffer = str_replace( "_MAIL_PASSWORD_", $mail_server_password, $buffer); fwrite($includeHandle, $buffer); } From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 23:57:30 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 04:57:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3942 - in /vtigercrm/branches/4.2: install.php install/5createTables.inc.php install/5createTables.php Message-ID: <20060227045730.7BA8649E34F@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 21:57:27 2006 New Revision: 3942 Log: create install/5createTables.inc.php and modify install.php to use it when called from the command line. see #28 Added: vtigercrm/branches/4.2/install/5createTables.inc.php - copied, changed from r3915, vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/install.php vtigercrm/branches/4.2/install/5createTables.php Modified: vtigercrm/branches/4.2/install.php ============================================================================== --- vtigercrm/branches/4.2/install.php (original) +++ vtigercrm/branches/4.2/install.php Sun Feb 26 21:57:27 2006 @@ -34,6 +34,12 @@ $_GET = array_map("stripslashes_checkstrings", $_GET); } +//Run command line if no web var detected +if (!isset($_SERVER['REQUEST_METHOD'])) { + require("install/5createTables.inc.php"); + exit; +} + if (isset($_POST['file'])) $the_file = $_POST['file']; else Modified: vtigercrm/branches/4.2/install/5createTables.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.php (original) +++ vtigercrm/branches/4.2/install/5createTables.php Sun Feb 26 21:57:27 2006 @@ -37,170 +37,7 @@ if (isset($_REQUEST['admin_password'])) $admin_password = $_REQUEST['admin_password']; -$new_tables = 0; - -require_once('include/database/PearDatabase.php'); -require_once('include/logging.php'); -require_once('modules/Leads/Lead.php'); -require_once('modules/Settings/FileStorage.php'); -//require_once('modules/imports/Headers.php'); -require_once('modules/Contacts/Contact.php'); -require_once('modules/Accounts/Account.php'); -require_once('modules/Potentials/Opportunity.php'); -require_once('modules/Activities/Activity.php'); -require_once('modules/Notes/Note.php'); -require_once('modules/Emails/Email.php'); -require_once('modules/Users/User.php'); -require_once('modules/Import/SugarFile.php'); -require_once('modules/Import/ImportMap.php'); -require_once('modules/Import/UsersLastImport.php'); -require_once('modules/Users/TabMenu.php'); -require_once('modules/Users/LoginHistory.php'); -require_once('modules/Settings/FileStorage.php'); -require_once('data/Tracker.php'); -require_once('include/utils.php'); -require_once('modules/Users/Security.php'); - -// load the config.override.php file to provide default user settings -if (is_file("config.override.php")) { - require_once("config.override.php"); -} - -$db = new PearDatabase(); - -$log =& LoggerManager::getLogger('create_table'); - -function createSchemaTable() { - global $log; - - // create the schema tables - $query = "CREATE TABLE modules (id int(11) NOT NULL auto_increment, name text,PRIMARY KEY ( ID ))"; - - $this->query($query); -} - -function createObjectTable() { - global $log; - - // create the object tables - $query = "CREATE TABLE objects (module_id int(11), name text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -function createAttributesTable() { - global $log; - - // create the attributes tables - $query = "CREATE TABLE attributes (module_id int(11), object_name text, name text, PRIMARY KEY ( module_id, object_name ))"; - // fk module_id, object_name -> object table. - - $this->query($query); -} - -function createLabelsTable() { - global $log; - - // create the translation tables - $query = "CREATE TABLE labels (module_id int(11), name text, value text, value_long text, value_popup text, PRIMARY KEY ( module_id, name ))"; - - $this->query($query); -} - -// drop old tables if table exists and told to drop it -function drop_table_install(&$focus) { - global $log, $db; - - $result = $db->requireSingleResult("SHOW TABLES LIKE '".$focus->table_name."'"); - - if (!empty($result)) { - $focus->drop_tables(); - $log->info("Dropped old ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Did not need to drop old ".$focus->table_name." table. It doesn't exist."); - return 0; - } -} - -// create new tables if they don't exist. -function create_table_install(&$focus) { - global $log, $db; - - $result = $db->query("SHOW TABLES LIKE '".$focus->table_name."'"); - - if ($db->getRowCount($result) == 0) { - $focus->create_tables(); - $log->info("Created ".$focus->table_name." table."); - return 1; - } - else { - $log->info("Table ".$focus->table_name." already exists."); - return 0; - } -} - -function create_default_users() { - global $log, $db; - global $admin_email; - global $admin_password; - global $create_default_user; - global $default_user_name; - global $default_password; - global $default_user_is_admin; - - // create default admin user - $user = new User(); - $user->last_name = 'Administrator'; - $user->user_name = 'admin'; - $user->status = 'Active'; - $user->is_admin = 'on'; - $user->user_password = $user->encrypt_password($admin_password); - $user->tz = 'Europe/Berlin'; - $user->holidays = 'de,en_uk,fr,it,us,'; - $user->workdays = '0,1,2,3,4,5,6,'; - $user->weekstart = '1'; - $user->namedays = ''; - $user->date_format = 'yyyy-mm-dd'; - $user->email = $admin_email; - $user->save(); - - // we need to change the admin user to a fixed id of 1. - //$query = "update users set id='1' where user_name='$user->user_name'"; - //$result = $db->query($query, true, "Error updating admin user ID: "); - - $log->info("Created ".$user->table_name." table. for user $user->id"); - - if($create_default_user) { - $default_user = new User(); - $default_user->last_name = $default_user_name; - $default_user->user_name = $default_user_name; - $default_user->status = 'Active'; - - if (isset($default_user_is_admin) && $default_user_is_admin) - $default_user->is_admin = 'on'; - - $default_user->user_password = $default_user->encrypt_password($default_password); - $default_user->tz = 'Europe/Berlin'; - $default_user->holidays = 'de,en_uk,fr,it,us,'; - $default_user->workdays = '0,1,2,3,4,5,6,'; - $default_user->weekstart = '1'; - $default_user->namedays = ''; - $default_user->save(); - } - - // insert values into user2role table - $role_query = "select roleid from role where name='administrator'"; - $db->database->SetFetchMode(ADODB_FETCH_ASSOC); - $role_result = $db->query($role_query); - $role_id = $db->query_result($role_result,0,"roleid"); - - $sql_stmt1 = "insert into user2role values(".$user->id.",".$role_id.")"; - $db->query($sql_stmt1) or die($app_strings['ERR_CREATING_TABLE'].mysql_error()); -} ?> - @@ -237,193 +74,14 @@

From vtigercrm-commits at vtiger.fosslabs.com Sun Feb 26 23:58:58 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 04:58:58 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3943 - /vtigercrm/branches/4.2/install/5createTables.inc.php Message-ID: <20060227045858.3EE0D49E34F@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 21:58:56 2006 New Revision: 3943 Log: output one less line to compensate for create_default_users(). see #40 Modified: vtigercrm/branches/4.2/install/5createTables.inc.php Modified: vtigercrm/branches/4.2/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/4.2/install/5createTables.inc.php (original) +++ vtigercrm/branches/4.2/install/5createTables.inc.php Sun Feb 26 21:58:56 2006 @@ -257,7 +257,7 @@ $focus->create_tables(); // inserts only rows eecho (", "); } -eecho ("Done.\n"); +eecho ("Done."); /* if ($new_tables) From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 00:19:08 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 05:19:08 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3944 - /vtigercrm/branches/4.2/schema/DatabaseSchema.xml Message-ID: <20060227051909.236643F4703@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 22:19:07 2006 New Revision: 3944 Log: remove primary key markers on several fields and use indexes instead. Cought by briand and extended by mfedyk. closes #39 Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml Modified: vtigercrm/branches/4.2/schema/DatabaseSchema.xml ============================================================================== --- vtigercrm/branches/4.2/schema/DatabaseSchema.xml (original) +++ vtigercrm/branches/4.2/schema/DatabaseSchema.xml Sun Feb 26 22:19:07 2006 @@ -4765,7 +4765,7 @@

"; - echo "Cannot write configuration file (config.php ) in the directory ".$root_directory.".\n"; - echo "

\n"; + echo "Cannot write configuration file (config.inc.php ) in the directory ".$root_directory.".\n"; + echo "

\n"; echo "".$config.""; - echo "

Did you remember to create the config.php file?

total time: seconds.

- + @@ -4776,6 +4776,9 @@ columnindex + + cvid + Type=InnoDB

@@ -4844,7 +4847,7 @@ - + @@ -4870,7 +4873,7 @@

- + @@ -4878,6 +4881,9 @@ + + queryid + Type=InnoDB @@ -4885,7 +4891,7 @@

- + @@ -4894,6 +4900,9 @@ + + queryid + Type=InnoDB

@@ -4906,7 +4915,7 @@ - + @@ -4920,6 +4929,9 @@ + + queryid + Type=InnoDB

From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 01:13:29 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 06:13:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3945 - /vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Message-ID: <20060227061329.4800C36B75F@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 23:13:27 2006 New Revision: 3945 Log: fix scope issue in getUserFldArray(), by kiang. Introduced in r3878 Modified: vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Modified: vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php ============================================================================== --- vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php (original) +++ vtigercrm/branches/4.2/modules/Settings/ComboFieldList.php Sun Feb 26 23:13:27 2006 @@ -216,6 +216,7 @@ function getUserFldArray($fld_module) { + global $adb; $user_fld = Array(); $query = "select * from field where generatedtype=2 and tabid=".fetchTabIDVal($fld_module)." and uitype IN (15,16)"; // echo $query; From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 01:17:57 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 06:17:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3946 - /vtigercrm/branches/4.2/modules/Potentials/Charts.php Message-ID: <20060227061757.47B5E41E64C@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 23:17:55 2006 New Revision: 3946 Log: Fix Graphs Labels Not Dispalyed Properly, by briand. closes #36 Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php Modified: vtigercrm/branches/4.2/modules/Potentials/Charts.php ============================================================================== --- vtigercrm/branches/4.2/modules/Potentials/Charts.php (original) +++ vtigercrm/branches/4.2/modules/Potentials/Charts.php Sun Feb 26 23:17:55 2006 @@ -222,7 +222,7 @@ //$bplot->value->SetAlign('left','center'); $bplot[$index]->value->SetColor("white"); $bplot[$index]->value->SetFormat(getCurrencySymbol().'%d'); - $bplot[$index]->SetValuePos('max'); + $bplot[$index]->SetValuePos('center'); //set client side image map URL's $bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]); @@ -510,7 +510,7 @@ //$bplot->value->SetAlign('left','center'); $bplot[$index]->value->SetColor("white"); $bplot[$index]->value->SetFormat(getCurrencySymbol().'%d'); - $bplot[$index]->SetValuePos('max'); + $bplot[$index]->SetValuePos('center'); //set client side image map URL's $bplot[$index]->SetCSIMTargets($aTargets[$stage],$aAlts[$stage]); @@ -783,7 +783,7 @@ //$bplot->value->SetAlign('left','center'); $bplot[$index]->value->SetColor("white"); $bplot[$index]->value->SetFormat(getCurrencySymbol().'%d'); - $bplot[$index]->SetValuePos('max'); + $bplot[$index]->SetValuePos('center'); //set client side image map URL's $bplot[$index]->SetCSIMTargets($aTargets[$the_id],$aAlts[$the_id]); From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 01:34:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 06:34:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3947 - /vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Message-ID: <20060227063406.44E0349E388@vtiger.fosslabs.com> Author: mfedyk Date: Sun Feb 26 23:34:04 2006 New Revision: 3947 Log: Fix Home Page Ticket List Status / Created / Assigned To are wrong, by briand. closes #38 Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Modified: vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php ============================================================================== --- vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php (original) +++ vtigercrm/branches/4.2/modules/HelpDesk/ListTickets.php Sun Feb 26 23:34:04 2006 @@ -102,8 +102,6 @@ $list.='

'; $list.=''.$current_module_strings['LBL_CREATED_DATE'].''; $list.='

'; -$list.=''.$current_module_strings['LBL_ASSIGNED_TO'].''; -$list.='

'; $list.=''; for ($i=1; $i<=$adb->num_rows($tktresult); $i++) @@ -131,19 +129,17 @@ $list .= ''.$parent_name.''; $list .= '

'; - $list .= ''.$adb->query_result($tktresult,$i,"status").''; + $list .= ''.$adb->query_result($tktresult,$i-1,"status").''; $list .= '

'; - $list .= ''.getDisplayDate($adb->query_result($tktresult,$i,"createdtime")).''; - $list .= '

'; - $list .= ''.$adb->query_result($tktresult,$i,"user_name").''; + $list .= ''.getDisplayDate($adb->query_result($tktresult,$i-1,"createdtime")).''; $list .= '

'; $list .= ''; } if($resultcount > 5) - $list .= '

'.$current_module_strings['LBL_MORE'].'...

'; + $list .= '

'.$current_module_strings['LBL_MORE'].'...

'; -$list.='

'; +$list.='

'; $list .= '

'; $list .= ' @@ -19,15 +18,15 @@ - - - @@ -36,16 +35,16 @@ - - + - - + @@ -67,14 +66,14 @@

${$MOD.LBL_CREATE_AND_MANAGE_USERS}$ {$MOD.LBL_USERS}	${$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}$ +	${$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}$ {$MOD.LBL_ROLES}	${$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}$ +	${$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}$ {$MOD.LBL_PROFILES}	${$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}$ +	${$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}$ {$MOD.USERGROUPLIST}
${$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}$ +	${$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}$ {$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}	${$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}$ -{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}	${$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}$ +{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}	${$MOD.LBL_SETTING_FIELD_ACCESSIBILITY}$ -{$MOD.LBL_FIELD_ACCESSIBILITY}	${$MOD.LBL_SETTING_ANNOUNCEMENT}$ +	${$MOD.LBL_SETTING_FIELD_ACCESSIBILITY}$ +{$MOD.LBL_FIELD_ACCESSIBILITY}	${$MOD.LBL_SETTING_ANNOUNCEMENT}$ {$MOD.LBL_ANNOUNCEMENT}

-{$MOD.LBL_CUSTOM_FIELD_SETTINGS} -{$MOD.LBL_PICKLIST_SETTINGS} -{$MOD.LBL_FIELD_ORDERING} +{$MOD.LBL_CUSTOM_FIELD_SETTINGS} +{$MOD.LBL_PICKLIST_SETTINGS} +{$MOD.LBL_FIELD_ORDERING}

@@ -79,6 +80,4 @@ ScrollEffect2.closelimit2= 120; ScrollEffect3.limit3 = 161; ScrollEffect3.closelimit3= 160; - - From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:26:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:26:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3955 - /vtigercrm/trunk/modules/Users/Security.php Message-ID: <20060227142625.8C51149E3B4@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:26:20 2006 New Revision: 3955 Log: Moved several fields from Basic Infn to Adv Infn & vice versa in Leads, Accounts, Contacts, Potential & Product Module based on the Inputs from Sales Team Modified: vtigercrm/trunk/modules/Users/Security.php Modified: vtigercrm/trunk/modules/Users/Security.php ============================================================================== --- vtigercrm/trunk/modules/Users/Security.php (original) +++ vtigercrm/trunk/modules/Users/Security.php Mon Feb 27 07:26:20 2006 @@ -160,11 +160,11 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'website','account',1,'17','website','Website',1,0,0,100,3,9,1,'V~O',0,3,'BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'fax','account',1,'1','fax','Fax',1,0,0,100,4,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'tickersymbol','account',1,'1','tickersymbol','Ticker Symbol',1,0,0,100,5,9,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'otherphone','account',1,'11','otherphone','Other Phone',1,0,0,100,6,9,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'parentid','account',1,'51','account_id','Member Of',1,0,0,100,7,9,1,'I~O',1,'','ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email1','account',1,'13','email1','Email',1,0,0,100,8,9,1,'E~O',1,'','BAS')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'employees','account',1,'7','employees','Employees',1,0,0,100,9,9,1,'I~O',1,'','ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'email2','account',1,'13','email2','Other Email',1,0,0,100,10,9,1,'E~O',1,'','ADV')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'ownership','account',1,'1','ownership','Ownership',1,0,0,100,11,9,1,'V~O',1,'','ADV')"); @@ -175,7 +175,7 @@ $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'annualrevenue','account',1,'71','annual_revenue','Annual Revenue',1,0,0,100,16,9,1,'I~O',1,'','ADV')"); //Added field emailoptout for accounts -- after 4.2 patch2 $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'emailoptout','account',1,'56','emailoptout','Email Opt Out',1,0,0,100,17,9,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,'','ADV')"); + $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,18,9,1,'V~M',1,'','BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); $this->db->query("insert into field values (6,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,19,9,2,'T~O',1,'','BAS')"); @@ -233,7 +233,7 @@ $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'annualrevenue','leaddetails',1,'71','annualrevenue','Annual Revenue',1,0,0,100,14,13,1,'I~O',1,'','ADV')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'rating','leaddetails',1,'15','rating','Rating',1,0,0,100,15,13,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'noofemployees','leaddetails',1,'1','noofemployees','No Of Employees',1,0,0,100,16,13,1,'V~O',1,'','ADV')"); - $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,'','ADV')"); + $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,17,13,1,'V~M',1,'','BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'yahooid','leaddetails',1,'13','yahooid','Yahoo Id',1,0,0,100,18,13,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,19,13,2,'T~O',1,'','BAS')"); $this->db->query("insert into field values (7,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,20,13,2,'T~O',1,'','BAS')"); @@ -271,7 +271,7 @@ $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'mobile','contactdetails',1,'1','mobile','Mobile',1,0,0,100,5,4,1,'V~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'accountid','contactdetails',1,'51','account_id','Account Name',1,0,0,100,6,4,1,'I~O',0,3,'BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'campaignid','contactdetails',1,'51','campaignid','Campaign Name',1,0,0,100,6,4,3,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'homephone','contactsubdetails',1,'11','homephone','Home Phone',1,0,0,100,7,4,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'leadsource','contactsubdetails',1,'15','leadsource','Lead Source',1,0,0,100,8,4,1,'V~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'otherphone','contactsubdetails',1,'11','otherphone','Phone',1,0,0,100,9,4,1,'V~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'title','contactdetails',1,'1','title','Title',1,0,0,100,10,4,1,'V~O',1,'','BAS')"); @@ -285,7 +285,7 @@ $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'assistantphone','contactsubdetails',1,'11','assistantphone','Assistant Phone',1,0,0,100,19,4,1,'V~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'donotcall','contactdetails',1,'56','donotcall','Do Not Call',1,0,0,100,20,4,1,'C~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'emailoptout','contactdetails',1,'56','emailoptout','Email Opt Out',1,0,0,100,21,4,1,'C~O',1,'','ADV')"); - $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,'','ADV')"); + $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'smownerid','crmentity',1,'53','assigned_user_id','Assigned To',1,0,0,100,22,4,1,'V~M',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'reference','contactdetails',1,'56','reference','Reference',1,0,0,10,23,4,1,'C~O',1,'','ADV')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'createdtime','crmentity',1,'70','createdtime','Created Time',1,0,0,100,24,4,2,'T~O',1,'','BAS')"); $this->db->query("insert into field values (4,".$this->db->getUniqueID("field").",'modifiedtime','crmentity',1,'70','modifiedtime','Modified Time',1,0,0,100,25,4,2,'T~O',1,'','BAS')"); @@ -438,17 +438,17 @@ //Block 33 stock info - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,'','BAS')"); -$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,'','BAS')"); - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'usageunit','products',1,'15','usageunit','Usage Unit',1,0,0,100,1,33,1,'V~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qty_per_unit','products',1,'1','qty_per_unit','Qty/Unit',1,0,0,100,2,33,1,'N~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyinstock','products',1,'1','qtyinstock','Qty In Stock',1,0,0,100,3,33,1,'I~O',1,'','ADV')"); +$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'reorderlevel','products',1,'1','reorderlevel','Reorder Level',1,0,0,100,4,33,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'handler','products',1,'52','assigned_user_id','Handler',1,0,0,100,5,33,1,'I~O',1,'','ADV')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'qtyindemand','products',1,'1','qtyindemand','Qty In Demand',1,0,0,100,6,33,1,'I~O',1,'','ADV')"); //ProductImageInformation - $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,'','BAS')"); + $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'imagename','products',1,'69','imagename','Product Image',1,0,0,100,1,35,1,'V~O',1,'','ADV')"); //Block 36 Description Info From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:27:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:27:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3956 - in /vtigercrm/trunk: Smarty/templates/ modules/Settings/ Message-ID: <20060227142700.83F2E49EEB0@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:26:51 2006 New Revision: 3956 Log: submenu integrated in settings Added: vtigercrm/trunk/Smarty/templates/CustomFieldindex.tpl vtigercrm/trunk/Smarty/templates/FieldAccessindex.tpl vtigercrm/trunk/Smarty/templates/FieldOrderindex.tpl vtigercrm/trunk/Smarty/templates/Organizationindex.tpl vtigercrm/trunk/Smarty/templates/PickListindex.tpl vtigercrm/trunk/modules/Settings/SettingsSubMenu.php From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:44:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:44:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3957 - /vtigercrm/trunk/include/utils/EditViewUtils.php Message-ID: <20060227144420.E912B2A8268@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:44:14 2006 New Revision: 3957 Log: changes made to return currency symbol ana conversion rate Modified: vtigercrm/trunk/include/utils/EditViewUtils.php Modified: vtigercrm/trunk/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/EditViewUtils.php (original) +++ vtigercrm/trunk/include/utils/EditViewUtils.php Mon Feb 27 07:44:14 2006 @@ -813,9 +813,14 @@ elseif($uitype == 71 || $uitype == 72) { - $disp_currency = getDisplayCurrency(); - $editview_label[]=$mod_strings[$fieldlabel].': ('.$disp_currency.')'; - $fieldvalue[] = $value; + $currencyid=fetchCurrency($current_user->id); + $currency=getCurrencySymbol($currencyid); + $rate = getConversionRate($currencyid,$currency); + $editview_label[]=$mod_strings[$fieldlabel].': ('.$currency.')'; + if($value!='') + $fieldvalue[] = convertFromDollar($value,$rate); + else + $fieldvalue[] = $value; } elseif($uitype == 75 || $uitype ==81) { From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:46:39 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:46:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3958 - in /vtigercrm/trunk/themes/blue/images: left.gif right.gif Message-ID: <20060227144639.D375A49ABBA@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:46:34 2006 New Revision: 3958 Log: old images has been removed Removed: vtigercrm/trunk/themes/blue/images/left.gif vtigercrm/trunk/themes/blue/images/right.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:49:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:49:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3959 - in /vtigercrm/trunk/themes/blue/images: left.gif right.gif Message-ID: <20060227144959.F03DF49ABBA@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:49:54 2006 New Revision: 3959 Log: new images integrated for calendar Added: vtigercrm/trunk/themes/blue/images/left.gif (with props) vtigercrm/trunk/themes/blue/images/right.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:53:34 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:53:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3960 - in /vtigercrm/trunk: Smarty/templates/Header.tpl modules/Users/Announcements.php modules/Users/UsersAjax.php Message-ID: <20060227145334.D1B2349E316@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:53:28 2006 New Revision: 3960 Log: issue in announcement has been fixed Modified: vtigercrm/trunk/Smarty/templates/Header.tpl vtigercrm/trunk/modules/Users/Announcements.php vtigercrm/trunk/modules/Users/UsersAjax.php Modified: vtigercrm/trunk/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Header.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon Feb 27 07:53:28 2006 @@ -18,7 +18,7 @@ \n"; From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 10:51:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:51:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3965 - /vtigercrm/trunk/themes/blue/style.css Message-ID: <20060227155100.AE95649E352@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:50:55 2006 New Revision: 3965 Log: New style added for product details Modified: vtigercrm/trunk/themes/blue/style.css Modified: vtigercrm/trunk/themes/blue/style.css ============================================================================== --- vtigercrm/trunk/themes/blue/style.css (original) +++ vtigercrm/trunk/themes/blue/style.css Mon Feb 27 08:50:55 2006 @@ -239,11 +239,13 @@ padding-right:10px; border-bottom:1px solid #eaeaea; color:#737373; + white-space:nowrap; } .dvtCellInfo { padding-left:10px; border-bottom:1px solid #eaeaea; + white-space:nowrap; } .rightMailMerge { @@ -290,6 +292,16 @@ border:1px solid #bababa; padding-left:5px; width:90%; + background-color:#ffffff; +} + +.detailedViewProdTextBox { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + color: #000000; + border:1px solid #bababa; + padding-left:5px; + width:85%; background-color:#ffffff; } @@ -836,3 +848,48 @@ width:245px; } +.prdTab{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + width:100%; + border-left:1px solid #CCCCCC; + border-right:0px solid #CCCCCC; +} + +.prdTab tr th{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + border-right:1px solid #CCCCCC; + padding-left:5px; + background-color:#E5E5E5; + height:20px; + color:#000000; + font-weight:bold; + text-decoration:none; + border-bottom:1px solid #CCCCCC; +} + +.prdTab tr td{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-align:left; + border-right:1px solid #CCCCCC; + border-bottom:1px solid #CCCCCC; + padding-left:5px; + color:#000000; + text-decoration:none; + font-weight:normal; + height:20px; +} + +.delTxt{ + font-family:Arial, Helvetica, sans-serif; + font-size:11px; + text-decoration:underline; + font-weight:normal; + color:#000099; + cursor:pointer; +} + From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 16:19:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:19:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3966 - in /vtigercrm/branches/4.2/modules: Calls/ Cases/ MessageBoard/ Message-ID: <20060227211906.AF6F042E1BA@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 14:19:03 2006 New Revision: 3966 Log: remove old unused modules: MessageBoard Calls Cases see #49 Removed: vtigercrm/branches/4.2/modules/Calls/ vtigercrm/branches/4.2/modules/Cases/ vtigercrm/branches/4.2/modules/MessageBoard/ From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 16:29:37 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:29:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3967 - in /vtigercrm/branches/4.2: config.db.php config.template.php install/4createConfigFile.php Message-ID: <20060227212937.C08E9188AE0@vtiger.fosslabs.com> Author: fathi Date: Mon Feb 27 14:29:31 2006 New Revision: 3967 Log: use site_URL previously removed by mistake Modified: vtigercrm/branches/4.2/config.db.php vtigercrm/branches/4.2/config.template.php vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/config.db.php ============================================================================== --- vtigercrm/branches/4.2/config.db.php (original) +++ vtigercrm/branches/4.2/config.db.php Mon Feb 27 14:29:31 2006 @@ -5,6 +5,4 @@ $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_' - - $dbconfig['db_hostname'] = $dbconfig['db_server'].$dbconfig['db_port']; ?> Modified: vtigercrm/branches/4.2/config.template.php ============================================================================== --- vtigercrm/branches/4.2/config.template.php (original) +++ vtigercrm/branches/4.2/config.template.php Mon Feb 27 14:29:31 2006 @@ -41,13 +41,15 @@ db_name */ -// TODO: test if port is empty $dbconfig['db_server'] = '_DBC_SERVER_'; $dbconfig['db_port'] = ':_DBC_PORT_'; $dbconfig['db_username'] = '_DBC_USER_'; $dbconfig['db_password'] = '_DBC_PASS_'; $dbconfig['db_name'] = '_DBC_NAME_'; $dbconfig['db_type'] = '_DBC_TYPE_'; + +// 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 @@ -72,7 +74,8 @@ $dbconfigoption['ssl'] = false; $host_name = $dbconfig['db_hostname']; -$site_URL = 'http://'.$dbconfig['db_server'].'/vtigercrm'; + +$site_URL = '_SITE_URL_'; // root directory path $root_directory = '_VT_ROOTDIR_'; Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Mon Feb 27 14:29:31 2006 @@ -145,6 +145,9 @@ $buffer = str_replace( "_DBC_PASS_", $db_password, $buffer); $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); + + $buffer = str_replace( "_SITE_URL_", "site_URL", $buffer); + /* replace dir variable */ $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer); $buffer = str_replace( "_VT_CACHEDIR_", $cache_dir, $buffer); From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 16:32:07 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:32:07 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3968 - /vtigercrm/branches/4.2/install/4createConfigFile.php Message-ID: <20060227213207.7814849EEFF@vtiger.fosslabs.com> Author: fathi Date: Mon Feb 27 14:32:04 2006 New Revision: 3968 Log: use site_URL previously removed by mistake Modified: vtigercrm/branches/4.2/install/4createConfigFile.php Modified: vtigercrm/branches/4.2/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/4.2/install/4createConfigFile.php (original) +++ vtigercrm/branches/4.2/install/4createConfigFile.php Mon Feb 27 14:32:04 2006 @@ -146,7 +146,7 @@ $buffer = str_replace( "_DBC_NAME_", $db_name, $buffer); $buffer = str_replace( "_DBC_TYPE_", "mysql", $buffer); - $buffer = str_replace( "_SITE_URL_", "site_URL", $buffer); + $buffer = str_replace( "_SITE_URL_", $site_URL, $buffer); /* replace dir variable */ $buffer = str_replace( "_VT_ROOTDIR_", $root_directory, $buffer); From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 16:47:42 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 21:47:42 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3969 - in /vtigercrm/branches/4.2: modules/Tasks/ modules/Tasks/language/ themes/Amazon/ themes/akodarkgem/ themes/busthree/ themes/busthree/images/ themes/coolblue/ themes/coolblue/images/ themes/coolblue/language/ Message-ID: <20060227214742.18D5C49CA6B@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 14:47:34 2006 New Revision: 3969 Log: remove more files to sync file list with 4.2.3. see #49 Removed: vtigercrm/branches/4.2/modules/Tasks/Delete.php vtigercrm/branches/4.2/modules/Tasks/DetailView.html vtigercrm/branches/4.2/modules/Tasks/DetailView.php vtigercrm/branches/4.2/modules/Tasks/EditView.html vtigercrm/branches/4.2/modules/Tasks/EditView.php vtigercrm/branches/4.2/modules/Tasks/Forms.php vtigercrm/branches/4.2/modules/Tasks/ListView.html vtigercrm/branches/4.2/modules/Tasks/ListView.php vtigercrm/branches/4.2/modules/Tasks/Save.php vtigercrm/branches/4.2/modules/Tasks/SearchForm.html vtigercrm/branches/4.2/modules/Tasks/Task.php vtigercrm/branches/4.2/modules/Tasks/index.php vtigercrm/branches/4.2/modules/Tasks/language/en_us.lang.php vtigercrm/branches/4.2/themes/Amazon/ vtigercrm/branches/4.2/themes/akodarkgem/ vtigercrm/branches/4.2/themes/busthree/config.php vtigercrm/branches/4.2/themes/busthree/footer.php vtigercrm/branches/4.2/themes/busthree/header.html vtigercrm/branches/4.2/themes/busthree/header.php vtigercrm/branches/4.2/themes/busthree/images/Accounts.gif vtigercrm/branches/4.2/themes/busthree/images/Calls.gif vtigercrm/branches/4.2/themes/busthree/images/Cases.gif vtigercrm/branches/4.2/themes/busthree/images/Contacts.gif vtigercrm/branches/4.2/themes/busthree/images/Emails.gif vtigercrm/branches/4.2/themes/busthree/images/Meetings.gif vtigercrm/branches/4.2/themes/busthree/images/Notes.gif vtigercrm/branches/4.2/themes/busthree/images/Opportunities.gif vtigercrm/branches/4.2/themes/busthree/images/SUGAR.jpg vtigercrm/branches/4.2/themes/busthree/images/Tasks.gif vtigercrm/branches/4.2/themes/busthree/images/Users.gif vtigercrm/branches/4.2/themes/busthree/images/blank.gif vtigercrm/branches/4.2/themes/busthree/images/logo.gif vtigercrm/branches/4.2/themes/busthree/images/paypal.gif vtigercrm/branches/4.2/themes/busthree/layout_utils.php vtigercrm/branches/4.2/themes/busthree/style.css vtigercrm/branches/4.2/themes/coolblue/footer.php vtigercrm/branches/4.2/themes/coolblue/header.html vtigercrm/branches/4.2/themes/coolblue/header.php vtigercrm/branches/4.2/themes/coolblue/images/Accounts.gif vtigercrm/branches/4.2/themes/coolblue/images/Calls.gif vtigercrm/branches/4.2/themes/coolblue/images/Cases.gif vtigercrm/branches/4.2/themes/coolblue/images/Contacts.gif vtigercrm/branches/4.2/themes/coolblue/images/Emails.gif vtigercrm/branches/4.2/themes/coolblue/images/HelpDesk.gif vtigercrm/branches/4.2/themes/coolblue/images/Leads.gif vtigercrm/branches/4.2/themes/coolblue/images/Meetings.gif vtigercrm/branches/4.2/themes/coolblue/images/Notes.gif vtigercrm/branches/4.2/themes/coolblue/images/Opportunities.gif vtigercrm/branches/4.2/themes/coolblue/images/Potentials.gif vtigercrm/branches/4.2/themes/coolblue/images/Products.gif vtigercrm/branches/4.2/themes/coolblue/images/SUGAR.jpg vtigercrm/branches/4.2/themes/coolblue/images/Tasks.gif vtigercrm/branches/4.2/themes/coolblue/images/Users.gif vtigercrm/branches/4.2/themes/coolblue/images/arrow_down.gif vtigercrm/branches/4.2/themes/coolblue/images/arrow_up.gif vtigercrm/branches/4.2/themes/coolblue/images/attachment.gif vtigercrm/branches/4.2/themes/coolblue/images/blank.gif vtigercrm/branches/4.2/themes/coolblue/images/calendar.gif vtigercrm/branches/4.2/themes/coolblue/images/high_priority.gif vtigercrm/branches/4.2/themes/coolblue/images/left_arc.gif vtigercrm/branches/4.2/themes/coolblue/images/paypal.gif vtigercrm/branches/4.2/themes/coolblue/images/print.gif vtigercrm/branches/4.2/themes/coolblue/images/right_arc.gif vtigercrm/branches/4.2/themes/coolblue/images/vtiger.jpg vtigercrm/branches/4.2/themes/coolblue/language/en_us.lang.php vtigercrm/branches/4.2/themes/coolblue/layout_utils.php vtigercrm/branches/4.2/themes/coolblue/style.css From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 18:57:18 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Mon, 27 Feb 2006 23:57:18 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2351=3A_Q?= =?utf-8?q?uotes_are_not_created_correctly_form_Potentials_or_from_Quote_s?= =?utf-8?q?creen?= In-Reply-To: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> References: <076.3fe99221940f9313383354f398acdb88@vtiger.fosslabs.com> Message-ID: <085.548e9ec85aea1104ed576c3475043e62@vtiger.fosslabs.com> #51: Quotes are not created correctly form Potentials or from Quote screen -----------------------------------------------+---------------------------- Reporter: onwealdandy | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.4rc3 Resolution: | Keywords: -----------------------------------------------+---------------------------- Changes (by onwealdandy ): * version: 5.0.0 => 4.2.4rc3 -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Mon Feb 27 23:46:14 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 04:46:14 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2349=3A_R?= =?utf-8?q?emove_files_from_previous_versions_in_4=2E2?= In-Reply-To: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> References: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> Message-ID: <085.df36c2f2d3a27bc0a127a3fdeb828cae@vtiger.fosslabs.com> #49: Remove files from previous versions in 4.2 ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by briand): Quick checks to help with your list and cleanup: '''Keep Me!''' menu.php is needed. It is called in the theme files and is used to create the submenus. vtigerlogger.php is used by the system logging, it is required. '''Delete Me!''' The two squirrelmail folders are already empty and should be deleted... as should the themes/busthree, themes/coolblue, modules/Tasks, and pkg folders (which only contain empty folders). migrate.php refers to a non-existent php file. It should be deleted, as should the migration directory, which seems to migrate from vtiger 2.1 to 3.0). Additioanlly there are two datamigration (.sh & .bat) files in the bin folder (one linux, one windows) that point to migrate.php, which point to the non-existent datamigration.php file. migratorbackupconnection.php is another one that is only referenced in the non-working bin/linux/datamigration.sh -- Ticket URL: vtiger development vtigerCRM From vtiger-tickets at vtiger.fosslabs.com Tue Feb 28 00:18:39 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 05:18:39 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2349=3A_R?= =?utf-8?q?emove_files_from_previous_versions_in_4=2E2?= In-Reply-To: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> References: <076.3af4fecaf060a1d1e8bbd0759bce146e@vtiger.fosslabs.com> Message-ID: <085.8fcd89486efa7cfcd643cad394d0b8a6@vtiger.fosslabs.com> #49: Remove files from previous versions in 4.2 ------------------------+--------------------------------------------------- Reporter: mfedyk | Owner: developer Type: defect | Status: new Priority: trivial | Milestone: 4.2.5 Component: vtigercrm | Version: 4.2.4rc2 Resolution: | Keywords: ------------------------+--------------------------------------------------- Comment (by mfedyk): (In [3970]) remove more empty directories. see #49 -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:18:40 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:18:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3970 - in /vtigercrm/branches/4.2: modules/Tasks/ modules/squirrelmail-1.4.4/contrib/ modules/squirrelmail-1.4.4/themes/ pkg/ themes/busthree/ themes/coolblue/ Message-ID: <20060228051840.8950E438CA2@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 22:18:36 2006 New Revision: 3970 Log: remove more empty directories. see #49 Removed: vtigercrm/branches/4.2/modules/Tasks/ vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/contrib/ vtigercrm/branches/4.2/modules/squirrelmail-1.4.4/themes/ vtigercrm/branches/4.2/pkg/ vtigercrm/branches/4.2/themes/busthree/ vtigercrm/branches/4.2/themes/coolblue/ From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:51:20 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:51:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3971 - /vtigercrm/trunk/include/utils/InventoryUtils.php Message-ID: <20060228055120.6BE5949E316@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:51:16 2006 New Revision: 3971 Log: Added the product details block in Inventory. Modified: vtigercrm/trunk/include/utils/InventoryUtils.php Modified: vtigercrm/trunk/include/utils/InventoryUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/InventoryUtils.php (original) +++ vtigercrm/trunk/include/utils/InventoryUtils.php Mon Feb 27 22:51:16 2006 @@ -15,8 +15,9 @@ * column fields/ */ -function getProductDetailsBlockInfo($mode,$module,$focus,$num_of_products='',$associated_prod='') +function getProductDetailsBlockInfo($mode,$module,$focus='',$num_of_products='',$associated_prod='') { + $productDetails = Array(); $productBlock = Array(); if($num_of_products=='') @@ -32,12 +33,21 @@ { $productDetails['product_details'] = $associated_prod; } - $productBlock[] = Array('mode'=>$focus->mode); - $productBlock[] = $productDetails['product_details']; - $productBlock[] = Array('taxvalue' => $focus->column_fields['txtTax']); - $productBlock[] = Array('taxAdjustment' => $focus->column_fields['txtAdjustment']); - $productBlock[] = Array('hdnSubTotal' => $focus->column_fields['hdnSubTotal']); - $productBlock[] = Array('hdnGrandTotal' => $focus->column_fields['hdnGrandTotal']); + if($focus != '') + { + $productBlock[] = Array('mode'=>$focus->mode); + $productBlock[] = $productDetails['product_details']; + $productBlock[] = Array('taxvalue' => $focus->column_fields['txtTax']); + $productBlock[] = Array('taxAdjustment' => $focus->column_fields['txtAdjustment']); + $productBlock[] = Array('hdnSubTotal' => $focus->column_fields['hdnSubTotal']); + $productBlock[] = Array('hdnGrandTotal' => $focus->column_fields['hdnGrandTotal']); + } + else + { + $productBlock[] = Array('Product Details' => 'Product Details'); + + } + //echo '

';print_r($productBlock);echo '

'; return $productBlock; } ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:53:13 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:53:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3972 - /vtigercrm/trunk/include/utils/CommonUtils.php Message-ID: <20060228055313.619BE49E31C@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:53:08 2006 New Revision: 3972 Log: Added get_product_details_label condition in commonutils. Modified: vtigercrm/trunk/include/utils/CommonUtils.php Modified: vtigercrm/trunk/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/CommonUtils.php (original) +++ vtigercrm/trunk/include/utils/CommonUtils.php Mon Feb 27 22:53:08 2006 @@ -777,16 +777,17 @@ $prev_header = ""; for($i=0; $i<$noofrows; $i++) { - $block_title = $mod_strings[$adb->query_result($result,$i,"blocklabel")]; + $block_title = $mod_strings[$adb->query_result($result,$i,"blocklabel")]; + $block_label = $adb->query_result($result,$i,"blocklabel"); if($block_title !='') { $prev_header = $block_title; if($disp_view == "detail_view") { - if($block_title=='LBL_RELATED_PRODUCTS') + if($block_label=='LBL_RELATED_PRODUCTS') { - $getBlockInfo=getProductDetails(); + $getBlockInfo=getProductDetailsBlockInfo($mode,$module); } else { @@ -794,13 +795,23 @@ } } else - { - $getBlockInfo=getBlockInformation($module,$adb->query_result($result,$i,"blockid"),$mode,$col_fields,$tabid,$info_type); + { + if($block_label=='LBL_RELATED_PRODUCTS') + { + $getBlockInfo=getProductDetailsBlockInfo($mode,$module); + //echo '

';print_r($getBlockInfo);echo '

'; + } + else + { + $getBlockInfo=getBlockInformation($module,$adb->query_result($result,$i,"blockid"),$mode,$col_fields,$tabid,$info_type); + //echo '

';print_r($getBlockInfo);echo '

'; + } } if(is_array($getBlockInfo)) { $block_detail[$block_title] = $getBlockInfo; + //echo '

';print_r($block_detail);echo '

'; } } else @@ -833,6 +844,7 @@ } } + //echo '

';print_r($block_detail);echo '

'; return $block_detail; } @@ -1180,16 +1192,4 @@ return $count; } -function mkdirs($dir) { -if( is_null($dir) || $dir === "" ){ - return FALSE; -} -if( is_dir($dir) || $dir === "/" ){ - return TRUE; -} -if( mkdirs(dirname($dir), $mode, $recursive) ){ - return mkdir($dir, $mode); -} -return FALSE; -} ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:55:10 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:55:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3973 - /vtigercrm/trunk/Popup.php Message-ID: <20060228055510.BD94149EEC4@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:55:06 2006 New Revision: 3973 Log: Added the Curr_Row condition in the Products case statement. Modified: vtigercrm/trunk/Popup.php Modified: vtigercrm/trunk/Popup.php ============================================================================== --- vtigercrm/trunk/Popup.php (original) +++ vtigercrm/trunk/Popup.php Mon Feb 27 22:55:06 2006 @@ -115,7 +115,14 @@ case 'Products': require_once("modules/$currentModule/Product.php"); $focus = new Product(); + echo '

';print_r($_REQUEST);echo '

'; $smarty->assign("SINGLE_MOD",'Product'); + if(isset($_REQUEST['curr_row'])) + { + $curr_row = $_REQUEST['curr_row']; + $smarty->assign("CURR_ROW", $curr_row); + $url_string .="&curr_row=".$_REQUEST['curr_row']; + } if(isset($_REQUEST['return_module']) && $_REQUEST['return_module'] !='') $smarty->assign("RETURN_MODULE",$_REQUEST['return_module']); if(isset($_REQUEST['smodule']) && $_REQUEST['smodule'] !='') @@ -329,7 +336,8 @@ $search_query .= " and unit_price like '%".$unitprice."%'"; $url_string .= "&unitprice=".$unitprice; $smarty->assign("UNITPRICE", $unitprice); - } + } + } if($currentModule == 'PurchaseOrder') From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:56:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:56:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3974 - /vtigercrm/trunk/Smarty/templates/Popup.tpl Message-ID: <20060228055616.0184949EEF0@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:56:13 2006 New Revision: 3974 Log: Added the hidden field Curr_Row. Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl Modified: vtigercrm/trunk/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/Popup.tpl (original) +++ vtigercrm/trunk/Smarty/templates/Popup.tpl Mon Feb 27 22:56:13 2006 @@ -39,6 +39,7 @@ + {if $SELECT eq 'enable'} From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:58:21 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:58:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3975 - /vtigercrm/branches/4.2/install/gnuify-changelog.pl Message-ID: <20060228055821.ADFE249EEF0@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 22:58:19 2006 New Revision: 3975 Log: add changelog converter from subversion Added: vtigercrm/branches/4.2/install/gnuify-changelog.pl From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 00:59:06 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 05:59:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3976 - /vtigercrm/trunk/Smarty/templates/CreateView.tpl Message-ID: <20060228055906.6C63649EEF0@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 22:59:01 2006 New Revision: 3976 Log: Added the Product_Details Block in Quotes, Invoice, SalesOrder & PurchaseOrder Module. Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Mon Feb 27 22:59:01 2006 @@ -20,6 +20,7 @@ + +

{$MOD.LBL_COMMUNICATION_TEMPLATES}

- + {**}

RSS is not configured. Click here to configure

Modified: vtigercrm/trunk/modules/Users/Announcements.php ============================================================================== --- vtigercrm/trunk/modules/Users/Announcements.php (original) +++ vtigercrm/trunk/modules/Users/Announcements.php Mon Feb 27 07:53:28 2006 @@ -25,7 +25,7 @@ $html='

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php ============================================================================== --- vtigercrm/trunk/modules/Users/UsersAjax.php (original) +++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Feb 27 07:53:28 2006 @@ -16,7 +16,12 @@ $announcement=''; $sql="select * from announcement order by time"; $result=$adb->query($sql); - $announcement.=getUserName($adb->query_result($result,$i,'creatorid')).' : '.$adb->query_result($result,$i,'announcement').' '; + for($i=0;$i<$adb->num_rows($result);$i++) + { + $announce = getUserName($adb->query_result($result,$i,'creatorid')).' : '.$adb->query_result($result,$i,'announcement').' '; + if($adb->query_result($result,$i,'announcement')!='') + $announcement.=$announce; + } echo $announcement; }elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != '')) @@ -31,6 +36,6 @@ else $query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",".$adb->formatString("announcement","time",$date_var).",'".$date_var."')"; $result=$adb->query($query); - echo $query.$announcement; + echo $announcement; } ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 09:54:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 14:54:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3961 - /vtigercrm/trunk/modules/Calendar/script.js Message-ID: <20060227145416.A1A6249E316@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 07:54:12 2006 New Revision: 3961 Log: js function check_form has been included Modified: vtigercrm/trunk/modules/Calendar/script.js Modified: vtigercrm/trunk/modules/Calendar/script.js ============================================================================== --- vtigercrm/trunk/modules/Calendar/script.js (original) +++ vtigercrm/trunk/modules/Calendar/script.js Mon Feb 27 07:54:12 2006 @@ -80,3 +80,25 @@ } } + +function check_form() +{ + if(trim(document.appSave.subject.value) == "") + { + alert("Missing Event Name"); + document.appSave.subject.focus() + return false; + } + else + { + if (document.appSave.activitytype[0].checked==true) + { + document.appSave.duration_minutes.value = "15"; + } + else if (document.appSave.activitytype[1].checked == true) + { + document.appSave.duration_minutes.value = "45"; + } + return true; + } +} From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 10:03:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:03:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3962 - /vtigercrm/trunk/modules/Calendar/addEventUI.php Message-ID: <20060227150317.2082349EEC2@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:03:13 2006 New Revision: 3962 Log: hidden fields have been included Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/addEventUI.php (original) +++ vtigercrm/trunk/modules/Calendar/addEventUI.php Mon Feb 27 08:03:13 2006 @@ -1,7 +1,27 @@ + +

@@ -15,15 +35,15 @@ - +

Add Event

Call

Meeting

Call

Meeting

Event Name :

@@ -76,7 +96,7 @@

From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 10:05:24 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:05:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3963 - /vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Message-ID: <20060227150525.2547549EEFD@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:05:20 2006 New Revision: 3963 Log: LBL_DATE_TITLE has been modified Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/trunk/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/trunk/modules/Calendar/language/en_us.lang.php Mon Feb 27 08:05:20 2006 @@ -56,7 +56,7 @@ 'LBL_SM_SAT' => 'Sat', 'LBL_SM_SUN' => 'Sun', -'LBL_DATE_TITLE' => '%A, %d. %B %Y', +'LBL_DATE_TITLE' => 'Day %d, %A', 'LBL_WEEK' => 'Week', 'LBL_WEEK_BUTTON_KEY' => 'W', From vtigercrm-commits at vtiger.fosslabs.com Mon Feb 27 10:16:31 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 27 Feb 2006 15:16:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3964 - /vtigercrm/trunk/modules/Calendar/calendar_dayview.php Message-ID: <20060227151632.1189D3E1A74@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 08:16:26 2006 New Revision: 3964 Log: changes made to display event in hour list Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php Modified: vtigercrm/trunk/modules/Calendar/calendar_dayview.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/calendar_dayview.php (original) +++ vtigercrm/trunk/modules/Calendar/calendar_dayview.php Mon Feb 27 08:16:26 2006 @@ -97,7 +97,6 @@ for ($c = 0 ; $c < $maxcol ; $c++ ) { if ( isset ( $table[$i][$c] ) ) { if ( is_object ( $table[$i][$c] ) ) { - //echo " "; @@ -332,17 +307,18 @@ echo "

@@ -271,7 +291,7 @@

- +

"; echo ""; - echo ""; + echo $image_path."calTopLeft.gif\">"; echo ""; - echo ""; - echo ""; + echo $image_path."calSep.gif\">"; echo ""; echo "

\n"; echo "

$\"Previous\"$

"; + echo $this->pref->menulink($callink ."calendar_dayview&t=".$last_day->getYYYYMMDD(),$this->pref->getImage(left,'list'),$last_day->getDate())."

Day "; - echo $day.", ".$day_in_words; + echo "

"; + echo " ". strftime($mod_strings['LBL_DATE_TITLE'],$from->ts) ." "; echo "

$\"Next\"$

"; + echo $this->pref->menulink($callink ."calendar_dayview&t=".$next_day->getYYYYMMDD(),$this->pref->getImage(right,'list'),$next_day->getDate())."

"; - echo "

"; echo "

\n"; echo "

{$header} -

*Product	Qty In Stock	*Qty	Unit Price	*List Price	Total

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

		Sub Total
		Tax
		Adjusment
		Grand Total

+ + +

*{$fldlabel}

{$fldlabel}

{$fldvalue}

{if $MODULE eq 'Emails'} @@ -949,3 +1026,5 @@ + + From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 01:08:05 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:08:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3977 - /vtigercrm/trunk/include/js/general.js Message-ID: <20060228060805.74BD249EF2B@vtiger.fosslabs.com> Author: richie Date: Mon Feb 27 23:08:01 2006 New Revision: 3977 Log: Added two function "fnAddRow & fnDel" in the general.js for the Product Details block. Modified: vtigercrm/trunk/include/js/general.js Modified: vtigercrm/trunk/include/js/general.js ============================================================================== --- vtigercrm/trunk/include/js/general.js (original) +++ vtigercrm/trunk/include/js/general.js Mon Feb 27 23:08:01 2006 @@ -1349,3 +1349,38 @@ tagName.style.visibility = 'visible'; } + +// Add & Delete Row in a Table + +function fnAddRow(){ + var tableName = document.getElementById('proTab'); + var prev = tableName.rows.length; + var count = prev; + var row = tableName.insertRow(prev); + if(count%2) + row.className = "dvtCellLabel"; + else + row.className = "dvtCellInfo"; + var colone = row.insertCell(0); + var coltwo = row.insertCell(1); + var colthree = row.insertCell(2); + var colfour = row.insertCell(3); + var colfive = row.insertCell(4); + var colsix = row.insertCell(5); + var colseven = row.insertCell(6); + colone.innerHTML="

"; + coltwo.innerHTML=" "; + colthree.innerHTML=" "; + colfour.innerHTML=" "; + colfive.innerHTML="

"; + colsix.innerHTML=" "; + colseven.innerHTML="Del"; + +} + + +function deleteRow(i) +{ + document.getElementById('proTab').deleteRow(i); +} + From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 01:09:32 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:09:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3978 - /vtigercrm/branches/4.2/install/gnuify-changelog.pl Message-ID: <20060228060932.6AE2B2A8253@vtiger.fosslabs.com> Author: mfedyk Date: Mon Feb 27 23:09:30 2006 New Revision: 3978 Log: modify names and comment out extra line generation in changelog script Modified: vtigercrm/branches/4.2/install/gnuify-changelog.pl Modified: vtigercrm/branches/4.2/install/gnuify-changelog.pl ============================================================================== --- vtigercrm/branches/4.2/install/gnuify-changelog.pl (original) +++ vtigercrm/branches/4.2/install/gnuify-changelog.pl Mon Feb 27 23:09:30 2006 @@ -13,72 +13,11 @@ use strict; my %hackers = ( - "svn" => 'Collab.net Subversion Team', - "jimb" => 'Jim Blandy ', - "sussman" => 'Ben Collins-Sussman ', - "kfogel" => 'Karl Fogel ', - "gstein" => 'Greg Stein ', - "brane" => 'Branko Cibej ', - "joe" => 'Joe Orton ', - "ghudson" => 'Greg Hudson ', - "lefty" => 'Lee P. W. Burgess ', - "fitz" => 'Brian Fitzpatrick ', - "mab" => 'Matthew Braithwaite ', - "daniel" => 'Daniel Stenberg ', - "mmurphy" => 'Mark Murphy ', - "cmpilato" => 'C. Michael Pilato ', - "kevin" => 'Kevin Pilch-Bisson ', - "philip" => 'Philip Martin ', - "jerenkrantz" => 'Justin Erenkrantz ', - "rooneg" => 'Garrett Rooney ', - "bcollins" => 'Ben Collins ', - "blair" => 'Blair Zajac ', - "striker" => 'Sander Striker ', - "XelaRellum" => 'Alexander Mueller ', - "yoshiki" => 'Yoshiki Hayashi ', - "david" => 'David Summers ', - "rassilon" => 'Bill Tutt ', - "kbohling" => 'Kirby C. Bohling ', - "breser" => 'Ben Reser ', - "bliss" => 'Tobias Ringstrom ', - "dionisos" => 'Erik Huelsmann ', - "josander" => 'Jostein Andersen ', - "julianfoad" => 'Julian Foad ', - "clkao" => 'Chia-Liang Kao ', - "xsteve" => 'Stefan Reich??r ', - "mbk" => 'Mark Benedetto King ', - "patrick" => 'Patrick Mayweg ', - "jrepenning" => 'Jack Repenning ', - "epg" => 'Eric Gillespie ', - "dwhedon" => 'David Kimdon ', - "djh" => 'D.J. Heap ', - "mprice" => 'Michael Price ', - "jszakmeister" => 'John Szakmeister ', - "bdenny" => 'Brian Denny ', - "rey4" => 'Russell Yanofsky ', - "maxb" => 'Max Bowsher ', - "dlr" => 'Daniel Rall ', - "jaa" => 'Jani Averbach ', - "pll" => 'Paul Lussier ', - "shlomif" => 'Shlomi Fish ', - "jpieper" => 'Josh Pieper ', - "dimentiy" => 'Dmitriy O. Popkov ', - "kellin" => 'Shamim Islam ', - "sergeyli" => 'Sergey A. Lipnevich ', - "kraai" => 'Matt Kraai ', - "ballbach" => 'Michael Ballbach ', - "kon" => 'Kalle Olavi Niemitalo ', - "knacke" => 'Kai Nacke ', - "gthompson" => 'Glenn A. Thompson ', - "jespersm" => 'Jesper Steen M??ller ', - "naked" => 'Nuutti Kotivuori ', - "niemeyer" => 'Gustavo Niemeyer ', - "trow" => 'Jon Trowbridge ', - "mmacek" => 'Marko Macek ', - "zbrown" => 'Zack Brown ', - "morten" => 'Morten Ludvigsen ', - "fmatias" => 'F??liciano Matias ', - "nsd" => 'Nick Duffek ', + "mfedyk" => 'Mike Fedyk', + "fathi" => 'Fathi Boudra', + "mmbrich" => 'Matt Brichacek', + "jeffk" => 'Jeff Kowalczyk', + "allanbush" => 'Allan Bush', ); my $parse_next_line = 0; @@ -107,7 +46,7 @@ # Check to see if the final line of the commit message was blank, # if not insert one - print "\n" if $last_rev ne "" and !$last_line_empty; + #Sprint "\n" if $last_rev ne "" and !$last_line_empty; } elsif ($parse_next_line) { @@ -126,7 +65,7 @@ } elsif ($this_line_empty) { - print "\n"; + #print "\n"; } else { From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 01:14:28 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:14:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3979 - /vtigercrm/trunk/modules/Calendar/index.php Message-ID: <20060228061428.89A323D1900@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:14:24 2006 New Revision: 3979 Log: new_calendar.php has been included Modified: vtigercrm/trunk/modules/Calendar/index.php Modified: vtigercrm/trunk/modules/Calendar/index.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/index.php (original) +++ vtigercrm/trunk/modules/Calendar/index.php Mon Feb 27 23:14:24 2006 @@ -26,7 +26,7 @@ require_once ($theme_path."layout_utils.php"); global $mod_strings; -include ('modules/Calendar/calendar_dayview.php'); -//include ('modules/Calendar/new_calendar.php'); +//include ('modules/Calendar/calendar_dayview.php'); +include ('modules/Calendar/new_calendar.php'); ?> From vtiger-tickets at vtiger.fosslabs.com Tue Feb 28 01:15:42 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 06:15:42 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2352=3A_V?= =?utf-8?q?ersion_4=2E2=2E4_Updates?= Message-ID: <076.21057f15b1e83e134121e50411e2e24e@vtiger.fosslabs.com> #52: Version 4.2.4 Updates --------------------------------+------------------------------------------- Reporter: briand | Owner: mfedyk Type: defect | Status: new Priority: minor | Milestone: 4.2.4 Component: vtigercrm | Version: 4.2.4rc2 Keywords: version 4.2.4 tags | --------------------------------+------------------------------------------- Updates to the script to reflect the v4.2.4. This includes the modules/about_us.php, vtigerversion.php, and the changelog.txt. Additionally, the about_us.php window was not tall enough for the data it needed to display, so all themes had header.html updated to open pop-up slightly taller. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 01:16:16 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:16:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3980 - /vtigercrm/trunk/modules/Calendar/new_calendar.php Message-ID: <20060228061617.45BA2498310@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:16:13 2006 New Revision: 3980 Log: calendar_dayview.php has been included Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php Modified: vtigercrm/trunk/modules/Calendar/new_calendar.php ============================================================================== --- vtigercrm/trunk/modules/Calendar/new_calendar.php (original) +++ vtigercrm/trunk/modules/Calendar/new_calendar.php Mon Feb 27 23:16:13 2006 @@ -21,8 +21,8 @@ */ $mysel= $_GET['sel']; - if ($mysel=="") { include "dayview.php"; } - if ($mysel=="day") { include "dayview.php"; } + if ($mysel=="") { include "calendar_dayview.php"; } + if ($mysel=="day") { include "calendar_dayview.php"; } if ($mysel=="week") { include "weekview.php"; } if ($mysel=="month") { include "monthview.php"; } if ($mysel=="year") { include "yearview.php"; } From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 01:28:03 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:28:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3981 - /vtigercrm/trunk/smiletag/data/messages.xml Message-ID: <20060228062803.002D249E385@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:28:00 2006 New Revision: 3981 Log: Removed the Junk Messages from ShoutBox Modified: vtigercrm/trunk/smiletag/data/messages.xml Modified: vtigercrm/trunk/smiletag/data/messages.xml ============================================================================== --- vtigercrm/trunk/smiletag/data/messages.xml (original) +++ vtigercrm/trunk/smiletag/data/messages.xml Mon Feb 27 23:28:00 2006 @@ -1,80 +1,11 @@ - - - - 1139933515 + + + + 1141107721 127.0.0.1 - - - - ]]> - 1139933234 - 127.0.0.1 - - - - - ]]> - 1139928863 - 127.0.0.1 - - - - - ]]> - 1139308277 - 127.0.0.1 - - - - - ]]> - 1139289670 - 127.0.0.1 - - - - Anwar]]> - - 1139238216 - 127.0.0.1 - - - - - - 1139238165 - 127.0.0.1 - - - - - - 1139236876 - 127.0.0.1 - - - - - - 1139219548 - 127.0.0.1 - - - - - - 1139219038 - 127.0.0.1 - - - - - - 1139217322 - 127.0.0.1 - + From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 01:53:35 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 06:53:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3982 - /vtigercrm/trunk/install/5createTables.php Message-ID: <20060228065335.7E74549E31C@vtiger.fosslabs.com> Author: saraj Date: Mon Feb 27 23:53:31 2006 New Revision: 3982 Log: install.php and install folder has been renamed for security issues Modified: vtigercrm/trunk/install/5createTables.php Modified: vtigercrm/trunk/install/5createTables.php ============================================================================== Binary files - no diff available. From vtiger-tickets at vtiger.fosslabs.com Tue Feb 28 02:05:44 2006 From: vtiger-tickets at vtiger.fosslabs.com (vtiger development) Date: Tue, 28 Feb 2006 07:05:44 -0000 Subject: [Vtigercrm-commits] =?utf-8?q?=5Bvtiger_development=5D_=2353=3A_D?= =?utf-8?q?atabase_schema_constraints?= Message-ID: <076.4da8f425ef7ccba782e7d18f60076fde@vtiger.fosslabs.com> #53: Database schema constraints ----------------------------------------+----------------------------------- Reporter: anonymous | Owner: developer Type: defect | Status: new Priority: major | Milestone: Component: vtigercrm | Version: 4.2.4rc3 Keywords: constraint database schema | ----------------------------------------+----------------------------------- ON DELETE CASCADE constraints on foreign keys are not compatible with most of database systems. Deleting one record in crmentity table generates cascading loops. This is only an example. Workaround : replace all ON CACADE DELETE by ON CASCADE NO ACTION It supposes to manage return codes on delete actions. -- Ticket URL: vtiger development vtigerCRM From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 02:26:15 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 07:26:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3983 - in /vtigercrm/trunk/Smarty/templates: CreateView.tpl salesEditView.tpl Message-ID: <20060228072616.3C55C49EEE5@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 00:26:08 2006 New Revision: 3983 Log: issue in Fckditor has been fixed Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl vtigercrm/trunk/Smarty/templates/salesEditView.tpl Modified: vtigercrm/trunk/Smarty/templates/CreateView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/CreateView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/CreateView.tpl Tue Feb 28 00:26:08 2006 @@ -994,7 +994,6 @@

- @@ -1014,6 +1013,7 @@ {/if} + {/if} +'; - if($i>0) + $imagenamelists.=''; + $imagelists = $imagelists.$imagenamelists; + if($imagecount>0) return $imagelists; } From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 05:52:59 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 10:52:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3994 - in /vtigercrm/trunk: Smarty/templates/HomePage.tpl smiletag/smiletag-script.js smiletag/smiletag-style.css Message-ID: <20060228105259.8447449EDBD@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 03:52:42 2006 New Revision: 3994 Log: smiletag made into expand collapse mode Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl vtigercrm/trunk/smiletag/smiletag-script.js vtigercrm/trunk/smiletag/smiletag-style.css Modified: vtigercrm/trunk/Smarty/templates/HomePage.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/HomePage.tpl (original) +++ vtigercrm/trunk/Smarty/templates/HomePage.tpl Tue Feb 28 03:52:42 2006 @@ -130,13 +130,16 @@ Pipeline chart comes here..

- - YOUR SHOUT!!! - +

- -

+ + +

YOUR SHOUT!!!

{if $TAGCLOUD_JS ne ''} @@ -187,8 +192,18 @@ -

+ Modified: vtigercrm/trunk/smiletag/smiletag-script.js ============================================================================== --- vtigercrm/trunk/smiletag/smiletag-script.js (original) +++ vtigercrm/trunk/smiletag/smiletag-script.js Tue Feb 28 03:52:42 2006 @@ -103,11 +103,11 @@ var smileyBox = document.getElementById('smiley_box'); smileyBox.style.display = 'block'; - var st = Math.max(document.body.scrollTop,document.documentElement.scrollTop); +/* var st = Math.max(document.body.scrollTop,document.documentElement.scrollTop); var leftPos = e.clientX - 100; if(leftPos<0)leftPos = 0; smileyBox.style.left = leftPos + 'px'; - smileyBox.style.top = e.clientY - smileyBox.offsetHeight -1 + st + 'px'; + smileyBox.style.top = e.clientY - smileyBox.offsetHeight -1 + st + 'px';*/ } function hideSmileyWindow() Modified: vtigercrm/trunk/smiletag/smiletag-style.css ============================================================================== --- vtigercrm/trunk/smiletag/smiletag-style.css (original) +++ vtigercrm/trunk/smiletag/smiletag-style.css Tue Feb 28 03:52:42 2006 @@ -64,7 +64,7 @@ #smiley_box{ width:95px; - position:absolute; + position:relative; display:none; margin-left: 55px; border: 0px; From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 06:04:00 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 11:04:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3995 - /vtigercrm/trunk/include/utils/DetailViewUtils.php Message-ID: <20060228110400.9F64549EEF6@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 04:03:55 2006 New Revision: 3995 Log: added contact image Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/trunk/include/utils/DetailViewUtils.php (original) +++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue Feb 28 04:03:55 2006 @@ -183,10 +183,14 @@ if($imagename != '') { $imgpath = "test/contact/".$imagename; - $label_fld[] ='

'.$mod_strings[$fieldlabel]; + $label_fld[] =$mod_strings[$fieldlabel]; + $label_fld["cntimage"] ='

'.$mod_strings[$fieldlabel]; } else - $label_fld[] =$mod_strings[$fieldlabel]; + { + $label_fld[] =$mod_strings[$fieldlabel]; + } + } else { @@ -929,7 +933,7 @@ $tabid = $adb->query_result($result,$i,"tabid"); $output .= ''; $custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid); - $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); + $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); $i++; if($i<$noofrows) { @@ -943,7 +947,7 @@ $tabid = $adb->query_result($result,$i,"tabid"); $custfld = getDetailViewOutputHtml($uitype, $fieldname, $fieldlabel, $col_fields,$generatedtype,$tabid); - $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); + $label_data[] = array($custfld[0]=>array("value"=>$custfld[1],"ui"=>$custfld[2],"options"=>$custfld["options"],"secid"=>$custfld["secid"],"link"=>$custfld["link"],"cursymb"=>$custfld["cursymb"],"salut"=>$custfld["salut"],"cntimage"=>$custfld["cntimage"],"tablename"=>$fieldtablename,"fldname"=>$fieldname)); } } From vtigercrm-commits at vtiger.fosslabs.com Tue Feb 28 06:06:18 2006 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 28 Feb 2006 11:06:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r3996 - /vtigercrm/trunk/Smarty/templates/DetailView.tpl Message-ID: <20060228110619.2064849EF67@vtiger.fosslabs.com> Author: saraj Date: Tue Feb 28 04:06:13 2006 New Revision: 3996 Log: * modified for contact image Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue Feb 28 04:06:13 2006 @@ -234,32 +234,37 @@ {assign var=keyseclink value=$data.link} {assign var=keycursymb value=$data.cursymb} {assign var=keysalut value=$data.salut} + {assign var=keycntimage value=$data.cntimage} {if $label ne ''} - {$label} + {if $keycntimage ne ''} + {$keycntimage} + {else} + {$label} + {/if} {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72'} - - {if $keyid eq '55'} + + {if $keyid eq '55'} {$keysalut} - {elseif $keyid eq '71' || $keyid eq '72'} + {elseif $keyid eq '71' || $keyid eq '72'} {$keycursymb} {/if} {$keyval} {elseif $keyid eq '13'} - {$keyval} + {$keyval} {elseif $keyid eq '15' || $keyid eq '16'} - {$keyval} + {$keyval} {elseif $keyid eq '17'} - {$keyval} + {$keyval} {elseif $keyid eq '19' || $keyid eq '20'} - {$keyval} + {$keyval} {elseif $keyid eq '21' || $keyid eq '24' || $keyid eq '22'} - {$keyval} + {$keyval} {elseif $keyid eq '50' || $keyid eq '73' || $keyid eq '51'} - {$keyval} -

${$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}$ -{$MOD.LBL_CUSTOM_FIELD_SETTINGS}	${$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}$ +{$MOD.LBL_CUSTOM_FIELD_SETTINGS}	${$MOD.LBL_EDIT_PICKLIST_VALUES}$ -{$MOD.LBL_PICKLIST_SETTINGS}	${$MOD.LBL_EDIT_PICKLIST_VALUES}$ +{$MOD.LBL_PICKLIST_SETTINGS}	${$MOD.LBL_FIELD_ORDERING_DESC}$ -{$MOD.LBL_FIELD_ORDERING}	${$MOD.LBL_FIELD_ORDERING_DESC}$ +{$MOD.LBL_FIELD_ORDERING}
${$MOD.LBL_CREATE_EMAIL_TEMPLATES}$ {$MOD.EMAILTEMPLATES}	${$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}$ +	${$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}$ {$MOD.WORDINTEGRATION}	${$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}$ +	${$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}$ {$MOD.NOTIFICATIONSCHEDULERS}

${$MOD.LBL_INVENTORY_NOTIFICATIONS}$ +	${$MOD.LBL_INVENTORY_NOTIFICATIONS}$ {$MOD.INVENTORYNOTIFICATION}	${$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}$ +	${$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}$ {$MOD.INVENTORYTERMSANDCONDITIONS}
${$MOD.LBL_SPECIFY_COMPANY_DETAILS}$ {$MOD.LBL_ORGANIZATION_DETAILS}	${$MOD.LBL_CONFIGURE_MAIL_SERVER}$ +	${$MOD.LBL_CONFIGURE_MAIL_SERVER}$ {$MOD.LBL_EMAIL_CONFIG}	${$MOD.LBL_CONFIGURE_BACKUP_SERVER}$ +	${$MOD.LBL_CONFIGURE_BACKUP_SERVER}$ {$MOD.LBL_BACKUP_SERVER_CONFIGURATION}	${$MOD.LBL_SYSTEM_CONFIGURATION}$ +	${$MOD.LBL_SYSTEM_CONFIGURATION}$ {$MOD.LBL_SYSTEM_CONFIG}
${$MOD.LBL_CURRENCY_CONFIGURATION}$ +	${$MOD.LBL_CURRENCY_CONFIGURATION}$ {$MOD.LBL_CURRENCY_CONFIG}	${$MOD.LBL_ASSIGN_MODULE_OWNERS}$ +	${$MOD.LBL_ASSIGN_MODULE_OWNERS}$ {$MOD.LBL_ASSIGN_MODULE_OWNERS} -	${$MOD.LBL_MIGRATION_INFO}$ +	${$MOD.LBL_MIGRATION_INFO}$ {$MOD.LBL_MIGRATION}

${$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}$ -{$MOD.LBL_CUSTOM_FIELD_SETTINGS}	${$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}$ +{$MOD.LBL_CUSTOM_FIELD_SETTINGS}	${$MOD.LBL_EDIT_PICKLIST_VALUES}$ -{$MOD.LBL_PICKLIST_SETTINGS}	${$MOD.LBL_EDIT_PICKLIST_VALUES}$ +{$MOD.LBL_PICKLIST_SETTINGS}	${$MOD.LBL_FIELD_ORDERING_DESC}$ -{$MOD.LBL_FIELD_ORDERING}	${$MOD.LBL_FIELD_ORDERING_DESC}$ +{$MOD.LBL_FIELD_ORDERING}
${$MOD.LBL_CREATE_EMAIL_TEMPLATES}$ {$MOD.EMAILTEMPLATES}	${$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}$ +	${$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}$ {$MOD.WORDINTEGRATION}	${$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}$ +	${$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}$ {$MOD.NOTIFICATIONSCHEDULERS}

${$MOD.LBL_INVENTORY_NOTIFICATIONS}$ +	${$MOD.LBL_INVENTORY_NOTIFICATIONS}$ {$MOD.INVENTORYNOTIFICATION}	${$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}$ +	${$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}$ {$MOD.INVENTORYTERMSANDCONDITIONS}
${$MOD.LBL_SPECIFY_COMPANY_DETAILS}$ {$MOD.LBL_ORGANIZATION_DETAILS}	${$MOD.LBL_CONFIGURE_MAIL_SERVER}$ +	${$MOD.LBL_CONFIGURE_MAIL_SERVER}$ {$MOD.LBL_EMAIL_CONFIG}	${$MOD.LBL_CONFIGURE_BACKUP_SERVER}$ +	${$MOD.LBL_CONFIGURE_BACKUP_SERVER}$ {$MOD.LBL_BACKUP_SERVER_CONFIGURATION}	${$MOD.LBL_SYSTEM_CONFIGURATION}$ +	${$MOD.LBL_SYSTEM_CONFIGURATION}$ {$MOD.LBL_SYSTEM_CONFIG}
${$MOD.LBL_CURRENCY_CONFIGURATION}$ +	${$MOD.LBL_CURRENCY_CONFIGURATION}$ {$MOD.LBL_CURRENCY_CONFIG}	${$MOD.LBL_ASSIGN_MODULE_OWNERS}$ +	${$MOD.LBL_ASSIGN_MODULE_OWNERS}$ {$MOD.LBL_ASSIGN_MODULE_OWNERS} -	${$MOD.LBL_MIGRATION_INFO}$ +	${$MOD.LBL_MIGRATION_INFO}$ {$MOD.LBL_MIGRATION}

URL ^*	URL ^*	-
Path ^*	" size="40" />
Path to Cache Directory ^* (must be writable)

username	admin
password^*
password^*	">
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later in vtigerCRM
Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later in vtigerCRM

Step 2 of 5

System Configuration

Database Configuration

System Configuration

Database Configuration

Site Configuration

Site Configuration

Admin Configuration

Admin Configuration

Step 4 of 5

Step 4 of 5

Create configuration file

Create Config File

Successfully created config file (config.php) in :

Successfully created configuration file (config.php) in :

Successfully created configuration file (config.php) in :

Successfully created configuration file (config.inc.php) in :

vtiger CRM 5.0 Alpha 2: Release Notes

1. Summary

2. Features

3. Bug Fixes

4. Known Issues

5. List of Files Changed from V 5 alpha to V 5 alpha + 2

vtiger CRM 5.0 Alpha: Release Notes

1. Summary

2. Features

4. Known Issues

3. Product Size

6. Known Issues

8. List of Files Changed from V 4.5 Development 1 to V 4.5 Development 3

3. Product Size

3. Code Contributions

Step 2 of 5

System Configuration

Database Configuration

System Configuration

Database Configuration

Site Configuration

Site Configuration

Admin Configuration

Admin Configuration

Step 4 of 5

Step 4 of 5

Create configuration file

Create Config File

Successfully created config file (config.php) in :

Successfully created configuration file (config.php) in :

Successfully created configuration file (config.php) in :

Successfully created configuration file (config.inc.php) in :

vtiger CRM 5.0 Alpha 2: Release Notes

1. Summary

2. Features

3. Bug Fixes

4. Known Issues

5. List of Files Changed from V 5 alpha to V 5 alpha + 2

vtiger CRM 5.0 Alpha: Release Notes

1. Summary

2. Features

4. Known Issues

3. Product Size

6. Known Issues

8. List of Files Changed from V 4.5 Development 1 to V 4.5 Development 3

3. Product Size

3. Code Contributions