From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 00:17:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 01 Mar 2007 08:17:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10277 - in /vtigercrm/branches/5.0.3: Smarty/templates/PrintReport.tpl modules/Reports/PrintReport.php modules/Reports/Reports.php Message-ID: <20070301081710.D369178D69B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 1 01:16:57 2007 New Revision: 10277 Log: i18n for Reports - Move report to another folder. Fixes #3016 Modified: vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl vtigercrm/branches/5.0.3/modules/Reports/PrintReport.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl Thu Mar 1 01:16:57 2007 @@ -18,7 +18,7 @@ -vtiger - Print Report +vtiger - {$MOD.LBL_PRINT_REPORT} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl Fri Mar 2 00:43:22 2007 @@ -11,8 +11,8 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl Fri Mar 2 00:43:22 2007 @@ -11,8 +11,8 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:45:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:45:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10310 - /vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php Message-ID: <20070302074531.0F9C478D707@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:45:24 2007 New Revision: 10310 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php Modified: vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php Fri Mar 2 00:45:24 2007 @@ -1,21 +1,24 @@ - + - + -Ajax Css-Popup chat +<?php echo $mod_strings['TITLE_AJAX_CSS_POPUP_CHAT'];?> - - - - + + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:46:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:46:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10311 - /vtigercrm/branches/5.0.3/modules/Users/notify_detail.php Message-ID: <20070302074617.34D0D78D707@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:45:47 2007 New Revision: 10311 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/modules/Users/notify_detail.php Modified: vtigercrm/branches/5.0.3/modules/Users/notify_detail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/notify_detail.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/notify_detail.php Fri Mar 2 00:45:47 2007 @@ -10,6 +10,8 @@ ********************************************************************************/ global $theme; +global $app_strings; +global $mod_strings; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -20,8 +22,8 @@ -Untitled Document - +<?php echo $mod_strings['TITLE_USER_DOCUMENT']; ?> +
@@ -44,7 +46,7 @@ Active: - + [Deactivate] From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:47:32 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:47:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10312 - /vtigercrm/branches/5.0.3/modules/Users/about_us.php Message-ID: <20070302074732.34F0E78D712@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:46:51 2007 New Revision: 10312 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/modules/Users/about_us.php Modified: vtigercrm/branches/5.0.3/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/about_us.php Fri Mar 2 00:46:51 2007 @@ -32,8 +32,8 @@ "http://www.w3.org/TR/html4/loose.dtd"> - -vtiger CRM 5 - Free, Commercial grade Open Source CRM + +<?php echo $mod_strings['TITLE_VTIGER_CRM_5'];?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:50:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:50:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10313 - /vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Message-ID: <20070302075010.A2FD678D718@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:50:01 2007 New Revision: 10313 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Fri Mar 2 00:50:01 2007 @@ -16,7 +16,7 @@ -Compose Mail +{MOD.TITLE_COMPOSE_MAIL} From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:52:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:52:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10314 - /vtigercrm/branches/5.0.3/modules/Settings/Save.php Message-ID: <20070302075231.277C178D72C@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:52:13 2007 New Revision: 10314 Log: fixes #3048 Modified: vtigercrm/branches/5.0.3/modules/Settings/Save.php Modified: vtigercrm/branches/5.0.3/modules/Settings/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/Save.php Fri Mar 2 00:52:13 2007 @@ -10,6 +10,7 @@ ********************************************************************************/ require_once("include/database/PearDatabase.php"); +global $mod_strings; $server=$_REQUEST['server']; $port=$_REQUEST['port']; $server_username=$_REQUEST['server_username']; @@ -99,8 +100,8 @@ $to_email = getUserEmailId('id',$current_user->id); $from_email = $to_email; - $subject = 'Test mail about the mail server configuration.'; - $description = 'Dear '.$current_user->user_name.',

This is a test mail sent to confirm if a mail is actually being sent through the vtiger system. You are free to delete this mail.
Thanks and Regards
Team vTiger

'; + $subject = $mod_strings['MSG_TEST_MAIL_ABOUT_MAIL_SERVER']; + $description = $mod_strings['MSG_Dear'].' '.$current_user->user_name.',

'.$mod_strings['MSG_THIS_IS_TEST_MAIL'].' '.$mod_strings['MSG_YOU_ARE_FREE_TO_THIS_MAIL'].'
'.$mod_strings['MSG_THANKS_AND_REGARDS'].'
'.$mod_strings['MSG_TEAM_VTIGER']

'; if($to_email != '') { $mail_status = send_mail('Users',$to_email,$current_user->user_name,$from_email,$subject,$description); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:53:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:53:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10315 - /vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Message-ID: <20070302075303.4824A78D718@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:52:54 2007 New Revision: 10315 Log: fixes #3048 Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Mar 2 00:52:54 2007 @@ -882,7 +882,7 @@ 'LBL_DOC_MSWORD'=>'File has to be a Document of type doc/msword', 'LBL_NODOC'=>'No doc File in this directory.Please try again!', -//Added for error messages on Company Info. +//Added for 5.0.3 'LOGO_ERROR'=>'Logo has to be an Image of type jpeg/png', 'Error_Message'=>'Error Message', 'Invalid_file'=>'Invalid file OR', @@ -892,5 +892,14 @@ 'try_file_smaller'=>'Please try a file smaller than 800000 bytes', 'Problems_in_upload'=>'Problems in file upload', 'Please_try_again'=>'Please try again!', + +'RECORD_DOESNOT_EXIST'=>'Record does not exist', + +'MSG_TEST_MAIL_ABOUT_MAIL_SERVER'=>'Test mail about the mail server configuration.', +'MSG_Dear'=>'Dear', +'MSG_THIS_IS_TEST_MAIL'=>'This is a test mail sent to confirm if a mail is actually being sent through the vtiger system.', +'MSG_YOU_ARE_FREE_TO_THIS_MAIL'=>'You are free to delete this mail.', +'MSG_THANKS_AND_REGARDS'=>'Thanks and Regards', +'MSG_TEAM_VTIGER'=>'Team vTiger', ); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:54:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:54:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10316 - /vtigercrm/branches/5.0.3/include/language/en_us.lang.php Message-ID: <20070302075447.2847F78D728@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:54:25 2007 New Revision: 10316 Log: fixes #3173 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri Mar 2 00:54:25 2007 @@ -356,7 +356,6 @@ 'Type' => 'Type', 'Start Date/Due Date' => 'Start Date/Due Date', 'Date Sent' => 'Date Sent', -'Sender'=>'Sender', 'Ticket ID' => 'Ticket ID', 'Status' => 'Status', 'Priority' => 'Priority', @@ -655,14 +654,6 @@ 'greater or equal'=>'greater or equal', 'less or equal'=>'less or equal', -'Private'=>'Private', -'Public'=>'Public', - -'High'=>'High', -'Medium'=>'Medium', -'Low'=>'Low', - - //For Product Details 'LABEL_SET_DISCOUNT_FOR_COLON'=>'Set Discount for :', 'LABEL_SET_TAX_FOR'=>'Set Tax for', @@ -672,7 +663,9 @@ 'LABEL_SET_TAX_FOR_X'=>'Set Tax for x', 'LABEL_SET_SH_TAX_FOR_COLON'=>'Set S&H Tax for :', +//Added for 5.0.3 'Files_Maximum_6'=>'Files Maximum 6', +'To'=>'To:', ); $app_list_strings = array ( From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 23:56:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:56:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10317 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070302075628.4A62C78D718@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:55:38 2007 New Revision: 10317 Log: fixes #3173 Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Fri Mar 2 00:55:38 2007 @@ -37,7 +37,7 @@ function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module_name,$mode='') { - global $log; + global $log,$app_strings; $log->debug("Entering getOutputHtml(".$uitype.",". $fieldname.",". $fieldlabel.",". $maxlength.",". $col_fields.",".$generatedtype.",".$module_name.") method ..."); global $adb,$log; global $theme; @@ -924,7 +924,7 @@ } } } - $custfld .= 'To: '; + $custfld .= ''.$app_strings['To'].' '; $custfld .= '   {/if} {if $DELETE eq 'permitted'} -   +   {/if} @@ -240,7 +240,7 @@   {/if} {if $DELETE eq 'permitted'} -   +   {/if} Modified: vtigercrm/branches/5.0.3/include/js/ListView.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ListView.js (original) +++ vtigercrm/branches/5.0.3/include/js/ListView.js Mon Mar 5 05:32:35 2007 @@ -72,7 +72,13 @@ alert("Please select at least one entity"); return false; } - var alert_str = (module=="Accounts") ? "Deleting this account(s) will remove its related Potentials,Quotes,Sales Order & Invoice. Are you sure you want to delete the selected "+xx+" records?" : "Are you sure you want to delete the selected "+xx+" records ?"; + var alert_str = "Are you sure you want to delete the selected "+xx+" records ?"; + + if(module=="Accounts") + alert_str = "Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected "+xx+" records?"; + else if(module=="Vendors") + alert_str = "Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected "+xx+" records?"; + if(confirm(alert_str)) { Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Mar 5 05:32:35 2007 @@ -176,7 +176,8 @@ 'NTC_TIME_FORMAT' => '(24:00)', 'NTC_DATE_TIME_FORMAT' => '(yyyy-mm-dd 24:00)', 'NTC_DELETE_CONFIRMATION' => 'Are you sure you want to delete this record?', -'NTC_ACCOUNT_DELETE_CONFIRMATION' => 'Deleting this account will remove its related Potentials,Quotes,Sales Order & Invoice. Are you sure you want to delete this account?', +'NTC_ACCOUNT_DELETE_CONFIRMATION' => 'Deleting this account will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete this account?', +'NTC_VENDOR_DELETE_CONFIRMATION' => 'Deleting this vendor will remove its related Purchase Orders. Are you sure you want to delete this vendor?', 'ERR_DELETE_RECORD' => 'A record number must be specified to delete the contact.', 'ERR_CREATING_TABLE' => 'Error creating table: ', 'ERR_CREATING_FIELDS' => 'Error filling in additional detail fields: ', Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Mon Mar 5 05:32:35 2007 @@ -428,7 +428,29 @@ //Deleting Trouble Tickets-Account Relation. $tt_q = "update vtiger_troubletickets set parent_id = '' where parent_id = ".$record; - $tt_res = $adb->query($tt_q); $adb->query($tt_q); } + +function delVendorRelRecords($record){ + + global $adb; + + //Deleting Vendor related PO. + $po_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_purchaseorder on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid inner join vtiger_vendor on vtiger_vendor.vendorid=vtiger_purchaseorder.vendorid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$record; + $po_res = $adb->query($po_q); + for($k=0;$k < $adb->num_rows($po_res);$k++) + { + $po_id = $adb->query_result($po_res,$k,"crmid"); + $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$po_id; + $adb->query($sql); + } + + //Deleting Product-Vendor Relation. + $pro_q = "update vtiger_products set vendor_id = '' where vendor_id = ".$record; + $adb->query($pro_q); + //Deleting Contact-Vendor Relaton + $vc_sql = "delete from vtiger_vendorcontactrel where vendorid=".$record; + $adb->query($vc_sql); +} + ?> Modified: vtigercrm/branches/5.0.3/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Delete.php Mon Mar 5 05:32:35 2007 @@ -29,11 +29,11 @@ if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); - + if($_REQUEST['module'] == $_REQUEST['return_module']) { + delVendorRelRecords($_REQUEST['record']); $focus->mark_deleted($_REQUEST['record']); - $smod ="smodule=VENDOR&"; } -header("Location: index.php?".$smod."module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); +header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 05:09:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 05 Mar 2007 13:09:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10344 - /vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Message-ID: <20070305130906.45B9178C36A@vtiger.fosslabs.com> Author: richie Date: Mon Mar 5 06:08:58 2007 New Revision: 10344 Log: fixes #3127 Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Mon Mar 5 06:08:58 2007 @@ -84,6 +84,7 @@ $email = new Webmails($MailBox->mbox,$mailid); $email->setFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } @@ -92,6 +93,7 @@ $email = new Webmails($MailBox->mbox,$mailid); $email->delFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 05:52:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 05 Mar 2007 13:52:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10345 - /vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Message-ID: <20070305135209.3969278D8F6@vtiger.fosslabs.com> Author: richie Date: Mon Mar 5 06:52:02 2007 New Revision: 10345 Log: fixes mail moving issue Modified: vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Modified: vtigercrm/branches/5.0.3/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Mon Mar 5 06:52:02 2007 @@ -370,7 +370,9 @@ for(var i=cnt;i>0;i--) { if(els[i].type == "checkbox" && els[i].name.indexOf("_")) { if(els[i].checked) { - var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); + // var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); + + var nid = els[i].value; var mvmbox = $("mailbox_select").value; var row = $("row_"+nid); new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '0.5'}); @@ -387,7 +389,8 @@ } } } - runEmailCommand('expunge',''); + $('mailbox_select').selectedIndex=0; + //runEmailCommand('expunge',''); $("status").style.display="none"; } function search_emails() { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 20:14:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:14:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10346 - /vtigercrm/branches/5.0.3/themes/bluelagoon/images/aboutUS.jpg Message-ID: <20070306041437.A744078D91D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:14:33 2007 New Revision: 10346 Log: aboutUS.jpg image has deleted --Minnie Removed: vtigercrm/branches/5.0.3/themes/bluelagoon/images/aboutUS.jpg From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 20:15:40 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:15:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10347 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/aboutUS.jpg woodspice/images/aboutUS.jpg Message-ID: <20070306041540.64BCA78D91C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:15:34 2007 New Revision: 10347 Log: aboutUS.jpg image has deleted --Minnie Removed: vtigercrm/branches/5.0.3/themes/alphagrey/images/aboutUS.jpg vtigercrm/branches/5.0.3/themes/woodspice/images/aboutUS.jpg From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 20:20:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:20:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10348 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/aboutUS.jpg bluelagoon/images/aboutUS.jpg woodspice/images/aboutUS.jpg Message-ID: <20070306042006.A2E3878D91D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:19:55 2007 New Revision: 10348 Log: new image added for aboutus --Minnie Added: vtigercrm/branches/5.0.3/themes/alphagrey/images/aboutUS.jpg (with props) vtigercrm/branches/5.0.3/themes/bluelagoon/images/aboutUS.jpg (with props) vtigercrm/branches/5.0.3/themes/woodspice/images/aboutUS.jpg (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 20:31:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:31:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10349 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/cal12x12Shared.gif bluelagoon/images/cal12x12Shared.gif woodspice/images/cal12x12Shared.gif Message-ID: <20070306043139.D373178D051@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:31:32 2007 New Revision: 10349 Log: calendar sharing image has been removed. --Minnie Removed: vtigercrm/branches/5.0.3/themes/alphagrey/images/cal12x12Shared.gif vtigercrm/branches/5.0.3/themes/bluelagoon/images/cal12x12Shared.gif vtigercrm/branches/5.0.3/themes/woodspice/images/cal12x12Shared.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 20:38:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:38:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10350 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/cal12x12Shared.gif bluelagoon/images/cal12x12Shared.gif woodspice/images/cal12x12Shared.gif Message-ID: <20070306043828.935DE78C6F4@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:38:17 2007 New Revision: 10350 Log: new image added for calendar sharing. --Minnie Added: vtigercrm/branches/5.0.3/themes/alphagrey/images/cal12x12Shared.gif (with props) vtigercrm/branches/5.0.3/themes/bluelagoon/images/cal12x12Shared.gif (with props) vtigercrm/branches/5.0.3/themes/woodspice/images/cal12x12Shared.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 21:42:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 05:42:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10351 - in /vtigercrm/branches/5.0.3/modules/Calendar: ActivityAjax.php CalendarCommon.php Save.php TodoSave.php Message-ID: <20070306054204.BAADC78D892@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 22:41:56 2007 New Revision: 10351 Log: fix for event notification failure. Fixes #3068 --Minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php vtigercrm/branches/5.0.3/modules/Calendar/Save.php vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php Mon Mar 5 22:41:56 2007 @@ -142,6 +142,24 @@ $activity_type = "Events"; } ChangeStatus($status,$return_id,$activity_type); + $mail_data = getActivityMailInfo($return_id,$status,$activity_type); + if($mail_data['sendnotification'] == 1) + { + getEventNotification($mail_data['user_id'],$activity_type,$mail_data['subject'],$mail_data); + } + $invitee_qry = "select * from vtiger_invitees where activityid=".$return_id; + $invitee_res = $adb->query($invitee_qry); + $count = $adb->num_rows($invitee_res); + if($count != 0) + { + for($j = 0; $j < $count; $j++) + { + $invitees_ids[]= $adb->query_result($invitee_res,$j,"inviteeid"); + + } + $invitees_ids_string = implode(';',$invitees_ids); + sendInvitation($invitees_ids_string,$activity_type,$mail_data['subject'],$mail_data); + } } if($type == 'activity_postpone') { Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Mon Mar 5 22:41:56 2007 @@ -293,26 +293,26 @@ global $adb,$mod_strings; $log->debug("Entering getActivityDetails(".$description.") method ..."); - $reply = (($_REQUEST['mode'] == 'edit')?'updated':'created'); + $reply = (($description['mode'] == 'edit')?'updated':'created'); if($inviteeid=='') - $name = getUserName($_REQUEST['assigned_user_id']); + $name = getUserName($description['user_id']); else $name = getUserName($inviteeid); $current_username = getUserName($current_user->id); - $status = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus'])); + $status = $description['status']; $list = $name.','; - $list .= '

'.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.
'.$mod_strings['LBL_DETAILS_STRING'].':'; - $list .= '
      '.$mod_strings["LBL_SUBJECT"].' '.$_REQUEST['subject']; + $list .= '

'.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.
'.$mod_strings['LBL_DETAILS_STRING'].':
'; + $list .= '
      '.$mod_strings["LBL_SUBJECT"].' '.$description['subject']; $list .= '
      '.$mod_strings["LBL_STATUS"].': '.$status; - $list .= '
      '.$mod_strings["Priority"].': '.$_REQUEST['taskpriority']; - $list .= '
      '.$mod_strings["Related To"].' : '.$_REQUEST['parent_name']; - if($_REQUEST['activity_mode']!= 'Events') - { - $list .= '
'.$mod_strings["LBL_CONTACT"].' '.$_REQUEST['contactlist']; - } - $list .= '
      '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description; + $list .= '
      '.$mod_strings["Priority"].': '.$description['taskpriority']; + $list .= '
      '.$mod_strings["Related To"].' : '.$description['relatedto']; + if($description['activity_mode'] != 'Events') + { + $list .= '
      '.$mod_strings["LBL_CONTACT"].' '.$description['contact_name']; + } + $list .= '
      '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description['description']; $list .= '

'.$mod_strings["LBL_REGARDS_STRING"].' ,'; $list .= '
'.$current_username.'.'; @@ -346,6 +346,120 @@ } return $timeStr; } - +//added to fix Ticket#3068 +function getEventNotification($mail_id,$mode,$subject,$desc) +{ + global $current_user,$adb; + require_once("modules/Emails/mail.php"); + $subject = $mode.' : '.$subject; + $crmentity = new CRMEntity(); + + if($desc['assingn_type'] == "U") + { + $to_email = getUserEmailId('id',$mail_id); + $description = getActivityDetails($desc); + send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); + } + if($desc['assingn_type'] == "T") + { + $groupname=$desc['group_name']; + $resultqry=$adb->query("select groupid from vtiger_groups where groupname='".$groupname."'"); + $groupid=$adb->query_result($resultqry,0,"groupid"); + require_once('include/utils/GetGroupUsers.php'); + $getGroupObj=new GetGroupUsers(); + $getGroupObj->getAllUsersInGroup($groupid); + $userIds=$getGroupObj->group_users; + $groupqry="select email1,id from vtiger_users where id in(".implode(',',$userIds).")"; + $groupqry_res=$adb->query($groupqry); + $noOfRows = $adb->num_rows($groupqry_res); + for($z=0;$z < $noOfRows;$z++) + { + $emailadd = $adb->query_result($groupqry_res,$z,'email1'); + $curr_userid = $adb->query_result($groupqry_res,$z,'id'); + $description = getActivityDetails($desc,$curr_userid); + $mail_status = send_mail('Calendar',$emailadd,getUserName($curr_userid),'',$subject,$description); + + } + } +} + +function sendInvitation($inviteesid,$mode,$subject,$desc) +{ + global $current_user; + require_once("modules/Emails/mail.php"); + $invitees_array = explode(';',$inviteesid); + $subject = $mode.' : '.$subject; + $record = $focus->id; + foreach($invitees_array as $inviteeid) + { + if($inviteeid != '') + { + $description=getActivityDetails($desc,$inviteeid); + $to_email = getUserEmailId('id',$inviteeid); + send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); + } + } + +} + +function getActivityMailInfo($return_id,$status,$activity_type) +{ + $mail_data = Array(); + global $adb; + $qry = "select * from vtiger_activity where activityid=".$return_id; + $ary_res = $adb->query($qry); + $send_notification = $adb->query_result($ary_res,0,"sendnotification"); + $subject = $adb->query_result($ary_res,0,"subject"); + $priority = $adb->query_result($ary_res,0,"priority"); + //$parent_name = $adb->query_result($ary_res,0,"priority"); + + $usr_qry = "select smownerid from vtiger_crmentity where crmid=".$return_id; + $res = $adb->query($usr_qry); + $usr_id = $adb->query_result($res,0,"smownerid"); + $assignType = "U"; + if($usr_id == '') + { + $assignType = "T"; + $group_qry = "select groupname from vtiger_activitygrouprelation where activityid=".$return_id; + $grp_res = $adb->query($group_qry); + $grp_name = $adb->query_result($res,0,"groupname"); + } + + + $desc_qry = "select description from vtiger_crmentity where crmid=".$return_id; + $des_res = $adb->query($desc_qry); + $description = $adb->query_result($des_res,0,"description"); + + + $rel_qry = "select case vtiger_crmentity.setype when 'Leads' then vtiger_leaddetails.lastname when 'Accounts' then vtiger_account.accountname when 'Potentials' then vtiger_potential.potentialname when 'Quotes' then vtiger_quotes.subject when 'PurchaseOrder' then vtiger_purchaseorder.subject when 'SalesOrder' then vtiger_salesorder.subject when 'Invoice' then vtiger_invoice.subject when 'Campaigns' then vtiger_campaign.campaignname when 'HelpDesk' then vtiger_troubletickets.title end as relname from vtiger_seactivityrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_seactivityrel.crmid left join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seactivityrel.crmid left join vtiger_account on vtiger_account.accountid=vtiger_seactivityrel.crmid left join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_quotes on vtiger_quotes.quoteid= vtiger_seactivityrel.crmid left join vtiger_purchaseorder on vtiger_purchaseorder.purchaseorderid = vtiger_seactivityrel.crmid left join vtiger_salesorder on vtiger_salesorder.salesorderid = vtiger_seactivityrel.crmid left join vtiger_invoice on vtiger_invoice.invoiceid = vtiger_seactivityrel.crmid left join vtiger_campaign on vtiger_campaign.campaignid = vtiger_seactivityrel.crmid left join vtiger_troubletickets on vtiger_troubletickets.ticketid = vtiger_seactivityrel.crmid where vtiger_seactivityrel.activityid=".$return_id; + + $rel_res = $adb->query($rel_qry); + $rel_name = $adb->query_result($rel_res,0,"relname"); + + + $cont_qry = "select * from vtiger_cntactivityrel where activityid=".$return_id; + $cont_res = $adb->query($cont_qry); + $cont_id = $adb->query_result($cont_res,0,"contactid"); + $cont_name = ''; + if($cont_id != '') + { + $cont_name = getContactName($cont_id); + } + $mail_data['mode'] = "edit"; + $mail_data['activity_mode'] = $activity_type; + $mail_data['sendnotification'] = $send_notification; + $mail_data['user_id'] = $usr_id; + $mail_data['subject'] = $subject; + $mail_data['status'] = $status; + $mail_data['taskpriority'] = $priority; + $mail_data['relatedto'] = $rel_name; + $mail_data['contact_name'] = $cont_name; + $mail_data['description'] = $description; + $mail_data['assingn_type'] = $assignType; + $mail_data['group_name'] = $grp_name; + return $mail_data; + + +} ?> Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Mon Mar 5 22:41:56 2007 @@ -23,11 +23,9 @@ require_once('modules/Calendar/Activity.php'); require_once('include/logging.php'); -//require("modules/Emails/class.phpmailer.php"); require_once("config.php"); require_once('include/database/PearDatabase.php'); require_once('modules/Calendar/CalendarCommon.php'); -require_once('data/CRMEntity.php'); global $adb; $local_log =& LoggerManager::getLogger('index'); $focus = new Activity(); @@ -59,8 +57,27 @@ $status = $_REQUEST['eventstatus']; $activity_type = "Events"; } - ChangeStatus($status,$return_id,$activity_type); + $mail_data = getActivityMailInfo($return_id,$status,$activity_type); + if($mail_data['sendnotification'] == 1) + { + getEventNotification($mail_data['user_id'],$activity_type,$mail_data['subject'],$mail_data); + } + $invitee_qry = "select * from vtiger_invitees where activityid=".$return_id; + $invitee_res = $adb->query($invitee_qry); + $count = $adb->num_rows($invitee_res); + if($count != 0) + { + for($j = 0; $j < $count; $j++) + { + $invitees_ids[]= $adb->query_result($invitee_res,$j,"inviteeid"); + + } + $invitees_ids_string = implode(';',$invitees_ids); + sendInvitation($invitees_ids_string,$activity_type,$mail_data['subject'],$mail_data); + } + + } else { @@ -137,68 +154,34 @@ if($activity_mode != '') $activemode = "&activity_mode=".$activity_mode; +function getRequestData() +{ + $mail_data = Array(); + $mail_data['user_id'] = $_REQUEST['assigned_user_id']; + $mail_data['subject'] = $_REQUEST['subject']; + $mail_data['status'] = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus'])); + $mail_data['activity_mode'] = $_REQUEST['activity_mode']; + $mail_data['taskpriority'] = $_REQUEST['taskpriority']; + $mail_data['relatedto'] = $_REQUEST['parent_name']; + $mail_data['contact_name'] = $_REQUEST['contact_name']; + $mail_data['description'] = $_REQUEST['description']; + $mail_data['assingn_type'] = $_REQUEST['assigntype']; + $mail_data['group_name'] = $_REQUEST['assigned_group_name']; + $mail_data['mode'] = $_REQUEST['mode']; + return $mail_data; +} //Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user if($_REQUEST['sendnotification'] == 'on') { - global $current_user; - $local_log->info("send notification is on"); - require_once("modules/Emails/mail.php"); - $subject = $_REQUEST['activity_mode'].' : '.$_REQUEST['subject']; - - $crmentity = new CRMEntity(); - if($_REQUEST['assigntype'] == 'U') - { - $to_email[0] = getUserEmailId('id',$_REQUEST['assigned_user_id']); - $description = getActivityDetails($_REQUEST['description']); - $mail_status = send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); - } - //code added to send mail to group - if($_REQUEST['assigntype'] == 'T') - { - $groupname=$_REQUEST['assigned_group_name']; - $resultqry=$adb->query("select groupid from vtiger_groups where groupname='".$groupname."'"); - $groupid=$adb->query_result($resultqry,0,"groupid"); - require_once('include/utils/GetGroupUsers.php'); - $getGroupObj=new GetGroupUsers(); - $getGroupObj->getAllUsersInGroup($groupid); - $userIds=$getGroupObj->group_users; - $groupqry="select email1,id from vtiger_users where id in(".implode(',',$userIds).")"; - $groupqry_res=$adb->query($groupqry); - $noOfRows = $adb->num_rows($groupqry_res); - for($z=0;$z < $noOfRows;$z++) - { - $emailadd = $adb->query_result($groupqry_res,$z,'email1'); - $curr_userid = $adb->query_result($groupqry_res,$z,'id'); - $description = getActivityDetails($_REQUEST['description'],$curr_userid); - $mail_status = send_mail('Calendar',$emailadd,getUserName($curr_userid),'',$subject,$description); - - } - - - } - -} - + $mail_contents = getRequestData(); + getEventNotification($_REQUEST['assigned_user_id'],$_REQUEST['activity_mode'],$_REQUEST['subject'],$mail_contents); +} //code added to send mail to the vtiger_invitees if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='') { - global $current_user; - $local_log->info("send notification is on"); - require_once("modules/Emails/mail.php"); - $selected_users_string = $_REQUEST['inviteesid']; - $invitees_array = explode(';',$selected_users_string); - $subject = $_REQUEST['activity_mode'].' : '.$_REQUEST['subject']; - $record = $focus->id; - foreach($invitees_array as $inviteeid) - { - if($inviteeid != '') - { - $description=getActivityDetails($_REQUEST['description'],$inviteeid); - $to_email = getUserEmailId('id',$inviteeid); - $mail_status = send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); - } - } + $mail_contents = getRequestData(); + sendInvitation($_REQUEST['inviteesid'],$_REQUEST['activity_mode'],$_REQUEST['subject'],$mail_contents); } if(isset($_REQUEST['contactidlist']) && $_REQUEST['contactidlist'] != '') Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Mon Mar 5 22:41:56 2007 @@ -15,7 +15,6 @@ require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); - $focus = new Activity(); $activity_mode = $_REQUEST['activity_mode']; if($activity_mode == 'Task') @@ -48,22 +47,29 @@ $focus->column_fields["sendnotification"] = $_REQUEST["task_sendnotification"]; $focus->save($tab_type); - if($_REQUEST["task_sendnotification"]=='on' && $_REQUEST['task_assigntype'] == 'U') + if($_REQUEST["task_sendnotification"]=='on') { - - global $current_user; - $local_log->info("send notification is on"); - require_once("modules/Emails/mail.php"); - $to_email = getUserEmailId('id',$_REQUEST['task_assigned_user_id']); - $subject = $_REQUEST['activity_mode'].' : '.$_REQUEST['task_subject']; - $_REQUEST["assigned_user_id"]= $_REQUEST["task_assigned_user_id"]; - $_REQUEST["subject"]=$subject; - $_REQUEST["parent_name"]=$_REQUEST["task_parent_name"]; - $_REQUEST['contactlist']=$_REQUEST['task_contact_name']; - $description = getActivityDetails($_REQUEST['task_description']); - $mail_status = send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); + $mail_contents = getRequestedToData(); + getEventNotification($_REQUEST['task_assigned_user_id'],$_REQUEST['activity_mode'],$_REQUEST['task_subject'],$mail_contents); } +function getRequestedToData() +{ + $mail_data = Array(); + $mail_data['user_id'] = $_REQUEST["task_assigned_user_id"]; + $mail_data['subject'] = $_REQUEST['task_subject']; + $mail_data['status'] = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus'])); + $mail_data['activity_mode'] = $_REQUEST['activity_mode']; + $mail_data['taskpriority'] = $_REQUEST['taskpriority']; + $mail_data['relatedto'] = $_REQUEST['task_parent_name']; + $mail_data['contact_name'] = $_REQUEST['task_contact_name']; + $mail_data['description'] = $_REQUEST['task_description']; + $mail_data['assingn_type'] = $_REQUEST['task_assigntype']; + $mail_data['group_name'] = $_REQUEST['task_assigned_group_name']; + $mail_data['mode'] = $_REQUEST['task_mode']; + return $mail_data; +} - header("Location: index.php?action=index&module=Calendar&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&viewOption=".$_REQUEST['viewOption']."&subtab=".$_REQUEST['subtab']."&parenttab=".$_REQUEST['parenttab']); + + header("Location: index.php?action=index&module=Calendar&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&viewOption=".$_REQUEST['viewOption']."&subtab=todo&parenttab=".$_REQUEST['parenttab']); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:07:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:07:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10352 - /vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Message-ID: <20070306070716.14B9578D970@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 6 00:07:12 2007 New Revision: 10352 Log: alert message has been modified --Minnie Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Tue Mar 6 00:07:12 2007 @@ -354,7 +354,7 @@ $adb->println("Create New Portal from Web Form - Ends"); if($result != '') - return 'Portal added sucessfully'; + return 'URL added sucessfully'; else return "Portal creation failed. Try again"; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:07:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:07:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10353 - /vtigercrm/branches/5.0.3/include/RelatedListView.php Message-ID: <20070306070723.BB6B978D956@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 00:07:12 2007 New Revision: 10353 Log: fixes #3118 Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Mar 6 00:07:12 2007 @@ -1,518 +1,523 @@ -debug("Entering GetRelatedList(".$module.",".$relatedmodule.",".$focus.",".$query.",".$button.",".$returnset.",".$edit_val.",".$del_val.") method ..."); - - require_once('Smarty_setup.php'); - require_once("data/Tracker.php"); - require_once('include/database/PearDatabase.php'); - - global $adb; - global $app_strings; - global $current_language; - - $current_module_strings = return_module_language($current_language, $module); - - global $list_max_entries_per_page; - global $urlPrefix; - - - global $currentModule; - global $theme; - global $theme_path; - global $theme_path; - global $mod_strings; - // focus_list is the means of passing data to a ListView. - global $focus_list; - $smarty = new vtigerCRM_Smarty; - if (!isset($where)) $where = ""; - - - $button = '
'.$button.'
'; - - // Added to have Purchase Order as form Title - if($relatedmodule == 'Orders') - { - $smarty->assign('ADDBUTTON',get_form_header($app_strings['PurchaseOrder'],$button, false)); - } - else - { - $smarty->assign('ADDBUTTON',get_form_header($app_strings[$relatedmodule],$button, false)); - } - - require_once('themes/'.$theme.'/layout_utils.php'); - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - $smarty->assign("MOD", $mod_strings); - $smarty->assign("APP", $app_strings); - $smarty->assign("IMAGE_PATH",$image_path); - $smarty->assign("MODULE",$relatedmodule); - - - //Retreive the list from Database - //$query = getListQuery("Accounts"); - - //echo '
*****************'.$relatedmodule.' ***************'; - //Appending the security parameter - if($relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook' && $relatedmodule != 'Vendors') //Security fix by Don - { - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - $tab_id=getTabid($relatedmodule); - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) - { - $sec_parameter=getListViewSecurityParameter($relatedmodule); - $query .= ' '.$sec_parameter; - - } - } - - - if(isset($where) && $where != '') - { - $query .= ' and '.$where; - } - - if(!$_SESSION['rlvs'][$module][$relatedmodule]) - { - $modObj = new ListViewSession(); - $modObj->sortby = $focus->default_order_by; - $modObj->sorder = $focus->default_sort_order; - $_SESSION['rlvs'][$module][$relatedmodule] = get_object_vars($modObj); - } - if(isset($_REQUEST['relmodule']) && ($_REQUEST['relmodule'] == $relatedmodule)) - { - if(method_exists($focus,getSortOrder)) - $sorder = $focus->getSortOrder(); - if(method_exists($focus,getOrderBy)) - $order_by = $focus->getOrderBy(); - - if(isset($order_by) && $order_by != '') - { - $_SESSION['rlvs'][$module][$relatedmodule]['sorder'] = $sorder; - $_SESSION['rlvs'][$module][$relatedmodule]['sortby'] = $order_by; - } - - } - elseif($_SESSION['rlvs'][$module][$relatedmodule]) - { - $sorder = $_SESSION['rlvs'][$module][$relatedmodule]['sorder']; - $order_by = $_SESSION['rlvs'][$module][$relatedmodule]['sortby']; - } - else - { - $order_by = $focus->default_order_by; - $sorder = $focus->default_sort_order; - } - - $query .= ' ORDER BY '.$order_by.' '.$sorder; - $url_qry .="&order_by=".$order_by; - //Added for PHP version less than 5 - if (!function_exists("stripos")) - { - function stripos($query,$needle) - { - return strpos(strtolower($query),strtolower($needle)); - } - } - - //Retreiving the no of rows - $count_query = "select count(*) as count ".substr($query, stripos($query,'from'),strlen($query)); - $count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER BY'))); - $noofrows = $adb->query_result($count_result,0,"count"); - - //Setting Listview session object while sorting/pagination - if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='' && $_REQUEST['relmodule'] == $relatedmodule) - { - $relmodule = $_REQUEST['relmodule']; - if($_SESSION['rlvs'][$module][$relmodule]) - { - setSessionVar($_SESSION['rlvs'][$module][$relmodule],$noofrows,$list_max_entries_per_page,$module,$relmodule); - } - } - $start = $_SESSION['rlvs'][$module][$relatedmodule]['start']; - - $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - - $start_rec = $navigation_array['start']; - $end_rec = $navigation_array['end_val']; - - //limiting the query - if ($start_rec ==0) - $limit_start_rec = 0; - else - $limit_start_rec = $start_rec -1; - - if( $adb->dbType == "pgsql") - $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page); - else - $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page); - - //Retreive the List View Table Header - if($noofrows == 0) - { - $smarty->assign('NOENTRIES',$app_strings['LBL_NONE_SCHEDULED']); - } - else - { - $id = $_REQUEST['record']; - $listview_header = getListViewHeader($focus,$relatedmodule,'',$sorder,$order_by,$id,'',$module);//"Accounts"); - if ($noofrows > 15) - { - $smarty->assign('SCROLLSTART','
'); - $smarty->assign('SCROLLSTOP','
'); - } - $smarty->assign("LISTHEADER", $listview_header); - - if($module == 'PriceBook' && $relatedmodule == 'Products') - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val); - } - if($module == 'Products' && $relatedmodule == 'PriceBook') - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel'); - } - elseif($relatedmodule == 'SalesOrder') - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder'); - }else - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset); - } - - $navigationOutput = Array(); - $navigationOutput[] = $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; - $module_rel = $module.'&relmodule='.$relatedmodule.'&record='.$id; - $navigationOutput[] = getRelatedTableHeaderNavigation($navigation_array, $url_qry,$module_rel); - $related_entries = array('header'=>$listview_header,'entries'=>$listview_entries,'navigation'=>$navigationOutput); - - $log->debug("Exiting GetRelatedList method ..."); - return $related_entries; - } -} - -/** Function to get related list entries in detailed array format - * @param $parentmodule -- parentmodulename:: Type string - * @param $query -- query:: Type string - * @param $id -- id:: Type string - * @returns $entries_list -- entries list:: Type string array - * - */ - -function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='') -{ - global $log; - $log->debug("Entering getAttachmentsAndNotes(".$parentmodule.",".$query.",".$id.",".$sid.") method ..."); - global $theme; - - $list = ''; - - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - require_once ($theme_path."layout_utils.php"); - - global $adb; - global $mod_strings; - global $app_strings; - - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['LBL_CREATED']; - $header[] = $app_strings['LBL_SUBJECT']; - $header[] = $app_strings['LBL_DESCRIPTION']; - $header[] = $app_strings['LBL_ATTACHMENTS']; - $header[] = $app_strings['LBL_TYPE']; - $header[] = $app_strings['LBL_ACTION']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - if(trim($row['activitytype']) == 'Notes') - { - $module = 'Notes'; - $editaction = 'EditView'; - $deleteaction = 'Delete'; - } - elseif($row['activitytype'] == 'Attachments') - { - $module = 'uploads'; - $editaction = 'upload'; - $deleteaction = 'deleteattachments'; - } - if($row['createdtime'] != '0000-00-00 00:00:00') - { - $created_arr = explode(" ",getDisplayDate($row['createdtime'])); - $created_date = $created_arr[0]; - $created_time = substr($created_arr[1],0,5); - } - else - { - $created_date = ''; - $created_time = ''; - } - - $entries[] = $created_date; - if($module == 'Notes') - { - $entries[] = ''.$row['title'].''; - } - elseif($module == 'uploads') - { - $entries[] = ""; - } - - if(strlen($row['description']) > 40) - { - $row['description'] = substr($row['description'],0,40).'...'; - } - $entries[] = nl2br($row['description']); - $attachmentname = ltrim($row['filename'],$row['attachmentsid'].'_');//explode('_',$row['filename'],2); - - $entries[] = ''.$attachmentname.''; - - $entries[] = $row['activitytype']; - - $del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&return_id='.$_REQUEST["record"]; - - if($module == 'Notes') - { - $edit_param = 'index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&filename='.$row['filename'].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"]; - - $entries[] .= ''.$app_strings['LNK_EDIT'].' | '.$app_strings['LNK_DELETE'].''; - } - else - { - $entries[] = ''.$app_strings['LNK_DELETE'].''; - } - $entries_list[] = $entries; - } - - if($entries_list !='') - $return_data = array('header'=>$header,'entries'=>$entries_list); - $log->debug("Exiting getAttachmentsAndNotes method ..."); - return $return_data; - -} - -/** Function to get related list entries in detailed array format - * @param $parentmodule -- parentmodulename:: Type string - * @param $query -- query:: Type string - * @param $id -- id:: Type string - * @returns $return_data -- return data:: Type string array - * - */ - -function getHistory($parentmodule,$query,$id) -{ - global $log; - $log->debug("Entering getHistory(".$parentmodule.",".$query.",".$id.") method ..."); - $parentaction = $_REQUEST['action']; - global $theme; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - require_once ($theme_path."layout_utils.php"); - - global $adb; - global $mod_strings; - global $app_strings; - - //Appending the security parameter - global $current_user; - $rel_tab_id = getTabid("Calendar"); - - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - $tab_id=getTabid('Calendar'); - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) - { - $sec_parameter=getListViewSecurityParameter('Calendar'); - $query .= ' '.$sec_parameter; - - } - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - if($noofrows == 0) - { - //There is no entries for history - } - else - { - //Form the header columns - $header[] = $app_strings['LBL_TYPE']; - $header[] = $app_strings['LBL_SUBJECT']; - $header[] = $app_strings['LBL_RELATED_TO']; - $header[] = $app_strings['LBL_START_DATE']." & ".$app_strings['LBL_TIME']; - $header[] = $app_strings['LBL_END_DATE']." & ".$app_strings['LBL_TIME']; - //$header[] = $app_strings['LBL_DESCRIPTION']; - $header[] = $app_strings['LBL_ACTION']; - $header[] = $app_strings['LBL_ASSIGNED_TO']; - - $i=1; - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - if($row['activitytype'] == 'Task') - { - $activitymode = 'Task'; - $icon = 'Tasks.gif'; - $status = $row['status']; - } - elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting') - { - $activitymode = 'Events'; - $icon = 'Activities.gif'; - $status = $row['eventstatus']; - } - - $entries[] = $row['activitytype']; - - $activity = ''.$row['subject'].''; - $entries[] = $activity; - - $parentname = getRelatedTo('Calendar',$result,$i-1); - $entries[] = $parentname; - - $entries[] = $row['date_start']." ".$row['time_start']; - $entries[] = $row['due_date']." ".$row['time_end']; - - //$entries[] = nl2br($row['description']); - - if(isPermitted("Calendar",1,$row["activityid"]) == 'yes') - { - $list .= ''.$app_strings['LNK_EDIT'].''; - - } - - $entries[] = $status; - - if($row['user_name']==NULL && $row['groupname']!=NULL) - { - $entries[] = $row['groupname']; - } - else - { - $entries[] = $row['user_name']; - - } - - if(isPermitted("Calendar",2,$row["activityid"]) == 'yes') - { - $list .= ''.$app_strings['LNK_DELETE'].''; - } - - $i++; - $entries_list[] = $entries; - } - - $return_data = array('header'=>$header,'entries'=>$entries_list); - $log->debug("Exiting getHistory method ..."); - return $return_data; - } -} - -/** Function to display the Products which are related to the PriceBook - * @param string $query - query to get the list of products which are related to the current PriceBook - * @param object $focus - PriceBook object which contains all the information of the current PriceBook - * @param string $returnset - return_module, return_action and return_id which are sequenced with & to pass to the URL which is optional - * return array $return_data which will be formed like array('header'=>$header,'entries'=>$entries_list) where as $header contains all the header columns and $entries_list will contain all the Product entries - */ -function getPriceBookRelatedProducts($query,$focus,$returnset='') -{ - global $log; - $log->debug("Entering getPriceBookRelatedProducts(".$query.",".$focus.",".$returnset.") method ..."); - - global $adb; - global $app_strings; - global $mod_strings; - global $current_language; - $current_module_strings = return_module_language($current_language, 'PriceBook'); - - global $list_max_entries_per_page; - global $urlPrefix; - - global $theme; - $pricebook_id = $_REQUEST['record']; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - require_once($theme_path.'layout_utils.php'); - - //Retreive the list from Database - $list_result = $adb->query($query); - $num_rows = $adb->num_rows($list_result); - - $header=array(); - $header[]=$mod_strings['LBL_LIST_PRODUCT_NAME']; - $header[]=$mod_strings['LBL_PRODUCT_CODE']; - $header[]=$mod_strings['LBL_PRODUCT_UNIT_PRICE']; - $header[]=$mod_strings['LBL_PB_LIST_PRICE']; - $header[]=$mod_strings['LBL_ACTION']; - - for($i=0; $i<$num_rows; $i++) - { - $entity_id = $adb->query_result($list_result,$i,"crmid"); - - $unit_price = $adb->query_result($list_result,$i,"unit_price"); - $listprice = $adb->query_result($list_result,$i,"listprice"); - $field_name=$entity_id."_listprice"; - - $entries = Array(); - $entries[] = $adb->query_result($list_result,$i,"productname"); - $entries[] = $adb->query_result($list_result,$i,"productcode"); - $entries[] = $unit_price; - $entries[] = $listprice; - $entries[] = ''.$app_strings[ | '.$app_strings['; - - $entries_list[] = $entries; - } - if($num_rows>0) - { - $return_data = array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting getPriceBookRelatedProducts method ..."); - return $return_data; - } -} - -?> +debug("Entering GetRelatedList(".$module.",".$relatedmodule.",".$focus.",".$query.",".$button.",".$returnset.",".$edit_val.",".$del_val.") method ..."); + + require_once('Smarty_setup.php'); + require_once("data/Tracker.php"); + require_once('include/database/PearDatabase.php'); + + global $adb; + global $app_strings; + global $current_language; + + $current_module_strings = return_module_language($current_language, $module); + + global $list_max_entries_per_page; + global $urlPrefix; + + + global $currentModule; + global $theme; + global $theme_path; + global $theme_path; + global $mod_strings; + // focus_list is the means of passing data to a ListView. + global $focus_list; + $smarty = new vtigerCRM_Smarty; + if (!isset($where)) $where = ""; + + + $button = '
'.$button.'
'; + + // Added to have Purchase Order as form Title + if($relatedmodule == 'Orders') + { + $smarty->assign('ADDBUTTON',get_form_header($app_strings['PurchaseOrder'],$button, false)); + } + else + { + $smarty->assign('ADDBUTTON',get_form_header($app_strings[$relatedmodule],$button, false)); + } + + require_once('themes/'.$theme.'/layout_utils.php'); + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + $smarty->assign("MOD", $mod_strings); + $smarty->assign("APP", $app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + $smarty->assign("MODULE",$relatedmodule); + + + //Retreive the list from Database + //$query = getListQuery("Accounts"); + + //echo '
*****************'.$relatedmodule.' ***************'; + //Appending the security parameter + if($relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook' && $relatedmodule != 'Vendors') //Security fix by Don + { + global $current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id=getTabid($relatedmodule); + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter($relatedmodule); + $query .= ' '.$sec_parameter; + + } + } + + + if(isset($where) && $where != '') + { + $query .= ' and '.$where; + } + + if(!$_SESSION['rlvs'][$module][$relatedmodule]) + { + $modObj = new ListViewSession(); + $modObj->sortby = $focus->default_order_by; + $modObj->sorder = $focus->default_sort_order; + $_SESSION['rlvs'][$module][$relatedmodule] = get_object_vars($modObj); + } + if(isset($_REQUEST['relmodule']) && ($_REQUEST['relmodule'] == $relatedmodule)) + { + if(method_exists($focus,getSortOrder)) + $sorder = $focus->getSortOrder(); + if(method_exists($focus,getOrderBy)) + $order_by = $focus->getOrderBy(); + + if(isset($order_by) && $order_by != '') + { + $_SESSION['rlvs'][$module][$relatedmodule]['sorder'] = $sorder; + $_SESSION['rlvs'][$module][$relatedmodule]['sortby'] = $order_by; + } + + } + elseif($_SESSION['rlvs'][$module][$relatedmodule]) + { + $sorder = $_SESSION['rlvs'][$module][$relatedmodule]['sorder']; + $order_by = $_SESSION['rlvs'][$module][$relatedmodule]['sortby']; + } + else + { + $order_by = $focus->default_order_by; + $sorder = $focus->default_sort_order; + } + //Added by Don for AssignedTo ordering issue in Related Lists + $query_order_by = $order_by; + if($order_by == 'smownerid') + { + $query_order_by = 'user_name'; + } + $query .= ' ORDER BY '.$query_order_by.' '.$sorder; + $url_qry .="&order_by=".$order_by; + //Added for PHP version less than 5 + if (!function_exists("stripos")) + { + function stripos($query,$needle) + { + return strpos(strtolower($query),strtolower($needle)); + } + } + + //Retreiving the no of rows + $count_query = "select count(*) as count ".substr($query, stripos($query,'from'),strlen($query)); + $count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER BY'))); + $noofrows = $adb->query_result($count_result,0,"count"); + + //Setting Listview session object while sorting/pagination + if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='' && $_REQUEST['relmodule'] == $relatedmodule) + { + $relmodule = $_REQUEST['relmodule']; + if($_SESSION['rlvs'][$module][$relmodule]) + { + setSessionVar($_SESSION['rlvs'][$module][$relmodule],$noofrows,$list_max_entries_per_page,$module,$relmodule); + } + } + $start = $_SESSION['rlvs'][$module][$relatedmodule]['start']; + + $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); + + $start_rec = $navigation_array['start']; + $end_rec = $navigation_array['end_val']; + + //limiting the query + if ($start_rec ==0) + $limit_start_rec = 0; + else + $limit_start_rec = $start_rec -1; + + if( $adb->dbType == "pgsql") + $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page); + else + $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page); + + //Retreive the List View Table Header + if($noofrows == 0) + { + $smarty->assign('NOENTRIES',$app_strings['LBL_NONE_SCHEDULED']); + } + else + { + $id = $_REQUEST['record']; + $listview_header = getListViewHeader($focus,$relatedmodule,'',$sorder,$order_by,$id,'',$module);//"Accounts"); + if ($noofrows > 15) + { + $smarty->assign('SCROLLSTART','
'); + $smarty->assign('SCROLLSTOP','
'); + } + $smarty->assign("LISTHEADER", $listview_header); + + if($module == 'PriceBook' && $relatedmodule == 'Products') + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val); + } + if($module == 'Products' && $relatedmodule == 'PriceBook') + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel'); + } + elseif($relatedmodule == 'SalesOrder') + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder'); + }else + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset); + } + + $navigationOutput = Array(); + $navigationOutput[] = $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; + $module_rel = $module.'&relmodule='.$relatedmodule.'&record='.$id; + $navigationOutput[] = getRelatedTableHeaderNavigation($navigation_array, $url_qry,$module_rel); + $related_entries = array('header'=>$listview_header,'entries'=>$listview_entries,'navigation'=>$navigationOutput); + + $log->debug("Exiting GetRelatedList method ..."); + return $related_entries; + } +} + +/** Function to get related list entries in detailed array format + * @param $parentmodule -- parentmodulename:: Type string + * @param $query -- query:: Type string + * @param $id -- id:: Type string + * @returns $entries_list -- entries list:: Type string array + * + */ + +function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='') +{ + global $log; + $log->debug("Entering getAttachmentsAndNotes(".$parentmodule.",".$query.",".$id.",".$sid.") method ..."); + global $theme; + + $list = ''; + + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + require_once ($theme_path."layout_utils.php"); + + global $adb; + global $mod_strings; + global $app_strings; + + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['LBL_CREATED']; + $header[] = $app_strings['LBL_SUBJECT']; + $header[] = $app_strings['LBL_DESCRIPTION']; + $header[] = $app_strings['LBL_ATTACHMENTS']; + $header[] = $app_strings['LBL_TYPE']; + $header[] = $app_strings['LBL_ACTION']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + if(trim($row['activitytype']) == 'Notes') + { + $module = 'Notes'; + $editaction = 'EditView'; + $deleteaction = 'Delete'; + } + elseif($row['activitytype'] == 'Attachments') + { + $module = 'uploads'; + $editaction = 'upload'; + $deleteaction = 'deleteattachments'; + } + if($row['createdtime'] != '0000-00-00 00:00:00') + { + $created_arr = explode(" ",getDisplayDate($row['createdtime'])); + $created_date = $created_arr[0]; + $created_time = substr($created_arr[1],0,5); + } + else + { + $created_date = ''; + $created_time = ''; + } + + $entries[] = $created_date; + if($module == 'Notes') + { + $entries[] = ''.$row['title'].''; + } + elseif($module == 'uploads') + { + $entries[] = ""; + } + + if(strlen($row['description']) > 40) + { + $row['description'] = substr($row['description'],0,40).'...'; + } + $entries[] = nl2br($row['description']); + $attachmentname = ltrim($row['filename'],$row['attachmentsid'].'_');//explode('_',$row['filename'],2); + + $entries[] = ''.$attachmentname.''; + + $entries[] = $row['activitytype']; + + $del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&return_id='.$_REQUEST["record"]; + + if($module == 'Notes') + { + $edit_param = 'index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&filename='.$row['filename'].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"]; + + $entries[] .= ''.$app_strings['LNK_EDIT'].' | '.$app_strings['LNK_DELETE'].''; + } + else + { + $entries[] = ''.$app_strings['LNK_DELETE'].''; + } + $entries_list[] = $entries; + } + + if($entries_list !='') + $return_data = array('header'=>$header,'entries'=>$entries_list); + $log->debug("Exiting getAttachmentsAndNotes method ..."); + return $return_data; + +} + +/** Function to get related list entries in detailed array format + * @param $parentmodule -- parentmodulename:: Type string + * @param $query -- query:: Type string + * @param $id -- id:: Type string + * @returns $return_data -- return data:: Type string array + * + */ + +function getHistory($parentmodule,$query,$id) +{ + global $log; + $log->debug("Entering getHistory(".$parentmodule.",".$query.",".$id.") method ..."); + $parentaction = $_REQUEST['action']; + global $theme; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + require_once ($theme_path."layout_utils.php"); + + global $adb; + global $mod_strings; + global $app_strings; + + //Appending the security parameter + global $current_user; + $rel_tab_id = getTabid("Calendar"); + + global $current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id=getTabid('Calendar'); + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter('Calendar'); + $query .= ' '.$sec_parameter; + + } + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + if($noofrows == 0) + { + //There is no entries for history + } + else + { + //Form the header columns + $header[] = $app_strings['LBL_TYPE']; + $header[] = $app_strings['LBL_SUBJECT']; + $header[] = $app_strings['LBL_RELATED_TO']; + $header[] = $app_strings['LBL_START_DATE']." & ".$app_strings['LBL_TIME']; + $header[] = $app_strings['LBL_END_DATE']." & ".$app_strings['LBL_TIME']; + //$header[] = $app_strings['LBL_DESCRIPTION']; + $header[] = $app_strings['LBL_ACTION']; + $header[] = $app_strings['LBL_ASSIGNED_TO']; + + $i=1; + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + if($row['activitytype'] == 'Task') + { + $activitymode = 'Task'; + $icon = 'Tasks.gif'; + $status = $row['status']; + } + elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting') + { + $activitymode = 'Events'; + $icon = 'Activities.gif'; + $status = $row['eventstatus']; + } + + $entries[] = $row['activitytype']; + + $activity = ''.$row['subject'].''; + $entries[] = $activity; + + $parentname = getRelatedTo('Calendar',$result,$i-1); + $entries[] = $parentname; + + $entries[] = $row['date_start']." ".$row['time_start']; + $entries[] = $row['due_date']." ".$row['time_end']; + + //$entries[] = nl2br($row['description']); + + if(isPermitted("Calendar",1,$row["activityid"]) == 'yes') + { + $list .= ''.$app_strings['LNK_EDIT'].''; + + } + + $entries[] = $status; + + if($row['user_name']==NULL && $row['groupname']!=NULL) + { + $entries[] = $row['groupname']; + } + else + { + $entries[] = $row['user_name']; + + } + + if(isPermitted("Calendar",2,$row["activityid"]) == 'yes') + { + $list .= ''.$app_strings['LNK_DELETE'].''; + } + + $i++; + $entries_list[] = $entries; + } + + $return_data = array('header'=>$header,'entries'=>$entries_list); + $log->debug("Exiting getHistory method ..."); + return $return_data; + } +} + +/** Function to display the Products which are related to the PriceBook + * @param string $query - query to get the list of products which are related to the current PriceBook + * @param object $focus - PriceBook object which contains all the information of the current PriceBook + * @param string $returnset - return_module, return_action and return_id which are sequenced with & to pass to the URL which is optional + * return array $return_data which will be formed like array('header'=>$header,'entries'=>$entries_list) where as $header contains all the header columns and $entries_list will contain all the Product entries + */ +function getPriceBookRelatedProducts($query,$focus,$returnset='') +{ + global $log; + $log->debug("Entering getPriceBookRelatedProducts(".$query.",".$focus.",".$returnset.") method ..."); + + global $adb; + global $app_strings; + global $mod_strings; + global $current_language; + $current_module_strings = return_module_language($current_language, 'PriceBook'); + + global $list_max_entries_per_page; + global $urlPrefix; + + global $theme; + $pricebook_id = $_REQUEST['record']; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + require_once($theme_path.'layout_utils.php'); + + //Retreive the list from Database + $list_result = $adb->query($query); + $num_rows = $adb->num_rows($list_result); + + $header=array(); + $header[]=$mod_strings['LBL_LIST_PRODUCT_NAME']; + $header[]=$mod_strings['LBL_PRODUCT_CODE']; + $header[]=$mod_strings['LBL_PRODUCT_UNIT_PRICE']; + $header[]=$mod_strings['LBL_PB_LIST_PRICE']; + $header[]=$mod_strings['LBL_ACTION']; + + for($i=0; $i<$num_rows; $i++) + { + $entity_id = $adb->query_result($list_result,$i,"crmid"); + + $unit_price = $adb->query_result($list_result,$i,"unit_price"); + $listprice = $adb->query_result($list_result,$i,"listprice"); + $field_name=$entity_id."_listprice"; + + $entries = Array(); + $entries[] = $adb->query_result($list_result,$i,"productname"); + $entries[] = $adb->query_result($list_result,$i,"productcode"); + $entries[] = $unit_price; + $entries[] = $listprice; + $entries[] = ''.$app_strings[ | '.$app_strings['; + + $entries_list[] = $entries; + } + if($num_rows>0) + { + $return_data = array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting getPriceBookRelatedProducts method ..."); + return $return_data; + } +} + +?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:10:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:10:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10354 - /vtigercrm/branches/5.0.3/modules/Leads/ListView.php Message-ID: <20070306071038.949F678D956@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 00:10:25 2007 New Revision: 10354 Log: fixes #3118 Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Leads/ListView.php Tue Mar 6 00:10:25 2007 @@ -166,7 +166,7 @@ $query .= ' and '.$where; } - +/* if(isset($order_by) && $order_by != '') { $tablename = getTableNameForField('Leads',$order_by); @@ -177,7 +177,24 @@ $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; } - +*/ +if(isset($order_by) && $order_by != '') +{ + if($order_by == 'smownerid') + { + $query .= ' ORDER BY user_name '.$sorder; + } + else + { + $tablename = getTableNameForField('Leads',$order_by); + $tablename = (($tablename != '')?($tablename."."):''); + if( $adb->dbType == "pgsql") + $query .= ' GROUP BY '.$tablename.$order_by; + + + $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; + } +} //Retreiving the no of rows $count_result = $adb->query( mkCountQuery( $query)); $noofrows = $adb->query_result($count_result,0,"count"); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:13:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:13:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10355 - /vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php Message-ID: <20070306071317.0CA0078D956@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 00:12:35 2007 New Revision: 10355 Log: fixes #3118 Modified: vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php Tue Mar 6 00:12:35 2007 @@ -133,8 +133,8 @@ if($order_by == 'smownerid') { if( $adb->dbType == "pgsql") - $list_query .= ' GROUP BY vtiger_users.user_name'; - $list_query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $list_query .= ' GROUP BY user_name'; + $list_query .= ' ORDER BY user_name '.$sorder; } else { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:49:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:49:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10356 - in /vtigercrm/branches/5.0.3: install/ modules/Calendar/ modules/Campaigns/ modules/Dashboard/ modules/Home/ modules/Users/ modules/Webmails/ modules/uploads/ Message-ID: <20070306074926.6EB5178D97D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 6 00:49:09 2007 New Revision: 10356 Log: short tags has been removed. Fixes #3076 --Minnie Modified: vtigercrm/branches/5.0.3/install/3confirmConfig.php vtigercrm/branches/5.0.3/install/5createTables.php vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome.php vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.3/modules/Users/about_us.php vtigercrm/branches/5.0.3/modules/Webmails/dlAttachments.php vtigercrm/branches/5.0.3/modules/uploads/upload.php Modified: vtigercrm/branches/5.0.3/install/3confirmConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/3confirmConfig.php (original) +++ vtigercrm/branches/5.0.3/install/3confirmConfig.php Tue Mar 6 00:49:09 2007 @@ -184,7 +184,7 @@ -

+

Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 6 00:49:09 2007 @@ -127,8 +127,8 @@
    -
  • Your install.php file has been renamed to install.php.txt. -
  • Your install folder too has been renamed to install/. +
  • Your install.php file has been renamed to install.php.txt. +
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2.
Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php Tue Mar 6 00:49:09 2007 @@ -21,9 +21,9 @@ ?>
- +
- +
@@ -38,7 +38,7 @@ - + @@ -46,12 +46,12 @@ - +
- + - + - + - +
-
- start_hour != ''){?> checked onClick="enableCalstarttime();">  - start_hour != ''){?> checked onClick="enableCalstarttime();">  +
- hour_format == '24'){?> checked value="24">  + hour_format == '24'){?> checked value="24"> 
-
-

+
+

@@ -162,8 +162,8 @@
-    - +    +
Modified: vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php Tue Mar 6 00:49:09 2007 @@ -33,7 +33,7 @@ ?>
1  
@@ -68,7 +68,7 @@
@@ -105,7 +105,7 @@ - + @@ -140,7 +140,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php Tue Mar 6 00:49:09 2007 @@ -33,10 +33,10 @@ - + - +
1  
@@ -57,7 +57,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -105,7 +105,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php Tue Mar 6 00:49:09 2007 @@ -139,7 +139,7 @@ //Added to display the Total record count ?>   -   +   @@ -66,8 +66,8 @@
-  " class="crmbutton small save" />   - " class="crmbutton small cancel" onclick="self.close();" /> +  " class="crmbutton small save" />   + " class="crmbutton small cancel" onclick="self.close();" />
From extremeprimetime at getpaidto.org Tue Mar 6 00:04:03 2007 From: extremeprimetime at getpaidto.org (Balding H. Chamberlain) Date: Tue, 06 Mar 2007 08:04:03 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7607924236.20070306080403@getpaidto.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070306/82713f2a/attachment-0001.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: nugget.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070306/82713f2a/nugget-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 01:37:57 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 09:37:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10357 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070306093757.D5A1978CAB0@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 02:37:46 2007 New Revision: 10357 Log: added links to forums and blogs Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 6 02:37:46 2007 @@ -130,6 +130,8 @@

  • Your install.php file has been renamed to install.php.txt.
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2. +
  • Talk to us at http://forums.vtiger.com +
  • Discuss with us at http://blogs.vtiger.com From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 01:59:35 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 09:59:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10358 - /vtigercrm/branches/5.0.3/modules/Webmails/body.php Message-ID: <20070306095935.4F8E878CAB0@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 02:59:26 2007 New Revision: 10358 Log: fixed the attachment issue Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Tue Mar 6 02:59:26 2007 @@ -17,10 +17,16 @@ if(!isset($_SESSION["authenticated_user_id"]) || $_SESSION["authenticated_user_id"] != $current_user->id) {echo "ajax failed";flush();exit();} $mailid=$_REQUEST["mailid"]; -if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") +{ + $mailbox=$_REQUEST["mailbox"]; +} +else +{ + $mailbox="INBOX"; +} $MailBox = new MailBox($mailbox); $email = new Webmails($MailBox->mbox,$mailid); - ?> -
    From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 06:20:45 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 13:20:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10410 - in /vtigercrm/branches/5.0.3/modules: Dashboard/HomepageDB.php Potentials/ListView.php Message-ID: <20070312132045.3D6F57C7F4D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 07:20:39 2007 New Revision: 10410 Log: Top potentials shows closed one in homepage dashboard. Fixes #2264 Modified: vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php vtigercrm/branches/5.0.3/modules/Potentials/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php Mon Mar 12 07:20:39 2007 @@ -10,9 +10,9 @@ ********************************************************************************/ require_once("modules/Dashboard/Entity_charts.php"); - global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings; + global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings,$app_strings; $type='recordsforuser'; - $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; + $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid left join vtiger_potential pot on pot.potentialid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (pot.sales_stage not in('".$app_strings['LBL_CLOSE_WON']."','".$app_strings['LBL_CLOSE_LOST']."') or pot.sales_stage is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; $graph_by="setype"; $graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name; $module="Home"; @@ -46,7 +46,7 @@ } else { - echo $mod_strings[LBL_NO_DATA]; + echo $mod_strings['LBL_NO_DATA']; } Modified: vtigercrm/branches/5.0.3/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Potentials/ListView.php Mon Mar 12 07:20:39 2007 @@ -26,7 +26,7 @@ require_once('include/DatabaseUtil.php'); -global $app_strings,$list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$mod_strings; $log = LoggerManager::getLogger('potential_list'); @@ -134,11 +134,12 @@ $list_query = getListQuery("Potentials"); } //<<<<<<<>>>>>>>> - if(isset($where) && $where != '') { if(isset($_REQUEST['from_dashboard']) && $_REQUEST['from_dashboard'] == 'true') - $list_query .= " AND vtiger_potential.sales_stage = 'Closed Won' AND ".$where; + $list_query .= " AND vtiger_potential.sales_stage = '".$mod_strings['Closed Won']."' AND ".$where; + elseif(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true') + $list_query .= " AND vtiger_potential.sales_stage not in( '".$mod_strings['Closed Won']."' , '".$mod_strings['Closed Lost']."' )AND ".$where; else $list_query .= " AND ".$where; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 08:05:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:05:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10411 - in /vtigercrm/branches/5.0.3: include/language/ install/ modules/Emails/ modules/Emails/language/ modules/Migration/DBChanges/ modules/Settings/ modules/Users/ Message-ID: <20070312150554.71ED078CD35@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:05:35 2007 New Revision: 10411 Log: changes made for language support in js alert. --Minnie Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/install/2setConfig.php vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Emails/mailbox.php vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php vtigercrm/branches/5.0.3/modules/Users/Forms.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Mar 12 09:05:35 2007 @@ -692,6 +692,125 @@ 'Dear_Admin_tasks_not_been_completed' => 'Dear Admin,

    Please note that there are certain tasks in the system which have not been completed even after 24hours of their existence
    Thank You
    HelpDesk Team
    ', 'Too_many_pending_tickets' => 'Too many pending tickets', 'Dear_Admin_too_ many_tickets_pending' => 'Dear Admin,
    This is to bring to your notice that there are too many tickets pending. Kindly take the necessary action required for addressing the same

    Thanks and Regards,
    HelpDesk Team
    ', + +//Added for java script alerts +'DELETE_CONFIRMATION' => 'Are you sure you want to delete the selected ', +'SELECT_ATLEAST_ONE' => 'Please select at least one entity', +'DELETING_ACCOUNT' => 'Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected ', +'DELETING_VENDOR' => 'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected ', +'PLEASE_SELECT_MAILID' => 'Please Select a mailid', +'OVERWRITE_EXISTING_ACCOUNT1' => 'Overwrite the existing address with this selected account(', +'OVERWRITE_EXISTING_ACCOUNT2' => ') address details?', +'MISSING_FIELDS' => 'Missing required fields:', +'NOT_ALLOWED_TO_EDIT' => 'you are not allowed to edit this field', +'COLUMNS_CANNOT_BE_EMPTY' => 'Selected Columns cannot be empty', +'CANNOT_BE_EMPTY' => ' cannot be empty', +'CANNOT_BE_NONE' => ' cannot be none', +'SERVERNAME_CANNOT_BE_EMPTY' => 'Server Name cannot be empty', +'ENTER_VALID' => 'Please enter a valid ', +'SHOULDBE_LESS' => ' should be less than ', +'SHOULDBE_LESS_EQUAL' => ' should be less than or equal to ', +'SHOULDBE_EQUAL' => ' should be equal to ', +'SHOULDBE_GREATER' => ' should be greater than ', +'SHOULDBE_GREATER_EQUAL' => ' should be greater than or equal to ', +'INVALID' => 'Invalid ', +'EXCEEDS_MAX' => ' exceeds the maximum limit ', +'OUT_OF_RANGE' => ' is out of range', +'SHOULDNOTBE_EQUAL' => ' should not be equal to ', +'PORTAL_PROVIDE_EMAILID' => 'Portal user should provide email Id for portal login', +'ADD_CONFIRMATION' => 'Are you sure you want to add the selected ', +'ACCOUNTNAME_CANNOT_EMPTY' => 'AccountName Cannot be Empty', +'CANT_SELECT_CONTACTS' => "You can\'t select related contacts from Lead", +'LBL_THIS' => 'This ', +'DOESNOT_HAVE_MAILIDS' => " doesn\'t have any mail ids", +'DOESNOT_HAVE_AN_MAILID' => '" '."doesn\'t have an Email Id", +'ARE_YOU_SURE' => 'Are you sure?', +'MISSING_REPORT_NAME' => 'Missing Report Name', +'REPORT_NAME_EXISTS' => 'Report name already exists, try again...', +'WANT_TO_CHANGE_CONTACT_ADDR' => 'Do you want to change the addresses of the Contacts related to this Account?', +'SURE_TO_DELETE' => 'Are you sure you want to delete ?', +'RECORDS' => ' records ?', +'NO_PRODUCT_SELECTED' => 'No product is selected. Select at least one Product', +'VALID_FINAL_PERCENT' => 'Enter valid Final Discount Percentage', +'VALID_FINAL_AMOUNT' => 'Enter valid Final Discount Amount', +'VALID_SHIPPING_CHARGE' => 'Enter a valid Shipping & Handling charge', +'VALID_ADJUSTMENT' => 'Enter a valid Adjustment', +'SELECTED_MORE_THAN_ONCE' => 'You have selected the following product(s) more than once.', +'WANT_TO_CONTINUE' => 'Do you want to Continue?', +'ENTER_VALID_TAX' => 'Please enter Valid TAX value', +'VALID_TAX_NAME' => 'Enter valid Tax Name', +'CORRECT_TAX_VALUE' => 'Enter Correct Tax Value', +'ENTER_POSITIVE_VALUE' => 'Please enter positive value', +'LABEL_SHOULDNOT_EMPTY' => 'The tax label name should not be empty', +'NOT_VALID_ENTRY' => 'is not a valid entry. Please enter correct value', +'VALID_DISCOUNT_PERCENT' => 'Enter a valid Discount percentage', +'VALID_DISCOUNT_AMOUNT' => 'Enter a valid Discount Amount', +'SELECT_TEMPLATE_TO_MERGE' => 'Please select a template to merge', +'MISSING_REQUIRED_FIELDS' => 'Missing required fields: ', +'READONLY' => "it\'s readonly", +'SELECT_ATLEAST_ONE_USER' => 'Please select at least one user', +'DISABLE_SHARING_CONFIRMATION' => 'Are you sure you want to disable sharing for selected ', +'USERS' => ' user(s) ?', +'ENDTIME_GREATER_THAN_STARTTIME' => 'End Time should be greater than Start Time ', +'FOLLOWUPTIME_GREATER_THAN_STARTTIME' => 'Followup Time should be greater than End Time ', +'MISSING_EVENT_NAME' => 'Missing Event Name', +'EVENT_TYPE_NOT_SELECTED' => 'Event Type is not selected', +'OPPORTUNITYNAME_CANNOT_BE_EMPTY' => 'Opportunity Name field cannot be empty', +'CLOSEDATE_CANNOT_BE_EMPTY' => 'Close Date field cannot be empty', +'SITEURL_CANNOT_BE_EMPTY' => 'Site Url cannot be empty', +'SITENAME_CANNOT_BE_EMPTY' => 'Site Name cannot be empty', +'LISTPRICE_CANNOT_BE_EMPTY' => 'List Price cannot be empty', +'INVALID_LIST_PRICE' => 'Invalid List Price', +'PROBLEM_ACCESSSING_URL' => 'Problem accessing url: ', +'CODE' => ' Code: ', +'WISH_TO_QUALIFY_MAIL_AS_CONTACT' => 'Are you sure you wish to Qualify this Mail as Contact?', +'SELECT_ATLEAST_ONEMSG_TO_DEL' => 'Please select at least one message to delete', +'ERROR' => 'Error', +'FIELD_TYPE_NOT_SELECTED' => 'Field Type is not selected', +'SPECIAL_CHARACTERS_NOT_ALLOWED' => 'Special characters are not allowed in Label field', +'PICKLIST_CANNOT_BE_EMPTY' => 'Picklist value cannot be empty', +'DUPLICATE_VALUES_FOUND' => 'Duplicate Values found', +'DUPLICATE_MAPPING_ACCOUNTS' => 'Duplicate mapping for accounts!!', +'DUPLICATE_MAPPING_CONTACTS' => 'Duplicate mapping for Contacts!!', +'DUPLICATE_MAPPING_POTENTIAL' => 'Duplicate mapping for Potential!!', +'ERROR_WHILE_EDITING' => 'Error while Editing', +'PLEASE_ENTER_TAG' => 'Please enter a tag', +'PLEASE_SELECT_PRODUCT' => 'Please select a Product', +'DUPLICATE_ENTRIES_FOUND' => "Duplicate entries found for the value \'", +'ROLE_SHOULDHAVE_INFO' => 'Role should have at least one profile', +'ENTER_VALID_CONVERSION_RATE' => 'Enter valid Conversion Rate', +'GROUPNAME_CANNNOT_BE_NONE' => 'Group Name cannot be none', +'GROUP_SHOULDHAVE_ONEMEMBER_INFO' => 'Group should have at least one member. Select a member to the group', +'MAP_DELETED_INFO' => 'This map has been deleted. You cannot use this map again', +'MUSTHAVE_ONE_REQUIREDFIELD' => 'Must have one Required field to be selected\n', +'COLUMNS_CANNOT_BE_DUPLICATED' => 'Columns cannot be duplicated', +'SPECIFY_ROLE_INFO' => 'Specfiy the Role to Transfer Existing Roles Users', +'FOLDERNAME_CANNOT_BE_EMPTY' => 'The Folder name cannot be empty', +'FOLDER_NAME_ALREADY_EXISTS' => 'Folder name already exists, try again...', +'SELECT_ATLEAST_ONE_REPORT' => 'Please select at least one Report', +'DELETE_FOLDER_CONFIRMATION' => "Are you sure you want to delete the folder \'", +'DELETE_REPORT_CONFIRMATION' => 'Are you sure you want to delete this report ?', +'MOVE_REPORT_CONFIRMATION' => 'Are you sure you want to move this report to ', +'FOLDER' => ' folder ?', +'ACCOUNT_ACCESS_INFO' => 'Potentials, HelpDesk, Quotes, SalesOrder & Invoice Access must be set to Private when the Account Access is set to Private', +'PROFILENAME_CANNOT_BE_EMPTY' => 'Profile Name Cannot be empty', +'PROFILE_DETAILS_UPDATED' => 'Profile Details are updated', +'CURRENCY_CHANGE_INFO' => 'Currency Changes has been made Successfully', +'CURRENCY_CONVERSION_INFO' => 'Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate.', +'THE_EMAILID' => "The email id \'", +'EMAIL_FIELD_INVALID' => "\' in the email field is invalid", +'SELECT_VALID_IMAGE' => 'Please Select a Valid Image', +'EMAIL_FILED_IS' => "\' in the email field is ", +'OTHER_EMAIL_FILED_IS' => "\' in other email field is ", +'YAHOO_EMAIL_FILED_IS' => "\' in yahoo email field is ", +'INVALID_ADD_IN_EMAILFIELD' => '\" not a valid email address in Email field', +'INVALID_ADD_IN_OTHER_EMAILFIELD' => '\" not a valid email address in Other Email field', +'ENTER_VALID_4DIGIT_YEAR' => 'Please enter a valid 4 digit year between ', +'AND' => ' and ', +'DATABASE_CHANGE_CONFIRMATION' => 'Are you sure to apply the Database Changes from ', +'TO' => ' to ', +'DELETE_RSSFEED_CONFIRMATION' => 'Are you sure to delete the rss feed?', + ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Mon Mar 12 09:05:35 2007 @@ -281,11 +281,11 @@ // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) { - alert("The email id '"+form.admin_email.value+"' in the email field is invalid"); + alert(alert_arr.THE_EMAILID+form.admin_email.value+alert_arr.EMAIL_FIELD_INVALID); form.admin_email.focus(); exit(); } Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Mon Mar 12 09:05:35 2007 @@ -164,6 +164,11 @@ 'LBL_CONF_MAILSERVER_ERROR'=>'Please configure your outgoing mailserver under Settings ---> Outgoing Server link', 'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Email Client', 'LBL_MAILSELECT_INFO3'=>'You don\'t have permission to view email id(s) of the selected Record(s).', +//Added for script alerts +'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f +or an update!', +'DOWNLOAD_CONFIRAMATION' => 'Do you want to download the file ?', + ); ?> Modified: vtigercrm/branches/5.0.3/modules/Emails/mailbox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mailbox.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mailbox.php Mon Mar 12 09:05:35 2007 @@ -73,9 +73,9 @@ function handleFile(nr) { if (b != "ie") { - alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!"); + alert('.$mod_strings['FEATURE_AVAILABLE_INFO'].'); } else { - check = confirm("Do you want to download the file ?"); + check = confirm('.$mod_strings['DOWNLOAD_CONFIRAMATION'].'); if (check) { setTimeout("this.location.reload()",8000); location.href="index.php?action=gotodownload&module=Emails&download=1&file="+ nr +"&msgno='.$msg.'"; } else { Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php Mon Mar 12 09:05:35 2007 @@ -4060,10 +4060,10 @@ function ajaxSaveResponse(response) { //alert(response.responseText); - alert("Currency Changes has been made Successfully"); + alert(alert_arr.CURRENCY_CHANGE_INFO); } - if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate.")) + if(!confirm(alert_arr.CURRENCY_CONVERSION_INFO)) { getConversionRate(''); } Modified: vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php Mon Mar 12 09:05:35 2007 @@ -131,7 +131,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -153,7 +153,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } Modified: vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php Mon Mar 12 09:05:35 2007 @@ -39,6 +39,7 @@ $smarty->assign("UMOD", $mod_strings); global $current_language; $smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("APP", $app_strings); $smarty->assign("MOD", $smod_strings); $smarty->assign("MODULE", 'Settings'); $smarty->assign("IMAGE_PATH", $image_path); Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Mon Mar 12 09:05:35 2007 @@ -135,14 +135,14 @@ include('themes/'.$theme.'/header.php'); include "upload.php"; // $errormessage = "Kindly give a valid file for upload!
    " ; - echo ""; + echo ""; } else if($errorCode == 2) { include('themes/'.$theme.'/header.php'); include "upload.php"; //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; - echo ""; + echo ""; //echo $errormessage; //echo $errorCode; } @@ -150,7 +150,7 @@ { include('themes/'.$theme.'/header.php'); include "upload.php"; - echo ""; + echo ""; } Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Mon Mar 12 09:05:35 2007 @@ -41,6 +41,11 @@ $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; $lbl_user_image=$mod_strings['User Image']; +$err_select_valid_image = $app_strings['SELECT_VALID_IMAGE']; +$the_emailid = $app_strings['THE_EMAILID']; +$email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address; +$other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address; +$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_email_address; $the_script = << Author: saraj Date: Mon Mar 12 09:17:26 2007 New Revision: 10412 Log: non admin user unable to select users during mail compose - fixed. Fixes #3195 Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon Mar 12 09:17:26 2007 @@ -253,7 +253,7 @@ $j++; } $field_list .=')'; - if($is_admin==false) + if($is_admin==false || $module != 'Users') { $profileList = getCurrentUserProfileList(); $query = "SELECT DISTINCT vtiger_field.fieldname @@ -284,7 +284,7 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin==false) + /* if($is_admin==false) { $profileList = getCurrentUserProfileList(); $query = "SELECT vtiger_profile2field.* @@ -300,9 +300,9 @@ AND vtiger_field.fieldname = '".$fieldname."'"; $result = $adb->query($query); - } - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + }*/ + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field) || $module == 'Users') { if(isset($focus->sortby_fields) && $focus->sortby_fields !='') @@ -824,7 +824,8 @@ $j++; } $field_list .=')'; - if($is_admin==false) + + if($is_admin==false || $module != 'Users') { $profileList = getCurrentUserProfileList(); $query = "SELECT DISTINCT vtiger_field.fieldname @@ -839,6 +840,7 @@ AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_field.fieldname IN ".$field_list; $result = $adb->query($query); + $field=Array(); for($k=0;$k < $adb->num_rows($result);$k++) { @@ -884,7 +886,9 @@ { $fieldname = $focus->search_fields_name[$name]; - if($is_admin==false) + /* + + if($is_admin==false && $module != 'Users') { $profileList = getCurrentUserProfileList(); $query = "SELECT vtiger_profile2field.* @@ -901,8 +905,8 @@ $result = $adb->query($query); } - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + */ + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field) || $module == 'Users') { if($fieldname == '') { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 08:18:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:18:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10413 - in /vtigercrm/branches/5.0.3/Smarty/templates: ./ Inventory/ Settings/ Message-ID: <20070312151811.6791F7C7F22@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:17:38 2007 New Revision: 10413 Log: changes made for language support in js alerts. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl vtigercrm/branches/5.0.3/Smarty/templates/Migration.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Mon Mar 12 09:17:38 2007 @@ -27,7 +27,7 @@ SaveTag('txtbox_tagfields','{$ID}','{$MODULE}'); else {ldelim} - alert("Please enter a tag"); + alert("{$APP.PLEASE_ENTER_TAG}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl Mon Mar 12 09:17:38 2007 @@ -31,12 +31,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -46,7 +46,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -79,12 +79,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -95,7 +95,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl Mon Mar 12 09:17:38 2007 @@ -311,7 +311,7 @@ // Here we decide whether to submit the form. if (isError == true) {ldelim} - alert("Missing required fields: " + errorMessage); + alert("{$APP.MISSING_FIELDS}" + errorMessage); return false; {rdelim} return true; Modified: vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl Mon Mar 12 09:17:38 2007 @@ -131,8 +131,10 @@ if(isNaN(getObj("conversion_rate").value) || eval(getObj("conversion_rate") .value) == 0) { - alert("Enter valid Conversion Rate") + {/literal} + alert("{$APP.ENTER_VALID_CONVERSION_RATE}") return false + {literal} } return true; Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl Mon Mar 12 09:17:38 2007 @@ -29,7 +29,9 @@ {literal} function deleteCustomField(id, fld_module, colName, uitype) { - if(confirm("Are you sure?")) + {/literal} + if(confirm("{$APP.ARE_YOU_SURE}")) + {literal} { document.form.action="index.php?module=Settings&action=DeleteCustomField&fld_module="+fld_module+"&fld_id="+id+"&colName="+colName+"&uitype="+uitype document.form.submit() Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Mon Mar 12 09:17:38 2007 @@ -92,7 +92,7 @@ {rdelim} if(mandatorycheck == false) {ldelim} - alert("Must have one Required field to be selected\n"+showvalues); + alert("{$APP.MUSTHAVE_ONE_REQUIREDFIELD}"+showvalues); {rdelim} return false; @@ -608,9 +608,11 @@ selected_cv_icolumnvalue = $(cvselect_array[iloop]).options[$(cvselect_array[iloop]).selectedIndex].value; if(selected_cv_columnvalue == selected_cv_icolumnvalue) { - alert('Columns cannot be duplicated'); - $(cvselect_array[iloop]).selectedIndex = 0; - return false; + {/literal} + alert('{$APP.COLUMNS_CANNOT_BE_DUPLICATED}'); + $(cvselect_array[iloop]).selectedIndex = 0; + return false; + {literal} } } Modified: vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl Mon Mar 12 09:17:38 2007 @@ -83,8 +83,10 @@ { if(document.getElementById('role_name').value == '') { - alert('Specfiy the Role to Transfer Existing Roles Users'); - return false; + {/literal} + alert('{$APP.SPECIFY_ROLE_INFO}'); + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Mar 12 09:17:38 2007 @@ -50,7 +50,7 @@ SaveTag('txtbox_tagfields','{$ID}','{$MODULE}'); else {ldelim} - alert("Please enter a tag"); + alert("{$APP.PLEASE_ENTER_TAG}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Mon Mar 12 09:17:38 2007 @@ -693,7 +693,7 @@ {ldelim} temp= /^\d+\.\d+$/.test(document.getElementById(txtObj).value); if(temp == false) - alert("Please enter Valid TAX value"); + alert("{$APP.ENTER_VALID_TAX}"); {rdelim} function delimage(id) @@ -708,7 +708,7 @@ if(response.responseText.indexOf("SUCESS")>-1) $("replaceimage").innerHTML='{$APP.LBL_IMAGE_DELETED}'; else - alert("Error while Deleting") + alert("{$APP.ERROR_WHILE_EDITING}") {rdelim} {rdelim} ); Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl Mon Mar 12 09:17:38 2007 @@ -136,7 +136,7 @@ if(trim(document.newGroupForm.groupName.value) == "") {ldelim} - alert('Group Name cannot be none'); + alert('{$APP.GROUPNAME_CANNNOT_BE_NONE}'); return false; {rdelim} @@ -144,7 +144,7 @@ if(document.newGroupForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {ldelim} - alert('Group should have at least one member. Select a member to the group'); + alert('{$APP.GROUP_SHOULDHAVE_ONEMEMBER_INFO}'); return false; {rdelim} dup_validation(); Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Mon Mar 12 09:17:38 2007 @@ -465,6 +465,92 @@
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Mar 12 09:17:38 2007 @@ -25,7 +25,7 @@ SaveTag('txtbox_tagfields','{$ID}','{$MODULE}'); else {ldelim} - alert("Please enter a tag"); + alert("{$APP.PLEASE_ENTER_TAG}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl Mon Mar 12 09:17:38 2007 @@ -28,7 +28,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl Mon Mar 12 09:17:38 2007 @@ -29,7 +29,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Mon Mar 12 09:17:38 2007 @@ -62,8 +62,7 @@ else {ldelim} document.massdelete.profile.style.display="none"; - alert("Please select at least one entity"); - + alert("{$APP.SELECT_ATLEAST_ONE}"); return false; {rdelim} {rdelim} @@ -84,11 +83,11 @@ {rdelim} else {ldelim} - alert("Please select at least one entity"); + alert("{$APP.SELECT_ATLEAST_ONE}"); return false; {rdelim} {rdelim} - if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) + if(confirm("{$APP.DELETE_CONFIRMATION}"+xx+"{$APP.RECORDS}")) {ldelim} document.massdelete.action="index.php?module=Settings&action=deleteemailtemplate&return_module=Settings&return_action=listemailtemplates"; {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl Mon Mar 12 09:17:38 2007 @@ -83,7 +83,7 @@ Modified: vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Mon Mar 12 09:17:38 2007 @@ -44,7 +44,7 @@ if(document.newRoleForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {ldelim} - alert('Role should have at least one profile'); + alert('{$APP.ROLE_SHOULDHAVE_INFO}'); return false; {rdelim} dup_validation(); Modified: vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Mon Mar 12 09:17:38 2007 @@ -34,8 +34,10 @@ function DeleteRssFeeds(id) { if(id != '') - { - if(confirm('Are you sure to delete the rss feed?')) + { + {/literal} + if(confirm('{$APP.DELETE_RSSFEED_CONFIRMATION}')) + {literal} { show('status'); var feed = 'feed_'+id; Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl Mon Mar 12 09:17:38 2007 @@ -143,16 +143,19 @@ { if (form.organization_name.value == "" ) { - alert(company_name +" cannot be none"); - form.organization_name.focus(); - return false; - + {/literal} + alert(company_name +"{$APP.CANNOT_BE_NONE}"); + form.organization_name.focus(); + return false; + {literal} } else if (form.organization_name.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert(company_name +" cannot be empty"); - form.organization_name.focus(); - return false; + {/literal} + alert(company_name +"{$APP.CANNOT_BE_EMPTY}"); + form.organization_name.focus(); + return false; + {literal} } else { Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl Mon Mar 12 09:17:38 2007 @@ -164,8 +164,10 @@ { if(form.server.value =='') { - alert("Server Name cannot be empty") - return false; + {/literal} + alert("{$APP.SERVERNAME_CANNOT_BE_EMPTY}") + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl Mon Mar 12 09:17:38 2007 @@ -62,9 +62,11 @@ //empty check validation for (i=0;i Author: saraj Date: Mon Mar 12 09:21:09 2007 New Revision: 10414 Log: Report name not displayed. Fixes #3182 Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Mon Mar 12 09:21:09 2007 @@ -173,7 +173,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $mod_strings[$reportfldrow["foldername"]]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]); $returndata[] = $details; @@ -186,7 +186,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $mod_strings[$reportfldrow["foldername"]]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $returndata[] = $details; }while($reportfldrow = $adb->fetch_array($result)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 08:26:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:26:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10415 - in /vtigercrm/branches/5.0.3/include/js: Inventory.js ListView.js Mail.js Merge.js QuickCreate.js ajax.js customview.js dtlviewajax.js general.js Message-ID: <20070312152634.78E417C7F22@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:26:20 2007 New Revision: 10415 Log: changes made for language support in js alerts. --Minnie Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js vtigercrm/branches/5.0.3/include/js/ListView.js vtigercrm/branches/5.0.3/include/js/Mail.js vtigercrm/branches/5.0.3/include/js/Merge.js vtigercrm/branches/5.0.3/include/js/QuickCreate.js vtigercrm/branches/5.0.3/include/js/ajax.js vtigercrm/branches/5.0.3/include/js/customview.js vtigercrm/branches/5.0.3/include/js/dtlviewajax.js vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Mon Mar 12 09:26:20 2007 @@ -230,7 +230,7 @@ if(max_row_count == 0) { - alert('No product is selected. Select at least one Product'); + alert(alert_arr.NO_PRODUCT_SELECTED); return false; } @@ -261,7 +261,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_percentage_final").value); if(!temp) { - alert("Enter valid Final Discount Percentage"); + alert(alert_arr.VALID_FINAL_PERCENT); return false; } } @@ -270,7 +270,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_amount_final").value); if(!temp) { - alert("Enter valid Final Discount Amount"); + alert(alert_arr.VALID_FINAL_AMOUNT); return false; } } @@ -279,7 +279,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("shipping_handling_charge").value); if(!temp) { - alert("Enter a valid Shipping & Handling charge"); + alert(alert_arr.VALID_SHIPPING_CHARGE); return false; } @@ -287,7 +287,7 @@ temp = /^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("adjustment").value) if(!temp) { - alert("Enter a valid Adjustment"); + alert(alert_arr.VALID_ADJUSTMENT); return false; } @@ -328,7 +328,7 @@ if(duplicate) { //alert("You have selected < "+duplicate_products+" > more than once in line items "+positions+".\n It is advisable to select the product just once but change the Qty. Thank You"); - if(!confirm("You have selected the following product(s) more than once. \n"+duplicate_products+"\n Do you want to Continue?")) + if(!confirm(alert_arr.SELECTED_MORE_THAN_ONCE+"\n"+duplicate_products+"\n "+alert_arr.WANT_TO_CONTINUE)) return false; } return true; @@ -346,7 +346,7 @@ { temp= /^\d+(\.\d\d*)*$/.test(document.getElementById(txtObj).value); if(temp == false) - alert("Please enter Valid TAX value"); + alert(alert_arr.ENTER_VALID_TAX); } function loadTaxes_Ajax(curr_row) @@ -406,12 +406,12 @@ { if(trim(document.getElementById(fieldname).value)== '') { - alert("Enter valid Tax Name"); + alert(alert_arr.VALID_TAX_NAME); return false; } if(trim(document.getElementById(fieldvalue).value)== '') { - alert("Enter Correct Tax Value"); + alert(alert_arr.CORRECT_TAX_VALUE); return false; } else @@ -419,7 +419,7 @@ var temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById(fieldvalue).value); if(!temp) { - alert("Please enter positive value"); + alert(alert_arr.ENTER_POSITIVE_VALUE); return false; } } @@ -450,7 +450,7 @@ if(document.getElementById(taxLabelPrefix+i).value.length == 0) { - alert("The tax label name should not be empty"); + alert(alert_arr.LABEL_SHOULDNOT_EMPTY); return false } @@ -458,7 +458,7 @@ var temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(taxval); if(!temp) { - alert("'"+taxval+"' is not a valid entry. Please enter correct value"); + alert("'"+taxval+"' "+alert_arr.NOT_VALID_ENTRY); return false; } } @@ -719,7 +719,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_percentage"+i).value); if(!temp) { - alert("Enter a valid Discount percentage"); + alert(alert_arr.VALID_DISCOUNT_PERCENT); return false; } } @@ -728,7 +728,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_amount"+i).value); if(!temp) { - alert("Enter a valid Discount Amount"); + alert(alert_arr.VALID_DISCOUNT_AMOUNT); return false; } } Modified: vtigercrm/branches/5.0.3/include/js/ListView.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ListView.js (original) +++ vtigercrm/branches/5.0.3/include/js/ListView.js Mon Mar 12 09:26:20 2007 @@ -29,7 +29,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } fnvshobj(obj,divid); @@ -69,15 +69,15 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } - var alert_str = "Are you sure you want to delete the selected "+xx+" records ?"; + var alert_str = alert_arr.DELETE + xx +alert_arr.RECORDS; if(module=="Accounts") - alert_str = "Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected "+xx+" records?"; + alert_str = alert_arr.DELETE_ACCOUNT +xx+alert_arr.RECORDS; else if(module=="Vendors") - alert_str = "Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected "+xx+" records?"; + alert_str = alert_arr.DELETE_VENDOR+xx+alert_arr.RECORDS; if(confirm(alert_str)) { Modified: vtigercrm/branches/5.0.3/include/js/Mail.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Mail.js (original) +++ vtigercrm/branches/5.0.3/include/js/Mail.js Mon Mar 12 09:26:20 2007 @@ -31,7 +31,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } allids = document.getElementById('idlist').value; @@ -63,7 +63,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } document.massdelete.action="index.php?module=CustomView&action=SendMailAction&return_module="+module+"&return_action=index&viewname="+viewid; @@ -79,7 +79,7 @@ window.close(); }else { - alert('"'+parentname+'" doesn\'t have an Email Id' ); + alert('"'+parentname+alert_arr.DOESNOT_HAVE_AN_MAILID); return false; } } @@ -111,7 +111,7 @@ } else { - alert('Please Select a mailid'); + alert(alert_arr.SELECT_MAILID); } } function sendmail(module,idstrings) Modified: vtigercrm/branches/5.0.3/include/js/Merge.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Merge.js (original) +++ vtigercrm/branches/5.0.3/include/js/Merge.js Mon Mar 12 09:26:20 2007 @@ -25,7 +25,7 @@ else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -47,7 +47,7 @@ else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -59,7 +59,7 @@ if(getObj('mergefile').value == '') { - alert("Please select a template to merge"); + alert(alert_arr.SELECT_TEMPLATE_TO_MERGE); return false; } document.massdelete.action="index.php?module="+module+"&action=Merge&return_module="+module+"&return_action=index"; Modified: vtigercrm/branches/5.0.3/include/js/QuickCreate.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/QuickCreate.js (original) +++ vtigercrm/branches/5.0.3/include/js/QuickCreate.js Mon Mar 12 09:26:20 2007 @@ -16,7 +16,7 @@ if (fldType=="text") { if (currObj.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert(fldLabel+" cannot be empty") + alert(fldLabel+alert_arr.CANNOT_BE_EMPTY) currObj.focus() @@ -30,7 +30,7 @@ } else { if (currObj.value == "" ) { - alert(fldLabel+" cannot be none") + alert(fldLabel+alert_arr.CANNOT_BE_NONE) return false @@ -73,7 +73,7 @@ } if (!re.test(currObj.value)) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } @@ -91,19 +91,19 @@ yyyy=dateelements[2] if (dd<1 || dd>31 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } @@ -114,7 +114,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } @@ -173,13 +173,13 @@ var val=window.document.QcEditView[fldName].value.replace(/^\s+/g, '').replace(/\s+$/g, '') if (isNaN(val) || (val.indexOf(".")!=-1 && fldName != 'potential_amount')) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) window.document.QcEditView[fldName].focus() return false } else if( val < -2147483648 || val > 2147483647) { - alert(fldLabel +" is out of range"); + alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; } @@ -196,32 +196,32 @@ var ret=true switch (type) { case "L" : if (val>=constval) { - alert(fldLabel+" should be less than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS+constval) ret=false } break; case "LE" : if (val>constval) { - alert(fldLabel+" should be less than or equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS_EQUAL+constval) ret=false } break; case "E" : if (val!=constval) { - alert(fldLabel+" should be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_EQUAL+constval) ret=false } break; case "NE" : if (val==constval) { - alert(fldLabel+" should not be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDNOTBE_EQUAL+constval) ret=false } break; case "G" : if (val<=constval) { - alert(fldLabel+" should be greater than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_GREATER+constval) ret=false } break; case "GE" : if (val31 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } @@ -266,7 +266,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } @@ -281,7 +281,7 @@ var currObj=window.document.QcEditView[timeFldName] if (hourval>23 || minval>59) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } Modified: vtigercrm/branches/5.0.3/include/js/ajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/ajax.js Mon Mar 12 09:26:20 2007 @@ -81,7 +81,7 @@ var response = me.callback(me.requester); break; default: - alert("Error"); + alert(alert_arr.ERROR); break; } } Modified: vtigercrm/branches/5.0.3/include/js/customview.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/customview.js (original) +++ vtigercrm/branches/5.0.3/include/js/customview.js Mon Mar 12 09:26:20 2007 @@ -42,7 +42,7 @@ var mode = document.getElementById('cfedit_mode').value; if(fieldtype == "" && mode != 'edit') { - alert("Field Type is not selected"); + alert(alert_arr.FIELD_TYPE_NOT_SELECTED); return false; } lengthLayer=getObj("lengthdetails") @@ -55,7 +55,7 @@ var re1=/^[a-z\d\_ ]+$/i if (!re1.test(str)) { - alert("Special characters are not allowed in Label field") + alert(alert_arr.SPECIAL_CHARACTERS_NOT_ALLOWED) return false; } @@ -99,7 +99,7 @@ //Empty Check validation for (i=0;i-1) { - alert("Error while Editing"); + alert(alert_arr.ERROR_WHILE_EDITING); } else if(response.responseText.indexOf(":#:SUCCESS")>-1) { Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Mar 12 09:26:20 2007 @@ -194,7 +194,7 @@ if (fldType=="text") { if (currObj.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert(fldLabel+" cannot be empty") + alert(fldLabel+alert_arr.CANNOT_BE_EMPTY) currObj.focus() @@ -208,7 +208,7 @@ } else { if (currObj.value == "" ) { - alert(fldLabel+" cannot be none") + alert(fldLabel+alert_arr.CANNOT_BE_NONE) return false @@ -253,7 +253,7 @@ } if (!re.test(currObj.value)) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID + fldLabel) currObj.focus() return false } @@ -292,27 +292,27 @@ var ret=true switch (type) { case 'L' : if (date1>=date2) {//DATE1 VALUE LESS THAN DATE2 - alert(fldLabel1+" should be less than "+fldLabel2) + alert(fldLabel1+ alert_arr.SHOULDBE_LESS +fldLabel2) ret=false } break; case 'LE' : if (date1>date2) {//DATE1 VALUE LESS THAN OR EQUAL TO DATE2 - alert(fldLabel1+" should be less than or equal to "+fldLabel2) + alert(fldLabel1+alert_arr.SHOULDBE_LESS_EQUAL+fldLabel2) ret=false } break; case 'E' : if (date1!=date2) {//DATE1 VALUE EQUAL TO DATE - alert(fldLabel1+" should be equal to "+fldLabel2) + alert(fldLabel1+alert_arr.SHOULDBE_EQUAL+fldLabel2) ret=false } break; case 'G' : if (date1<=date2) {//DATE1 VALUE GREATER THAN DATE2 - alert(fldLabel1+" should be greater than "+fldLabel2) + alert(fldLabel1+alert_arr.SHOULDBE_GREATER+fldLabel2) ret=false } break; case 'GE' : if (date131 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } @@ -357,7 +357,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } @@ -372,7 +372,7 @@ var currObj=getObj(timeFldName) if (hourval>23 || minval>59) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } @@ -453,19 +453,19 @@ yyyy=dateelements[2] if (dd<1 || dd>31 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } @@ -476,7 +476,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } @@ -541,7 +541,7 @@ var currObj=getObj(fldName) if (hourval>23 || minval>59) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } @@ -614,7 +614,7 @@ invalid=true } if (invalid==true) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) getObj(fldName).focus() return false } else return true @@ -624,7 +624,7 @@ if(splitval[0]>18446744073709551615) { - alert( fldLabel + " exceeds the maximum limit "); + alert( fldLabel + alert_arr.EXCEEDS_MAX); return false; } @@ -635,7 +635,7 @@ var re=/^\d+(\.\d\d*)*$/ } if (!re.test(val)) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) getObj(fldName).focus() return false } else return true @@ -646,13 +646,13 @@ var val=getObj(fldName).value.replace(/^\s+/g, '').replace(/\s+$/g, '') if (isNaN(val) || (val.indexOf(".")!=-1 && fldName != 'potential_amount')) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) getObj(fldName).focus() return false } else if( val < -2147483648 || val > 2147483647) { - alert(fldLabel +" is out of range"); + alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; } @@ -669,32 +669,32 @@ var ret=true switch (type) { case "L" : if (val>=constval) { - alert(fldLabel+" should be less than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS+constval) ret=false } break; case "LE" : if (val>constval) { - alert(fldLabel+" should be less than or equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS_EQUAL+constval) ret=false } break; case "E" : if (val!=constval) { - alert(fldLabel+" should be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_EQUAL+constval) ret=false } break; case "NE" : if (val==constval) { - alert(fldLabel+" should not be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDNOTBE_EQUAL+constval) ret=false } break; case "G" : if (val<=constval) { - alert(fldLabel+" should be greater than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_GREATER+constval) ret=false } break; case "GE" : if (val Author: saraj Date: Mon Mar 12 09:37:53 2007 New Revision: 10416 Log: changes made for language support in js alerts. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Accounts/Account.js vtigercrm/branches/5.0.3/modules/Calendar/Activity.js vtigercrm/branches/5.0.3/modules/Calendar/script.js vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js vtigercrm/branches/5.0.3/modules/Emails/Email.js vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js vtigercrm/branches/5.0.3/modules/Leads/Lead.js vtigercrm/branches/5.0.3/modules/Portal/Portal.js vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js vtigercrm/branches/5.0.3/modules/Products/Product.js vtigercrm/branches/5.0.3/modules/Reports/Report.js vtigercrm/branches/5.0.3/modules/Rss/Rss.js vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Modified: vtigercrm/branches/5.0.3/modules/Accounts/Account.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Account.js (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Account.js Mon Mar 12 09:37:53 2007 @@ -45,7 +45,7 @@ window.opener.document.EditView.account_id.value = account_id; //Ask the user to overwite the address or not - Modified on 06-01-2007 - if(confirm("Overwrite the existing address with this selected account("+account_name+") address details?")) + if(confirm(alert_arr.OVERWRITE_EXISTING_ACCOUNT1+account_name+alert_arr.OVERWRITE_EXISTING_ACCOUNT2)) { window.opener.document.EditView.bill_street.value = bill_street; window.opener.document.EditView.ship_street.value = ship_street; @@ -270,7 +270,7 @@ onComplete: function(response) { if(response.responseText == 'address_change') { - if(confirm("Do you want to change the addresses of the Contacts related to this Account?") == true) + if(confirm(alert_arr.WANT_TO_CHANGE_CONTACT_ADDR) == true) { form.address_change.value='yes'; form.submit(); Modified: vtigercrm/branches/5.0.3/modules/Calendar/Activity.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Activity.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Activity.js Mon Mar 12 09:37:53 2007 @@ -37,7 +37,7 @@ form.duetime.readOnly=false; - if (form.duetime.readonly) alert ("it's readonly"); + if (form.duetime.readonly) alert (alert_arr.READONLY); document.images.jscal_trigger.width = 16; Modified: vtigercrm/branches/5.0.3/modules/Calendar/script.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/script.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/script.js Mon Mar 12 09:37:53 2007 @@ -23,7 +23,7 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } @@ -43,11 +43,11 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } - if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + if(confirm(alert_arr.DISABLE_SHARING_CONFIRMATION+xx+alert_arr.USERS)) { document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; } @@ -275,7 +275,7 @@ { if((endhour*60+endmin) <= (starthour*60+startmin)) { - alert("End Time should be greater than Start Time "); + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } @@ -333,7 +333,7 @@ { if((followuphour*60+followupmin) <= (endhour*60+endmin)) { - alert("Followup Time should be greater than End Time "); + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); document.EditView.followup_starthr.focus(); return false; } @@ -368,7 +368,7 @@ formSelectColumnString('inviteesid','selectedusers'); if(trim(document.EditView.subject.value) == "") { - alert("Missing Event Name"); + alert(alert_arr.MISSING_EVENT_NAME); document.EditView.subject.focus() return false; } @@ -474,7 +474,7 @@ { if((endhour*60+endmin) <= (starthour*60+startmin)) { - alert("End Time should be greater than Start Time "); + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } @@ -531,7 +531,7 @@ { if((followuphour*60+followupmin) <= (endhour*60+endmin)) { - alert("Followup Time should be greater than End Time "); + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); document.EditView.followup_starthr.focus(); return false; } @@ -1187,7 +1187,7 @@ else if(select_meeting) calDuedatetime('meeting'); else - alert('Event Type is not selected'); + alert(alert_arr.EVENT_TYPE_NOT_SELECTED); } function calDuedatetime(type) Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js Mon Mar 12 09:37:53 2007 @@ -74,7 +74,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } //return true; @@ -102,7 +102,7 @@ // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Emails/Email.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Email.js (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Email.js Mon Mar 12 09:37:53 2007 @@ -95,7 +95,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -121,11 +121,11 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } - if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) + if(confirm(alert_arr.DELETE + xx + alert_arr.RECORDS)) { getObj('search_text').value = ''; show("status"); @@ -170,7 +170,7 @@ function DeleteEmail(id) { - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) { getObj('search_text').value = ''; gselectedrowid = 0; Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js Mon Mar 12 09:37:53 2007 @@ -14,12 +14,12 @@ { if (form.potential_name.value == "") { - alert("Opportunity Name field cannot be empty"); + alert(alert_arr.OPPORTUNITYNAME_CANNOT_BE_EMPTY); return false; } if (form.closedate.value == "") { - alert("Close Date field cannot be empty"); + alert(alert_arr.CLOSEDATE_CANNOT_BE_EMPTY); return false; } return dateValidate('closedate','Potential Close Date','GECD'); Modified: vtigercrm/branches/5.0.3/modules/Leads/Lead.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/Lead.js (original) +++ vtigercrm/branches/5.0.3/modules/Leads/Lead.js Mon Mar 12 09:37:53 2007 @@ -16,12 +16,12 @@ { if (form.potential_name.value == "") { - alert("Opportunity Name field cannot be empty"); + alert(alert_arr.OPPORTUNITYNAME_CANNOT_BE_EMPTY); return false; } if (form.closedate.value == "") { - alert("Close Date field cannot be empty"); + alert(alert_arr.CLOSEDATE_CANNOT_BE_EMPTY); return false; } x = dateValidate('closedate','Potential Close Date','GECD'); Modified: vtigercrm/branches/5.0.3/modules/Portal/Portal.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Portal/Portal.js (original) +++ vtigercrm/branches/5.0.3/modules/Portal/Portal.js Mon Mar 12 09:37:53 2007 @@ -42,7 +42,7 @@ } function DeleteSite(id) { - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) { $("status").style.display="inline"; new Ajax.Request( @@ -61,11 +61,11 @@ function SaveSite(id) { if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Url cannot be empty') + alert(alert_arr.SITEURL_CANNOT_BE_EMPTY) return false; } if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Name cannot be empty') + alert(alert_arr.SITENAME_CANNOT_BE_EMPTY) return false; } Effect.Puff('orgLay'); Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js Mon Mar 12 09:37:53 2007 @@ -32,12 +32,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -47,7 +47,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -80,12 +80,12 @@ if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -96,7 +96,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -127,7 +127,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Products/Product.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Product.js (original) +++ vtigercrm/branches/5.0.3/modules/Products/Product.js Mon Mar 12 09:37:53 2007 @@ -31,7 +31,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Reports/Report.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Report.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Report.js Mon Mar 12 09:37:53 2007 @@ -151,7 +151,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_FIELDS + errorMessage); return false; } return true; @@ -225,7 +225,7 @@ { if (oSel.selectedIndex == -1 || oSel.options[oSel.selectedIndex].disabled == true) { - alert("you are not allowed to edit this field"); + alert(alert_arr.NOT_ALLOWED_TO_EDIT); oSel.options[oSel.selectedIndex].selected = false; } } @@ -385,7 +385,7 @@ { if(selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } @@ -407,7 +407,7 @@ { if(i == 1 && selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } if(divarray[i] == 'step4') @@ -463,7 +463,7 @@ { if (trim(document.NewRep.reportname.value) == "") { - alert("Missing Report Name"); + alert(alert_arr.MISSING_REPORT_NAME); }else { new Ajax.Request( @@ -474,7 +474,7 @@ onComplete: function(response) { if(response.responseText!=0) { - alert("Report name already exists, try again..."); + alert(alert_arr.REPORT_NAME_EXISTS); return false; } else Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Rss/Rss.js (original) +++ vtigercrm/branches/5.0.3/modules/Rss/Rss.js Mon Mar 12 09:37:53 2007 @@ -34,7 +34,7 @@ return httpRequest.responseText; break; default: - alert("Problem accessing url: "+targetUrl+" Code: "+httpRequest.status); + alert(alert_arr.PROBLEM_ACCESSSING_URL+targetUrl+alert_arr.CODE+httpRequest.status); return null; break; } @@ -48,7 +48,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js Mon Mar 12 09:37:53 2007 @@ -20,7 +20,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Mon Mar 12 09:37:53 2007 @@ -99,7 +99,7 @@ // TODO: present the user with a simple DHTML div to // choose what type of relationship they would like to create // before creating it. - alert('Are you sure you wish to Qualify this Mail as Contact?'); + alert(alert_arr.WISH_TO_QUALIFY_MAIL_AS_CONTACT); add_to_vtiger(mid); } function add_to_vtiger(mid) { @@ -357,10 +357,10 @@ nids=nid; else { - alert("Please select at least one message to delete"); + alert(alert_arr.SELECT_ATLEAST_ONEMSG_TO_DEL); return false; } - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) runEmailCommand("delete_multi_msg",nids); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 08:55:24 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:55:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10417 - /vtigercrm/branches/5.0.3/include/js/Inventory.js Message-ID: <20070312155524.409057C7F63@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:55:17 2007 New Revision: 10417 Log: popup window resized for ie7 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Mon Mar 12 09:55:17 2007 @@ -63,9 +63,9 @@ if(document.getElementsByName("account_id").length != 0) record_id= document.EditView.account_id.value; if(record_id != '') - window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId+"&relmod_id="+record_id+"&parent_module=Accounts","productWin","width=640,height=565,resizable=0,scrollbars=0,status=1,top=150,left=200"); + window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId+"&relmod_id="+record_id+"&parent_module=Accounts","productWin","width=640,height=600,resizable=0,scrollbars=0,status=1,top=150,left=200"); else - window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=640,height=565,resizable=0,scrollbars=0,status=1,top=150,left=200"); + window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=640,height=600,resizable=0,scrollbars=0,status=1,top=150,left=200"); } function priceBookPickList(currObj, row_no) { From mariack at gotee.com Mon Mar 12 06:56:36 2007 From: mariack at gotee.com (Lightness B. World) Date: Mon, 12 Mar 2007 13:56:36 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7426912866.20070312135636@gotee.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070312/9ab1498c/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: davit.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070312/9ab1498c/davit-0001.gif From stefylynn at goke.org Tue Mar 13 01:53:12 2007 From: stefylynn at goke.org (Accused D. Seamiest) Date: Tue, 13 Mar 2007 08:53:12 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9815546624.20070313085312@goke.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/937fad06/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: disapproval.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/937fad06/disapproval.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 13 04:24:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 13 Mar 2007 11:24:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10418 - in /vtigercrm/branches/5.0.3/Smarty/templates: ActivityListView.tpl ListView.tpl Message-ID: <20070313112411.944077C7F62@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 13 05:24:06 2007 New Revision: 10418 Log: image path added Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Tue Mar 13 05:24:06 2007 @@ -16,7 +16,7 @@ - + + + Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Tue Mar 13 10:33:53 2007 @@ -18,7 +18,7 @@ - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl Tue Mar 13 10:33:53 2007 @@ -124,7 +124,7 @@ {rdelim} - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddProductsToPriceBook.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AddProductsToPriceBook.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AddProductsToPriceBook.tpl Tue Mar 13 10:33:53 2007 @@ -34,7 +34,7 @@ {rdelim} - +

    {$PRODUCTLISTHEADER} Modified: vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl Tue Mar 13 10:33:53 2007 @@ -9,7 +9,7 @@ * ********************************************************************************/ -->*} - + {if $MODULE eq 'Calendar'}
     
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Tue Mar 13 10:33:53 2007 @@ -20,7 +20,7 @@
    {/if} - + {if $SEARCH_MODULE eq 'All'} + {include file='Buttons_List1.tpl'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl Tue Mar 13 10:33:53 2007 @@ -11,7 +11,7 @@ -->*} - + - + +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryEditView.tpl Tue Mar 13 10:33:53 2007 @@ -18,7 +18,7 @@ - + - + - + + {literal} - + + {literal} + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl Tue Mar 13 10:33:53 2007 @@ -13,7 +13,7 @@ -->*} {**} - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl Tue Mar 13 10:33:53 2007 @@ -16,7 +16,7 @@ - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl Tue Mar 13 10:33:53 2007 @@ -15,7 +15,7 @@ {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/salesEditView.tpl Tue Mar 13 10:33:53 2007 @@ -18,7 +18,7 @@ - + {JAVASCRIPT} - + Modified: vtigercrm/branches/5.0.3/modules/Products/AddProductToPriceBooks.html ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/AddProductToPriceBooks.html (original) +++ vtigercrm/branches/5.0.3/modules/Products/AddProductToPriceBooks.html Tue Mar 13 10:33:53 2007 @@ -116,7 +116,7 @@ } - +
    Modified: vtigercrm/branches/5.0.3/modules/Products/AddProductsToPriceBook.html ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/AddProductsToPriceBook.html (original) +++ vtigercrm/branches/5.0.3/modules/Products/AddProductsToPriceBook.html Tue Mar 13 10:33:53 2007 @@ -27,7 +27,7 @@ } - +

    {PRODUCTLISTHEADER} Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 13 10:33:53 2007 @@ -173,7 +173,7 @@ } ); - + -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/b8ab5928/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: monkeyshine.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/b8ab5928/monkeyshine.gif From robert.i.wright at glazed.org Wed Mar 14 03:20:52 2007 From: robert.i.wright at glazed.org (Doer R. Tate) Date: Wed, 14 Mar 2007 10:20:52 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9346441980.20070314102052@glazed.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070314/c400dbe8/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: buckskin.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070314/c400dbe8/buckskin.gif From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 14 03:23:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 14 Mar 2007 10:23:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10431 - in /vtigercrm/branches/5.0.3/modules/Products: Save.php language/en_us.lang.php Message-ID: <20070314102344.1F5C57C7F51@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 14 04:23:37 2007 New Revision: 10431 Log: fix for i18n issue - Notification email - Stock Level is Low. Fixes #3046 Modified: vtigercrm/branches/5.0.3/modules/Products/Save.php vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Products/Save.php Wed Mar 14 04:23:37 2007 @@ -24,7 +24,7 @@ require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -global $log,$current_user; +global $log,$current_user,$mod_strings; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; @@ -139,14 +139,14 @@ $handler_name = getUserName($handler); $sender_name = getUserName($current_user->id); $to_address= getUserEmail($handler); - $subject = $productname.' Stock Level is Low'; - $body = 'Dear '.$handler_name.', + $subject = $productname.' '.$mod_strings['MSG_STOCK_LEVEL']; + $body = $mod_strings['MSG_DEAR'].' '.$handler_name.',

    '. - The current stock of '.$productname.' in our warehouse is '.$qty_stk.'. Kindly procure required number of units as the stock level is below reorder level '.$reord.'. + $mod_strings['MSG_CURRENT_STOCK'].' '.$productname.' '.$mod_strings['MSG_IN_OUR_WAREHOUSE'].' '.$qty_stk.'. '.$mod_strings['MSG_PROCURE_REQUIRED_NUMBER'].' '.$reord.'.
    '. - Severity: Major - Thanks, - '.$sender_name; + $mod_strings['MSG_SEVERITY'].'

    '. + $mod_strings['MSG_THANKS'].'
    '. + $sender_name; include("modules/Emails/mail.php"); $mail_status = send_mail("Products",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); Modified: vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Wed Mar 14 04:23:37 2007 @@ -209,6 +209,15 @@ 'Spiral Binder'=>'Spiral Binder', 'Sq Ft'=>'Sq Ft', +//Added for 5.0.3 +'MSG_STOCK_LEVEL'=>'Stock Level is Low', +'MSG_DEAR'=>'Dear', +'MSG_CURRENT_STOCK'=>'The current stock of', +'MSG_IN_OUR_WAREHOUSE'=>'in our warehouse is', +'MSG_PROCURE_REQUIRED_NUMBER'=>'Kindly procure required number of units as the stock level is below reorder level', +'MSG_SEVERITY'=>'Severity: Major', +'MSG_THANKS'=>'Thanks,', + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 14 03:41:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 14 Mar 2007 10:41:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10432 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php ListView.php language/en_us.lang.php Message-ID: <20070314104119.DAF4C7C7F0D@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 14 04:41:12 2007 New Revision: 10432 Log: fix for i18n issue - in Email / My Mails. Fixes #3034 --Minnie Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Wed Mar 14 04:41:12 2007 @@ -29,23 +29,23 @@ echo ''; $webmail->loadMail(); -echo ''; +echo ''; -echo ""; +echo ""; foreach($webmail->attachments as $key=>$value) { echo '"; Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Wed Mar 14 04:41:12 2007 @@ -266,13 +266,13 @@ } echo ""; -$listview_header = array("","","","",""); +$listview_header = array("","","","",""); $listview_entries = array(); $displayed_msgs=0; $new_msgs=0; if(($numEmails) <= 0) - $listview_entries[0][] = ''; + $listview_entries[0][] = ''; else { if(isset($_REQUEST["search"])) { @@ -318,7 +318,7 @@ $i=0; if (is_array($list)) { $boxes = '
     
    '; echo ''; -echo ''; -echo ''; +echo ''; +echo ''; //Added to get the UTF-8 string - 30-11-06 - Mickie $elist->subject = utf8_decode(imap_utf8($elist->subject)); -echo ''; -echo ''; +echo ''; +echo ''; echo '
    From:'.$elist->from.'
    To:'.$elist->to.'
    '.$mod_strings['LBL_FROM'].''.$elist->from.'
    '.$mod_strings['LBL_TO'].''.$elist->to.'
    Subject:'.$elist->subject.'
    Date:'.$elist->date.'
    '.$mod_strings['LBL_SUBJECT'].''.$elist->subject.'
    '.$mod_strings['LBL_DATE'].''.$elist->date.'
    '; echo '

    Email Attachments:

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    '.($key+1).') '.$value["filename"]."
    InfoSubjectDateFromDel".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."No Emails In This Folder'.$mod_strings['LBL_NO_EMAILS'].'
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 14 23:53:20 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 06:53:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10437 - /vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Message-ID: <20070315065320.EAADF7C7F0D@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 00:53:13 2007 New Revision: 10437 Log: fix for customfields of type Multi-Select Combo Box and Skype not displayed properly in ListView. Fixes #3079 --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Mar 15 00:53:13 2007 @@ -1324,6 +1324,14 @@ elseif($uitype == 98) { $value = ''.getRoleName($temp_val).''; + } + elseif($uitype == 33) + { + $value = ($temp_val != "") ? str_ireplace(' |##| ',', ',$temp_val) : ""; + } + elseif($uitype == 85) + { + $value = ($temp_val != "") ? "{$temp_val}" : ""; } else { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 00:56:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 07:56:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10438 - in /vtigercrm/branches/5.0.3: Smarty/templates/Header.tpl include/js/dtlviewajax.js Message-ID: <20070315075631.0D4227C8030@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 01:56:19 2007 New Revision: 10438 Log: fix for i18n issue with check boxes. Fixes #2448 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Thu Mar 15 01:56:19 2007 @@ -548,7 +548,8 @@ VALID_DISCOUNT_PERCENT:'{$APP.VALID_DISCOUNT_PERCENT}', VALID_DISCOUNT_AMOUNT:'{$APP.VALID_DISCOUNT_AMOUNT}', SELECT_TEMPLATE_TO_MERGE:'{$APP.SELECT_TEMPLATE_TO_MERGE}', - + YES:'{$APP.yes}', + NO:'{$APP.no}', {rdelim}; var THandle = document.getElementById("Track_Handle"); Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Thu Mar 15 01:56:19 2007 @@ -284,14 +284,14 @@ } else - getObj(dtlView).innerHTML = "yes"; + getObj(dtlView).innerHTML = alert_arr.YES; } else - getObj(dtlView).innerHTML = "yes"; - }else - { - getObj(dtlView).innerHTML = "no"; + getObj(dtlView).innerHTML = alert_arr.YES; + }else + { + getObj(dtlView).innerHTML = alert_arr.NO; } }else if(uitype == 116) @@ -345,7 +345,7 @@ { if(tagValue == '1') { - getObj(dtlView).innerHTML = "yes"; + getObj(dtlView).innerHTML = alert_arr.YES; }else { getObj(dtlView).innerHTML = ""; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 01:08:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 08:08:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10439 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/DetailViewUtils.php Message-ID: <20070315080838.63F447C803A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 02:08:30 2007 New Revision: 10439 Log: fix for Contact images display oddly. Fixes #2780 --Minnie Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Thu Mar 15 02:08:30 2007 @@ -825,6 +825,7 @@ 'MSG_THANKS'=>'Thanks,', 'MSG_VTIGERTEAM'=>' vTiger Team', 'MSG_IS_NOT_UPLOADED'=>'is not uploaded. Allowed file types - jpeg, png, jpg, pjpeg, x-png or gif', +'MSG_IMAGE_ERROR'=>'Image not found', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Thu Mar 15 02:08:30 2007 @@ -483,7 +483,7 @@ $image_name = $adb->query_result($image_res,0,'name'); $imgpath = $image_path.$image_id."_".$image_name; if($image_name != '') - $label_fld[] =''; + $label_fld[] =''.$app_strings['MSG_IMAGE_ERROR'].''; else $label_fld[] = ''; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 02:41:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 09:41:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10440 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070315094116.097D978C717@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 03:41:04 2007 New Revision: 10440 Log: fix for Contacts is selected in Compose email box while sending mail from Accounts/Leads. Fixes #3070 --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Thu Mar 15 03:41:04 2007 @@ -798,15 +798,23 @@ //added by rdhital/Raju for better email support elseif($uitype == 357) { - $contact_selected = 'selected'; - $account_selected = ''; - $lead_selected = ''; + if($_REQUEST['pmodule'] == 'Contacts') + { + $contact_selected = 'selected'; + } + elseif($_REQUEST['pmodule'] == 'Accounts') + { + $account_selected = 'selected'; + } + elseif($_REQUEST['pmodule'] == 'Leads') + { + $lead_selected = 'selected'; + } if(isset($_REQUEST['emailids']) && $_REQUEST['emailids'] != '') { $parent_id = $_REQUEST['emailids']; $parent_name=''; $pmodule=$_REQUEST['pmodule']; - $myids=explode("|",$parent_id); for ($i=0;$i<(count($myids)-1);$i++) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 03:36:51 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 10:36:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10441 - in /vtigercrm/branches/5.0.3/include/utils: ListViewUtils.php SearchUtils.php Message-ID: <20070315103651.E4AD17C8058@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 04:36:31 2007 New Revision: 10441 Log: Problem in searching Inventory manager - fixed. Fixes #3176 Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Mar 15 04:36:31 2007 @@ -1999,6 +1999,8 @@ ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_users as vtiger_usersQuotes + ON vtiger_usersQuotes.id = vtiger_quotes.inventorymanager WHERE vtiger_crmentity.deleted = 0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Thu Mar 15 04:36:31 2007 @@ -433,6 +433,13 @@ } $fieldlabel1 = str_replace(" ","_",$fieldlabel); + //Check added to search the lists by Inventory manager + if($fieldtablename == 'vtiger_quotes' && $fieldcolname == 'inventorymanager') + { + $fieldtablename = 'vtiger_usersQuotes'; + $fieldcolname = 'user_name'; + } + if($fieldlabel != 'Related to') { if ($i==0) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 04:49:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 11:49:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10442 - /vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Message-ID: <20070315114941.E76837C7FEF@vtiger.fosslabs.com> Author: richie Date: Thu Mar 15 05:49:31 2007 New Revision: 10442 Log: removed unwanted echos Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Thu Mar 15 05:49:31 2007 @@ -81,12 +81,15 @@ } // Set IMAP flag - if($mails[$start_message]->flagged) - $flags.=''; - else + if($mails[$start_message]->flagged) + { + $flags.=''; + } + else + { $flags.=''; - + } $tmp=imap_mime_header_decode($mails[$start_message]->from); $from = $tmp[0]->text; From richardson at greghopkins.net Thu Mar 15 06:06:01 2007 From: richardson at greghopkins.net (Profundities B. Avenging) Date: Thu, 15 Mar 2007 13:06:01 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3150319689.20070315130601@greghopkins.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070315/247b0e3a/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: aridity.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070315/247b0e3a/aridity.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 07:29:32 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:29:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10443 - in /vtigercrm/branches/5.0.3/modules: Accounts/Accounts.js Calendar/Calendar.js Emails/Emails.js Leads/Leads.js PriceBooks/PriceBooks.js Products/Products.js Reports/Reports.js Vendors/Vendors.js Webmails/Webmails.js Message-ID: <20070315142933.239D378C72B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:29:20 2007 New Revision: 10443 Log: i18n support added for new js files Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js vtigercrm/branches/5.0.3/modules/Emails/Emails.js vtigercrm/branches/5.0.3/modules/Leads/Leads.js vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js vtigercrm/branches/5.0.3/modules/Products/Products.js vtigercrm/branches/5.0.3/modules/Reports/Reports.js vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js Thu Mar 15 08:29:20 2007 @@ -45,7 +45,7 @@ window.opener.document.EditView.account_id.value = account_id; //Ask the user to overwite the address or not - Modified on 06-01-2007 - if(confirm("Overwrite the existing address with this selected account("+account_name+") address details?")) + if(confirm(alert_arr.OVERWRITE_EXISTING_ACCOUNT1+account_name+alert_arr.OVERWRITE_EXISTING_ACCOUNT2)) { window.opener.document.EditView.bill_street.value = bill_street; window.opener.document.EditView.ship_street.value = ship_street; @@ -270,7 +270,7 @@ onComplete: function(response) { if(response.responseText == 'address_change') { - if(confirm("Do you want to change the addresses of the Contacts related to this Account?") == true) + if(confirm(alert_arr.WANT_TO_CHANGE_CONTACT_ADDR) == true) { form.address_change.value='yes'; form.submit(); Modified: vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js Thu Mar 15 08:29:20 2007 @@ -37,7 +37,7 @@ form.duetime.readOnly=false; - if (form.duetime.readonly) alert ("it's readonly"); + if (form.duetime.readonly) alert (alert_arr.READONLY); document.images.jscal_trigger.width = 16; Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.js (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.js Thu Mar 15 08:29:20 2007 @@ -95,7 +95,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -121,11 +121,11 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } - if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) + if(confirm(alert_arr.DELETE + xx + alert_arr.RECORDS)) { getObj('search_text').value = ''; show("status"); @@ -170,7 +170,7 @@ function DeleteEmail(id) { - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) { getObj('search_text').value = ''; gselectedrowid = 0; Modified: vtigercrm/branches/5.0.3/modules/Leads/Leads.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/Leads.js (original) +++ vtigercrm/branches/5.0.3/modules/Leads/Leads.js Thu Mar 15 08:29:20 2007 @@ -16,12 +16,12 @@ { if (form.potential_name.value == "") { - alert("Opportunity Name field cannot be empty"); + alert(alert_arr.OPPORTUNITYNAME_CANNOT_BE_EMPTY); return false; } if (form.closedate.value == "") { - alert("Close Date field cannot be empty"); + alert(alert_arr.CLOSEDATE_CANNOT_BE_EMPTY); return false; } x = dateValidate('closedate','Potential Close Date','GECD'); Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js (original) +++ vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js Thu Mar 15 08:29:20 2007 @@ -32,12 +32,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -47,7 +47,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -80,12 +80,12 @@ if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -96,7 +96,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -127,7 +127,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Products/Products.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Products.js (original) +++ vtigercrm/branches/5.0.3/modules/Products/Products.js Thu Mar 15 08:29:20 2007 @@ -31,7 +31,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Thu Mar 15 08:29:20 2007 @@ -151,7 +151,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_FIELDS + errorMessage); return false; } return true; @@ -225,7 +225,7 @@ { if (oSel.selectedIndex == -1 || oSel.options[oSel.selectedIndex].disabled == true) { - alert("you are not allowed to edit this field"); + alert(alert_arr.NOT_ALLOWED_TO_EDIT); oSel.options[oSel.selectedIndex].selected = false; } } @@ -385,7 +385,7 @@ { if(selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } @@ -407,7 +407,7 @@ { if(i == 1 && selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } if(divarray[i] == 'step4') @@ -463,7 +463,7 @@ { if (trim(document.NewRep.reportname.value) == "") { - alert("Missing Report Name"); + alert(alert_arr.MISSING_REPORT_NAME); }else { new Ajax.Request( @@ -474,7 +474,7 @@ onComplete: function(response) { if(response.responseText!=0) { - alert("Report name already exists, try again..."); + alert(alert_arr.REPORT_NAME_EXISTS); return false; } else Modified: vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js Thu Mar 15 08:29:20 2007 @@ -20,7 +20,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Thu Mar 15 08:29:20 2007 @@ -99,7 +99,7 @@ // TODO: present the user with a simple DHTML div to // choose what type of relationship they would like to create // before creating it. - alert('Are you sure you wish to Qualify this Mail as Contact?'); + alert(alert_arr.WISH_TO_QUALIFY_MAIL_AS_CONTACT); add_to_vtiger(mid); } function add_to_vtiger(mid) { @@ -357,10 +357,10 @@ nids=nid; else { - alert("Please select at least one message to delete"); + alert(alert_arr.SELECT_ATLEAST_ONEMSG_TO_DEL); return false; } - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) runEmailCommand("delete_multi_msg",nids); } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 07:31:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:31:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10444 - /thunderbirdextn/trunk/install.js Message-ID: <20070315143123.3BAE478C72B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:31:19 2007 New Revision: 10444 Log: version changed Modified: thunderbirdextn/trunk/install.js Modified: thunderbirdextn/trunk/install.js ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 07:36:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:36:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10445 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Message-ID: <20070315143638.AC6F97C8043@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:36:33 2007 New Revision: 10445 Log: copyright changes Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 07:50:55 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:50:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10446 - in /vtigercrm/branches/5.0.3/modules/Webmails: MailParse.php language/en_us.lang.php Message-ID: <20070315145055.B5EB87C8049@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:50:50 2007 New Revision: 10446 Log: Title added for Icons Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Thu Mar 15 08:50:50 2007 @@ -56,7 +56,7 @@ // Attachment Icons if($msg_ob->has_attachments) - $flags.=' '; + $flags.=' '; else $flags.=' '; @@ -65,7 +65,7 @@ // read/unread/forwarded/replied if(!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $flags.=' '; + $flags.=' '; } elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject)) { @@ -73,11 +73,11 @@ } elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) { - $flags.=' '; + $flags.=' '; } else { - $flags.=' '; + $flags.=' '; } // Set IMAP flag Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Thu Mar 15 08:50:50 2007 @@ -1,139 +1,139 @@ -'Emails', -'LBL_MODULE_TITLE'=>'Emails: Home', -'LBL_SEARCH_FORM_TITLE'=>'Email Search', -'LBL_LIST_FORM_TITLE'=>'Email List', -'LBL_NEW_FORM_TITLE'=>'Track Email', - -'LBL_LIST_SUBJECT'=>'Subject', -'LBL_LIST_CONTACT'=>'Contact', -'LBL_LIST_RELATED_TO'=>'Related to', -'LBL_LIST_DATE'=>'Date Sent', -'LBL_LIST_TIME'=>'Time Sent', +'Emails', +'LBL_MODULE_TITLE'=>'Emails: Home', +'LBL_SEARCH_FORM_TITLE'=>'Email Search', +'LBL_LIST_FORM_TITLE'=>'Email List', +'LBL_NEW_FORM_TITLE'=>'Track Email', + +'LBL_LIST_SUBJECT'=>'Subject', +'LBL_LIST_CONTACT'=>'Contact', +'LBL_LIST_RELATED_TO'=>'Related to', +'LBL_LIST_DATE'=>'Date Sent', +'LBL_LIST_TIME'=>'Time Sent', 'LBL_MOVE_TO'=>'Move To', 'LBL_DELETE'=>'Delete', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", -'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject :', -'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date :', -'LBL_TIME'=>'Time Sent:', -'LBL_BODY'=>'Body:', -'LBL_CONTACT_NAME'=>' Contact Name: ', -'LBL_EMAIL'=>'Email:', -'LBL_COLON'=>':', -'LBL_TO'=>'To :', -'LBL_CHK_MAIL'=>'Check Mail', -'LBL_COMPOSE'=>'Compose', -'LBL_SETTINGS'=>'Incmg. MailServer Settings', -'LBL_EMAIL_FOLDERS'=>'Email Folders', -'LBL_INBOX'=>'Inbox', -'LBL_SENT_MAILS'=>'Sent Mails', -'LBL_TRASH'=>'Trash', -'LBL_JUNK_MAILS'=>'Junk Mails', -'LBL_TO_LEADS'=>'To Leads', -'LBL_TO_CONTACTS'=>'To Contacts', -'LBL_TO_ACCOUNTS'=>'To Accounts', -'LBL_MY_MAILS'=>'My Mails', -'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', -'LBL_MAILS'=>'Mails', -'LBL_QUALIFY_BUTTON'=>'Qualify', -'LBL_REPLY_BUTTON'=>'Reply', -'LBL_FORWARD_BUTTON'=>'Forward', -'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', -'LBL_FROM'=>'From :', -'LBL_CC'=>'cc :', -'LBL_REPLY_TO_SENDER'=>'Reply to Sender', -'LBL_REPLY_ALL'=>'Reply All', -'LBL_SHOW_HIDDEN'=>'Show Hidden Mails', -'LBL_EXPUNGE_MAILBOX'=>'Trim Mailbox', - -'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', -'LBL_INVITEE'=>'Recipients', - -// Added Fields -// Contacts-SubPanelViewContactsAndUsers.php -'LBL_BULK_MAILS'=>'Bulk Mails', -'LBL_ATTACHMENT'=>'Attachment', -'LBL_UPLOAD'=>'Upload', -'LBL_FILE_NAME'=>'File Name', -'LBL_SEND'=>'Send', - -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', -'LBL_EMAIL_INFORMATION'=>'Email Information', - - - - -//for v4 release added -'LBL_NEW_LEAD'=>'New Lead', -'LBL_LEAD_TITLE'=>'Leads', - -'LBL_NEW_PRODUCT'=>'New Product', -'LBL_PRODUCT_TITLE'=>'Products', -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_CONTACT_TITLE'=>'Contacts', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_ACCOUNT_TITLE'=>'Accounts', - -// Added vtiger_fields after vtiger4 - Beta -'LBL_USER_TITLE'=>'Users', -'LBL_NEW_USER'=>'New User', - -// Added for 4 GA -'LBL_TOOL_FORM_TITLE'=>'Email Tools', -//Added for 4GA -'Date & Time Sent'=>'Date & Time Sent', -'Sales Enity Module'=>'Sales Enity Module', -'Activtiy Type'=>'Activtiy Type', -'Related To'=>'Related To', -'Assigned To'=>'Assigned To', -'Subject'=>'Subject', -'Attachment'=>'Attachment', -'Description'=>'Description', -'Time Start'=>'Time Start', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', - -'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', -'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', -'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', -'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', -'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', -'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', -'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', - -// Added for web mail post 4.0.1 release -'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', -//Added for 4.2 Release -- CustomView -'LBL_ALL'=>'All', -'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', -'LBL_WEBMAILS_TITLE'=>'WebMails', -'LBL_EMAILS_TITLE'=>'Emails', -'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', + +'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", +'LBL_DATE_SENT'=>'Date Sent:', +'LBL_SUBJECT'=>'Subject :', +'LBL_DATE_AND_TIME'=>'Date & Time Sent:', +'LBL_DATE'=>'Date :', +'LBL_TIME'=>'Time Sent:', +'LBL_BODY'=>'Body:', +'LBL_CONTACT_NAME'=>' Contact Name: ', +'LBL_EMAIL'=>'Email:', +'LBL_COLON'=>':', +'LBL_TO'=>'To :', +'LBL_CHK_MAIL'=>'Check Mail', +'LBL_COMPOSE'=>'Compose', +'LBL_SETTINGS'=>'Incmg. MailServer Settings', +'LBL_EMAIL_FOLDERS'=>'Email Folders', +'LBL_INBOX'=>'Inbox', +'LBL_SENT_MAILS'=>'Sent Mails', +'LBL_TRASH'=>'Trash', +'LBL_JUNK_MAILS'=>'Junk Mails', +'LBL_TO_LEADS'=>'To Leads', +'LBL_TO_CONTACTS'=>'To Contacts', +'LBL_TO_ACCOUNTS'=>'To Accounts', +'LBL_MY_MAILS'=>'My Mails', +'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', +'LBL_MAILS'=>'Mails', +'LBL_QUALIFY_BUTTON'=>'Qualify', +'LBL_REPLY_BUTTON'=>'Reply', +'LBL_FORWARD_BUTTON'=>'Forward', +'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', +'LBL_FROM'=>'From :', +'LBL_CC'=>'cc :', +'LBL_REPLY_TO_SENDER'=>'Reply to Sender', +'LBL_REPLY_ALL'=>'Reply All', +'LBL_SHOW_HIDDEN'=>'Show Hidden Mails', +'LBL_EXPUNGE_MAILBOX'=>'Trim Mailbox', + +'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', +'LBL_INVITEE'=>'Recipients', + +// Added Fields +// Contacts-SubPanelViewContactsAndUsers.php +'LBL_BULK_MAILS'=>'Bulk Mails', +'LBL_ATTACHMENT'=>'Attachment', +'LBL_UPLOAD'=>'Upload', +'LBL_FILE_NAME'=>'File Name', +'LBL_SEND'=>'Send', + +'LBL_EMAIL_TEMPLATES'=>'Email Templates', +'LBL_TEMPLATE_NAME'=>'Template Name', +'LBL_DESCRIPTION'=>'Description', +'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', +'LBL_EMAIL_INFORMATION'=>'Email Information', + + + + +//for v4 release added +'LBL_NEW_LEAD'=>'New Lead', +'LBL_LEAD_TITLE'=>'Leads', + +'LBL_NEW_PRODUCT'=>'New Product', +'LBL_PRODUCT_TITLE'=>'Products', +'LBL_NEW_CONTACT'=>'New Contact', +'LBL_CONTACT_TITLE'=>'Contacts', +'LBL_NEW_ACCOUNT'=>'New Account', +'LBL_ACCOUNT_TITLE'=>'Accounts', + +// Added vtiger_fields after vtiger4 - Beta +'LBL_USER_TITLE'=>'Users', +'LBL_NEW_USER'=>'New User', + +// Added for 4 GA +'LBL_TOOL_FORM_TITLE'=>'Email Tools', +//Added for 4GA +'Date & Time Sent'=>'Date & Time Sent', +'Sales Enity Module'=>'Sales Enity Module', +'Activtiy Type'=>'Activtiy Type', +'Related To'=>'Related To', +'Assigned To'=>'Assigned To', +'Subject'=>'Subject', +'Attachment'=>'Attachment', +'Description'=>'Description', +'Time Start'=>'Time Start', +'Created Time'=>'Created Time', +'Modified Time'=>'Modified Time', + +'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', +'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', +'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', +'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', +'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', +'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', +'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', + +// Added for web mail post 4.0.1 release +'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', +//Added for 4.2 Release -- CustomView +'LBL_ALL'=>'All', +'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', +'LBL_WEBMAILS_TITLE'=>'WebMails', +'LBL_EMAILS_TITLE'=>'Emails', +'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', // Added for 5.0.3 release 'IN_REPLY_TO_THE_MESSAGE' => 'In reply to the message sent by ', 'LBL_NO_EMAILS'=>'No Emails In This Folder', @@ -144,7 +144,8 @@ 'LABEL_DATE'=>'Date', 'LBL_NO_IFRAMES_SUPPORTED'=>'No Iframes supported', 'LBL_EMAIL_ATTACHMENTS'=>'Email Attachments:', - - -); -?> +'LBL_ALLMAILS'=>'All Mails', +'LBL_TO_USERS'=>'TO Users', +'LBL_TO_GROUPS'=>'To Groups', +); +?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 08:36:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 15:36:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10447 - in /vtigercrm/branches/5.0.3/modules/Reports: ReportRun.php Reports.php language/en_us.lang.php Message-ID: <20070315153649.F03367C8059@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 09:36:43 2007 New Revision: 10447 Log: Ticket id added in reports Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Thu Mar 15 09:36:43 2007 @@ -153,6 +153,9 @@ { $access_fields[] = $collistrow["fieldname"]; } + //added to include ticketid for Reports module in select columnlist for all users + if($module == "HelpDesk") + $access_fields[] = "ticketid"; return $access_fields; } Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Thu Mar 15 09:36:43 2007 @@ -325,6 +325,12 @@ { $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type'; } + + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['vtiger_crmentity:crmid:HelpDesk_Ticket_ID:ticketid:I'] = 'Ticket ID'; + } + $result = $adb->query($sql); $noofrows = $adb->num_rows($result); @@ -899,7 +905,7 @@ $mod_strings = return_module_language($current_language,$module); $fieldlabel = trim(str_replace($module," ",$selectedfields[2])); $fieldlabel = trim(str_replace("_"," ",$fieldlabel)); - if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields)) + if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields) && $fieldname != 'ticketid') { if(isset($mod_strings[$fieldlabel])) { Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Thu Mar 15 09:36:43 2007 @@ -203,6 +203,8 @@ 'MIN'=>'MIN', 'LBL_CUSTOM_REPORTS'=>'Custom Reports', +'ticketid'=>'Ticket Id', + ) ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 08:43:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 15:43:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10448 - /thunderbirdextn/trunk/install.rdf Message-ID: <20070315154304.21C2E78CDC9@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 09:42:56 2007 New Revision: 10448 Log: version changed Modified: thunderbirdextn/trunk/install.rdf Modified: thunderbirdextn/trunk/install.rdf ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 08:45:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 15:45:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10449 - in /wordintegration/trunk/client/bin/Language: deutsch.ini english.ini finnish.ini french.ini german.ini portuguese.ini Message-ID: <20070315154553.D732B78BB25@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 09:45:41 2007 New Revision: 10449 Log: version and copyright info changed Modified: wordintegration/trunk/client/bin/Language/deutsch.ini wordintegration/trunk/client/bin/Language/english.ini wordintegration/trunk/client/bin/Language/finnish.ini wordintegration/trunk/client/bin/Language/french.ini wordintegration/trunk/client/bin/Language/german.ini wordintegration/trunk/client/bin/Language/portuguese.ini Modified: wordintegration/trunk/client/bin/Language/deutsch.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/deutsch.ini (original) +++ wordintegration/trunk/client/bin/Language/deutsch.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=Deutsch [vtigerCRM_frmAbout] FormName=?ber -Label2=Copyright ? 2003-2007 vtiger.com. Alle Rechte vorbehalten. +Label2=Copyright ? 2004-2007 vtiger.com. Alle Rechte vorbehalten. Label3= Button1=OK Modified: wordintegration/trunk/client/bin/Language/english.ini ============================================================================== Binary files - no diff available. Modified: wordintegration/trunk/client/bin/Language/finnish.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/finnish.ini (original) +++ wordintegration/trunk/client/bin/Language/finnish.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=Finnish [vtigerCRM_frmAbout] FormName=About -Label2=Copyright ? 2003-2007 vtiger.com. All rights reserverd. +Label2=Copyright ? 2004-2007 vtiger.com. All rights reserverd. Label3= Button1=Hyv?ksy Modified: wordintegration/trunk/client/bin/Language/french.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/french.ini (original) +++ wordintegration/trunk/client/bin/Language/french.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=French [vtigerCRM_frmAbout] FormName=A propos -Label2=Copyright ? 2003-2007 vtiger.com. Tous droits r?serv?s. +Label2=Copyright ? 2004-2007 vtiger.com. Tous droits r?serv?s. Label3=French by Abos : contact at abonlinesolutions.com Button1=OK Modified: wordintegration/trunk/client/bin/Language/german.ini ============================================================================== Binary files - no diff available. Modified: wordintegration/trunk/client/bin/Language/portuguese.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/portuguese.ini (original) +++ wordintegration/trunk/client/bin/Language/portuguese.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=Portugu?s [vtigerCRM_frmAbout] FormName=Sobre -Label2=Copyright ? 2003-2007 vtiger.com. Todos os direitos reservados. +Label2=Copyright ? 2004-2007 vtiger.com. Todos os direitos reservados. Label3= Button1=OK From isthian at gonzocom.com Thu Mar 15 20:18:16 2007 From: isthian at gonzocom.com (Devilishly H. Storeroom) Date: Fri, 16 Mar 2007 03:18:16 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2264093656.20070316031816@gonzocom.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/a3394f43/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Slavic.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/a3394f43/Slavic.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 22:51:35 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 05:51:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10450 - /vtigercrm/branches/5.0.3/SendReminder.php Message-ID: <20070316055135.E04F87C8069@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 23:51:31 2007 New Revision: 10450 Log: changes made to get application strings. --Minnie Modified: vtigercrm/branches/5.0.3/SendReminder.php Modified: vtigercrm/branches/5.0.3/SendReminder.php ============================================================================== --- vtigercrm/branches/5.0.3/SendReminder.php (original) +++ vtigercrm/branches/5.0.3/SendReminder.php Thu Mar 15 23:51:31 2007 @@ -28,10 +28,13 @@ // Get the list of activity for which reminder needs to be sent -global $adb,$app_strings; +global $adb; global $log; $log =& LoggerManager::getLogger('SendReminder'); $log->debug(" invoked SendReminder "); + +// retrieve the translated strings. +$app_strings = return_application_language($current_language); //modified query for recurring events -Jag $query="select vtiger_crmentity.crmid,vtiger_seactivityrel.crmid as setype,vtiger_activity.*,vtiger_activity_reminder.reminder_time,vtiger_activity_reminder.reminder_sent,vtiger_activity_reminder.recurringid,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_activity_reminder on vtiger_activity.activityid=vtiger_activity_reminder.activity_id left outer join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid where DATE_FORMAT(vtiger_activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' and vtiger_crmentity.crmid != 0 and vtiger_activity.eventstatus = 'Planned' and vtiger_activity_reminder.reminder_sent = 0 group by vtiger_activity.activityid,vtiger_recurringevents.recurringid"; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 23:09:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 06:09:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10451 - /vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Message-ID: <20070316060928.2813C78C392@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 00:09:21 2007 New Revision: 10451 Log: fix for Quote - Decimals for taxes are out of the table, amount history. Fixes #3209 --Minnie Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php ============================================================================== --- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original) +++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Fri Mar 16 00:09:21 2007 @@ -124,10 +124,15 @@ $lineData=array("105",$bottom+49,"94"); $pdf->drawLine($lineData); - $data= $app_strings['LBL_TAX'].": ($group_total_tax_percent %) ".$price_salestax.""; + $data= $app_strings['LBL_TAX'].": ($group_total_tax_percent %)";// ".$price_salestax.""; $pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) ); $pdf->SetFont( "Helvetica", "", 10); $pdf->MultiCell(110, 4, $data); + + //Added for value field alignment + $pdf->SetXY( $space[strlen($price_salestax)] , ($nettotal_y+(2*$next_y)) ); + $pdf->SetFont( "Helvetica", "", 10); + $pdf->MultiCell(110, 4, $price_salestax); $lineData=array("105",$bottom+55,"94"); $pdf->drawLine($lineData); From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 23:44:50 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 06:44:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10452 - in /vtigercrm/branches/5.0.3/Smarty/templates: ActivityDetailView.tpl ActivityEditView.tpl Message-ID: <20070316064450.A725878C392@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 00:44:14 2007 New Revision: 10452 Log: changes made for location field of event. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Fri Mar 16 00:44:14 2007 @@ -128,10 +128,6 @@ {$MOD.LBL_EVENTNAME} {$ACTIVITYDATA.subject} - - {$MOD.LBL_APP_LOCATION} - {$ACTIVITYDATA.location} - {if $LABEL.description neq ''} @@ -139,6 +135,12 @@ {$ACTIVITYDATA.description} {/if} + {if $LABEL.location neq ''} + + {$LABEL.location} + {$ACTIVITYDATA.location} + + {/if} {if $LABEL.eventstatus neq ''} {$LABEL.eventstatus} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Fri Mar 16 00:44:14 2007 @@ -147,13 +147,12 @@ {/if} + {if $LABEL.location neq ''} {$MOD.LBL_APP_LOCATION} - - - + {/if} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 00:40:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 07:40:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10453 - /vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Message-ID: <20070316074038.F226C7C4FE8@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 01:40:34 2007 New Revision: 10453 Log: changes made to display Related to label in Notes detailview. --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Fri Mar 16 01:40:34 2007 @@ -558,6 +558,11 @@ $invoicename= $adb->query_result($result,0,"subject"); $label_fld[] =''.$invoicename.''; + } + elseif($parent_module == "HelpDesk") + { + $label_fld[] = $mod_strings[$fieldlabel]; + $label_fld[] = ''; } } else From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 01:04:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 08:04:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10454 - /vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Message-ID: <20070316080404.55D2378C78E@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 02:03:59 2007 New Revision: 10454 Log: labels added for java script alerts. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Fri Mar 16 02:03:59 2007 @@ -77,7 +77,18 @@ 'LBL_CANCEL_BUTTON'=>'Cancel', 'LBL_UPGRADE_FROM_VTIGER_5X'=>'Upgrade database from vtiger CRM 5.x to next version', 'LBL_PATCH_OR_MIGRATION'=>'you must specify the source database version (Patch update or Migration)', - +//Added for java script alerts +'ENTER_SOURCE_HOST' => 'Please enter the Source Host Name', +'ENTER_SOURCE_MYSQL_PORT' => 'Please enter the Source MySql Port Number', +'ENTER_SOURCE_MYSQL_USER' => 'Please enter the Source MySql User Name', +'ENTER_SOURCE_DATABASE' => 'Please enter the Source Database Name', +'ENTER_SOURCE_MYSQL_DUMP' => 'Please enter the Valid MySQL Dump File', +'ENTER_HOST' => 'Please enter the Host Name', +'ENTER_MYSQL_PORT' => 'Please enter the MySql Port Number', +'ENTER_MYSQL_USER' => 'Please enter the MySql User Name', +'ENTER_DATABASE' => 'Please enter the Database Name', +'SELECT_ANYONE_OPTION' => 'Please select any one option', +'ENTER_CORRECT_MYSQL_PATH' => 'Please enter the Correct MySQL Path', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 01:04:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 08:04:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10455 - /vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl Message-ID: <20070316080448.655867C4FE8@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 02:04:43 2007 New Revision: 10455 Log: labels added for java script alerts. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl Fri Mar 16 02:04:43 2007 @@ -291,22 +291,22 @@ //check whether the user entered the valid Source MySQL database details when db details selected if(trim(formname.old_host_name.value) == '') {ldelim} - error_msg = "Please enter the Source Host Name"; + error_msg = "{$MOD.ENTER_SOURCE_HOST}"; error = true; {rdelim} else if(trim(formname.old_port_no.value) == '') {ldelim} - error_msg = "Please enter the Source MySql Port Number"; + error_msg = "{$MOD.ENTER_SOURCE_MYSQL_PORT}"; error = true; {rdelim} else if(trim(formname.old_mysql_username.value) == '') {ldelim} - error_msg = "Please enter the Source MySql User Name"; + error_msg = "{$MOD.ENTER_SOURCE_MYSQL_USER}"; error = true; {rdelim} else if(trim(formname.old_dbname.value) == '') {ldelim} - error_msg = "Please enter the Source Database Name"; + error_msg = "{$MOD.ENTER_SOURCE_DATABASE}"; error = true; {rdelim} {rdelim} @@ -316,7 +316,7 @@ //check whether the user entered the MySQL File when dump file details selected if(trim(formname.old_dump_filename.value) == '') {ldelim} - error_msg = "Please enter the Valid MySQL Dump File"; + error_msg = "{$MOD.ENTER_SOURCE_MYSQL_DUMP}"; error = true; {rdelim} {rdelim} @@ -326,29 +326,29 @@ //check whether the user entered the valid Source MySQL database details when db details selected if(trim(formname.alter_old_host_name.value) == '') {ldelim} - error_msg = "Please enter the Host Name"; + error_msg = "{$MOD.ENTER_HOST}"; error = true; {rdelim} else if(trim(formname.alter_old_port_no.value) == '') {ldelim} - error_msg = "Please enter the MySql Port Number"; + error_msg = "{$MOD.ENTER_MYSQL_PORT}"; error = true; {rdelim} else if(trim(formname.alter_old_mysql_username.value) == '') {ldelim} - error_msg = "Please enter the MySql User Name"; + error_msg = "{$MOD.ENTER_MYSQL_USER}"; error = true; {rdelim} else if(trim(formname.alter_old_dbname.value) == '') {ldelim} - error_msg = "Please enter the Database Name"; + error_msg = "{$MOD.ENTER_DATABASE}"; error = true; {rdelim} {rdelim} else {ldelim} formname.migration_option.value = ''; - error_msg = "Please select any one option"; + error_msg = "{$MOD.SELECT_ANYONE_OPTION}"; error = true; {rdelim} @@ -358,7 +358,7 @@ if(document.getElementById("getmysqlpath").value == 1 && trim(formname.server_mysql_path.value) == '' && document.getElementById("alter_db_details").checked != true) {ldelim} //alert(document.getElementById("getmysqlpath").value+" Enter the mysql path"); - error_msg = "Please enter the Correct MySQL Path"; + error_msg = "{$MOD.ENTER_CORRECT_MYSQL_PATH}"; error = true; {rdelim} else From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 02:28:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 09:28:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10456 - in /vtigercrm/branches/5.0.3: Smarty/templates/Header.tpl include/RelatedListView.php include/utils/ListViewUtils.php modules/Settings/language/en_us.lang.php modules/Settings/listwordtemplates.php Message-ID: <20070316092850.1ABE57C8060@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 03:28:32 2007 New Revision: 10456 Log: changes made for java script alerts. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Fri Mar 16 03:28:32 2007 @@ -548,6 +548,7 @@ VALID_DISCOUNT_PERCENT:'{$APP.VALID_DISCOUNT_PERCENT}', VALID_DISCOUNT_AMOUNT:'{$APP.VALID_DISCOUNT_AMOUNT}', SELECT_TEMPLATE_TO_MERGE:'{$APP.SELECT_TEMPLATE_TO_MERGE}', + SELECTED_MORE_THAN_ONCE:'{$APP.SELECTED_MORE_THAN_ONCE}', YES:'{$APP.yes}', NO:'{$APP.no}', {rdelim}; Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Fri Mar 16 03:28:32 2007 @@ -244,7 +244,7 @@ $list = ''; - + */ $list_block[$entity_id] = $list_header; } @@ -998,12 +998,13 @@ function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='') { - global $log; + global $log,$app_strings; $log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ..."); global $adb,$current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabname = getParentTab(); + $tabid = getTabid($module); $uicolarr=$field_result[$fieldname]; foreach($uicolarr as $key=>$value) { @@ -1016,15 +1017,32 @@ $colname="activitystatus"; } //Ends - $temp_val = $adb->query_result($list_result,$list_result_count,$colname); + $field_val = $adb->query_result($list_result,$list_result_count,$colname); - if(strlen($temp_val) > 40) + if(strlen($field_val) > 40) { - $temp_val = substr($temp_val,0,40).'...'; + $temp_val = substr($field_val,0,40).'...'; } - if($uitype == 52 || $uitype == 53 || $uitype == 77) + else + { + $temp_val = $field_val; + } + if($uitype == 53) { $value = $adb->query_result($list_result,$list_result_count,'user_name'); + } + elseif($uitype == 52) + { + $value = getUserName($adb->query_result($list_result,$list_result_count,'handler')); + } + elseif($uitype == 77) + { + $value = getUserName($adb->query_result($list_result,$list_result_count,'inventorymanager')); + } + elseif($uitype == 15 && $module == 'Calendar') + { + $activitytype = $adb->query_result($list_result,$list_result_count,$colname); + $value = $app_strings[$activitytype]; } elseif($uitype == 5 || $uitype == 6 || $uitype == 23 || $uitype == 70) { @@ -1072,14 +1090,14 @@ } elseif($uitype == 17) { - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } elseif($uitype == 13 || $uitype == 104) { if(useInternalMailer() == 1) $value = ''.$temp_val.''; else - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } elseif($uitype == 56) { @@ -1340,7 +1358,7 @@ { if($mode == "search") { - if($popuptype == "specific") + if($popuptype == "specific" || $popuptype=="toDospecific") { // Added for get the first name of contact in Popup window if($colname == "lastname" && $module == 'Contacts') @@ -1553,7 +1571,7 @@ $result = $adb->query($query); $contact_image = ''; $imagename=$adb->query_result($result,0,'imagename'); - if($imagename != '') + if($imagename != '') { $imgpath = "test/contact/".$imagename; $contact_image=''; From extremers at grabandt.com Fri Mar 16 10:16:49 2007 From: extremers at grabandt.com (Misalignment U. Heretofore) Date: Fri, 16 Mar 2007 17:16:49 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1616509471.20070316171649@grabandt.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/affcdfcf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: tawdriness.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/affcdfcf/tawdriness-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 10:42:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 17:42:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10463 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Message-ID: <20070316174203.E9A4B7C8091@vtiger.fosslabs.com> Author: jerrydgeorge Date: Fri Mar 16 11:41:56 2007 New Revision: 10463 Log: version and copyright year changed --bharath Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 01:04:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 08:04:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10464 - in /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/language/ include/utils/ install/ Message-ID: <20070317080421.5FCE47C808C@vtiger.fosslabs.com> Author: saraj Date: Sat Mar 17 02:04:01 2007 New Revision: 10464 Log: changes made for alert message. --Minnie Added: vtigercrm/branches/5.0.3/Smarty/templates/JsArray.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl vtigercrm/branches/5.0.3/include/js/ajax.js vtigercrm/branches/5.0.3/include/js/dtlviewajax.js vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/export.php vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Sat Mar 17 02:04:01 2007 @@ -463,96 +463,9 @@ {$trackelements.item_summary}   {/foreach} - + +{include file=JsArray.tpl} +{include file=JsArray.tpl} Modified: vtigercrm/branches/5.0.3/include/js/ajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/ajax.js Sat Mar 17 02:04:01 2007 @@ -81,7 +81,7 @@ var response = me.callback(me.requester); break; default: - alert(alert_arr.ERROR); + alert("Error"); break; } } Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Sat Mar 17 02:04:01 2007 @@ -197,7 +197,7 @@ var port_obj = getObj('portal').checked; if(fieldName == "email" && tagValue == '' && port_obj == true) { - alert('Portal user should provide email id for portal login'); + alert(alert_arr.PORTAL_PROVIDE_EMAILID); return false; } } @@ -279,7 +279,7 @@ var obj = getObj("email"); if((fieldName == "portal") && (obj.value == '')) { - alert("Portal user should provide email Id for portal login"); + alert(alert_arr.PORTAL_PROVIDE_EMAILID); return false; } Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Mar 17 02:04:01 2007 @@ -810,6 +810,8 @@ 'DATABASE_CHANGE_CONFIRMATION' => 'Are you sure to apply the Database Changes from ', 'TO' => ' to ', 'DELETE_RSSFEED_CONFIRMATION' => 'Are you sure to delete the rss feed?', +'NOT_PERMITTED_TO_EXPORT' => 'you are not permitted to export!', + //Added for 5.0.3 'MSG_DEAR'=>'Dear', 'MSG_REGARDING'=>'Regarding', Modified: vtigercrm/branches/5.0.3/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/export.php (original) +++ vtigercrm/branches/5.0.3/include/utils/export.php Sat Mar 17 02:04:01 2007 @@ -32,7 +32,7 @@ require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); -global $allow_exports; +global $allow_exports,$app_strings; session_start(); @@ -60,7 +60,7 @@ ?> Author: saraj Date: Sat Mar 17 03:04:23 2007 New Revision: 10465 Log: display of product name changed Modified: vtigercrm/branches/5.0.3/install/0welcome.php vtigercrm/branches/5.0.3/install/1checkSystem.php Modified: vtigercrm/branches/5.0.3/install/0welcome.php ============================================================================== --- vtigercrm/branches/5.0.3/install/0welcome.php (original) +++ vtigercrm/branches/5.0.3/install/0welcome.php Sat Mar 17 03:04:23 2007 @@ -97,12 +97,12 @@ Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/5.0.3/install/1checkSystem.php (original) +++ vtigercrm/branches/5.0.3/install/1checkSystem.php Sat Mar 17 03:04:23 2007 @@ -334,7 +334,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 02:35:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 09:35:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10466 - /vtigercrm/branches/5.0.3/install/4createConfigFile.php Message-ID: <20070317093553.615CD7C7FB4@vtiger.fosslabs.com> Author: richie Date: Sat Mar 17 03:35:47 2007 New Revision: 10466 Log: added link to forums Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Sat Mar 17 03:35:47 2007 @@ -235,7 +235,7 @@

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



    - The installation will take at least 4 minutes. Grab a coffee,sit back and relax...
    + The installation will take at least 4 minutes. Grab a coffee,sit back and relax or browse through our forums


    From lykim at great2day.com Sat Mar 17 02:43:02 2007 From: lykim at great2day.com (Workman H. Fleshes) Date: Sat, 17 Mar 2007 09:43:02 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6853483197.20070317094302@great2day.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070317/6f2664eb/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: lessens.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070317/6f2664eb/lessens-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 04:19:00 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 11:19:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10467 - /vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Message-ID: <20070317111900.667D67C808A@vtiger.fosslabs.com> Author: richie Date: Sat Mar 17 05:18:09 2007 New Revision: 10467 Log: fixes #3216 Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Sat Mar 17 05:18:09 2007 @@ -50,6 +50,7 @@ if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); + imap_mail_move($MailBox->mbox,$mailid,"Trash"); $email = new Webmails($MailBox->mbox,$mailid); $email->delete(); imap_close($MailBox->mbox); @@ -61,9 +62,10 @@ $MailBox = new MailBox($mailbox); $tlist = explode(":",$mailid); foreach($tlist as $id) { + imap_mail_move($MailBox->mbox,$id,"Trash"); $adb->println("DELETE MULTI MESSAGE $id"); $email = new Webmails($MailBox->mbox,$id); - $email->delete(); + $email->delete(); } imap_close($MailBox->mbox); echo $mailid; From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 04:20:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 11:20:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10468 - /vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Message-ID: <20070317112027.C1D087C808A@vtiger.fosslabs.com> Author: saraj Date: Sat Mar 17 05:20:00 2007 New Revision: 10468 Log: picklist value not displayed Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Sat Mar 17 05:20:00 2007 @@ -37,7 +37,7 @@ {elseif $keyid eq '15' || $keyid eq '16' || $keyid eq '111'} - {elseif $keyid eq '156'} {if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} -
    -

           This Configuration Wizard will create the requisite data needed to get working with vtiger. The entire process should take about four minutes. Click the Start button when you are ready. +

           This Configuration Wizard will create the requisite data needed to get working with vtiger CRM. The entire process should take about four minutes. Click the Start button when you are ready.

    - vtiger CRM 5.0.3 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    vtiger CRM 5.0.3 will not work on mysql 4.0.x versions and PHP 5.2.x versions

    -vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
    +vtiger CRM can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

    The installation wizard will guide you with the installation regardless of the setup you may have.

    Max Execution Time 600
    output_buffering= On
    Change the memory limit = 32M
    error_reporting = E_WARNING & ~E_NOTICE
    error_reporting = E_ALL & ~E_NOTICE
    allow_call_time_reference = On
    log_errors = Off
    short_open_tag= On
     {$APP.$keyval} +  {if $APP.$keyval!=''}{$APP.$keyval}{elseif $MOD.$keyval!=''}{$MOD.$keyval}{else}{$keyval}{/if}  {$APP.$keyval}  +  {if $APP.$keyval!=''}{$APP.$keyval}{elseif $MOD.$keyval!=''}{$MOD.$keyval}{else}{$keyval}{/if} 
    -{include file=JsArray.tpl} + -{include file=JsArray.tpl} + Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Sat Mar 17 06:36:39 2007 @@ -11,6 +11,7 @@ //Utility Functions var gValidationCall=''; +document.write(''); if (document.all) From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 07:33:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 14:33:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10474 - /vtigercrm/branches/5.0.3/modules/Emails/EditView.php Message-ID: <20070317143347.325477C80B2@vtiger.fosslabs.com> Author: richie Date: Sat Mar 17 08:33:41 2007 New Revision: 10474 Log: handles the multiple CCs case Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Sat Mar 17 08:33:41 2007 @@ -120,6 +120,11 @@ } +//Added to set the cc when click reply all +if(isset($_REQUEST['msg_cc']) && $_REQUEST['msg_cc'] != '') +{ + $smarty->assign("MAIL_MSG_CC", $_REQUEST['msg_cc']); +} // Webmails if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != "") { @@ -138,19 +143,20 @@ $webmail = new Webmails($mbox,$mailid); $webmail->loadMail(); - + $hdr = @imap_headerinfo($mbox, $mailid); $smarty->assign('WEBMAIL',"true"); if($_REQUEST["reply"] == "all") { $smarty->assign('TO_MAIL',$webmail->fromaddr); - if(is_array($webmail->cc_list)) + $smarty->assign('CC_MAIL',$hdr->ccaddress); + /*if(is_array($webmail->cc_list)) { $smarty->assign('CC_MAIL',implode(",",$webmail->cc_list).",".implode(",",$webmail->to)); } else { - //to fix #3231 + //Commenting this to fix #3231 // $smarty->assign('CC_MAIL',implode(",",$webmail->to)); - } + }*/ if(preg_match("/RE:/i", $webmail->subject)) $smarty->assign('SUBJECT',$webmail->subject); else @@ -165,7 +171,6 @@ $smarty->assign('SUBJECT',"RE: ".$webmail->subject); } elseif($_REQUEST["forward"] == "true" ) { - //commenting it out to fix #3232 //$smarty->assign('TO_MAIL',$webmail->reply_to[0]); //$smarty->assign('BCC_MAIL',$webmail->to[0]); if(preg_match("/FW:/i", $webmail->subject)) @@ -227,12 +232,6 @@ if (isset($focus->name)) $smarty->assign("NAME", $focus->name); else $smarty->assign("NAME", ""); - -//Added to set the cc when click reply all -if(isset($_REQUEST['msg_cc']) && $_REQUEST['msg_cc'] != '') -{ - $smarty->assign("MAIL_MSG_CC", $_REQUEST['msg_cc']); -} if($focus->mode == 'edit') { From istalkyall at graphicartscenter.net Sat Mar 17 18:22:07 2007 From: istalkyall at graphicartscenter.net (Prefigured O. Foray) Date: Sun, 18 Mar 2007 01:22:07 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4285927201.20070318012207@graphicartscenter.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070318/ebbac718/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: soir.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070318/ebbac718/soir-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 18 22:57:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 05:57:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10475 - in /vtigercrm/branches/5.0.3/modules/Calendar: CalendarCommon.php Save.php TodoSave.php language/en_us.lang.php Message-ID: <20070319055714.23F0A78CA63@vtiger.fosslabs.com> Author: saraj Date: Sun Mar 18 23:57:03 2007 New Revision: 10475 Log: event notification and invitation mail has been changed. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php vtigercrm/branches/5.0.3/modules/Calendar/Save.php vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Sun Mar 18 23:57:03 2007 @@ -305,24 +305,43 @@ $log->debug("Entering getActivityDetails(".$description.") method ..."); $reply = (($description['mode'] == 'edit')?'updated':'created'); + if($description['activity_mode'] == "Events") + { + $end_date_lable=$mod_strings['End date and time']; + } + else + { + $end_date_lable=$mod_strings['End date']; + } if($inviteeid=='') - $name = getUserName($description['user_id']); + { + $name = getUserName($description['user_id']); + $msg = $mod_strings['LBL_ACTIVITY_NOTIFICATION']; + } else - $name = getUserName($inviteeid); + { + $name = getUserName($inviteeid); + $msg = $mod_strings['LBL_ACTIVITY_INVITATION']; + } $current_username = getUserName($current_user->id); $status = $description['status']; $list = $name.','; - $list .= '

    '.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.
    '.$mod_strings['LBL_DETAILS_STRING'].':
    '; + $list .= '

    '.$msg.' '.$reply.'.
    '.$mod_strings['LBL_DETAILS_STRING'].':
    '; $list .= '
          '.$mod_strings["LBL_SUBJECT"].' '.$description['subject']; + $list .= '
          '.$mod_strings["Start date and time"].' : '.$description['st_date_time']; + $list .= '
          '.$end_date_lable.' : '.$description['end_date_time']; $list .= '
          '.$mod_strings["LBL_STATUS"].': '.$status; $list .= '
          '.$mod_strings["Priority"].': '.$description['taskpriority']; - $list .= '
          '.$mod_strings["Related To"].' : '.$description['relatedto']; + $list .= '
          '.$mod_strings["Related To"].': '.$description['relatedto']; if($description['activity_mode'] != 'Events') { $list .= '
          '.$mod_strings["LBL_CONTACT"].' '.$description['contact_name']; } + else + $list .= '
          '.$mod_strings["Location"].' : '.$description['location']; + $list .= '
          '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description['description']; $list .= '

    '.$mod_strings["LBL_REGARDS_STRING"].' ,'; $list .= '
    '.$current_username.'.'; @@ -422,7 +441,11 @@ $send_notification = $adb->query_result($ary_res,0,"sendnotification"); $subject = $adb->query_result($ary_res,0,"subject"); $priority = $adb->query_result($ary_res,0,"priority"); - //$parent_name = $adb->query_result($ary_res,0,"priority"); + $st_date = $adb->query_result($ary_res,0,"date_start"); + $st_time = $adb->query_result($ary_res,0,"time_start"); + $end_date = $adb->query_result($ary_res,0,"due_date"); + $end_time = $adb->query_result($ary_res,0,"time_end"); + $location = $adb->query_result($ary_res,0,"location"); $usr_qry = "select smownerid from vtiger_crmentity where crmid=".$return_id; $res = $adb->query($usr_qry); @@ -468,6 +491,9 @@ $mail_data['description'] = $description; $mail_data['assingn_type'] = $assignType; $mail_data['group_name'] = $grp_name; + $mail_data['st_date_time']=$st_date." ".$st_time; + $mail_data['end_date_time']=$end_date." ".$end_time; + $mail_data['location']=$location; return $mail_data; Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Sun Mar 18 23:57:03 2007 @@ -168,6 +168,9 @@ $mail_data['assingn_type'] = $_REQUEST['assigntype']; $mail_data['group_name'] = $_REQUEST['assigned_group_name']; $mail_data['mode'] = $_REQUEST['mode']; + $mail_data['st_date_time'] = $_REQUEST['date_start']." ".$_REQUEST['time_start']; + $mail_data['end_date_time']=$_REQUEST['due_date']." ".$_REQUEST['time_end']; + $mail_data['location']=$_REQUEST['location']; return $mail_data; } //Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Sun Mar 18 23:57:03 2007 @@ -67,6 +67,8 @@ $mail_data['assingn_type'] = $_REQUEST['task_assigntype']; $mail_data['group_name'] = $_REQUEST['task_assigned_group_name']; $mail_data['mode'] = $_REQUEST['task_mode']; + $mail_data['st_date_time'] = $_REQUEST['task_date_start']." ".$_REQUEST['task_time_start']; + $mail_data['end_date_time']=$_REQUEST['task_due_date']; return $mail_data; } Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Sun Mar 18 23:57:03 2007 @@ -257,7 +257,8 @@ 'LBL_CALENDAR_INFORMATION'=>'Calendar Information', 'LBL_NAME'=>'Subject:', -'LBL_ACTIVITY_STRING'=>'This is a notification that an activity you have been invited to has been', +'LBL_ACTIVITY_NOTIFICATION'=>'This is a notification that an activity is assigned to you that has been', +'LBL_ACTIVITY_INVITATION'=>'You have been invited for an activity that has been ', 'LBL_DETAILS_STRING'=>'The details are', 'LBL_REGARDS_STRING'=>'Thanks & Regards', 'LBL_CONTACT_NAME'=>'Contact Name', @@ -403,6 +404,14 @@ 'Call'=>'Call', 'Meeting'=>'Meeting', +//added to send dates and time in calendar notification/invitation mail. + +'Start date and time'=>'Start Date & Time', +'End date and time'=>'End Date & Time', +//this is for task +'End date'=>'End date', + + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Sun Mar 18 23:18:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 06:18:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10476 - in /vtigercrm/branches/5.0.3: Smarty/templates/Webmails.tpl modules/Webmails/language/en_us.lang.php Message-ID: <20070319061803.29CC07C808A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 00:17:54 2007 New Revision: 10476 Log: fix for i18n issue in Add Folder option. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Mon Mar 19 00:17:54 2007 @@ -54,7 +54,7 @@ ","","","",""); $listview_entries = array(); @@ -283,40 +291,59 @@ $listview_entries[0][] = ''; else { -if(isset($_REQUEST["search"])) { - $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; - //echo $searchstring."
    "; - $searchlist = imap_search($MailBox->mbox,$searchstring); - if(is_array($searchlist)) + if(isset($_REQUEST["search"]) && trim($_REQUEST["search_input"]) != '') { + $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; + //echo $searchstring."
    "; + $searchlist = Array(); + $searchlist = imap_search($MailBox->mbox,$searchstring); + + if(is_array($searchlist)) + { + $num_searches = count($searchlist); + $c=$numEmails; + } + + while ($i<=$c) { + if(is_array($searchlist)) { + for($l=0;$l<$num_searches;$l++) { + if($mails[$start_message]->msgno == $searchlist[$l]) + $listview_entries[] = show_msg($mails,$start_message); + } + } + $i++; + $start_message--; + } + }else { - $num_searches = count($searchlist); - $c=$numEmails; - } -} - -flush(); -// MAIN LOOP -// Main loop to create listview entries - -$i=1; -while ($i<=$c) { - if(is_array($searchlist)) { - for($l=0;$l<$num_searches;$l++) { - if($mails[$start_message]->msgno == $searchlist[$l]) + $i=1; + while ($i<=$c) { + if($start_message > 0) + { $listview_entries[] = show_msg($mails,$start_message); - } - } else { + if($displayed_msgs == $MailBox->mails_per_page) {break;} + } + $i++; + $start_message--; + } + + } + + flush(); + // MAIN LOOP + // Main loop to create listview entries + +} + +$search_html = ''; // Build folder list and move_to dropdown box $list = imap_getmailboxes($MailBox->mbox, "{".$MailBox->imapServerAddress."}", "*"); @@ -336,9 +363,13 @@ $i++; + if($_REQUEST["mailbox"] == '') + $_REQUEST["mailbox"] = 'INBOX'; + if ($_REQUEST["mailbox"] == $tmpval) { - if($tmpval != "INBOX") + /* if($tmpval != "INBOX") $boxes .= ''; - } + } $struct_msg = imap_fetchstructure($mail, $ev); $msg_charset = ''; @@ -804,64 +804,64 @@ } - $subject_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->subject); - $subject_array = $this->mime_header_decode($subject_header); - for ($j = 0; $j < count($subject_array); $j++) + $subject_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->subject); + $subject_array = $this->mime_header_decode($subject_header); + for ($j = 0; $j < count($subject_array); $j++) $subject .= $subject_array[$j]->text; - $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); - $from_array = $this->mime_header_decode($from_header); - for ($j = 0; $j < count($from_array); $j++) - $from .= $from_array[$j]->text; - - $to_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->toaddress); - $to_array = $this->mime_header_decode($to_header); - for ($j = 0; $j < count($to_array); $j++) - $to .= $to_array[$j]->text; - $to = str_replace(',', ', ', $to); - - $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; - $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); - $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; - if ($cc_array != 0) { - for ($j = 0; $j < count($cc_array); $j++) - $cc .= $cc_array[$j]->text; - } - $cc = str_replace(',', ', ', $cc); - - $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; - $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); - $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; - if ($reply_to_array != 0) { - for ($j = 0; $j < count($reply_to_array); $j++) - $reply_to .= $reply_to_array[$j]->text; - } - - $timestamp = chop($ref_contenu_message->udate); - $date = format_date($timestamp, $lang); - $time = format_time($timestamp, $lang); - $content = Array( - 'from' => $from, - 'to' => $to, - 'cc' => $cc, - 'reply_to' => $reply_to, - 'subject' => $subject, - 'date' => $date, - 'time' => $time, - 'complete_date' => $date, - 'att' => $link_att, - 'body' => $this->graphicalsmilies($body), - 'body_mime' => $this->convertLang2Html($tmpvar['mime']), - 'body_transfer' => $this->convertLang2Html($tmpvar['transfer']), - 'header' => $header, - 'verbose' => $verbose, - 'prev' => $prev_msg, - 'next' => $next_msg, - 'msgnum' => $mail, - 'attachtab' => $attach_tab, - 'charset' => $body_charset - ); -return ($content); + $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); + $from_array = $this->mime_header_decode($from_header); + for ($j = 0; $j < count($from_array); $j++) + $from .= $from_array[$j]->text; + + $to_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->toaddress); + $to_array = $this->mime_header_decode($to_header); + for ($j = 0; $j < count($to_array); $j++) + $to .= $to_array[$j]->text; + $to = str_replace(',', ', ', $to); + + $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; + $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); + $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; + if ($cc_array != 0) { + for ($j = 0; $j < count($cc_array); $j++) + $cc .= $cc_array[$j]->text; + } + $cc = str_replace(',', ', ', $cc); + + $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; + $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); + $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; + if ($reply_to_array != 0) { + for ($j = 0; $j < count($reply_to_array); $j++) + $reply_to .= $reply_to_array[$j]->text; + } + + $timestamp = chop($ref_contenu_message->udate); + $date = format_date($timestamp, $lang); + $time = format_time($timestamp, $lang); + $content = Array( + 'from' => $from, + 'to' => $to, + 'cc' => $cc, + 'reply_to' => $reply_to, + 'subject' => $subject, + 'date' => $date, + 'time' => $time, + 'complete_date' => $date, + 'att' => $link_att, + 'body' => $this->graphicalsmilies($body), + 'body_mime' => $this->convertLang2Html($tmpvar['mime']), + 'body_transfer' => $this->convertLang2Html($tmpvar['transfer']), + 'header' => $header, + 'verbose' => $verbose, + 'prev' => $prev_msg, + 'next' => $next_msg, + 'msgnum' => $mail, + 'attachtab' => $attach_tab, + 'charset' => $body_charset + ); + return ($content); } Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Thu Mar 22 03:33:40 2007 @@ -147,12 +147,13 @@ 'LBL_ALLMAILS'=>'All Mails', 'LBL_TO_USERS'=>'To Users', 'LBL_TO_GROUPS'=>'To Groups', -'IN_SUBJECT' => 'in Subject', -'IN_BODY' => 'in Body', -'IN_TO' => 'in To:', -'IN_CC' => 'in CC:', -'IN_BCC' => 'in BCC:', -'IN_FROM' => 'in From:', +'SUBJECT' => 'Subject', +'BODY' => 'Body', +'TO' => 'To:', +'CC' => 'CC:', +'BCC' => 'BCC:', +'FROM' => 'From:', +'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', ); From lovelylb at graffiti2000.com Thu Mar 22 09:41:30 2007 From: lovelylb at graffiti2000.com (Bailiwicks V. Showpiece) Date: Thu, 22 Mar 2007 12:41:30 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <6634071201.20070322124130@graffiti2000.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://unaik.hk Make right choice: buy medications at LegalRXMedications drug store! From samuraichick at giant-bicycles.com Thu Mar 22 15:07:54 2007 From: samuraichick at giant-bicycles.com (Swatter C. Specially) Date: Thu, 22 Mar 2007 22:07:54 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3773083596.20070322220754@giant-bicycles.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6a20ef5c/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: copse.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6a20ef5c/copse-0001.gif From hurley at gripwell.com Thu Mar 22 20:17:50 2007 From: hurley at gripwell.com (Dwindles M. Monroe) Date: Thu, 22 Mar 2007 23:17:50 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <2822840566.20070322231750@gripwell.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://unaik.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From bauer at globexriskmanagement.com Thu Mar 22 18:24:40 2007 From: bauer at globexriskmanagement.com (Overhead K. Bourbaki) Date: Thu, 22 Mar 2007 21:24:40 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7106354497.20070322212440@globexriskmanagement.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://unaik.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From bug at grandhotelrosamarina.com Thu Mar 22 18:02:33 2007 From: bug at grandhotelrosamarina.com (Dimness G. Parterres) Date: Thu, 22 Mar 2007 21:02:33 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <1907849538.20070322210233@grandhotelrosamarina.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://unaik.hk any pill you need! Absolutely Confidential and Secure purchase From bernd.koblitz at gobert.org Thu Mar 22 20:42:42 2007 From: bernd.koblitz at gobert.org (Alleluias S. Reviewing) Date: Fri, 23 Mar 2007 03:42:42 +0000 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <0689937354.20070323034242@gobert.org> The most powerful medicines for you! Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result – a powerful, lasting effect of up to 36 hours. Zinc - $35.99 - naturally produced by human organism mineral. Zinc is important for growth and for the development and health of body tissues. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. and more! our site http://unaik.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From blanchard at giftoflifeinc.org Fri Mar 23 02:59:36 2007 From: blanchard at giftoflifeinc.org (Swopping F. Ideographs) Date: Fri, 23 Mar 2007 05:59:36 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <4652705254.20070323055936@giftoflifeinc.org> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://unaik.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From flo at goyet.net Thu Mar 22 19:19:58 2007 From: flo at goyet.net (Header H. Stiffest) Date: Thu, 22 Mar 2007 22:19:58 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <3002301040.20070322221958@goyet.net> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://unaik.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From t-aota at grapevinerestaurant.com Fri Mar 23 06:11:04 2007 From: t-aota at grapevinerestaurant.com (Surfeits C. Champions) Date: Fri, 23 Mar 2007 09:11:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2560899071.20070323091104@grapevinerestaurant.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/ff53854d/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: gangrene.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/ff53854d/gangrene.gif From crusherko at gigavision.net Fri Mar 23 02:16:17 2007 From: crusherko at gigavision.net (Rosins M. Chrysalis) Date: Fri, 23 Mar 2007 09:16:17 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4567842055.20070323091617@gigavision.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://unaik.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/b19438f7/attachment.html From stanley.budden_y at gothlet.net Fri Mar 23 02:48:46 2007 From: stanley.budden_y at gothlet.net (Blowouts G. Percents) Date: Fri, 23 Mar 2007 05:48:46 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <7611995198.20070323054846@gothlet.net> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://unaik.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From beb at gjcarch.com Fri Mar 23 00:41:55 2007 From: beb at gjcarch.com (Recompilation H. Clarity) Date: Fri, 23 Mar 2007 03:41:55 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <5810265272.20070323034155@gjcarch.com> Most wanted pills at LOW price! http://unaik.hk Instant shipping worldwide! CONFIDENTIAL purchase! From claude at graficascastany.com Fri Mar 23 03:01:49 2007 From: claude at graficascastany.com (Escher U. Precinct) Date: Fri, 23 Mar 2007 06:01:49 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <8950333724.20070323060149@graficascastany.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://unaik.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From angus at greenwellfrazer.com Fri Mar 23 11:12:21 2007 From: angus at greenwellfrazer.com (Solitaries H. Democratized) Date: Fri, 23 Mar 2007 14:12:21 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <6249302386.20070323141221@greenwellfrazer.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://unaik.hk any pill you need! Absolutely Confidential and Secure purchase From istkxycxyewd at gloucswt.cix.co.uk Fri Mar 23 06:27:13 2007 From: istkxycxyewd at gloucswt.cix.co.uk (Slaloming R. Cecile) Date: Fri, 23 Mar 2007 09:27:13 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <7920420710.20070323092713@gloucswt.cix.co.uk> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://frawq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From vicki at gopherhole.com Fri Mar 23 09:53:57 2007 From: vicki at gopherhole.com (Snub E. Mackenzie) Date: Fri, 23 Mar 2007 12:53:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4058515743.20070323125357@gopherhole.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/8ecfd711/attachment.htm From istdochegalwer at granger01.ufpi.com Fri Mar 23 10:14:45 2007 From: istdochegalwer at granger01.ufpi.com (Pussies F. Rowdy) Date: Fri, 23 Mar 2007 17:14:45 +0000 Subject: [Vtigercrm-commits] Need some help? Message-ID: <9649113466.20070323171445@granger01.ufpi.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://frawq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From relocatecanada.a at granitestateplastics.com Fri Mar 23 17:59:59 2007 From: relocatecanada.a at granitestateplastics.com (Flashily U. Mutates) Date: Fri, 23 Mar 2007 20:59:59 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6940526287.20070323205959@granitestateplastics.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/cc530558/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: taxidermists.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/cc530558/taxidermists.gif From extraspace at gregmyersappraisal.com Fri Mar 23 19:55:40 2007 From: extraspace at gregmyersappraisal.com (Cannibalize I. Uphold) Date: Fri, 23 Mar 2007 22:55:40 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <3218184413.20070323225540@gregmyersappraisal.com> Most wanted pills at LOW price! http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From cedar at gregorysigns.com Fri Mar 23 12:32:52 2007 From: cedar at gregorysigns.com (Chandrasekhar Q. Attributing) Date: Fri, 23 Mar 2007 15:32:52 -0400 Subject: [Vtigercrm-commits] Want to be perfect lover? Message-ID: <8957532346.20070323153252@gregorysigns.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://frawq.hk ONLY! From norris at gett.de Fri Mar 23 17:05:12 2007 From: norris at gett.de (Evaporated H. Tawny) Date: Fri, 23 Mar 2007 20:05:12 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <5869218484.20070323200512@gett.de> Most wanted pills at LOW price! http://frawq.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From frimjob at grabatelo.net Fri Mar 23 19:32:35 2007 From: frimjob at grabatelo.net (Godmother Q. Tenets) Date: Sat, 24 Mar 2007 02:32:35 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1289651064.20070324023235@grabatelo.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/2f462110/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: homestretches.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/2f462110/homestretches.gif From afm at goddy-online.de Fri Mar 23 19:42:47 2007 From: afm at goddy-online.de (Closeouts S. Physicist) Date: Fri, 23 Mar 2007 22:42:47 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <4596643512.20070323224247@goddy-online.de> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From phipps at glaces-erhard.com Sat Mar 24 03:50:49 2007 From: phipps at glaces-erhard.com (Dactyl J. Epaulet) Date: Sat, 24 Mar 2007 06:50:49 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <3337567547.20070324065049@glaces-erhard.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istobe at glavey.com Fri Mar 23 20:58:32 2007 From: istobe at glavey.com (Juggler U. Personalized) Date: Fri, 23 Mar 2007 23:58:32 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <5381529954.20070323235832@glavey.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://frawq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From extremtwo at gotohamed.com Sat Mar 24 00:15:16 2007 From: extremtwo at gotohamed.com (Dahlia M. Alzheimer) Date: Sat, 24 Mar 2007 07:15:16 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4644112288.20070324071516@gotohamed.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/cdb32d33/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Lyell.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/cdb32d33/Lyell.gif From thkaaiai at graftoncity.nsw.gov.au Sat Mar 24 07:41:56 2007 From: thkaaiai at graftoncity.nsw.gov.au (Crystal H. Egyptology) Date: Sat, 24 Mar 2007 10:41:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0289219845.20070324104156@graftoncity.nsw.gov.au> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/58797472/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Arcadia.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/58797472/Arcadia-0001.gif From istintegra at gillaroos.com Sat Mar 24 00:41:58 2007 From: istintegra at gillaroos.com (Apt E. Unloosed) Date: Sat, 24 Mar 2007 03:41:58 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <3692151628.20070324034158@gillaroos.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://frawq.hk verified by VISA and certified by CIPA. From angie at goodwinpozzi.com Sat Mar 24 03:23:54 2007 From: angie at goodwinpozzi.com (Resolutes E. Gaberdine) Date: Sat, 24 Mar 2007 06:23:54 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <8508907805.20070324062354@goodwinpozzi.com> The most powerful medicines for you! Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istides at gradgiftlife.com Sat Mar 24 11:52:36 2007 From: istides at gradgiftlife.com (Revivalist H. Headland) Date: Sat, 24 Mar 2007 14:52:36 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <1492496453.20070324145236@gradgiftlife.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istdf at golfhomesinfl.com Sat Mar 24 07:09:55 2007 From: istdf at golfhomesinfl.com (Dr. Joseph Raymond) Date: Sat, 24 Mar 2007 14:09:55 +0000 Subject: [Vtigercrm-commits] Straining yourself when you are with a woman? Message-ID: <0760616398.20070324140955@golfhomesinfl.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/7a0bb38d/attachment.html From extremeroller at girlscouts-kickapoocouncil.org Sat Mar 24 05:39:16 2007 From: extremeroller at girlscouts-kickapoocouncil.org (Plastering O. Mike) Date: Sat, 24 Mar 2007 08:39:16 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <5863993181.20070324083916@girlscouts-kickapoocouncil.org> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://frawq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From jagomes at graphicaroma.com Sat Mar 24 08:39:30 2007 From: jagomes at graphicaroma.com (Rewords R. Anarchy) Date: Sat, 24 Mar 2007 15:39:30 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4032236554.20070324153930@graphicaroma.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5b113a2e/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: misdiagnose.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5b113a2e/misdiagnose.gif From extremerage at giftseasy.com Sat Mar 24 08:32:53 2007 From: extremerage at giftseasy.com (Monstrous U. Mahayanist) Date: Sat, 24 Mar 2007 11:32:53 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <0620044443.20070324113253@giftseasy.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://frawq.hk Instant shipping worldwide! CONFIDENTIAL purchase! From crushermbw at grab-it.com Sat Mar 24 11:36:41 2007 From: crushermbw at grab-it.com (Snootiest D. Preshrinking) Date: Sat, 24 Mar 2007 14:36:41 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2418814593.20070324143641@grab-it.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/cf030274/attachment.htm From davila at globalmakana.com Sat Mar 24 18:33:02 2007 From: davila at globalmakana.com (Macram G. Roundness) Date: Sat, 24 Mar 2007 21:33:02 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1167962232.20070324213302@globalmakana.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5d8b7345/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pickerels.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5d8b7345/pickerels-0001.gif From swain at gregsearcy.com Sat Mar 24 21:38:50 2007 From: swain at gregsearcy.com (Ronald P. Tinker) Date: Sun, 25 Mar 2007 00:38:50 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <2339224658.20070325003850@gregsearcy.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://frawq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From extremesam at gosailnow.com Sat Mar 24 16:46:39 2007 From: extremesam at gosailnow.com (Debates G. Squished) Date: Sat, 24 Mar 2007 23:46:39 +0000 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <2651257838.20070324234639@gosailnow.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremedt at goldenembryo.net Sat Mar 24 15:08:10 2007 From: extremedt at goldenembryo.net (Adrift T. Colette) Date: Sat, 24 Mar 2007 18:08:10 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <0321610226.20070324180810@goldenembryo.net> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From kate at goedzo.com Sat Mar 24 17:43:02 2007 From: kate at goedzo.com (Nominating P. Aristocratic) Date: Sat, 24 Mar 2007 20:43:02 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <9274236653.20070324204302@goedzo.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://frawq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From asa at gottfried-stiller.com Sat Mar 24 20:18:19 2007 From: asa at gottfried-stiller.com (Filament U. Embarrassments) Date: Sat, 24 Mar 2007 23:18:19 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <6338576513.20070324231819@gottfried-stiller.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://frawq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From extranorm at getchaos.com Sat Mar 24 21:59:52 2007 From: extranorm at getchaos.com (Patrician O. Gadsden) Date: Sun, 25 Mar 2007 04:59:52 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5282760799.20070325045952@getchaos.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/e4e6cb4c/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: reconstruct.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/e4e6cb4c/reconstruct.gif From istanboy at goldbust.com Sun Mar 25 06:01:09 2007 From: istanboy at goldbust.com (Biker Q. Specials) Date: Sun, 25 Mar 2007 09:01:09 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8353801566.20070325090109@goldbust.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From chris at gise.org Sun Mar 25 01:05:05 2007 From: chris at gise.org (Atoll T. Muckraker) Date: Sun, 25 Mar 2007 08:05:05 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5769201715.20070325080505@gise.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/b7009abc/attachment.html From bates at globalimmigrationservices.com Sun Mar 25 06:52:00 2007 From: bates at globalimmigrationservices.com (Millicent L. Ligament) Date: Sun, 25 Mar 2007 09:52:00 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4507369006.20070325095200@globalimmigrationservices.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/14fc9fc8/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: hayloft.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/14fc9fc8/hayloft-0001.gif From logan at graytechintl.com Sat Mar 24 23:03:34 2007 From: logan at graytechintl.com (Executioner T. Medically) Date: Sun, 25 Mar 2007 02:03:34 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <1070527706.20070325020334@graytechintl.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://frawq.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From npetersen at gownsales.com Sun Mar 25 02:05:03 2007 From: npetersen at gownsales.com (Subliminally P. Brocades) Date: Sun, 25 Mar 2007 05:05:03 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <0045355296.20070325050503@gownsales.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://frawq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From wiseman at greenvillechamber.org Sun Mar 25 05:22:22 2007 From: wiseman at greenvillechamber.org (Pompousness H. Beep) Date: Sun, 25 Mar 2007 08:22:22 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <0657592430.20070325082222@greenvillechamber.org> The most powerful medicines for you! Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isszhao at dmhosting.g.ysm.yahoo.com Sun Mar 25 12:37:27 2007 From: isszhao at dmhosting.g.ysm.yahoo.com (Pitying B. Parches) Date: Sun, 25 Mar 2007 15:37:27 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <0239175204.20070325153727@greatfaith.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://frawq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From lkj at web.ultrarpm.com Sun Mar 25 09:52:11 2007 From: lkj at web.ultrarpm.com (Handpick L. Stadiums) Date: Sun, 25 Mar 2007 16:52:11 +0000 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7567210383.20070325165211@graphic.bignewideas.net> Most wanted pills at LOW price! http://frawq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From extremecod at goodfear.com Sun Mar 25 07:09:39 2007 From: extremecod at goodfear.com (Threading V. Mattered) Date: Sun, 25 Mar 2007 10:09:39 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <3645598644.20070325100939@goodfear.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From savage at gravdal.net Sun Mar 25 07:58:47 2007 From: savage at gravdal.net (Dynamism Q. Antacid) Date: Sun, 25 Mar 2007 10:58:47 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <5788771084.20070325105847@gravdal.net> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://frawq.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From linzhengsong at graphicventuresinc.com Sun Mar 25 10:44:14 2007 From: linzhengsong at graphicventuresinc.com (Circuit U. Marduk) Date: Sun, 25 Mar 2007 17:44:14 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1576030935.20070325174414@graphicventuresinc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/a9671eb9/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: template.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/a9671eb9/template.gif From bride at goquepos.com Sun Mar 25 12:44:57 2007 From: bride at goquepos.com (Bouncier I. Dearly) Date: Sun, 25 Mar 2007 15:44:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4190027668.20070325154457@goquepos.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/30fb56ba/attachment.htm From jesse at greatfinancialfreedom.com Sun Mar 25 17:44:06 2007 From: jesse at greatfinancialfreedom.com (Employment E. Bobs) Date: Sun, 25 Mar 2007 20:44:06 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4795205235.20070325204406@greatfinancialfreedom.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/25f83963/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: satellite.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/25f83963/satellite-0001.gif From istmena at gianlucabove.com Sun Mar 25 17:44:39 2007 From: istmena at gianlucabove.com (Zap K. Pilate) Date: Sun, 25 Mar 2007 20:44:39 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9064056875.20070325204439@gianlucabove.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/97e9bf29/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Ptolemy.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/97e9bf29/Ptolemy.gif From istau at greattoday.com Sun Mar 25 20:40:05 2007 From: istau at greattoday.com (Retarding M. Tiebreaker) Date: Sun, 25 Mar 2007 23:40:05 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <4134749214.20070325234005@greattoday.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://frawq.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From marie at grmgmt.com Sun Mar 25 15:36:44 2007 From: marie at grmgmt.com (Blundering U. Argumentation) Date: Sun, 25 Mar 2007 18:36:44 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <1538376803.20070325183644@grmgmt.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://frawq.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From triplett at glo.uk.com Sun Mar 25 16:13:01 2007 From: triplett at glo.uk.com (Repulses P. Grebe) Date: Sun, 25 Mar 2007 19:13:01 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <7432944378.20070325191301@glo.uk.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://frawq.hk Only Secure and Confidential purchase! Verified buy VISA! From emc at goldberryuk.com Sun Mar 25 19:36:00 2007 From: emc at goldberryuk.com (Iterates T. Plaiting) Date: Sun, 25 Mar 2007 22:36:00 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <7168569947.20070325223600@goldberryuk.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From zsemilk at glycoboy.com Sun Mar 25 20:19:48 2007 From: zsemilk at glycoboy.com (Vicariously A. Sculls) Date: Mon, 26 Mar 2007 03:19:48 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1224550805.20070326031948@glycoboy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/6ea78ecb/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: hellish.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/6ea78ecb/hellish-0001.gif From sandrafountain at gokugirl.com Sun Mar 25 23:28:13 2007 From: sandrafountain at gokugirl.com (Lute I. Behooving) Date: Mon, 26 Mar 2007 06:28:13 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8307544172.20070326062813@gokugirl.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/dd599d41/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: instructive.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/dd599d41/instructive.gif From nix at gilescounty-tn.us Mon Mar 26 04:49:29 2007 From: nix at gilescounty-tn.us (Herring J. Cline) Date: Mon, 26 Mar 2007 07:49:29 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <5917731884.20070326074929@gilescounty-tn.us> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From alford at gocoffs.com Mon Mar 26 05:05:22 2007 From: alford at gocoffs.com (Oceangoing G. Outselling) Date: Mon, 26 Mar 2007 08:05:22 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9925885629.20070326080522@gocoffs.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/f3b77f70/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: minefield.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/f3b77f70/minefield.gif From isthatue at globalburnfire.com Sun Mar 25 23:29:24 2007 From: isthatue at globalburnfire.com (Tenets K. Euripides) Date: Mon, 26 Mar 2007 02:29:24 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <9922947197.20070326022924@globalburnfire.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From engel at goldberglaw.us Mon Mar 26 01:32:45 2007 From: engel at goldberglaw.us (Sunbathers T. Defections) Date: Mon, 26 Mar 2007 04:32:45 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <4553075430.20070326043245@goldberglaw.us> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremelyinked at glassboxdesign.com Mon Mar 26 04:39:18 2007 From: extremelyinked at glassboxdesign.com (Duping O. Follicles) Date: Mon, 26 Mar 2007 07:39:18 -0400 Subject: [Vtigercrm-commits] Health for sale! Message-ID: <7526090117.20070326073918@glassboxdesign.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From hinkle at gothmail.net Mon Mar 26 06:13:01 2007 From: hinkle at gothmail.net (Dr. Donald Nichols) Date: Mon, 26 Mar 2007 13:13:01 +0000 Subject: [Vtigercrm-commits] Nobody will know about your problems. Message-ID: <6343427560.20070326131301@gothmail.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/3442627b/attachment.html From foo at graul.com Mon Mar 26 12:30:54 2007 From: foo at graul.com (Creature K. Swinburne) Date: Mon, 26 Mar 2007 15:30:54 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <9990283722.20070326153054@graul.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://frawq.hk Verified by VISA and sell FDA Approved Drugs only! From rienk_koolstra at goldman-rosen.com Mon Mar 26 07:28:41 2007 From: rienk_koolstra at goldman-rosen.com (Cruciform O. Perspicuity) Date: Mon, 26 Mar 2007 10:28:41 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <1603942667.20070326102841@goldman-rosen.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://frawq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From ddd at giguereassoc.com Mon Mar 26 15:15:52 2007 From: ddd at giguereassoc.com (Imbalance M. Ills) Date: Mon, 26 Mar 2007 18:15:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8064774724.20070326181552@giguereassoc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/64a6f623/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: chambermaid.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/64a6f623/chambermaid.gif From istanbulneo at greatxchange.com Mon Mar 26 09:34:58 2007 From: istanbulneo at greatxchange.com (Selvedged K. Uphill) Date: Mon, 26 Mar 2007 12:34:58 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <2893762330.20070326123458@greatxchange.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From barnard at ghc.ctc.edu Mon Mar 26 12:49:47 2007 From: barnard at ghc.ctc.edu (Grenades Q. Transfiguration) Date: Mon, 26 Mar 2007 15:49:47 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3758337079.20070326154947@ghc.ctc.edu> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/57134e8e/attachment.htm From ks at getzel.com Mon Mar 26 14:23:40 2007 From: ks at getzel.com (Kim R. Disgraceful) Date: Mon, 26 Mar 2007 21:23:40 +0000 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <0683075071.20070326212340@getzel.com> The most powerful medicines for you! Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lovett at goldensalesco.com Mon Mar 26 20:38:38 2007 From: lovett at goldensalesco.com (Kiss Q. Lied) Date: Mon, 26 Mar 2007 23:38:38 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <3248774294.20070326233838@goldensalesco.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://frawq.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From extremespo at gilkatho.com.au Mon Mar 26 16:25:05 2007 From: extremespo at gilkatho.com.au (Psychoanalysis E. Kalashnikov) Date: Mon, 26 Mar 2007 19:25:05 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <4749246139.20070326192505@gilkatho.com.au> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://frawq.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extremeszero at grigolla.net Mon Mar 26 16:55:33 2007 From: extremeszero at grigolla.net (Tallyhos A. Futility) Date: Mon, 26 Mar 2007 19:55:33 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <0350609977.20070326195533@grigolla.net> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From training at gomoose.com Mon Mar 26 20:52:03 2007 From: training at gomoose.com (Thou H. Inescapable) Date: Mon, 26 Mar 2007 23:52:03 -0400 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <1794737529.20070326235203@gomoose.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://frawq.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From gallagher at ginapete.com Tue Mar 27 02:48:13 2007 From: gallagher at ginapete.com (Intercourse D. Aymara) Date: Tue, 27 Mar 2007 05:48:13 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0056878717.20070327054813@ginapete.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/9cf146a9/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: sentiments.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/9cf146a9/sentiments.gif From aero at gglenn.com Mon Mar 26 22:05:25 2007 From: aero at gglenn.com (Fawkes J. Quaffed) Date: Tue, 27 Mar 2007 05:05:25 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9514066199.20070327050525@gglenn.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/a912a21a/attachment.html From riestrueh at goldeneggproductions.com Tue Mar 27 05:00:01 2007 From: riestrueh at goldeneggproductions.com (McDaniel V. Madagascan) Date: Tue, 27 Mar 2007 08:00:01 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <0932042650.20070327080001@goldeneggproductions.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://frawq.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From extrama at gillespie.com Tue Mar 27 00:27:14 2007 From: extrama at gillespie.com (Jellyfishes T. Countryside) Date: Tue, 27 Mar 2007 07:27:14 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9871650299.20070327072714@gillespie.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/4e40ed9a/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: dwellings.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/4e40ed9a/dwellings-0001.gif From extremehen at grbnet.com Tue Mar 27 00:31:25 2007 From: extremehen at grbnet.com (Hate I. Crown) Date: Tue, 27 Mar 2007 03:31:25 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <8824204879.20070327033125@grbnet.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://frawq.hk any pill you need! Absolutely Confidential and Secure purchase From istolz at goapolice.org Tue Mar 27 04:27:36 2007 From: istolz at goapolice.org (Ghettos D. Lucy) Date: Tue, 27 Mar 2007 07:27:36 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <9643857352.20070327072736@goapolice.org> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From seb_f at goaio.com Tue Mar 27 02:56:54 2007 From: seb_f at goaio.com (Technologically T. Gypsies) Date: Tue, 27 Mar 2007 05:56:54 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <3452072305.20070327055654@goaio.com> Most wanted pills at LOW price! http://frawq.hk ONLY! From istoleurgf at goodpet.com Tue Mar 27 05:52:46 2007 From: istoleurgf at goodpet.com (Salter D. Straightjacket) Date: Tue, 27 Mar 2007 12:52:46 +0000 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <8284623446.20070327125246@goodpet.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://frawq.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From extreme_pain at grigri.eng.ascend.com Tue Mar 27 13:08:49 2007 From: extreme_pain at grigri.eng.ascend.com (Steppes V. Inpatients) Date: Tue, 27 Mar 2007 16:08:49 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <2629396670.20070327160849@grigri.eng.ascend.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://frawq.hk ONLY! From knapp at gregy.com Tue Mar 27 13:10:17 2007 From: knapp at gregy.com (Tuscarora S. Pawpaws) Date: Tue, 27 Mar 2007 16:10:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9817813910.20070327161017@gregy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/caab1ccd/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: peerless.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/caab1ccd/peerless.gif From nccasey at graphichorizonsinc.com Tue Mar 27 06:35:07 2007 From: nccasey at graphichorizonsinc.com (Trifler C. Daumier) Date: Tue, 27 Mar 2007 09:35:07 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <1970369717.20070327093507@graphichorizonsinc.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From nanard at goodprinters.com Tue Mar 27 11:43:58 2007 From: nanard at goodprinters.com (Cashing M. Marshy) Date: Tue, 27 Mar 2007 14:43:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6462639811.20070327144358@goodprinters.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/88573e17/attachment.htm From ponce at greenfieldfeeders.com Tue Mar 27 12:58:46 2007 From: ponce at greenfieldfeeders.com (Dignities T. Enfeeble) Date: Tue, 27 Mar 2007 19:58:46 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8133653384.20070327195846@greenfieldfeeders.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/f863ab17/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: alleys.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/f863ab17/alleys-0001.gif From extrakulkille at grainesvoltz.com Tue Mar 27 11:17:31 2007 From: extrakulkille at grainesvoltz.com (Tubing U. Rubs) Date: Tue, 27 Mar 2007 14:17:31 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <9240897881.20070327141731@grainesvoltz.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://frawq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From aplus at giftsofgratitude.com Tue Mar 27 14:54:45 2007 From: aplus at giftsofgratitude.com (Epaulets D. Brad) Date: Tue, 27 Mar 2007 21:54:45 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6429523598.20070327215445@giftsofgratitude.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/c6345c09/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: fuze.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/c6345c09/fuze.gif From extreme_bikes at grandecosse.com Tue Mar 27 20:39:04 2007 From: extreme_bikes at grandecosse.com (Lariats K. Leashes) Date: Tue, 27 Mar 2007 23:39:04 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <0838895788.20070327233904@grandecosse.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://frawq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istkris at glendoralaw.com Tue Mar 27 14:23:11 2007 From: istkris at glendoralaw.com (Foregrounded L. Definitively) Date: Tue, 27 Mar 2007 17:23:11 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <7561047200.20070327172311@glendoralaw.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://foop.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From register at goodsamcenter.com Tue Mar 27 23:06:50 2007 From: register at goodsamcenter.com (Thigh K. Dawdler) Date: Wed, 28 Mar 2007 02:06:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0094075760.20070328020650@goodsamcenter.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/abd84bf4/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Ladonna.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/abd84bf4/Ladonna-0001.gif From samuraichick at greatit.net Tue Mar 27 18:42:27 2007 From: samuraichick at greatit.net (Obstructionist H. Bomber) Date: Tue, 27 Mar 2007 21:42:27 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <8580015559.20070327214227@greatit.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://foop.hk Instant shipping worldwide! CONFIDENTIAL purchase! From security at eBay.com Tue Mar 27 05:56:20 2007 From: security at eBay.com (eBay) Date: 27 Mar 2007 14:56:20 +0200 Subject: [Vtigercrm-commits] eBay account information Message-ID: <1175000180.76613.qmail@eBay.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/ec287804/attachment.html From mejia at greenbutton.com Tue Mar 27 19:34:48 2007 From: mejia at greenbutton.com (Distorter D. Holing) Date: Tue, 27 Mar 2007 22:34:48 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <5343342394.20070327223448@greenbutton.com> Most wanted pills at LOW price! http://foop.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From penneyj at goquepos.com Tue Mar 27 23:08:37 2007 From: penneyj at goquepos.com (Dr. Kristen Holden) Date: Wed, 28 Mar 2007 06:08:37 +0000 Subject: [Vtigercrm-commits] Can't find must-have meds at your local drug store? Message-ID: <7273573302.20070328060837@goquepos.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/9896fe0d/attachment.htm From issyo_toyonaka at gpartners.com Wed Mar 28 04:09:55 2007 From: issyo_toyonaka at gpartners.com (Musicologists E. Refinish) Date: Wed, 28 Mar 2007 07:09:55 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <9561337611.20070328070955@gpartners.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://foop.hk Instant shipping worldwide! CONFIDENTIAL purchase! From alex at glcc.on.ca Tue Mar 27 21:22:47 2007 From: alex at glcc.on.ca (Rotes D. Tels) Date: Wed, 28 Mar 2007 00:22:47 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <6386906348.20070328002247@glcc.on.ca> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://foop.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From satan at gladwinag.com Wed Mar 28 01:52:53 2007 From: satan at gladwinag.com (Could B. Domestication) Date: Wed, 28 Mar 2007 04:52:53 -0400 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <4604055684.20070328045253@gladwinag.com> The most powerful medicines for you! Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. and more! our site http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From eva at golobulos1000.freeserve.co.uk Wed Mar 28 09:36:31 2007 From: eva at golobulos1000.freeserve.co.uk (Lashes G. Miking) Date: Wed, 28 Mar 2007 12:36:31 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8248221349.20070328123631@golobulos1000.freeserve.co.uk> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/08c1c50e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: rigged.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/08c1c50e/rigged.gif From p_phillups at greatest.saveexpert.net Wed Mar 28 02:22:21 2007 From: p_phillups at greatest.saveexpert.net (Transvestism V. Lyceums) Date: Wed, 28 Mar 2007 05:22:21 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <8442257851.20070328052221@greatest.saveexpert.net> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://foop.hk any pill you need! Absolutely Confidential and Secure purchase From clayton at gonetoparis.com Wed Mar 28 06:25:40 2007 From: clayton at gonetoparis.com (Incrimination Q. Vulcanize) Date: Wed, 28 Mar 2007 13:25:40 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7147285649.20070328132540@gonetoparis.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/3bf6c1fa/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: finagle.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/3bf6c1fa/finagle.gif From morgan at godspeedonwheels.com Wed Mar 28 07:09:27 2007 From: morgan at godspeedonwheels.com (Ditty E. Backing) Date: Wed, 28 Mar 2007 14:09:27 +0000 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <3062348730.20070328140927@godspeedonwheels.com> The most powerful medicines for you! Ultram - $1.83 - an analgesic used to treat or prevent pain. Ultram - $1.83 - an analgesic used to treat or prevent pain. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. and more! our site http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From keys at goreplicas.com Wed Mar 28 12:31:04 2007 From: keys at goreplicas.com (Airway J. Oxymorons) Date: Wed, 28 Mar 2007 15:31:04 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <1767638225.20070328153104@goreplicas.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://foop.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From jdevers at goofy.canada.ingr.com Wed Mar 28 06:06:43 2007 From: jdevers at goofy.canada.ingr.com (Apollo D. Discommodes) Date: Wed, 28 Mar 2007 09:06:43 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <8697033660.20070328090643@goofy.canada.ingr.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://foop.hk verified by VISA and certified by CIPA. From istkntkhat at groatmachinery.com Wed Mar 28 09:21:11 2007 From: istkntkhat at groatmachinery.com (Dispatched R. Gruffness) Date: Wed, 28 Mar 2007 12:21:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2168227214.20070328122111@groatmachinery.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/862506fb/attachment.html From davdr at glassworksseattle.com Wed Mar 28 11:39:00 2007 From: davdr at glassworksseattle.com (Discussions M. Photoelectric) Date: Wed, 28 Mar 2007 14:39:00 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <4886052603.20070328143900@glassworksseattle.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://foop.hk Only Secure and Confidential purchase! Verified buy VISA! From boss at greta-pays-basque.com Wed Mar 28 14:42:34 2007 From: boss at greta-pays-basque.com (Workdays V. Sprat) Date: Wed, 28 Mar 2007 21:42:34 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3622680274.20070328214234@greta-pays-basque.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/094c7db3/attachment.htm From william at golf-apparel-brands.com Wed Mar 28 20:15:14 2007 From: william at golf-apparel-brands.com (Gaffe J. Lutheranism) Date: Wed, 28 Mar 2007 23:15:14 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7302333443.20070328231514@golf-apparel-brands.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/028eba8b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bloodies.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/028eba8b/bloodies-0001.gif From general at gregorysigns.com Wed Mar 28 13:23:43 2007 From: general at gregorysigns.com (Enchilada H. Diamond) Date: Wed, 28 Mar 2007 16:23:43 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <4282110423.20070328162343@gregorysigns.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://foop.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From godfrey at goamericana.com Wed Mar 28 21:02:07 2007 From: godfrey at goamericana.com (Ombudsmen S. Disconsolate) Date: Thu, 29 Mar 2007 00:02:07 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <5682855272.20070329000207@goamericana.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://foop.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From jemelors at greersport.com Wed Mar 28 17:14:05 2007 From: jemelors at greersport.com (Carter T. Drawbridge) Date: Wed, 28 Mar 2007 20:14:05 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <2355332393.20070328201405@greersport.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://foop.hk Verified by VISA and sell FDA Approved Drugs only! From issybowl at giorgioskory.com Wed Mar 28 20:02:30 2007 From: issybowl at giorgioskory.com (Izanami P. Humility) Date: Thu, 29 Mar 2007 03:02:30 +0000 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <9995448365.20070329030230@giorgioskory.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://foop.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From hackett at gilberthunter.com Wed Mar 28 20:57:31 2007 From: hackett at gilberthunter.com (Sudan R. Watermelons) Date: Thu, 29 Mar 2007 03:57:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9069168920.20070329035731@gilberthunter.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/ed4cccfa/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Zachary.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/ed4cccfa/Zachary.gif From its at godonna.com Wed Mar 28 18:15:56 2007 From: its at godonna.com (Swaziland H. Resuscitators) Date: Wed, 28 Mar 2007 21:15:56 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <9765189289.20070328211556@godonna.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://foop.hk Make right choice: buy medications at LegalRXMedications drug store! From istana at gpm-probation.com Wed Mar 28 19:08:46 2007 From: istana at gpm-probation.com (Eateries I. Unsheathes) Date: Wed, 28 Mar 2007 22:08:46 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <6502739305.20070328220846@gpm-probation.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://foop.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From bnk_d at gokartpartsonline.com Thu Mar 29 02:47:25 2007 From: bnk_d at gokartpartsonline.com (Hallucinates H. Asturias) Date: Thu, 29 Mar 2007 05:47:25 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <9612881191.20070329054725@gokartpartsonline.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://foop.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From banks at greenford-scouts.freeserve.co.uk Wed Mar 28 22:36:50 2007 From: banks at greenford-scouts.freeserve.co.uk (Rick B. Sortie) Date: Thu, 29 Mar 2007 01:36:50 -0400 Subject: [Vtigercrm-commits] US Drugs pharmacy Message-ID: <7755246843.20070329013650@greenford-scouts.freeserve.co.uk> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isterio at gregoryfineportraits.com Thu Mar 29 03:52:24 2007 From: isterio at gregoryfineportraits.com (Showing H. Carrillo) Date: Thu, 29 Mar 2007 06:52:24 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6474450007.20070329065224@gregoryfineportraits.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/01f56b9e/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Socratic.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/01f56b9e/Socratic-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 02:00:32 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 09:00:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10517 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070329090032.891057D260E@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 03:00:23 2007 New Revision: 10517 Log: Changed the format of message Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Thu Mar 29 03:00:23 2007 @@ -136,14 +136,15 @@
    • -
    • You are the most important to us! We take pride in being associated with you -
    +
  • You are the most important to us! +
  • We take pride in being associated with you
  • Talk to us at forums

    Discuss with us at blogs

    - We aim to be - simply the best. Come on over, there is space for you too! + We aim to be -simply the best.Come on over,there is space for you too! + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 02:20:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 09:20:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10518 - /vtigercrm/branches/5.0.3/tabdata.php Message-ID: <20070329092009.101BF7C7FF9@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 03:20:04 2007 New Revision: 10518 Log: * Added entry for Users module which was missed earlier Modified: vtigercrm/branches/5.0.3/tabdata.php Modified: vtigercrm/branches/5.0.3/tabdata.php ============================================================================== --- vtigercrm/branches/5.0.3/tabdata.php (original) +++ vtigercrm/branches/5.0.3/tabdata.php Thu Mar 29 03:20:04 2007 @@ -11,7 +11,7 @@ //This file contains the commonly used variables -$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,); +$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,'Users'=>29,); $tab_seq_array=array('3'=>0,'7'=>0,'6'=>0,'4'=>0,'2'=>0,'8'=>0,'9'=>0,'10'=>0,'13'=>0,'14'=>0,'1'=>0,'15'=>0,'16'=>2,'18'=>0,'19'=>0,'20'=>0,'21'=>0,'22'=>0,'23'=>0,'24'=>0,'25'=>0,'26'=>0,'27'=>0,'28'=>0,); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 02:29:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 09:29:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10519 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070329092922.2808E7D2606@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 03:29:16 2007 New Revision: 10519 Log: Message added for the currency configuration Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Thu Mar 29 03:29:16 2007 @@ -1,525 +1,528 @@ -$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; - - if (isset($_REQUEST['db_username'])) - $db_username = $_REQUEST['db_username']; - elseif (isset($dbconfig['db_username'])) - $db_username = $dbconfig['db_username']; - - if (isset($_REQUEST['db_password'])) - $db_password = $_REQUEST['db_password']; - elseif (isset($dbconfig['db_password'])) - $db_password = $dbconfig['db_password']; - - if (isset($_REQUEST['db_type'])) - $db_type = $_REQUEST['db_type']; - elseif (isset($dbconfig['db_type'])) - $db_type = $dbconfig['db_type']; - - if (isset($_REQUEST['db_name'])) - $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') - $db_name = $dbconfig['db_name']; - else - $db_name = 'vtigercrm503'; - - !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']; - elseif (isset($site_URL) && $site_URL!='_SITE_URL_') - $site_URL = $site_URL; - else $site_URL = $web_root; - - if(isset($_REQUEST['root_directory'])) $root_directory = $_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']; - - if (isset($_REQUEST['currency_name'])) - $currency_name = $_REQUEST['currency_name']; - else - $currency_name = ''; - - if (isset($_REQUEST['currency_symbol'])) - $currency_symbol = $_REQUEST['currency_symbol']; - - if (isset($_REQUEST['currency_code'])) - $currency_code = $_REQUEST['currency_code']; - - } - else { - !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm503" : $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']; - } - !isset($_REQUEST['check_createdb']) ? $check_createdb = "" : $check_createdb = $_REQUEST['check_createdb']; - !isset($_REQUEST['root_user']) ? $root_user = "" : $root_user = $_REQUEST['root_user']; - !isset($_REQUEST['root_password']) ? $root_password = "" : $root_password = $_REQUEST['root_password']; - // determine database options - $db_options = array(); - if(function_exists('mysql_connect')) { - $db_options['mysql'] = 'MySQL'; - } - if(function_exists('pg_connect')) { - $db_options['pgsql'] = 'Postgres'; - } -?> - - - - - - vtiger CRM 5 - Configuration Wizard - System Configuration - - - - - - - - -


    - - -

    -  {$MOD.LBL_MY_MAILS}   +  {$MOD.LBL_MY_MAILS}  
      @@ -117,12 +117,12 @@ {$APP.LBL_SEARCH}     
    Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Mon Mar 19 00:17:54 2007 @@ -147,5 +147,13 @@ 'LBL_ALLMAILS'=>'All Mails', 'LBL_TO_USERS'=>'To Users', 'LBL_TO_GROUPS'=>'To Groups', +'IN_SUBJECT' => 'in Subject', +'IN_BODY' => 'in Body', +'IN_TO' => 'in To:', +'IN_CC' => 'in CC:', +'IN_BCC' => 'in BCC:', +'IN_FROM' => 'in From:', +'ADD_FOLDER' => 'Add Folder[X]', + ); ?> From flynn at globallinksdubai.com Mon Mar 19 03:39:30 2007 From: flynn at globallinksdubai.com (Dungarees S. Girlhood) Date: Mon, 19 Mar 2007 10:39:30 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2287205315.20070319103930@globallinksdubai.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070319/39db33c6/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: unlace.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070319/39db33c6/unlace.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 06:14:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 13:14:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10477 - in /vtigercrm/branches/5.0.3/include/utils: DeleteUtils.php ListViewUtils.php Message-ID: <20070319131417.59D397C80EB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 07:14:12 2007 New Revision: 10477 Log: fix for Accounts relationship when delete accounts. --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Mon Mar 19 07:14:12 2007 @@ -389,14 +389,14 @@ $adb->query($sql); } //Deleting Account related Sales Orders. - $so_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_salesorder on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid where vtiger_crmentity.deleted=0 and vtiger_salesorder.accountid=".$record; + /*$so_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_salesorder on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid where vtiger_crmentity.deleted=0 and vtiger_salesorder.accountid=".$record; $so_res = $adb->query($so_q); for($k=0;$k < $adb->num_rows($so_res);$k++) { $so_id = $adb->query_result($so_res,$k,"crmid"); $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$so_id; $adb->query($sql); - } + }*/ //Deleting Account related Quotes. $quo_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_quotes on vtiger_crmentity.crmid=vtiger_quotes.quoteid inner join vtiger_account on vtiger_account.accountid=vtiger_quotes.accountid where vtiger_crmentity.deleted=0 and vtiger_quotes.accountid=".$record; $quo_res = $adb->query($quo_q); @@ -407,14 +407,14 @@ $adb->query($sql); } //Deleting Account related Invoices. - $inv_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_invoice on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid where vtiger_crmentity.deleted=0 and vtiger_invoice.accountid=".$record; + /*$inv_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_invoice on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid where vtiger_crmentity.deleted=0 and vtiger_invoice.accountid=".$record; $inv_res = $adb->query($inv_q); for($k=0;$k < $adb->num_rows($inv_res);$k++) { $inv_id = $adb->query_result($inv_res,$k,"crmid"); $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$inv_id; $adb->query($sql); - } + }*/ //Deleting Contact-Account Relation. $con_q = "update vtiger_contactdetails set accountid = null where accountid = ".$record; $con_res = $adb->query($con_q); Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon Mar 19 07:14:12 2007 @@ -2782,13 +2782,14 @@ { if($relmodule == 'Accounts') { - $pot_query = "select potentialid from vtiger_potential where accountid=".$relmod_recordid; + $pot_query = "select vtiger_crmentity.crmid,vtiger_account.accountid,vtiger_potential.potentialid from vtiger_potential inner join vtiger_account on vtiger_account.accountid=vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_potential.accountid=".$relmod_recordid; $pot_result = $result = $adb->query($pot_query); $rows = $adb->num_rows($pot_result); + $potids_comma = ""; if($rows != 0) { $j = 0; - $potids_comma = "("; + $potids_comma .= "("; for($k=0; $k < $rows; $k++) { $potential_ids = $adb->query_result($pot_result,$k,'potentialid'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 06:23:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 13:23:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10478 - /vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Message-ID: <20070319132323.D6E267C8104@vtiger.fosslabs.com> Author: richie Date: Mon Mar 19 07:23:05 2007 New Revision: 10478 Log: commented out the Trash and Junk Mail Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Mon Mar 19 07:23:05 2007 @@ -94,11 +94,11 @@ Home Page" class="webMnu">{$MOD.LBL_TO_GROUPS} 
    -  {$MOD.LBL_TRASH} + From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 08:31:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 15:31:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10479 - in /vtigercrm/branches/5.0.3: Smarty/templates/ComposeEmail.tpl Smarty/templates/Header.tpl Smarty/templates/Popup.tpl Smarty/templates/ReportsStep0.tpl Smarty/templates/ReportsStep1.tpl include/js/general.js vtigerversion.php Message-ID: <20070319153150.10D777C804F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 09:31:40 2007 New Revision: 10479 Log: added version for js file Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/vtigerversion.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Mon Mar 19 09:31:40 2007 @@ -22,6 +22,7 @@ + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Mon Mar 19 09:31:40 2007 @@ -22,6 +22,7 @@ + @@ -32,7 +33,7 @@ - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl Mon Mar 19 09:31:40 2007 @@ -14,6 +14,7 @@ + + Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl Mon Mar 19 09:31:40 2007 @@ -15,6 +15,7 @@ {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} + Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Mar 19 09:31:40 2007 @@ -11,7 +11,6 @@ //Utility Functions var gValidationCall=''; -document.write(''); if (document.all) Modified: vtigercrm/branches/5.0.3/vtigerversion.php ============================================================================== --- vtigercrm/branches/5.0.3/vtigerversion.php (original) +++ vtigercrm/branches/5.0.3/vtigerversion.php Mon Mar 19 09:31:40 2007 @@ -11,4 +11,5 @@ $patch_version = ''; $modified_database = ''; $vtiger_current_version = '5.0.3'; +$_SESSION['vtiger_version'] = $vtiger_current_version; ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 08:43:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 15:43:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10480 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070319154347.42E8D7C80EB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 09:43:43 2007 New Revision: 10480 Log: fields disabled globally, disabled in profile field display Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Mon Mar 19 09:43:43 2007 @@ -427,8 +427,6 @@ if($mode=='view') { $fieldListResult = getProfile2AllFieldList($modArr,$profileId); - for($i=0; $i"; + } + else { $visible = ""; - } - else - { - $visible = ""; } if($language_strings[$fieldListResult[$module_name][$j][0]] != '') $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 00:47:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 07:47:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10481 - in /vtigercrm/branches/5.0.3/modules/Calendar: CalendarCommon.php Save.php TodoSave.php Message-ID: <20070320074739.BD6267C8065@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 01:46:31 2007 New Revision: 10481 Log: date and time display changed in event notification mail. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php vtigercrm/branches/5.0.3/modules/Calendar/Save.php vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Tue Mar 20 01:46:31 2007 @@ -491,8 +491,11 @@ $mail_data['description'] = $description; $mail_data['assingn_type'] = $assignType; $mail_data['group_name'] = $grp_name; - $mail_data['st_date_time']=$st_date." ".$st_time; - $mail_data['end_date_time']=$end_date." ".$end_time; + $value = getaddEventPopupTime($st_time,$end_time,'24'); + $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; + $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $mail_data['st_date_time']=getDisplayDate($st_date)." ".$start_hour; + $mail_data['end_date_time']=getDisplayDate($end_date)." ".$end_hour; $mail_data['location']=$location; return $mail_data; Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Tue Mar 20 01:46:31 2007 @@ -168,8 +168,11 @@ $mail_data['assingn_type'] = $_REQUEST['assigntype']; $mail_data['group_name'] = $_REQUEST['assigned_group_name']; $mail_data['mode'] = $_REQUEST['mode']; - $mail_data['st_date_time'] = $_REQUEST['date_start']." ".$_REQUEST['time_start']; - $mail_data['end_date_time']=$_REQUEST['due_date']." ".$_REQUEST['time_end']; + $value = getaddEventPopupTime($_REQUEST['time_start'],$_REQUEST['time_end'],'24'); + $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; + $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $mail_data['st_date_time'] = getDisplayDate($_REQUEST['date_start'])." ".$start_hour; + $mail_data['end_date_time']=getDisplayDate($_REQUEST['due_date'])." ".$end_hour; $mail_data['location']=$_REQUEST['location']; return $mail_data; } Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Tue Mar 20 01:46:31 2007 @@ -67,8 +67,10 @@ $mail_data['assingn_type'] = $_REQUEST['task_assigntype']; $mail_data['group_name'] = $_REQUEST['task_assigned_group_name']; $mail_data['mode'] = $_REQUEST['task_mode']; - $mail_data['st_date_time'] = $_REQUEST['task_date_start']." ".$_REQUEST['task_time_start']; - $mail_data['end_date_time']=$_REQUEST['task_due_date']; + $value = getaddEventPopupTime($_REQUEST['task_time_start'],$_REQUEST['task_time_end'],'24'); + $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; + $mail_data['st_date_time'] = getDisplayDate($_REQUEST['task_date_start'])." ".$start_hour; + $mail_data['end_date_time']=getDisplayDate($_REQUEST['task_due_date']); return $mail_data; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 01:18:00 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 08:18:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10482 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Webmails/ themes/alphagrey/ themes/bluelagoon/ themes/woodspice/ Message-ID: <20070320081800.D8F8C7C804F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 02:17:20 2007 New Revision: 10482 Log: Add/Remove Folder removed, The selected mail has been highlighted, Mail count made to display proper Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php vtigercrm/branches/5.0.3/modules/Webmails/body.php vtigercrm/branches/5.0.3/themes/alphagrey/style.css vtigercrm/branches/5.0.3/themes/bluelagoon/style.css vtigercrm/branches/5.0.3/themes/woodspice/style.css Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Tue Mar 20 02:17:20 2007 @@ -54,7 +54,7 @@ - - - + @@ -267,7 +263,7 @@ if(gselected_mail != '') $(gselected_mail).className = ''; - $(rowId).className = 'tabSelected'; + $(rowId).className = 'mailSelected_select'; gselected_mail = rowId; } {/literal} Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 20 02:17:20 2007 @@ -56,7 +56,6 @@ $degraded_service='false'; if($MailBox->mail_protocol == "imap" || $MailBox->mail_protocol == "pop3") $degraded_service='true'; - if($_POST["command"] == "check_mbox_all") { exit(); @@ -100,18 +99,18 @@ flush(); exit(); } - +//This is invoked from Webmails.js as a result of the periodic event function call, checks only for NEW mails; this in turn checks for new mails in all the mailboxes if($_POST["command"] == "check_mbox") { $adb->println("Inside check_mbox AJAX command"); - $criteria = 'NEW'; - $search = imap_search($MailBox->mbox, $criteria); + $search = imap_search($MailBox->mbox, 'NEW'); + //if($search === false) {echo "failed";flush();exit();} $adb->println("imap_search($MailBox->mbox, $criteria) ===> "); $adb->println($search); - $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); $num=sizeof($data); $adb->println("fetched data using imap_fetch_overview ==>"); @@ -159,7 +158,15 @@ "; -$listview_header = array("","","","",""); +$listview_header = array("","","","",""); $listview_entries = array(); $displayed_msgs=0; @@ -279,16 +287,12 @@ $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; //echo $searchstring."
    "; $searchlist = imap_search($MailBox->mbox,$searchstring); -// if($searchlist === false) - // echo "The search failed"; - $num_searches = count($searchlist); $c=$numEmails; } flush(); - // MAIN LOOP // Main loop to create listview entries @@ -319,7 +323,7 @@ if (is_array($list)) { $boxes = ''; } Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Tue Mar 20 02:17:20 2007 @@ -47,7 +47,7 @@ } else { - $flags = "'; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; } elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; } else { @@ -132,9 +132,9 @@ //Option 2 - Ends //Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; } Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Tue Mar 20 02:17:20 2007 @@ -17,8 +17,8 @@ } if(node.className == "mailSelected") { - var unread = parseInt($(mailbox+"_unread").innerHTML); - if(unread != 0) + var unread = parseInt($(mailbox+"_unread").innerHTML); + if(unread != 0) { var curUnread; curUnread = unread -1; @@ -89,7 +89,7 @@ $("full_view").removeChild($("full_view").firstChild); $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View')); - node.className = 'mailSelected' + makeSelected(node.id) } function displayAttachments(mid) { var url = "index.php?module=Webmails&action=dlAttachments&mailid="+mid+"&mailbox="+mailbox; @@ -363,17 +363,38 @@ if(confirm(alert_arr.SURE_TO_DELETE)) runEmailCommand("delete_multi_msg",nids); } - -function move_messages() { +function move_messages() +{ + var nid = ''; + $("status").style.display = "block"; + var chkname=document.getElementsByName("selected_id"); + var mvmbox = $("mailbox_select").value; + for(var m=0;m0;i--) { if(els[i].type == "checkbox" && els[i].name.indexOf("_")) { if(els[i].checked) { - // var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); - - var nid = els[i].value; + var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); var mvmbox = $("mailbox_select").value; var row = $("row_"+nid); new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '0.5'}); @@ -393,7 +414,7 @@ $('mailbox_select').selectedIndex=0; //runEmailCommand('expunge',''); $("status").style.display="none"; -} +}*/ function search_emails() { // TODO: find a way to search in degraded functionality mode. var search_query = $("search_input").value; @@ -411,7 +432,7 @@ postBody: 'module=Webmails&action=WebmailsAjax&command='+command+'&mailid='+id+'&mailbox='+mailbox, onComplete: function(t) { resp = t.responseText; - id=resp; + id=resp; if(resp.match(/ajax failed/)) {return;} switch(command) { case 'expunge': Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Tue Mar 20 02:17:20 2007 @@ -12,9 +12,18 @@ include_once('config.php'); require_once('include/logging.php'); +require_once('modules/Webmails/conf.php'); +require_once('modules/Webmails/functions.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); +class result +{ + var $text = ""; + var $charset = ""; +} + + class Webmails extends CRMEntity { var $log; @@ -37,6 +46,7 @@ var $body; var $attachments = array(); var $inline = array(); + var $attachtab = array(); var $mbox; var $email; var $relationship = array(); @@ -79,18 +89,25 @@ imap_delete($this->mbox, $this->mailid); } - function loadMail() { - $this->email = $this->load_mail(); + function loadMail($attach_tab) { + + $this->email = $this->load_mail($attach_tab); + /* commented out by richie $this->inline = $this->email["inline"]; $this->attachments = $this->email["attachments"]; $this->body = $this->email["content"]["body"]; $this->relationship = $this->find_relationships(); + */ + $this->body = $this->email["body"]; + $this->attachtab = $this->email["attachtab"]; + $this->att= $this->email["att"]; + //echo ' body is ssssssssssssssss '.$this->email["body"]; } function replyBody() { - $tmp = "

    ".$mod_strings['IN_REPLY_TO_THE_MESSAGE'].$this->reply_name." on ".$this->date."

    "; - $tmp .= "
    ".$this->body."
    "; - return $tmp; + $tmpvar = "

    ".$mod_strings['IN_REPLY_TO_THE_MESSAGE'].$this->reply_name." on ".$this->date."

    "; + $tmpvar .= "
    ".$this->body."
    "; + return $tmpvar; } function unDeleteMsg() { @@ -121,7 +138,7 @@ // get the header info $mailHeader=Array(); $theader = @imap_headerinfo($this->mbox, $this->mailid); - $tmp = imap_mime_header_decode($theader->fromaddress); + $tmpvar = imap_mime_header_decode($theader->fromaddress); for($p=0;$pto);$p++) { $mailHeader['to'][] = $theader->to[$p]->mailbox.'@'.$theader->to[$p]->host; @@ -220,7 +237,7 @@ function dl_inline() { - $struct = imap_fetchstructure($this->mbox, $this->mailid); + $struct = @imap_fetchstructure($this->mbox, $this->mailid); $parts = $struct->parts; $i = 0; @@ -292,7 +309,7 @@ function dl_attachments() { - $struct = imap_fetchstructure($this->mbox, $this->mailid); + $struct = @imap_fetchstructure($this->mbox, $this->mailid); $parts = $struct->parts; $i = 0; @@ -351,109 +368,501 @@ } - function load_mail() + + + + function graphicalsmilies($body) { + $user_prefs = $_SESSION['nocc_user_prefs']; + if (isset($user_prefs->graphical_smilies) && $user_prefs->graphical_smilies) { + $body = ereg_replace("\;-?\)","\"wink\"/", $body); + $body = ereg_replace("\;-?D","\"grin\"/", $body); + $body = ereg_replace(":\'\(?","\"cry\"/", $body); + $body = ereg_replace(":-?[xX]","\"confused\"/", $body); + $body = ereg_replace(":-?\[\)","\"embarassed\"/", $body); + $body = ereg_replace(":-?\*","\"love\"/", $body); + $body = ereg_replace(":-?[pP]","\"tongue\"/", $body); + $body = ereg_replace(":-?\)","\"happy\"/", $body); + $body = ereg_replace(":-?\(","\"unhappy\"/", $body); + $body = ereg_replace(":-[oO]","\"surprised\"/", $body); + $body = ereg_replace("8-?\)","\"cool\"/", $body); + } + return ($body); + } + +// based on a function from matt at bonneau.net +function GetPart(&$attach_tab, &$this_part, $part_no, &$display_rfc822) +{ + $att_name = '[unknown]'; + if ($this_part->ifdescription == true) + { + $att_name = $this_part->description; + } + for ($i = 0; $i < count($this_part->parameters); $i++) + { + // PHP 5.x doesn't allow to convert a stdClass object to an array + // We sometimes have this issue with Mailer daemon reports + if (!(get_class($this_part->parameters) == "stdClass") && + !(get_class($this_part->parameters) == "stdclass")) + { + $param = $this_part->parameters[$i]; + if ((($param->attribute == 'NAME') || ($param->attribute == 'name')) && ($param->value != '')) + { + $att_name = $param->value; + break; + } + } + } + if (isset($this_part->type)) + { + switch ($this_part->type) + { + case 0: + $mime_type = 'text'; + break; + case 1: + $mime_type = 'multipart'; + for ($i = 0; $i < count($this_part->parts); $i++) + { + if ($part_no != '') + $part_no = $part_no . '.'; + // if it's an alternative, we skip the text part to only keep the HTML part + if ($this_part->subtype == 'ALTERNATIVE')// && $read == true) + $this->GetPart($attach_tab, $this_part->parts[++$i], $part_no . ($i + 1), $display_rfc822); + else + $this->GetPart($attach_tab, $this_part->parts[$i], $part_no . ($i + 1), $display_rfc822); + } + break; + case 2: + $mime_type = 'message'; + // well it's a message we have to parse it to find attachments or text message + if(isset($this_part->parts[0]->parts)) + { + $num_parts = count($this_part->parts[0]->parts); + for ($i = 0; $i < $num_parts; $i++) + { + $this->GetPart($attach_tab, $this_part->parts[0]->parts[$i], $part_no . '.' . ($i + 1), $display_rfc822); + } + } + break; + // Maybe we can do something with the mime types later ?? + case 3: + $mime_type = 'application'; + break; + case 4: + $mime_type = 'audio'; + break; + case 5: + $mime_type = 'image'; + break; + case 6: + $mime_type = 'video'; + break; + case 7: + $mime_type = 'other'; + break; + default: + $mime_type = 'unknown'; + } + } + else + { + $mime_type = 'text'; + } + $full_mime_type = $mime_type . '/' . $this_part->subtype; + if (isset($this_part->encoding)) + { + switch ($this_part->encoding) + { + case 0: + $encoding = '7BIT'; + break; + case 1: + $encoding = '8BIT'; + break; + case 2: + $encoding = 'BINARY'; + break; + case 3: + $encoding = 'BASE64'; + break; + case 4: + $encoding = 'QUOTED-PRINTABLE'; + break; + case 5: + $encoding = 'OTHER'; + break; + default: + $encoding = 'none'; + break; + } + } + else + { + $encoding = '7BIT'; + } + + if (($full_mime_type == 'message/RFC822' && $display_rfc822 == true) || ($mime_type != 'multipart' && $full_mime_type != 'message/RFC822')) + { + $charset = ''; + if ($this_part->ifparameters) + while ($obj = array_pop($this_part->parameters)) + if (strtolower($obj->attribute) == 'charset') + { + $charset = $obj->value; + break; + } + $tmp = Array( + 'number' => ($part_no != '' ? $part_no : 1), + 'id' => $this_part->ifid ? $this_part->id : 0, + 'name' => $att_name, + 'mime' => $full_mime_type, + 'transfer' => $encoding, + 'disposition' => $this_part->ifdisposition ? $this_part->disposition : '', + 'charset' => $charset, + 'size' => ($this_part->bytes > 1000) ? ceil($this_part->bytes / 1000) : 1 + ); + + array_unshift($attach_tab, $tmp); + } +} + +function GetCodeScoreAll($Data,$beg_charset) { + global $cad_StatsTableWin, $cad_StatsTableKoi; + $PairSize = 2; + + $Data=substr($Data,$beg_charset,100); + $Data=preg_replace('/[\n\r]/','',$Data); + setlocale(LC_CTYPE,'ru_RU.KOI8-R'); + + $Mark_koi=0; + $Mark_win=0; + $cnt=0; + $max_detect_limit=10; + + $sp=preg_split('/[\.\,\-\s\:\;\?\!\'\"\(\)\d<>]+/',$Data); + while ( list($key2,$val2) = each($sp) ) { + $rc=preg_match("/(.*)([\x7F-\xFF]+)/x",$val2); + if($rc == 0) { + continue; + } + + if($cnt > $max_detect_limit) { + break; + } else { + $cnt++; + } + $dlina=strlen($val2)-$PairSize; + if($dlina < 1) {$cnt--; continue;} + $val3=strtolower($val2); + if (ucfirst($val3) == $val2) { + $scaleK=2; + } else { + $scaleK=1; + } + if(substr($val3,0,1).strtoupper(substr($val2,1,strlen($val2))) == $val2) { + $scaleW=2; + } else { + $scaleW=1; + } + $Cur_mark_koi=0; + $Cur_mark_win=0; + for ($i=0; $i<$dlina; $i++ ) { + $pp=substr ($val3, $i, $PairSize); + if (isset($cad_StatsTableKoi[$pp])) { + $Cur_mark_koi += $cad_StatsTableKoi[$pp]; + } + if (isset($cad_StatsTableWin[$pp])) { + $Cur_mark_win += $cad_StatsTableWin[$pp]; + } + } + $Mark_koi+=$Cur_mark_koi*$scaleK; + $Mark_win+=$Cur_mark_win*$scaleW; + } + $Mark_list=array($Mark_koi,$Mark_win); + //setlocale(LC_CTYPE,$old_locale); + return $Mark_list; +} + + + + + + + + + + + +/* lxnt: patched to return charset names that iconv() understands*/ +function detect_charset($Data,$dbg_fl = 0) { + /* for many small pices of text - list of sender/subject*/ + $rc=preg_match("/(.*)([\x7F-\xFF]+)/xU",$Data,$tst_ar); + if($rc == 0) { + return 'US-ASCII'; + } else { + $beg_charset=strpos($Data,$tst_ar[2]); + } + list($KoiMark,$WinMark) = GetCodeScoreAll($Data,$beg_charset); + $Ratio['koi8-r'] = $KoiMark/($WinMark + 1); + $Ratio['windows-1251'] = $WinMark/($KoiMark + 1); + + list($MaxRation,$MaxRatioKey)=max_from_ratio($Ratio); + return $MaxRatioKey; +} + + + + + + + +function mime_header_decode(&$header) +{ + $output_charset = $GLOBALS['charset']; + $source = imap_mime_header_decode($header); + $result[] = new result; + $result[0]->text=''; + $result[0]->charset='ISO-8859-1'; + for ($j = 0; $j < count($source); $j++ ) + { + $element_charset = ($source[$j]->charset == "default") ? $this->detect_charset($source[$j]->text) : $source[$j]->charset; + if ($element_charset == 'x-unknown') + $element_charset = 'ISO-8859-1'; + + $element_converted = @iconv( $element_charset, $output_charset, $source[$j]->text); + $result[$j]->text = $element_converted; + $result[$j]->charset = $output_charset; + } + return $result; +} + + + + +function link_att(&$mail, $attach_tab, &$display_part_no,$ev) +{ + sort($attach_tab); + $link = ''; + while ($tmp = array_shift($attach_tab)) + if (!empty($tmp['name'])) + { + $mime = str_replace('/', '-', $tmp['mime']); + if ($display_part_no == true) + $link .= $tmp['number'] . '  '; + unset($att_name); + $att_name_array = imap_mime_header_decode($tmp['name']); + for ($i=0; $itext; + } + $att_name_dl = $att_name; + $att_name = $this->convertLang2Html($att_name); + $link .= '' . $att_name . '  ' . $tmp['mime'] . '  ' . $tmp['size'] . '
    '; + } + return ($link); +} + + + + + + + + + + + +// Convert mail data (from, to, ...) to HTML +function convertMailData2Html($maildata, $cutafter = 0) + { + if (($cutafter > 0) && (strlen($maildata) > $cutafter)) + { + return htmlspecialchars(substr($maildata, 0, $cutafter)) . '…'; + } + else + { + return htmlspecialchars($maildata); + } + } + +// Convert a language string to HTML + function convertLang2Html($langstring) { + global $charset; + return htmlentities($langstring, 2, $charset); + } + + + + + + + + + function load_mail($attach_tab) { // parse the message - $struct = imap_fetchstructure($this->mbox, $this->mailid); - $parts = $struct->parts; - - $content = array(); - $i = 0; - if (!$parts) - { - /* Simple message, only 1 piece */ - $attachment = array(); /* No vtiger_attachments */ - $bod=imap_body($this->mbox, $this->mailid); - if(preg_match("/\/",$bod)) - $content['body'] = $bod; - else - $content['body'] = nl2br($bod); - } + $ref_contenu_message = imap_headerinfo($this->mbox, $this->mailid); + $struct_msg = imap_fetchstructure($this->mbox, $this->mailid); + $mail = $this->mbox; + $ev = $this->mailid; +$conf->display_rfc822 = true; + if ($struct_msg->type == 3 || (isset($struct_msg->parts) && (sizeof($struct_msg->parts) > 0))) + { + $this->GetPart($attach_tab, $struct_msg, NULL, $conf->display_rfc822); + } else - { - - $stack = array(); - $attachment = array(); - - $endwhile = false; - - while (!$endwhile) - { - if (!$parts[$i]) - { - if (count($stack) > 0) - { - $parts = $stack[count($stack)-1]["p"]; - $i = $stack[count($stack)-1]["i"] + 1; - array_pop($stack); - } - else - { - $endwhile = true; - } - } - $search = array("/=20=/","/=20/","/=\r\n/","/=3D/","@&(disposition) == "INLINE" && strtoupper($parts[$i]->subtype) != "PLAIN") - { - $inline[] = array("filename" => $parts[$i]->dparameters[0]->value,"subtype"=>$parts[$i]->subtype,"filesize"=>$parts[$i]->bytes); - } - elseif (strtoupper($parts[$i]->disposition) == "ATTACHMENT") - { - $attachment[] = array("filename" => $parts[$i]->dparameters[0]->value,"subtype"=>$parts[$i]->subtype,"filesize"=>$parts[$i]->bytes); - - } - elseif (strtoupper($parts[$i]->subtype) == "HTML") - { - $content['body'] = preg_replace($search,$replace,imap_fetchbody($this->mbox, $this->mailid, $partstring)); - $stat="done"; - } - elseif (strtoupper($parts[$i]->subtype) == "TEXT" && !$stat == "done") - { - $content['body'] = nl2br(imap_fetchbody($this->mbox, $this->mailid, $partstring)); - $stat="done"; - } - elseif (strtoupper($parts[$i]->subtype) == "PLAIN" && !$stat == "done") - { - $content['body'] = nl2br(imap_fetchbody($this->mbox, $this->mailid, $partstring)); - $stat="done"; - } - elseif (!$stat == "done") - { - $content['body'] = nl2br(imap_fetchbody($this->mbox, $this->mailid, $partstring)); - } - } - - if ($parts[$i]->parts) - { - $stack[] = array("p" => $parts, "i" => $i); - $parts = $parts[$i]->parts; - $i = 0; + { + $pop_fetchheader_mail_ev = imap_fetchheader($mail, $ev); + $pop_body_mail_ev = imap_body($mail, $ev); + GetSinglePart($attach_tab, $struct_msg, $pop_fetchheader_mail_ev, $pop_body_mail_ev); + } + $conf->use_verbose = true; + $header = ""; + if (($verbose == 1) && ($conf->use_verbose == true)) { + $header = imap_fetchheader($mail, $ev); + } + + $tmpvar = array_pop($attach_tab); + if ($struct_msg->type == 3) + { + $body = ''; + } + else + { + $body = imap_fetchbody($mail,$ev,$tmpvar['number']); + + } + + + + if (eregi('text/html', $tmpvar['mime']) || eregi('text/plain', $tmpvar['mime'])) + { + if ($tmpvar['transfer'] == 'QUOTED-PRINTABLE') + $body = imap_qprint($body); + if ($tmpvar['transfer'] == 'BASE64') + $body = base64_decode($body); + $body = remove_stuff($body, $tmpvar['mime']); + $body_charset = ($tmpvar['charset'] == "default") ? $this->detect_charset($body) : $tmpvar['charset']; + + + if (strtolower($body_charset) == "us-ascii") { + $body_charset = "ISO-8859-1"; + } + + if ($body_charset == "" || $body_charset == null) { + if (isset($conf->default_charset) && $conf->default_charset != "") { + $body_charset = $conf->default_charset; + } else { + $body_charset = "ISO-8859-1"; + } + } + + if (isset($_REQUEST['user_charset']) && $_REQUEST['user_charset'] != '') { + $body_charset = $_REQUEST['user_charset']; + } + + $body_converted = @iconv( $body_charset, $GLOBALS['charset'], $body); + $body = ($body_converted===FALSE) ? $body : $body_converted; + $tmpvar['charset'] = ($body_converted===FALSE) ? $body_charset : $GLOBALS['charset']; } else { - $i++; - } + array_push($attach_tab, $tmpvar); + } + $link_att = ''; +$conf->display_part_no = true; + if ($struct_msg->subtype != 'ALTERNATIVE' && $struct_msg->subtype != 'RELATED') + { + switch (sizeof($attach_tab)) + { + case 0: + $link_att = '
    '; + break; + case 1: + $link_att = ''; + break; + default: + $link_att = ''; + break; } + }else + { + $link_att = ''; } - if($struct->encoding==3) - $content['body'] = base64_decode($content['body']); - if($struct->encoding==4) - $content['body'] = quoted_printable_decode($content['body']); - - $ret = Array("content" => $content,"attachments"=>$attachment,"inline"=>$inline); - return $ret; + + $struct_msg = imap_fetchstructure($mail, $ev); + $msg_charset = ''; + if ($struct_msg->ifparameters) { + while ($obj = array_pop($struct_msg->parameters)) { + if (strtolower($obj->attribute) == 'charset') { + $msg_charset = $obj->value; + break; + } + } + } + if ($msg_charset == '') { + $msg_charset = 'ISO-8859-1'; + } + + + $subject_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->subject); + $subject_array = $this->mime_header_decode($subject_header); + for ($j = 0; $j < count($subject_array); $j++) + $subject .= $subject_array[$j]->text; + + $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); + $from_array = $this->mime_header_decode($from_header); + for ($j = 0; $j < count($from_array); $j++) + $from .= $from_array[$j]->text; + + $to_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->toaddress); + $to_array = $this->mime_header_decode($to_header); + for ($j = 0; $j < count($to_array); $j++) + $to .= $to_array[$j]->text; + $to = str_replace(',', ', ', $to); + + $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; + $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); + $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; + if ($cc_array != 0) { + for ($j = 0; $j < count($cc_array); $j++) + $cc .= $cc_array[$j]->text; + } + $cc = str_replace(',', ', ', $cc); + + $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; + $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); + $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; + if ($reply_to_array != 0) { + for ($j = 0; $j < count($reply_to_array); $j++) + $reply_to .= $reply_to_array[$j]->text; + } + + $timestamp = chop($ref_contenu_message->udate); + $date = format_date($timestamp, $lang); + $time = format_time($timestamp, $lang); + $content = Array( + 'from' => $from, + 'to' => $to, + 'cc' => $cc, + 'reply_to' => $reply_to, + 'subject' => $subject, + 'date' => $date, + 'time' => $time, + 'complete_date' => $date, + 'att' => $link_att, + 'body' => $this->graphicalsmilies($body), + 'body_mime' => $this->convertLang2Html($tmpvar['mime']), + 'body_transfer' => $this->convertLang2Html($tmpvar['transfer']), + 'header' => $header, + 'verbose' => $verbose, + 'prev' => $prev_msg, + 'next' => $next_msg, + 'msgnum' => $mail, + 'attachtab' => $attach_tab, + 'charset' => $body_charset + ); +return ($content); + } Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Tue Mar 20 02:17:20 2007 @@ -42,6 +42,17 @@ $command = $_REQUEST["command"]; if($command == "expunge") { $MailBox = new MailBox($mailbox); + /* + $search = imap_search($MailBox->mbox,'DELETED'); + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + for($i=0;$i<$num;$i++) + { + if($data[$i]->deleted != 0) + { + imap_delete($MailBox->mbox,$data[$i]->message_id); + } + } + */ imap_expunge($MailBox->mbox); imap_close($MailBox->mbox); flush(); @@ -50,9 +61,8 @@ if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); - imap_mail_move($MailBox->mbox,$mailid,"Trash"); + imap_mail_move($MailBox->mbox,$mailid,"Deleted"); $email = new Webmails($MailBox->mbox,$mailid); - $email->delete(); imap_close($MailBox->mbox); echo $mailid; flush(); Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Tue Mar 20 02:17:20 2007 @@ -14,6 +14,7 @@ require_once('include/utils/UserInfoUtil.php'); require_once('modules/Webmails/Webmails.php'); require_once('modules/Webmails/MailBox.php'); +global $mod_strings; if(!isset($_SESSION["authenticated_user_id"]) || $_SESSION["authenticated_user_id"] != $current_user->id) {echo "ajax failed";flush();exit();} $mailid=$_REQUEST["mailid"]; @@ -26,7 +27,9 @@ $mailbox="INBOX"; } $MailBox = new MailBox($mailbox); +$mail = $MailBox->mbox; $email = new Webmails($MailBox->mbox,$mailid); +$status=imap_setflag_full($MailBox->mbox,$mailid,"\\Seen"); ?> loadMail($attach_tab); +$content['body'] = ''.$email->body.''; +$content['attachtab'] = $email->attachtab; +//Need to put this along with the subject block +echo $email->att; +echo $content['body']; -$email->loadMail(); +//test added by Richie +if (!isset($_REQUEST['display_images']) || $_REQUEST['display_images'] != 1) +{ + $content['body'] = eregi_replace('src="[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]"', 'src="none"', $content['body']); + $content['body'] = eregi_replace('src=[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]', 'src="none"', $content['body']); +} -//Added to get the UTF-8 string - 30-11-06 - Mickie -$email->body = utf8_decode(imap_utf8($email->body)); +//Display embedded HTML images +$tmp_attach_tab=$content['attachtab']; +$i = 0; +$conf->display_img_attach = true; +$conf->display_text_attach = true; -echo $email->body; -echo "

    "; - -if(is_array($email->inline)) +while ($tmp = array_pop($tmp_attach_tab)) { - $inline = $email->downloadInlineAttachments(); - $num=sizeof($inline); - echo "

    Inline Attachments:

    "; - - for($i=0;$i<$num;$i++) + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) { - //var_dump($inline[$i]); - // PLAIN TEXT - if($inline[$i]["subtype"] == "RFC822") + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) { - echo "
    ".($i+1).") ".$inline[$i]["filename"].""; + $new_img_src = 'src="get_img.php?mail=' . $mailid.'&num=' . $tmp['number'] . '&mime=' . $img_type . '&transfer=' . $tmp['transfer'] . '"'; + $img_id = str_replace('<', '', $tmp['id']); + $img_id = str_replace('>', '', $img_id); + $content['body'] = str_replace('src="cid:'.$img_id.'"', $new_img_src, $content['body']); + $content['body'] = str_replace('src=cid:'.$img_id, $new_img_src, $content['body']); } - elseif($inline[$i]["subtype"] == "JPEG" || $inline[$i]["subtype"] == "GIF") - { - echo "
    ".($i+1).") ".$inline[$i]["filename"]."

    '; } - else +} +while ($tmp = array_pop($content['attachtab'])) +{ + if ((!eregi('ATTACHMENT', $tmp['disposition'])) && $conf->display_text_attach && (eregi('text/plain', $tmp['mime']))) + echo '
    '.view_part_detail($mail, $mailid, $tmp['number'], $tmp['transfer'], $tmp['charset'], $charset); + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) + { + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) { - echo "
    ".($i+1).") ".$inline[$i]["filename"]." -
    "; -// echo "
    ".($i+1).") ".$inline[$i]["filename"]."
    "; + echo '
    '; + echo '
    '; + echo $mod_strings['LBL_LOADING_IMAGE']; + echo '..........
    '; + echo ''; + echo '
    '; } } } + + +//test ended by Richie + imap_close($MailBox->mbox); ?> + Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.0.3/themes/alphagrey/style.css Tue Mar 20 02:17:20 2007 @@ -1639,7 +1639,7 @@ padding-bottom:2px; } -.mailSelected:hover { +.mailSelected_select { background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; background-color:#1F5EFF; font-family: Arial, Helvetica, sans-serif; Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original) +++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Tue Mar 20 02:17:20 2007 @@ -2228,7 +2228,7 @@ padding-bottom:2px; } -.mailSelected:hover { +.mailSelected_select { background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; background-color:#1F5EFF; font-family: Arial, Helvetica, sans-serif; Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.0.3/themes/woodspice/style.css Tue Mar 20 02:17:20 2007 @@ -1681,7 +1681,7 @@ padding-bottom:2px; } -.mailSelected:hover { +.mailSelected_select { background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; background-color:#1F5EFF; font-family: Arial, Helvetica, sans-serif; From greeting at 2000Greetings.com Mon Mar 19 11:01:00 2007 From: greeting at 2000Greetings.com (2000Greetings.com) Date: 19 Mar 2007 18:01:00 -0000 Subject: [Vtigercrm-commits] Hi, an old friend has sent you a greeting card! Message-ID: <1174327260.45794.qmail@2000Greetrings.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070319/278608df/attachment.htm From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:22:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:22:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10483 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070320092244.D95C178D33E@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:22:36 2007 New Revision: 10483 Log: fixes the search issue which was giving irrelevant results if the data was not found Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 20 03:22:36 2007 @@ -222,7 +222,7 @@ $start_message=($numEmails-(($start-1)*$mails_per_page)); } -$c=$numEmails; +//$c=$numEmails; if(!isset($_REQUEST["search"])) { $numPages = ceil($numEmails/$MailBox->mails_per_page); @@ -287,9 +287,11 @@ $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; //echo $searchstring."
    "; $searchlist = imap_search($MailBox->mbox,$searchstring); - $num_searches = count($searchlist); - + if(is_array($searchlist)) + { + $num_searches = count($searchlist); $c=$numEmails; + } } flush(); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:34:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:34:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10484 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070320093418.E754579C63E@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:28:31 2007 New Revision: 10484 Log: reverted back the change Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 20 03:28:31 2007 @@ -222,7 +222,7 @@ $start_message=($numEmails-(($start-1)*$mails_per_page)); } -//$c=$numEmails; +$c=$numEmails; if(!isset($_REQUEST["search"])) { $numPages = ceil($numEmails/$MailBox->mails_per_page); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:43:52 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:43:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10485 - /vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Message-ID: <20070320094352.CF44779C63E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 03:43:46 2007 New Revision: 10485 Log: space problem fixed Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Tue Mar 20 03:43:46 2007 @@ -50,7 +50,7 @@ - +
    vtiger CRM
    -  {$MOD.LBL_MY_MAILS}   +  {$MOD.LBL_MY_MAILS}  
      @@ -94,11 +94,11 @@ Home Page" class="webMnu">{$MOD.LBL_TO_GROUPS} 

    - + {$MOD.LBL_JUNK_MAILS}  @@ -141,7 +141,7 @@
    - + @@ -155,7 +155,7 @@ {/foreach} {/foreach}
    - +
    @@ -194,11 +194,7 @@
    {$MOD.LBL_CC} 
    {$MOD.LBL_SUBJECT}
    {$MOD.LBL_DATE}
    {$MOD.LBL_DATE}
    {$MOD.LBL_ATTACHMENT} Full Email View
     
    ".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."
    "; + $flags = "
    "; } @@ -99,15 +99,15 @@ if ($mails[$start_message]->deleted) { - $listview_entries[$num][] = ''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).'
    ' . $html_att . ':' . $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev) . '
    ' . $html_atts . ':' . $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev) . '
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:53:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:53:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10486 - in /vtigercrm/branches/5.0.3: Smarty/templates/UserDetailView.tpl modules/Users/DetailView.php Message-ID: <20070320095303.138C17C808A@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 03:52:55 2007 New Revision: 10486 Log: Though we are disable to view audittrail, the button ViewAuditTrail was displaying Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl vtigercrm/branches/5.0.3/modules/Users/DetailView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl Tue Mar 20 03:52:55 2007 @@ -80,7 +80,7 @@ {if $homeitems neq ''} + {$UMOD.LBL_SHOWN} {else} + {$UMOD.LBL_HIDDEN} {/if} {/foreach} Modified: vtigercrm/branches/5.0.3/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DetailView.php Tue Mar 20 03:52:55 2007 @@ -28,6 +28,8 @@ require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/GetUserGroups.php'); +//to check audittrail if enable or not +require_once('user_privileges/audit_trail.php'); global $current_user; global $theme; @@ -193,6 +195,8 @@ $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); $smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); $smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); +//for check audittrail if it is enable or not +$smarty->assign("AUDITTRAIL",$audit_trail); $smarty->display("UserDetailView.tpl"); } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:53:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:53:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10487 - /vtigercrm/branches/5.0.3/install/4createConfigFile.php Message-ID: <20070320095310.779A97C808A@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:53:03 2007 New Revision: 10487 Log: changed to blogs Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Tue Mar 20 03:53:03 2007 @@ -235,7 +235,7 @@

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



    - The installation will take at least 4 minutes. Grab a coffee,sit back and relax or browse through our forums
    + The installation will take at least 4 minutes.

    Grab a coffee,sit back and relax or browse through our blogs


    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:56:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:56:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10488 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070320095659.876787C8115@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:56:51 2007 New Revision: 10488 Log: changed message Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 20 03:56:51 2007 @@ -131,13 +131,17 @@
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2.
  • + + + +
    • -
    • You are the most important to us! -
    • -
    • -
    • Talk to us at http://forums.vtiger.com -
    • Discuss with us at http://blogs.vtiger.com +
    • You are the most important to us! We take pride in being associated with you
    +

    + Talk to us at http://forums.vtiger.com +

    + Discuss with us at http://blogs.vtiger.com From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 02:58:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:58:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10489 - /vtigercrm/branches/5.0.3/modules/uploads/add2db.php Message-ID: <20070320095809.2E13C7C8115@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 03:58:04 2007 New Revision: 10489 Log: fix for mysql sql_mode Modified: vtigercrm/branches/5.0.3/modules/uploads/add2db.php Modified: vtigercrm/branches/5.0.3/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/uploads/add2db.php (original) +++ vtigercrm/branches/5.0.3/modules/uploads/add2db.php Tue Mar 20 03:58:04 2007 @@ -53,9 +53,10 @@ $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); $date_var = $adb->formatDate(date('YmdHis')); - - $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")"; + $current_date = getdate(); + $current_date = $adb->formatDate(date('YmdHis')); + $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$current_date.")"; $result = $adb->query($query); # Added by DG 26 Oct 2005 From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:02:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:02:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10490 - in /vtigercrm/branches/5.0.3/modules/Webmails: conf.php get_img.php Message-ID: <20070320100239.70B747C8120@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 04:02:31 2007 New Revision: 10490 Log: files from nocc Added: vtigercrm/branches/5.0.3/modules/Webmails/conf.php vtigercrm/branches/5.0.3/modules/Webmails/get_img.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:06:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:06:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10491 - in /vtigercrm/branches/5.0.3/modules/Webmails: download.php functions.php Message-ID: <20070320100654.428757C8119@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 04:06:45 2007 New Revision: 10491 Log: files from nocc Added: vtigercrm/branches/5.0.3/modules/Webmails/download.php vtigercrm/branches/5.0.3/modules/Webmails/functions.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:13:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:13:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10492 - /vtigercrm/branches/5.0.3/index.php Message-ID: <20070320101341.AA6827C8119@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 04:13:35 2007 New Revision: 10492 Log: added check for the webmail image handling Modified: vtigercrm/branches/5.0.3/index.php Modified: vtigercrm/branches/5.0.3/index.php ============================================================================== --- vtigercrm/branches/5.0.3/index.php (original) +++ vtigercrm/branches/5.0.3/index.php Tue Mar 20 04:13:35 2007 @@ -282,7 +282,7 @@ (ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) ) || ereg("^savewordtemplate",$action) || - ereg("^mailmergedownloadfile",$action)) + ereg("^mailmergedownloadfile",$action) || ereg("^Webmails",$module) && ereg("^get_img",$action) || ereg("^download",$action) ) { @@ -300,10 +300,12 @@ ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^massdelete", $action) || - ereg("^mailmergedownloadfile",$action)) + ereg("^mailmergedownloadfile",$action) || ereg("^get_img",$action) || + ereg("^download",$action) || + ereg("^massdelete", $action )) $skipFooters=true; //skip footers for all these invocations as they are mostly popups - if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^mailmergedownloadfile",$action)) + if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^mailmergedownloadfile",$action)|| ereg("^get_img",$action)) { $viewAttachment = true; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:23:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:23:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10493 - in /vtigercrm/branches/5.0.3: include/js/en_us.lang.js include/language/en_us.lang.php modules/Reports/ReportColumns.php modules/Reports/Reports.js Message-ID: <20070320102323.527637C8119@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 04:23:13 2007 New Revision: 10493 Log: i18n added for reports columns Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php vtigercrm/branches/5.0.3/modules/Reports/Reports.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Mar 20 04:23:13 2007 @@ -93,4 +93,15 @@ SELECT_TEMPLATE_TO_MERGE:'Please select a template to merge', YES:'yes', NO:'no', + + EQUALS:'equals', + NOT_EQUALS_TO:'not equal to', + STARTS_WITH:'starts with', + CONTAINS:'contains', + DOES_NOT_CONTAINS:'does not contains', + LESS_THAN:'less than', + GREATER_THAN:'greater than', + LESS_OR_EQUALS:'less or equal', + GREATER_OR_EQUALS:'greater or equal', + }; Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Mar 20 04:23:13 2007 @@ -647,7 +647,7 @@ //Added for values of picklist in Advanced Search filter 'contains'=>'contains', 'does not contains'=>'does not contains', -'is'=>'is', +'equals'=>'equals', 'is not'=>'is not', 'begins with'=>'begins with', 'ends with'=>'ends with', @@ -828,6 +828,17 @@ 'MSG_VTIGERTEAM'=>' vTiger Team', 'MSG_IS_NOT_UPLOADED'=>'is not uploaded. Allowed file types - jpeg, png, jpg, pjpeg, x-png or gif', 'MSG_IMAGE_ERROR'=>'Image not found', + +'Information'=>'Information', +'Address'=>'Address', +'Custom Information'=>'Custom Information', +'Portal Information'=>'- Portal Information', +'Description'=>'Description', +'Expectations'=>'Expectations', +'Pricing Information'=>'Pricing Information', +'Stock Information'=>'Stock Information', +'Solution'=>'Solution', +'Terms and Conditions'=>'Terms and Conditions', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php Tue Mar 20 04:23:13 2007 @@ -64,6 +64,7 @@ { global $ogReport; global $app_list_strings; + global $app_strings; global $current_language; $mod_strings = return_module_language($current_language,$module); @@ -71,7 +72,8 @@ { if(isset($ogReport->pri_module_columnslist[$module][$key])) { - $shtml .= ""; + + $shtml .= ""; foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) @@ -97,7 +99,7 @@ function getSecondaryColumnsHTML($module) { global $ogReport; - global $app_list_strings; + global $app_list_strings,$app_strings; global $current_language; if($module != "") @@ -110,7 +112,7 @@ { if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key])) { - $shtml .= ""; + $shtml .= ""; foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Tue Mar 20 04:23:13 2007 @@ -16,15 +16,15 @@ typeofdata['D'] = ['e','n','l','g','m','h']; var fLabels = new Array(); -fLabels['e'] = 'equals'; -fLabels['n'] = 'not equal to'; -fLabels['s'] = 'starts with'; -fLabels['c'] = 'contains'; -fLabels['k'] = 'does not contain'; -fLabels['l'] = 'less than'; -fLabels['g'] = 'greater than'; -fLabels['m'] = 'less or equal'; -fLabels['h'] = 'greater or equal'; +fLabels['e'] = alert_arr.EQUALS; +fLabels['n'] = alert_arr.NOT_EQUALS_TO; +fLabels['s'] = alert_arr.STARTS_WITH; +fLabels['c'] = alert_arr.CONTAINS; +fLabels['k'] = alert_arr.DOES_NOT_CONTAINS; +fLabels['l'] = alert_arr.LESS_THAN; +fLabels['g'] = alert_arr.GREATER_THAN; +fLabels['m'] = alert_arr.LESS_OR_EQUALS; +fLabels['h'] = alert_arr.GREATER_OR_EQUALS; var noneLabel; var gcurrepfolderid=0; function trimfValues(value) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:25:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:25:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10494 - /vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Message-ID: <20070320102559.E7E8378D24F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 04:25:52 2007 New Revision: 10494 Log: Webmails module made default Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Tue Mar 20 04:25:52 2007 @@ -167,7 +167,7 @@ { global $current_user; $this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1"); - echo "
     Could not connect to the server. Please check the server details Here "; + echo "
     Could not connect to the server. Please check the server details Here . Please click here to go to your Emails module."; exit; } } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:28:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:28:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10495 - /vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Message-ID: <20070320102839.BF5EB78D24F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 04:28:29 2007 New Revision: 10495 Log: Webmails module made default Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Tue Mar 20 04:28:29 2007 @@ -2126,7 +2126,7 @@ $this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)"); $this->db->query("insert into vtiger_parenttabrel values (1,9,2)"); - $this->db->query("insert into vtiger_parenttabrel values (1,10,4)"); + $this->db->query("insert into vtiger_parenttabrel values (1,28,4)"); $this->db->query("insert into vtiger_parenttabrel values (1,3,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,7,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,6,2)"); @@ -2159,8 +2159,8 @@ $this->db->query("insert into vtiger_parenttabrel values (2,26,1)"); $this->db->query("insert into vtiger_parenttabrel values (2,6,2)"); $this->db->query("insert into vtiger_parenttabrel values (2,4,3)"); - $this->db->query("insert into vtiger_parenttabrel values (2,10,4)"); - $this->db->query("insert into vtiger_parenttabrel values (4,10,7)"); + $this->db->query("insert into vtiger_parenttabrel values (2,28,4)"); + $this->db->query("insert into vtiger_parenttabrel values (4,28,7)"); $this->db->query("insert into vtiger_parenttabrel values (2,7,5)"); $this->db->query("insert into vtiger_parenttabrel values (2,9,6)"); $this->db->query("insert into vtiger_parenttabrel values (4,9,8)"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:34:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:34:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10496 - /vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat Message-ID: <20070320103416.4977878D015@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 04:34:12 2007 New Revision: 10496 Log: storage engine changed to innodb Modified: vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat Modified: vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat Tue Mar 20 04:34:12 2007 @@ -105,7 +105,7 @@ echo "" echo "Starting MySQL on port specified by the user" echo "" -start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --datadir=../data --port=%mysql_port% +start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --default-storage-engine=InnoDB --datadir=../data --port=%mysql_port% %SLEEP_STR% -n 11 127.0.0.1>nul mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases" > NUL IF ERRORLEVEL 1 goto notstarted From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:45:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:45:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10497 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070320104505.C53E679C63E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 04:45:01 2007 New Revision: 10497 Log: variable to get hostname changed Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Tue Mar 20 04:45:01 2007 @@ -27,7 +27,8 @@ // 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 = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"]; +//$web_root = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"]; +$web_root = $_ENV["HOSTNAME"] . $HTTP_SERVER_VARS["REQUEST_URI"]; $web_root = str_replace("/install.php", "", $web_root); $web_root = "http://".$web_root; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 04:16:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 11:16:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10498 - /vtigercrm/branches/5.0.3/include/js/en_us.lang.js Message-ID: <20070320111654.9AA887C8133@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 05:16:49 2007 New Revision: 10498 Log: missed label added. --Minnie Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Mar 20 05:16:49 2007 @@ -91,6 +91,7 @@ VALID_DISCOUNT_PERCENT:'Enter a valid Discount percentage', VALID_DISCOUNT_AMOUNT:'Enter a valid Discount Amount', SELECT_TEMPLATE_TO_MERGE:'Please select a template to merge', + SELECTED_MORE_THAN_ONCE:'You have selected the following product(s) more than once.', YES:'yes', NO:'no', From istick at gpro.net Tue Mar 20 04:48:06 2007 From: istick at gpro.net (Bobwhite B. Agamemnon) Date: Tue, 20 Mar 2007 11:48:06 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1589606708.20070320114806@gpro.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070320/311d6577/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Eratosthenes.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070320/311d6577/Eratosthenes-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:55:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 13:55:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10499 - /vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Message-ID: <20070320135510.089FB7C7F0A@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 07:55:01 2007 New Revision: 10499 Log: page reloaded for check mail has been done Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Tue Mar 20 07:55:01 2007 @@ -163,6 +163,8 @@ ); } function check_for_new_mail(mbox) { + window.location=window.location; +/* if(degraded_service == 'true') { window.location=window.location; return; @@ -308,6 +310,7 @@ } } ); +*/ } function periodic_event() { // NOTE: any functions you put in here may race. This could probably From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 07:03:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 14:03:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10500 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070320140330.2559A7C813C@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 08:03:24 2007 New Revision: 10500 Log: added extra statement Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 20 08:03:24 2007 @@ -130,7 +130,7 @@

  • Your install.php file has been renamed to install.php.txt.
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2. -
  • +
  • Do not forget to set the outgoing emailserver setup accessible from Settings->Outgoing Server @@ -142,6 +142,8 @@ Talk to us at http://forums.vtiger.com

    Discuss with us at http://blogs.vtiger.com +

    + We aim to be - simply the best. Come on over, there is space for you too! From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 07:38:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 14:38:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10501 - /vtigercrm/branches/5.0.3/Smarty/templates/ Message-ID: <20070320143844.05E347C814B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 08:38:21 2007 New Revision: 10501 Log: fix for i18n issue: lots of untranslatable alt= and title= in *.tpl --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListRoles.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl vtigercrm/branches/5.0.3/Smarty/templates/SysInformation.tpl vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Tue Mar 20 08:38:21 2007 @@ -279,7 +279,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} -

  •  
    - {if $IS_ADMIN eq 'true'} + {if $IS_ADMIN eq 'true' && $AUDITTRAIL eq 'true'} {/if} {if $CATEGORY eq 'Settings'} @@ -157,10 +157,10 @@
    {$UMOD.$values} - {$UMOD.LBL_SHOWN}{$UMOD.LBL_SHOWN}{$UMOD.LBL_SHOWN} - {$UMOD.LBL_HIDDEN}{$UMOD.LBL_HIDDEN}{$UMOD.LBL_HIDDEN}
    Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.date_start} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -300,7 +300,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.due_date} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -321,7 +321,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.due_date} {assign var=date_vl value="$date_fmt"} @@ -746,7 +746,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.date_start} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -765,7 +765,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.due_date} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -877,13 +877,13 @@
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 21:45:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 04:45:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10505 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070321044511.E999378D6CC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 22:45:07 2007 New Revision: 10505 Log: fix for misplaced } --Minnie Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Tue Mar 20 22:45:07 2007 @@ -427,31 +427,30 @@ if($mode=='view') { $fieldListResult = getProfile2AllFieldList($modArr,$profileId); - $field_module=array(); - $module_name=key($fieldListResult); - $module_id = getTabid($module_name); - $language_strings = return_module_language($current_language,$module_name); - for($j=0; $j"; - } - else - { - $visible = ""; - } - if($language_strings[$fieldListResult[$module_name][$j][0]] != '') - $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; - else - $field[]=$fieldListResult[$module_name][$j][0]; - $field[]=$visible; - $field_module[]=$field; - } - $privilege_field[$module_id] = array_chunk($field_module,3); - next($fieldListResult); - } + $field_module=array(); + $module_name=key($fieldListResult); + $module_id = getTabid($module_name); + $language_strings = return_module_language($current_language,$module_name); + for($j=0; $j"; + } + else + { + $visible = ""; + } + if($language_strings[$fieldListResult[$module_name][$j][0]] != '') + $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; + else + $field[]=$fieldListResult[$module_name][$j][0]; + $field[]=$visible; + $field_module[]=$field; + } + $privilege_field[$module_id] = array_chunk($field_module,3); + next($fieldListResult); } elseif($mode=='edit') { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 22:03:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 05:03:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10506 - /vtigercrm/branches/5.0.3/modules/Users/Users.php Message-ID: <20070321050321.361F378D6CC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 23:03:16 2007 New Revision: 10506 Log: homeorder has been changed. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Users/Users.php Modified: vtigercrm/branches/5.0.3/modules/Users/Users.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Users.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Users.php Tue Mar 20 23:03:16 2007 @@ -112,7 +112,7 @@ var $object_name = "User"; var $user_preferences; var $defhomeview; - var $homeorder_array = array('ALVT','HDB','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); + var $homeorder_array = array('HDB','ALVT','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); var $encodeFields = Array("first_name", "last_name", "description"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 22:05:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 05:05:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10507 - /vtigercrm/branches/5.0.3/install/5createTables.inc.php Message-ID: <20070321050554.BFCE87C80A2@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 23:05:50 2007 New Revision: 10507 Log: extra details added for standarduser in default data population. --Minnie Modified: vtigercrm/branches/5.0.3/install/5createTables.inc.php Modified: vtigercrm/branches/5.0.3/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.inc.php Tue Mar 20 23:05:50 2007 @@ -134,6 +134,9 @@ $user->column_fields["namedays"] = ''; $user->column_fields["currency_id"] = 1; $user->column_fields["date_format"] = 'yyyy-mm-dd'; + $user->column_fields["hour_format"] = '24'; + $user->column_fields["start_hour"] = '08:00'; + $user->column_fields["end_hour"] = '23:00'; $user->column_fields["imagename"] = ''; $user->column_fields["activity_view"] = 'This Year'; $user->column_fields["lead_view"] = 'Today'; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 23:09:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 06:09:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10508 - /vtigercrm/branches/5.0.3/modules/Reports/Reports.php Message-ID: <20070321060959.0419478D33E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 00:09:55 2007 New Revision: 10508 Log: - removed Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Mar 21 00:09:55 2007 @@ -107,7 +107,7 @@ var $module_list = Array( "Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), + "Contacts"=>Array("Information"=>4,"Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), "Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>10), "Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>2), "Calendar"=>Array("Information"=>19,"Description"=>20), From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 23:14:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 06:14:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10509 - /vtigercrm/branches/5.0.3/include/js/en_us.lang.js Message-ID: <20070321061404.DC19478D33E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 00:14:00 2007 New Revision: 10509 Log: message has been modified. --Minnie Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Wed Mar 21 00:14:00 2007 @@ -12,8 +12,8 @@ var alert_arr = { DELETE:'Are you sure you want to delete the selected ', RECORDS:' records?', SELECT:'Please select at least one entity', - DELETE_ACCOUNT:'Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected', - DELETE_VENDOR:'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected', + DELETE_ACCOUNT:'Deleting this account(s) will remove its related Potentials & Quotes. Are you sure you want to delete the selected ', + DELETE_VENDOR:'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected ', SELECT_MAILID:'Please Select a mailid', OVERWRITE_EXISTING_ACCOUNT1:'Overwrite the existing address with this selected account(', OVERWRITE_EXISTING_ACCOUNT2:') address details?', From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 23:18:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 06:18:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10510 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070321061849.D71A47C8140@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 00:18:45 2007 New Revision: 10510 Log: problem in profile creation fixed Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Wed Mar 21 00:18:45 2007 @@ -427,30 +427,33 @@ if($mode=='view') { $fieldListResult = getProfile2AllFieldList($modArr,$profileId); - $field_module=array(); - $module_name=key($fieldListResult); - $module_id = getTabid($module_name); - $language_strings = return_module_language($current_language,$module_name); - for($j=0; $j"; - } - else - { - $visible = ""; - } - if($language_strings[$fieldListResult[$module_name][$j][0]] != '') - $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; - else - $field[]=$fieldListResult[$module_name][$j][0]; - $field[]=$visible; - $field_module[]=$field; - } - $privilege_field[$module_id] = array_chunk($field_module,3); - next($fieldListResult); + for($i=0; $i"; + } + else + { + $visible = ""; + } + if($language_strings[$fieldListResult[$module_name][$j][0]] != '') + $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; + else + $field[]=$fieldListResult[$module_name][$j][0]; + $field[]=$visible; + $field_module[]=$field; + } + $privilege_field[$module_id] = array_chunk($field_module,3); + next($fieldListResult); + } } elseif($mode=='edit') { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 00:43:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 07:43:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10511 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070321074348.9EFF27C8147@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 01:43:44 2007 New Revision: 10511 Log: changes made to enable proper check during field view Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Wed Mar 21 01:43:44 2007 @@ -436,13 +436,17 @@ for($j=0; $j"; + } + else + { + $visible = ""; + } if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1) { $visible = ""; - } - else - { - $visible = ""; } if($language_strings[$fieldListResult[$module_name][$j][0]] != '') $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 23:54:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 06:54:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10512 - /vtigercrm/tags/vtigercrm-5.0.3-rc3/ Message-ID: <20070322065406.B2CF77C813B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 00:53:54 2007 New Revision: 10512 Log: 5.0.3 version tagged for validation Added: vtigercrm/tags/vtigercrm-5.0.3-rc3/ - copied from r10511, vtigercrm/branches/5.0.3/ From thompson at granitecontracting.com Thu Mar 22 01:37:13 2007 From: thompson at granitecontracting.com (Disbar E. Ninja) Date: Thu, 22 Mar 2007 08:37:13 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6879935671.20070322083713@granitecontracting.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6fc7e5a1/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: depreciating.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6fc7e5a1/depreciating.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 01:43:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 08:43:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10513 - /vtigercrm/branches/5.0.3/install/4createConfigFile.php Message-ID: <20070322084301.E3C5B7C813B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 02:42:49 2007 New Revision: 10513 Log: opened link in new window, fixes #3300 Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Thu Mar 22 02:42:49 2007 @@ -235,7 +235,7 @@

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



    - The installation will take at least 4 minutes.

    Grab a coffee,sit back and relax or browse through our blogs
    + The installation will take at least 4 minutes.

    Grab a coffee,sit back and relax or browse through our blogs


    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 01:47:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 08:47:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10514 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070322084727.2ABB97C8159@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 02:46:57 2007 New Revision: 10514 Log: opened link in new window, fixes #3280 Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Thu Mar 22 02:46:57 2007 @@ -139,9 +139,9 @@
  • You are the most important to us! We take pride in being associated with you

    - Talk to us at http://forums.vtiger.com + Talk to us at forums

    - Discuss with us at http://blogs.vtiger.com + Discuss with us at blogs

    We aim to be - simply the best. Come on over, there is space for you too! From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 01:57:33 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 08:57:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10515 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070322085733.906727C8174@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 02:57:26 2007 New Revision: 10515 Log: another variable added to avoid empty hostname Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Thu Mar 22 02:57:26 2007 @@ -28,7 +28,8 @@ //$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF']; //$web_root = $hostname.$_SERVER['PHP_SELF']; //$web_root = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"]; -$web_root = $_ENV["HOSTNAME"] . $HTTP_SERVER_VARS["REQUEST_URI"]; +$web_root = ($_ENV["HOSTNAME"]=='')? $HTTP_SERVER_VARS["HTTP_HOST"]:$_ENV["HOSTNAME"]; +$web_root .= $HTTP_SERVER_VARS["REQUEST_URI"]; $web_root = str_replace("/install.php", "", $web_root); $web_root = "http://".$web_root; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 02:34:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 09:34:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10516 - in /vtigercrm/branches/5.0.3: Smarty/templates/Webmails.tpl include/js/en_us.lang.js modules/Webmails/ListView.php modules/Webmails/Webmails.js modules/Webmails/Webmails.php modules/Webmails/language/en_us.lang.php Message-ID: <20070322093427.C257F7C8181@vtiger.fosslabs.com> Author: jerrydgeorge Date: Thu Mar 22 03:33:40 2007 New Revision: 10516 Log: Issues in Webmails has been fixed Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Thu Mar 22 03:33:40 2007 @@ -115,15 +115,8 @@ {if $DEGRADED_SERVICE eq 'false'}

  • {$APP.LBL_SEARCH}  -   -   +   + {$SEARCH_HTML}  @@ -253,9 +246,9 @@ {rdelim} var gselected_mail = ''; {if $smarty.request.mailbox.value neq ''} -var gCurrentFolder = '{$smarty.request.mailbox}'; + var gCurrentFolder = '{$smarty.request.mailbox}'; {else} -var gCurrentFolder = 'INBOX'; + var gCurrentFolder = 'INBOX'; {/if} {literal} function makeSelected(rowId) Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Thu Mar 22 03:33:40 2007 @@ -94,7 +94,7 @@ SELECTED_MORE_THAN_ONCE:'You have selected the following product(s) more than once.', YES:'yes', NO:'no', - + MAIL:'mail', EQUALS:'equals', NOT_EQUALS_TO:'not equal to', STARTS_WITH:'starts with', @@ -104,5 +104,4 @@ GREATER_THAN:'greater than', LESS_OR_EQUALS:'less or equal', GREATER_OR_EQUALS:'greater or equal', - }; Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Thu Mar 22 03:33:40 2007 @@ -186,7 +186,14 @@ global $displayed_msgs; // AJAX commands (should be moved) if($_POST["command"] == "move_msg" && $_POST["ajax"] == "true") { - imap_mail_move($MailBox->mbox,$_REQUEST["mailid"],$_REQUEST["mvbox"]); + if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != '') + { + $mailids = explode(':',$_REQUEST["mailid"]); + } + foreach($mailids as $mailid) + { + imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); + } imap_close($MailBox->mbox); echo "SUCCESS"; flush(); @@ -253,7 +260,7 @@ foreach ($overview as $val) { $mails[$val->msgno] = $val; - $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); + $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); //Added to get the UTF-8 string - 30-11-06 - Mickie //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); @@ -274,6 +281,7 @@ } echo ""; +$search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); $listview_header = array("".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."'.$mod_strings['LBL_NO_EMAILS'].'
    - - - - -
    Configuration Wizardvtiger CRM 5
    - - - - - -
    - - - - -
    - - - - - - -
    - - - - - - - - - - -
    Welcome
    Installation Check
    System Configuration
    Confirm Settings
    Config File Creation
    Database Generation
    Finish
    - -
    - -
    - - - - - - - - -
    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 are unsure of your database host, username or password, we suggest that you use the default - values below.

    - - *- required information - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Database Configuration
    Database Type * - - No Database Support Detected - - - - - - -
    Host Name *" />
    User Name *" />
    Password" />
    Database Name *" />  - - - - - -  Create Database(will drop the database if exists)
    Root Username *
    Root Password
    - -

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

    - - - - - - - - - - - - - - - - - - - - - -
    Admin Configuration
    User nameadmin
    Password*">
    Email*">
    Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
    - -

    - - - - - - - - - - - - - - - - - -
    Currency Configuration
    Name*">
    Symbol*">
    Code*">
    - - -
    - - -
    -
    -
    -
    - -
    -
    - - - - - -
    - - - - -
    - - - - - -
    www.vtiger.com
    - - - +$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; + + if (isset($_REQUEST['db_username'])) + $db_username = $_REQUEST['db_username']; + elseif (isset($dbconfig['db_username'])) + $db_username = $dbconfig['db_username']; + + if (isset($_REQUEST['db_password'])) + $db_password = $_REQUEST['db_password']; + elseif (isset($dbconfig['db_password'])) + $db_password = $dbconfig['db_password']; + + if (isset($_REQUEST['db_type'])) + $db_type = $_REQUEST['db_type']; + elseif (isset($dbconfig['db_type'])) + $db_type = $dbconfig['db_type']; + + if (isset($_REQUEST['db_name'])) + $db_name = $_REQUEST['db_name']; + elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') + $db_name = $dbconfig['db_name']; + else + $db_name = 'vtigercrm503'; + + !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']; + elseif (isset($site_URL) && $site_URL!='_SITE_URL_') + $site_URL = $site_URL; + else $site_URL = $web_root; + + if(isset($_REQUEST['root_directory'])) $root_directory = $_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']; + + if (isset($_REQUEST['currency_name'])) + $currency_name = $_REQUEST['currency_name']; + else + $currency_name = ''; + + if (isset($_REQUEST['currency_symbol'])) + $currency_symbol = $_REQUEST['currency_symbol']; + + if (isset($_REQUEST['currency_code'])) + $currency_code = $_REQUEST['currency_code']; + + } + else { + !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm503" : $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']; + } + !isset($_REQUEST['check_createdb']) ? $check_createdb = "" : $check_createdb = $_REQUEST['check_createdb']; + !isset($_REQUEST['root_user']) ? $root_user = "" : $root_user = $_REQUEST['root_user']; + !isset($_REQUEST['root_password']) ? $root_password = "" : $root_password = $_REQUEST['root_password']; + // determine database options + $db_options = array(); + if(function_exists('mysql_connect')) { + $db_options['mysql'] = 'MySQL'; + } + if(function_exists('pg_connect')) { + $db_options['pgsql'] = 'Postgres'; + } +?> + + + + + + vtiger CRM 5 - Configuration Wizard - System Configuration + + + + + + + + +


    + + + + + + + +
    Configuration Wizardvtiger CRM 5
    + + + + + +
    + + + + +
    + + + + + + +
    + + + + + + + + + + +
    Welcome
    Installation Check
    System Configuration
    Confirm Settings
    Config File Creation
    Database Generation
    Finish
    + +
    + +
    + + + + + + + + +
    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 are unsure of your database host, username or password, we suggest that you use the default + values below.

    + + *- required information + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Database Configuration
    Database Type * + + No Database Support Detected + + + + + + +
    Host Name *" />
    User Name *" />
    Password" />
    Database Name *" />  + + + + + +  Create Database(will drop the database if exists)
    Root Username *
    Root Password
    + +

    + + + + + + + + + + + + + + + + + + +
    Site Configuration
    URL * +
    Path *" size="40" />
    Path to Cache Directory *
    (must be writable)
    +

    + + + + + + + + + + + + + + + + + + + + + +
    Admin Configuration
    User nameadmin
    Password*">
    Email*">
    Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
    + +

    + + + + This will setup the + default currency which will be used for maintaining + transactions in vtiger. + + + + + + + + + + + + + +
    Currency + Configuration
    Name*">
    Symbol*">
    Code*">
    + + +
    + + +
    +
    +
    +
    + +
    +
    + + + + + +
    + + + + +
    + + + + + +
    www.vtiger.com
    + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 03:04:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:04:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10520 - /vtigercrm/branches/5.0.3/cron/jobstartwindows.bat Message-ID: <20070329100439.04F267D2622@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 29 04:04:15 2007 New Revision: 10520 Log: url changed Modified: vtigercrm/branches/5.0.3/cron/jobstartwindows.bat Modified: vtigercrm/branches/5.0.3/cron/jobstartwindows.bat ============================================================================== --- vtigercrm/branches/5.0.3/cron/jobstartwindows.bat (original) +++ vtigercrm/branches/5.0.3/cron/jobstartwindows.bat Thu Mar 29 04:04:15 2007 @@ -2,4 +2,4 @@ set SCH_INSTALL=%1 FOR %%X in (%SCH_INSTALL%) DO SET SCH_INSTALL=%%~sX schtasks /create /tn "vtigerCRM Notification Scheduler" /tr %SCH_INSTALL%\apache\htdocs\vtigerCRM\cron\intimateTaskStatus.bat /sc daily /st 11:00:00 /RU SYSTEM -schtasks /create /tn "vtigerCRM Email Reminder" /tr %SCH_INSTALL%\apache\htdocs\vtigerCRM\modules\Activities\SendReminder.bat /sc minute /mo 1 /RU SYSTEM +schtasks /create /tn "vtigerCRM Email Reminder" /tr %SCH_INSTALL%\apache\htdocs\vtigerCRM\modules\Calendar\SendReminder.bat /sc minute /mo 1 /RU SYSTEM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 03:09:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:09:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10521 - /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Message-ID: <20070329100949.137267D261B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 04:09:43 2007 New Revision: 10521 Log: Fixes #3468 Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Thu Mar 29 04:09:43 2007 @@ -2059,7 +2059,7 @@ $description .= $app_strings['MSG_THE'].' '.$mod_name.' '.$app_strings['MSG_HAS_BEEN_ASSIGNED_TO_YOU'].'.'; } $description .= '
    '.$app_strings['MSG_THE'].' '.$mod_name.' '.$app_strings['MSG_DETAILS_ARE'].':

    '; - $description .= $mod_name.' '.$app_strings['MSG_ID'].' '.$focus->id.'
    '; + $description .= $mod_name.' '.$app_strings['MSG_ID'].' '.''.$focus->id.'
    '; foreach($object_column_fields as $fieldname => $fieldlabel) { //Get the translated string From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 03:16:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:16:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10522 - /vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503.php Message-ID: <20070329101638.A1A3F7D2623@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 29 04:16:34 2007 New Revision: 10522 Log: * Removed this file because we have included 503 RC2 migration so that this file contents will be added in the file 502_503rc2.php Removed: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 03:23:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:23:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10523 - in /vtigercrm/branches/5.0.3/modules/Migration: DBChanges/42P2_to_50.php DBChanges/501_to_502.php DBChanges/502_to_503rc2.php DBChanges/503rc2_to_503.php PatchApply.php versions.php Message-ID: <20070329102338.7ADE37D262B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 29 04:23:29 2007 New Revision: 10523 Log: * Added 503 RC2 migration in the script and added some debug logs Added: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503rc2.php (with props) vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php vtigercrm/branches/5.0.3/modules/Migration/versions.php Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php Thu Mar 29 04:23:29 2007 @@ -19,18 +19,15 @@ global $query_count, $success_query_count, $failure_query_count; global $success_query_array, $failure_query_array; +$migrationlog->debug("\n\nDB Changes from 4.2.x to 5.0 GA -------- Starts \n\n"); + //Added to put prefix vtiger_ in some of the columns in tables which are used for CV and Reports and field -- 23-06-06 $migrationlog->debug("Going to rename the table names with prefix vtiger_"); include("modules/Migration/rename_tables.php"); $migrationlog->debug("Renaming the table names with prefix vtiger_ has been finished"); - - - - $migrationlog->debug("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here."); - //These changes have been made in 4.2.3. The following queries have been included who has run the migration from 4.2 Patch2 @@ -4052,6 +4049,7 @@ } +$migrationlog->debug("\n\nDB Changes from 4.2.x to 5.0 GA -------- Ends \n\n"); //Added to get the conversion rate and update for all records @@ -4118,7 +4116,7 @@ '.$query.' '; $failure_query_array[$failure_query_count++] = $query; - $migrationlog->debug("Query Failed ==> $query"); + $migrationlog->debug("Query Failed ==> $query \n Error is ==> [".$conn->database->ErrorNo()."]".$conn->database->ErrorMsg()); //$migrationlog->debug("Error is ==> ".$conn->ErrorMsg()); } } Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php Thu Mar 29 04:23:29 2007 @@ -12,6 +12,8 @@ //5.0.2 database changes - added on 27-10-06 global $adb; + +$migrationlog->debug("\n\nDB Changes from 5.0.1 to 5.0.2 -------- Starts \n\n"); //Query added to show Manufacturer field in Products module ExecuteQuery("update vtiger_field set displaytype=1,block=31 where tabid=14 and block=1"); @@ -63,5 +65,6 @@ //echo "
      5.0/5.0.1 ==> 5.0.2 Database changes has been done.
    "; +$migrationlog->debug("\n\nDB Changes from 5.0.1 to 5.0.2 -------- Ends \n\n"); ?> Modified: vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php Thu Mar 29 04:23:29 2007 @@ -10,6 +10,7 @@ ********************************************************************************/ include("modules/Migration/versions.php"); +$migrationlog =& LoggerManager::getLogger('MIGRATION'); //global $vtiger_current_version; if($_REQUEST['source_version'] != '') @@ -76,8 +77,11 @@ echo '

    Failed Queries Log
    '; - foreach($failure_query_array as $failed_query) - echo '
    '.$failed_query.';'; + if(is_array($failure_query_array)) + foreach($failure_query_array as $failed_query) + echo '
    '.$failed_query.';'; + else + echo '
    No queries failed during Patch Update.'; echo '
    '; //echo "Failed Queries ==>
    ";print_r($failure_query_array);echo '
    '; @@ -109,6 +113,7 @@ '.$query.' '; $success_query_array[$success_query_count++] = $query; + $migrationlog->debug("Query Success ==> $query"); } else { @@ -119,16 +124,9 @@ '.$query.' '; $failure_query_array[$failure_query_count++] = $query; + $migrationlog->debug("Query Failed ==> $query \n Error is ==> [".$adb->database->ErrorNo()."]".$adb->database->ErrorMsg()); } } - - - - - - - - ?> Modified: vtigercrm/branches/5.0.3/modules/Migration/versions.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/versions.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/versions.php Thu Mar 29 04:23:29 2007 @@ -16,6 +16,7 @@ "50"=>"5.0", "501"=>"5.0.1", "502"=>"5.0.2", + "503rc2"=>"5.0.3 RC2", ); $current_version = '503'; From scottmk at gracebaptists.com Thu Mar 29 01:26:45 2007 From: scottmk at gracebaptists.com (Projector Q. Antihistamine) Date: Thu, 29 Mar 2007 04:26:45 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <9769422677.20070329042645@gracebaptists.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://commiserationzul.com any pill you need! Absolutely Confidential and Secure purchase From istomin at gps.ca Thu Mar 29 01:17:47 2007 From: istomin at gps.ca (Myopia J. Skyjackers) Date: Thu, 29 Mar 2007 04:17:47 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7864338963.20070329041747@gps.ca> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://commiserationzul.com verified by VISA and certified by CIPA. From kendrick at glebecentre.ca Thu Mar 29 04:08:07 2007 From: kendrick at glebecentre.ca (Upper K. Nightmares) Date: Thu, 29 Mar 2007 11:08:07 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5353485645.20070329110807@glebecentre.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/5d2326fc/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: escapism.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/5d2326fc/escapism-0001.gif From juergen at glorypolyfilms.com Thu Mar 29 09:17:32 2007 From: juergen at glorypolyfilms.com (Enthusiastically F. Hemispheric) Date: Thu, 29 Mar 2007 12:17:32 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <0608357559.20070329121732@glorypolyfilms.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://commiserationzul.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From extremedx at greencard-us.org Thu Mar 29 04:26:27 2007 From: extremedx at greencard-us.org (Cohesion A. Miltiades) Date: Thu, 29 Mar 2007 07:26:27 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1015093807.20070329072627@greencard-us.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://commiserationzul.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/0dc41792/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 05:44:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 12:44:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10524 - /vtigercrm/branches/5.0.3/modules/Emails/EditView.php Message-ID: <20070329124405.516F77D2617@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 06:44:01 2007 New Revision: 10524 Log: passed array as parameter Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Thu Mar 29 06:44:01 2007 @@ -142,7 +142,8 @@ $mbox = $MailBox->mbox; $webmail = new Webmails($mbox,$mailid); - $webmail->loadMail(); + $array_tab = Array(); + $webmail->loadMail($array_tab); $hdr = @imap_headerinfo($mbox, $mailid); $smarty->assign('WEBMAIL',"true"); if($_REQUEST["reply"] == "all") { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:32:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:32:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10525 - /vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Message-ID: <20070329133225.63DB07D260B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:32:21 2007 New Revision: 10525 Log: changed the css name Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Thu Mar 29 07:32:21 2007 @@ -106,7 +106,7 @@ // TODO: update this function to allow you to set what entity type // you would like to associate to var rowId = "row_"+mid; - $(rowId).className = "unread_email"; + $(rowId).className = "qualify_email"; $("status").style.display="block"; new Ajax.Request( 'index.php', From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:33:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:33:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10526 - /vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Message-ID: <20070329133344.25C737D261C@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:33:39 2007 New Revision: 10526 Log: added a css entry for qualify email Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original) +++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Thu Mar 29 07:33:39 2007 @@ -1603,6 +1603,15 @@ .unread_email:hover{ font-weight:bold; } + + + + +.qualify_email { + font-weight:bold; + background-color:#FF7F50; + + } .delete_email { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:34:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:34:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10527 - /vtigercrm/branches/5.0.3/themes/alphagrey/style.css Message-ID: <20070329133422.07CA27D261C@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:34:18 2007 New Revision: 10527 Log: added a css entry for qualify email Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.0.3/themes/alphagrey/style.css Thu Mar 29 07:34:18 2007 @@ -1628,6 +1628,14 @@ background-color:#FF5151; } +.qualify_email { + font-weight:bold; + background-color:#CDB5CD; + + } + + + .mailSelected { font-family: Arial, Helvetica, sans-serif; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:34:55 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:34:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10528 - /vtigercrm/branches/5.0.3/themes/woodspice/style.css Message-ID: <20070329133455.EEA1E7D260B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:34:51 2007 New Revision: 10528 Log: added a css entry for qualify email Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.0.3/themes/woodspice/style.css Thu Mar 29 07:34:51 2007 @@ -1665,6 +1665,15 @@ font-weight:bold; background-color:#00FF00; } + + +.qualify_email { + font-weight:bold; + background-color:#FFA500; + + } + + .delete_email { font-weight:bold; background-color:#FF5151; From joyner at granite.k12.ok.us Thu Mar 29 12:16:02 2007 From: joyner at granite.k12.ok.us (Subprograms O. Difficulties) Date: Thu, 29 Mar 2007 15:16:02 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6933616930.20070329151602@granite.k12.ok.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/1059236b/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Benet.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/1059236b/Benet.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 08:25:20 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 15:25:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10529 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php Save.php Message-ID: <20070329152520.7F8CD7C43F4@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 09:25:13 2007 New Revision: 10529 Log: passed array as parameter Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/Save.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Thu Mar 29 09:25:13 2007 @@ -40,8 +40,8 @@ echo ''; echo ''; - -$webmail->loadMail(); +$array_tab = Array(); +$webmail->loadMail($array_tab); echo ''; Modified: vtigercrm/branches/5.0.3/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Save.php Thu Mar 29 09:25:13 2007 @@ -33,8 +33,8 @@ $email = new Webmails($MailBox->mbox, $_REQUEST["mailid"]); $subject = $email->subject; $date = $email->date; - -$email->loadMail(); +$array_tab = Array(); +$email->loadMail($array_tab); $msgData = $email->body; $focus->column_fields['subject']=$subject; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 08:29:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 15:29:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10530 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070329152902.D0FCD7D2609@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 09:28:58 2007 New Revision: 10530 Log: string added for Loading Image message Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Thu Mar 29 09:28:58 2007 @@ -155,6 +155,7 @@ 'FROM' => 'From:', 'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', - +//Added for 5.0.3 +'LBL_LOADING_IMAGE' => 'Loading Image', ); ?> From isthistaken at greerdesigns.com Thu Mar 29 07:18:03 2007 From: isthistaken at greerdesigns.com (Cavort T. Detonated) Date: Thu, 29 Mar 2007 10:18:03 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <0269172661.20070329101803@greerdesigns.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://commiserationzul.com Completely secure and confidential purchase. Instant shipping worldwide. From extremsp at gimns.com Thu Mar 29 09:40:28 2007 From: extremsp at gimns.com (Atrophied V. Internals) Date: Thu, 29 Mar 2007 16:40:28 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7392930205.20070329164028@gimns.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/d8a17938/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: God.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/d8a17938/God.gif From extradoors at gmbdesign.com Thu Mar 29 10:39:50 2007 From: extradoors at gmbdesign.com (Democritus H. Screwball) Date: Thu, 29 Mar 2007 13:39:50 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <4633394294.20070329133950@gmbdesign.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://commiserationzul.com Only Secure and Confidential purchase! Verified buy VISA! From istmas at goodluckmojo-jpn.com Thu Mar 29 15:38:52 2007 From: istmas at goodluckmojo-jpn.com (Communing S. Asteroid) Date: Thu, 29 Mar 2007 18:38:52 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <9175458500.20070329183852@goodluckmojo-jpn.com> Most wanted pills at LOW price! http://commiserationzul.com Completely secure and confidential purchase. Instant shipping worldwide. From extremefearclan at ggiroux.par32.com Thu Mar 29 11:17:24 2007 From: extremefearclan at ggiroux.par32.com (Dr. Richard French) Date: Thu, 29 Mar 2007 18:17:24 +0000 Subject: [Vtigercrm-commits] Power penis Message-ID: <8773727141.20070329181724@ggiroux.par32.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/7beca371/attachment.htm From sadecker at goatsucker.com Thu Mar 29 08:52:49 2007 From: sadecker at goatsucker.com (Holdup M. Polanski) Date: Thu, 29 Mar 2007 11:52:49 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <2407860745.20070329115249@goatsucker.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://commiserationzul.com We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From istcs at giskard.com Thu Mar 29 19:10:26 2007 From: istcs at giskard.com (Descender R. Prizefight) Date: Thu, 29 Mar 2007 22:10:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5554561300.20070329221026@giskard.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/6adc5fb7/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: tranquiler.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/6adc5fb7/tranquiler-0001.gif From aw at globteam.com Thu Mar 29 14:23:00 2007 From: aw at globteam.com (Volcanoes P. Drawers) Date: Thu, 29 Mar 2007 21:23:00 +0000 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <2771913118.20070329212300@globteam.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From rjls at globaldarkness.com Thu Mar 29 20:17:21 2007 From: rjls at globaldarkness.com (Puppy D. Guttered) Date: Thu, 29 Mar 2007 23:17:21 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <0034391282.20070329231721@globaldarkness.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://scapeidaa.com Verified by VISA and sell FDA Approved Drugs only! From marzette at gls-denmark.com Thu Mar 29 15:52:28 2007 From: marzette at gls-denmark.com (Providing G. Diminuendo) Date: Thu, 29 Mar 2007 18:52:28 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <9860287156.20070329185228@gls-denmark.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sdallen at griffinsecurities.com Thu Mar 29 13:12:02 2007 From: sdallen at griffinsecurities.com (Marginal J. Dross) Date: Thu, 29 Mar 2007 16:12:02 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <0754099448.20070329161202@griffinsecurities.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://scapeidaa.com Recover your health! Completely confidential and secure purchase! Licensed medications only! From lycanthus at dpweb.vendaregroup.com Thu Mar 29 23:32:29 2007 From: lycanthus at dpweb.vendaregroup.com (Studentship S. Dictatorial) Date: Fri, 30 Mar 2007 02:32:29 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <5366758538.20070330023229@gmmsolutions.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://scapeidaa.com And improve your sexual life! Only Confidential purchase. Verified by VISA! From istapa at greenzap.com Thu Mar 29 19:54:01 2007 From: istapa at greenzap.com (Gluts S. Zanier) Date: Fri, 30 Mar 2007 02:54:01 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9552183482.20070330025401@greenzap.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/d6b2f48c/attachment.html From cat at globecities.com Thu Mar 29 20:03:41 2007 From: cat at globecities.com (Pass V. Liquidity) Date: Thu, 29 Mar 2007 23:03:41 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3407788765.20070329230341@globecities.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/a5f0ed82/attachment.htm From istem at glucotrak.com Thu Mar 29 17:52:57 2007 From: istem at glucotrak.com (Natalie Shepherd) Date: Thu, 29 Mar 2007 20:52:57 -0400 Subject: [Vtigercrm-commits] snishoditelno chto Message-ID: <8481415627.20070329205257@glucotrak.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/7b4dfa37/attachment.html From gabriel at goldline.ca Thu Mar 29 20:34:59 2007 From: gabriel at goldline.ca (Handshaking B. Indelible) Date: Fri, 30 Mar 2007 03:34:59 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4159599721.20070330033459@goldline.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/3c63712c/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: Ana.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/3c63712c/Ana.gif From weiss at gospelpianostudio.com Fri Mar 30 01:52:44 2007 From: weiss at gospelpianostudio.com (Impudence G. Tyro) Date: Fri, 30 Mar 2007 04:52:44 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6860725471.20070330045244@gospelpianostudio.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/ece6c7b5/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: persecution.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/ece6c7b5/persecution-0001.gif From istahy at grasshopperpie.com Thu Mar 29 20:20:21 2007 From: istahy at grasshopperpie.com (Juliennes L. Slater) Date: Thu, 29 Mar 2007 23:20:21 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <9797152699.20070329232021@grasshopperpie.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://scapeidaa.com Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 23:50:29 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 06:50:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10531 - /vtigercrm/branches/5.0.3/include/js/en_us.lang.js Message-ID: <20070330065029.6AB357D262B@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 30 00:50:25 2007 New Revision: 10531 Log: removed comma Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Fri Mar 30 00:50:25 2007 @@ -103,5 +103,5 @@ LESS_THAN:'less than', GREATER_THAN:'greater than', LESS_OR_EQUALS:'less or equal', - GREATER_OR_EQUALS:'greater or equal', + GREATER_OR_EQUALS:'greater or equal' }; From samuraiblu at park.funnel.revenuedirect.com.akadns.net Thu Mar 29 23:28:25 2007 From: samuraiblu at park.funnel.revenuedirect.com.akadns.net (Waylon Barnes) Date: Fri, 30 Mar 2007 02:28:25 -0400 Subject: [Vtigercrm-commits] bylo poniala Message-ID: <6902284103.20070330022825@gravitystormz.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/921db226/attachment.htm From extrk at gmsaudit.com Fri Mar 30 01:59:18 2007 From: extrk at gmsaudit.com (Westminster U. Irresistibly) Date: Fri, 30 Mar 2007 04:59:18 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <8226476508.20070330045918@gmsaudit.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://scapeidaa.com ONLY! From highams at gokcenlawoffice.com Fri Mar 30 06:57:45 2007 From: highams at gokcenlawoffice.com (Festoons M. Cardboard) Date: Fri, 30 Mar 2007 09:57:45 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <5441090302.20070330095745@gokcenlawoffice.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://scapeidaa.com Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 02:45:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 09:45:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10532 - /vtigercrm/branches/5.0.3/modules/Webmails/functions.php Message-ID: <20070330094543.8FC507D2654@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 03:45:35 2007 New Revision: 10532 Log: fixes #3245 Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/functions.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/functions.php Fri Mar 30 03:45:35 2007 @@ -235,7 +235,9 @@ "']*>.*?'si", "']*>'si" ); - $body = preg_replace($to_removed_array, '', $body); + $body = preg_replace($to_removed_array, '', $body); + //line added to fix #3245 + $body=preg_replace("/(http:\/\/|ftp:\/\/)([^\s,]*)/i","$1$2 target=_blank",$body ); $body = preg_replace("|href=\"(.*)script:|i", 'href="nocc_removed_script:', $body); $body = preg_replace("|<([^>]*)java|i", ']*)&{.*}([^>]*)>|i", "<&{;}\\3>", $body); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 02:52:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 09:52:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10533 - /vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl Message-ID: <20070330095203.734547D2655@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 30 03:51:59 2007 New Revision: 10533 Log: text removed Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl Fri Mar 30 03:51:59 2007 @@ -1,4 +1,4 @@ -tamil{* +{* /********************************************************************************* ** The contents of this file are subject to the vtiger CRM Public License Version 1.0 * ("License"); You may not use this file except in compliance with the License From issybelly at goudurix.com Fri Mar 30 03:01:28 2007 From: issybelly at goudurix.com (Detain S. Humid) Date: Fri, 30 Mar 2007 10:01:28 +0000 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <0892568711.20070330100128@goudurix.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://scapeidaa.com Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 04:48:56 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 11:48:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10534 - /vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Message-ID: <20070330114856.4D91E78D0CA@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 05:48:51 2007 New Revision: 10534 Log: fixes #3543 Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Mar 30 05:48:51 2007 @@ -167,7 +167,7 @@ { global $current_user; $this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1"); - echo "
     Could not connect to the server. Please check the server details Here . Please click here to go to your Emails module."; + echo "
     ".$mod_strings['LBL_MAIL_CONNECT_ERROR']." Here . Please ".$mod_strings['LBL_CLICK_HERE']."".$mod_strings['LBL_GOTO_EMAILS_MODULE']." "; exit; } } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 04:49:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 11:49:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10535 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070330114916.1E14D7D265F@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 05:49:10 2007 New Revision: 10535 Log: fixes #3543 Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Mar 30 05:49:10 2007 @@ -135,7 +135,10 @@ 'LBL_EMAILS_TITLE'=>'Emails', 'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', // Added for 5.0.3 release +'LBL_MAIL_CONNECT_ERROR'=>'Could not connect to the mail server. Please check the mail server details', 'IN_REPLY_TO_THE_MESSAGE' => 'In reply to the message sent by ', +'LBL_CLICK_HERE' => 'Click Here ', +'LBL_GOTO_EMAILS_MODULE' => ' go to Emails module', 'LBL_NO_EMAILS'=>'No Emails In This Folder', 'LBL_MOVE_TO'=>'Move To...', 'LBL_DEL'=>'Del ', @@ -155,7 +158,6 @@ 'FROM' => 'From:', 'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', -//Added for 5.0.3 -'LBL_LOADING_IMAGE' => 'Loading Image', + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 04:50:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 11:50:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10536 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070330115038.728E278D0CA@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 05:50:34 2007 New Revision: 10536 Log: corrected checkin Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Mar 30 05:50:34 2007 @@ -158,6 +158,7 @@ 'FROM' => 'From:', 'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', - +//Added for 5.0.3 +'LBL_LOADING_IMAGE' => 'Loading Image', ); ?> From sharp at gloriousgospel.org Fri Mar 30 09:53:09 2007 From: sharp at gloriousgospel.org (Witticism P. Cruddy) Date: Fri, 30 Mar 2007 12:53:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5394260088.20070330125309@gloriousgospel.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/dbcd6bca/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Maribel.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/dbcd6bca/Maribel-0001.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 05:13:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:13:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10537 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070330121305.690CB78D16E@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 06:13:00 2007 New Revision: 10537 Log: changed font set to italics Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Fri Mar 30 06:13:00 2007 @@ -466,9 +466,9 @@ This will setup the + ConfigurationThis will setup the default currency which will be used for maintaining - transactions in vtiger. + transactions in vtiger. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 05:32:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:32:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10538 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070330123249.340A87D2664@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 06:32:45 2007 New Revision: 10538 Log: removed unwanted print_r Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Fri Mar 30 06:32:45 2007 @@ -130,7 +130,8 @@ $ret .= '"subject":"'.substr($data[$i]->subject,0,40).'",'; $ret .= '"date":"'.substr($data[$i]->date,0,30).'",'; $ret .= '"from":"'.substr($data[$i]->from,0,20).'",'; - $ret .= '"to":"'.$data[$i]->to.'",'; + $ret .= '"to":"'.$data[$i]->to.'",'; + echo ' to field is ' .$data[$i]->to; $email = new Webmails($MailBox->mbox,$data[$i]->msgno); if($email->has_attachments) $ret .= '"attachments":"1"}'; @@ -265,6 +266,7 @@ //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); + echo ' 2 to is '.$val->to; $val->subject = utf8_decode(imap_utf8($val->subject)); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 05:33:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:33:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10539 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070330123319.D139E7D2664@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 06:33:15 2007 New Revision: 10539 Log: removed unwanted echo Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Fri Mar 30 06:33:15 2007 @@ -266,7 +266,6 @@ //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); - echo ' 2 to is '.$val->to; $val->subject = utf8_decode(imap_utf8($val->subject)); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 05:57:35 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:57:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10540 - /vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Message-ID: <20070330125735.0364D7D266C@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 30 06:57:31 2007 New Revision: 10540 Log: language support. Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Mar 30 06:57:31 2007 @@ -165,7 +165,7 @@ //try second string which has no tls or validate-cert if(!$this->mbox = @imap_open($connectString1, $this->login_username, $this->secretkey)) { - global $current_user; + global $current_user,$mod_strings; $this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1"); echo "
     ".$mod_strings['LBL_MAIL_CONNECT_ERROR']." Here . Please ".$mod_strings['LBL_CLICK_HERE']."".$mod_strings['LBL_GOTO_EMAILS_MODULE']." "; exit; From krispy_k at gosportstherapy.com Fri Mar 30 03:59:51 2007 From: krispy_k at gosportstherapy.com (Thomas Bruce) Date: Fri, 30 Mar 2007 06:59:51 -0400 Subject: [Vtigercrm-commits] pogasit altar Message-ID: <5645144678.20070330065951@gosportstherapy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/a9215e95/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 06:25:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 13:25:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10541 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070330132549.C86767D2650@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 07:25:42 2007 New Revision: 10541 Log: changed All Mails to Emails Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Mar 30 07:25:42 2007 @@ -147,7 +147,7 @@ 'LABEL_DATE'=>'Date', 'LBL_NO_IFRAMES_SUPPORTED'=>'No Iframes supported', 'LBL_EMAIL_ATTACHMENTS'=>'Email Attachments:', -'LBL_ALLMAILS'=>'All Mails', +'LBL_ALLMAILS'=>'Emails', 'LBL_TO_USERS'=>'To Users', 'LBL_TO_GROUPS'=>'To Groups', 'SUBJECT' => 'Subject', From rblase at goldsealwindows.com Fri Mar 30 07:40:00 2007 From: rblase at goldsealwindows.com (Luminously F. Wineries) Date: Fri, 30 Mar 2007 10:40:00 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <9384944219.20070330104000@goldsealwindows.com> The most powerful medicines for you! Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pelletier at gotraining.us Fri Mar 30 06:43:20 2007 From: pelletier at gotraining.us (Angularity J. Rinsing) Date: Fri, 30 Mar 2007 09:43:20 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <7664821821.20070330094320@gotraining.us> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://scapeidaa.com Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From crusherjs at greenlightconsulting.net Fri Mar 30 10:38:14 2007 From: crusherjs at greenlightconsulting.net (Compendium Q. Explicable) Date: Fri, 30 Mar 2007 17:38:14 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4747275593.20070330173814@greenlightconsulting.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/d2fc1af4/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: love.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/d2fc1af4/love-0001.gif From extrato at greatlakescichlidsociety.com Fri Mar 30 09:52:38 2007 From: extrato at greatlakescichlidsociety.com (Catherine Wiley) Date: Fri, 30 Mar 2007 12:52:38 -0400 Subject: [Vtigercrm-commits] chut hochu Message-ID: <7489202974.20070330125238@greatlakescichlidsociety.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/a972872d/attachment.htm From frimjob at graupintors.com Fri Mar 30 13:21:29 2007 From: frimjob at graupintors.com (Terry Beard) Date: Fri, 30 Mar 2007 16:21:29 -0400 Subject: [Vtigercrm-commits] stoiala zastoialis Message-ID: <2894881772.20070330162129@graupintors.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/68242e91/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: widespread.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/68242e91/widespread.gif From karyn at goldinvestor.com Fri Mar 30 18:39:00 2007 From: karyn at goldinvestor.com (Vizor L. Berrying) Date: Fri, 30 Mar 2007 21:39:00 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <9078998343.20070330213900@goldinvestor.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://scapeidaa.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From rita.purohit at greghodges.com Fri Mar 30 11:50:20 2007 From: rita.purohit at greghodges.com (Elizabeth Hinton) Date: Fri, 30 Mar 2007 14:50:20 -0400 Subject: [Vtigercrm-commits] olsen etih Message-ID: <3619893283.20070330145020@greghodges.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/b483540e/attachment.html From rodriguez at gnpm-inc.com Fri Mar 30 15:52:23 2007 From: rodriguez at gnpm-inc.com (Dr. Aaron Hendricks) Date: Fri, 30 Mar 2007 22:52:23 +0000 Subject: [Vtigercrm-commits] FYEO Message-ID: <7120267864.20070330225223@gnpm-inc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/0f6b211a/attachment.htm From ajc at graphycad.com Fri Mar 30 22:11:40 2007 From: ajc at graphycad.com (Agency G. Contortionists) Date: Sat, 31 Mar 2007 01:11:40 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <8698779724.20070331011140@graphycad.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://scapeidaa.com Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From isteg at granada-apartments.com Fri Mar 30 15:07:06 2007 From: isteg at granada-apartments.com (Fred Conrad) Date: Fri, 30 Mar 2007 18:07:06 -0400 Subject: [Vtigercrm-commits] korotyshka tebia Message-ID: <7950276122.20070330180706@granada-apartments.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/4fd1538e/attachment.html From extrmeteam at gnnetcom.fr Fri Mar 30 22:46:38 2007 From: extrmeteam at gnnetcom.fr (Privileging A. Mohammedans) Date: Sat, 31 Mar 2007 01:46:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3035884696.20070331014638@gnnetcom.fr> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/1b06ad30/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: bagel.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/1b06ad30/bagel.gif From istofer.liew at glennen.freeserve.co.uk Fri Mar 30 18:43:19 2007 From: istofer.liew at glennen.freeserve.co.uk (Tara Hancock) Date: Fri, 30 Mar 2007 21:43:19 -0400 Subject: [Vtigercrm-commits] vyrazhenie soboj Message-ID: <5930743132.20070330214319@glennen.freeserve.co.uk> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/cf8f5409/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: trite.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/cf8f5409/trite-0001.gif From norman at greatlakesorganic.com Fri Mar 30 16:19:37 2007 From: norman at greatlakesorganic.com (Robert Goff) Date: Fri, 30 Mar 2007 19:19:37 -0400 Subject: [Vtigercrm-commits] nepodhodiashchij starostoj Message-ID: <1900356684.20070330191937@greatlakesorganic.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/869554eb/attachment.htm From istevenson at gossinternational.com Fri Mar 30 19:59:57 2007 From: istevenson at gossinternational.com (Wolfing F. Incubus) Date: Sat, 31 Mar 2007 02:59:57 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4922095542.20070331025957@gossinternational.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/c525f23c/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Jeffrey.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/c525f23c/Jeffrey.gif From extremrage at gordlau.com Fri Mar 30 20:05:04 2007 From: extremrage at gordlau.com (Curacao J. Brahma) Date: Sat, 31 Mar 2007 03:05:04 +0000 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <6674817796.20070331030504@gordlau.com> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istenkut at gpac.com Fri Mar 30 18:55:32 2007 From: istenkut at gpac.com (Andrew Cochran) Date: Fri, 30 Mar 2007 21:55:32 -0400 Subject: [Vtigercrm-commits] tishiny obormot Message-ID: <1639752929.20070330215532@gpac.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/c5e6efa7/attachment.html From saishikawa at gratiotdesign.com Sat Mar 31 02:17:06 2007 From: saishikawa at gratiotdesign.com (Cohabits B. Laughing) Date: Sat, 31 Mar 2007 05:17:06 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <1027708365.20070331051706@gratiotdesign.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://scapeidaa.com Only Secure and Confidential purchase! Verified buy VISA! From d.michael_merino at glover.lib.ok.us Fri Mar 30 20:25:42 2007 From: d.michael_merino at glover.lib.ok.us (Hank Massey) Date: Fri, 30 Mar 2007 23:25:42 -0400 Subject: [Vtigercrm-commits] spasaete miasom Message-ID: <6125842305.20070330232542@glover.lib.ok.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/e54278b3/attachment.htm From istith at grolink.com Sat Mar 31 04:46:28 2007 From: istith at grolink.com (Appendectomy J. Albion) Date: Sat, 31 Mar 2007 07:46:28 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4089210056.20070331074628@grolink.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f9d48652/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: roomiest.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f9d48652/roomiest-0001.gif From istafford at gntimport.com Fri Mar 30 23:55:35 2007 From: istafford at gntimport.com (Rots H. Scatterbrains) Date: Sat, 31 Mar 2007 06:55:35 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0449634275.20070331065535@gntimport.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/31bea3a3/attachment.html From istianto_a at go4indiabusiness.com Sat Mar 31 05:36:56 2007 From: istianto_a at go4indiabusiness.com (Trappist I. Atherosclerosis) Date: Sat, 31 Mar 2007 08:36:56 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <2216722172.20070331083656@go4indiabusiness.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://scapeidaa.com Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From bob.korte at gnld.com.au Sat Mar 31 00:54:41 2007 From: bob.korte at gnld.com.au (Amy Rocha) Date: Sat, 31 Mar 2007 03:54:41 -0400 Subject: [Vtigercrm-commits] videl uzhe Message-ID: <6139788829.20070331035441@gnld.com.au> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/3179cf96/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: pepper.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/3179cf96/pepper.gif From istopsandiego at ghaneminsurance.com Fri Mar 30 23:04:34 2007 From: istopsandiego at ghaneminsurance.com (Christopher Benson) Date: Sat, 31 Mar 2007 02:04:34 -0400 Subject: [Vtigercrm-commits] posledniaia brovi Message-ID: <5570808253.20070331020434@ghaneminsurance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f6559b64/attachment.htm From dave-diggs at giacomotazzi.com Sat Mar 31 03:02:41 2007 From: dave-diggs at giacomotazzi.com (Whip O. Nib) Date: Sat, 31 Mar 2007 10:02:41 +0000 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <9331086086.20070331100241@giacomotazzi.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://scapeidaa.com Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From davdor at gilmancorp.com Sat Mar 31 01:16:48 2007 From: davdor at gilmancorp.com (Teresa Hughes) Date: Sat, 31 Mar 2007 04:16:48 -0400 Subject: [Vtigercrm-commits] smerti vospriiatie Message-ID: <8908879100.20070331041648@gilmancorp.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/8a582b51/attachment.html From mcleod at ghigny.com Sat Mar 31 09:22:38 2007 From: mcleod at ghigny.com (Caprice T. Groveler) Date: Sat, 31 Mar 2007 12:22:38 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <6503084461.20070331122238@ghigny.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://scapeidaa.com And improve your sexual life! Only Confidential purchase. Verified by VISA! From scarecrowmail at gradybritton.com Sat Mar 31 09:36:33 2007 From: scarecrowmail at gradybritton.com (Lumbermen H. Embezzler) Date: Sat, 31 Mar 2007 12:36:33 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4877147412.20070331123633@gradybritton.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/9cb67ee3/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: ganglia.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/9cb67ee3/ganglia.gif From sylvester at globdesign.com Sat Mar 31 02:35:59 2007 From: sylvester at globdesign.com (Bill Foreman) Date: Sat, 31 Mar 2007 05:35:59 -0400 Subject: [Vtigercrm-commits] viazli zaezzhij Message-ID: <9679949198.20070331053559@globdesign.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/d1bb66c2/attachment.htm From sesnyder at go2anr.com.au Sat Mar 31 07:08:31 2007 From: sesnyder at go2anr.com.au (Calyces H. Farewell) Date: Sat, 31 Mar 2007 14:08:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9818348334.20070331140831@go2anr.com.au> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/faf5b0bc/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: splinter.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/faf5b0bc/splinter-0001.gif From mark_ng at groceryinsider.com Sat Mar 31 07:27:18 2007 From: mark_ng at groceryinsider.com (Wendy Hurst) Date: Sat, 31 Mar 2007 10:27:18 -0400 Subject: [Vtigercrm-commits] gorlo etoj Message-ID: <1136640001.20070331102718@groceryinsider.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f08faded/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: whichever.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f08faded/whichever.gif From larkin at getbuf.com Sat Mar 31 12:27:05 2007 From: larkin at getbuf.com (Wooliest S. Babushkas) Date: Sat, 31 Mar 2007 15:27:05 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <9985335949.20070331152705@getbuf.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft – the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://scapeidaa.com Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From corbett at glasscock.org Sat Mar 31 04:43:13 2007 From: corbett at glasscock.org (Bridget Schmidt) Date: Sat, 31 Mar 2007 07:43:13 -0400 Subject: [Vtigercrm-commits] delo silah Message-ID: <0935565890.20070331074313@glasscock.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/121d19f9/attachment.html From crushgrove at gh-ca.com Sat Mar 31 06:38:40 2007 From: crushgrove at gh-ca.com (Candace Cochran) Date: Sat, 31 Mar 2007 09:38:40 -0400 Subject: [Vtigercrm-commits] lecheniia bolshim Message-ID: <6652849679.20070331093840@gh-ca.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/5959e2c3/attachment.htm From horne at graphicfactory.com Sat Mar 31 08:59:19 2007 From: horne at graphicfactory.com (Pithy G. Disarray) Date: Sat, 31 Mar 2007 15:59:19 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1231633649.20070331155919@graphicfactory.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/075ba71b/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: corsage.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/075ba71b/corsage-0001.gif From extremecase at getmygames.com Sat Mar 31 14:58:00 2007 From: extremecase at getmygames.com (Destitute U. Rued) Date: Sat, 31 Mar 2007 17:58:00 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2701411504.20070331175800@getmygames.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/07e781be/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: unfurl.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/07e781be/unfurl.gif From sadurrani at godoyle.com Sat Mar 31 16:17:03 2007 From: sadurrani at godoyle.com (Wing V. Leukocyte) Date: Sat, 31 Mar 2007 19:17:03 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <9429251610.20070331191703@godoyle.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://scapeidaa.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From alee at gonzoradio.org Sat Mar 31 08:33:41 2007 From: alee at gonzoradio.org (Steven Gregory) Date: Sat, 31 Mar 2007 11:33:41 -0400 Subject: [Vtigercrm-commits] meshalo kakoeto Message-ID: <3691300134.20070331113341@gonzoradio.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/5658885e/attachment.html From hewaiau at glennscarpet.com Sat Mar 31 12:14:03 2007 From: hewaiau at glennscarpet.com (Gang Q. Muralist) Date: Sat, 31 Mar 2007 19:14:03 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0757110770.20070331191403@glennscarpet.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/96ef0c32/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: prophetically.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/96ef0c32/prophetically.gif From sdmrt-ls at globeinternationalltd.com Sat Mar 31 12:18:35 2007 From: sdmrt-ls at globeinternationalltd.com (Dr. Andrew Ortiz) Date: Sat, 31 Mar 2007 19:18:35 +0000 Subject: [Vtigercrm-commits] FYEO Message-ID: <0508723319.20070331191835@globeinternationalltd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/8424cfe9/attachment.htm From extremesoftware at grafikando.com Sat Mar 31 15:22:32 2007 From: extremesoftware at grafikando.com (Daniel Randall) Date: Sat, 31 Mar 2007 18:22:32 -0400 Subject: [Vtigercrm-commits] chtoby nekotorye Message-ID: <5978478305.20070331182232@grafikando.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/7ff85daf/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: dungeon.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/7ff85daf/dungeon.gif From istek at globalsoftit.com Sat Mar 31 15:26:44 2007 From: istek at globalsoftit.com (Keenest M. Advent) Date: Sat, 31 Mar 2007 22:26:44 +0000 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0969334645.20070331222644@globalsoftit.com> The most powerful medicines for you! Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Wellbutrin SR - $3 - antidepressant used to treat depression. Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extronic at gonzvalabogados.com Sat Mar 31 20:31:25 2007 From: extronic at gonzvalabogados.com (Slough G. Cormorant) Date: Sat, 31 Mar 2007 23:31:25 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <9547139218.20070331233125@gonzvalabogados.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://scapeidaa.com Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From muzteach at globaltechweb.com Sat Mar 31 12:56:30 2007 From: muzteach at globaltechweb.com (Zachary Anderson) Date: Sat, 31 Mar 2007 15:56:30 -0400 Subject: [Vtigercrm-commits] szhimaia obitaniia Message-ID: <9139171932.20070331155630@globaltechweb.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/17a00f1f/attachment.html From heard at goodonebooks.com Sat Mar 31 20:56:08 2007 From: heard at goodonebooks.com (Telemetry Q. Spartacus) Date: Sat, 31 Mar 2007 23:56:08 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7834936716.20070331235608@goodonebooks.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/40734dcf/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: unemotional.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/40734dcf/unemotional-0001.gif From extrovert_angel at grantsynergy.net Sat Mar 31 14:48:04 2007 From: extrovert_angel at grantsynergy.net (Friedrick Webb) Date: Sat, 31 Mar 2007 17:48:04 -0400 Subject: [Vtigercrm-commits] tam lezet Message-ID: <7321108105.20070331174804@grantsynergy.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/ae30782e/attachment.htm From bmw at grandstandsports.com Sat Mar 31 18:37:43 2007 From: bmw at grandstandsports.com (Chisholm S. Lexicographer) Date: Sun, 01 Apr 2007 01:37:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7219249232.20070401013743@grandstandsports.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/41e2ed2b/attachment.html From extraloutfi at golfterrebonne.ca Sat Mar 31 17:01:18 2007 From: extraloutfi at golfterrebonne.ca (Joseph Santos) Date: Sat, 31 Mar 2007 20:01:18 -0400 Subject: [Vtigercrm-commits] dazhe leteli Message-ID: <1625614939.20070331200118@golfterrebonne.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/0dade1f5/attachment.htm From gardenmstr at global-transactions-ltd.com Sat Mar 31 18:26:39 2007 From: gardenmstr at global-transactions-ltd.com (Stephanie Rosales) Date: Sat, 31 Mar 2007 21:26:39 -0400 Subject: [Vtigercrm-commits] etih golovu Message-ID: <9778367196.20070331212639@global-transactions-ltd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/230b6207/attachment.html From post at glassdude.com Sat Mar 31 20:57:17 2007 From: post at glassdude.com (Jinx T. Shrubbed) Date: Sun, 01 Apr 2007 03:57:17 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5017468788.20070401035717@glassdude.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d255dd6b/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: shareholders.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d255dd6b/shareholders.gif From dave-a at glsbr.net Sat Mar 31 21:41:20 2007 From: dave-a at glsbr.net (Boyishness H. Conner) Date: Sun, 01 Apr 2007 04:41:20 +0000 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <0637235914.20070401044120@glsbr.net> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://scapeidaa.com Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From pnjca at goodnewstucson.com Sat Mar 31 22:28:47 2007 From: pnjca at goodnewstucson.com (Jennifer Chambers) Date: Sun, 01 Apr 2007 01:28:47 -0400 Subject: [Vtigercrm-commits] truda voliu Message-ID: <4504679679.20070401012847@goodnewstucson.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/8e980adf/attachment.htm -------------- next part -------------- A non-text attachment was scrubbed... Name: woodpeckers.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/8e980adf/woodpeckers.gif From crushermg at glcu.org Sat Mar 31 21:06:53 2007 From: crushermg at glcu.org (Catherine Salinas) Date: Sun, 01 Apr 2007 00:06:53 -0400 Subject: [Vtigercrm-commits] sobiralsia poetomu Message-ID: <9644001359.20070401000653@glcu.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/1160456f/attachment.htm From eve at gpara.com Sat Mar 31 22:27:42 2007 From: eve at gpara.com (Vanessa Sandoval) Date: Sun, 01 Apr 2007 01:27:42 -0400 Subject: [Vtigercrm-commits] sobstvennye kurtki Message-ID: <8810397957.20070401012742@gpara.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/43712f57/attachment.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 1 03:17:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 01 Mar 2007 08:17:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10277 - in /vtigercrm/branches/5.0.3: Smarty/templates/PrintReport.tpl modules/Reports/PrintReport.php modules/Reports/Reports.php Message-ID: <20070301081710.D369178D69B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 1 01:16:57 2007 New Revision: 10277 Log: i18n for Reports - Move report to another folder. Fixes #3016 Modified: vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl vtigercrm/branches/5.0.3/modules/Reports/PrintReport.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/PrintReport.tpl Thu Mar 1 01:16:57 2007 @@ -18,7 +18,7 @@ -vtiger - Print Report +vtiger - {$MOD.LBL_PRINT_REPORT} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl Fri Mar 2 00:43:22 2007 @@ -11,8 +11,8 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl Fri Mar 2 00:43:22 2007 @@ -11,8 +11,8 @@ -->*} - - vtiger CRM - Create Report + + {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:45:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:45:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10310 - /vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php Message-ID: <20070302074531.0F9C478D707@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:45:24 2007 New Revision: 10310 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php Modified: vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php (original) +++ vtigercrm/branches/5.0.3/modules/Contacts/vtchat.php Fri Mar 2 00:45:24 2007 @@ -1,21 +1,24 @@ - + - + -Ajax Css-Popup chat +<?php echo $mod_strings['TITLE_AJAX_CSS_POPUP_CHAT'];?> - - - - + + + + From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:46:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:46:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10311 - /vtigercrm/branches/5.0.3/modules/Users/notify_detail.php Message-ID: <20070302074617.34D0D78D707@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:45:47 2007 New Revision: 10311 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/modules/Users/notify_detail.php Modified: vtigercrm/branches/5.0.3/modules/Users/notify_detail.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/notify_detail.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/notify_detail.php Fri Mar 2 00:45:47 2007 @@ -10,6 +10,8 @@ ********************************************************************************/ global $theme; +global $app_strings; +global $mod_strings; $theme_path="themes/".$theme."/"; $image_path=$theme_path."images/"; @@ -20,8 +22,8 @@ -Untitled Document - +<?php echo $mod_strings['TITLE_USER_DOCUMENT']; ?> + @@ -44,7 +46,7 @@ - From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:47:32 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:47:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10312 - /vtigercrm/branches/5.0.3/modules/Users/about_us.php Message-ID: <20070302074732.34F0E78D712@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:46:51 2007 New Revision: 10312 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/modules/Users/about_us.php Modified: vtigercrm/branches/5.0.3/modules/Users/about_us.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/about_us.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/about_us.php Fri Mar 2 00:46:51 2007 @@ -32,8 +32,8 @@ "http://www.w3.org/TR/html4/loose.dtd"> - -vtiger CRM 5 - Free, Commercial grade Open Source CRM + +<?php echo $mod_strings['TITLE_VTIGER_CRM_5'];?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:50:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:50:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10313 - /vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Message-ID: <20070302075010.A2FD678D718@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:50:01 2007 New Revision: 10313 Log: fixes #3042 Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Fri Mar 2 00:50:01 2007 @@ -16,7 +16,7 @@ -Compose Mail +{MOD.TITLE_COMPOSE_MAIL} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:52:31 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:52:31 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10314 - /vtigercrm/branches/5.0.3/modules/Settings/Save.php Message-ID: <20070302075231.277C178D72C@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:52:13 2007 New Revision: 10314 Log: fixes #3048 Modified: vtigercrm/branches/5.0.3/modules/Settings/Save.php Modified: vtigercrm/branches/5.0.3/modules/Settings/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/Save.php Fri Mar 2 00:52:13 2007 @@ -10,6 +10,7 @@ ********************************************************************************/ require_once("include/database/PearDatabase.php"); +global $mod_strings; $server=$_REQUEST['server']; $port=$_REQUEST['port']; $server_username=$_REQUEST['server_username']; @@ -99,8 +100,8 @@ $to_email = getUserEmailId('id',$current_user->id); $from_email = $to_email; - $subject = 'Test mail about the mail server configuration.'; - $description = 'Dear '.$current_user->user_name.',

    This is a test mail sent to confirm if a mail is actually being sent through the vtiger system. You are free to delete this mail.
    Thanks and Regards
    Team vTiger

    '; + $subject = $mod_strings['MSG_TEST_MAIL_ABOUT_MAIL_SERVER']; + $description = $mod_strings['MSG_Dear'].' '.$current_user->user_name.',

    '.$mod_strings['MSG_THIS_IS_TEST_MAIL'].' '.$mod_strings['MSG_YOU_ARE_FREE_TO_THIS_MAIL'].'
    '.$mod_strings['MSG_THANKS_AND_REGARDS'].'
    '.$mod_strings['MSG_TEAM_VTIGER']

    '; if($to_email != '') { $mail_status = send_mail('Users',$to_email,$current_user->user_name,$from_email,$subject,$description); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:53:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:53:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10315 - /vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Message-ID: <20070302075303.4824A78D718@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:52:54 2007 New Revision: 10315 Log: fixes #3048 Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Fri Mar 2 00:52:54 2007 @@ -882,7 +882,7 @@ 'LBL_DOC_MSWORD'=>'File has to be a Document of type doc/msword', 'LBL_NODOC'=>'No doc File in this directory.Please try again!', -//Added for error messages on Company Info. +//Added for 5.0.3 'LOGO_ERROR'=>'Logo has to be an Image of type jpeg/png', 'Error_Message'=>'Error Message', 'Invalid_file'=>'Invalid file OR', @@ -892,5 +892,14 @@ 'try_file_smaller'=>'Please try a file smaller than 800000 bytes', 'Problems_in_upload'=>'Problems in file upload', 'Please_try_again'=>'Please try again!', + +'RECORD_DOESNOT_EXIST'=>'Record does not exist', + +'MSG_TEST_MAIL_ABOUT_MAIL_SERVER'=>'Test mail about the mail server configuration.', +'MSG_Dear'=>'Dear', +'MSG_THIS_IS_TEST_MAIL'=>'This is a test mail sent to confirm if a mail is actually being sent through the vtiger system.', +'MSG_YOU_ARE_FREE_TO_THIS_MAIL'=>'You are free to delete this mail.', +'MSG_THANKS_AND_REGARDS'=>'Thanks and Regards', +'MSG_TEAM_VTIGER'=>'Team vTiger', ); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:54:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:54:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10316 - /vtigercrm/branches/5.0.3/include/language/en_us.lang.php Message-ID: <20070302075447.2847F78D728@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:54:25 2007 New Revision: 10316 Log: fixes #3173 Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Fri Mar 2 00:54:25 2007 @@ -356,7 +356,6 @@ 'Type' => 'Type', 'Start Date/Due Date' => 'Start Date/Due Date', 'Date Sent' => 'Date Sent', -'Sender'=>'Sender', 'Ticket ID' => 'Ticket ID', 'Status' => 'Status', 'Priority' => 'Priority', @@ -655,14 +654,6 @@ 'greater or equal'=>'greater or equal', 'less or equal'=>'less or equal', -'Private'=>'Private', -'Public'=>'Public', - -'High'=>'High', -'Medium'=>'Medium', -'Low'=>'Low', - - //For Product Details 'LABEL_SET_DISCOUNT_FOR_COLON'=>'Set Discount for :', 'LABEL_SET_TAX_FOR'=>'Set Tax for', @@ -672,7 +663,9 @@ 'LABEL_SET_TAX_FOR_X'=>'Set Tax for x', 'LABEL_SET_SH_TAX_FOR_COLON'=>'Set S&H Tax for :', +//Added for 5.0.3 'Files_Maximum_6'=>'Files Maximum 6', +'To'=>'To:', ); $app_list_strings = array ( From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 2 02:56:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 02 Mar 2007 07:56:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10317 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070302075628.4A62C78D718@vtiger.fosslabs.com> Author: richie Date: Fri Mar 2 00:55:38 2007 New Revision: 10317 Log: fixes #3173 Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Fri Mar 2 00:55:38 2007 @@ -37,7 +37,7 @@ function getOutputHtml($uitype, $fieldname, $fieldlabel, $maxlength, $col_fields,$generatedtype,$module_name,$mode='') { - global $log; + global $log,$app_strings; $log->debug("Entering getOutputHtml(".$uitype.",". $fieldname.",". $fieldlabel.",". $maxlength.",". $col_fields.",".$generatedtype.",".$module_name.") method ..."); global $adb,$log; global $theme; @@ -924,7 +924,7 @@ } } } - $custfld .= ''; + $custfld .= ''; $custfld .= '
    Currency - Configuration
    Name*
    Active: + [Deactivate]
    To: '.$app_strings['To'].'  
    From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 07:33:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 05 Mar 2007 12:33:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10343 - in /vtigercrm/branches/5.0.3: Smarty/templates/Inventory/InventoryDetailView.tpl include/js/ListView.js include/language/en_us.lang.php include/utils/DeleteUtils.php modules/Vendors/Delete.php Message-ID: <20070305123317.1C21C78B59A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 05:32:35 2007 New Revision: 10343 Log: fix for vendor related purchase order is not getting deleted. Fixes #3102 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/branches/5.0.3/include/js/ListView.js vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php vtigercrm/branches/5.0.3/modules/Vendors/Delete.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Mar 5 05:32:35 2007 @@ -125,7 +125,7 @@   {/if} {if $DELETE eq 'permitted'} -   +   {/if} @@ -240,7 +240,7 @@   {/if} {if $DELETE eq 'permitted'} -   +   {/if} Modified: vtigercrm/branches/5.0.3/include/js/ListView.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ListView.js (original) +++ vtigercrm/branches/5.0.3/include/js/ListView.js Mon Mar 5 05:32:35 2007 @@ -72,7 +72,13 @@ alert("Please select at least one entity"); return false; } - var alert_str = (module=="Accounts") ? "Deleting this account(s) will remove its related Potentials,Quotes,Sales Order & Invoice. Are you sure you want to delete the selected "+xx+" records?" : "Are you sure you want to delete the selected "+xx+" records ?"; + var alert_str = "Are you sure you want to delete the selected "+xx+" records ?"; + + if(module=="Accounts") + alert_str = "Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected "+xx+" records?"; + else if(module=="Vendors") + alert_str = "Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected "+xx+" records?"; + if(confirm(alert_str)) { Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Mar 5 05:32:35 2007 @@ -176,7 +176,8 @@ 'NTC_TIME_FORMAT' => '(24:00)', 'NTC_DATE_TIME_FORMAT' => '(yyyy-mm-dd 24:00)', 'NTC_DELETE_CONFIRMATION' => 'Are you sure you want to delete this record?', -'NTC_ACCOUNT_DELETE_CONFIRMATION' => 'Deleting this account will remove its related Potentials,Quotes,Sales Order & Invoice. Are you sure you want to delete this account?', +'NTC_ACCOUNT_DELETE_CONFIRMATION' => 'Deleting this account will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete this account?', +'NTC_VENDOR_DELETE_CONFIRMATION' => 'Deleting this vendor will remove its related Purchase Orders. Are you sure you want to delete this vendor?', 'ERR_DELETE_RECORD' => 'A record number must be specified to delete the contact.', 'ERR_CREATING_TABLE' => 'Error creating table: ', 'ERR_CREATING_FIELDS' => 'Error filling in additional detail fields: ', Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Mon Mar 5 05:32:35 2007 @@ -428,7 +428,29 @@ //Deleting Trouble Tickets-Account Relation. $tt_q = "update vtiger_troubletickets set parent_id = '' where parent_id = ".$record; - $tt_res = $adb->query($tt_q); $adb->query($tt_q); } + +function delVendorRelRecords($record){ + + global $adb; + + //Deleting Vendor related PO. + $po_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_purchaseorder on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid inner join vtiger_vendor on vtiger_vendor.vendorid=vtiger_purchaseorder.vendorid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$record; + $po_res = $adb->query($po_q); + for($k=0;$k < $adb->num_rows($po_res);$k++) + { + $po_id = $adb->query_result($po_res,$k,"crmid"); + $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$po_id; + $adb->query($sql); + } + + //Deleting Product-Vendor Relation. + $pro_q = "update vtiger_products set vendor_id = '' where vendor_id = ".$record; + $adb->query($pro_q); + //Deleting Contact-Vendor Relaton + $vc_sql = "delete from vtiger_vendorcontactrel where vendorid=".$record; + $adb->query($vc_sql); +} + ?> Modified: vtigercrm/branches/5.0.3/modules/Vendors/Delete.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Delete.php (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Delete.php Mon Mar 5 05:32:35 2007 @@ -29,11 +29,11 @@ if(!isset($_REQUEST['record'])) die($mod_strings['ERR_DELETE_RECORD']); - + if($_REQUEST['module'] == $_REQUEST['return_module']) { + delVendorRelRecords($_REQUEST['record']); $focus->mark_deleted($_REQUEST['record']); - $smod ="smodule=VENDOR&"; } -header("Location: index.php?".$smod."module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); +header("Location: index.php?module=".$_REQUEST['return_module']."&action=".$_REQUEST['return_action']."&record=".$_REQUEST['return_id']."&relmodule=".$_REQUEST['module']); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 08:09:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 05 Mar 2007 13:09:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10344 - /vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Message-ID: <20070305130906.45B9178C36A@vtiger.fosslabs.com> Author: richie Date: Mon Mar 5 06:08:58 2007 New Revision: 10344 Log: fixes #3127 Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Mon Mar 5 06:08:58 2007 @@ -84,6 +84,7 @@ $email = new Webmails($MailBox->mbox,$mailid); $email->setFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } @@ -92,6 +93,7 @@ $email = new Webmails($MailBox->mbox,$mailid); $email->delFlag(); imap_close($MailBox->mbox); + echo $mailid; flush(); exit(); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 08:52:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 05 Mar 2007 13:52:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10345 - /vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Message-ID: <20070305135209.3969278D8F6@vtiger.fosslabs.com> Author: richie Date: Mon Mar 5 06:52:02 2007 New Revision: 10345 Log: fixes mail moving issue Modified: vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Modified: vtigercrm/branches/5.0.3/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Mon Mar 5 06:52:02 2007 @@ -370,7 +370,9 @@ for(var i=cnt;i>0;i--) { if(els[i].type == "checkbox" && els[i].name.indexOf("_")) { if(els[i].checked) { - var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); + // var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); + + var nid = els[i].value; var mvmbox = $("mailbox_select").value; var row = $("row_"+nid); new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '0.5'}); @@ -387,7 +389,8 @@ } } } - runEmailCommand('expunge',''); + $('mailbox_select').selectedIndex=0; + //runEmailCommand('expunge',''); $("status").style.display="none"; } function search_emails() { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:14:37 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:14:37 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10346 - /vtigercrm/branches/5.0.3/themes/bluelagoon/images/aboutUS.jpg Message-ID: <20070306041437.A744078D91D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:14:33 2007 New Revision: 10346 Log: aboutUS.jpg image has deleted --Minnie Removed: vtigercrm/branches/5.0.3/themes/bluelagoon/images/aboutUS.jpg From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:15:40 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:15:40 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10347 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/aboutUS.jpg woodspice/images/aboutUS.jpg Message-ID: <20070306041540.64BCA78D91C@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:15:34 2007 New Revision: 10347 Log: aboutUS.jpg image has deleted --Minnie Removed: vtigercrm/branches/5.0.3/themes/alphagrey/images/aboutUS.jpg vtigercrm/branches/5.0.3/themes/woodspice/images/aboutUS.jpg From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:20:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:20:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10348 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/aboutUS.jpg bluelagoon/images/aboutUS.jpg woodspice/images/aboutUS.jpg Message-ID: <20070306042006.A2E3878D91D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:19:55 2007 New Revision: 10348 Log: new image added for aboutus --Minnie Added: vtigercrm/branches/5.0.3/themes/alphagrey/images/aboutUS.jpg (with props) vtigercrm/branches/5.0.3/themes/bluelagoon/images/aboutUS.jpg (with props) vtigercrm/branches/5.0.3/themes/woodspice/images/aboutUS.jpg (with props) From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:31:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:31:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10349 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/cal12x12Shared.gif bluelagoon/images/cal12x12Shared.gif woodspice/images/cal12x12Shared.gif Message-ID: <20070306043139.D373178D051@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:31:32 2007 New Revision: 10349 Log: calendar sharing image has been removed. --Minnie Removed: vtigercrm/branches/5.0.3/themes/alphagrey/images/cal12x12Shared.gif vtigercrm/branches/5.0.3/themes/bluelagoon/images/cal12x12Shared.gif vtigercrm/branches/5.0.3/themes/woodspice/images/cal12x12Shared.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 5 23:38:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 04:38:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10350 - in /vtigercrm/branches/5.0.3/themes: alphagrey/images/cal12x12Shared.gif bluelagoon/images/cal12x12Shared.gif woodspice/images/cal12x12Shared.gif Message-ID: <20070306043828.935DE78C6F4@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 21:38:17 2007 New Revision: 10350 Log: new image added for calendar sharing. --Minnie Added: vtigercrm/branches/5.0.3/themes/alphagrey/images/cal12x12Shared.gif (with props) vtigercrm/branches/5.0.3/themes/bluelagoon/images/cal12x12Shared.gif (with props) vtigercrm/branches/5.0.3/themes/woodspice/images/cal12x12Shared.gif (with props) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 00:42:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 05:42:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10351 - in /vtigercrm/branches/5.0.3/modules/Calendar: ActivityAjax.php CalendarCommon.php Save.php TodoSave.php Message-ID: <20070306054204.BAADC78D892@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 5 22:41:56 2007 New Revision: 10351 Log: fix for event notification failure. Fixes #3068 --Minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php vtigercrm/branches/5.0.3/modules/Calendar/Save.php vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/ActivityAjax.php Mon Mar 5 22:41:56 2007 @@ -142,6 +142,24 @@ $activity_type = "Events"; } ChangeStatus($status,$return_id,$activity_type); + $mail_data = getActivityMailInfo($return_id,$status,$activity_type); + if($mail_data['sendnotification'] == 1) + { + getEventNotification($mail_data['user_id'],$activity_type,$mail_data['subject'],$mail_data); + } + $invitee_qry = "select * from vtiger_invitees where activityid=".$return_id; + $invitee_res = $adb->query($invitee_qry); + $count = $adb->num_rows($invitee_res); + if($count != 0) + { + for($j = 0; $j < $count; $j++) + { + $invitees_ids[]= $adb->query_result($invitee_res,$j,"inviteeid"); + + } + $invitees_ids_string = implode(';',$invitees_ids); + sendInvitation($invitees_ids_string,$activity_type,$mail_data['subject'],$mail_data); + } } if($type == 'activity_postpone') { Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Mon Mar 5 22:41:56 2007 @@ -293,26 +293,26 @@ global $adb,$mod_strings; $log->debug("Entering getActivityDetails(".$description.") method ..."); - $reply = (($_REQUEST['mode'] == 'edit')?'updated':'created'); + $reply = (($description['mode'] == 'edit')?'updated':'created'); if($inviteeid=='') - $name = getUserName($_REQUEST['assigned_user_id']); + $name = getUserName($description['user_id']); else $name = getUserName($inviteeid); $current_username = getUserName($current_user->id); - $status = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus'])); + $status = $description['status']; $list = $name.','; - $list .= '

    '.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.
    '.$mod_strings['LBL_DETAILS_STRING'].':'; - $list .= '
          '.$mod_strings["LBL_SUBJECT"].' '.$_REQUEST['subject']; + $list .= '

    '.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.
    '.$mod_strings['LBL_DETAILS_STRING'].':
    '; + $list .= '
          '.$mod_strings["LBL_SUBJECT"].' '.$description['subject']; $list .= '
          '.$mod_strings["LBL_STATUS"].': '.$status; - $list .= '
          '.$mod_strings["Priority"].': '.$_REQUEST['taskpriority']; - $list .= '
          '.$mod_strings["Related To"].' : '.$_REQUEST['parent_name']; - if($_REQUEST['activity_mode']!= 'Events') - { - $list .= '
    '.$mod_strings["LBL_CONTACT"].' '.$_REQUEST['contactlist']; - } - $list .= '
          '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description; + $list .= '
          '.$mod_strings["Priority"].': '.$description['taskpriority']; + $list .= '
          '.$mod_strings["Related To"].' : '.$description['relatedto']; + if($description['activity_mode'] != 'Events') + { + $list .= '
          '.$mod_strings["LBL_CONTACT"].' '.$description['contact_name']; + } + $list .= '
          '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description['description']; $list .= '

    '.$mod_strings["LBL_REGARDS_STRING"].' ,'; $list .= '
    '.$current_username.'.'; @@ -346,6 +346,120 @@ } return $timeStr; } - +//added to fix Ticket#3068 +function getEventNotification($mail_id,$mode,$subject,$desc) +{ + global $current_user,$adb; + require_once("modules/Emails/mail.php"); + $subject = $mode.' : '.$subject; + $crmentity = new CRMEntity(); + + if($desc['assingn_type'] == "U") + { + $to_email = getUserEmailId('id',$mail_id); + $description = getActivityDetails($desc); + send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); + } + if($desc['assingn_type'] == "T") + { + $groupname=$desc['group_name']; + $resultqry=$adb->query("select groupid from vtiger_groups where groupname='".$groupname."'"); + $groupid=$adb->query_result($resultqry,0,"groupid"); + require_once('include/utils/GetGroupUsers.php'); + $getGroupObj=new GetGroupUsers(); + $getGroupObj->getAllUsersInGroup($groupid); + $userIds=$getGroupObj->group_users; + $groupqry="select email1,id from vtiger_users where id in(".implode(',',$userIds).")"; + $groupqry_res=$adb->query($groupqry); + $noOfRows = $adb->num_rows($groupqry_res); + for($z=0;$z < $noOfRows;$z++) + { + $emailadd = $adb->query_result($groupqry_res,$z,'email1'); + $curr_userid = $adb->query_result($groupqry_res,$z,'id'); + $description = getActivityDetails($desc,$curr_userid); + $mail_status = send_mail('Calendar',$emailadd,getUserName($curr_userid),'',$subject,$description); + + } + } +} + +function sendInvitation($inviteesid,$mode,$subject,$desc) +{ + global $current_user; + require_once("modules/Emails/mail.php"); + $invitees_array = explode(';',$inviteesid); + $subject = $mode.' : '.$subject; + $record = $focus->id; + foreach($invitees_array as $inviteeid) + { + if($inviteeid != '') + { + $description=getActivityDetails($desc,$inviteeid); + $to_email = getUserEmailId('id',$inviteeid); + send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); + } + } + +} + +function getActivityMailInfo($return_id,$status,$activity_type) +{ + $mail_data = Array(); + global $adb; + $qry = "select * from vtiger_activity where activityid=".$return_id; + $ary_res = $adb->query($qry); + $send_notification = $adb->query_result($ary_res,0,"sendnotification"); + $subject = $adb->query_result($ary_res,0,"subject"); + $priority = $adb->query_result($ary_res,0,"priority"); + //$parent_name = $adb->query_result($ary_res,0,"priority"); + + $usr_qry = "select smownerid from vtiger_crmentity where crmid=".$return_id; + $res = $adb->query($usr_qry); + $usr_id = $adb->query_result($res,0,"smownerid"); + $assignType = "U"; + if($usr_id == '') + { + $assignType = "T"; + $group_qry = "select groupname from vtiger_activitygrouprelation where activityid=".$return_id; + $grp_res = $adb->query($group_qry); + $grp_name = $adb->query_result($res,0,"groupname"); + } + + + $desc_qry = "select description from vtiger_crmentity where crmid=".$return_id; + $des_res = $adb->query($desc_qry); + $description = $adb->query_result($des_res,0,"description"); + + + $rel_qry = "select case vtiger_crmentity.setype when 'Leads' then vtiger_leaddetails.lastname when 'Accounts' then vtiger_account.accountname when 'Potentials' then vtiger_potential.potentialname when 'Quotes' then vtiger_quotes.subject when 'PurchaseOrder' then vtiger_purchaseorder.subject when 'SalesOrder' then vtiger_salesorder.subject when 'Invoice' then vtiger_invoice.subject when 'Campaigns' then vtiger_campaign.campaignname when 'HelpDesk' then vtiger_troubletickets.title end as relname from vtiger_seactivityrel inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_seactivityrel.crmid left join vtiger_leaddetails on vtiger_leaddetails.leadid = vtiger_seactivityrel.crmid left join vtiger_account on vtiger_account.accountid=vtiger_seactivityrel.crmid left join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_quotes on vtiger_quotes.quoteid= vtiger_seactivityrel.crmid left join vtiger_purchaseorder on vtiger_purchaseorder.purchaseorderid = vtiger_seactivityrel.crmid left join vtiger_salesorder on vtiger_salesorder.salesorderid = vtiger_seactivityrel.crmid left join vtiger_invoice on vtiger_invoice.invoiceid = vtiger_seactivityrel.crmid left join vtiger_campaign on vtiger_campaign.campaignid = vtiger_seactivityrel.crmid left join vtiger_troubletickets on vtiger_troubletickets.ticketid = vtiger_seactivityrel.crmid where vtiger_seactivityrel.activityid=".$return_id; + + $rel_res = $adb->query($rel_qry); + $rel_name = $adb->query_result($rel_res,0,"relname"); + + + $cont_qry = "select * from vtiger_cntactivityrel where activityid=".$return_id; + $cont_res = $adb->query($cont_qry); + $cont_id = $adb->query_result($cont_res,0,"contactid"); + $cont_name = ''; + if($cont_id != '') + { + $cont_name = getContactName($cont_id); + } + $mail_data['mode'] = "edit"; + $mail_data['activity_mode'] = $activity_type; + $mail_data['sendnotification'] = $send_notification; + $mail_data['user_id'] = $usr_id; + $mail_data['subject'] = $subject; + $mail_data['status'] = $status; + $mail_data['taskpriority'] = $priority; + $mail_data['relatedto'] = $rel_name; + $mail_data['contact_name'] = $cont_name; + $mail_data['description'] = $description; + $mail_data['assingn_type'] = $assignType; + $mail_data['group_name'] = $grp_name; + return $mail_data; + + +} ?> Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Mon Mar 5 22:41:56 2007 @@ -23,11 +23,9 @@ require_once('modules/Calendar/Activity.php'); require_once('include/logging.php'); -//require("modules/Emails/class.phpmailer.php"); require_once("config.php"); require_once('include/database/PearDatabase.php'); require_once('modules/Calendar/CalendarCommon.php'); -require_once('data/CRMEntity.php'); global $adb; $local_log =& LoggerManager::getLogger('index'); $focus = new Activity(); @@ -59,8 +57,27 @@ $status = $_REQUEST['eventstatus']; $activity_type = "Events"; } - ChangeStatus($status,$return_id,$activity_type); + $mail_data = getActivityMailInfo($return_id,$status,$activity_type); + if($mail_data['sendnotification'] == 1) + { + getEventNotification($mail_data['user_id'],$activity_type,$mail_data['subject'],$mail_data); + } + $invitee_qry = "select * from vtiger_invitees where activityid=".$return_id; + $invitee_res = $adb->query($invitee_qry); + $count = $adb->num_rows($invitee_res); + if($count != 0) + { + for($j = 0; $j < $count; $j++) + { + $invitees_ids[]= $adb->query_result($invitee_res,$j,"inviteeid"); + + } + $invitees_ids_string = implode(';',$invitees_ids); + sendInvitation($invitees_ids_string,$activity_type,$mail_data['subject'],$mail_data); + } + + } else { @@ -137,68 +154,34 @@ if($activity_mode != '') $activemode = "&activity_mode=".$activity_mode; +function getRequestData() +{ + $mail_data = Array(); + $mail_data['user_id'] = $_REQUEST['assigned_user_id']; + $mail_data['subject'] = $_REQUEST['subject']; + $mail_data['status'] = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus'])); + $mail_data['activity_mode'] = $_REQUEST['activity_mode']; + $mail_data['taskpriority'] = $_REQUEST['taskpriority']; + $mail_data['relatedto'] = $_REQUEST['parent_name']; + $mail_data['contact_name'] = $_REQUEST['contact_name']; + $mail_data['description'] = $_REQUEST['description']; + $mail_data['assingn_type'] = $_REQUEST['assigntype']; + $mail_data['group_name'] = $_REQUEST['assigned_group_name']; + $mail_data['mode'] = $_REQUEST['mode']; + return $mail_data; +} //Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user if($_REQUEST['sendnotification'] == 'on') { - global $current_user; - $local_log->info("send notification is on"); - require_once("modules/Emails/mail.php"); - $subject = $_REQUEST['activity_mode'].' : '.$_REQUEST['subject']; - - $crmentity = new CRMEntity(); - if($_REQUEST['assigntype'] == 'U') - { - $to_email[0] = getUserEmailId('id',$_REQUEST['assigned_user_id']); - $description = getActivityDetails($_REQUEST['description']); - $mail_status = send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); - } - //code added to send mail to group - if($_REQUEST['assigntype'] == 'T') - { - $groupname=$_REQUEST['assigned_group_name']; - $resultqry=$adb->query("select groupid from vtiger_groups where groupname='".$groupname."'"); - $groupid=$adb->query_result($resultqry,0,"groupid"); - require_once('include/utils/GetGroupUsers.php'); - $getGroupObj=new GetGroupUsers(); - $getGroupObj->getAllUsersInGroup($groupid); - $userIds=$getGroupObj->group_users; - $groupqry="select email1,id from vtiger_users where id in(".implode(',',$userIds).")"; - $groupqry_res=$adb->query($groupqry); - $noOfRows = $adb->num_rows($groupqry_res); - for($z=0;$z < $noOfRows;$z++) - { - $emailadd = $adb->query_result($groupqry_res,$z,'email1'); - $curr_userid = $adb->query_result($groupqry_res,$z,'id'); - $description = getActivityDetails($_REQUEST['description'],$curr_userid); - $mail_status = send_mail('Calendar',$emailadd,getUserName($curr_userid),'',$subject,$description); - - } - - - } - -} - + $mail_contents = getRequestData(); + getEventNotification($_REQUEST['assigned_user_id'],$_REQUEST['activity_mode'],$_REQUEST['subject'],$mail_contents); +} //code added to send mail to the vtiger_invitees if(isset($_REQUEST['inviteesid']) && $_REQUEST['inviteesid']!='') { - global $current_user; - $local_log->info("send notification is on"); - require_once("modules/Emails/mail.php"); - $selected_users_string = $_REQUEST['inviteesid']; - $invitees_array = explode(';',$selected_users_string); - $subject = $_REQUEST['activity_mode'].' : '.$_REQUEST['subject']; - $record = $focus->id; - foreach($invitees_array as $inviteeid) - { - if($inviteeid != '') - { - $description=getActivityDetails($_REQUEST['description'],$inviteeid); - $to_email = getUserEmailId('id',$inviteeid); - $mail_status = send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); - } - } + $mail_contents = getRequestData(); + sendInvitation($_REQUEST['inviteesid'],$_REQUEST['activity_mode'],$_REQUEST['subject'],$mail_contents); } if(isset($_REQUEST['contactidlist']) && $_REQUEST['contactidlist'] != '') Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Mon Mar 5 22:41:56 2007 @@ -15,7 +15,6 @@ require_once('include/database/PearDatabase.php'); $local_log =& LoggerManager::getLogger('index'); - $focus = new Activity(); $activity_mode = $_REQUEST['activity_mode']; if($activity_mode == 'Task') @@ -48,22 +47,29 @@ $focus->column_fields["sendnotification"] = $_REQUEST["task_sendnotification"]; $focus->save($tab_type); - if($_REQUEST["task_sendnotification"]=='on' && $_REQUEST['task_assigntype'] == 'U') + if($_REQUEST["task_sendnotification"]=='on') { - - global $current_user; - $local_log->info("send notification is on"); - require_once("modules/Emails/mail.php"); - $to_email = getUserEmailId('id',$_REQUEST['task_assigned_user_id']); - $subject = $_REQUEST['activity_mode'].' : '.$_REQUEST['task_subject']; - $_REQUEST["assigned_user_id"]= $_REQUEST["task_assigned_user_id"]; - $_REQUEST["subject"]=$subject; - $_REQUEST["parent_name"]=$_REQUEST["task_parent_name"]; - $_REQUEST['contactlist']=$_REQUEST['task_contact_name']; - $description = getActivityDetails($_REQUEST['task_description']); - $mail_status = send_mail('Calendar',$to_email,$current_user->user_name,'',$subject,$description); + $mail_contents = getRequestedToData(); + getEventNotification($_REQUEST['task_assigned_user_id'],$_REQUEST['activity_mode'],$_REQUEST['task_subject'],$mail_contents); } +function getRequestedToData() +{ + $mail_data = Array(); + $mail_data['user_id'] = $_REQUEST["task_assigned_user_id"]; + $mail_data['subject'] = $_REQUEST['task_subject']; + $mail_data['status'] = (($_REQUEST['activity_mode']=='Task')?($_REQUEST['taskstatus']):($_REQUEST['eventstatus'])); + $mail_data['activity_mode'] = $_REQUEST['activity_mode']; + $mail_data['taskpriority'] = $_REQUEST['taskpriority']; + $mail_data['relatedto'] = $_REQUEST['task_parent_name']; + $mail_data['contact_name'] = $_REQUEST['task_contact_name']; + $mail_data['description'] = $_REQUEST['task_description']; + $mail_data['assingn_type'] = $_REQUEST['task_assigntype']; + $mail_data['group_name'] = $_REQUEST['task_assigned_group_name']; + $mail_data['mode'] = $_REQUEST['task_mode']; + return $mail_data; +} - header("Location: index.php?action=index&module=Calendar&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&viewOption=".$_REQUEST['viewOption']."&subtab=".$_REQUEST['subtab']."&parenttab=".$_REQUEST['parenttab']); + + header("Location: index.php?action=index&module=Calendar&view=".$_REQUEST['view']."&hour=".$_REQUEST['hour']."&day=".$_REQUEST['day']."&month=".$_REQUEST['month']."&year=".$_REQUEST['year']."&viewOption=".$_REQUEST['viewOption']."&subtab=todo&parenttab=".$_REQUEST['parenttab']); ?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 02:07:15 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:07:15 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10352 - /vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Message-ID: <20070306070716.14B9578D970@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 6 00:07:12 2007 New Revision: 10352 Log: alert message has been modified --Minnie Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Modified: vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php ============================================================================== --- vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php (original) +++ vtigercrm/branches/5.0.3/soap/firefoxtoolbar.php Tue Mar 6 00:07:12 2007 @@ -354,7 +354,7 @@ $adb->println("Create New Portal from Web Form - Ends"); if($result != '') - return 'Portal added sucessfully'; + return 'URL added sucessfully'; else return "Portal creation failed. Try again"; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 02:07:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:07:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10353 - /vtigercrm/branches/5.0.3/include/RelatedListView.php Message-ID: <20070306070723.BB6B978D956@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 00:07:12 2007 New Revision: 10353 Log: fixes #3118 Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Tue Mar 6 00:07:12 2007 @@ -1,518 +1,523 @@ -debug("Entering GetRelatedList(".$module.",".$relatedmodule.",".$focus.",".$query.",".$button.",".$returnset.",".$edit_val.",".$del_val.") method ..."); - - require_once('Smarty_setup.php'); - require_once("data/Tracker.php"); - require_once('include/database/PearDatabase.php'); - - global $adb; - global $app_strings; - global $current_language; - - $current_module_strings = return_module_language($current_language, $module); - - global $list_max_entries_per_page; - global $urlPrefix; - - - global $currentModule; - global $theme; - global $theme_path; - global $theme_path; - global $mod_strings; - // focus_list is the means of passing data to a ListView. - global $focus_list; - $smarty = new vtigerCRM_Smarty; - if (!isset($where)) $where = ""; - - - $button = '
    '.$button.'
    '; - - // Added to have Purchase Order as form Title - if($relatedmodule == 'Orders') - { - $smarty->assign('ADDBUTTON',get_form_header($app_strings['PurchaseOrder'],$button, false)); - } - else - { - $smarty->assign('ADDBUTTON',get_form_header($app_strings[$relatedmodule],$button, false)); - } - - require_once('themes/'.$theme.'/layout_utils.php'); - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - $smarty->assign("MOD", $mod_strings); - $smarty->assign("APP", $app_strings); - $smarty->assign("IMAGE_PATH",$image_path); - $smarty->assign("MODULE",$relatedmodule); - - - //Retreive the list from Database - //$query = getListQuery("Accounts"); - - //echo '
    *****************'.$relatedmodule.' ***************'; - //Appending the security parameter - if($relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook' && $relatedmodule != 'Vendors') //Security fix by Don - { - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - $tab_id=getTabid($relatedmodule); - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) - { - $sec_parameter=getListViewSecurityParameter($relatedmodule); - $query .= ' '.$sec_parameter; - - } - } - - - if(isset($where) && $where != '') - { - $query .= ' and '.$where; - } - - if(!$_SESSION['rlvs'][$module][$relatedmodule]) - { - $modObj = new ListViewSession(); - $modObj->sortby = $focus->default_order_by; - $modObj->sorder = $focus->default_sort_order; - $_SESSION['rlvs'][$module][$relatedmodule] = get_object_vars($modObj); - } - if(isset($_REQUEST['relmodule']) && ($_REQUEST['relmodule'] == $relatedmodule)) - { - if(method_exists($focus,getSortOrder)) - $sorder = $focus->getSortOrder(); - if(method_exists($focus,getOrderBy)) - $order_by = $focus->getOrderBy(); - - if(isset($order_by) && $order_by != '') - { - $_SESSION['rlvs'][$module][$relatedmodule]['sorder'] = $sorder; - $_SESSION['rlvs'][$module][$relatedmodule]['sortby'] = $order_by; - } - - } - elseif($_SESSION['rlvs'][$module][$relatedmodule]) - { - $sorder = $_SESSION['rlvs'][$module][$relatedmodule]['sorder']; - $order_by = $_SESSION['rlvs'][$module][$relatedmodule]['sortby']; - } - else - { - $order_by = $focus->default_order_by; - $sorder = $focus->default_sort_order; - } - - $query .= ' ORDER BY '.$order_by.' '.$sorder; - $url_qry .="&order_by=".$order_by; - //Added for PHP version less than 5 - if (!function_exists("stripos")) - { - function stripos($query,$needle) - { - return strpos(strtolower($query),strtolower($needle)); - } - } - - //Retreiving the no of rows - $count_query = "select count(*) as count ".substr($query, stripos($query,'from'),strlen($query)); - $count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER BY'))); - $noofrows = $adb->query_result($count_result,0,"count"); - - //Setting Listview session object while sorting/pagination - if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='' && $_REQUEST['relmodule'] == $relatedmodule) - { - $relmodule = $_REQUEST['relmodule']; - if($_SESSION['rlvs'][$module][$relmodule]) - { - setSessionVar($_SESSION['rlvs'][$module][$relmodule],$noofrows,$list_max_entries_per_page,$module,$relmodule); - } - } - $start = $_SESSION['rlvs'][$module][$relatedmodule]['start']; - - $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); - - $start_rec = $navigation_array['start']; - $end_rec = $navigation_array['end_val']; - - //limiting the query - if ($start_rec ==0) - $limit_start_rec = 0; - else - $limit_start_rec = $start_rec -1; - - if( $adb->dbType == "pgsql") - $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page); - else - $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page); - - //Retreive the List View Table Header - if($noofrows == 0) - { - $smarty->assign('NOENTRIES',$app_strings['LBL_NONE_SCHEDULED']); - } - else - { - $id = $_REQUEST['record']; - $listview_header = getListViewHeader($focus,$relatedmodule,'',$sorder,$order_by,$id,'',$module);//"Accounts"); - if ($noofrows > 15) - { - $smarty->assign('SCROLLSTART','
    '); - $smarty->assign('SCROLLSTOP','
    '); - } - $smarty->assign("LISTHEADER", $listview_header); - - if($module == 'PriceBook' && $relatedmodule == 'Products') - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val); - } - if($module == 'Products' && $relatedmodule == 'PriceBook') - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel'); - } - elseif($relatedmodule == 'SalesOrder') - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder'); - }else - { - $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset); - } - - $navigationOutput = Array(); - $navigationOutput[] = $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; - $module_rel = $module.'&relmodule='.$relatedmodule.'&record='.$id; - $navigationOutput[] = getRelatedTableHeaderNavigation($navigation_array, $url_qry,$module_rel); - $related_entries = array('header'=>$listview_header,'entries'=>$listview_entries,'navigation'=>$navigationOutput); - - $log->debug("Exiting GetRelatedList method ..."); - return $related_entries; - } -} - -/** Function to get related list entries in detailed array format - * @param $parentmodule -- parentmodulename:: Type string - * @param $query -- query:: Type string - * @param $id -- id:: Type string - * @returns $entries_list -- entries list:: Type string array - * - */ - -function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='') -{ - global $log; - $log->debug("Entering getAttachmentsAndNotes(".$parentmodule.",".$query.",".$id.",".$sid.") method ..."); - global $theme; - - $list = ''; - - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - require_once ($theme_path."layout_utils.php"); - - global $adb; - global $mod_strings; - global $app_strings; - - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - $header[] = $app_strings['LBL_CREATED']; - $header[] = $app_strings['LBL_SUBJECT']; - $header[] = $app_strings['LBL_DESCRIPTION']; - $header[] = $app_strings['LBL_ATTACHMENTS']; - $header[] = $app_strings['LBL_TYPE']; - $header[] = $app_strings['LBL_ACTION']; - - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - if(trim($row['activitytype']) == 'Notes') - { - $module = 'Notes'; - $editaction = 'EditView'; - $deleteaction = 'Delete'; - } - elseif($row['activitytype'] == 'Attachments') - { - $module = 'uploads'; - $editaction = 'upload'; - $deleteaction = 'deleteattachments'; - } - if($row['createdtime'] != '0000-00-00 00:00:00') - { - $created_arr = explode(" ",getDisplayDate($row['createdtime'])); - $created_date = $created_arr[0]; - $created_time = substr($created_arr[1],0,5); - } - else - { - $created_date = ''; - $created_time = ''; - } - - $entries[] = $created_date; - if($module == 'Notes') - { - $entries[] = ''.$row['title'].''; - } - elseif($module == 'uploads') - { - $entries[] = ""; - } - - if(strlen($row['description']) > 40) - { - $row['description'] = substr($row['description'],0,40).'...'; - } - $entries[] = nl2br($row['description']); - $attachmentname = ltrim($row['filename'],$row['attachmentsid'].'_');//explode('_',$row['filename'],2); - - $entries[] = ''.$attachmentname.''; - - $entries[] = $row['activitytype']; - - $del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&return_id='.$_REQUEST["record"]; - - if($module == 'Notes') - { - $edit_param = 'index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&filename='.$row['filename'].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"]; - - $entries[] .= ''.$app_strings['LNK_EDIT'].' | '.$app_strings['LNK_DELETE'].''; - } - else - { - $entries[] = ''.$app_strings['LNK_DELETE'].''; - } - $entries_list[] = $entries; - } - - if($entries_list !='') - $return_data = array('header'=>$header,'entries'=>$entries_list); - $log->debug("Exiting getAttachmentsAndNotes method ..."); - return $return_data; - -} - -/** Function to get related list entries in detailed array format - * @param $parentmodule -- parentmodulename:: Type string - * @param $query -- query:: Type string - * @param $id -- id:: Type string - * @returns $return_data -- return data:: Type string array - * - */ - -function getHistory($parentmodule,$query,$id) -{ - global $log; - $log->debug("Entering getHistory(".$parentmodule.",".$query.",".$id.") method ..."); - $parentaction = $_REQUEST['action']; - global $theme; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - require_once ($theme_path."layout_utils.php"); - - global $adb; - global $mod_strings; - global $app_strings; - - //Appending the security parameter - global $current_user; - $rel_tab_id = getTabid("Calendar"); - - global $current_user; - require('user_privileges/user_privileges_'.$current_user->id.'.php'); - require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); - $tab_id=getTabid('Calendar'); - if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) - { - $sec_parameter=getListViewSecurityParameter('Calendar'); - $query .= ' '.$sec_parameter; - - } - $result=$adb->query($query); - $noofrows = $adb->num_rows($result); - - if($noofrows == 0) - { - //There is no entries for history - } - else - { - //Form the header columns - $header[] = $app_strings['LBL_TYPE']; - $header[] = $app_strings['LBL_SUBJECT']; - $header[] = $app_strings['LBL_RELATED_TO']; - $header[] = $app_strings['LBL_START_DATE']." & ".$app_strings['LBL_TIME']; - $header[] = $app_strings['LBL_END_DATE']." & ".$app_strings['LBL_TIME']; - //$header[] = $app_strings['LBL_DESCRIPTION']; - $header[] = $app_strings['LBL_ACTION']; - $header[] = $app_strings['LBL_ASSIGNED_TO']; - - $i=1; - while($row = $adb->fetch_array($result)) - { - $entries = Array(); - if($row['activitytype'] == 'Task') - { - $activitymode = 'Task'; - $icon = 'Tasks.gif'; - $status = $row['status']; - } - elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting') - { - $activitymode = 'Events'; - $icon = 'Activities.gif'; - $status = $row['eventstatus']; - } - - $entries[] = $row['activitytype']; - - $activity = ''.$row['subject'].''; - $entries[] = $activity; - - $parentname = getRelatedTo('Calendar',$result,$i-1); - $entries[] = $parentname; - - $entries[] = $row['date_start']." ".$row['time_start']; - $entries[] = $row['due_date']." ".$row['time_end']; - - //$entries[] = nl2br($row['description']); - - if(isPermitted("Calendar",1,$row["activityid"]) == 'yes') - { - $list .= ''.$app_strings['LNK_EDIT'].''; - - } - - $entries[] = $status; - - if($row['user_name']==NULL && $row['groupname']!=NULL) - { - $entries[] = $row['groupname']; - } - else - { - $entries[] = $row['user_name']; - - } - - if(isPermitted("Calendar",2,$row["activityid"]) == 'yes') - { - $list .= ''.$app_strings['LNK_DELETE'].''; - } - - $i++; - $entries_list[] = $entries; - } - - $return_data = array('header'=>$header,'entries'=>$entries_list); - $log->debug("Exiting getHistory method ..."); - return $return_data; - } -} - -/** Function to display the Products which are related to the PriceBook - * @param string $query - query to get the list of products which are related to the current PriceBook - * @param object $focus - PriceBook object which contains all the information of the current PriceBook - * @param string $returnset - return_module, return_action and return_id which are sequenced with & to pass to the URL which is optional - * return array $return_data which will be formed like array('header'=>$header,'entries'=>$entries_list) where as $header contains all the header columns and $entries_list will contain all the Product entries - */ -function getPriceBookRelatedProducts($query,$focus,$returnset='') -{ - global $log; - $log->debug("Entering getPriceBookRelatedProducts(".$query.",".$focus.",".$returnset.") method ..."); - - global $adb; - global $app_strings; - global $mod_strings; - global $current_language; - $current_module_strings = return_module_language($current_language, 'PriceBook'); - - global $list_max_entries_per_page; - global $urlPrefix; - - global $theme; - $pricebook_id = $_REQUEST['record']; - $theme_path="themes/".$theme."/"; - $image_path=$theme_path."images/"; - require_once($theme_path.'layout_utils.php'); - - //Retreive the list from Database - $list_result = $adb->query($query); - $num_rows = $adb->num_rows($list_result); - - $header=array(); - $header[]=$mod_strings['LBL_LIST_PRODUCT_NAME']; - $header[]=$mod_strings['LBL_PRODUCT_CODE']; - $header[]=$mod_strings['LBL_PRODUCT_UNIT_PRICE']; - $header[]=$mod_strings['LBL_PB_LIST_PRICE']; - $header[]=$mod_strings['LBL_ACTION']; - - for($i=0; $i<$num_rows; $i++) - { - $entity_id = $adb->query_result($list_result,$i,"crmid"); - - $unit_price = $adb->query_result($list_result,$i,"unit_price"); - $listprice = $adb->query_result($list_result,$i,"listprice"); - $field_name=$entity_id."_listprice"; - - $entries = Array(); - $entries[] = $adb->query_result($list_result,$i,"productname"); - $entries[] = $adb->query_result($list_result,$i,"productcode"); - $entries[] = $unit_price; - $entries[] = $listprice; - $entries[] = ''.$app_strings[ | '.$app_strings['; - - $entries_list[] = $entries; - } - if($num_rows>0) - { - $return_data = array('header'=>$header,'entries'=>$entries_list); - - $log->debug("Exiting getPriceBookRelatedProducts method ..."); - return $return_data; - } -} - -?> +debug("Entering GetRelatedList(".$module.",".$relatedmodule.",".$focus.",".$query.",".$button.",".$returnset.",".$edit_val.",".$del_val.") method ..."); + + require_once('Smarty_setup.php'); + require_once("data/Tracker.php"); + require_once('include/database/PearDatabase.php'); + + global $adb; + global $app_strings; + global $current_language; + + $current_module_strings = return_module_language($current_language, $module); + + global $list_max_entries_per_page; + global $urlPrefix; + + + global $currentModule; + global $theme; + global $theme_path; + global $theme_path; + global $mod_strings; + // focus_list is the means of passing data to a ListView. + global $focus_list; + $smarty = new vtigerCRM_Smarty; + if (!isset($where)) $where = ""; + + + $button = '
    '.$button.'
    '; + + // Added to have Purchase Order as form Title + if($relatedmodule == 'Orders') + { + $smarty->assign('ADDBUTTON',get_form_header($app_strings['PurchaseOrder'],$button, false)); + } + else + { + $smarty->assign('ADDBUTTON',get_form_header($app_strings[$relatedmodule],$button, false)); + } + + require_once('themes/'.$theme.'/layout_utils.php'); + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + $smarty->assign("MOD", $mod_strings); + $smarty->assign("APP", $app_strings); + $smarty->assign("IMAGE_PATH",$image_path); + $smarty->assign("MODULE",$relatedmodule); + + + //Retreive the list from Database + //$query = getListQuery("Accounts"); + + //echo '
    *****************'.$relatedmodule.' ***************'; + //Appending the security parameter + if($relatedmodule != 'Notes' && $relatedmodule != 'Products' && $relatedmodule != 'Faq' && $relatedmodule != 'PriceBook' && $relatedmodule != 'Vendors') //Security fix by Don + { + global $current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id=getTabid($relatedmodule); + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter($relatedmodule); + $query .= ' '.$sec_parameter; + + } + } + + + if(isset($where) && $where != '') + { + $query .= ' and '.$where; + } + + if(!$_SESSION['rlvs'][$module][$relatedmodule]) + { + $modObj = new ListViewSession(); + $modObj->sortby = $focus->default_order_by; + $modObj->sorder = $focus->default_sort_order; + $_SESSION['rlvs'][$module][$relatedmodule] = get_object_vars($modObj); + } + if(isset($_REQUEST['relmodule']) && ($_REQUEST['relmodule'] == $relatedmodule)) + { + if(method_exists($focus,getSortOrder)) + $sorder = $focus->getSortOrder(); + if(method_exists($focus,getOrderBy)) + $order_by = $focus->getOrderBy(); + + if(isset($order_by) && $order_by != '') + { + $_SESSION['rlvs'][$module][$relatedmodule]['sorder'] = $sorder; + $_SESSION['rlvs'][$module][$relatedmodule]['sortby'] = $order_by; + } + + } + elseif($_SESSION['rlvs'][$module][$relatedmodule]) + { + $sorder = $_SESSION['rlvs'][$module][$relatedmodule]['sorder']; + $order_by = $_SESSION['rlvs'][$module][$relatedmodule]['sortby']; + } + else + { + $order_by = $focus->default_order_by; + $sorder = $focus->default_sort_order; + } + //Added by Don for AssignedTo ordering issue in Related Lists + $query_order_by = $order_by; + if($order_by == 'smownerid') + { + $query_order_by = 'user_name'; + } + $query .= ' ORDER BY '.$query_order_by.' '.$sorder; + $url_qry .="&order_by=".$order_by; + //Added for PHP version less than 5 + if (!function_exists("stripos")) + { + function stripos($query,$needle) + { + return strpos(strtolower($query),strtolower($needle)); + } + } + + //Retreiving the no of rows + $count_query = "select count(*) as count ".substr($query, stripos($query,'from'),strlen($query)); + $count_result = $adb->query(substr($count_query, stripos($count_query,'select'),stripos($count_query,'ORDER BY'))); + $noofrows = $adb->query_result($count_result,0,"count"); + + //Setting Listview session object while sorting/pagination + if(isset($_REQUEST['relmodule']) && $_REQUEST['relmodule']!='' && $_REQUEST['relmodule'] == $relatedmodule) + { + $relmodule = $_REQUEST['relmodule']; + if($_SESSION['rlvs'][$module][$relmodule]) + { + setSessionVar($_SESSION['rlvs'][$module][$relmodule],$noofrows,$list_max_entries_per_page,$module,$relmodule); + } + } + $start = $_SESSION['rlvs'][$module][$relatedmodule]['start']; + + $navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page); + + $start_rec = $navigation_array['start']; + $end_rec = $navigation_array['end_val']; + + //limiting the query + if ($start_rec ==0) + $limit_start_rec = 0; + else + $limit_start_rec = $start_rec -1; + + if( $adb->dbType == "pgsql") + $list_result = $adb->query($query. " OFFSET ".$limit_start_rec." LIMIT ".$list_max_entries_per_page); + else + $list_result = $adb->query($query. " LIMIT ".$limit_start_rec.",".$list_max_entries_per_page); + + //Retreive the List View Table Header + if($noofrows == 0) + { + $smarty->assign('NOENTRIES',$app_strings['LBL_NONE_SCHEDULED']); + } + else + { + $id = $_REQUEST['record']; + $listview_header = getListViewHeader($focus,$relatedmodule,'',$sorder,$order_by,$id,'',$module);//"Accounts"); + if ($noofrows > 15) + { + $smarty->assign('SCROLLSTART','
    '); + $smarty->assign('SCROLLSTOP','
    '); + } + $smarty->assign("LISTHEADER", $listview_header); + + if($module == 'PriceBook' && $relatedmodule == 'Products') + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,$edit_val,$del_val); + } + if($module == 'Products' && $relatedmodule == 'PriceBook') + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'EditListPrice','DeletePriceBookProductRel'); + } + elseif($relatedmodule == 'SalesOrder') + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset,'SalesOrderEditView','DeleteSalesOrder'); + }else + { + $listview_entries = getListViewEntries($focus,$relatedmodule,$list_result,$navigation_array,'relatedlist',$returnset); + } + + $navigationOutput = Array(); + $navigationOutput[] = $app_strings[LBL_SHOWING]." " .$start_rec." - ".$end_rec." " .$app_strings[LBL_LIST_OF] ." ".$noofrows; + $module_rel = $module.'&relmodule='.$relatedmodule.'&record='.$id; + $navigationOutput[] = getRelatedTableHeaderNavigation($navigation_array, $url_qry,$module_rel); + $related_entries = array('header'=>$listview_header,'entries'=>$listview_entries,'navigation'=>$navigationOutput); + + $log->debug("Exiting GetRelatedList method ..."); + return $related_entries; + } +} + +/** Function to get related list entries in detailed array format + * @param $parentmodule -- parentmodulename:: Type string + * @param $query -- query:: Type string + * @param $id -- id:: Type string + * @returns $entries_list -- entries list:: Type string array + * + */ + +function getAttachmentsAndNotes($parentmodule,$query,$id,$sid='') +{ + global $log; + $log->debug("Entering getAttachmentsAndNotes(".$parentmodule.",".$query.",".$id.",".$sid.") method ..."); + global $theme; + + $list = ''; + + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + require_once ($theme_path."layout_utils.php"); + + global $adb; + global $mod_strings; + global $app_strings; + + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + $header[] = $app_strings['LBL_CREATED']; + $header[] = $app_strings['LBL_SUBJECT']; + $header[] = $app_strings['LBL_DESCRIPTION']; + $header[] = $app_strings['LBL_ATTACHMENTS']; + $header[] = $app_strings['LBL_TYPE']; + $header[] = $app_strings['LBL_ACTION']; + + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + if(trim($row['activitytype']) == 'Notes') + { + $module = 'Notes'; + $editaction = 'EditView'; + $deleteaction = 'Delete'; + } + elseif($row['activitytype'] == 'Attachments') + { + $module = 'uploads'; + $editaction = 'upload'; + $deleteaction = 'deleteattachments'; + } + if($row['createdtime'] != '0000-00-00 00:00:00') + { + $created_arr = explode(" ",getDisplayDate($row['createdtime'])); + $created_date = $created_arr[0]; + $created_time = substr($created_arr[1],0,5); + } + else + { + $created_date = ''; + $created_time = ''; + } + + $entries[] = $created_date; + if($module == 'Notes') + { + $entries[] = ''.$row['title'].''; + } + elseif($module == 'uploads') + { + $entries[] = ""; + } + + if(strlen($row['description']) > 40) + { + $row['description'] = substr($row['description'],0,40).'...'; + } + $entries[] = nl2br($row['description']); + $attachmentname = ltrim($row['filename'],$row['attachmentsid'].'_');//explode('_',$row['filename'],2); + + $entries[] = ''.$attachmentname.''; + + $entries[] = $row['activitytype']; + + $del_param = 'index.php?module='.$module.'&action='.$deleteaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&return_id='.$_REQUEST["record"]; + + if($module == 'Notes') + { + $edit_param = 'index.php?module='.$module.'&action='.$editaction.'&return_module='.$parentmodule.'&return_action='.$_REQUEST['action'].'&record='.$row["crmid"].'&filename='.$row['filename'].'&fileid='.$row['attachmentsid'].'&return_id='.$_REQUEST["record"]; + + $entries[] .= ''.$app_strings['LNK_EDIT'].' | '.$app_strings['LNK_DELETE'].''; + } + else + { + $entries[] = ''.$app_strings['LNK_DELETE'].''; + } + $entries_list[] = $entries; + } + + if($entries_list !='') + $return_data = array('header'=>$header,'entries'=>$entries_list); + $log->debug("Exiting getAttachmentsAndNotes method ..."); + return $return_data; + +} + +/** Function to get related list entries in detailed array format + * @param $parentmodule -- parentmodulename:: Type string + * @param $query -- query:: Type string + * @param $id -- id:: Type string + * @returns $return_data -- return data:: Type string array + * + */ + +function getHistory($parentmodule,$query,$id) +{ + global $log; + $log->debug("Entering getHistory(".$parentmodule.",".$query.",".$id.") method ..."); + $parentaction = $_REQUEST['action']; + global $theme; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + require_once ($theme_path."layout_utils.php"); + + global $adb; + global $mod_strings; + global $app_strings; + + //Appending the security parameter + global $current_user; + $rel_tab_id = getTabid("Calendar"); + + global $current_user; + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $tab_id=getTabid('Calendar'); + if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) + { + $sec_parameter=getListViewSecurityParameter('Calendar'); + $query .= ' '.$sec_parameter; + + } + $result=$adb->query($query); + $noofrows = $adb->num_rows($result); + + if($noofrows == 0) + { + //There is no entries for history + } + else + { + //Form the header columns + $header[] = $app_strings['LBL_TYPE']; + $header[] = $app_strings['LBL_SUBJECT']; + $header[] = $app_strings['LBL_RELATED_TO']; + $header[] = $app_strings['LBL_START_DATE']." & ".$app_strings['LBL_TIME']; + $header[] = $app_strings['LBL_END_DATE']." & ".$app_strings['LBL_TIME']; + //$header[] = $app_strings['LBL_DESCRIPTION']; + $header[] = $app_strings['LBL_ACTION']; + $header[] = $app_strings['LBL_ASSIGNED_TO']; + + $i=1; + while($row = $adb->fetch_array($result)) + { + $entries = Array(); + if($row['activitytype'] == 'Task') + { + $activitymode = 'Task'; + $icon = 'Tasks.gif'; + $status = $row['status']; + } + elseif($row['activitytype'] == 'Call' || $row['activitytype'] == 'Meeting') + { + $activitymode = 'Events'; + $icon = 'Activities.gif'; + $status = $row['eventstatus']; + } + + $entries[] = $row['activitytype']; + + $activity = ''.$row['subject'].''; + $entries[] = $activity; + + $parentname = getRelatedTo('Calendar',$result,$i-1); + $entries[] = $parentname; + + $entries[] = $row['date_start']." ".$row['time_start']; + $entries[] = $row['due_date']." ".$row['time_end']; + + //$entries[] = nl2br($row['description']); + + if(isPermitted("Calendar",1,$row["activityid"]) == 'yes') + { + $list .= ''.$app_strings['LNK_EDIT'].''; + + } + + $entries[] = $status; + + if($row['user_name']==NULL && $row['groupname']!=NULL) + { + $entries[] = $row['groupname']; + } + else + { + $entries[] = $row['user_name']; + + } + + if(isPermitted("Calendar",2,$row["activityid"]) == 'yes') + { + $list .= ''.$app_strings['LNK_DELETE'].''; + } + + $i++; + $entries_list[] = $entries; + } + + $return_data = array('header'=>$header,'entries'=>$entries_list); + $log->debug("Exiting getHistory method ..."); + return $return_data; + } +} + +/** Function to display the Products which are related to the PriceBook + * @param string $query - query to get the list of products which are related to the current PriceBook + * @param object $focus - PriceBook object which contains all the information of the current PriceBook + * @param string $returnset - return_module, return_action and return_id which are sequenced with & to pass to the URL which is optional + * return array $return_data which will be formed like array('header'=>$header,'entries'=>$entries_list) where as $header contains all the header columns and $entries_list will contain all the Product entries + */ +function getPriceBookRelatedProducts($query,$focus,$returnset='') +{ + global $log; + $log->debug("Entering getPriceBookRelatedProducts(".$query.",".$focus.",".$returnset.") method ..."); + + global $adb; + global $app_strings; + global $mod_strings; + global $current_language; + $current_module_strings = return_module_language($current_language, 'PriceBook'); + + global $list_max_entries_per_page; + global $urlPrefix; + + global $theme; + $pricebook_id = $_REQUEST['record']; + $theme_path="themes/".$theme."/"; + $image_path=$theme_path."images/"; + require_once($theme_path.'layout_utils.php'); + + //Retreive the list from Database + $list_result = $adb->query($query); + $num_rows = $adb->num_rows($list_result); + + $header=array(); + $header[]=$mod_strings['LBL_LIST_PRODUCT_NAME']; + $header[]=$mod_strings['LBL_PRODUCT_CODE']; + $header[]=$mod_strings['LBL_PRODUCT_UNIT_PRICE']; + $header[]=$mod_strings['LBL_PB_LIST_PRICE']; + $header[]=$mod_strings['LBL_ACTION']; + + for($i=0; $i<$num_rows; $i++) + { + $entity_id = $adb->query_result($list_result,$i,"crmid"); + + $unit_price = $adb->query_result($list_result,$i,"unit_price"); + $listprice = $adb->query_result($list_result,$i,"listprice"); + $field_name=$entity_id."_listprice"; + + $entries = Array(); + $entries[] = $adb->query_result($list_result,$i,"productname"); + $entries[] = $adb->query_result($list_result,$i,"productcode"); + $entries[] = $unit_price; + $entries[] = $listprice; + $entries[] = ''.$app_strings[ | '.$app_strings['; + + $entries_list[] = $entries; + } + if($num_rows>0) + { + $return_data = array('header'=>$header,'entries'=>$entries_list); + + $log->debug("Exiting getPriceBookRelatedProducts method ..."); + return $return_data; + } +} + +?> From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 02:10:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:10:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10354 - /vtigercrm/branches/5.0.3/modules/Leads/ListView.php Message-ID: <20070306071038.949F678D956@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 00:10:25 2007 New Revision: 10354 Log: fixes #3118 Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Leads/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Leads/ListView.php Tue Mar 6 00:10:25 2007 @@ -166,7 +166,7 @@ $query .= ' and '.$where; } - +/* if(isset($order_by) && $order_by != '') { $tablename = getTableNameForField('Leads',$order_by); @@ -177,7 +177,24 @@ $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; } - +*/ +if(isset($order_by) && $order_by != '') +{ + if($order_by == 'smownerid') + { + $query .= ' ORDER BY user_name '.$sorder; + } + else + { + $tablename = getTableNameForField('Leads',$order_by); + $tablename = (($tablename != '')?($tablename."."):''); + if( $adb->dbType == "pgsql") + $query .= ' GROUP BY '.$tablename.$order_by; + + + $query .= ' ORDER BY '.$tablename.$order_by.' '.$sorder; + } +} //Retreiving the no of rows $count_result = $adb->query( mkCountQuery( $query)); $noofrows = $adb->query_result($count_result,0,"count"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 02:13:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:13:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10355 - /vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php Message-ID: <20070306071317.0CA0078D956@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 00:12:35 2007 New Revision: 10355 Log: fixes #3118 Modified: vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/ListView.php Tue Mar 6 00:12:35 2007 @@ -133,8 +133,8 @@ if($order_by == 'smownerid') { if( $adb->dbType == "pgsql") - $list_query .= ' GROUP BY vtiger_users.user_name'; - $list_query .= ' ORDER BY vtiger_users.user_name '.$sorder; + $list_query .= ' GROUP BY user_name'; + $list_query .= ' ORDER BY user_name '.$sorder; } else { From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 02:49:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 07:49:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10356 - in /vtigercrm/branches/5.0.3: install/ modules/Calendar/ modules/Campaigns/ modules/Dashboard/ modules/Home/ modules/Users/ modules/Webmails/ modules/uploads/ Message-ID: <20070306074926.6EB5178D97D@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 6 00:49:09 2007 New Revision: 10356 Log: short tags has been removed. Fixes #3076 --Minnie Modified: vtigercrm/branches/5.0.3/install/3confirmConfig.php vtigercrm/branches/5.0.3/install/5createTables.php vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome.php vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php vtigercrm/branches/5.0.3/modules/Users/about_us.php vtigercrm/branches/5.0.3/modules/Webmails/dlAttachments.php vtigercrm/branches/5.0.3/modules/uploads/upload.php Modified: vtigercrm/branches/5.0.3/install/3confirmConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/3confirmConfig.php (original) +++ vtigercrm/branches/5.0.3/install/3confirmConfig.php Tue Mar 6 00:49:09 2007 @@ -184,7 +184,7 @@ -

    +

    Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 6 00:49:09 2007 @@ -127,8 +127,8 @@
      -
    • Your install.php file has been renamed to install.php.txt. -
    • Your install folder too has been renamed to install/. +
    • Your install.php file has been renamed to install.php.txt. +
    • Your install folder too has been renamed to install/.
    • Please log in using the "admin" user name and the password you entered in step 2.
    Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/calendar_share.php Tue Mar 6 00:49:09 2007 @@ -21,9 +21,9 @@ ?>
    - +
    - +
    @@ -38,7 +38,7 @@ - + @@ -46,12 +46,12 @@ - +
    - + - + - + - +
    -
    - start_hour != ''){?> checked onClick="enableCalstarttime();">  - start_hour != ''){?> checked onClick="enableCalstarttime();">  +
    - hour_format == '24'){?> checked value="24">  + hour_format == '24'){?> checked value="24"> 
    -
    -

    +
    +

    @@ -162,8 +162,8 @@
    -    - +    +
    Modified: vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php (original) +++ vtigercrm/branches/5.0.3/modules/Campaigns/LoadList.php Tue Mar 6 00:49:09 2007 @@ -33,7 +33,7 @@ ?>
    1  
    @@ -68,7 +68,7 @@
    @@ -105,7 +105,7 @@ - + @@ -140,7 +140,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/DashboardHome_matrix.php Tue Mar 6 00:49:09 2007 @@ -33,10 +33,10 @@ - + - +
    1  
    @@ -57,7 +57,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -105,7 +105,7 @@ - + Modified: vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php (original) +++ vtigercrm/branches/5.0.3/modules/Home/UnifiedSearch.php Tue Mar 6 00:49:09 2007 @@ -139,7 +139,7 @@ //Added to display the Total record count ?>   -   +   @@ -66,8 +66,8 @@
    -  " class="crmbutton small save" />   - " class="crmbutton small cancel" onclick="self.close();" /> +  " class="crmbutton small save" />   + " class="crmbutton small cancel" onclick="self.close();" />
    From extremeprimetime at getpaidto.org Tue Mar 6 03:04:03 2007 From: extremeprimetime at getpaidto.org (Balding H. Chamberlain) Date: Tue, 06 Mar 2007 08:04:03 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7607924236.20070306080403@getpaidto.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070306/82713f2a/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: nugget.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070306/82713f2a/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 04:37:57 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 09:37:57 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10357 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070306093757.D5A1978CAB0@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 02:37:46 2007 New Revision: 10357 Log: added links to forums and blogs Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 6 02:37:46 2007 @@ -130,6 +130,8 @@

  • Your install.php file has been renamed to install.php.txt.
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2. +
  • Talk to us at http://forums.vtiger.com +
  • Discuss with us at http://blogs.vtiger.com From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 6 04:59:35 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 06 Mar 2007 09:59:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10358 - /vtigercrm/branches/5.0.3/modules/Webmails/body.php Message-ID: <20070306095935.4F8E878CAB0@vtiger.fosslabs.com> Author: richie Date: Tue Mar 6 02:59:26 2007 New Revision: 10358 Log: fixed the attachment issue Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Tue Mar 6 02:59:26 2007 @@ -17,10 +17,16 @@ if(!isset($_SESSION["authenticated_user_id"]) || $_SESSION["authenticated_user_id"] != $current_user->id) {echo "ajax failed";flush();exit();} $mailid=$_REQUEST["mailid"]; -if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") {$mailbox=$_REQUEST["mailbox"];} else {$mailbox="INBOX";} +if(isset($_REQUEST["mailbox"]) && $_REQUEST["mailbox"] != "") +{ + $mailbox=$_REQUEST["mailbox"]; +} +else +{ + $mailbox="INBOX"; +} $MailBox = new MailBox($mailbox); $email = new Webmails($MailBox->mbox,$mailid); - ?> -
    From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 09:20:45 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 13:20:45 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10410 - in /vtigercrm/branches/5.0.3/modules: Dashboard/HomepageDB.php Potentials/ListView.php Message-ID: <20070312132045.3D6F57C7F4D@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 07:20:39 2007 New Revision: 10410 Log: Top potentials shows closed one in homepage dashboard. Fixes #2264 Modified: vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php vtigercrm/branches/5.0.3/modules/Potentials/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php (original) +++ vtigercrm/branches/5.0.3/modules/Dashboard/HomepageDB.php Mon Mar 12 07:20:39 2007 @@ -10,9 +10,9 @@ ********************************************************************************/ require_once("modules/Dashboard/Entity_charts.php"); - global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings; + global $current_user,$user_id,$date_start,$end_date,$tmp_dir,$mod_strings,$app_strings; $type='recordsforuser'; - $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; + $homepagedb_query = "select * from vtiger_crmentity se left join vtiger_leaddetails le on le.leadid=se.crmid left join vtiger_troubletickets tt on tt.ticketid=se.crmid left join vtiger_activity act on act.activityid=se.crmid left join vtiger_potential pot on pot.potentialid=se.crmid where se.deleted=0 and (le.converted=0 or le.converted is null) and (pot.sales_stage not in('".$app_strings['LBL_CLOSE_WON']."','".$app_strings['LBL_CLOSE_LOST']."') or pot.sales_stage is null) and (tt.status!='Closed' or tt.status is null) and ((act.status!='Completed' and act.status!='Deferred') or act.status is null) and ((act.eventstatus!='Held' and act.eventstatus!='Not Held') or act.eventstatus is null) and setype in ('Accounts','Contacts','Leads','Potentials','Quotes','Invoice','PurchaseOrder', 'SalesOrder','Calendar','HelpDesk','Campaigns') and se.deleted=0 and se.smownerid=".$current_user->id; $graph_by="setype"; $graph_title=$mod_strings['recordsforuser'].' '.$current_user->user_name; $module="Home"; @@ -46,7 +46,7 @@ } else { - echo $mod_strings[LBL_NO_DATA]; + echo $mod_strings['LBL_NO_DATA']; } Modified: vtigercrm/branches/5.0.3/modules/Potentials/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Potentials/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Potentials/ListView.php Mon Mar 12 07:20:39 2007 @@ -26,7 +26,7 @@ require_once('include/DatabaseUtil.php'); -global $app_strings,$list_max_entries_per_page; +global $app_strings,$list_max_entries_per_page,$mod_strings; $log = LoggerManager::getLogger('potential_list'); @@ -134,11 +134,12 @@ $list_query = getListQuery("Potentials"); } //<<<<<<<>>>>>>>> - if(isset($where) && $where != '') { if(isset($_REQUEST['from_dashboard']) && $_REQUEST['from_dashboard'] == 'true') - $list_query .= " AND vtiger_potential.sales_stage = 'Closed Won' AND ".$where; + $list_query .= " AND vtiger_potential.sales_stage = '".$mod_strings['Closed Won']."' AND ".$where; + elseif(isset($_REQUEST['from_homepagedb']) && $_REQUEST['from_homepagedb'] == 'true') + $list_query .= " AND vtiger_potential.sales_stage not in( '".$mod_strings['Closed Won']."' , '".$mod_strings['Closed Lost']."' )AND ".$where; else $list_query .= " AND ".$where; } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 11:05:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:05:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10411 - in /vtigercrm/branches/5.0.3: include/language/ install/ modules/Emails/ modules/Emails/language/ modules/Migration/DBChanges/ modules/Settings/ modules/Users/ Message-ID: <20070312150554.71ED078CD35@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:05:35 2007 New Revision: 10411 Log: changes made for language support in js alert. --Minnie Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/install/2setConfig.php vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Emails/mailbox.php vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php vtigercrm/branches/5.0.3/modules/Users/Forms.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Mon Mar 12 09:05:35 2007 @@ -692,6 +692,125 @@ 'Dear_Admin_tasks_not_been_completed' => 'Dear Admin,

    Please note that there are certain tasks in the system which have not been completed even after 24hours of their existence
    Thank You
    HelpDesk Team
    ', 'Too_many_pending_tickets' => 'Too many pending tickets', 'Dear_Admin_too_ many_tickets_pending' => 'Dear Admin,
    This is to bring to your notice that there are too many tickets pending. Kindly take the necessary action required for addressing the same

    Thanks and Regards,
    HelpDesk Team
    ', + +//Added for java script alerts +'DELETE_CONFIRMATION' => 'Are you sure you want to delete the selected ', +'SELECT_ATLEAST_ONE' => 'Please select at least one entity', +'DELETING_ACCOUNT' => 'Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected ', +'DELETING_VENDOR' => 'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected ', +'PLEASE_SELECT_MAILID' => 'Please Select a mailid', +'OVERWRITE_EXISTING_ACCOUNT1' => 'Overwrite the existing address with this selected account(', +'OVERWRITE_EXISTING_ACCOUNT2' => ') address details?', +'MISSING_FIELDS' => 'Missing required fields:', +'NOT_ALLOWED_TO_EDIT' => 'you are not allowed to edit this field', +'COLUMNS_CANNOT_BE_EMPTY' => 'Selected Columns cannot be empty', +'CANNOT_BE_EMPTY' => ' cannot be empty', +'CANNOT_BE_NONE' => ' cannot be none', +'SERVERNAME_CANNOT_BE_EMPTY' => 'Server Name cannot be empty', +'ENTER_VALID' => 'Please enter a valid ', +'SHOULDBE_LESS' => ' should be less than ', +'SHOULDBE_LESS_EQUAL' => ' should be less than or equal to ', +'SHOULDBE_EQUAL' => ' should be equal to ', +'SHOULDBE_GREATER' => ' should be greater than ', +'SHOULDBE_GREATER_EQUAL' => ' should be greater than or equal to ', +'INVALID' => 'Invalid ', +'EXCEEDS_MAX' => ' exceeds the maximum limit ', +'OUT_OF_RANGE' => ' is out of range', +'SHOULDNOTBE_EQUAL' => ' should not be equal to ', +'PORTAL_PROVIDE_EMAILID' => 'Portal user should provide email Id for portal login', +'ADD_CONFIRMATION' => 'Are you sure you want to add the selected ', +'ACCOUNTNAME_CANNOT_EMPTY' => 'AccountName Cannot be Empty', +'CANT_SELECT_CONTACTS' => "You can\'t select related contacts from Lead", +'LBL_THIS' => 'This ', +'DOESNOT_HAVE_MAILIDS' => " doesn\'t have any mail ids", +'DOESNOT_HAVE_AN_MAILID' => '" '."doesn\'t have an Email Id", +'ARE_YOU_SURE' => 'Are you sure?', +'MISSING_REPORT_NAME' => 'Missing Report Name', +'REPORT_NAME_EXISTS' => 'Report name already exists, try again...', +'WANT_TO_CHANGE_CONTACT_ADDR' => 'Do you want to change the addresses of the Contacts related to this Account?', +'SURE_TO_DELETE' => 'Are you sure you want to delete ?', +'RECORDS' => ' records ?', +'NO_PRODUCT_SELECTED' => 'No product is selected. Select at least one Product', +'VALID_FINAL_PERCENT' => 'Enter valid Final Discount Percentage', +'VALID_FINAL_AMOUNT' => 'Enter valid Final Discount Amount', +'VALID_SHIPPING_CHARGE' => 'Enter a valid Shipping & Handling charge', +'VALID_ADJUSTMENT' => 'Enter a valid Adjustment', +'SELECTED_MORE_THAN_ONCE' => 'You have selected the following product(s) more than once.', +'WANT_TO_CONTINUE' => 'Do you want to Continue?', +'ENTER_VALID_TAX' => 'Please enter Valid TAX value', +'VALID_TAX_NAME' => 'Enter valid Tax Name', +'CORRECT_TAX_VALUE' => 'Enter Correct Tax Value', +'ENTER_POSITIVE_VALUE' => 'Please enter positive value', +'LABEL_SHOULDNOT_EMPTY' => 'The tax label name should not be empty', +'NOT_VALID_ENTRY' => 'is not a valid entry. Please enter correct value', +'VALID_DISCOUNT_PERCENT' => 'Enter a valid Discount percentage', +'VALID_DISCOUNT_AMOUNT' => 'Enter a valid Discount Amount', +'SELECT_TEMPLATE_TO_MERGE' => 'Please select a template to merge', +'MISSING_REQUIRED_FIELDS' => 'Missing required fields: ', +'READONLY' => "it\'s readonly", +'SELECT_ATLEAST_ONE_USER' => 'Please select at least one user', +'DISABLE_SHARING_CONFIRMATION' => 'Are you sure you want to disable sharing for selected ', +'USERS' => ' user(s) ?', +'ENDTIME_GREATER_THAN_STARTTIME' => 'End Time should be greater than Start Time ', +'FOLLOWUPTIME_GREATER_THAN_STARTTIME' => 'Followup Time should be greater than End Time ', +'MISSING_EVENT_NAME' => 'Missing Event Name', +'EVENT_TYPE_NOT_SELECTED' => 'Event Type is not selected', +'OPPORTUNITYNAME_CANNOT_BE_EMPTY' => 'Opportunity Name field cannot be empty', +'CLOSEDATE_CANNOT_BE_EMPTY' => 'Close Date field cannot be empty', +'SITEURL_CANNOT_BE_EMPTY' => 'Site Url cannot be empty', +'SITENAME_CANNOT_BE_EMPTY' => 'Site Name cannot be empty', +'LISTPRICE_CANNOT_BE_EMPTY' => 'List Price cannot be empty', +'INVALID_LIST_PRICE' => 'Invalid List Price', +'PROBLEM_ACCESSSING_URL' => 'Problem accessing url: ', +'CODE' => ' Code: ', +'WISH_TO_QUALIFY_MAIL_AS_CONTACT' => 'Are you sure you wish to Qualify this Mail as Contact?', +'SELECT_ATLEAST_ONEMSG_TO_DEL' => 'Please select at least one message to delete', +'ERROR' => 'Error', +'FIELD_TYPE_NOT_SELECTED' => 'Field Type is not selected', +'SPECIAL_CHARACTERS_NOT_ALLOWED' => 'Special characters are not allowed in Label field', +'PICKLIST_CANNOT_BE_EMPTY' => 'Picklist value cannot be empty', +'DUPLICATE_VALUES_FOUND' => 'Duplicate Values found', +'DUPLICATE_MAPPING_ACCOUNTS' => 'Duplicate mapping for accounts!!', +'DUPLICATE_MAPPING_CONTACTS' => 'Duplicate mapping for Contacts!!', +'DUPLICATE_MAPPING_POTENTIAL' => 'Duplicate mapping for Potential!!', +'ERROR_WHILE_EDITING' => 'Error while Editing', +'PLEASE_ENTER_TAG' => 'Please enter a tag', +'PLEASE_SELECT_PRODUCT' => 'Please select a Product', +'DUPLICATE_ENTRIES_FOUND' => "Duplicate entries found for the value \'", +'ROLE_SHOULDHAVE_INFO' => 'Role should have at least one profile', +'ENTER_VALID_CONVERSION_RATE' => 'Enter valid Conversion Rate', +'GROUPNAME_CANNNOT_BE_NONE' => 'Group Name cannot be none', +'GROUP_SHOULDHAVE_ONEMEMBER_INFO' => 'Group should have at least one member. Select a member to the group', +'MAP_DELETED_INFO' => 'This map has been deleted. You cannot use this map again', +'MUSTHAVE_ONE_REQUIREDFIELD' => 'Must have one Required field to be selected\n', +'COLUMNS_CANNOT_BE_DUPLICATED' => 'Columns cannot be duplicated', +'SPECIFY_ROLE_INFO' => 'Specfiy the Role to Transfer Existing Roles Users', +'FOLDERNAME_CANNOT_BE_EMPTY' => 'The Folder name cannot be empty', +'FOLDER_NAME_ALREADY_EXISTS' => 'Folder name already exists, try again...', +'SELECT_ATLEAST_ONE_REPORT' => 'Please select at least one Report', +'DELETE_FOLDER_CONFIRMATION' => "Are you sure you want to delete the folder \'", +'DELETE_REPORT_CONFIRMATION' => 'Are you sure you want to delete this report ?', +'MOVE_REPORT_CONFIRMATION' => 'Are you sure you want to move this report to ', +'FOLDER' => ' folder ?', +'ACCOUNT_ACCESS_INFO' => 'Potentials, HelpDesk, Quotes, SalesOrder & Invoice Access must be set to Private when the Account Access is set to Private', +'PROFILENAME_CANNOT_BE_EMPTY' => 'Profile Name Cannot be empty', +'PROFILE_DETAILS_UPDATED' => 'Profile Details are updated', +'CURRENCY_CHANGE_INFO' => 'Currency Changes has been made Successfully', +'CURRENCY_CONVERSION_INFO' => 'Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate.', +'THE_EMAILID' => "The email id \'", +'EMAIL_FIELD_INVALID' => "\' in the email field is invalid", +'SELECT_VALID_IMAGE' => 'Please Select a Valid Image', +'EMAIL_FILED_IS' => "\' in the email field is ", +'OTHER_EMAIL_FILED_IS' => "\' in other email field is ", +'YAHOO_EMAIL_FILED_IS' => "\' in yahoo email field is ", +'INVALID_ADD_IN_EMAILFIELD' => '\" not a valid email address in Email field', +'INVALID_ADD_IN_OTHER_EMAILFIELD' => '\" not a valid email address in Other Email field', +'ENTER_VALID_4DIGIT_YEAR' => 'Please enter a valid 4 digit year between ', +'AND' => ' and ', +'DATABASE_CHANGE_CONFIRMATION' => 'Are you sure to apply the Database Changes from ', +'TO' => ' to ', +'DELETE_RSSFEED_CONFIRMATION' => 'Are you sure to delete the rss feed?', + ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Mon Mar 12 09:05:35 2007 @@ -281,11 +281,11 @@ // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } if (trim(form.admin_email.value) != "" && !/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,4})+$/.test(form.admin_email.value)) { - alert("The email id '"+form.admin_email.value+"' in the email field is invalid"); + alert(alert_arr.THE_EMAILID+form.admin_email.value+alert_arr.EMAIL_FIELD_INVALID); form.admin_email.focus(); exit(); } Modified: vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/language/en_us.lang.php Mon Mar 12 09:05:35 2007 @@ -164,6 +164,11 @@ 'LBL_CONF_MAILSERVER_ERROR'=>'Please configure your outgoing mailserver under Settings ---> Outgoing Server link', 'LBL_VTIGER_EMAIL_CLIENT'=>'vtiger Email Client', 'LBL_MAILSELECT_INFO3'=>'You don\'t have permission to view email id(s) of the selected Record(s).', +//Added for script alerts +'FEATURE_AVAILABLE_INFO' => 'This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait f +or an update!', +'DOWNLOAD_CONFIRAMATION' => 'Do you want to download the file ?', + ); ?> Modified: vtigercrm/branches/5.0.3/modules/Emails/mailbox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/mailbox.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/mailbox.php Mon Mar 12 09:05:35 2007 @@ -73,9 +73,9 @@ function handleFile(nr) { if (b != "ie") { - alert("This feature is currently only available for Microsoft Internet Explorer 5.5+ users\n\nWait for an update!"); + alert('.$mod_strings['FEATURE_AVAILABLE_INFO'].'); } else { - check = confirm("Do you want to download the file ?"); + check = confirm('.$mod_strings['DOWNLOAD_CONFIRAMATION'].'); if (check) { setTimeout("this.location.reload()",8000); location.href="index.php?action=gotodownload&module=Emails&download=1&file="+ nr +"&msgno='.$msg.'"; } else { Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php Mon Mar 12 09:05:35 2007 @@ -4060,10 +4060,10 @@ function ajaxSaveResponse(response) { //alert(response.responseText); - alert("Currency Changes has been made Successfully"); + alert(alert_arr.CURRENCY_CHANGE_INFO); } - if(!confirm("Are you using Dollar $ as Currency? \n Click OK to remain as $, Cancel to change the currency conversion rate.")) + if(!confirm(alert_arr.CURRENCY_CONVERSION_INFO)) { getConversionRate(''); } Modified: vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/ListMailAccount.php Mon Mar 12 09:05:35 2007 @@ -131,7 +131,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -153,7 +153,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } Modified: vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/listemailtemplates.php Mon Mar 12 09:05:35 2007 @@ -39,6 +39,7 @@ $smarty->assign("UMOD", $mod_strings); global $current_language; $smod_strings = return_module_language($current_language,'Settings'); +$smarty->assign("APP", $app_strings); $smarty->assign("MOD", $smod_strings); $smarty->assign("MODULE", 'Settings'); $smarty->assign("IMAGE_PATH", $image_path); Modified: vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/savewordtemplate.php Mon Mar 12 09:05:35 2007 @@ -135,14 +135,14 @@ include('themes/'.$theme.'/header.php'); include "upload.php"; // $errormessage = "Kindly give a valid file for upload!
    " ; - echo ""; + echo ""; } else if($errorCode == 2) { include('themes/'.$theme.'/header.php'); include "upload.php"; //$errormessage = "Sorry, the uploaded file exceeds the maximum filesize limit. Please try a smaller file
    "; - echo ""; + echo ""; //echo $errormessage; //echo $errorCode; } @@ -150,7 +150,7 @@ { include('themes/'.$theme.'/header.php'); include "upload.php"; - echo ""; + echo ""; } Modified: vtigercrm/branches/5.0.3/modules/Users/Forms.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Forms.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Forms.php Mon Mar 12 09:05:35 2007 @@ -41,6 +41,11 @@ $err_missing_required_fields = $app_strings['ERR_MISSING_REQUIRED_FIELDS']; $err_invalid_email_address = $app_strings['ERR_INVALID_EMAIL_ADDRESS']; $lbl_user_image=$mod_strings['User Image']; +$err_select_valid_image = $app_strings['SELECT_VALID_IMAGE']; +$the_emailid = $app_strings['THE_EMAILID']; +$email_field_is = $app_strings['EMAIL_FILED_IS'].$err_invalid_email_address; +$other_email_field_is = $app_strings['OTHER_EMAIL_FILED_IS'].$err_invalid_email_address; +$yahoo_email_field_is = $app_strings['YAHOO_EMAIL_FILED_IS'].$err_invalid_email_address; $the_script = << Author: saraj Date: Mon Mar 12 09:17:26 2007 New Revision: 10412 Log: non admin user unable to select users during mail compose - fixed. Fixes #3195 Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon Mar 12 09:17:26 2007 @@ -253,7 +253,7 @@ $j++; } $field_list .=')'; - if($is_admin==false) + if($is_admin==false || $module != 'Users') { $profileList = getCurrentUserProfileList(); $query = "SELECT DISTINCT vtiger_field.fieldname @@ -284,7 +284,7 @@ global $current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); - if($is_admin==false) + /* if($is_admin==false) { $profileList = getCurrentUserProfileList(); $query = "SELECT vtiger_profile2field.* @@ -300,9 +300,9 @@ AND vtiger_field.fieldname = '".$fieldname."'"; $result = $adb->query($query); - } - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + }*/ + + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field) || $module == 'Users') { if(isset($focus->sortby_fields) && $focus->sortby_fields !='') @@ -824,7 +824,8 @@ $j++; } $field_list .=')'; - if($is_admin==false) + + if($is_admin==false || $module != 'Users') { $profileList = getCurrentUserProfileList(); $query = "SELECT DISTINCT vtiger_field.fieldname @@ -839,6 +840,7 @@ AND vtiger_profile2field.profileid IN ".$profileList." AND vtiger_field.fieldname IN ".$field_list; $result = $adb->query($query); + $field=Array(); for($k=0;$k < $adb->num_rows($result);$k++) { @@ -884,7 +886,9 @@ { $fieldname = $focus->search_fields_name[$name]; - if($is_admin==false) + /* + + if($is_admin==false && $module != 'Users') { $profileList = getCurrentUserProfileList(); $query = "SELECT vtiger_profile2field.* @@ -901,8 +905,8 @@ $result = $adb->query($query); } - - if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || $adb->num_rows($result) == 1) + */ + if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] ==0 || in_array($fieldname,$field) || $module == 'Users') { if($fieldname == '') { From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 11:18:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:18:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10413 - in /vtigercrm/branches/5.0.3/Smarty/templates: ./ Inventory/ Settings/ Message-ID: <20070312151811.6791F7C7F22@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:17:38 2007 New Revision: 10413 Log: changes made for language support in js alerts. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl vtigercrm/branches/5.0.3/Smarty/templates/Migration.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Mon Mar 12 09:17:38 2007 @@ -27,7 +27,7 @@ SaveTag('txtbox_tagfields','{$ID}','{$MODULE}'); else {ldelim} - alert("Please enter a tag"); + alert("{$APP.PLEASE_ENTER_TAG}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl Mon Mar 12 09:17:38 2007 @@ -31,12 +31,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -46,7 +46,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -79,12 +79,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -95,7 +95,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl Mon Mar 12 09:17:38 2007 @@ -311,7 +311,7 @@ // Here we decide whether to submit the form. if (isError == true) {ldelim} - alert("Missing required fields: " + errorMessage); + alert("{$APP.MISSING_FIELDS}" + errorMessage); return false; {rdelim} return true; Modified: vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl Mon Mar 12 09:17:38 2007 @@ -131,8 +131,10 @@ if(isNaN(getObj("conversion_rate").value) || eval(getObj("conversion_rate") .value) == 0) { - alert("Enter valid Conversion Rate") + {/literal} + alert("{$APP.ENTER_VALID_CONVERSION_RATE}") return false + {literal} } return true; Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl Mon Mar 12 09:17:38 2007 @@ -29,7 +29,9 @@ {literal} function deleteCustomField(id, fld_module, colName, uitype) { - if(confirm("Are you sure?")) + {/literal} + if(confirm("{$APP.ARE_YOU_SURE}")) + {literal} { document.form.action="index.php?module=Settings&action=DeleteCustomField&fld_module="+fld_module+"&fld_id="+id+"&colName="+colName+"&uitype="+uitype document.form.submit() Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomView.tpl Mon Mar 12 09:17:38 2007 @@ -92,7 +92,7 @@ {rdelim} if(mandatorycheck == false) {ldelim} - alert("Must have one Required field to be selected\n"+showvalues); + alert("{$APP.MUSTHAVE_ONE_REQUIREDFIELD}"+showvalues); {rdelim} return false; @@ -608,9 +608,11 @@ selected_cv_icolumnvalue = $(cvselect_array[iloop]).options[$(cvselect_array[iloop]).selectedIndex].value; if(selected_cv_columnvalue == selected_cv_icolumnvalue) { - alert('Columns cannot be duplicated'); - $(cvselect_array[iloop]).selectedIndex = 0; - return false; + {/literal} + alert('{$APP.COLUMNS_CANNOT_BE_DUPLICATED}'); + $(cvselect_array[iloop]).selectedIndex = 0; + return false; + {literal} } } Modified: vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DeleteRole.tpl Mon Mar 12 09:17:38 2007 @@ -83,8 +83,10 @@ { if(document.getElementById('role_name').value == '') { - alert('Specfiy the Role to Transfer Existing Roles Users'); - return false; + {/literal} + alert('{$APP.SPECIFY_ROLE_INFO}'); + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Mar 12 09:17:38 2007 @@ -50,7 +50,7 @@ SaveTag('txtbox_tagfields','{$ID}','{$MODULE}'); else {ldelim} - alert("Please enter a tag"); + alert("{$APP.PLEASE_ENTER_TAG}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl Mon Mar 12 09:17:38 2007 @@ -693,7 +693,7 @@ {ldelim} temp= /^\d+\.\d+$/.test(document.getElementById(txtObj).value); if(temp == false) - alert("Please enter Valid TAX value"); + alert("{$APP.ENTER_VALID_TAX}"); {rdelim} function delimage(id) @@ -708,7 +708,7 @@ if(response.responseText.indexOf("SUCESS")>-1) $("replaceimage").innerHTML='{$APP.LBL_IMAGE_DELETED}'; else - alert("Error while Deleting") + alert("{$APP.ERROR_WHILE_EDITING}") {rdelim} {rdelim} ); Modified: vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl Mon Mar 12 09:17:38 2007 @@ -136,7 +136,7 @@ if(trim(document.newGroupForm.groupName.value) == "") {ldelim} - alert('Group Name cannot be none'); + alert('{$APP.GROUPNAME_CANNNOT_BE_NONE}'); return false; {rdelim} @@ -144,7 +144,7 @@ if(document.newGroupForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {ldelim} - alert('Group should have at least one member. Select a member to the group'); + alert('{$APP.GROUP_SHOULDHAVE_ONEMEMBER_INFO}'); return false; {rdelim} dup_validation(); Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Mon Mar 12 09:17:38 2007 @@ -465,6 +465,92 @@
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryDetailView.tpl Mon Mar 12 09:17:38 2007 @@ -25,7 +25,7 @@ SaveTag('txtbox_tagfields','{$ID}','{$MODULE}'); else {ldelim} - alert("Please enter a tag"); + alert("{$APP.PLEASE_ENTER_TAG}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl Mon Mar 12 09:17:38 2007 @@ -28,7 +28,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl Mon Mar 12 09:17:38 2007 @@ -29,7 +29,7 @@ var curr_productid = document.getElementById("hdnProductId"+curr_row).value; if(curr_productid == '') {ldelim} - alert("Please select a Product"); + alert("{$APP.PLEASE_SELECT_PRODUCT}"); return false; {rdelim} {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListEmailTemplates.tpl Mon Mar 12 09:17:38 2007 @@ -62,8 +62,7 @@ else {ldelim} document.massdelete.profile.style.display="none"; - alert("Please select at least one entity"); - + alert("{$APP.SELECT_ATLEAST_ONE}"); return false; {rdelim} {rdelim} @@ -84,11 +83,11 @@ {rdelim} else {ldelim} - alert("Please select at least one entity"); + alert("{$APP.SELECT_ATLEAST_ONE}"); return false; {rdelim} {rdelim} - if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) + if(confirm("{$APP.DELETE_CONFIRMATION}"+xx+"{$APP.RECORDS}")) {ldelim} document.massdelete.action="index.php?module=Settings&action=deleteemailtemplate&return_module=Settings&return_action=listemailtemplates"; {rdelim} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ListLeadCustomFieldMapping.tpl Mon Mar 12 09:17:38 2007 @@ -83,7 +83,7 @@ Modified: vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl Mon Mar 12 09:17:38 2007 @@ -44,7 +44,7 @@ if(document.newRoleForm.selectedColumnsString.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) {ldelim} - alert('Role should have at least one profile'); + alert('{$APP.ROLE_SHOULDHAVE_INFO}'); return false; {rdelim} dup_validation(); Modified: vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Rss.tpl Mon Mar 12 09:17:38 2007 @@ -34,8 +34,10 @@ function DeleteRssFeeds(id) { if(id != '') - { - if(confirm('Are you sure to delete the rss feed?')) + { + {/literal} + if(confirm('{$APP.DELETE_RSSFEED_CONFIRMATION}')) + {literal} { show('status'); var feed = 'feed_'+id; Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EditCompanyInfo.tpl Mon Mar 12 09:17:38 2007 @@ -143,16 +143,19 @@ { if (form.organization_name.value == "" ) { - alert(company_name +" cannot be none"); - form.organization_name.focus(); - return false; - + {/literal} + alert(company_name +"{$APP.CANNOT_BE_NONE}"); + form.organization_name.focus(); + return false; + {literal} } else if (form.organization_name.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert(company_name +" cannot be empty"); - form.organization_name.focus(); - return false; + {/literal} + alert(company_name +"{$APP.CANNOT_BE_EMPTY}"); + form.organization_name.focus(); + return false; + {literal} } else { Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/EmailConfig.tpl Mon Mar 12 09:17:38 2007 @@ -164,8 +164,10 @@ { if(form.server.value =='') { - alert("Server Name cannot be empty") - return false; + {/literal} + alert("{$APP.SERVERNAME_CANNOT_BE_EMPTY}") + return false; + {literal} } return true; } Modified: vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Settings/PickList.tpl Mon Mar 12 09:17:38 2007 @@ -62,9 +62,11 @@ //empty check validation for (i=0;i Author: saraj Date: Mon Mar 12 09:21:09 2007 New Revision: 10414 Log: Report name not displayed. Fixes #3182 Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Mon Mar 12 09:21:09 2007 @@ -173,7 +173,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $mod_strings[$reportfldrow["foldername"]]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $details['details'] = $this->sgetRptsforFldr($reportfldrow["folderid"]); $returndata[] = $details; @@ -186,7 +186,7 @@ $details = Array(); $details['state'] = $reportfldrow["state"]; $details['id'] = $reportfldrow["folderid"]; - $details['name'] = $mod_strings[$reportfldrow["foldername"]]; + $details['name'] = ($mod_strings[$reportfldrow["foldername"]] == '' ) ? $reportfldrow["foldername"]:$mod_strings[$reportfldrow["foldername"]]; $details['description'] = $reportfldrow["description"]; $returndata[] = $details; }while($reportfldrow = $adb->fetch_array($result)); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 11:26:34 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:26:34 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10415 - in /vtigercrm/branches/5.0.3/include/js: Inventory.js ListView.js Mail.js Merge.js QuickCreate.js ajax.js customview.js dtlviewajax.js general.js Message-ID: <20070312152634.78E417C7F22@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:26:20 2007 New Revision: 10415 Log: changes made for language support in js alerts. --Minnie Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js vtigercrm/branches/5.0.3/include/js/ListView.js vtigercrm/branches/5.0.3/include/js/Mail.js vtigercrm/branches/5.0.3/include/js/Merge.js vtigercrm/branches/5.0.3/include/js/QuickCreate.js vtigercrm/branches/5.0.3/include/js/ajax.js vtigercrm/branches/5.0.3/include/js/customview.js vtigercrm/branches/5.0.3/include/js/dtlviewajax.js vtigercrm/branches/5.0.3/include/js/general.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Mon Mar 12 09:26:20 2007 @@ -230,7 +230,7 @@ if(max_row_count == 0) { - alert('No product is selected. Select at least one Product'); + alert(alert_arr.NO_PRODUCT_SELECTED); return false; } @@ -261,7 +261,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_percentage_final").value); if(!temp) { - alert("Enter valid Final Discount Percentage"); + alert(alert_arr.VALID_FINAL_PERCENT); return false; } } @@ -270,7 +270,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_amount_final").value); if(!temp) { - alert("Enter valid Final Discount Amount"); + alert(alert_arr.VALID_FINAL_AMOUNT); return false; } } @@ -279,7 +279,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("shipping_handling_charge").value); if(!temp) { - alert("Enter a valid Shipping & Handling charge"); + alert(alert_arr.VALID_SHIPPING_CHARGE); return false; } @@ -287,7 +287,7 @@ temp = /^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("adjustment").value) if(!temp) { - alert("Enter a valid Adjustment"); + alert(alert_arr.VALID_ADJUSTMENT); return false; } @@ -328,7 +328,7 @@ if(duplicate) { //alert("You have selected < "+duplicate_products+" > more than once in line items "+positions+".\n It is advisable to select the product just once but change the Qty. Thank You"); - if(!confirm("You have selected the following product(s) more than once. \n"+duplicate_products+"\n Do you want to Continue?")) + if(!confirm(alert_arr.SELECTED_MORE_THAN_ONCE+"\n"+duplicate_products+"\n "+alert_arr.WANT_TO_CONTINUE)) return false; } return true; @@ -346,7 +346,7 @@ { temp= /^\d+(\.\d\d*)*$/.test(document.getElementById(txtObj).value); if(temp == false) - alert("Please enter Valid TAX value"); + alert(alert_arr.ENTER_VALID_TAX); } function loadTaxes_Ajax(curr_row) @@ -406,12 +406,12 @@ { if(trim(document.getElementById(fieldname).value)== '') { - alert("Enter valid Tax Name"); + alert(alert_arr.VALID_TAX_NAME); return false; } if(trim(document.getElementById(fieldvalue).value)== '') { - alert("Enter Correct Tax Value"); + alert(alert_arr.CORRECT_TAX_VALUE); return false; } else @@ -419,7 +419,7 @@ var temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById(fieldvalue).value); if(!temp) { - alert("Please enter positive value"); + alert(alert_arr.ENTER_POSITIVE_VALUE); return false; } } @@ -450,7 +450,7 @@ if(document.getElementById(taxLabelPrefix+i).value.length == 0) { - alert("The tax label name should not be empty"); + alert(alert_arr.LABEL_SHOULDNOT_EMPTY); return false } @@ -458,7 +458,7 @@ var temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(taxval); if(!temp) { - alert("'"+taxval+"' is not a valid entry. Please enter correct value"); + alert("'"+taxval+"' "+alert_arr.NOT_VALID_ENTRY); return false; } } @@ -719,7 +719,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_percentage"+i).value); if(!temp) { - alert("Enter a valid Discount percentage"); + alert(alert_arr.VALID_DISCOUNT_PERCENT); return false; } } @@ -728,7 +728,7 @@ temp = /^(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("discount_amount"+i).value); if(!temp) { - alert("Enter a valid Discount Amount"); + alert(alert_arr.VALID_DISCOUNT_AMOUNT); return false; } } Modified: vtigercrm/branches/5.0.3/include/js/ListView.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ListView.js (original) +++ vtigercrm/branches/5.0.3/include/js/ListView.js Mon Mar 12 09:26:20 2007 @@ -29,7 +29,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } fnvshobj(obj,divid); @@ -69,15 +69,15 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } - var alert_str = "Are you sure you want to delete the selected "+xx+" records ?"; + var alert_str = alert_arr.DELETE + xx +alert_arr.RECORDS; if(module=="Accounts") - alert_str = "Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected "+xx+" records?"; + alert_str = alert_arr.DELETE_ACCOUNT +xx+alert_arr.RECORDS; else if(module=="Vendors") - alert_str = "Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected "+xx+" records?"; + alert_str = alert_arr.DELETE_VENDOR+xx+alert_arr.RECORDS; if(confirm(alert_str)) { Modified: vtigercrm/branches/5.0.3/include/js/Mail.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Mail.js (original) +++ vtigercrm/branches/5.0.3/include/js/Mail.js Mon Mar 12 09:26:20 2007 @@ -31,7 +31,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } allids = document.getElementById('idlist').value; @@ -63,7 +63,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } document.massdelete.action="index.php?module=CustomView&action=SendMailAction&return_module="+module+"&return_action=index&viewname="+viewid; @@ -79,7 +79,7 @@ window.close(); }else { - alert('"'+parentname+'" doesn\'t have an Email Id' ); + alert('"'+parentname+alert_arr.DOESNOT_HAVE_AN_MAILID); return false; } } @@ -111,7 +111,7 @@ } else { - alert('Please Select a mailid'); + alert(alert_arr.SELECT_MAILID); } } function sendmail(module,idstrings) Modified: vtigercrm/branches/5.0.3/include/js/Merge.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Merge.js (original) +++ vtigercrm/branches/5.0.3/include/js/Merge.js Mon Mar 12 09:26:20 2007 @@ -25,7 +25,7 @@ else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -47,7 +47,7 @@ else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -59,7 +59,7 @@ if(getObj('mergefile').value == '') { - alert("Please select a template to merge"); + alert(alert_arr.SELECT_TEMPLATE_TO_MERGE); return false; } document.massdelete.action="index.php?module="+module+"&action=Merge&return_module="+module+"&return_action=index"; Modified: vtigercrm/branches/5.0.3/include/js/QuickCreate.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/QuickCreate.js (original) +++ vtigercrm/branches/5.0.3/include/js/QuickCreate.js Mon Mar 12 09:26:20 2007 @@ -16,7 +16,7 @@ if (fldType=="text") { if (currObj.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert(fldLabel+" cannot be empty") + alert(fldLabel+alert_arr.CANNOT_BE_EMPTY) currObj.focus() @@ -30,7 +30,7 @@ } else { if (currObj.value == "" ) { - alert(fldLabel+" cannot be none") + alert(fldLabel+alert_arr.CANNOT_BE_NONE) return false @@ -73,7 +73,7 @@ } if (!re.test(currObj.value)) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } @@ -91,19 +91,19 @@ yyyy=dateelements[2] if (dd<1 || dd>31 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } @@ -114,7 +114,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[fldName].focus() return false } @@ -173,13 +173,13 @@ var val=window.document.QcEditView[fldName].value.replace(/^\s+/g, '').replace(/\s+$/g, '') if (isNaN(val) || (val.indexOf(".")!=-1 && fldName != 'potential_amount')) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) window.document.QcEditView[fldName].focus() return false } else if( val < -2147483648 || val > 2147483647) { - alert(fldLabel +" is out of range"); + alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; } @@ -196,32 +196,32 @@ var ret=true switch (type) { case "L" : if (val>=constval) { - alert(fldLabel+" should be less than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS+constval) ret=false } break; case "LE" : if (val>constval) { - alert(fldLabel+" should be less than or equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS_EQUAL+constval) ret=false } break; case "E" : if (val!=constval) { - alert(fldLabel+" should be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_EQUAL+constval) ret=false } break; case "NE" : if (val==constval) { - alert(fldLabel+" should not be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDNOTBE_EQUAL+constval) ret=false } break; case "G" : if (val<=constval) { - alert(fldLabel+" should be greater than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_GREATER+constval) ret=false } break; case "GE" : if (val31 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } @@ -266,7 +266,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) window.document.QcEditView[dateFldName].focus() return false } @@ -281,7 +281,7 @@ var currObj=window.document.QcEditView[timeFldName] if (hourval>23 || minval>59) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } Modified: vtigercrm/branches/5.0.3/include/js/ajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/ajax.js Mon Mar 12 09:26:20 2007 @@ -81,7 +81,7 @@ var response = me.callback(me.requester); break; default: - alert("Error"); + alert(alert_arr.ERROR); break; } } Modified: vtigercrm/branches/5.0.3/include/js/customview.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/customview.js (original) +++ vtigercrm/branches/5.0.3/include/js/customview.js Mon Mar 12 09:26:20 2007 @@ -42,7 +42,7 @@ var mode = document.getElementById('cfedit_mode').value; if(fieldtype == "" && mode != 'edit') { - alert("Field Type is not selected"); + alert(alert_arr.FIELD_TYPE_NOT_SELECTED); return false; } lengthLayer=getObj("lengthdetails") @@ -55,7 +55,7 @@ var re1=/^[a-z\d\_ ]+$/i if (!re1.test(str)) { - alert("Special characters are not allowed in Label field") + alert(alert_arr.SPECIAL_CHARACTERS_NOT_ALLOWED) return false; } @@ -99,7 +99,7 @@ //Empty Check validation for (i=0;i-1) { - alert("Error while Editing"); + alert(alert_arr.ERROR_WHILE_EDITING); } else if(response.responseText.indexOf(":#:SUCCESS")>-1) { Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Mar 12 09:26:20 2007 @@ -194,7 +194,7 @@ if (fldType=="text") { if (currObj.value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert(fldLabel+" cannot be empty") + alert(fldLabel+alert_arr.CANNOT_BE_EMPTY) currObj.focus() @@ -208,7 +208,7 @@ } else { if (currObj.value == "" ) { - alert(fldLabel+" cannot be none") + alert(fldLabel+alert_arr.CANNOT_BE_NONE) return false @@ -253,7 +253,7 @@ } if (!re.test(currObj.value)) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID + fldLabel) currObj.focus() return false } @@ -292,27 +292,27 @@ var ret=true switch (type) { case 'L' : if (date1>=date2) {//DATE1 VALUE LESS THAN DATE2 - alert(fldLabel1+" should be less than "+fldLabel2) + alert(fldLabel1+ alert_arr.SHOULDBE_LESS +fldLabel2) ret=false } break; case 'LE' : if (date1>date2) {//DATE1 VALUE LESS THAN OR EQUAL TO DATE2 - alert(fldLabel1+" should be less than or equal to "+fldLabel2) + alert(fldLabel1+alert_arr.SHOULDBE_LESS_EQUAL+fldLabel2) ret=false } break; case 'E' : if (date1!=date2) {//DATE1 VALUE EQUAL TO DATE - alert(fldLabel1+" should be equal to "+fldLabel2) + alert(fldLabel1+alert_arr.SHOULDBE_EQUAL+fldLabel2) ret=false } break; case 'G' : if (date1<=date2) {//DATE1 VALUE GREATER THAN DATE2 - alert(fldLabel1+" should be greater than "+fldLabel2) + alert(fldLabel1+alert_arr.SHOULDBE_GREATER+fldLabel2) ret=false } break; case 'GE' : if (date131 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } @@ -357,7 +357,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(dateFldName).focus() return false } @@ -372,7 +372,7 @@ var currObj=getObj(timeFldName) if (hourval>23 || minval>59) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } @@ -453,19 +453,19 @@ yyyy=dateelements[2] if (dd<1 || dd>31 || mm<1 || mm>12 || yyyy<1 || yyyy<1000) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } if ((mm==2) && (dd>29)) {//checking of no. of days in february month - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } if ((mm==2) && (dd>28) && ((yyyy%4)!=0)) {//leap year checking - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } @@ -476,7 +476,7 @@ case 6 : case 9 : case 11 : if (dd>30) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) getObj(fldName).focus() return false } @@ -541,7 +541,7 @@ var currObj=getObj(fldName) if (hourval>23 || minval>59) { - alert("Please enter a valid "+fldLabel) + alert(alert_arr.ENTER_VALID+fldLabel) currObj.focus() return false } @@ -614,7 +614,7 @@ invalid=true } if (invalid==true) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) getObj(fldName).focus() return false } else return true @@ -624,7 +624,7 @@ if(splitval[0]>18446744073709551615) { - alert( fldLabel + " exceeds the maximum limit "); + alert( fldLabel + alert_arr.EXCEEDS_MAX); return false; } @@ -635,7 +635,7 @@ var re=/^\d+(\.\d\d*)*$/ } if (!re.test(val)) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) getObj(fldName).focus() return false } else return true @@ -646,13 +646,13 @@ var val=getObj(fldName).value.replace(/^\s+/g, '').replace(/\s+$/g, '') if (isNaN(val) || (val.indexOf(".")!=-1 && fldName != 'potential_amount')) { - alert("Invalid "+fldLabel) + alert(alert_arr.INVALID+fldLabel) getObj(fldName).focus() return false } else if( val < -2147483648 || val > 2147483647) { - alert(fldLabel +" is out of range"); + alert(fldLabel +alert_arr.OUT_OF_RANGE); return false; } @@ -669,32 +669,32 @@ var ret=true switch (type) { case "L" : if (val>=constval) { - alert(fldLabel+" should be less than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS+constval) ret=false } break; case "LE" : if (val>constval) { - alert(fldLabel+" should be less than or equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_LESS_EQUAL+constval) ret=false } break; case "E" : if (val!=constval) { - alert(fldLabel+" should be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDBE_EQUAL+constval) ret=false } break; case "NE" : if (val==constval) { - alert(fldLabel+" should not be equal to "+constval) + alert(fldLabel+alert_arr.SHOULDNOTBE_EQUAL+constval) ret=false } break; case "G" : if (val<=constval) { - alert(fldLabel+" should be greater than "+constval) + alert(fldLabel+alert_arr.SHOULDBE_GREATER+constval) ret=false } break; case "GE" : if (val Author: saraj Date: Mon Mar 12 09:37:53 2007 New Revision: 10416 Log: changes made for language support in js alerts. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Accounts/Account.js vtigercrm/branches/5.0.3/modules/Calendar/Activity.js vtigercrm/branches/5.0.3/modules/Calendar/script.js vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js vtigercrm/branches/5.0.3/modules/Emails/Email.js vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js vtigercrm/branches/5.0.3/modules/Leads/Lead.js vtigercrm/branches/5.0.3/modules/Portal/Portal.js vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js vtigercrm/branches/5.0.3/modules/Products/Product.js vtigercrm/branches/5.0.3/modules/Reports/Report.js vtigercrm/branches/5.0.3/modules/Rss/Rss.js vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Modified: vtigercrm/branches/5.0.3/modules/Accounts/Account.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Account.js (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Account.js Mon Mar 12 09:37:53 2007 @@ -45,7 +45,7 @@ window.opener.document.EditView.account_id.value = account_id; //Ask the user to overwite the address or not - Modified on 06-01-2007 - if(confirm("Overwrite the existing address with this selected account("+account_name+") address details?")) + if(confirm(alert_arr.OVERWRITE_EXISTING_ACCOUNT1+account_name+alert_arr.OVERWRITE_EXISTING_ACCOUNT2)) { window.opener.document.EditView.bill_street.value = bill_street; window.opener.document.EditView.ship_street.value = ship_street; @@ -270,7 +270,7 @@ onComplete: function(response) { if(response.responseText == 'address_change') { - if(confirm("Do you want to change the addresses of the Contacts related to this Account?") == true) + if(confirm(alert_arr.WANT_TO_CHANGE_CONTACT_ADDR) == true) { form.address_change.value='yes'; form.submit(); Modified: vtigercrm/branches/5.0.3/modules/Calendar/Activity.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Activity.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Activity.js Mon Mar 12 09:37:53 2007 @@ -37,7 +37,7 @@ form.duetime.readOnly=false; - if (form.duetime.readonly) alert ("it's readonly"); + if (form.duetime.readonly) alert (alert_arr.READONLY); document.images.jscal_trigger.width = 16; Modified: vtigercrm/branches/5.0.3/modules/Calendar/script.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/script.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/script.js Mon Mar 12 09:37:53 2007 @@ -23,7 +23,7 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } @@ -43,11 +43,11 @@ } else { - alert("Please select at least one user"); + alert(alert_arr.SELECT_ATLEAST_ONE_USER); return false; } } - if(confirm("Are you sure you want to disable sharing for selected "+xx+" user(s) ?")) + if(confirm(alert_arr.DISABLE_SHARING_CONFIRMATION+xx+alert_arr.USERS)) { document.SharedList.action="index.php?module=Calendar&action=disable_sharing&return_module=Calendar&return_action=calendar_share"; } @@ -275,7 +275,7 @@ { if((endhour*60+endmin) <= (starthour*60+startmin)) { - alert("End Time should be greater than Start Time "); + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } @@ -333,7 +333,7 @@ { if((followuphour*60+followupmin) <= (endhour*60+endmin)) { - alert("Followup Time should be greater than End Time "); + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); document.EditView.followup_starthr.focus(); return false; } @@ -368,7 +368,7 @@ formSelectColumnString('inviteesid','selectedusers'); if(trim(document.EditView.subject.value) == "") { - alert("Missing Event Name"); + alert(alert_arr.MISSING_EVENT_NAME); document.EditView.subject.focus() return false; } @@ -474,7 +474,7 @@ { if((endhour*60+endmin) <= (starthour*60+startmin)) { - alert("End Time should be greater than Start Time "); + alert(alert_arr.ENDTIME_GREATER_THAN_STARTTIME); document.EditView.endhr.focus(); return false; } @@ -531,7 +531,7 @@ { if((followuphour*60+followupmin) <= (endhour*60+endmin)) { - alert("Followup Time should be greater than End Time "); + alert(alert_arr.FOLLOWUPTIME_GREATER_THAN_STARTTIME); document.EditView.followup_starthr.focus(); return false; } @@ -1187,7 +1187,7 @@ else if(select_meeting) calDuedatetime('meeting'); else - alert('Event Type is not selected'); + alert(alert_arr.EVENT_TYPE_NOT_SELECTED); } function calDuedatetime(type) Modified: vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js (original) +++ vtigercrm/branches/5.0.3/modules/CustomView/CustomView.js Mon Mar 12 09:37:53 2007 @@ -74,7 +74,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } //return true; @@ -102,7 +102,7 @@ // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Emails/Email.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Email.js (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Email.js Mon Mar 12 09:37:53 2007 @@ -95,7 +95,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -121,11 +121,11 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } - if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) + if(confirm(alert_arr.DELETE + xx + alert_arr.RECORDS)) { getObj('search_text').value = ''; show("status"); @@ -170,7 +170,7 @@ function DeleteEmail(id) { - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) { getObj('search_text').value = ''; gselectedrowid = 0; Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js (original) +++ vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.js Mon Mar 12 09:37:53 2007 @@ -14,12 +14,12 @@ { if (form.potential_name.value == "") { - alert("Opportunity Name field cannot be empty"); + alert(alert_arr.OPPORTUNITYNAME_CANNOT_BE_EMPTY); return false; } if (form.closedate.value == "") { - alert("Close Date field cannot be empty"); + alert(alert_arr.CLOSEDATE_CANNOT_BE_EMPTY); return false; } return dateValidate('closedate','Potential Close Date','GECD'); Modified: vtigercrm/branches/5.0.3/modules/Leads/Lead.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/Lead.js (original) +++ vtigercrm/branches/5.0.3/modules/Leads/Lead.js Mon Mar 12 09:37:53 2007 @@ -16,12 +16,12 @@ { if (form.potential_name.value == "") { - alert("Opportunity Name field cannot be empty"); + alert(alert_arr.OPPORTUNITYNAME_CANNOT_BE_EMPTY); return false; } if (form.closedate.value == "") { - alert("Close Date field cannot be empty"); + alert(alert_arr.CLOSEDATE_CANNOT_BE_EMPTY); return false; } x = dateValidate('closedate','Potential Close Date','GECD'); Modified: vtigercrm/branches/5.0.3/modules/Portal/Portal.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Portal/Portal.js (original) +++ vtigercrm/branches/5.0.3/modules/Portal/Portal.js Mon Mar 12 09:37:53 2007 @@ -42,7 +42,7 @@ } function DeleteSite(id) { - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) { $("status").style.display="inline"; new Ajax.Request( @@ -61,11 +61,11 @@ function SaveSite(id) { if ($('portalurl').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Url cannot be empty') + alert(alert_arr.SITEURL_CANNOT_BE_EMPTY) return false; } if ($('portalname').value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert('Site Name cannot be empty') + alert(alert_arr.SITENAME_CANNOT_BE_EMPTY) return false; } Effect.Puff('orgLay'); Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js (original) +++ vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBook.js Mon Mar 12 09:37:53 2007 @@ -32,12 +32,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -47,7 +47,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -80,12 +80,12 @@ if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -96,7 +96,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -127,7 +127,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Products/Product.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Product.js (original) +++ vtigercrm/branches/5.0.3/modules/Products/Product.js Mon Mar 12 09:37:53 2007 @@ -31,7 +31,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Reports/Report.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Report.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Report.js Mon Mar 12 09:37:53 2007 @@ -151,7 +151,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_FIELDS + errorMessage); return false; } return true; @@ -225,7 +225,7 @@ { if (oSel.selectedIndex == -1 || oSel.options[oSel.selectedIndex].disabled == true) { - alert("you are not allowed to edit this field"); + alert(alert_arr.NOT_ALLOWED_TO_EDIT); oSel.options[oSel.selectedIndex].selected = false; } } @@ -385,7 +385,7 @@ { if(selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } @@ -407,7 +407,7 @@ { if(i == 1 && selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } if(divarray[i] == 'step4') @@ -463,7 +463,7 @@ { if (trim(document.NewRep.reportname.value) == "") { - alert("Missing Report Name"); + alert(alert_arr.MISSING_REPORT_NAME); }else { new Ajax.Request( @@ -474,7 +474,7 @@ onComplete: function(response) { if(response.responseText!=0) { - alert("Report name already exists, try again..."); + alert(alert_arr.REPORT_NAME_EXISTS); return false; } else Modified: vtigercrm/branches/5.0.3/modules/Rss/Rss.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Rss/Rss.js (original) +++ vtigercrm/branches/5.0.3/modules/Rss/Rss.js Mon Mar 12 09:37:53 2007 @@ -34,7 +34,7 @@ return httpRequest.responseText; break; default: - alert("Problem accessing url: "+targetUrl+" Code: "+httpRequest.status); + alert(alert_arr.PROBLEM_ACCESSSING_URL+targetUrl+alert_arr.CODE+httpRequest.status); return null; break; } @@ -48,7 +48,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Vendor.js Mon Mar 12 09:37:53 2007 @@ -20,7 +20,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Webmails/webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/webmails.js Mon Mar 12 09:37:53 2007 @@ -99,7 +99,7 @@ // TODO: present the user with a simple DHTML div to // choose what type of relationship they would like to create // before creating it. - alert('Are you sure you wish to Qualify this Mail as Contact?'); + alert(alert_arr.WISH_TO_QUALIFY_MAIL_AS_CONTACT); add_to_vtiger(mid); } function add_to_vtiger(mid) { @@ -357,10 +357,10 @@ nids=nid; else { - alert("Please select at least one message to delete"); + alert(alert_arr.SELECT_ATLEAST_ONEMSG_TO_DEL); return false; } - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) runEmailCommand("delete_multi_msg",nids); } From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 12 11:55:24 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 12 Mar 2007 15:55:24 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10417 - /vtigercrm/branches/5.0.3/include/js/Inventory.js Message-ID: <20070312155524.409057C7F63@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 12 09:55:17 2007 New Revision: 10417 Log: popup window resized for ie7 Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/Inventory.js (original) +++ vtigercrm/branches/5.0.3/include/js/Inventory.js Mon Mar 12 09:55:17 2007 @@ -63,9 +63,9 @@ if(document.getElementsByName("account_id").length != 0) record_id= document.EditView.account_id.value; if(record_id != '') - window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId+"&relmod_id="+record_id+"&parent_module=Accounts","productWin","width=640,height=565,resizable=0,scrollbars=0,status=1,top=150,left=200"); + window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId+"&relmod_id="+record_id+"&parent_module=Accounts","productWin","width=640,height=600,resizable=0,scrollbars=0,status=1,top=150,left=200"); else - window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=640,height=565,resizable=0,scrollbars=0,status=1,top=150,left=200"); + window.open("index.php?module=Products&action=Popup&html=Popup_picker&form=HelpDeskEditView&popuptype="+popuptype+"&curr_row="+rowId,"productWin","width=640,height=600,resizable=0,scrollbars=0,status=1,top=150,left=200"); } function priceBookPickList(currObj, row_no) { From mariack at gotee.com Mon Mar 12 09:56:36 2007 From: mariack at gotee.com (Lightness B. World) Date: Mon, 12 Mar 2007 13:56:36 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7426912866.20070312135636@gotee.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070312/9ab1498c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: davit.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070312/9ab1498c/attachment.gif From stefylynn at goke.org Tue Mar 13 04:53:12 2007 From: stefylynn at goke.org (Accused D. Seamiest) Date: Tue, 13 Mar 2007 08:53:12 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9815546624.20070313085312@goke.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/937fad06/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: disapproval.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/937fad06/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 13 07:24:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 13 Mar 2007 11:24:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10418 - in /vtigercrm/branches/5.0.3/Smarty/templates: ActivityListView.tpl ListView.tpl Message-ID: <20070313112411.944077C7F62@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 13 05:24:06 2007 New Revision: 10418 Log: image path added Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Tue Mar 13 05:24:06 2007 @@ -16,7 +16,7 @@ - + + + Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Tue Mar 13 10:33:53 2007 @@ -18,7 +18,7 @@ - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AddProductToPriceBooks.tpl Tue Mar 13 10:33:53 2007 @@ -124,7 +124,7 @@ {rdelim} - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/AddProductsToPriceBook.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/AddProductsToPriceBook.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/AddProductsToPriceBook.tpl Tue Mar 13 10:33:53 2007 @@ -34,7 +34,7 @@ {rdelim} - +

    {$PRODUCTLISTHEADER} Modified: vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl Tue Mar 13 10:33:53 2007 @@ -9,7 +9,7 @@ * ********************************************************************************/ -->*} - + {if $MODULE eq 'Calendar'}
     
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/GlobalListView.tpl Tue Mar 13 10:33:53 2007 @@ -20,7 +20,7 @@
    {/if} - + {if $SEARCH_MODULE eq 'All'} + {include file='Buttons_List1.tpl'} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ImportStep2.tpl Tue Mar 13 10:33:53 2007 @@ -11,7 +11,7 @@ -->*} - + - + +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/InventoryEditView.tpl Tue Mar 13 10:33:53 2007 @@ -18,7 +18,7 @@ - + - + - + + {literal} - + + {literal} + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Reports.tpl Tue Mar 13 10:33:53 2007 @@ -13,7 +13,7 @@ -->*} {**} - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl Tue Mar 13 10:33:53 2007 @@ -16,7 +16,7 @@ - +
    Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl Tue Mar 13 10:33:53 2007 @@ -15,7 +15,7 @@ {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/salesEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/salesEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/salesEditView.tpl Tue Mar 13 10:33:53 2007 @@ -18,7 +18,7 @@ - + {JAVASCRIPT} - + Modified: vtigercrm/branches/5.0.3/modules/Products/AddProductToPriceBooks.html ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/AddProductToPriceBooks.html (original) +++ vtigercrm/branches/5.0.3/modules/Products/AddProductToPriceBooks.html Tue Mar 13 10:33:53 2007 @@ -116,7 +116,7 @@ } - +
    Modified: vtigercrm/branches/5.0.3/modules/Products/AddProductsToPriceBook.html ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/AddProductsToPriceBook.html (original) +++ vtigercrm/branches/5.0.3/modules/Products/AddProductsToPriceBook.html Tue Mar 13 10:33:53 2007 @@ -27,7 +27,7 @@ } - +

    {PRODUCTLISTHEADER} Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 13 10:33:53 2007 @@ -173,7 +173,7 @@ } ); - + -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/b8ab5928/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: monkeyshine.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070313/b8ab5928/attachment.gif From robert.i.wright at glazed.org Wed Mar 14 06:20:52 2007 From: robert.i.wright at glazed.org (Doer R. Tate) Date: Wed, 14 Mar 2007 10:20:52 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9346441980.20070314102052@glazed.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070314/c400dbe8/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: buckskin.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070314/c400dbe8/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 14 06:23:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 14 Mar 2007 10:23:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10431 - in /vtigercrm/branches/5.0.3/modules/Products: Save.php language/en_us.lang.php Message-ID: <20070314102344.1F5C57C7F51@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 14 04:23:37 2007 New Revision: 10431 Log: fix for i18n issue - Notification email - Stock Level is Low. Fixes #3046 Modified: vtigercrm/branches/5.0.3/modules/Products/Save.php vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Products/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Products/Save.php Wed Mar 14 04:23:37 2007 @@ -24,7 +24,7 @@ require_once('modules/Products/Products.php'); require_once('include/logging.php'); require_once('include/database/PearDatabase.php'); -global $log,$current_user; +global $log,$current_user,$mod_strings; $currencyid=fetchCurrency($current_user->id); $rate_symbol = getCurrencySymbolandCRate($currencyid); $rate = $rate_symbol['rate']; @@ -139,14 +139,14 @@ $handler_name = getUserName($handler); $sender_name = getUserName($current_user->id); $to_address= getUserEmail($handler); - $subject = $productname.' Stock Level is Low'; - $body = 'Dear '.$handler_name.', + $subject = $productname.' '.$mod_strings['MSG_STOCK_LEVEL']; + $body = $mod_strings['MSG_DEAR'].' '.$handler_name.',

    '. - The current stock of '.$productname.' in our warehouse is '.$qty_stk.'. Kindly procure required number of units as the stock level is below reorder level '.$reord.'. + $mod_strings['MSG_CURRENT_STOCK'].' '.$productname.' '.$mod_strings['MSG_IN_OUR_WAREHOUSE'].' '.$qty_stk.'. '.$mod_strings['MSG_PROCURE_REQUIRED_NUMBER'].' '.$reord.'.
    '. - Severity: Major - Thanks, - '.$sender_name; + $mod_strings['MSG_SEVERITY'].'

    '. + $mod_strings['MSG_THANKS'].'
    '. + $sender_name; include("modules/Emails/mail.php"); $mail_status = send_mail("Products",$to_address,$current_user->user_name,$current_user->email1,$subject,$body); Modified: vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Products/language/en_us.lang.php Wed Mar 14 04:23:37 2007 @@ -209,6 +209,15 @@ 'Spiral Binder'=>'Spiral Binder', 'Sq Ft'=>'Sq Ft', +//Added for 5.0.3 +'MSG_STOCK_LEVEL'=>'Stock Level is Low', +'MSG_DEAR'=>'Dear', +'MSG_CURRENT_STOCK'=>'The current stock of', +'MSG_IN_OUR_WAREHOUSE'=>'in our warehouse is', +'MSG_PROCURE_REQUIRED_NUMBER'=>'Kindly procure required number of units as the stock level is below reorder level', +'MSG_SEVERITY'=>'Severity: Major', +'MSG_THANKS'=>'Thanks,', + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 14 06:41:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 14 Mar 2007 10:41:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10432 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php ListView.php language/en_us.lang.php Message-ID: <20070314104119.DAF4C7C7F0D@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 14 04:41:12 2007 New Revision: 10432 Log: fix for i18n issue - in Email / My Mails. Fixes #3034 --Minnie Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Wed Mar 14 04:41:12 2007 @@ -29,23 +29,23 @@ echo ''; $webmail->loadMail(); -echo ''; +echo ''; -echo ""; +echo ""; foreach($webmail->attachments as $key=>$value) { echo '"; Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Wed Mar 14 04:41:12 2007 @@ -266,13 +266,13 @@ } echo ""; -$listview_header = array("","","","",""); +$listview_header = array("","","","",""); $listview_entries = array(); $displayed_msgs=0; $new_msgs=0; if(($numEmails) <= 0) - $listview_entries[0][] = ''; + $listview_entries[0][] = ''; else { if(isset($_REQUEST["search"])) { @@ -318,7 +318,7 @@ $i=0; if (is_array($list)) { $boxes = '
     
    '; echo ''; -echo ''; -echo ''; +echo ''; +echo ''; //Added to get the UTF-8 string - 30-11-06 - Mickie $elist->subject = utf8_decode(imap_utf8($elist->subject)); -echo ''; -echo ''; +echo ''; +echo ''; echo '
    From:'.$elist->from.'
    To:'.$elist->to.'
    '.$mod_strings['LBL_FROM'].''.$elist->from.'
    '.$mod_strings['LBL_TO'].''.$elist->to.'
    Subject:'.$elist->subject.'
    Date:'.$elist->date.'
    '.$mod_strings['LBL_SUBJECT'].''.$elist->subject.'
    '.$mod_strings['LBL_DATE'].''.$elist->date.'
    '; echo '

    Email Attachments:

    ".$mod_strings['LBL_EMAIL_ATTACHMENTS']."

    '.($key+1).') '.$value["filename"]."
    InfoSubjectDateFromDel".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."No Emails In This Folder'.$mod_strings['LBL_NO_EMAILS'].'
    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 02:53:20 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 06:53:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10437 - /vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Message-ID: <20070315065320.EAADF7C7F0D@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 00:53:13 2007 New Revision: 10437 Log: fix for customfields of type Multi-Select Combo Box and Skype not displayed properly in ListView. Fixes #3079 --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Mar 15 00:53:13 2007 @@ -1324,6 +1324,14 @@ elseif($uitype == 98) { $value = ''.getRoleName($temp_val).''; + } + elseif($uitype == 33) + { + $value = ($temp_val != "") ? str_ireplace(' |##| ',', ',$temp_val) : ""; + } + elseif($uitype == 85) + { + $value = ($temp_val != "") ? "{$temp_val}" : ""; } else { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 03:56:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 07:56:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10438 - in /vtigercrm/branches/5.0.3: Smarty/templates/Header.tpl include/js/dtlviewajax.js Message-ID: <20070315075631.0D4227C8030@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 01:56:19 2007 New Revision: 10438 Log: fix for i18n issue with check boxes. Fixes #2448 --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Thu Mar 15 01:56:19 2007 @@ -548,7 +548,8 @@ VALID_DISCOUNT_PERCENT:'{$APP.VALID_DISCOUNT_PERCENT}', VALID_DISCOUNT_AMOUNT:'{$APP.VALID_DISCOUNT_AMOUNT}', SELECT_TEMPLATE_TO_MERGE:'{$APP.SELECT_TEMPLATE_TO_MERGE}', - + YES:'{$APP.yes}', + NO:'{$APP.no}', {rdelim}; var THandle = document.getElementById("Track_Handle"); Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Thu Mar 15 01:56:19 2007 @@ -284,14 +284,14 @@ } else - getObj(dtlView).innerHTML = "yes"; + getObj(dtlView).innerHTML = alert_arr.YES; } else - getObj(dtlView).innerHTML = "yes"; - }else - { - getObj(dtlView).innerHTML = "no"; + getObj(dtlView).innerHTML = alert_arr.YES; + }else + { + getObj(dtlView).innerHTML = alert_arr.NO; } }else if(uitype == 116) @@ -345,7 +345,7 @@ { if(tagValue == '1') { - getObj(dtlView).innerHTML = "yes"; + getObj(dtlView).innerHTML = alert_arr.YES; }else { getObj(dtlView).innerHTML = ""; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 04:08:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 08:08:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10439 - in /vtigercrm/branches/5.0.3/include: language/en_us.lang.php utils/DetailViewUtils.php Message-ID: <20070315080838.63F447C803A@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 02:08:30 2007 New Revision: 10439 Log: fix for Contact images display oddly. Fixes #2780 --Minnie Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Thu Mar 15 02:08:30 2007 @@ -825,6 +825,7 @@ 'MSG_THANKS'=>'Thanks,', 'MSG_VTIGERTEAM'=>' vTiger Team', 'MSG_IS_NOT_UPLOADED'=>'is not uploaded. Allowed file types - jpeg, png, jpg, pjpeg, x-png or gif', +'MSG_IMAGE_ERROR'=>'Image not found', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Thu Mar 15 02:08:30 2007 @@ -483,7 +483,7 @@ $image_name = $adb->query_result($image_res,0,'name'); $imgpath = $image_path.$image_id."_".$image_name; if($image_name != '') - $label_fld[] =''; + $label_fld[] =''.$app_strings['MSG_IMAGE_ERROR'].''; else $label_fld[] = ''; } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 05:41:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 09:41:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10440 - /vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Message-ID: <20070315094116.097D978C717@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 03:41:04 2007 New Revision: 10440 Log: fix for Contacts is selected in Compose email box while sending mail from Accounts/Leads. Fixes #3070 --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Thu Mar 15 03:41:04 2007 @@ -798,15 +798,23 @@ //added by rdhital/Raju for better email support elseif($uitype == 357) { - $contact_selected = 'selected'; - $account_selected = ''; - $lead_selected = ''; + if($_REQUEST['pmodule'] == 'Contacts') + { + $contact_selected = 'selected'; + } + elseif($_REQUEST['pmodule'] == 'Accounts') + { + $account_selected = 'selected'; + } + elseif($_REQUEST['pmodule'] == 'Leads') + { + $lead_selected = 'selected'; + } if(isset($_REQUEST['emailids']) && $_REQUEST['emailids'] != '') { $parent_id = $_REQUEST['emailids']; $parent_name=''; $pmodule=$_REQUEST['pmodule']; - $myids=explode("|",$parent_id); for ($i=0;$i<(count($myids)-1);$i++) { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 06:36:51 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 10:36:51 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10441 - in /vtigercrm/branches/5.0.3/include/utils: ListViewUtils.php SearchUtils.php Message-ID: <20070315103651.E4AD17C8058@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 04:36:31 2007 New Revision: 10441 Log: Problem in searching Inventory manager - fixed. Fixes #3176 Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Thu Mar 15 04:36:31 2007 @@ -1999,6 +1999,8 @@ ON vtiger_groups.groupname = vtiger_quotegrouprelation.groupname LEFT JOIN vtiger_users ON vtiger_users.id = vtiger_crmentity.smownerid + LEFT JOIN vtiger_users as vtiger_usersQuotes + ON vtiger_usersQuotes.id = vtiger_quotes.inventorymanager WHERE vtiger_crmentity.deleted = 0 ".$where; if($is_admin==false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1 && $defaultOrgSharingPermission[$tab_id] == 3) { Modified: vtigercrm/branches/5.0.3/include/utils/SearchUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/SearchUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/SearchUtils.php Thu Mar 15 04:36:31 2007 @@ -433,6 +433,13 @@ } $fieldlabel1 = str_replace(" ","_",$fieldlabel); + //Check added to search the lists by Inventory manager + if($fieldtablename == 'vtiger_quotes' && $fieldcolname == 'inventorymanager') + { + $fieldtablename = 'vtiger_usersQuotes'; + $fieldcolname = 'user_name'; + } + if($fieldlabel != 'Related to') { if ($i==0) From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 07:49:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 11:49:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10442 - /vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Message-ID: <20070315114941.E76837C7FEF@vtiger.fosslabs.com> Author: richie Date: Thu Mar 15 05:49:31 2007 New Revision: 10442 Log: removed unwanted echos Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Thu Mar 15 05:49:31 2007 @@ -81,12 +81,15 @@ } // Set IMAP flag - if($mails[$start_message]->flagged) - $flags.=''; - else + if($mails[$start_message]->flagged) + { + $flags.=''; + } + else + { $flags.=''; - + } $tmp=imap_mime_header_decode($mails[$start_message]->from); $from = $tmp[0]->text; From richardson at greghopkins.net Thu Mar 15 09:06:01 2007 From: richardson at greghopkins.net (Profundities B. Avenging) Date: Thu, 15 Mar 2007 13:06:01 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3150319689.20070315130601@greghopkins.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070315/247b0e3a/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: aridity.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070315/247b0e3a/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 10:29:32 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:29:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10443 - in /vtigercrm/branches/5.0.3/modules: Accounts/Accounts.js Calendar/Calendar.js Emails/Emails.js Leads/Leads.js PriceBooks/PriceBooks.js Products/Products.js Reports/Reports.js Vendors/Vendors.js Webmails/Webmails.js Message-ID: <20070315142933.239D378C72B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:29:20 2007 New Revision: 10443 Log: i18n support added for new js files Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js vtigercrm/branches/5.0.3/modules/Emails/Emails.js vtigercrm/branches/5.0.3/modules/Leads/Leads.js vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js vtigercrm/branches/5.0.3/modules/Products/Products.js vtigercrm/branches/5.0.3/modules/Reports/Reports.js vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js (original) +++ vtigercrm/branches/5.0.3/modules/Accounts/Accounts.js Thu Mar 15 08:29:20 2007 @@ -45,7 +45,7 @@ window.opener.document.EditView.account_id.value = account_id; //Ask the user to overwite the address or not - Modified on 06-01-2007 - if(confirm("Overwrite the existing address with this selected account("+account_name+") address details?")) + if(confirm(alert_arr.OVERWRITE_EXISTING_ACCOUNT1+account_name+alert_arr.OVERWRITE_EXISTING_ACCOUNT2)) { window.opener.document.EditView.bill_street.value = bill_street; window.opener.document.EditView.ship_street.value = ship_street; @@ -270,7 +270,7 @@ onComplete: function(response) { if(response.responseText == 'address_change') { - if(confirm("Do you want to change the addresses of the Contacts related to this Account?") == true) + if(confirm(alert_arr.WANT_TO_CHANGE_CONTACT_ADDR) == true) { form.address_change.value='yes'; form.submit(); Modified: vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Calendar.js Thu Mar 15 08:29:20 2007 @@ -37,7 +37,7 @@ form.duetime.readOnly=false; - if (form.duetime.readonly) alert ("it's readonly"); + if (form.duetime.readonly) alert (alert_arr.READONLY); document.images.jscal_trigger.width = 16; Modified: vtigercrm/branches/5.0.3/modules/Emails/Emails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/Emails.js (original) +++ vtigercrm/branches/5.0.3/modules/Emails/Emails.js Thu Mar 15 08:29:20 2007 @@ -95,7 +95,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -121,11 +121,11 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } - if(confirm("Are you sure you want to delete the selected "+xx+" records ?")) + if(confirm(alert_arr.DELETE + xx + alert_arr.RECORDS)) { getObj('search_text').value = ''; show("status"); @@ -170,7 +170,7 @@ function DeleteEmail(id) { - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) { getObj('search_text').value = ''; gselectedrowid = 0; Modified: vtigercrm/branches/5.0.3/modules/Leads/Leads.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Leads/Leads.js (original) +++ vtigercrm/branches/5.0.3/modules/Leads/Leads.js Thu Mar 15 08:29:20 2007 @@ -16,12 +16,12 @@ { if (form.potential_name.value == "") { - alert("Opportunity Name field cannot be empty"); + alert(alert_arr.OPPORTUNITYNAME_CANNOT_BE_EMPTY); return false; } if (form.closedate.value == "") { - alert("Close Date field cannot be empty"); + alert(alert_arr.CLOSEDATE_CANNOT_BE_EMPTY); return false; } x = dateValidate('closedate','Potential Close Date','GECD'); Modified: vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js (original) +++ vtigercrm/branches/5.0.3/modules/PriceBooks/PriceBooks.js Thu Mar 15 08:29:20 2007 @@ -32,12 +32,12 @@ { if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -47,7 +47,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -80,12 +80,12 @@ if (elem[i].value.replace(/^\s+/g, '').replace(/\s+$/g, '').length==0) { - alert("List Price cannot be empty"); + alert(alert_arr.LISTPRICE_CANNOT_BE_EMPTY); return false; } else if(isNaN(elem[i].value)) { - alert("Invalid List Price"); + alert(alert_arr.INVALID_LIST_PRICE); return false; } @@ -96,7 +96,7 @@ } else { - alert("Please select at least one entity"); + alert(alert_arr.SELECT); return false; } } @@ -127,7 +127,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Products/Products.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Products/Products.js (original) +++ vtigercrm/branches/5.0.3/modules/Products/Products.js Thu Mar 15 08:29:20 2007 @@ -31,7 +31,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Thu Mar 15 08:29:20 2007 @@ -151,7 +151,7 @@ } // Here we decide whether to submit the form. if (isError == true) { - alert("Missing required fields:" + errorMessage); + alert(alert_arr.MISSING_FIELDS + errorMessage); return false; } return true; @@ -225,7 +225,7 @@ { if (oSel.selectedIndex == -1 || oSel.options[oSel.selectedIndex].disabled == true) { - alert("you are not allowed to edit this field"); + alert(alert_arr.NOT_ALLOWED_TO_EDIT); oSel.options[oSel.selectedIndex].selected = false; } } @@ -385,7 +385,7 @@ { if(selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } @@ -407,7 +407,7 @@ { if(i == 1 && selectedColumnsObj.options.length == 0) { - alert("Selected Columns cannot be empty"); + alert(alert_arr.COLUMNS_CANNOT_BE_EMPTY); return false; } if(divarray[i] == 'step4') @@ -463,7 +463,7 @@ { if (trim(document.NewRep.reportname.value) == "") { - alert("Missing Report Name"); + alert(alert_arr.MISSING_REPORT_NAME); }else { new Ajax.Request( @@ -474,7 +474,7 @@ onComplete: function(response) { if(response.responseText!=0) { - alert("Report name already exists, try again..."); + alert(alert_arr.REPORT_NAME_EXISTS); return false; } else Modified: vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js (original) +++ vtigercrm/branches/5.0.3/modules/Vendors/Vendors.js Thu Mar 15 08:29:20 2007 @@ -20,7 +20,7 @@ } if (isError == true) { - alert("Missing required fields: " + errorMessage); + alert(alert_arr.MISSING_REQUIRED_FIELDS + errorMessage); return false; } return true; Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Thu Mar 15 08:29:20 2007 @@ -99,7 +99,7 @@ // TODO: present the user with a simple DHTML div to // choose what type of relationship they would like to create // before creating it. - alert('Are you sure you wish to Qualify this Mail as Contact?'); + alert(alert_arr.WISH_TO_QUALIFY_MAIL_AS_CONTACT); add_to_vtiger(mid); } function add_to_vtiger(mid) { @@ -357,10 +357,10 @@ nids=nid; else { - alert("Please select at least one message to delete"); + alert(alert_arr.SELECT_ATLEAST_ONEMSG_TO_DEL); return false; } - if(confirm("Are you sure you want to delete ?")) + if(confirm(alert_arr.SURE_TO_DELETE)) runEmailCommand("delete_multi_msg",nids); } From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 10:31:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:31:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10444 - /thunderbirdextn/trunk/install.js Message-ID: <20070315143123.3BAE478C72B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:31:19 2007 New Revision: 10444 Log: version changed Modified: thunderbirdextn/trunk/install.js Modified: thunderbirdextn/trunk/install.js ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 10:36:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:36:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10445 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Message-ID: <20070315143638.AC6F97C8043@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:36:33 2007 New Revision: 10445 Log: copyright changes Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 10:50:55 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 14:50:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10446 - in /vtigercrm/branches/5.0.3/modules/Webmails: MailParse.php language/en_us.lang.php Message-ID: <20070315145055.B5EB87C8049@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 08:50:50 2007 New Revision: 10446 Log: Title added for Icons Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Thu Mar 15 08:50:50 2007 @@ -56,7 +56,7 @@ // Attachment Icons if($msg_ob->has_attachments) - $flags.=' '; + $flags.=' '; else $flags.=' '; @@ -65,7 +65,7 @@ // read/unread/forwarded/replied if(!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $flags.=' '; + $flags.=' '; } elseif ($mails[$start_message]->in_reply_to || $mails[$start_message]->references || preg_match("/^re:/i",$mails[$start_message]->subject)) { @@ -73,11 +73,11 @@ } elseif (preg_match("/^fw:/i",$mails[$start_message]->subject)) { - $flags.=' '; + $flags.=' '; } else { - $flags.=' '; + $flags.=' '; } // Set IMAP flag Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Thu Mar 15 08:50:50 2007 @@ -1,139 +1,139 @@ -'Emails', -'LBL_MODULE_TITLE'=>'Emails: Home', -'LBL_SEARCH_FORM_TITLE'=>'Email Search', -'LBL_LIST_FORM_TITLE'=>'Email List', -'LBL_NEW_FORM_TITLE'=>'Track Email', - -'LBL_LIST_SUBJECT'=>'Subject', -'LBL_LIST_CONTACT'=>'Contact', -'LBL_LIST_RELATED_TO'=>'Related to', -'LBL_LIST_DATE'=>'Date Sent', -'LBL_LIST_TIME'=>'Time Sent', +'Emails', +'LBL_MODULE_TITLE'=>'Emails: Home', +'LBL_SEARCH_FORM_TITLE'=>'Email Search', +'LBL_LIST_FORM_TITLE'=>'Email List', +'LBL_NEW_FORM_TITLE'=>'Track Email', + +'LBL_LIST_SUBJECT'=>'Subject', +'LBL_LIST_CONTACT'=>'Contact', +'LBL_LIST_RELATED_TO'=>'Related to', +'LBL_LIST_DATE'=>'Date Sent', +'LBL_LIST_TIME'=>'Time Sent', 'LBL_MOVE_TO'=>'Move To', 'LBL_DELETE'=>'Delete', - -'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", -'LBL_DATE_SENT'=>'Date Sent:', -'LBL_SUBJECT'=>'Subject :', -'LBL_DATE_AND_TIME'=>'Date & Time Sent:', -'LBL_DATE'=>'Date :', -'LBL_TIME'=>'Time Sent:', -'LBL_BODY'=>'Body:', -'LBL_CONTACT_NAME'=>' Contact Name: ', -'LBL_EMAIL'=>'Email:', -'LBL_COLON'=>':', -'LBL_TO'=>'To :', -'LBL_CHK_MAIL'=>'Check Mail', -'LBL_COMPOSE'=>'Compose', -'LBL_SETTINGS'=>'Incmg. MailServer Settings', -'LBL_EMAIL_FOLDERS'=>'Email Folders', -'LBL_INBOX'=>'Inbox', -'LBL_SENT_MAILS'=>'Sent Mails', -'LBL_TRASH'=>'Trash', -'LBL_JUNK_MAILS'=>'Junk Mails', -'LBL_TO_LEADS'=>'To Leads', -'LBL_TO_CONTACTS'=>'To Contacts', -'LBL_TO_ACCOUNTS'=>'To Accounts', -'LBL_MY_MAILS'=>'My Mails', -'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', -'LBL_MAILS'=>'Mails', -'LBL_QUALIFY_BUTTON'=>'Qualify', -'LBL_REPLY_BUTTON'=>'Reply', -'LBL_FORWARD_BUTTON'=>'Forward', -'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', -'LBL_FROM'=>'From :', -'LBL_CC'=>'cc :', -'LBL_REPLY_TO_SENDER'=>'Reply to Sender', -'LBL_REPLY_ALL'=>'Reply All', -'LBL_SHOW_HIDDEN'=>'Show Hidden Mails', -'LBL_EXPUNGE_MAILBOX'=>'Trim Mailbox', - -'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', -'LBL_INVITEE'=>'Recipients', - -// Added Fields -// Contacts-SubPanelViewContactsAndUsers.php -'LBL_BULK_MAILS'=>'Bulk Mails', -'LBL_ATTACHMENT'=>'Attachment', -'LBL_UPLOAD'=>'Upload', -'LBL_FILE_NAME'=>'File Name', -'LBL_SEND'=>'Send', - -'LBL_EMAIL_TEMPLATES'=>'Email Templates', -'LBL_TEMPLATE_NAME'=>'Template Name', -'LBL_DESCRIPTION'=>'Description', -'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', -'LBL_EMAIL_INFORMATION'=>'Email Information', - - - - -//for v4 release added -'LBL_NEW_LEAD'=>'New Lead', -'LBL_LEAD_TITLE'=>'Leads', - -'LBL_NEW_PRODUCT'=>'New Product', -'LBL_PRODUCT_TITLE'=>'Products', -'LBL_NEW_CONTACT'=>'New Contact', -'LBL_CONTACT_TITLE'=>'Contacts', -'LBL_NEW_ACCOUNT'=>'New Account', -'LBL_ACCOUNT_TITLE'=>'Accounts', - -// Added vtiger_fields after vtiger4 - Beta -'LBL_USER_TITLE'=>'Users', -'LBL_NEW_USER'=>'New User', - -// Added for 4 GA -'LBL_TOOL_FORM_TITLE'=>'Email Tools', -//Added for 4GA -'Date & Time Sent'=>'Date & Time Sent', -'Sales Enity Module'=>'Sales Enity Module', -'Activtiy Type'=>'Activtiy Type', -'Related To'=>'Related To', -'Assigned To'=>'Assigned To', -'Subject'=>'Subject', -'Attachment'=>'Attachment', -'Description'=>'Description', -'Time Start'=>'Time Start', -'Created Time'=>'Created Time', -'Modified Time'=>'Modified Time', - -'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', -'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', -'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', -'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', -'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', -'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', -'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', - -// Added for web mail post 4.0.1 release -'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', -//Added for 4.2 Release -- CustomView -'LBL_ALL'=>'All', -'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', -'LBL_WEBMAILS_TITLE'=>'WebMails', -'LBL_EMAILS_TITLE'=>'Emails', -'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', + +'ERR_DELETE_RECORD'=>"A record number must be specified to delete the vtiger_account.", +'LBL_DATE_SENT'=>'Date Sent:', +'LBL_SUBJECT'=>'Subject :', +'LBL_DATE_AND_TIME'=>'Date & Time Sent:', +'LBL_DATE'=>'Date :', +'LBL_TIME'=>'Time Sent:', +'LBL_BODY'=>'Body:', +'LBL_CONTACT_NAME'=>' Contact Name: ', +'LBL_EMAIL'=>'Email:', +'LBL_COLON'=>':', +'LBL_TO'=>'To :', +'LBL_CHK_MAIL'=>'Check Mail', +'LBL_COMPOSE'=>'Compose', +'LBL_SETTINGS'=>'Incmg. MailServer Settings', +'LBL_EMAIL_FOLDERS'=>'Email Folders', +'LBL_INBOX'=>'Inbox', +'LBL_SENT_MAILS'=>'Sent Mails', +'LBL_TRASH'=>'Trash', +'LBL_JUNK_MAILS'=>'Junk Mails', +'LBL_TO_LEADS'=>'To Leads', +'LBL_TO_CONTACTS'=>'To Contacts', +'LBL_TO_ACCOUNTS'=>'To Accounts', +'LBL_MY_MAILS'=>'My Mails', +'LBL_QUAL_CONTACT'=>'Qualified Mails (As Contacts)', +'LBL_MAILS'=>'Mails', +'LBL_QUALIFY_BUTTON'=>'Qualify', +'LBL_REPLY_BUTTON'=>'Reply', +'LBL_FORWARD_BUTTON'=>'Forward', +'LBL_DOWNLOAD_ATTCH_BUTTON'=>'Download Attachments', +'LBL_FROM'=>'From :', +'LBL_CC'=>'cc :', +'LBL_REPLY_TO_SENDER'=>'Reply to Sender', +'LBL_REPLY_ALL'=>'Reply All', +'LBL_SHOW_HIDDEN'=>'Show Hidden Mails', +'LBL_EXPUNGE_MAILBOX'=>'Trim Mailbox', + +'NTC_REMOVE_INVITEE'=>'Are you sure you want to remove this recipient from the email?', +'LBL_INVITEE'=>'Recipients', + +// Added Fields +// Contacts-SubPanelViewContactsAndUsers.php +'LBL_BULK_MAILS'=>'Bulk Mails', +'LBL_ATTACHMENT'=>'Attachment', +'LBL_UPLOAD'=>'Upload', +'LBL_FILE_NAME'=>'File Name', +'LBL_SEND'=>'Send', + +'LBL_EMAIL_TEMPLATES'=>'Email Templates', +'LBL_TEMPLATE_NAME'=>'Template Name', +'LBL_DESCRIPTION'=>'Description', +'LBL_EMAIL_TEMPLATES_LIST'=>'Email Templates List', +'LBL_EMAIL_INFORMATION'=>'Email Information', + + + + +//for v4 release added +'LBL_NEW_LEAD'=>'New Lead', +'LBL_LEAD_TITLE'=>'Leads', + +'LBL_NEW_PRODUCT'=>'New Product', +'LBL_PRODUCT_TITLE'=>'Products', +'LBL_NEW_CONTACT'=>'New Contact', +'LBL_CONTACT_TITLE'=>'Contacts', +'LBL_NEW_ACCOUNT'=>'New Account', +'LBL_ACCOUNT_TITLE'=>'Accounts', + +// Added vtiger_fields after vtiger4 - Beta +'LBL_USER_TITLE'=>'Users', +'LBL_NEW_USER'=>'New User', + +// Added for 4 GA +'LBL_TOOL_FORM_TITLE'=>'Email Tools', +//Added for 4GA +'Date & Time Sent'=>'Date & Time Sent', +'Sales Enity Module'=>'Sales Enity Module', +'Activtiy Type'=>'Activtiy Type', +'Related To'=>'Related To', +'Assigned To'=>'Assigned To', +'Subject'=>'Subject', +'Attachment'=>'Attachment', +'Description'=>'Description', +'Time Start'=>'Time Start', +'Created Time'=>'Created Time', +'Modified Time'=>'Modified Time', + +'MESSAGE_CHECK_MAIL_SERVER_NAME'=>'Please Check the Mail Server Name...', +'MESSAGE_CHECK_MAIL_ID'=>'Please Check the Email Id of "Assigned To" User...', +'MESSAGE_MAIL_HAS_SENT_TO_USERS'=>'Mail has been sent to the following User(s) :', +'MESSAGE_MAIL_HAS_SENT_TO_CONTACTS'=>'Mail has been sent to the following Contact(s) :', +'MESSAGE_MAIL_ID_IS_INCORRECT'=>'Mail Id is incorrect. Please Check this Mail Id...', +'MESSAGE_ADD_USER_OR_CONTACT'=>'Please Add any User(s) or Contact(s)...', +'MESSAGE_MAIL_SENT_SUCCESSFULLY'=>' Mail(s) sent successfully!', + +// Added for web mail post 4.0.1 release +'LBL_FETCH_WEBMAIL'=>'Fetch Web Mail', +//Added for 4.2 Release -- CustomView +'LBL_ALL'=>'All', +'MESSAGE_CONTACT_NOT_WANT_MAIL'=>'This Contact does not want to receive mails.', +'LBL_WEBMAILS_TITLE'=>'WebMails', +'LBL_EMAILS_TITLE'=>'Emails', +'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', // Added for 5.0.3 release 'IN_REPLY_TO_THE_MESSAGE' => 'In reply to the message sent by ', 'LBL_NO_EMAILS'=>'No Emails In This Folder', @@ -144,7 +144,8 @@ 'LABEL_DATE'=>'Date', 'LBL_NO_IFRAMES_SUPPORTED'=>'No Iframes supported', 'LBL_EMAIL_ATTACHMENTS'=>'Email Attachments:', - - -); -?> +'LBL_ALLMAILS'=>'All Mails', +'LBL_TO_USERS'=>'TO Users', +'LBL_TO_GROUPS'=>'To Groups', +); +?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 11:36:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 15:36:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10447 - in /vtigercrm/branches/5.0.3/modules/Reports: ReportRun.php Reports.php language/en_us.lang.php Message-ID: <20070315153649.F03367C8059@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 09:36:43 2007 New Revision: 10447 Log: Ticket id added in reports Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php vtigercrm/branches/5.0.3/modules/Reports/Reports.php vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Thu Mar 15 09:36:43 2007 @@ -153,6 +153,9 @@ { $access_fields[] = $collistrow["fieldname"]; } + //added to include ticketid for Reports module in select columnlist for all users + if($module == "HelpDesk") + $access_fields[] = "ticketid"; return $access_fields; } Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Thu Mar 15 09:36:43 2007 @@ -325,6 +325,12 @@ { $module_columnlist['vtiger_activity:activitytype:Calendar_Activity_Type:activitytype:C'] = 'Activity Type'; } + + if($module == 'HelpDesk' && $block == 25) + { + $module_columnlist['vtiger_crmentity:crmid:HelpDesk_Ticket_ID:ticketid:I'] = 'Ticket ID'; + } + $result = $adb->query($sql); $noofrows = $adb->num_rows($result); @@ -899,7 +905,7 @@ $mod_strings = return_module_language($current_language,$module); $fieldlabel = trim(str_replace($module," ",$selectedfields[2])); $fieldlabel = trim(str_replace("_"," ",$fieldlabel)); - if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields)) + if(sizeof($permitted_fields) != 0 && !in_array($fieldname,$permitted_fields) && $fieldname != 'ticketid') { if(isset($mod_strings[$fieldlabel])) { Modified: vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/language/en_us.lang.php Thu Mar 15 09:36:43 2007 @@ -203,6 +203,8 @@ 'MIN'=>'MIN', 'LBL_CUSTOM_REPORTS'=>'Custom Reports', +'ticketid'=>'Ticket Id', + ) ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 11:43:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 15:43:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10448 - /thunderbirdextn/trunk/install.rdf Message-ID: <20070315154304.21C2E78CDC9@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 09:42:56 2007 New Revision: 10448 Log: version changed Modified: thunderbirdextn/trunk/install.rdf Modified: thunderbirdextn/trunk/install.rdf ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 15 11:45:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 15 Mar 2007 15:45:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10449 - in /wordintegration/trunk/client/bin/Language: deutsch.ini english.ini finnish.ini french.ini german.ini portuguese.ini Message-ID: <20070315154553.D732B78BB25@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 09:45:41 2007 New Revision: 10449 Log: version and copyright info changed Modified: wordintegration/trunk/client/bin/Language/deutsch.ini wordintegration/trunk/client/bin/Language/english.ini wordintegration/trunk/client/bin/Language/finnish.ini wordintegration/trunk/client/bin/Language/french.ini wordintegration/trunk/client/bin/Language/german.ini wordintegration/trunk/client/bin/Language/portuguese.ini Modified: wordintegration/trunk/client/bin/Language/deutsch.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/deutsch.ini (original) +++ wordintegration/trunk/client/bin/Language/deutsch.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=Deutsch [vtigerCRM_frmAbout] FormName=?ber -Label2=Copyright ? 2003-2007 vtiger.com. Alle Rechte vorbehalten. +Label2=Copyright ? 2004-2007 vtiger.com. Alle Rechte vorbehalten. Label3= Button1=OK Modified: wordintegration/trunk/client/bin/Language/english.ini ============================================================================== Binary files - no diff available. Modified: wordintegration/trunk/client/bin/Language/finnish.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/finnish.ini (original) +++ wordintegration/trunk/client/bin/Language/finnish.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=Finnish [vtigerCRM_frmAbout] FormName=About -Label2=Copyright ? 2003-2007 vtiger.com. All rights reserverd. +Label2=Copyright ? 2004-2007 vtiger.com. All rights reserverd. Label3= Button1=Hyv?ksy Modified: wordintegration/trunk/client/bin/Language/french.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/french.ini (original) +++ wordintegration/trunk/client/bin/Language/french.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=French [vtigerCRM_frmAbout] FormName=A propos -Label2=Copyright ? 2003-2007 vtiger.com. Tous droits r?serv?s. +Label2=Copyright ? 2004-2007 vtiger.com. Tous droits r?serv?s. Label3=French by Abos : contact at abonlinesolutions.com Button1=OK Modified: wordintegration/trunk/client/bin/Language/german.ini ============================================================================== Binary files - no diff available. Modified: wordintegration/trunk/client/bin/Language/portuguese.ini ============================================================================== --- wordintegration/trunk/client/bin/Language/portuguese.ini (original) +++ wordintegration/trunk/client/bin/Language/portuguese.ini Thu Mar 15 09:45:41 2007 @@ -1,13 +1,13 @@ [vtigerCRM_Common] CompanyName=vtiger.com ProductName=vtiger Office Plug-in -ProductVersion=5.0.3-rc2 +ProductVersion=5.0.3 ProductSite=www.vtiger.com ProductLanguage=Portugu?s [vtigerCRM_frmAbout] FormName=Sobre -Label2=Copyright ? 2003-2007 vtiger.com. Todos os direitos reservados. +Label2=Copyright ? 2004-2007 vtiger.com. Todos os direitos reservados. Label3= Button1=OK From isthian at gonzocom.com Thu Mar 15 23:18:16 2007 From: isthian at gonzocom.com (Devilishly H. Storeroom) Date: Fri, 16 Mar 2007 03:18:16 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2264093656.20070316031816@gonzocom.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/a3394f43/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Slavic.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/a3394f43/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 01:51:35 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 05:51:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10450 - /vtigercrm/branches/5.0.3/SendReminder.php Message-ID: <20070316055135.E04F87C8069@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 15 23:51:31 2007 New Revision: 10450 Log: changes made to get application strings. --Minnie Modified: vtigercrm/branches/5.0.3/SendReminder.php Modified: vtigercrm/branches/5.0.3/SendReminder.php ============================================================================== --- vtigercrm/branches/5.0.3/SendReminder.php (original) +++ vtigercrm/branches/5.0.3/SendReminder.php Thu Mar 15 23:51:31 2007 @@ -28,10 +28,13 @@ // Get the list of activity for which reminder needs to be sent -global $adb,$app_strings; +global $adb; global $log; $log =& LoggerManager::getLogger('SendReminder'); $log->debug(" invoked SendReminder "); + +// retrieve the translated strings. +$app_strings = return_application_language($current_language); //modified query for recurring events -Jag $query="select vtiger_crmentity.crmid,vtiger_seactivityrel.crmid as setype,vtiger_activity.*,vtiger_activity_reminder.reminder_time,vtiger_activity_reminder.reminder_sent,vtiger_activity_reminder.recurringid,vtiger_recurringevents.recurringdate from vtiger_activity inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_activity_reminder on vtiger_activity.activityid=vtiger_activity_reminder.activity_id left outer join vtiger_recurringevents on vtiger_activity.activityid=vtiger_recurringevents.activityid left outer join vtiger_seactivityrel on vtiger_seactivityrel.activityid = vtiger_activity.activityid where DATE_FORMAT(vtiger_activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' and vtiger_crmentity.crmid != 0 and vtiger_activity.eventstatus = 'Planned' and vtiger_activity_reminder.reminder_sent = 0 group by vtiger_activity.activityid,vtiger_recurringevents.recurringid"; From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 02:09:28 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 06:09:28 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10451 - /vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Message-ID: <20070316060928.2813C78C392@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 00:09:21 2007 New Revision: 10451 Log: fix for Quote - Decimals for taxes are out of the table, amount history. Fixes #3209 --Minnie Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php ============================================================================== --- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original) +++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Fri Mar 16 00:09:21 2007 @@ -124,10 +124,15 @@ $lineData=array("105",$bottom+49,"94"); $pdf->drawLine($lineData); - $data= $app_strings['LBL_TAX'].": ($group_total_tax_percent %) ".$price_salestax.""; + $data= $app_strings['LBL_TAX'].": ($group_total_tax_percent %)";// ".$price_salestax.""; $pdf->SetXY( 105 , ($nettotal_y+(2*$next_y)) ); $pdf->SetFont( "Helvetica", "", 10); $pdf->MultiCell(110, 4, $data); + + //Added for value field alignment + $pdf->SetXY( $space[strlen($price_salestax)] , ($nettotal_y+(2*$next_y)) ); + $pdf->SetFont( "Helvetica", "", 10); + $pdf->MultiCell(110, 4, $price_salestax); $lineData=array("105",$bottom+55,"94"); $pdf->drawLine($lineData); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 02:44:50 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 06:44:50 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10452 - in /vtigercrm/branches/5.0.3/Smarty/templates: ActivityDetailView.tpl ActivityEditView.tpl Message-ID: <20070316064450.A725878C392@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 00:44:14 2007 New Revision: 10452 Log: changes made for location field of event. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityDetailView.tpl Fri Mar 16 00:44:14 2007 @@ -128,10 +128,6 @@ {$MOD.LBL_EVENTNAME} {$ACTIVITYDATA.subject} - - {$MOD.LBL_APP_LOCATION} - {$ACTIVITYDATA.location} - {if $LABEL.description neq ''} @@ -139,6 +135,12 @@ {$ACTIVITYDATA.description} {/if} + {if $LABEL.location neq ''} + + {$LABEL.location} + {$ACTIVITYDATA.location} + + {/if} {if $LABEL.eventstatus neq ''} {$LABEL.eventstatus} Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Fri Mar 16 00:44:14 2007 @@ -147,13 +147,12 @@ {/if} + {if $LABEL.location neq ''} {$MOD.LBL_APP_LOCATION} - - - + {/if} From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 03:40:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 07:40:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10453 - /vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Message-ID: <20070316074038.F226C7C4FE8@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 01:40:34 2007 New Revision: 10453 Log: changes made to display Related to label in Notes detailview. --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DetailViewUtils.php Fri Mar 16 01:40:34 2007 @@ -558,6 +558,11 @@ $invoicename= $adb->query_result($result,0,"subject"); $label_fld[] =''.$invoicename.''; + } + elseif($parent_module == "HelpDesk") + { + $label_fld[] = $mod_strings[$fieldlabel]; + $label_fld[] = ''; } } else From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 04:04:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 08:04:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10454 - /vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Message-ID: <20070316080404.55D2378C78E@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 02:03:59 2007 New Revision: 10454 Log: labels added for java script alerts. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Fri Mar 16 02:03:59 2007 @@ -77,7 +77,18 @@ 'LBL_CANCEL_BUTTON'=>'Cancel', 'LBL_UPGRADE_FROM_VTIGER_5X'=>'Upgrade database from vtiger CRM 5.x to next version', 'LBL_PATCH_OR_MIGRATION'=>'you must specify the source database version (Patch update or Migration)', - +//Added for java script alerts +'ENTER_SOURCE_HOST' => 'Please enter the Source Host Name', +'ENTER_SOURCE_MYSQL_PORT' => 'Please enter the Source MySql Port Number', +'ENTER_SOURCE_MYSQL_USER' => 'Please enter the Source MySql User Name', +'ENTER_SOURCE_DATABASE' => 'Please enter the Source Database Name', +'ENTER_SOURCE_MYSQL_DUMP' => 'Please enter the Valid MySQL Dump File', +'ENTER_HOST' => 'Please enter the Host Name', +'ENTER_MYSQL_PORT' => 'Please enter the MySql Port Number', +'ENTER_MYSQL_USER' => 'Please enter the MySql User Name', +'ENTER_DATABASE' => 'Please enter the Database Name', +'SELECT_ANYONE_OPTION' => 'Please select any one option', +'ENTER_CORRECT_MYSQL_PATH' => 'Please enter the Correct MySQL Path', ); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 04:04:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 08:04:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10455 - /vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl Message-ID: <20070316080448.655867C4FE8@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 02:04:43 2007 New Revision: 10455 Log: labels added for java script alerts. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/MigrationStep1.tpl Fri Mar 16 02:04:43 2007 @@ -291,22 +291,22 @@ //check whether the user entered the valid Source MySQL database details when db details selected if(trim(formname.old_host_name.value) == '') {ldelim} - error_msg = "Please enter the Source Host Name"; + error_msg = "{$MOD.ENTER_SOURCE_HOST}"; error = true; {rdelim} else if(trim(formname.old_port_no.value) == '') {ldelim} - error_msg = "Please enter the Source MySql Port Number"; + error_msg = "{$MOD.ENTER_SOURCE_MYSQL_PORT}"; error = true; {rdelim} else if(trim(formname.old_mysql_username.value) == '') {ldelim} - error_msg = "Please enter the Source MySql User Name"; + error_msg = "{$MOD.ENTER_SOURCE_MYSQL_USER}"; error = true; {rdelim} else if(trim(formname.old_dbname.value) == '') {ldelim} - error_msg = "Please enter the Source Database Name"; + error_msg = "{$MOD.ENTER_SOURCE_DATABASE}"; error = true; {rdelim} {rdelim} @@ -316,7 +316,7 @@ //check whether the user entered the MySQL File when dump file details selected if(trim(formname.old_dump_filename.value) == '') {ldelim} - error_msg = "Please enter the Valid MySQL Dump File"; + error_msg = "{$MOD.ENTER_SOURCE_MYSQL_DUMP}"; error = true; {rdelim} {rdelim} @@ -326,29 +326,29 @@ //check whether the user entered the valid Source MySQL database details when db details selected if(trim(formname.alter_old_host_name.value) == '') {ldelim} - error_msg = "Please enter the Host Name"; + error_msg = "{$MOD.ENTER_HOST}"; error = true; {rdelim} else if(trim(formname.alter_old_port_no.value) == '') {ldelim} - error_msg = "Please enter the MySql Port Number"; + error_msg = "{$MOD.ENTER_MYSQL_PORT}"; error = true; {rdelim} else if(trim(formname.alter_old_mysql_username.value) == '') {ldelim} - error_msg = "Please enter the MySql User Name"; + error_msg = "{$MOD.ENTER_MYSQL_USER}"; error = true; {rdelim} else if(trim(formname.alter_old_dbname.value) == '') {ldelim} - error_msg = "Please enter the Database Name"; + error_msg = "{$MOD.ENTER_DATABASE}"; error = true; {rdelim} {rdelim} else {ldelim} formname.migration_option.value = ''; - error_msg = "Please select any one option"; + error_msg = "{$MOD.SELECT_ANYONE_OPTION}"; error = true; {rdelim} @@ -358,7 +358,7 @@ if(document.getElementById("getmysqlpath").value == 1 && trim(formname.server_mysql_path.value) == '' && document.getElementById("alter_db_details").checked != true) {ldelim} //alert(document.getElementById("getmysqlpath").value+" Enter the mysql path"); - error_msg = "Please enter the Correct MySQL Path"; + error_msg = "{$MOD.ENTER_CORRECT_MYSQL_PATH}"; error = true; {rdelim} else From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 05:28:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 09:28:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10456 - in /vtigercrm/branches/5.0.3: Smarty/templates/Header.tpl include/RelatedListView.php include/utils/ListViewUtils.php modules/Settings/language/en_us.lang.php modules/Settings/listwordtemplates.php Message-ID: <20070316092850.1ABE57C8060@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 16 03:28:32 2007 New Revision: 10456 Log: changes made for java script alerts. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/include/RelatedListView.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Settings/listwordtemplates.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Fri Mar 16 03:28:32 2007 @@ -548,6 +548,7 @@ VALID_DISCOUNT_PERCENT:'{$APP.VALID_DISCOUNT_PERCENT}', VALID_DISCOUNT_AMOUNT:'{$APP.VALID_DISCOUNT_AMOUNT}', SELECT_TEMPLATE_TO_MERGE:'{$APP.SELECT_TEMPLATE_TO_MERGE}', + SELECTED_MORE_THAN_ONCE:'{$APP.SELECTED_MORE_THAN_ONCE}', YES:'{$APP.yes}', NO:'{$APP.no}', {rdelim}; Modified: vtigercrm/branches/5.0.3/include/RelatedListView.php ============================================================================== --- vtigercrm/branches/5.0.3/include/RelatedListView.php (original) +++ vtigercrm/branches/5.0.3/include/RelatedListView.php Fri Mar 16 03:28:32 2007 @@ -244,7 +244,7 @@ $list = ''; - + */ $list_block[$entity_id] = $list_header; } @@ -998,12 +998,13 @@ function getValue($field_result, $list_result,$fieldname,$focus,$module,$entity_id,$list_result_count,$mode,$popuptype,$returnset='',$viewid='') { - global $log; + global $log,$app_strings; $log->debug("Entering getValue(".$field_result.",". $list_result.",".$fieldname.",".$focus.",".$module.",".$entity_id.",".$list_result_count.",".$mode.",".$popuptype.",".$returnset.",".$viewid.") method ..."); global $adb,$current_user; require('user_privileges/user_privileges_'.$current_user->id.'.php'); $tabname = getParentTab(); + $tabid = getTabid($module); $uicolarr=$field_result[$fieldname]; foreach($uicolarr as $key=>$value) { @@ -1016,15 +1017,32 @@ $colname="activitystatus"; } //Ends - $temp_val = $adb->query_result($list_result,$list_result_count,$colname); + $field_val = $adb->query_result($list_result,$list_result_count,$colname); - if(strlen($temp_val) > 40) + if(strlen($field_val) > 40) { - $temp_val = substr($temp_val,0,40).'...'; + $temp_val = substr($field_val,0,40).'...'; } - if($uitype == 52 || $uitype == 53 || $uitype == 77) + else + { + $temp_val = $field_val; + } + if($uitype == 53) { $value = $adb->query_result($list_result,$list_result_count,'user_name'); + } + elseif($uitype == 52) + { + $value = getUserName($adb->query_result($list_result,$list_result_count,'handler')); + } + elseif($uitype == 77) + { + $value = getUserName($adb->query_result($list_result,$list_result_count,'inventorymanager')); + } + elseif($uitype == 15 && $module == 'Calendar') + { + $activitytype = $adb->query_result($list_result,$list_result_count,$colname); + $value = $app_strings[$activitytype]; } elseif($uitype == 5 || $uitype == 6 || $uitype == 23 || $uitype == 70) { @@ -1072,14 +1090,14 @@ } elseif($uitype == 17) { - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } elseif($uitype == 13 || $uitype == 104) { if(useInternalMailer() == 1) $value = ''.$temp_val.''; else - $value = ''.$temp_val.''; + $value = ''.$temp_val.''; } elseif($uitype == 56) { @@ -1340,7 +1358,7 @@ { if($mode == "search") { - if($popuptype == "specific") + if($popuptype == "specific" || $popuptype=="toDospecific") { // Added for get the first name of contact in Popup window if($colname == "lastname" && $module == 'Contacts') @@ -1553,7 +1571,7 @@ $result = $adb->query($query); $contact_image = ''; $imagename=$adb->query_result($result,0,'imagename'); - if($imagename != '') + if($imagename != '') { $imgpath = "test/contact/".$imagename; $contact_image=''; From extremers at grabandt.com Fri Mar 16 13:16:49 2007 From: extremers at grabandt.com (Misalignment U. Heretofore) Date: Fri, 16 Mar 2007 17:16:49 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1616509471.20070316171649@grabandt.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/affcdfcf/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: tawdriness.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070316/affcdfcf/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 16 13:42:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 16 Mar 2007 17:42:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10463 - /vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Message-ID: <20070316174203.E9A4B7C8091@vtiger.fosslabs.com> Author: jerrydgeorge Date: Fri Mar 16 11:41:56 2007 New Revision: 10463 Log: version and copyright year changed --bharath Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm Modified: vtigercrmoutlook/trunk/vtigercrmoladdin/source/frmAbout.frm ============================================================================== Binary files - no diff available. From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 04:04:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 08:04:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10464 - in /vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ include/language/ include/utils/ install/ Message-ID: <20070317080421.5FCE47C808C@vtiger.fosslabs.com> Author: saraj Date: Sat Mar 17 02:04:01 2007 New Revision: 10464 Log: changes made for alert message. --Minnie Added: vtigercrm/branches/5.0.3/Smarty/templates/JsArray.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl vtigercrm/branches/5.0.3/include/js/ajax.js vtigercrm/branches/5.0.3/include/js/dtlviewajax.js vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/include/utils/export.php vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Sat Mar 17 02:04:01 2007 @@ -463,96 +463,9 @@ {$trackelements.item_summary}   {/foreach} - + +{include file=JsArray.tpl} +{include file=JsArray.tpl} Modified: vtigercrm/branches/5.0.3/include/js/ajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/ajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/ajax.js Sat Mar 17 02:04:01 2007 @@ -81,7 +81,7 @@ var response = me.callback(me.requester); break; default: - alert(alert_arr.ERROR); + alert("Error"); break; } } Modified: vtigercrm/branches/5.0.3/include/js/dtlviewajax.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/dtlviewajax.js (original) +++ vtigercrm/branches/5.0.3/include/js/dtlviewajax.js Sat Mar 17 02:04:01 2007 @@ -197,7 +197,7 @@ var port_obj = getObj('portal').checked; if(fieldName == "email" && tagValue == '' && port_obj == true) { - alert('Portal user should provide email id for portal login'); + alert(alert_arr.PORTAL_PROVIDE_EMAILID); return false; } } @@ -279,7 +279,7 @@ var obj = getObj("email"); if((fieldName == "portal") && (obj.value == '')) { - alert("Portal user should provide email Id for portal login"); + alert(alert_arr.PORTAL_PROVIDE_EMAILID); return false; } Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Sat Mar 17 02:04:01 2007 @@ -810,6 +810,8 @@ 'DATABASE_CHANGE_CONFIRMATION' => 'Are you sure to apply the Database Changes from ', 'TO' => ' to ', 'DELETE_RSSFEED_CONFIRMATION' => 'Are you sure to delete the rss feed?', +'NOT_PERMITTED_TO_EXPORT' => 'you are not permitted to export!', + //Added for 5.0.3 'MSG_DEAR'=>'Dear', 'MSG_REGARDING'=>'Regarding', Modified: vtigercrm/branches/5.0.3/include/utils/export.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/export.php (original) +++ vtigercrm/branches/5.0.3/include/utils/export.php Sat Mar 17 02:04:01 2007 @@ -32,7 +32,7 @@ require_once('modules/Products/Products.php'); require_once('include/utils/UserInfoUtil.php'); -global $allow_exports; +global $allow_exports,$app_strings; session_start(); @@ -60,7 +60,7 @@ ?> Author: saraj Date: Sat Mar 17 03:04:23 2007 New Revision: 10465 Log: display of product name changed Modified: vtigercrm/branches/5.0.3/install/0welcome.php vtigercrm/branches/5.0.3/install/1checkSystem.php Modified: vtigercrm/branches/5.0.3/install/0welcome.php ============================================================================== --- vtigercrm/branches/5.0.3/install/0welcome.php (original) +++ vtigercrm/branches/5.0.3/install/0welcome.php Sat Mar 17 03:04:23 2007 @@ -97,12 +97,12 @@ Modified: vtigercrm/branches/5.0.3/install/1checkSystem.php ============================================================================== --- vtigercrm/branches/5.0.3/install/1checkSystem.php (original) +++ vtigercrm/branches/5.0.3/install/1checkSystem.php Sat Mar 17 03:04:23 2007 @@ -334,7 +334,7 @@ - + From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 05:35:53 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 09:35:53 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10466 - /vtigercrm/branches/5.0.3/install/4createConfigFile.php Message-ID: <20070317093553.615CD7C7FB4@vtiger.fosslabs.com> Author: richie Date: Sat Mar 17 03:35:47 2007 New Revision: 10466 Log: added link to forums Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Sat Mar 17 03:35:47 2007 @@ -235,7 +235,7 @@

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



    - The installation will take at least 4 minutes. Grab a coffee,sit back and relax...
    + The installation will take at least 4 minutes. Grab a coffee,sit back and relax or browse through our forums


    From lykim at great2day.com Sat Mar 17 05:43:02 2007 From: lykim at great2day.com (Workman H. Fleshes) Date: Sat, 17 Mar 2007 09:43:02 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6853483197.20070317094302@great2day.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070317/6f2664eb/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: lessens.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070317/6f2664eb/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 07:19:00 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 11:19:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10467 - /vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Message-ID: <20070317111900.667D67C808A@vtiger.fosslabs.com> Author: richie Date: Sat Mar 17 05:18:09 2007 New Revision: 10467 Log: fixes #3216 Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Sat Mar 17 05:18:09 2007 @@ -50,6 +50,7 @@ if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); + imap_mail_move($MailBox->mbox,$mailid,"Trash"); $email = new Webmails($MailBox->mbox,$mailid); $email->delete(); imap_close($MailBox->mbox); @@ -61,9 +62,10 @@ $MailBox = new MailBox($mailbox); $tlist = explode(":",$mailid); foreach($tlist as $id) { + imap_mail_move($MailBox->mbox,$id,"Trash"); $adb->println("DELETE MULTI MESSAGE $id"); $email = new Webmails($MailBox->mbox,$id); - $email->delete(); + $email->delete(); } imap_close($MailBox->mbox); echo $mailid; From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 07:20:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 11:20:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10468 - /vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Message-ID: <20070317112027.C1D087C808A@vtiger.fosslabs.com> Author: saraj Date: Sat Mar 17 05:20:00 2007 New Revision: 10468 Log: picklist value not displayed Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl Sat Mar 17 05:20:00 2007 @@ -37,7 +37,7 @@ {elseif $keyid eq '15' || $keyid eq '16' || $keyid eq '111'} - {elseif $keyid eq '156'} {if $smarty.request.record neq $CURRENT_USERID && $keyadmin eq 1} -
    -

           This Configuration Wizard will create the requisite data needed to get working with vtiger. The entire process should take about four minutes. Click the Start button when you are ready. +

           This Configuration Wizard will create the requisite data needed to get working with vtiger CRM. The entire process should take about four minutes. Click the Start button when you are ready.

    - vtiger CRM 5.0.3 is tested on mySQL 4.1.X, mySQL 5.0.19, PHP 5.0.19 and Apache 2.0.40.

    vtiger CRM 5.0.3 will not work on mysql 4.0.x versions and PHP 5.2.x versions

    -vtiger crm can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements
    +vtiger CRM can run on a system which has xampp/lampp/wampp already installed in it provided it meets the above mentioned requirements

    The installation wizard will guide you with the installation regardless of the setup you may have.

    Max Execution Time 600
    output_buffering= On
    Change the memory limit = 32M
    error_reporting = E_WARNING & ~E_NOTICE
    error_reporting = E_ALL & ~E_NOTICE
    allow_call_time_reference = On
    log_errors = Off
    short_open_tag= On
     {$APP.$keyval} +  {if $APP.$keyval!=''}{$APP.$keyval}{elseif $MOD.$keyval!=''}{$MOD.$keyval}{else}{$keyval}{/if}  {$APP.$keyval}  +  {if $APP.$keyval!=''}{$APP.$keyval}{elseif $MOD.$keyval!=''}{$MOD.$keyval}{else}{$keyval}{/if} 
    -{include file=JsArray.tpl} + -{include file=JsArray.tpl} + Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Sat Mar 17 06:36:39 2007 @@ -11,6 +11,7 @@ //Utility Functions var gValidationCall=''; +document.write(''); if (document.all) From vtigercrm-commits at vtiger.fosslabs.com Sat Mar 17 10:33:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Sat, 17 Mar 2007 14:33:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10474 - /vtigercrm/branches/5.0.3/modules/Emails/EditView.php Message-ID: <20070317143347.325477C80B2@vtiger.fosslabs.com> Author: richie Date: Sat Mar 17 08:33:41 2007 New Revision: 10474 Log: handles the multiple CCs case Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Sat Mar 17 08:33:41 2007 @@ -120,6 +120,11 @@ } +//Added to set the cc when click reply all +if(isset($_REQUEST['msg_cc']) && $_REQUEST['msg_cc'] != '') +{ + $smarty->assign("MAIL_MSG_CC", $_REQUEST['msg_cc']); +} // Webmails if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != "") { @@ -138,19 +143,20 @@ $webmail = new Webmails($mbox,$mailid); $webmail->loadMail(); - + $hdr = @imap_headerinfo($mbox, $mailid); $smarty->assign('WEBMAIL',"true"); if($_REQUEST["reply"] == "all") { $smarty->assign('TO_MAIL',$webmail->fromaddr); - if(is_array($webmail->cc_list)) + $smarty->assign('CC_MAIL',$hdr->ccaddress); + /*if(is_array($webmail->cc_list)) { $smarty->assign('CC_MAIL',implode(",",$webmail->cc_list).",".implode(",",$webmail->to)); } else { - //to fix #3231 + //Commenting this to fix #3231 // $smarty->assign('CC_MAIL',implode(",",$webmail->to)); - } + }*/ if(preg_match("/RE:/i", $webmail->subject)) $smarty->assign('SUBJECT',$webmail->subject); else @@ -165,7 +171,6 @@ $smarty->assign('SUBJECT',"RE: ".$webmail->subject); } elseif($_REQUEST["forward"] == "true" ) { - //commenting it out to fix #3232 //$smarty->assign('TO_MAIL',$webmail->reply_to[0]); //$smarty->assign('BCC_MAIL',$webmail->to[0]); if(preg_match("/FW:/i", $webmail->subject)) @@ -227,12 +232,6 @@ if (isset($focus->name)) $smarty->assign("NAME", $focus->name); else $smarty->assign("NAME", ""); - -//Added to set the cc when click reply all -if(isset($_REQUEST['msg_cc']) && $_REQUEST['msg_cc'] != '') -{ - $smarty->assign("MAIL_MSG_CC", $_REQUEST['msg_cc']); -} if($focus->mode == 'edit') { From istalkyall at graphicartscenter.net Sat Mar 17 21:22:07 2007 From: istalkyall at graphicartscenter.net (Prefigured O. Foray) Date: Sun, 18 Mar 2007 01:22:07 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4285927201.20070318012207@graphicartscenter.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070318/ebbac718/attachment-0002.html -------------- next part -------------- A non-text attachment was scrubbed... Name: soir.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070318/ebbac718/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 01:57:13 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 05:57:13 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10475 - in /vtigercrm/branches/5.0.3/modules/Calendar: CalendarCommon.php Save.php TodoSave.php language/en_us.lang.php Message-ID: <20070319055714.23F0A78CA63@vtiger.fosslabs.com> Author: saraj Date: Sun Mar 18 23:57:03 2007 New Revision: 10475 Log: event notification and invitation mail has been changed. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php vtigercrm/branches/5.0.3/modules/Calendar/Save.php vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Sun Mar 18 23:57:03 2007 @@ -305,24 +305,43 @@ $log->debug("Entering getActivityDetails(".$description.") method ..."); $reply = (($description['mode'] == 'edit')?'updated':'created'); + if($description['activity_mode'] == "Events") + { + $end_date_lable=$mod_strings['End date and time']; + } + else + { + $end_date_lable=$mod_strings['End date']; + } if($inviteeid=='') - $name = getUserName($description['user_id']); + { + $name = getUserName($description['user_id']); + $msg = $mod_strings['LBL_ACTIVITY_NOTIFICATION']; + } else - $name = getUserName($inviteeid); + { + $name = getUserName($inviteeid); + $msg = $mod_strings['LBL_ACTIVITY_INVITATION']; + } $current_username = getUserName($current_user->id); $status = $description['status']; $list = $name.','; - $list .= '

    '.$mod_strings['LBL_ACTIVITY_STRING'].' '.$reply.'.
    '.$mod_strings['LBL_DETAILS_STRING'].':
    '; + $list .= '

    '.$msg.' '.$reply.'.
    '.$mod_strings['LBL_DETAILS_STRING'].':
    '; $list .= '
          '.$mod_strings["LBL_SUBJECT"].' '.$description['subject']; + $list .= '
          '.$mod_strings["Start date and time"].' : '.$description['st_date_time']; + $list .= '
          '.$end_date_lable.' : '.$description['end_date_time']; $list .= '
          '.$mod_strings["LBL_STATUS"].': '.$status; $list .= '
          '.$mod_strings["Priority"].': '.$description['taskpriority']; - $list .= '
          '.$mod_strings["Related To"].' : '.$description['relatedto']; + $list .= '
          '.$mod_strings["Related To"].': '.$description['relatedto']; if($description['activity_mode'] != 'Events') { $list .= '
          '.$mod_strings["LBL_CONTACT"].' '.$description['contact_name']; } + else + $list .= '
          '.$mod_strings["Location"].' : '.$description['location']; + $list .= '
          '.$mod_strings["LBL_APP_DESCRIPTION"].': '.$description['description']; $list .= '

    '.$mod_strings["LBL_REGARDS_STRING"].' ,'; $list .= '
    '.$current_username.'.'; @@ -422,7 +441,11 @@ $send_notification = $adb->query_result($ary_res,0,"sendnotification"); $subject = $adb->query_result($ary_res,0,"subject"); $priority = $adb->query_result($ary_res,0,"priority"); - //$parent_name = $adb->query_result($ary_res,0,"priority"); + $st_date = $adb->query_result($ary_res,0,"date_start"); + $st_time = $adb->query_result($ary_res,0,"time_start"); + $end_date = $adb->query_result($ary_res,0,"due_date"); + $end_time = $adb->query_result($ary_res,0,"time_end"); + $location = $adb->query_result($ary_res,0,"location"); $usr_qry = "select smownerid from vtiger_crmentity where crmid=".$return_id; $res = $adb->query($usr_qry); @@ -468,6 +491,9 @@ $mail_data['description'] = $description; $mail_data['assingn_type'] = $assignType; $mail_data['group_name'] = $grp_name; + $mail_data['st_date_time']=$st_date." ".$st_time; + $mail_data['end_date_time']=$end_date." ".$end_time; + $mail_data['location']=$location; return $mail_data; Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Sun Mar 18 23:57:03 2007 @@ -168,6 +168,9 @@ $mail_data['assingn_type'] = $_REQUEST['assigntype']; $mail_data['group_name'] = $_REQUEST['assigned_group_name']; $mail_data['mode'] = $_REQUEST['mode']; + $mail_data['st_date_time'] = $_REQUEST['date_start']." ".$_REQUEST['time_start']; + $mail_data['end_date_time']=$_REQUEST['due_date']." ".$_REQUEST['time_end']; + $mail_data['location']=$_REQUEST['location']; return $mail_data; } //Added code to send mail to the assigned to user about the details of the vtiger_activity if sendnotification = on and assigned to user Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Sun Mar 18 23:57:03 2007 @@ -67,6 +67,8 @@ $mail_data['assingn_type'] = $_REQUEST['task_assigntype']; $mail_data['group_name'] = $_REQUEST['task_assigned_group_name']; $mail_data['mode'] = $_REQUEST['task_mode']; + $mail_data['st_date_time'] = $_REQUEST['task_date_start']." ".$_REQUEST['task_time_start']; + $mail_data['end_date_time']=$_REQUEST['task_due_date']; return $mail_data; } Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Sun Mar 18 23:57:03 2007 @@ -257,7 +257,8 @@ 'LBL_CALENDAR_INFORMATION'=>'Calendar Information', 'LBL_NAME'=>'Subject:', -'LBL_ACTIVITY_STRING'=>'This is a notification that an activity you have been invited to has been', +'LBL_ACTIVITY_NOTIFICATION'=>'This is a notification that an activity is assigned to you that has been', +'LBL_ACTIVITY_INVITATION'=>'You have been invited for an activity that has been ', 'LBL_DETAILS_STRING'=>'The details are', 'LBL_REGARDS_STRING'=>'Thanks & Regards', 'LBL_CONTACT_NAME'=>'Contact Name', @@ -403,6 +404,14 @@ 'Call'=>'Call', 'Meeting'=>'Meeting', +//added to send dates and time in calendar notification/invitation mail. + +'Start date and time'=>'Start Date & Time', +'End date and time'=>'End Date & Time', +//this is for task +'End date'=>'End date', + + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 02:18:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 06:18:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10476 - in /vtigercrm/branches/5.0.3: Smarty/templates/Webmails.tpl modules/Webmails/language/en_us.lang.php Message-ID: <20070319061803.29CC07C808A@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 00:17:54 2007 New Revision: 10476 Log: fix for i18n issue in Add Folder option. --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Mon Mar 19 00:17:54 2007 @@ -54,7 +54,7 @@ ","","","",""); $listview_entries = array(); @@ -283,40 +291,59 @@ $listview_entries[0][] = ''; else { -if(isset($_REQUEST["search"])) { - $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; - //echo $searchstring."
    "; - $searchlist = imap_search($MailBox->mbox,$searchstring); - if(is_array($searchlist)) + if(isset($_REQUEST["search"]) && trim($_REQUEST["search_input"]) != '') { + $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; + //echo $searchstring."
    "; + $searchlist = Array(); + $searchlist = imap_search($MailBox->mbox,$searchstring); + + if(is_array($searchlist)) + { + $num_searches = count($searchlist); + $c=$numEmails; + } + + while ($i<=$c) { + if(is_array($searchlist)) { + for($l=0;$l<$num_searches;$l++) { + if($mails[$start_message]->msgno == $searchlist[$l]) + $listview_entries[] = show_msg($mails,$start_message); + } + } + $i++; + $start_message--; + } + }else { - $num_searches = count($searchlist); - $c=$numEmails; - } -} - -flush(); -// MAIN LOOP -// Main loop to create listview entries - -$i=1; -while ($i<=$c) { - if(is_array($searchlist)) { - for($l=0;$l<$num_searches;$l++) { - if($mails[$start_message]->msgno == $searchlist[$l]) + $i=1; + while ($i<=$c) { + if($start_message > 0) + { $listview_entries[] = show_msg($mails,$start_message); - } - } else { + if($displayed_msgs == $MailBox->mails_per_page) {break;} + } + $i++; + $start_message--; + } + + } + + flush(); + // MAIN LOOP + // Main loop to create listview entries + +} + +$search_html = ''; // Build folder list and move_to dropdown box $list = imap_getmailboxes($MailBox->mbox, "{".$MailBox->imapServerAddress."}", "*"); @@ -336,9 +363,13 @@ $i++; + if($_REQUEST["mailbox"] == '') + $_REQUEST["mailbox"] = 'INBOX'; + if ($_REQUEST["mailbox"] == $tmpval) { - if($tmpval != "INBOX") + /* if($tmpval != "INBOX") $boxes .= ''; - } + } $struct_msg = imap_fetchstructure($mail, $ev); $msg_charset = ''; @@ -804,64 +804,64 @@ } - $subject_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->subject); - $subject_array = $this->mime_header_decode($subject_header); - for ($j = 0; $j < count($subject_array); $j++) + $subject_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->subject); + $subject_array = $this->mime_header_decode($subject_header); + for ($j = 0; $j < count($subject_array); $j++) $subject .= $subject_array[$j]->text; - $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); - $from_array = $this->mime_header_decode($from_header); - for ($j = 0; $j < count($from_array); $j++) - $from .= $from_array[$j]->text; - - $to_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->toaddress); - $to_array = $this->mime_header_decode($to_header); - for ($j = 0; $j < count($to_array); $j++) - $to .= $to_array[$j]->text; - $to = str_replace(',', ', ', $to); - - $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; - $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); - $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; - if ($cc_array != 0) { - for ($j = 0; $j < count($cc_array); $j++) - $cc .= $cc_array[$j]->text; - } - $cc = str_replace(',', ', ', $cc); - - $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; - $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); - $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; - if ($reply_to_array != 0) { - for ($j = 0; $j < count($reply_to_array); $j++) - $reply_to .= $reply_to_array[$j]->text; - } - - $timestamp = chop($ref_contenu_message->udate); - $date = format_date($timestamp, $lang); - $time = format_time($timestamp, $lang); - $content = Array( - 'from' => $from, - 'to' => $to, - 'cc' => $cc, - 'reply_to' => $reply_to, - 'subject' => $subject, - 'date' => $date, - 'time' => $time, - 'complete_date' => $date, - 'att' => $link_att, - 'body' => $this->graphicalsmilies($body), - 'body_mime' => $this->convertLang2Html($tmpvar['mime']), - 'body_transfer' => $this->convertLang2Html($tmpvar['transfer']), - 'header' => $header, - 'verbose' => $verbose, - 'prev' => $prev_msg, - 'next' => $next_msg, - 'msgnum' => $mail, - 'attachtab' => $attach_tab, - 'charset' => $body_charset - ); -return ($content); + $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); + $from_array = $this->mime_header_decode($from_header); + for ($j = 0; $j < count($from_array); $j++) + $from .= $from_array[$j]->text; + + $to_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->toaddress); + $to_array = $this->mime_header_decode($to_header); + for ($j = 0; $j < count($to_array); $j++) + $to .= $to_array[$j]->text; + $to = str_replace(',', ', ', $to); + + $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; + $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); + $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; + if ($cc_array != 0) { + for ($j = 0; $j < count($cc_array); $j++) + $cc .= $cc_array[$j]->text; + } + $cc = str_replace(',', ', ', $cc); + + $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; + $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); + $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; + if ($reply_to_array != 0) { + for ($j = 0; $j < count($reply_to_array); $j++) + $reply_to .= $reply_to_array[$j]->text; + } + + $timestamp = chop($ref_contenu_message->udate); + $date = format_date($timestamp, $lang); + $time = format_time($timestamp, $lang); + $content = Array( + 'from' => $from, + 'to' => $to, + 'cc' => $cc, + 'reply_to' => $reply_to, + 'subject' => $subject, + 'date' => $date, + 'time' => $time, + 'complete_date' => $date, + 'att' => $link_att, + 'body' => $this->graphicalsmilies($body), + 'body_mime' => $this->convertLang2Html($tmpvar['mime']), + 'body_transfer' => $this->convertLang2Html($tmpvar['transfer']), + 'header' => $header, + 'verbose' => $verbose, + 'prev' => $prev_msg, + 'next' => $next_msg, + 'msgnum' => $mail, + 'attachtab' => $attach_tab, + 'charset' => $body_charset + ); + return ($content); } Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Thu Mar 22 03:33:40 2007 @@ -147,12 +147,13 @@ 'LBL_ALLMAILS'=>'All Mails', 'LBL_TO_USERS'=>'To Users', 'LBL_TO_GROUPS'=>'To Groups', -'IN_SUBJECT' => 'in Subject', -'IN_BODY' => 'in Body', -'IN_TO' => 'in To:', -'IN_CC' => 'in CC:', -'IN_BCC' => 'in BCC:', -'IN_FROM' => 'in From:', +'SUBJECT' => 'Subject', +'BODY' => 'Body', +'TO' => 'To:', +'CC' => 'CC:', +'BCC' => 'BCC:', +'FROM' => 'From:', +'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', ); From lovelylb at graffiti2000.com Thu Mar 22 12:41:30 2007 From: lovelylb at graffiti2000.com (Bailiwicks V. Showpiece) Date: Thu, 22 Mar 2007 12:41:30 -0400 Subject: [Vtigercrm-commits] Say NO to erectile dysfunction! Message-ID: <6634071201.20070322124130@graffiti2000.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://unaik.hk Make right choice: buy medications at LegalRXMedications drug store! From samuraichick at giant-bicycles.com Thu Mar 22 18:07:54 2007 From: samuraichick at giant-bicycles.com (Swatter C. Specially) Date: Thu, 22 Mar 2007 22:07:54 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3773083596.20070322220754@giant-bicycles.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6a20ef5c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: copse.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6a20ef5c/attachment.gif From hurley at gripwell.com Thu Mar 22 23:17:50 2007 From: hurley at gripwell.com (Dwindles M. Monroe) Date: Thu, 22 Mar 2007 23:17:50 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <2822840566.20070322231750@gripwell.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://unaik.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From bauer at globexriskmanagement.com Thu Mar 22 21:24:40 2007 From: bauer at globexriskmanagement.com (Overhead K. Bourbaki) Date: Thu, 22 Mar 2007 21:24:40 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <7106354497.20070322212440@globexriskmanagement.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://unaik.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From bug at grandhotelrosamarina.com Thu Mar 22 21:02:33 2007 From: bug at grandhotelrosamarina.com (Dimness G. Parterres) Date: Thu, 22 Mar 2007 21:02:33 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <1907849538.20070322210233@grandhotelrosamarina.com> Make your dreams come true with licensed medications from US Drug Store! Any pills at your choice. There is no need to visit your local drug store at all. http://unaik.hk any pill you need! Absolutely Confidential and Secure purchase From bernd.koblitz at gobert.org Thu Mar 22 23:42:42 2007 From: bernd.koblitz at gobert.org (Alleluias S. Reviewing) Date: Fri, 23 Mar 2007 03:42:42 +0000 Subject: [Vtigercrm-commits] Pharmacy for real men! Message-ID: <0689937354.20070323034242@gobert.org> The most powerful medicines for you! Cloalis Soft Tabs - $5.78 - Just like regular Clualis but specially formulated, these pills are soft and dissolvable under the tongue. The effect of this is more direct absorption into the bloodstream, rather than through the stomach. Result ? a powerful, lasting effect of up to 36 hours. Zinc - $35.99 - naturally produced by human organism mineral. Zinc is important for growth and for the development and health of body tissues. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. and more! our site http://unaik.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From blanchard at giftoflifeinc.org Fri Mar 23 05:59:36 2007 From: blanchard at giftoflifeinc.org (Swopping F. Ideographs) Date: Fri, 23 Mar 2007 05:59:36 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <4652705254.20070323055936@giftoflifeinc.org> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://unaik.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From flo at goyet.net Thu Mar 22 22:19:58 2007 From: flo at goyet.net (Header H. Stiffest) Date: Thu, 22 Mar 2007 22:19:58 -0400 Subject: [Vtigercrm-commits] To buy or not to buy? Message-ID: <3002301040.20070322221958@goyet.net> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://unaik.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From t-aota at grapevinerestaurant.com Fri Mar 23 09:11:04 2007 From: t-aota at grapevinerestaurant.com (Surfeits C. Champions) Date: Fri, 23 Mar 2007 09:11:04 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2560899071.20070323091104@grapevinerestaurant.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/ff53854d/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: gangrene.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/ff53854d/attachment.gif From crusherko at gigavision.net Fri Mar 23 05:16:17 2007 From: crusherko at gigavision.net (Rosins M. Chrysalis) Date: Fri, 23 Mar 2007 09:16:17 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4567842055.20070323091617@gigavision.net> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://unaik.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/b19438f7/attachment-0001.html From stanley.budden_y at gothlet.net Fri Mar 23 05:48:46 2007 From: stanley.budden_y at gothlet.net (Blowouts G. Percents) Date: Fri, 23 Mar 2007 05:48:46 -0400 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <7611995198.20070323054846@gothlet.net> The most powerful medicines for you! Glucophage - $0.83 - a medicine used to treat type 2 diabetes mellitus. Spermamax - $40.5 - SPERMAMAX is a scientifically validated herbal nutritional blend to enhance fertility by improving sperm quality, count and motility (spontaneous motion). Clearitol - $40.5 - specially formulated to help correct acne-causing internal imbalances in both adults and adolescents. and more! our site http://unaik.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From beb at gjcarch.com Fri Mar 23 03:41:55 2007 From: beb at gjcarch.com (Recompilation H. Clarity) Date: Fri, 23 Mar 2007 03:41:55 -0400 Subject: [Vtigercrm-commits] Perfect sex? It is possible! Message-ID: <5810265272.20070323034155@gjcarch.com> Most wanted pills at LOW price! http://unaik.hk Instant shipping worldwide! CONFIDENTIAL purchase! From claude at graficascastany.com Fri Mar 23 06:01:49 2007 From: claude at graficascastany.com (Escher U. Precinct) Date: Fri, 23 Mar 2007 06:01:49 -0400 Subject: [Vtigercrm-commits] We have everything that you need Message-ID: <8950333724.20070323060149@graficascastany.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://unaik.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From angus at greenwellfrazer.com Fri Mar 23 14:12:21 2007 From: angus at greenwellfrazer.com (Solitaries H. Democratized) Date: Fri, 23 Mar 2007 14:12:21 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <6249302386.20070323141221@greenwellfrazer.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://unaik.hk any pill you need! Absolutely Confidential and Secure purchase From istkxycxyewd at gloucswt.cix.co.uk Fri Mar 23 09:27:13 2007 From: istkxycxyewd at gloucswt.cix.co.uk (Slaloming R. Cecile) Date: Fri, 23 Mar 2007 09:27:13 -0400 Subject: [Vtigercrm-commits] Want to be healthy? U can! Message-ID: <7920420710.20070323092713@gloucswt.cix.co.uk> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://frawq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From vicki at gopherhole.com Fri Mar 23 12:53:57 2007 From: vicki at gopherhole.com (Snub E. Mackenzie) Date: Fri, 23 Mar 2007 12:53:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4058515743.20070323125357@gopherhole.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/8ecfd711/attachment-0001.html From istdochegalwer at granger01.ufpi.com Fri Mar 23 13:14:45 2007 From: istdochegalwer at granger01.ufpi.com (Pussies F. Rowdy) Date: Fri, 23 Mar 2007 17:14:45 +0000 Subject: [Vtigercrm-commits] Need some help? Message-ID: <9649113466.20070323171445@granger01.ufpi.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://frawq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From relocatecanada.a at granitestateplastics.com Fri Mar 23 20:59:59 2007 From: relocatecanada.a at granitestateplastics.com (Flashily U. Mutates) Date: Fri, 23 Mar 2007 20:59:59 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6940526287.20070323205959@granitestateplastics.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/cc530558/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: taxidermists.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070323/cc530558/attachment.gif From extraspace at gregmyersappraisal.com Fri Mar 23 22:55:40 2007 From: extraspace at gregmyersappraisal.com (Cannibalize I. Uphold) Date: Fri, 23 Mar 2007 22:55:40 -0400 Subject: [Vtigercrm-commits] Top listed medications 4 you. Message-ID: <3218184413.20070323225540@gregmyersappraisal.com> Most wanted pills at LOW price! http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From cedar at gregorysigns.com Fri Mar 23 15:32:52 2007 From: cedar at gregorysigns.com (Chandrasekhar Q. Attributing) Date: Fri, 23 Mar 2007 15:32:52 -0400 Subject: [Vtigercrm-commits] Want to be perfect lover? Message-ID: <8957532346.20070323153252@gregorysigns.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://frawq.hk ONLY! From norris at gett.de Fri Mar 23 20:05:12 2007 From: norris at gett.de (Evaporated H. Tawny) Date: Fri, 23 Mar 2007 20:05:12 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <5869218484.20070323200512@gett.de> Most wanted pills at LOW price! http://frawq.hk Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From frimjob at grabatelo.net Fri Mar 23 22:32:35 2007 From: frimjob at grabatelo.net (Godmother Q. Tenets) Date: Sat, 24 Mar 2007 02:32:35 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1289651064.20070324023235@grabatelo.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/2f462110/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: homestretches.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/2f462110/attachment.gif From afm at goddy-online.de Fri Mar 23 22:42:47 2007 From: afm at goddy-online.de (Closeouts S. Physicist) Date: Fri, 23 Mar 2007 22:42:47 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <4596643512.20070323224247@goddy-online.de> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From phipps at glaces-erhard.com Sat Mar 24 06:50:49 2007 From: phipps at glaces-erhard.com (Dactyl J. Epaulet) Date: Sat, 24 Mar 2007 06:50:49 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <3337567547.20070324065049@glaces-erhard.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From istobe at glavey.com Fri Mar 23 23:58:32 2007 From: istobe at glavey.com (Juggler U. Personalized) Date: Fri, 23 Mar 2007 23:58:32 -0400 Subject: [Vtigercrm-commits] Can't be a lover anymore? Message-ID: <5381529954.20070323235832@glavey.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://frawq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From extremtwo at gotohamed.com Sat Mar 24 03:15:16 2007 From: extremtwo at gotohamed.com (Dahlia M. Alzheimer) Date: Sat, 24 Mar 2007 07:15:16 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4644112288.20070324071516@gotohamed.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/cdb32d33/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Lyell.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/cdb32d33/attachment.gif From thkaaiai at graftoncity.nsw.gov.au Sat Mar 24 10:41:56 2007 From: thkaaiai at graftoncity.nsw.gov.au (Crystal H. Egyptology) Date: Sat, 24 Mar 2007 10:41:56 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0289219845.20070324104156@graftoncity.nsw.gov.au> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/58797472/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Arcadia.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/58797472/attachment.gif From istintegra at gillaroos.com Sat Mar 24 03:41:58 2007 From: istintegra at gillaroos.com (Apt E. Unloosed) Date: Sat, 24 Mar 2007 03:41:58 -0400 Subject: [Vtigercrm-commits] No need to visit local drug store. Message-ID: <3692151628.20070324034158@gillaroos.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://frawq.hk verified by VISA and certified by CIPA. From angie at goodwinpozzi.com Sat Mar 24 06:23:54 2007 From: angie at goodwinpozzi.com (Resolutes E. Gaberdine) Date: Sat, 24 Mar 2007 06:23:54 -0400 Subject: [Vtigercrm-commits] For Your Eyes Only Message-ID: <8508907805.20070324062354@goodwinpozzi.com> The most powerful medicines for you! Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. Codeine - $3.6 - relieves pain. Acetaminophen is a less potent pain reliever that increases the effects of Codeine. Proscar - $1.07 - helps shrink the prostate in many men. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istides at gradgiftlife.com Sat Mar 24 14:52:36 2007 From: istides at gradgiftlife.com (Revivalist H. Headland) Date: Sat, 24 Mar 2007 14:52:36 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <1492496453.20070324145236@gradgiftlife.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istdf at golfhomesinfl.com Sat Mar 24 10:09:55 2007 From: istdf at golfhomesinfl.com (Dr. Joseph Raymond) Date: Sat, 24 Mar 2007 14:09:55 +0000 Subject: [Vtigercrm-commits] Straining yourself when you are with a woman? Message-ID: <0760616398.20070324140955@golfhomesinfl.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/7a0bb38d/attachment-0001.html From extremeroller at girlscouts-kickapoocouncil.org Sat Mar 24 08:39:16 2007 From: extremeroller at girlscouts-kickapoocouncil.org (Plastering O. Mike) Date: Sat, 24 Mar 2007 08:39:16 -0400 Subject: [Vtigercrm-commits] Can't afford medications you need? Message-ID: <5863993181.20070324083916@girlscouts-kickapoocouncil.org> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://frawq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From jagomes at graphicaroma.com Sat Mar 24 11:39:30 2007 From: jagomes at graphicaroma.com (Rewords R. Anarchy) Date: Sat, 24 Mar 2007 15:39:30 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4032236554.20070324153930@graphicaroma.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5b113a2e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: misdiagnose.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5b113a2e/attachment.gif From extremerage at giftseasy.com Sat Mar 24 11:32:53 2007 From: extremerage at giftseasy.com (Monstrous U. Mahayanist) Date: Sat, 24 Mar 2007 11:32:53 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <0620044443.20070324113253@giftseasy.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://frawq.hk Instant shipping worldwide! CONFIDENTIAL purchase! From crushermbw at grab-it.com Sat Mar 24 14:36:41 2007 From: crushermbw at grab-it.com (Snootiest D. Preshrinking) Date: Sat, 24 Mar 2007 14:36:41 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2418814593.20070324143641@grab-it.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/cf030274/attachment-0001.html From davila at globalmakana.com Sat Mar 24 21:33:02 2007 From: davila at globalmakana.com (Macram G. Roundness) Date: Sat, 24 Mar 2007 21:33:02 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1167962232.20070324213302@globalmakana.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5d8b7345/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pickerels.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070324/5d8b7345/attachment.gif From swain at gregsearcy.com Sun Mar 25 00:38:50 2007 From: swain at gregsearcy.com (Ronald P. Tinker) Date: Sun, 25 Mar 2007 00:38:50 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <2339224658.20070325003850@gregsearcy.com> Buy top products at Canadian Pharmacy store. Legal and quality medications at low price only. There is no need to go to your local drug store just click here: http://frawq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From extremesam at gosailnow.com Sat Mar 24 19:46:39 2007 From: extremesam at gosailnow.com (Debates G. Squished) Date: Sat, 24 Mar 2007 23:46:39 +0000 Subject: [Vtigercrm-commits] On-line generic store Message-ID: <2651257838.20070324234639@gosailnow.com> The most powerful medicines for you! Allegra - $1.32 - an antihistamine that comes in a variety of strengths and formulations to provide relief from a wide range of seasonal allergy symptoms. Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Horny Goat Weed - $35.99 - Epimedium is a genus of twenty-one related plant species. It boosts libido (sex drive), increases energy levels and enhances recovery from exercise. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extremedt at goldenembryo.net Sat Mar 24 18:08:10 2007 From: extremedt at goldenembryo.net (Adrift T. Colette) Date: Sat, 24 Mar 2007 18:08:10 -0400 Subject: [Vtigercrm-commits] Unbelievable prices! Message-ID: <0321610226.20070324180810@goldenembryo.net> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From kate at goedzo.com Sat Mar 24 20:43:02 2007 From: kate at goedzo.com (Nominating P. Aristocratic) Date: Sat, 24 Mar 2007 20:43:02 -0400 Subject: [Vtigercrm-commits] Make your girlfriend happy. Message-ID: <9274236653.20070324204302@goedzo.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://frawq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From asa at gottfried-stiller.com Sat Mar 24 23:18:19 2007 From: asa at gottfried-stiller.com (Filament U. Embarrassments) Date: Sat, 24 Mar 2007 23:18:19 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <6338576513.20070324231819@gottfried-stiller.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://frawq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From extranorm at getchaos.com Sun Mar 25 00:59:52 2007 From: extranorm at getchaos.com (Patrician O. Gadsden) Date: Sun, 25 Mar 2007 04:59:52 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5282760799.20070325045952@getchaos.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/e4e6cb4c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: reconstruct.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/e4e6cb4c/attachment.gif From istanboy at goldbust.com Sun Mar 25 09:01:09 2007 From: istanboy at goldbust.com (Biker Q. Specials) Date: Sun, 25 Mar 2007 09:01:09 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <8353801566.20070325090109@goldbust.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From chris at gise.org Sun Mar 25 04:05:05 2007 From: chris at gise.org (Atoll T. Muckraker) Date: Sun, 25 Mar 2007 08:05:05 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <5769201715.20070325080505@gise.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/b7009abc/attachment-0001.html From bates at globalimmigrationservices.com Sun Mar 25 09:52:00 2007 From: bates at globalimmigrationservices.com (Millicent L. Ligament) Date: Sun, 25 Mar 2007 09:52:00 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4507369006.20070325095200@globalimmigrationservices.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/14fc9fc8/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: hayloft.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/14fc9fc8/attachment.gif From logan at graytechintl.com Sun Mar 25 02:03:34 2007 From: logan at graytechintl.com (Executioner T. Medically) Date: Sun, 25 Mar 2007 02:03:34 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <1070527706.20070325020334@graytechintl.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://frawq.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From npetersen at gownsales.com Sun Mar 25 05:05:03 2007 From: npetersen at gownsales.com (Subliminally P. Brocades) Date: Sun, 25 Mar 2007 05:05:03 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <0045355296.20070325050503@gownsales.com> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://frawq.hk Make secure and confidential purchase. Verified by VISA. Instant shipping worldwide! From wiseman at greenvillechamber.org Sun Mar 25 08:22:22 2007 From: wiseman at greenvillechamber.org (Pompousness H. Beep) Date: Sun, 25 Mar 2007 08:22:22 -0400 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <0657592430.20070325082222@greenvillechamber.org> The most powerful medicines for you! Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Zithromax - $3.2 - Zithromax is in a class of drugs called macrolide antibiotics. Zithromax fights bacteria in the body. Nymphomax - $35.99 - Helps women to achieve multiple and more powerful orgasms with this unique female sexual stimulant. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isszhao at dmhosting.g.ysm.yahoo.com Sun Mar 25 15:37:27 2007 From: isszhao at dmhosting.g.ysm.yahoo.com (Pitying B. Parches) Date: Sun, 25 Mar 2007 15:37:27 -0400 Subject: [Vtigercrm-commits] Medications for US residents. Message-ID: <0239175204.20070325153727@greatfaith.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://frawq.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From lkj at web.ultrarpm.com Sun Mar 25 12:52:11 2007 From: lkj at web.ultrarpm.com (Handpick L. Stadiums) Date: Sun, 25 Mar 2007 16:52:11 +0000 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7567210383.20070325165211@graphic.bignewideas.net> Most wanted pills at LOW price! http://frawq.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From extremecod at goodfear.com Sun Mar 25 10:09:39 2007 From: extremecod at goodfear.com (Threading V. Mattered) Date: Sun, 25 Mar 2007 10:09:39 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <3645598644.20070325100939@goodfear.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From savage at gravdal.net Sun Mar 25 10:58:47 2007 From: savage at gravdal.net (Dynamism Q. Antacid) Date: Sun, 25 Mar 2007 10:58:47 -0400 Subject: [Vtigercrm-commits] Looking for perfect sex? Message-ID: <5788771084.20070325105847@gravdal.net> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://frawq.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From linzhengsong at graphicventuresinc.com Sun Mar 25 13:44:14 2007 From: linzhengsong at graphicventuresinc.com (Circuit U. Marduk) Date: Sun, 25 Mar 2007 17:44:14 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1576030935.20070325174414@graphicventuresinc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/a9671eb9/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: template.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/a9671eb9/attachment.gif From bride at goquepos.com Sun Mar 25 15:44:57 2007 From: bride at goquepos.com (Bouncier I. Dearly) Date: Sun, 25 Mar 2007 15:44:57 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <4190027668.20070325154457@goquepos.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/30fb56ba/attachment-0001.html From jesse at greatfinancialfreedom.com Sun Mar 25 20:44:06 2007 From: jesse at greatfinancialfreedom.com (Employment E. Bobs) Date: Sun, 25 Mar 2007 20:44:06 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4795205235.20070325204406@greatfinancialfreedom.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/25f83963/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: satellite.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/25f83963/attachment.gif From istmena at gianlucabove.com Sun Mar 25 20:44:39 2007 From: istmena at gianlucabove.com (Zap K. Pilate) Date: Sun, 25 Mar 2007 20:44:39 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9064056875.20070325204439@gianlucabove.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/97e9bf29/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Ptolemy.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070325/97e9bf29/attachment.gif From istau at greattoday.com Sun Mar 25 23:40:05 2007 From: istau at greattoday.com (Retarding M. Tiebreaker) Date: Sun, 25 Mar 2007 23:40:05 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <4134749214.20070325234005@greattoday.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://frawq.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From marie at grmgmt.com Sun Mar 25 18:36:44 2007 From: marie at grmgmt.com (Blundering U. Argumentation) Date: Sun, 25 Mar 2007 18:36:44 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <1538376803.20070325183644@grmgmt.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://frawq.hk Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From triplett at glo.uk.com Sun Mar 25 19:13:01 2007 From: triplett at glo.uk.com (Repulses P. Grebe) Date: Sun, 25 Mar 2007 19:13:01 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <7432944378.20070325191301@glo.uk.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://frawq.hk Only Secure and Confidential purchase! Verified buy VISA! From emc at goldberryuk.com Sun Mar 25 22:36:00 2007 From: emc at goldberryuk.com (Iterates T. Plaiting) Date: Sun, 25 Mar 2007 22:36:00 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <7168569947.20070325223600@goldberryuk.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From zsemilk at glycoboy.com Sun Mar 25 23:19:48 2007 From: zsemilk at glycoboy.com (Vicariously A. Sculls) Date: Mon, 26 Mar 2007 03:19:48 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1224550805.20070326031948@glycoboy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/6ea78ecb/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: hellish.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/6ea78ecb/attachment.gif From sandrafountain at gokugirl.com Mon Mar 26 02:28:13 2007 From: sandrafountain at gokugirl.com (Lute I. Behooving) Date: Mon, 26 Mar 2007 06:28:13 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8307544172.20070326062813@gokugirl.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/dd599d41/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: instructive.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/dd599d41/attachment.gif From nix at gilescounty-tn.us Mon Mar 26 07:49:29 2007 From: nix at gilescounty-tn.us (Herring J. Cline) Date: Mon, 26 Mar 2007 07:49:29 -0400 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <5917731884.20070326074929@gilescounty-tn.us> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From alford at gocoffs.com Mon Mar 26 08:05:22 2007 From: alford at gocoffs.com (Oceangoing G. Outselling) Date: Mon, 26 Mar 2007 08:05:22 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9925885629.20070326080522@gocoffs.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/f3b77f70/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: minefield.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/f3b77f70/attachment.gif From isthatue at globalburnfire.com Mon Mar 26 02:29:24 2007 From: isthatue at globalburnfire.com (Tenets K. Euripides) Date: Mon, 26 Mar 2007 02:29:24 -0400 Subject: [Vtigercrm-commits] You need these pills. Message-ID: <9922947197.20070326022924@globalburnfire.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From engel at goldberglaw.us Mon Mar 26 04:32:45 2007 From: engel at goldberglaw.us (Sunbathers T. Defections) Date: Mon, 26 Mar 2007 04:32:45 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <4553075430.20070326043245@goldberglaw.us> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://frawq.hk Nobody will know that you are using Viagra because all purchases are TOTALLY CONFIDENTIAL AND SECURE! From extremelyinked at glassboxdesign.com Mon Mar 26 07:39:18 2007 From: extremelyinked at glassboxdesign.com (Duping O. Follicles) Date: Mon, 26 Mar 2007 07:39:18 -0400 Subject: [Vtigercrm-commits] Health for sale! Message-ID: <7526090117.20070326073918@glassboxdesign.com> The most powerful medicines for you! Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Lipotrexate - $35.99 - one of the safest and most powerful dietary supplements on the market. Its special proprietary blend of pharmaceutical grade botanicals provides you with consistent levels of sustained energy all day without the nervousness or jitters commonly associated with other diet pills. Suprax - $3- a medication belonging to a class of antibiotics called Cephalosporins. The active ingredient in Suprax is Cefixime. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From hinkle at gothmail.net Mon Mar 26 09:13:01 2007 From: hinkle at gothmail.net (Dr. Donald Nichols) Date: Mon, 26 Mar 2007 13:13:01 +0000 Subject: [Vtigercrm-commits] Nobody will know about your problems. Message-ID: <6343427560.20070326131301@gothmail.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/3442627b/attachment-0001.html From foo at graul.com Mon Mar 26 15:30:54 2007 From: foo at graul.com (Creature K. Swinburne) Date: Mon, 26 Mar 2007 15:30:54 -0400 Subject: [Vtigercrm-commits] Need some help? Message-ID: <9990283722.20070326153054@graul.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://frawq.hk Verified by VISA and sell FDA Approved Drugs only! From rienk_koolstra at goldman-rosen.com Mon Mar 26 10:28:41 2007 From: rienk_koolstra at goldman-rosen.com (Cruciform O. Perspicuity) Date: Mon, 26 Mar 2007 10:28:41 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <1603942667.20070326102841@goldman-rosen.com> That can be real! Just buy any medications you need at Legal Rx Medications store! Best quality drugs, instant shipping WORLDWIDE, friendly support! Lowest prices on the web! http://frawq.hk Recover your health! Completely confidential and secure purchase! Licensed medications only! From ddd at giguereassoc.com Mon Mar 26 18:15:52 2007 From: ddd at giguereassoc.com (Imbalance M. Ills) Date: Mon, 26 Mar 2007 18:15:52 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8064774724.20070326181552@giguereassoc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/64a6f623/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: chambermaid.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/64a6f623/attachment.gif From istanbulneo at greatxchange.com Mon Mar 26 12:34:58 2007 From: istanbulneo at greatxchange.com (Selvedged K. Uphill) Date: Mon, 26 Mar 2007 12:34:58 -0400 Subject: [Vtigercrm-commits] Must have medications. Message-ID: <2893762330.20070326123458@greatxchange.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From barnard at ghc.ctc.edu Mon Mar 26 15:49:47 2007 From: barnard at ghc.ctc.edu (Grenades Q. Transfiguration) Date: Mon, 26 Mar 2007 15:49:47 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3758337079.20070326154947@ghc.ctc.edu> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070326/57134e8e/attachment-0001.html From ks at getzel.com Mon Mar 26 17:23:40 2007 From: ks at getzel.com (Kim R. Disgraceful) Date: Mon, 26 Mar 2007 21:23:40 +0000 Subject: [Vtigercrm-commits] Penis launcher Message-ID: <0683075071.20070326212340@getzel.com> The most powerful medicines for you! Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From lovett at goldensalesco.com Mon Mar 26 23:38:38 2007 From: lovett at goldensalesco.com (Kiss Q. Lied) Date: Mon, 26 Mar 2007 23:38:38 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <3248774294.20070326233838@goldensalesco.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://frawq.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From extremespo at gilkatho.com.au Mon Mar 26 19:25:05 2007 From: extremespo at gilkatho.com.au (Psychoanalysis E. Kalashnikov) Date: Mon, 26 Mar 2007 19:25:05 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <4749246139.20070326192505@gilkatho.com.au> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://frawq.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From extremeszero at grigolla.net Mon Mar 26 19:55:33 2007 From: extremeszero at grigolla.net (Tallyhos A. Futility) Date: Mon, 26 Mar 2007 19:55:33 -0400 Subject: [Vtigercrm-commits] Be healthy, be wealthy! Message-ID: <0350609977.20070326195533@grigolla.net> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://frawq.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From training at gomoose.com Mon Mar 26 23:52:03 2007 From: training at gomoose.com (Thou H. Inescapable) Date: Mon, 26 Mar 2007 23:52:03 -0400 Subject: [Vtigercrm-commits] Don't know where to buy pills? Message-ID: <1794737529.20070326235203@gomoose.com> Our Canada Pharmacy store presents top products that will make you healthy! You do not need to go to your local drug store, you can by here any pill that you need. Viagra, Cialis, Levitra, Valium, Phentermine, Tramadol, Xanax, HGH you can find them here: http://frawq.hk Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From gallagher at ginapete.com Tue Mar 27 05:48:13 2007 From: gallagher at ginapete.com (Intercourse D. Aymara) Date: Tue, 27 Mar 2007 05:48:13 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0056878717.20070327054813@ginapete.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/9cf146a9/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: sentiments.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/9cf146a9/attachment.gif From aero at gglenn.com Tue Mar 27 01:05:25 2007 From: aero at gglenn.com (Fawkes J. Quaffed) Date: Tue, 27 Mar 2007 05:05:25 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9514066199.20070327050525@gglenn.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/a912a21a/attachment-0001.html From riestrueh at goldeneggproductions.com Tue Mar 27 08:00:01 2007 From: riestrueh at goldeneggproductions.com (McDaniel V. Madagascan) Date: Tue, 27 Mar 2007 08:00:01 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <0932042650.20070327080001@goldeneggproductions.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://frawq.hk And no one will know that you have some problems. Absolutely confidential and secure purchase! From extrama at gillespie.com Tue Mar 27 03:27:14 2007 From: extrama at gillespie.com (Jellyfishes T. Countryside) Date: Tue, 27 Mar 2007 07:27:14 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9871650299.20070327072714@gillespie.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/4e40ed9a/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: dwellings.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/4e40ed9a/attachment.gif From extremehen at grbnet.com Tue Mar 27 03:31:25 2007 From: extremehen at grbnet.com (Hate I. Crown) Date: Tue, 27 Mar 2007 03:31:25 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <8824204879.20070327033125@grbnet.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://frawq.hk any pill you need! Absolutely Confidential and Secure purchase From istolz at goapolice.org Tue Mar 27 07:27:36 2007 From: istolz at goapolice.org (Ghettos D. Lucy) Date: Tue, 27 Mar 2007 07:27:36 -0400 Subject: [Vtigercrm-commits] Pharmacy for everyone Message-ID: <9643857352.20070327072736@goapolice.org> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Pro-erex - $35.99 - Enlarge your penis and achieve stronger erections with this natural stamina enhancer. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. and more! our site http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From seb_f at goaio.com Tue Mar 27 05:56:54 2007 From: seb_f at goaio.com (Technologically T. Gypsies) Date: Tue, 27 Mar 2007 05:56:54 -0400 Subject: [Vtigercrm-commits] Products that can improve you life! Message-ID: <3452072305.20070327055654@goaio.com> Most wanted pills at LOW price! http://frawq.hk ONLY! From istoleurgf at goodpet.com Tue Mar 27 08:52:46 2007 From: istoleurgf at goodpet.com (Salter D. Straightjacket) Date: Tue, 27 Mar 2007 12:52:46 +0000 Subject: [Vtigercrm-commits] Can't stand sex all night long? Message-ID: <8284623446.20070327125246@goodpet.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://frawq.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From extreme_pain at grigri.eng.ascend.com Tue Mar 27 16:08:49 2007 From: extreme_pain at grigri.eng.ascend.com (Steppes V. Inpatients) Date: Tue, 27 Mar 2007 16:08:49 -0400 Subject: [Vtigercrm-commits] Best medications, best prices! Message-ID: <2629396670.20070327160849@grigri.eng.ascend.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://frawq.hk ONLY! From knapp at gregy.com Tue Mar 27 16:10:17 2007 From: knapp at gregy.com (Tuscarora S. Pawpaws) Date: Tue, 27 Mar 2007 16:10:17 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9817813910.20070327161017@gregy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/caab1ccd/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: peerless.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/caab1ccd/attachment.gif From nccasey at graphichorizonsinc.com Tue Mar 27 09:35:07 2007 From: nccasey at graphichorizonsinc.com (Trifler C. Daumier) Date: Tue, 27 Mar 2007 09:35:07 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <1970369717.20070327093507@graphichorizonsinc.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://frawq.hk Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From nanard at goodprinters.com Tue Mar 27 14:43:58 2007 From: nanard at goodprinters.com (Cashing M. Marshy) Date: Tue, 27 Mar 2007 14:43:58 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <6462639811.20070327144358@goodprinters.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://frawq.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/88573e17/attachment-0001.html From ponce at greenfieldfeeders.com Tue Mar 27 15:58:46 2007 From: ponce at greenfieldfeeders.com (Dignities T. Enfeeble) Date: Tue, 27 Mar 2007 19:58:46 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8133653384.20070327195846@greenfieldfeeders.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/f863ab17/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: alleys.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/f863ab17/attachment.gif From extrakulkille at grainesvoltz.com Tue Mar 27 14:17:31 2007 From: extrakulkille at grainesvoltz.com (Tubing U. Rubs) Date: Tue, 27 Mar 2007 14:17:31 -0400 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <9240897881.20070327141731@grainesvoltz.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://frawq.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From aplus at giftsofgratitude.com Tue Mar 27 17:54:45 2007 From: aplus at giftsofgratitude.com (Epaulets D. Brad) Date: Tue, 27 Mar 2007 21:54:45 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6429523598.20070327215445@giftsofgratitude.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/c6345c09/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: fuze.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/c6345c09/attachment.gif From extreme_bikes at grandecosse.com Tue Mar 27 23:39:04 2007 From: extreme_bikes at grandecosse.com (Lariats K. Leashes) Date: Tue, 27 Mar 2007 23:39:04 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <0838895788.20070327233904@grandecosse.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://frawq.hk Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From istkris at glendoralaw.com Tue Mar 27 17:23:11 2007 From: istkris at glendoralaw.com (Foregrounded L. Definitively) Date: Tue, 27 Mar 2007 17:23:11 -0400 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <7561047200.20070327172311@glendoralaw.com> Don't want to expose your private life? There is no need to go to your local drug store! All medications you can find in US Drug stores! We have pills for any disease: ED, Weight loss, Antibiotics etc. Instant shipping, perfect support! http://foop.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From register at goodsamcenter.com Wed Mar 28 02:06:50 2007 From: register at goodsamcenter.com (Thigh K. Dawdler) Date: Wed, 28 Mar 2007 02:06:50 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0094075760.20070328020650@goodsamcenter.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/abd84bf4/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Ladonna.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/abd84bf4/attachment.gif From samuraichick at greatit.net Tue Mar 27 21:42:27 2007 From: samuraichick at greatit.net (Obstructionist H. Bomber) Date: Tue, 27 Mar 2007 21:42:27 -0400 Subject: [Vtigercrm-commits] Nobody will know bout your problems. Message-ID: <8580015559.20070327214227@greatit.net> Is there any reasons to pay more? Do you want to save your money? I bet you do! Pay less and get licensed medications you are looking for. Everything you need to cure yourself. http://foop.hk Instant shipping worldwide! CONFIDENTIAL purchase! From security at eBay.com Tue Mar 27 08:56:20 2007 From: security at eBay.com (eBay) Date: 27 Mar 2007 14:56:20 +0200 Subject: [Vtigercrm-commits] eBay account information Message-ID: <1175000180.76613.qmail@eBay.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070327/ec287804/attachment-0001.html From mejia at greenbutton.com Tue Mar 27 22:34:48 2007 From: mejia at greenbutton.com (Distorter D. Holing) Date: Tue, 27 Mar 2007 22:34:48 -0400 Subject: [Vtigercrm-commits] Need to buy medications but don't know where? Message-ID: <5343342394.20070327223448@greenbutton.com> Most wanted pills at LOW price! http://foop.hk And improve your sexual life! Only Confidential purchase. Verified by VISA! From penneyj at goquepos.com Wed Mar 28 02:08:37 2007 From: penneyj at goquepos.com (Dr. Kristen Holden) Date: Wed, 28 Mar 2007 06:08:37 +0000 Subject: [Vtigercrm-commits] Can't find must-have meds at your local drug store? Message-ID: <7273573302.20070328060837@goquepos.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/9896fe0d/attachment-0001.html From issyo_toyonaka at gpartners.com Wed Mar 28 07:09:55 2007 From: issyo_toyonaka at gpartners.com (Musicologists E. Refinish) Date: Wed, 28 Mar 2007 07:09:55 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <9561337611.20070328070955@gpartners.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://foop.hk Instant shipping worldwide! CONFIDENTIAL purchase! From alex at glcc.on.ca Wed Mar 28 00:22:47 2007 From: alex at glcc.on.ca (Rotes D. Tels) Date: Wed, 28 Mar 2007 00:22:47 -0400 Subject: [Vtigercrm-commits] Say YES to perfect sex! Message-ID: <6386906348.20070328002247@glcc.on.ca> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://foop.hk No one will know that you are using medications. Completely CONIDENTIAL and SECURE purchase. From satan at gladwinag.com Wed Mar 28 04:52:53 2007 From: satan at gladwinag.com (Could B. Domestication) Date: Wed, 28 Mar 2007 04:52:53 -0400 Subject: [Vtigercrm-commits] Good health is above wealth Message-ID: <4604055684.20070328045253@gladwinag.com> The most powerful medicines for you! Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. Testosterone - $7.5 - a steroid hormone from the androgen group. Testosterone is secreted in the testes of men and the ovaries of women. Sonma - $1.22 - works to relax the muscles by blocking pain messages sent to the brain. and more! our site http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From eva at golobulos1000.freeserve.co.uk Wed Mar 28 12:36:31 2007 From: eva at golobulos1000.freeserve.co.uk (Lashes G. Miking) Date: Wed, 28 Mar 2007 12:36:31 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <8248221349.20070328123631@golobulos1000.freeserve.co.uk> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/08c1c50e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: rigged.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/08c1c50e/attachment.gif From p_phillups at greatest.saveexpert.net Wed Mar 28 05:22:21 2007 From: p_phillups at greatest.saveexpert.net (Transvestism V. Lyceums) Date: Wed, 28 Mar 2007 05:22:21 -0400 Subject: [Vtigercrm-commits] Say I can have sex all night long! Message-ID: <8442257851.20070328052221@greatest.saveexpert.net> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://foop.hk any pill you need! Absolutely Confidential and Secure purchase From clayton at gonetoparis.com Wed Mar 28 09:25:40 2007 From: clayton at gonetoparis.com (Incrimination Q. Vulcanize) Date: Wed, 28 Mar 2007 13:25:40 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7147285649.20070328132540@gonetoparis.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/3bf6c1fa/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: finagle.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/3bf6c1fa/attachment.gif From morgan at godspeedonwheels.com Wed Mar 28 10:09:27 2007 From: morgan at godspeedonwheels.com (Ditty E. Backing) Date: Wed, 28 Mar 2007 14:09:27 +0000 Subject: [Vtigercrm-commits] Only our pharmacy gives the results like that Message-ID: <3062348730.20070328140927@godspeedonwheels.com> The most powerful medicines for you! Ultram - $1.83 - an analgesic used to treat or prevent pain. Ultram - $1.83 - an analgesic used to treat or prevent pain. Quick-detox - $35.99 - Rid your body of all traces of toxins in as little as two hours with this highly effective detoxification formula. and more! our site http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From keys at goreplicas.com Wed Mar 28 15:31:04 2007 From: keys at goreplicas.com (Airway J. Oxymorons) Date: Wed, 28 Mar 2007 15:31:04 -0400 Subject: [Vtigercrm-commits] Medications that you need. Message-ID: <1767638225.20070328153104@goreplicas.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://foop.hk Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From jdevers at goofy.canada.ingr.com Wed Mar 28 09:06:43 2007 From: jdevers at goofy.canada.ingr.com (Apollo D. Discommodes) Date: Wed, 28 Mar 2007 09:06:43 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <8697033660.20070328090643@goofy.canada.ingr.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://foop.hk verified by VISA and certified by CIPA. From istkntkhat at groatmachinery.com Wed Mar 28 12:21:11 2007 From: istkntkhat at groatmachinery.com (Dispatched R. Gruffness) Date: Wed, 28 Mar 2007 12:21:11 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <2168227214.20070328122111@groatmachinery.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/862506fb/attachment-0001.html From davdr at glassworksseattle.com Wed Mar 28 14:39:00 2007 From: davdr at glassworksseattle.com (Discussions M. Photoelectric) Date: Wed, 28 Mar 2007 14:39:00 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <4886052603.20070328143900@glassworksseattle.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://foop.hk Only Secure and Confidential purchase! Verified buy VISA! From boss at greta-pays-basque.com Wed Mar 28 17:42:34 2007 From: boss at greta-pays-basque.com (Workdays V. Sprat) Date: Wed, 28 Mar 2007 21:42:34 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3622680274.20070328214234@greta-pays-basque.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/094c7db3/attachment-0001.html From william at golf-apparel-brands.com Wed Mar 28 23:15:14 2007 From: william at golf-apparel-brands.com (Gaffe J. Lutheranism) Date: Wed, 28 Mar 2007 23:15:14 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7302333443.20070328231514@golf-apparel-brands.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/028eba8b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bloodies.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070328/028eba8b/attachment.gif From general at gregorysigns.com Wed Mar 28 16:23:43 2007 From: general at gregorysigns.com (Enchilada H. Diamond) Date: Wed, 28 Mar 2007 16:23:43 -0400 Subject: [Vtigercrm-commits] Want to be the best with your girlfriend? Message-ID: <4282110423.20070328162343@gregorysigns.com> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://foop.hk Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From godfrey at goamericana.com Thu Mar 29 00:02:07 2007 From: godfrey at goamericana.com (Ombudsmen S. Disconsolate) Date: Thu, 29 Mar 2007 00:02:07 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <5682855272.20070329000207@goamericana.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://foop.hk We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From jemelors at greersport.com Wed Mar 28 20:14:05 2007 From: jemelors at greersport.com (Carter T. Drawbridge) Date: Wed, 28 Mar 2007 20:14:05 -0400 Subject: [Vtigercrm-commits] Can you imagine that you are healthy? Message-ID: <2355332393.20070328201405@greersport.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://foop.hk Verified by VISA and sell FDA Approved Drugs only! From issybowl at giorgioskory.com Wed Mar 28 23:02:30 2007 From: issybowl at giorgioskory.com (Izanami P. Humility) Date: Thu, 29 Mar 2007 03:02:30 +0000 Subject: [Vtigercrm-commits] Cheapest way to solve health problems. Message-ID: <9995448365.20070329030230@giorgioskory.com> There is no need to exert yourself with silly doubts while you are in bed. Buy and use Viagra or Cialis pills and you won't have any problems at all. You'll be sexual giant all night long. http://foop.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From hackett at gilberthunter.com Wed Mar 28 23:57:31 2007 From: hackett at gilberthunter.com (Sudan R. Watermelons) Date: Thu, 29 Mar 2007 03:57:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9069168920.20070329035731@gilberthunter.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/ed4cccfa/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Zachary.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/ed4cccfa/attachment.gif From its at godonna.com Wed Mar 28 21:15:56 2007 From: its at godonna.com (Swaziland H. Resuscitators) Date: Wed, 28 Mar 2007 21:15:56 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <9765189289.20070328211556@godonna.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://foop.hk Make right choice: buy medications at LegalRXMedications drug store! From istana at gpm-probation.com Wed Mar 28 22:08:46 2007 From: istana at gpm-probation.com (Eateries I. Unsheathes) Date: Wed, 28 Mar 2007 22:08:46 -0400 Subject: [Vtigercrm-commits] All medications at low price! Message-ID: <6502739305.20070328220846@gpm-probation.com> We surely can say: buying most wanted medications at US Drug Store is easy as 1-2-3! Just a few minutes and you'll get any pill that you need at the LOWEST cost you ever seen! Viagra, Cialis, Levitra, Valium, Phentermine - they are all licensed and have the best quality! http://foop.hk There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From bnk_d at gokartpartsonline.com Thu Mar 29 05:47:25 2007 From: bnk_d at gokartpartsonline.com (Hallucinates H. Asturias) Date: Thu, 29 Mar 2007 05:47:25 -0400 Subject: [Vtigercrm-commits] Simple way to enhance your sexual life. Message-ID: <9612881191.20070329054725@gokartpartsonline.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://foop.hk Licensed medications! Confidential and Secure purchase! Instant shipping! Lowest prices you can find anywhere! From banks at greenford-scouts.freeserve.co.uk Thu Mar 29 01:36:50 2007 From: banks at greenford-scouts.freeserve.co.uk (Rick B. Sortie) Date: Thu, 29 Mar 2007 01:36:50 -0400 Subject: [Vtigercrm-commits] US Drugs pharmacy Message-ID: <7755246843.20070329013650@greenford-scouts.freeserve.co.uk> The most powerful medicines for you! Singulair - $1.28 - medicine approved to help control asthma in adults and children as young as 12 months old. It also helps to relieve the symptoms of seasonal allergies in adults and children as young as 2 years old. Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://foop.hk dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From isterio at gregoryfineportraits.com Thu Mar 29 06:52:24 2007 From: isterio at gregoryfineportraits.com (Showing H. Carrillo) Date: Thu, 29 Mar 2007 06:52:24 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6474450007.20070329065224@gregoryfineportraits.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/01f56b9e/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Socratic.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/01f56b9e/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 05:00:32 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 09:00:32 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10517 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070329090032.891057D260E@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 03:00:23 2007 New Revision: 10517 Log: Changed the format of message Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Thu Mar 29 03:00:23 2007 @@ -136,14 +136,15 @@
    • -
    • You are the most important to us! We take pride in being associated with you -
    +
  • You are the most important to us! +
  • We take pride in being associated with you
  • Talk to us at forums

    Discuss with us at blogs

    - We aim to be - simply the best. Come on over, there is space for you too! + We aim to be -simply the best.Come on over,there is space for you too! + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 05:20:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 09:20:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10518 - /vtigercrm/branches/5.0.3/tabdata.php Message-ID: <20070329092009.101BF7C7FF9@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 03:20:04 2007 New Revision: 10518 Log: * Added entry for Users module which was missed earlier Modified: vtigercrm/branches/5.0.3/tabdata.php Modified: vtigercrm/branches/5.0.3/tabdata.php ============================================================================== --- vtigercrm/branches/5.0.3/tabdata.php (original) +++ vtigercrm/branches/5.0.3/tabdata.php Thu Mar 29 03:20:04 2007 @@ -11,7 +11,7 @@ //This file contains the commonly used variables -$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,); +$tab_info_array=array('Home'=>3,'Leads'=>7,'Accounts'=>6,'Contacts'=>4,'Potentials'=>2,'Notes'=>8,'Calendar'=>9,'Emails'=>10,'HelpDesk'=>13,'Products'=>14,'Dashboard'=>1,'Faq'=>15,'Events'=>16,'Vendors'=>18,'PriceBooks'=>19,'Quotes'=>20,'PurchaseOrder'=>21,'SalesOrder'=>22,'Invoice'=>23,'Rss'=>24,'Reports'=>25,'Campaigns'=>26,'Portal'=>27,'Webmails'=>28,'Users'=>29,); $tab_seq_array=array('3'=>0,'7'=>0,'6'=>0,'4'=>0,'2'=>0,'8'=>0,'9'=>0,'10'=>0,'13'=>0,'14'=>0,'1'=>0,'15'=>0,'16'=>2,'18'=>0,'19'=>0,'20'=>0,'21'=>0,'22'=>0,'23'=>0,'24'=>0,'25'=>0,'26'=>0,'27'=>0,'28'=>0,); ?> From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 05:29:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 09:29:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10519 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070329092922.2808E7D2606@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 03:29:16 2007 New Revision: 10519 Log: Message added for the currency configuration Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Thu Mar 29 03:29:16 2007 @@ -1,525 +1,528 @@ -$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; - - if (isset($_REQUEST['db_username'])) - $db_username = $_REQUEST['db_username']; - elseif (isset($dbconfig['db_username'])) - $db_username = $dbconfig['db_username']; - - if (isset($_REQUEST['db_password'])) - $db_password = $_REQUEST['db_password']; - elseif (isset($dbconfig['db_password'])) - $db_password = $dbconfig['db_password']; - - if (isset($_REQUEST['db_type'])) - $db_type = $_REQUEST['db_type']; - elseif (isset($dbconfig['db_type'])) - $db_type = $dbconfig['db_type']; - - if (isset($_REQUEST['db_name'])) - $db_name = $_REQUEST['db_name']; - elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') - $db_name = $dbconfig['db_name']; - else - $db_name = 'vtigercrm503'; - - !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']; - elseif (isset($site_URL) && $site_URL!='_SITE_URL_') - $site_URL = $site_URL; - else $site_URL = $web_root; - - if(isset($_REQUEST['root_directory'])) $root_directory = $_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']; - - if (isset($_REQUEST['currency_name'])) - $currency_name = $_REQUEST['currency_name']; - else - $currency_name = ''; - - if (isset($_REQUEST['currency_symbol'])) - $currency_symbol = $_REQUEST['currency_symbol']; - - if (isset($_REQUEST['currency_code'])) - $currency_code = $_REQUEST['currency_code']; - - } - else { - !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; - !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm503" : $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']; - } - !isset($_REQUEST['check_createdb']) ? $check_createdb = "" : $check_createdb = $_REQUEST['check_createdb']; - !isset($_REQUEST['root_user']) ? $root_user = "" : $root_user = $_REQUEST['root_user']; - !isset($_REQUEST['root_password']) ? $root_password = "" : $root_password = $_REQUEST['root_password']; - // determine database options - $db_options = array(); - if(function_exists('mysql_connect')) { - $db_options['mysql'] = 'MySQL'; - } - if(function_exists('pg_connect')) { - $db_options['pgsql'] = 'Postgres'; - } -?> - - - - - - vtiger CRM 5 - Configuration Wizard - System Configuration - - - - - - - - -


    - - -

    -  {$MOD.LBL_MY_MAILS}   +  {$MOD.LBL_MY_MAILS}  
      @@ -117,12 +117,12 @@ {$APP.LBL_SEARCH}     
    Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Mon Mar 19 00:17:54 2007 @@ -147,5 +147,13 @@ 'LBL_ALLMAILS'=>'All Mails', 'LBL_TO_USERS'=>'To Users', 'LBL_TO_GROUPS'=>'To Groups', +'IN_SUBJECT' => 'in Subject', +'IN_BODY' => 'in Body', +'IN_TO' => 'in To:', +'IN_CC' => 'in CC:', +'IN_BCC' => 'in BCC:', +'IN_FROM' => 'in From:', +'ADD_FOLDER' => 'Add Folder[X]', + ); ?> From flynn at globallinksdubai.com Mon Mar 19 06:39:30 2007 From: flynn at globallinksdubai.com (Dungarees S. Girlhood) Date: Mon, 19 Mar 2007 10:39:30 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2287205315.20070319103930@globallinksdubai.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070319/39db33c6/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: unlace.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070319/39db33c6/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 09:14:17 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 13:14:17 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10477 - in /vtigercrm/branches/5.0.3/include/utils: DeleteUtils.php ListViewUtils.php Message-ID: <20070319131417.59D397C80EB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 07:14:12 2007 New Revision: 10477 Log: fix for Accounts relationship when delete accounts. --Minnie Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php Mon Mar 19 07:14:12 2007 @@ -389,14 +389,14 @@ $adb->query($sql); } //Deleting Account related Sales Orders. - $so_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_salesorder on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid where vtiger_crmentity.deleted=0 and vtiger_salesorder.accountid=".$record; + /*$so_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_salesorder on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid inner join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid where vtiger_crmentity.deleted=0 and vtiger_salesorder.accountid=".$record; $so_res = $adb->query($so_q); for($k=0;$k < $adb->num_rows($so_res);$k++) { $so_id = $adb->query_result($so_res,$k,"crmid"); $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$so_id; $adb->query($sql); - } + }*/ //Deleting Account related Quotes. $quo_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_quotes on vtiger_crmentity.crmid=vtiger_quotes.quoteid inner join vtiger_account on vtiger_account.accountid=vtiger_quotes.accountid where vtiger_crmentity.deleted=0 and vtiger_quotes.accountid=".$record; $quo_res = $adb->query($quo_q); @@ -407,14 +407,14 @@ $adb->query($sql); } //Deleting Account related Invoices. - $inv_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_invoice on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid where vtiger_crmentity.deleted=0 and vtiger_invoice.accountid=".$record; + /*$inv_q = "select vtiger_crmentity.crmid from vtiger_crmentity inner join vtiger_invoice on vtiger_crmentity.crmid=vtiger_invoice.invoiceid inner join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid where vtiger_crmentity.deleted=0 and vtiger_invoice.accountid=".$record; $inv_res = $adb->query($inv_q); for($k=0;$k < $adb->num_rows($inv_res);$k++) { $inv_id = $adb->query_result($inv_res,$k,"crmid"); $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$inv_id; $adb->query($sql); - } + }*/ //Deleting Contact-Account Relation. $con_q = "update vtiger_contactdetails set accountid = null where accountid = ".$record; $con_res = $adb->query($con_q); Modified: vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php Mon Mar 19 07:14:12 2007 @@ -2782,13 +2782,14 @@ { if($relmodule == 'Accounts') { - $pot_query = "select potentialid from vtiger_potential where accountid=".$relmod_recordid; + $pot_query = "select vtiger_crmentity.crmid,vtiger_account.accountid,vtiger_potential.potentialid from vtiger_potential inner join vtiger_account on vtiger_account.accountid=vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_account.accountid where vtiger_crmentity.deleted=0 and vtiger_potential.accountid=".$relmod_recordid; $pot_result = $result = $adb->query($pot_query); $rows = $adb->num_rows($pot_result); + $potids_comma = ""; if($rows != 0) { $j = 0; - $potids_comma = "("; + $potids_comma .= "("; for($k=0; $k < $rows; $k++) { $potential_ids = $adb->query_result($pot_result,$k,'potentialid'); From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 09:23:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 13:23:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10478 - /vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Message-ID: <20070319132323.D6E267C8104@vtiger.fosslabs.com> Author: richie Date: Mon Mar 19 07:23:05 2007 New Revision: 10478 Log: commented out the Trash and Junk Mail Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Mon Mar 19 07:23:05 2007 @@ -94,11 +94,11 @@ Home Page" class="webMnu">{$MOD.LBL_TO_GROUPS} 
    -  {$MOD.LBL_TRASH} + From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 11:31:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 15:31:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10479 - in /vtigercrm/branches/5.0.3: Smarty/templates/ComposeEmail.tpl Smarty/templates/Header.tpl Smarty/templates/Popup.tpl Smarty/templates/ReportsStep0.tpl Smarty/templates/ReportsStep1.tpl include/js/general.js vtigerversion.php Message-ID: <20070319153150.10D777C804F@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 09:31:40 2007 New Revision: 10479 Log: added version for js file Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep0.tpl vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl vtigercrm/branches/5.0.3/include/js/general.js vtigercrm/branches/5.0.3/vtigerversion.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl Mon Mar 19 09:31:40 2007 @@ -22,6 +22,7 @@ + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Mon Mar 19 09:31:40 2007 @@ -22,6 +22,7 @@ + @@ -32,7 +33,7 @@ - + Modified: vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl Mon Mar 19 09:31:40 2007 @@ -14,6 +14,7 @@ + + Modified: vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ReportsStep1.tpl Mon Mar 19 09:31:40 2007 @@ -15,6 +15,7 @@ {$MOD.TITLE_VTIGERCRM_CREATE_REPORT} + Modified: vtigercrm/branches/5.0.3/include/js/general.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/general.js (original) +++ vtigercrm/branches/5.0.3/include/js/general.js Mon Mar 19 09:31:40 2007 @@ -11,7 +11,6 @@ //Utility Functions var gValidationCall=''; -document.write(''); if (document.all) Modified: vtigercrm/branches/5.0.3/vtigerversion.php ============================================================================== --- vtigercrm/branches/5.0.3/vtigerversion.php (original) +++ vtigercrm/branches/5.0.3/vtigerversion.php Mon Mar 19 09:31:40 2007 @@ -11,4 +11,5 @@ $patch_version = ''; $modified_database = ''; $vtiger_current_version = '5.0.3'; +$_SESSION['vtiger_version'] = $vtiger_current_version; ?> From vtigercrm-commits at vtiger.fosslabs.com Mon Mar 19 11:43:47 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Mon, 19 Mar 2007 15:43:47 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10480 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070319154347.42E8D7C80EB@vtiger.fosslabs.com> Author: saraj Date: Mon Mar 19 09:43:43 2007 New Revision: 10480 Log: fields disabled globally, disabled in profile field display Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Mon Mar 19 09:43:43 2007 @@ -427,8 +427,6 @@ if($mode=='view') { $fieldListResult = getProfile2AllFieldList($modArr,$profileId); - for($i=0; $i"; + } + else { $visible = ""; - } - else - { - $visible = ""; } if($language_strings[$fieldListResult[$module_name][$j][0]] != '') $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 03:47:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 07:47:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10481 - in /vtigercrm/branches/5.0.3/modules/Calendar: CalendarCommon.php Save.php TodoSave.php Message-ID: <20070320074739.BD6267C8065@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 01:46:31 2007 New Revision: 10481 Log: date and time display changed in event notification mail. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php vtigercrm/branches/5.0.3/modules/Calendar/Save.php vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Modified: vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/CalendarCommon.php Tue Mar 20 01:46:31 2007 @@ -491,8 +491,11 @@ $mail_data['description'] = $description; $mail_data['assingn_type'] = $assignType; $mail_data['group_name'] = $grp_name; - $mail_data['st_date_time']=$st_date." ".$st_time; - $mail_data['end_date_time']=$end_date." ".$end_time; + $value = getaddEventPopupTime($st_time,$end_time,'24'); + $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; + $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $mail_data['st_date_time']=getDisplayDate($st_date)." ".$start_hour; + $mail_data['end_date_time']=getDisplayDate($end_date)." ".$end_hour; $mail_data['location']=$location; return $mail_data; Modified: vtigercrm/branches/5.0.3/modules/Calendar/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/Save.php Tue Mar 20 01:46:31 2007 @@ -168,8 +168,11 @@ $mail_data['assingn_type'] = $_REQUEST['assigntype']; $mail_data['group_name'] = $_REQUEST['assigned_group_name']; $mail_data['mode'] = $_REQUEST['mode']; - $mail_data['st_date_time'] = $_REQUEST['date_start']." ".$_REQUEST['time_start']; - $mail_data['end_date_time']=$_REQUEST['due_date']." ".$_REQUEST['time_end']; + $value = getaddEventPopupTime($_REQUEST['time_start'],$_REQUEST['time_end'],'24'); + $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; + $end_hour = $value['endhour'] .':'.$value['endmin'].''.$value['endfmt']; + $mail_data['st_date_time'] = getDisplayDate($_REQUEST['date_start'])." ".$start_hour; + $mail_data['end_date_time']=getDisplayDate($_REQUEST['due_date'])." ".$end_hour; $mail_data['location']=$_REQUEST['location']; return $mail_data; } Modified: vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php (original) +++ vtigercrm/branches/5.0.3/modules/Calendar/TodoSave.php Tue Mar 20 01:46:31 2007 @@ -67,8 +67,10 @@ $mail_data['assingn_type'] = $_REQUEST['task_assigntype']; $mail_data['group_name'] = $_REQUEST['task_assigned_group_name']; $mail_data['mode'] = $_REQUEST['task_mode']; - $mail_data['st_date_time'] = $_REQUEST['task_date_start']." ".$_REQUEST['task_time_start']; - $mail_data['end_date_time']=$_REQUEST['task_due_date']; + $value = getaddEventPopupTime($_REQUEST['task_time_start'],$_REQUEST['task_time_end'],'24'); + $start_hour = $value['starthour'].':'.$value['startmin'].''.$value['startfmt']; + $mail_data['st_date_time'] = getDisplayDate($_REQUEST['task_date_start'])." ".$start_hour; + $mail_data['end_date_time']=getDisplayDate($_REQUEST['task_due_date']); return $mail_data; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 04:18:00 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 08:18:00 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10482 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Webmails/ themes/alphagrey/ themes/bluelagoon/ themes/woodspice/ Message-ID: <20070320081800.D8F8C7C804F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 02:17:20 2007 New Revision: 10482 Log: Add/Remove Folder removed, The selected mail has been highlighted, Mail count made to display proper Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php vtigercrm/branches/5.0.3/modules/Webmails/body.php vtigercrm/branches/5.0.3/themes/alphagrey/style.css vtigercrm/branches/5.0.3/themes/bluelagoon/style.css vtigercrm/branches/5.0.3/themes/woodspice/style.css Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Tue Mar 20 02:17:20 2007 @@ -54,7 +54,7 @@ - - - + @@ -267,7 +263,7 @@ if(gselected_mail != '') $(gselected_mail).className = ''; - $(rowId).className = 'tabSelected'; + $(rowId).className = 'mailSelected_select'; gselected_mail = rowId; } {/literal} Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 20 02:17:20 2007 @@ -56,7 +56,6 @@ $degraded_service='false'; if($MailBox->mail_protocol == "imap" || $MailBox->mail_protocol == "pop3") $degraded_service='true'; - if($_POST["command"] == "check_mbox_all") { exit(); @@ -100,18 +99,18 @@ flush(); exit(); } - +//This is invoked from Webmails.js as a result of the periodic event function call, checks only for NEW mails; this in turn checks for new mails in all the mailboxes if($_POST["command"] == "check_mbox") { $adb->println("Inside check_mbox AJAX command"); - $criteria = 'NEW'; - $search = imap_search($MailBox->mbox, $criteria); + $search = imap_search($MailBox->mbox, 'NEW'); + //if($search === false) {echo "failed";flush();exit();} $adb->println("imap_search($MailBox->mbox, $criteria) ===> "); $adb->println($search); - $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); $num=sizeof($data); $adb->println("fetched data using imap_fetch_overview ==>"); @@ -159,7 +158,15 @@ "; -$listview_header = array("","","","",""); +$listview_header = array("","","","",""); $listview_entries = array(); $displayed_msgs=0; @@ -279,16 +287,12 @@ $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; //echo $searchstring."
    "; $searchlist = imap_search($MailBox->mbox,$searchstring); -// if($searchlist === false) - // echo "The search failed"; - $num_searches = count($searchlist); $c=$numEmails; } flush(); - // MAIN LOOP // Main loop to create listview entries @@ -319,7 +323,7 @@ if (is_array($list)) { $boxes = ''; } Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailParse.php Tue Mar 20 02:17:20 2007 @@ -47,7 +47,7 @@ } else { - $flags = "'; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; } elseif(!$mails[$start_message]->seen || $mails[$start_message]->recent) { - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; } else { @@ -132,9 +132,9 @@ //Option 2 - Ends //Added to shown the original UTF-8 characters - Mickie - 30-11-06 - Ends - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; - $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; + $listview_entries[$num][] = ''; } Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Tue Mar 20 02:17:20 2007 @@ -17,8 +17,8 @@ } if(node.className == "mailSelected") { - var unread = parseInt($(mailbox+"_unread").innerHTML); - if(unread != 0) + var unread = parseInt($(mailbox+"_unread").innerHTML); + if(unread != 0) { var curUnread; curUnread = unread -1; @@ -89,7 +89,7 @@ $("full_view").removeChild($("full_view").firstChild); $("full_view").appendChild(Builder.node('a',{href: 'javascript:;', onclick: 'OpenCompose('+mid+',\'full_view\')'},'Full Email View')); - node.className = 'mailSelected' + makeSelected(node.id) } function displayAttachments(mid) { var url = "index.php?module=Webmails&action=dlAttachments&mailid="+mid+"&mailbox="+mailbox; @@ -363,17 +363,38 @@ if(confirm(alert_arr.SURE_TO_DELETE)) runEmailCommand("delete_multi_msg",nids); } - -function move_messages() { +function move_messages() +{ + var nid = ''; + $("status").style.display = "block"; + var chkname=document.getElementsByName("selected_id"); + var mvmbox = $("mailbox_select").value; + for(var m=0;m0;i--) { if(els[i].type == "checkbox" && els[i].name.indexOf("_")) { if(els[i].checked) { - // var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); - - var nid = els[i].value; + var nid = els[i].name.substr((els[i].name.indexOf("_")+1),els[i].name.length); var mvmbox = $("mailbox_select").value; var row = $("row_"+nid); new Effect.Fade(row,{queue: {position: 'end', scope: 'effect'},duration: '0.5'}); @@ -393,7 +414,7 @@ $('mailbox_select').selectedIndex=0; //runEmailCommand('expunge',''); $("status").style.display="none"; -} +}*/ function search_emails() { // TODO: find a way to search in degraded functionality mode. var search_query = $("search_input").value; @@ -411,7 +432,7 @@ postBody: 'module=Webmails&action=WebmailsAjax&command='+command+'&mailid='+id+'&mailbox='+mailbox, onComplete: function(t) { resp = t.responseText; - id=resp; + id=resp; if(resp.match(/ajax failed/)) {return;} switch(command) { case 'expunge': Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php Tue Mar 20 02:17:20 2007 @@ -12,9 +12,18 @@ include_once('config.php'); require_once('include/logging.php'); +require_once('modules/Webmails/conf.php'); +require_once('modules/Webmails/functions.php'); require_once('include/database/PearDatabase.php'); require_once('data/SugarBean.php'); require_once('data/CRMEntity.php'); +class result +{ + var $text = ""; + var $charset = ""; +} + + class Webmails extends CRMEntity { var $log; @@ -37,6 +46,7 @@ var $body; var $attachments = array(); var $inline = array(); + var $attachtab = array(); var $mbox; var $email; var $relationship = array(); @@ -79,18 +89,25 @@ imap_delete($this->mbox, $this->mailid); } - function loadMail() { - $this->email = $this->load_mail(); + function loadMail($attach_tab) { + + $this->email = $this->load_mail($attach_tab); + /* commented out by richie $this->inline = $this->email["inline"]; $this->attachments = $this->email["attachments"]; $this->body = $this->email["content"]["body"]; $this->relationship = $this->find_relationships(); + */ + $this->body = $this->email["body"]; + $this->attachtab = $this->email["attachtab"]; + $this->att= $this->email["att"]; + //echo ' body is ssssssssssssssss '.$this->email["body"]; } function replyBody() { - $tmp = "

    ".$mod_strings['IN_REPLY_TO_THE_MESSAGE'].$this->reply_name." on ".$this->date."

    "; - $tmp .= "
    ".$this->body."
    "; - return $tmp; + $tmpvar = "

    ".$mod_strings['IN_REPLY_TO_THE_MESSAGE'].$this->reply_name." on ".$this->date."

    "; + $tmpvar .= "
    ".$this->body."
    "; + return $tmpvar; } function unDeleteMsg() { @@ -121,7 +138,7 @@ // get the header info $mailHeader=Array(); $theader = @imap_headerinfo($this->mbox, $this->mailid); - $tmp = imap_mime_header_decode($theader->fromaddress); + $tmpvar = imap_mime_header_decode($theader->fromaddress); for($p=0;$pto);$p++) { $mailHeader['to'][] = $theader->to[$p]->mailbox.'@'.$theader->to[$p]->host; @@ -220,7 +237,7 @@ function dl_inline() { - $struct = imap_fetchstructure($this->mbox, $this->mailid); + $struct = @imap_fetchstructure($this->mbox, $this->mailid); $parts = $struct->parts; $i = 0; @@ -292,7 +309,7 @@ function dl_attachments() { - $struct = imap_fetchstructure($this->mbox, $this->mailid); + $struct = @imap_fetchstructure($this->mbox, $this->mailid); $parts = $struct->parts; $i = 0; @@ -351,109 +368,501 @@ } - function load_mail() + + + + function graphicalsmilies($body) { + $user_prefs = $_SESSION['nocc_user_prefs']; + if (isset($user_prefs->graphical_smilies) && $user_prefs->graphical_smilies) { + $body = ereg_replace("\;-?\)","\"wink\"/", $body); + $body = ereg_replace("\;-?D","\"grin\"/", $body); + $body = ereg_replace(":\'\(?","\"cry\"/", $body); + $body = ereg_replace(":-?[xX]","\"confused\"/", $body); + $body = ereg_replace(":-?\[\)","\"embarassed\"/", $body); + $body = ereg_replace(":-?\*","\"love\"/", $body); + $body = ereg_replace(":-?[pP]","\"tongue\"/", $body); + $body = ereg_replace(":-?\)","\"happy\"/", $body); + $body = ereg_replace(":-?\(","\"unhappy\"/", $body); + $body = ereg_replace(":-[oO]","\"surprised\"/", $body); + $body = ereg_replace("8-?\)","\"cool\"/", $body); + } + return ($body); + } + +// based on a function from matt at bonneau.net +function GetPart(&$attach_tab, &$this_part, $part_no, &$display_rfc822) +{ + $att_name = '[unknown]'; + if ($this_part->ifdescription == true) + { + $att_name = $this_part->description; + } + for ($i = 0; $i < count($this_part->parameters); $i++) + { + // PHP 5.x doesn't allow to convert a stdClass object to an array + // We sometimes have this issue with Mailer daemon reports + if (!(get_class($this_part->parameters) == "stdClass") && + !(get_class($this_part->parameters) == "stdclass")) + { + $param = $this_part->parameters[$i]; + if ((($param->attribute == 'NAME') || ($param->attribute == 'name')) && ($param->value != '')) + { + $att_name = $param->value; + break; + } + } + } + if (isset($this_part->type)) + { + switch ($this_part->type) + { + case 0: + $mime_type = 'text'; + break; + case 1: + $mime_type = 'multipart'; + for ($i = 0; $i < count($this_part->parts); $i++) + { + if ($part_no != '') + $part_no = $part_no . '.'; + // if it's an alternative, we skip the text part to only keep the HTML part + if ($this_part->subtype == 'ALTERNATIVE')// && $read == true) + $this->GetPart($attach_tab, $this_part->parts[++$i], $part_no . ($i + 1), $display_rfc822); + else + $this->GetPart($attach_tab, $this_part->parts[$i], $part_no . ($i + 1), $display_rfc822); + } + break; + case 2: + $mime_type = 'message'; + // well it's a message we have to parse it to find attachments or text message + if(isset($this_part->parts[0]->parts)) + { + $num_parts = count($this_part->parts[0]->parts); + for ($i = 0; $i < $num_parts; $i++) + { + $this->GetPart($attach_tab, $this_part->parts[0]->parts[$i], $part_no . '.' . ($i + 1), $display_rfc822); + } + } + break; + // Maybe we can do something with the mime types later ?? + case 3: + $mime_type = 'application'; + break; + case 4: + $mime_type = 'audio'; + break; + case 5: + $mime_type = 'image'; + break; + case 6: + $mime_type = 'video'; + break; + case 7: + $mime_type = 'other'; + break; + default: + $mime_type = 'unknown'; + } + } + else + { + $mime_type = 'text'; + } + $full_mime_type = $mime_type . '/' . $this_part->subtype; + if (isset($this_part->encoding)) + { + switch ($this_part->encoding) + { + case 0: + $encoding = '7BIT'; + break; + case 1: + $encoding = '8BIT'; + break; + case 2: + $encoding = 'BINARY'; + break; + case 3: + $encoding = 'BASE64'; + break; + case 4: + $encoding = 'QUOTED-PRINTABLE'; + break; + case 5: + $encoding = 'OTHER'; + break; + default: + $encoding = 'none'; + break; + } + } + else + { + $encoding = '7BIT'; + } + + if (($full_mime_type == 'message/RFC822' && $display_rfc822 == true) || ($mime_type != 'multipart' && $full_mime_type != 'message/RFC822')) + { + $charset = ''; + if ($this_part->ifparameters) + while ($obj = array_pop($this_part->parameters)) + if (strtolower($obj->attribute) == 'charset') + { + $charset = $obj->value; + break; + } + $tmp = Array( + 'number' => ($part_no != '' ? $part_no : 1), + 'id' => $this_part->ifid ? $this_part->id : 0, + 'name' => $att_name, + 'mime' => $full_mime_type, + 'transfer' => $encoding, + 'disposition' => $this_part->ifdisposition ? $this_part->disposition : '', + 'charset' => $charset, + 'size' => ($this_part->bytes > 1000) ? ceil($this_part->bytes / 1000) : 1 + ); + + array_unshift($attach_tab, $tmp); + } +} + +function GetCodeScoreAll($Data,$beg_charset) { + global $cad_StatsTableWin, $cad_StatsTableKoi; + $PairSize = 2; + + $Data=substr($Data,$beg_charset,100); + $Data=preg_replace('/[\n\r]/','',$Data); + setlocale(LC_CTYPE,'ru_RU.KOI8-R'); + + $Mark_koi=0; + $Mark_win=0; + $cnt=0; + $max_detect_limit=10; + + $sp=preg_split('/[\.\,\-\s\:\;\?\!\'\"\(\)\d<>]+/',$Data); + while ( list($key2,$val2) = each($sp) ) { + $rc=preg_match("/(.*)([\x7F-\xFF]+)/x",$val2); + if($rc == 0) { + continue; + } + + if($cnt > $max_detect_limit) { + break; + } else { + $cnt++; + } + $dlina=strlen($val2)-$PairSize; + if($dlina < 1) {$cnt--; continue;} + $val3=strtolower($val2); + if (ucfirst($val3) == $val2) { + $scaleK=2; + } else { + $scaleK=1; + } + if(substr($val3,0,1).strtoupper(substr($val2,1,strlen($val2))) == $val2) { + $scaleW=2; + } else { + $scaleW=1; + } + $Cur_mark_koi=0; + $Cur_mark_win=0; + for ($i=0; $i<$dlina; $i++ ) { + $pp=substr ($val3, $i, $PairSize); + if (isset($cad_StatsTableKoi[$pp])) { + $Cur_mark_koi += $cad_StatsTableKoi[$pp]; + } + if (isset($cad_StatsTableWin[$pp])) { + $Cur_mark_win += $cad_StatsTableWin[$pp]; + } + } + $Mark_koi+=$Cur_mark_koi*$scaleK; + $Mark_win+=$Cur_mark_win*$scaleW; + } + $Mark_list=array($Mark_koi,$Mark_win); + //setlocale(LC_CTYPE,$old_locale); + return $Mark_list; +} + + + + + + + + + + + +/* lxnt: patched to return charset names that iconv() understands*/ +function detect_charset($Data,$dbg_fl = 0) { + /* for many small pices of text - list of sender/subject*/ + $rc=preg_match("/(.*)([\x7F-\xFF]+)/xU",$Data,$tst_ar); + if($rc == 0) { + return 'US-ASCII'; + } else { + $beg_charset=strpos($Data,$tst_ar[2]); + } + list($KoiMark,$WinMark) = GetCodeScoreAll($Data,$beg_charset); + $Ratio['koi8-r'] = $KoiMark/($WinMark + 1); + $Ratio['windows-1251'] = $WinMark/($KoiMark + 1); + + list($MaxRation,$MaxRatioKey)=max_from_ratio($Ratio); + return $MaxRatioKey; +} + + + + + + + +function mime_header_decode(&$header) +{ + $output_charset = $GLOBALS['charset']; + $source = imap_mime_header_decode($header); + $result[] = new result; + $result[0]->text=''; + $result[0]->charset='ISO-8859-1'; + for ($j = 0; $j < count($source); $j++ ) + { + $element_charset = ($source[$j]->charset == "default") ? $this->detect_charset($source[$j]->text) : $source[$j]->charset; + if ($element_charset == 'x-unknown') + $element_charset = 'ISO-8859-1'; + + $element_converted = @iconv( $element_charset, $output_charset, $source[$j]->text); + $result[$j]->text = $element_converted; + $result[$j]->charset = $output_charset; + } + return $result; +} + + + + +function link_att(&$mail, $attach_tab, &$display_part_no,$ev) +{ + sort($attach_tab); + $link = ''; + while ($tmp = array_shift($attach_tab)) + if (!empty($tmp['name'])) + { + $mime = str_replace('/', '-', $tmp['mime']); + if ($display_part_no == true) + $link .= $tmp['number'] . '  '; + unset($att_name); + $att_name_array = imap_mime_header_decode($tmp['name']); + for ($i=0; $itext; + } + $att_name_dl = $att_name; + $att_name = $this->convertLang2Html($att_name); + $link .= '' . $att_name . '  ' . $tmp['mime'] . '  ' . $tmp['size'] . '
    '; + } + return ($link); +} + + + + + + + + + + + +// Convert mail data (from, to, ...) to HTML +function convertMailData2Html($maildata, $cutafter = 0) + { + if (($cutafter > 0) && (strlen($maildata) > $cutafter)) + { + return htmlspecialchars(substr($maildata, 0, $cutafter)) . '…'; + } + else + { + return htmlspecialchars($maildata); + } + } + +// Convert a language string to HTML + function convertLang2Html($langstring) { + global $charset; + return htmlentities($langstring, 2, $charset); + } + + + + + + + + + function load_mail($attach_tab) { // parse the message - $struct = imap_fetchstructure($this->mbox, $this->mailid); - $parts = $struct->parts; - - $content = array(); - $i = 0; - if (!$parts) - { - /* Simple message, only 1 piece */ - $attachment = array(); /* No vtiger_attachments */ - $bod=imap_body($this->mbox, $this->mailid); - if(preg_match("/\/",$bod)) - $content['body'] = $bod; - else - $content['body'] = nl2br($bod); - } + $ref_contenu_message = imap_headerinfo($this->mbox, $this->mailid); + $struct_msg = imap_fetchstructure($this->mbox, $this->mailid); + $mail = $this->mbox; + $ev = $this->mailid; +$conf->display_rfc822 = true; + if ($struct_msg->type == 3 || (isset($struct_msg->parts) && (sizeof($struct_msg->parts) > 0))) + { + $this->GetPart($attach_tab, $struct_msg, NULL, $conf->display_rfc822); + } else - { - - $stack = array(); - $attachment = array(); - - $endwhile = false; - - while (!$endwhile) - { - if (!$parts[$i]) - { - if (count($stack) > 0) - { - $parts = $stack[count($stack)-1]["p"]; - $i = $stack[count($stack)-1]["i"] + 1; - array_pop($stack); - } - else - { - $endwhile = true; - } - } - $search = array("/=20=/","/=20/","/=\r\n/","/=3D/","@&(disposition) == "INLINE" && strtoupper($parts[$i]->subtype) != "PLAIN") - { - $inline[] = array("filename" => $parts[$i]->dparameters[0]->value,"subtype"=>$parts[$i]->subtype,"filesize"=>$parts[$i]->bytes); - } - elseif (strtoupper($parts[$i]->disposition) == "ATTACHMENT") - { - $attachment[] = array("filename" => $parts[$i]->dparameters[0]->value,"subtype"=>$parts[$i]->subtype,"filesize"=>$parts[$i]->bytes); - - } - elseif (strtoupper($parts[$i]->subtype) == "HTML") - { - $content['body'] = preg_replace($search,$replace,imap_fetchbody($this->mbox, $this->mailid, $partstring)); - $stat="done"; - } - elseif (strtoupper($parts[$i]->subtype) == "TEXT" && !$stat == "done") - { - $content['body'] = nl2br(imap_fetchbody($this->mbox, $this->mailid, $partstring)); - $stat="done"; - } - elseif (strtoupper($parts[$i]->subtype) == "PLAIN" && !$stat == "done") - { - $content['body'] = nl2br(imap_fetchbody($this->mbox, $this->mailid, $partstring)); - $stat="done"; - } - elseif (!$stat == "done") - { - $content['body'] = nl2br(imap_fetchbody($this->mbox, $this->mailid, $partstring)); - } - } - - if ($parts[$i]->parts) - { - $stack[] = array("p" => $parts, "i" => $i); - $parts = $parts[$i]->parts; - $i = 0; + { + $pop_fetchheader_mail_ev = imap_fetchheader($mail, $ev); + $pop_body_mail_ev = imap_body($mail, $ev); + GetSinglePart($attach_tab, $struct_msg, $pop_fetchheader_mail_ev, $pop_body_mail_ev); + } + $conf->use_verbose = true; + $header = ""; + if (($verbose == 1) && ($conf->use_verbose == true)) { + $header = imap_fetchheader($mail, $ev); + } + + $tmpvar = array_pop($attach_tab); + if ($struct_msg->type == 3) + { + $body = ''; + } + else + { + $body = imap_fetchbody($mail,$ev,$tmpvar['number']); + + } + + + + if (eregi('text/html', $tmpvar['mime']) || eregi('text/plain', $tmpvar['mime'])) + { + if ($tmpvar['transfer'] == 'QUOTED-PRINTABLE') + $body = imap_qprint($body); + if ($tmpvar['transfer'] == 'BASE64') + $body = base64_decode($body); + $body = remove_stuff($body, $tmpvar['mime']); + $body_charset = ($tmpvar['charset'] == "default") ? $this->detect_charset($body) : $tmpvar['charset']; + + + if (strtolower($body_charset) == "us-ascii") { + $body_charset = "ISO-8859-1"; + } + + if ($body_charset == "" || $body_charset == null) { + if (isset($conf->default_charset) && $conf->default_charset != "") { + $body_charset = $conf->default_charset; + } else { + $body_charset = "ISO-8859-1"; + } + } + + if (isset($_REQUEST['user_charset']) && $_REQUEST['user_charset'] != '') { + $body_charset = $_REQUEST['user_charset']; + } + + $body_converted = @iconv( $body_charset, $GLOBALS['charset'], $body); + $body = ($body_converted===FALSE) ? $body : $body_converted; + $tmpvar['charset'] = ($body_converted===FALSE) ? $body_charset : $GLOBALS['charset']; } else { - $i++; - } + array_push($attach_tab, $tmpvar); + } + $link_att = ''; +$conf->display_part_no = true; + if ($struct_msg->subtype != 'ALTERNATIVE' && $struct_msg->subtype != 'RELATED') + { + switch (sizeof($attach_tab)) + { + case 0: + $link_att = '
    '; + break; + case 1: + $link_att = ''; + break; + default: + $link_att = ''; + break; } + }else + { + $link_att = ''; } - if($struct->encoding==3) - $content['body'] = base64_decode($content['body']); - if($struct->encoding==4) - $content['body'] = quoted_printable_decode($content['body']); - - $ret = Array("content" => $content,"attachments"=>$attachment,"inline"=>$inline); - return $ret; + + $struct_msg = imap_fetchstructure($mail, $ev); + $msg_charset = ''; + if ($struct_msg->ifparameters) { + while ($obj = array_pop($struct_msg->parameters)) { + if (strtolower($obj->attribute) == 'charset') { + $msg_charset = $obj->value; + break; + } + } + } + if ($msg_charset == '') { + $msg_charset = 'ISO-8859-1'; + } + + + $subject_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->subject); + $subject_array = $this->mime_header_decode($subject_header); + for ($j = 0; $j < count($subject_array); $j++) + $subject .= $subject_array[$j]->text; + + $from_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->fromaddress); + $from_array = $this->mime_header_decode($from_header); + for ($j = 0; $j < count($from_array); $j++) + $from .= $from_array[$j]->text; + + $to_header = str_replace('x-unknown', $msg_charset, $ref_contenu_message->toaddress); + $to_array = $this->mime_header_decode($to_header); + for ($j = 0; $j < count($to_array); $j++) + $to .= $to_array[$j]->text; + $to = str_replace(',', ', ', $to); + + $cc_header = isset($ref_contenu_message->ccaddress) ? $ref_contenu_message->ccaddress : ''; + $cc_header = str_replace('x-unknown', $msg_charset, $cc_header); + $cc_array = isset($ref_contenu_message->ccaddress) ? imap_mime_header_decode($cc_header) :0; + if ($cc_array != 0) { + for ($j = 0; $j < count($cc_array); $j++) + $cc .= $cc_array[$j]->text; + } + $cc = str_replace(',', ', ', $cc); + + $reply_to_header = isset($ref_contenu_message->reply_toaddress) ? $ref_contenu_message->reply_toaddress : ''; + $reply_to_header = str_replace('x-unknown', $msg_charset, $reply_to_header); + $reply_to_array = isset($ref_contenu_message->reply_toaddress) ? imap_mime_header_decode($reply_to_header) : 0; + if ($reply_to_array != 0) { + for ($j = 0; $j < count($reply_to_array); $j++) + $reply_to .= $reply_to_array[$j]->text; + } + + $timestamp = chop($ref_contenu_message->udate); + $date = format_date($timestamp, $lang); + $time = format_time($timestamp, $lang); + $content = Array( + 'from' => $from, + 'to' => $to, + 'cc' => $cc, + 'reply_to' => $reply_to, + 'subject' => $subject, + 'date' => $date, + 'time' => $time, + 'complete_date' => $date, + 'att' => $link_att, + 'body' => $this->graphicalsmilies($body), + 'body_mime' => $this->convertLang2Html($tmpvar['mime']), + 'body_transfer' => $this->convertLang2Html($tmpvar['transfer']), + 'header' => $header, + 'verbose' => $verbose, + 'prev' => $prev_msg, + 'next' => $next_msg, + 'msgnum' => $mail, + 'attachtab' => $attach_tab, + 'charset' => $body_charset + ); +return ($content); + } Modified: vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/WebmailsAjax.php Tue Mar 20 02:17:20 2007 @@ -42,6 +42,17 @@ $command = $_REQUEST["command"]; if($command == "expunge") { $MailBox = new MailBox($mailbox); + /* + $search = imap_search($MailBox->mbox,'DELETED'); + $data = imap_fetch_overview($MailBox->mbox,implode(',',$search)); + for($i=0;$i<$num;$i++) + { + if($data[$i]->deleted != 0) + { + imap_delete($MailBox->mbox,$data[$i]->message_id); + } + } + */ imap_expunge($MailBox->mbox); imap_close($MailBox->mbox); flush(); @@ -50,9 +61,8 @@ if($command == "delete_msg") { $adb->println("DELETE SINGLE WEBMAIL MESSAGE $mailid"); $MailBox = new MailBox($mailbox); - imap_mail_move($MailBox->mbox,$mailid,"Trash"); + imap_mail_move($MailBox->mbox,$mailid,"Deleted"); $email = new Webmails($MailBox->mbox,$mailid); - $email->delete(); imap_close($MailBox->mbox); echo $mailid; flush(); Modified: vtigercrm/branches/5.0.3/modules/Webmails/body.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/body.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/body.php Tue Mar 20 02:17:20 2007 @@ -14,6 +14,7 @@ require_once('include/utils/UserInfoUtil.php'); require_once('modules/Webmails/Webmails.php'); require_once('modules/Webmails/MailBox.php'); +global $mod_strings; if(!isset($_SESSION["authenticated_user_id"]) || $_SESSION["authenticated_user_id"] != $current_user->id) {echo "ajax failed";flush();exit();} $mailid=$_REQUEST["mailid"]; @@ -26,7 +27,9 @@ $mailbox="INBOX"; } $MailBox = new MailBox($mailbox); +$mail = $MailBox->mbox; $email = new Webmails($MailBox->mbox,$mailid); +$status=imap_setflag_full($MailBox->mbox,$mailid,"\\Seen"); ?> loadMail($attach_tab); +$content['body'] = ''.$email->body.''; +$content['attachtab'] = $email->attachtab; +//Need to put this along with the subject block +echo $email->att; +echo $content['body']; -$email->loadMail(); +//test added by Richie +if (!isset($_REQUEST['display_images']) || $_REQUEST['display_images'] != 1) +{ + $content['body'] = eregi_replace('src="[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]"', 'src="none"', $content['body']); + $content['body'] = eregi_replace('src=[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]', 'src="none"', $content['body']); +} -//Added to get the UTF-8 string - 30-11-06 - Mickie -$email->body = utf8_decode(imap_utf8($email->body)); +//Display embedded HTML images +$tmp_attach_tab=$content['attachtab']; +$i = 0; +$conf->display_img_attach = true; +$conf->display_text_attach = true; -echo $email->body; -echo "

    "; - -if(is_array($email->inline)) +while ($tmp = array_pop($tmp_attach_tab)) { - $inline = $email->downloadInlineAttachments(); - $num=sizeof($inline); - echo "

    Inline Attachments:

    "; - - for($i=0;$i<$num;$i++) + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) { - //var_dump($inline[$i]); - // PLAIN TEXT - if($inline[$i]["subtype"] == "RFC822") + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) { - echo "
    ".($i+1).") ".$inline[$i]["filename"].""; + $new_img_src = 'src="get_img.php?mail=' . $mailid.'&num=' . $tmp['number'] . '&mime=' . $img_type . '&transfer=' . $tmp['transfer'] . '"'; + $img_id = str_replace('<', '', $tmp['id']); + $img_id = str_replace('>', '', $img_id); + $content['body'] = str_replace('src="cid:'.$img_id.'"', $new_img_src, $content['body']); + $content['body'] = str_replace('src=cid:'.$img_id, $new_img_src, $content['body']); } - elseif($inline[$i]["subtype"] == "JPEG" || $inline[$i]["subtype"] == "GIF") - { - echo "
    ".($i+1).") ".$inline[$i]["filename"]."

    '; } - else +} +while ($tmp = array_pop($content['attachtab'])) +{ + if ((!eregi('ATTACHMENT', $tmp['disposition'])) && $conf->display_text_attach && (eregi('text/plain', $tmp['mime']))) + echo '
    '.view_part_detail($mail, $mailid, $tmp['number'], $tmp['transfer'], $tmp['charset'], $charset); + if ($conf->display_img_attach && (eregi('image', $tmp['mime']) && ($tmp['number'] != ''))) + { + $exploded = explode('/', $tmp['mime']); + $img_type = array_pop($exploded); + if (eregi('JPEG', $img_type) || eregi('JPG', $img_type) || eregi('GIF', $img_type) || eregi ('PNG', $img_type)) { - echo "
    ".($i+1).") ".$inline[$i]["filename"]." -
    "; -// echo "
    ".($i+1).") ".$inline[$i]["filename"]."
    "; + echo '
    '; + echo '
    '; + echo $mod_strings['LBL_LOADING_IMAGE']; + echo '..........
    '; + echo ''; + echo '
    '; } } } + + +//test ended by Richie + imap_close($MailBox->mbox); ?> + Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.0.3/themes/alphagrey/style.css Tue Mar 20 02:17:20 2007 @@ -1639,7 +1639,7 @@ padding-bottom:2px; } -.mailSelected:hover { +.mailSelected_select { background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; background-color:#1F5EFF; font-family: Arial, Helvetica, sans-serif; Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original) +++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Tue Mar 20 02:17:20 2007 @@ -2228,7 +2228,7 @@ padding-bottom:2px; } -.mailSelected:hover { +.mailSelected_select { background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; background-color:#1F5EFF; font-family: Arial, Helvetica, sans-serif; Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.0.3/themes/woodspice/style.css Tue Mar 20 02:17:20 2007 @@ -1681,7 +1681,7 @@ padding-bottom:2px; } -.mailSelected:hover { +.mailSelected_select { background:#E1DCB3 url(images/tabSelectedBg.gif) repeat-x; background-color:#1F5EFF; font-family: Arial, Helvetica, sans-serif; From greeting at 2000Greetings.com Mon Mar 19 14:01:00 2007 From: greeting at 2000Greetings.com (2000Greetings.com) Date: 19 Mar 2007 18:01:00 -0000 Subject: [Vtigercrm-commits] Hi, an old friend has sent you a greeting card! Message-ID: <1174327260.45794.qmail@2000Greetrings.com> An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070319/278608df/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:22:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:22:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10483 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070320092244.D95C178D33E@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:22:36 2007 New Revision: 10483 Log: fixes the search issue which was giving irrelevant results if the data was not found Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 20 03:22:36 2007 @@ -222,7 +222,7 @@ $start_message=($numEmails-(($start-1)*$mails_per_page)); } -$c=$numEmails; +//$c=$numEmails; if(!isset($_REQUEST["search"])) { $numPages = ceil($numEmails/$MailBox->mails_per_page); @@ -287,9 +287,11 @@ $searchstring = $_REQUEST["search_type"].' "'.$_REQUEST["search_input"].'"'; //echo $searchstring."
    "; $searchlist = imap_search($MailBox->mbox,$searchstring); - $num_searches = count($searchlist); - + if(is_array($searchlist)) + { + $num_searches = count($searchlist); $c=$numEmails; + } } flush(); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:34:18 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:34:18 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10484 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070320093418.E754579C63E@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:28:31 2007 New Revision: 10484 Log: reverted back the change Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Tue Mar 20 03:28:31 2007 @@ -222,7 +222,7 @@ $start_message=($numEmails-(($start-1)*$mails_per_page)); } -//$c=$numEmails; +$c=$numEmails; if(!isset($_REQUEST["search"])) { $numPages = ceil($numEmails/$MailBox->mails_per_page); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:43:52 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:43:52 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10485 - /vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Message-ID: <20070320094352.CF44779C63E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 03:43:46 2007 New Revision: 10485 Log: space problem fixed Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/UserEditView.tpl Tue Mar 20 03:43:46 2007 @@ -50,7 +50,7 @@ - +
    vtiger CRM
    -  {$MOD.LBL_MY_MAILS}   +  {$MOD.LBL_MY_MAILS}  
      @@ -94,11 +94,11 @@ Home Page" class="webMnu">{$MOD.LBL_TO_GROUPS} 

    - + {$MOD.LBL_JUNK_MAILS}  @@ -141,7 +141,7 @@
    - + @@ -155,7 +155,7 @@ {/foreach} {/foreach}
    - +
    @@ -194,11 +194,7 @@
    {$MOD.LBL_CC} 
    {$MOD.LBL_SUBJECT}
    {$MOD.LBL_DATE}
    {$MOD.LBL_DATE}
    {$MOD.LBL_ATTACHMENT} Full Email View
     
    ".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."
    "; + $flags = "
    "; } @@ -99,15 +99,15 @@ if ($mails[$start_message]->deleted) { - $listview_entries[$num][] = ''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).'            '.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).''.substr($mails[$start_message]->subject,0,50).''.substr($mails[$start_message]->date,0,30).''.substr($from,0,20).'
    ' . $html_att . ':' . $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev) . '
    ' . $html_atts . ':' . $this->link_att($mail, $attach_tab, $conf->display_part_no,$ev) . '
    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:53:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:53:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10486 - in /vtigercrm/branches/5.0.3: Smarty/templates/UserDetailView.tpl modules/Users/DetailView.php Message-ID: <20070320095303.138C17C808A@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 03:52:55 2007 New Revision: 10486 Log: Though we are disable to view audittrail, the button ViewAuditTrail was displaying Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl vtigercrm/branches/5.0.3/modules/Users/DetailView.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl Tue Mar 20 03:52:55 2007 @@ -80,7 +80,7 @@ {if $homeitems neq ''} + {$UMOD.LBL_SHOWN} {else} + {$UMOD.LBL_HIDDEN} {/if} {/foreach} Modified: vtigercrm/branches/5.0.3/modules/Users/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DetailView.php Tue Mar 20 03:52:55 2007 @@ -28,6 +28,8 @@ require_once('include/utils/UserInfoUtil.php'); require_once('include/database/PearDatabase.php'); require_once('include/utils/GetUserGroups.php'); +//to check audittrail if enable or not +require_once('user_privileges/audit_trail.php'); global $current_user; global $theme; @@ -193,6 +195,8 @@ $smarty->assign("HOMEORDER",$focus->getHomeOrder($focus->id)); $smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields)); $smarty->assign("USERNAME",$focus->last_name.' '.$focus->first_name); +//for check audittrail if it is enable or not +$smarty->assign("AUDITTRAIL",$audit_trail); $smarty->display("UserDetailView.tpl"); } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:53:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:53:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10487 - /vtigercrm/branches/5.0.3/install/4createConfigFile.php Message-ID: <20070320095310.779A97C808A@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:53:03 2007 New Revision: 10487 Log: changed to blogs Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Tue Mar 20 03:53:03 2007 @@ -235,7 +235,7 @@

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



    - The installation will take at least 4 minutes. Grab a coffee,sit back and relax or browse through our forums
    + The installation will take at least 4 minutes.

    Grab a coffee,sit back and relax or browse through our blogs


    From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:56:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:56:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10488 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070320095659.876787C8115@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 03:56:51 2007 New Revision: 10488 Log: changed message Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 20 03:56:51 2007 @@ -131,13 +131,17 @@
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2.
  • + + + +
    • -
    • You are the most important to us! -
    • -
    • -
    • Talk to us at http://forums.vtiger.com -
    • Discuss with us at http://blogs.vtiger.com +
    • You are the most important to us! We take pride in being associated with you
    +

    + Talk to us at http://forums.vtiger.com +

    + Discuss with us at http://blogs.vtiger.com From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 05:58:09 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 09:58:09 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10489 - /vtigercrm/branches/5.0.3/modules/uploads/add2db.php Message-ID: <20070320095809.2E13C7C8115@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 03:58:04 2007 New Revision: 10489 Log: fix for mysql sql_mode Modified: vtigercrm/branches/5.0.3/modules/uploads/add2db.php Modified: vtigercrm/branches/5.0.3/modules/uploads/add2db.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/uploads/add2db.php (original) +++ vtigercrm/branches/5.0.3/modules/uploads/add2db.php Tue Mar 20 03:58:04 2007 @@ -53,9 +53,10 @@ $desc = $_REQUEST['txtDescription']; $description = addslashes($desc); $date_var = $adb->formatDate(date('YmdHis')); - - $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime) values('"; - $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.")"; + $current_date = getdate(); + $current_date = $adb->formatDate(date('YmdHis')); + $query = "insert into vtiger_crmentity (crmid,smcreatorid,smownerid,setype,description,createdtime,modifiedtime) values('"; + $query .= $current_id."','".$current_user->id."','".$current_user->id."','".$_REQUEST['return_module'].' Attachment'."','".$description."',".$date_var.",".$current_date.")"; $result = $adb->query($query); # Added by DG 26 Oct 2005 From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:02:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:02:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10490 - in /vtigercrm/branches/5.0.3/modules/Webmails: conf.php get_img.php Message-ID: <20070320100239.70B747C8120@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 04:02:31 2007 New Revision: 10490 Log: files from nocc Added: vtigercrm/branches/5.0.3/modules/Webmails/conf.php vtigercrm/branches/5.0.3/modules/Webmails/get_img.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:06:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:06:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10491 - in /vtigercrm/branches/5.0.3/modules/Webmails: download.php functions.php Message-ID: <20070320100654.428757C8119@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 04:06:45 2007 New Revision: 10491 Log: files from nocc Added: vtigercrm/branches/5.0.3/modules/Webmails/download.php vtigercrm/branches/5.0.3/modules/Webmails/functions.php From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:13:41 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:13:41 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10492 - /vtigercrm/branches/5.0.3/index.php Message-ID: <20070320101341.AA6827C8119@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 04:13:35 2007 New Revision: 10492 Log: added check for the webmail image handling Modified: vtigercrm/branches/5.0.3/index.php Modified: vtigercrm/branches/5.0.3/index.php ============================================================================== --- vtigercrm/branches/5.0.3/index.php (original) +++ vtigercrm/branches/5.0.3/index.php Tue Mar 20 04:13:35 2007 @@ -282,7 +282,7 @@ (ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) || (ereg("^DetailView",$action) && ereg("^Webmails",$module) ) || ereg("^savewordtemplate",$action) || - ereg("^mailmergedownloadfile",$action)) + ereg("^mailmergedownloadfile",$action) || ereg("^Webmails",$module) && ereg("^get_img",$action) || ereg("^download",$action) ) { @@ -300,10 +300,12 @@ ereg("^chat",$action) || ereg("^vtchat",$action) || ereg("^massdelete", $action) || - ereg("^mailmergedownloadfile",$action)) + ereg("^mailmergedownloadfile",$action) || ereg("^get_img",$action) || + ereg("^download",$action) || + ereg("^massdelete", $action )) $skipFooters=true; //skip footers for all these invocations as they are mostly popups - if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^mailmergedownloadfile",$action)) + if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^mailmergedownloadfile",$action)|| ereg("^get_img",$action)) { $viewAttachment = true; } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:23:23 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:23:23 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10493 - in /vtigercrm/branches/5.0.3: include/js/en_us.lang.js include/language/en_us.lang.php modules/Reports/ReportColumns.php modules/Reports/Reports.js Message-ID: <20070320102323.527637C8119@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 04:23:13 2007 New Revision: 10493 Log: i18n added for reports columns Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/include/language/en_us.lang.php vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php vtigercrm/branches/5.0.3/modules/Reports/Reports.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Mar 20 04:23:13 2007 @@ -93,4 +93,15 @@ SELECT_TEMPLATE_TO_MERGE:'Please select a template to merge', YES:'yes', NO:'no', + + EQUALS:'equals', + NOT_EQUALS_TO:'not equal to', + STARTS_WITH:'starts with', + CONTAINS:'contains', + DOES_NOT_CONTAINS:'does not contains', + LESS_THAN:'less than', + GREATER_THAN:'greater than', + LESS_OR_EQUALS:'less or equal', + GREATER_OR_EQUALS:'greater or equal', + }; Modified: vtigercrm/branches/5.0.3/include/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/include/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/include/language/en_us.lang.php Tue Mar 20 04:23:13 2007 @@ -647,7 +647,7 @@ //Added for values of picklist in Advanced Search filter 'contains'=>'contains', 'does not contains'=>'does not contains', -'is'=>'is', +'equals'=>'equals', 'is not'=>'is not', 'begins with'=>'begins with', 'ends with'=>'ends with', @@ -828,6 +828,17 @@ 'MSG_VTIGERTEAM'=>' vTiger Team', 'MSG_IS_NOT_UPLOADED'=>'is not uploaded. Allowed file types - jpeg, png, jpg, pjpeg, x-png or gif', 'MSG_IMAGE_ERROR'=>'Image not found', + +'Information'=>'Information', +'Address'=>'Address', +'Custom Information'=>'Custom Information', +'Portal Information'=>'- Portal Information', +'Description'=>'Description', +'Expectations'=>'Expectations', +'Pricing Information'=>'Pricing Information', +'Stock Information'=>'Stock Information', +'Solution'=>'Solution', +'Terms and Conditions'=>'Terms and Conditions', ); $app_list_strings = array ( Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/ReportColumns.php Tue Mar 20 04:23:13 2007 @@ -64,6 +64,7 @@ { global $ogReport; global $app_list_strings; + global $app_strings; global $current_language; $mod_strings = return_module_language($current_language,$module); @@ -71,7 +72,8 @@ { if(isset($ogReport->pri_module_columnslist[$module][$key])) { - $shtml .= ""; + + $shtml .= ""; foreach($ogReport->pri_module_columnslist[$module][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) @@ -97,7 +99,7 @@ function getSecondaryColumnsHTML($module) { global $ogReport; - global $app_list_strings; + global $app_list_strings,$app_strings; global $current_language; if($module != "") @@ -110,7 +112,7 @@ { if(isset($ogReport->sec_module_columnslist[$secmodule[$i]][$key])) { - $shtml .= ""; + $shtml .= ""; foreach($ogReport->sec_module_columnslist[$secmodule[$i]][$key] as $field=>$fieldlabel) { if(isset($mod_strings[$fieldlabel])) Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.js (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.js Tue Mar 20 04:23:13 2007 @@ -16,15 +16,15 @@ typeofdata['D'] = ['e','n','l','g','m','h']; var fLabels = new Array(); -fLabels['e'] = 'equals'; -fLabels['n'] = 'not equal to'; -fLabels['s'] = 'starts with'; -fLabels['c'] = 'contains'; -fLabels['k'] = 'does not contain'; -fLabels['l'] = 'less than'; -fLabels['g'] = 'greater than'; -fLabels['m'] = 'less or equal'; -fLabels['h'] = 'greater or equal'; +fLabels['e'] = alert_arr.EQUALS; +fLabels['n'] = alert_arr.NOT_EQUALS_TO; +fLabels['s'] = alert_arr.STARTS_WITH; +fLabels['c'] = alert_arr.CONTAINS; +fLabels['k'] = alert_arr.DOES_NOT_CONTAINS; +fLabels['l'] = alert_arr.LESS_THAN; +fLabels['g'] = alert_arr.GREATER_THAN; +fLabels['m'] = alert_arr.LESS_OR_EQUALS; +fLabels['h'] = alert_arr.GREATER_OR_EQUALS; var noneLabel; var gcurrepfolderid=0; function trimfValues(value) From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:25:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:25:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10494 - /vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Message-ID: <20070320102559.E7E8378D24F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 04:25:52 2007 New Revision: 10494 Log: Webmails module made default Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Tue Mar 20 04:25:52 2007 @@ -167,7 +167,7 @@ { global $current_user; $this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1"); - echo "
     Could not connect to the server. Please check the server details Here "; + echo "
     Could not connect to the server. Please check the server details Here . Please click here to go to your Emails module."; exit; } } From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:28:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:28:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10495 - /vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Message-ID: <20070320102839.BF5EB78D24F@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 04:28:29 2007 New Revision: 10495 Log: Webmails module made default Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Modified: vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php Tue Mar 20 04:28:29 2007 @@ -2126,7 +2126,7 @@ $this->db->query("insert into vtiger_parenttab values (8,'Settings',8,0)"); $this->db->query("insert into vtiger_parenttabrel values (1,9,2)"); - $this->db->query("insert into vtiger_parenttabrel values (1,10,4)"); + $this->db->query("insert into vtiger_parenttabrel values (1,28,4)"); $this->db->query("insert into vtiger_parenttabrel values (1,3,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,7,1)"); $this->db->query("insert into vtiger_parenttabrel values (3,6,2)"); @@ -2159,8 +2159,8 @@ $this->db->query("insert into vtiger_parenttabrel values (2,26,1)"); $this->db->query("insert into vtiger_parenttabrel values (2,6,2)"); $this->db->query("insert into vtiger_parenttabrel values (2,4,3)"); - $this->db->query("insert into vtiger_parenttabrel values (2,10,4)"); - $this->db->query("insert into vtiger_parenttabrel values (4,10,7)"); + $this->db->query("insert into vtiger_parenttabrel values (2,28,4)"); + $this->db->query("insert into vtiger_parenttabrel values (4,28,7)"); $this->db->query("insert into vtiger_parenttabrel values (2,7,5)"); $this->db->query("insert into vtiger_parenttabrel values (2,9,6)"); $this->db->query("insert into vtiger_parenttabrel values (4,9,8)"); From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:34:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:34:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10496 - /vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat Message-ID: <20070320103416.4977878D015@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 04:34:12 2007 New Revision: 10496 Log: storage engine changed to innodb Modified: vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat Modified: vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat ============================================================================== --- vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat (original) +++ vtigercrm/branches/5.0.3/pkg/bin/startvTiger.bat Tue Mar 20 04:34:12 2007 @@ -105,7 +105,7 @@ echo "" echo "Starting MySQL on port specified by the user" echo "" -start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --datadir=../data --port=%mysql_port% +start mysqld-nt -b .. --skip-bdb --log-queries-not-using-indexes --log-slow-admin-statements --log-error --low-priority-updates --log-slow-queries=vtslowquery.log --default-storage-engine=InnoDB --datadir=../data --port=%mysql_port% %SLEEP_STR% -n 11 127.0.0.1>nul mysql --port=%mysql_port% --user=%mysql_username% --password=%mysql_password% -e "show databases" > NUL IF ERRORLEVEL 1 goto notstarted From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 06:45:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 10:45:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10497 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070320104505.C53E679C63E@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 04:45:01 2007 New Revision: 10497 Log: variable to get hostname changed Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Tue Mar 20 04:45:01 2007 @@ -27,7 +27,8 @@ // 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 = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"]; +//$web_root = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"]; +$web_root = $_ENV["HOSTNAME"] . $HTTP_SERVER_VARS["REQUEST_URI"]; $web_root = str_replace("/install.php", "", $web_root); $web_root = "http://".$web_root; From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 07:16:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 11:16:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10498 - /vtigercrm/branches/5.0.3/include/js/en_us.lang.js Message-ID: <20070320111654.9AA887C8133@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 05:16:49 2007 New Revision: 10498 Log: missed label added. --Minnie Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Tue Mar 20 05:16:49 2007 @@ -91,6 +91,7 @@ VALID_DISCOUNT_PERCENT:'Enter a valid Discount percentage', VALID_DISCOUNT_AMOUNT:'Enter a valid Discount Amount', SELECT_TEMPLATE_TO_MERGE:'Please select a template to merge', + SELECTED_MORE_THAN_ONCE:'You have selected the following product(s) more than once.', YES:'yes', NO:'no', From istick at gpro.net Tue Mar 20 07:48:06 2007 From: istick at gpro.net (Bobwhite B. Agamemnon) Date: Tue, 20 Mar 2007 11:48:06 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1589606708.20070320114806@gpro.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070320/311d6577/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Eratosthenes.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070320/311d6577/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 09:55:10 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 13:55:10 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10499 - /vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Message-ID: <20070320135510.089FB7C7F0A@vtiger.fosslabs.com> Author: jerrydgeorge Date: Tue Mar 20 07:55:01 2007 New Revision: 10499 Log: page reloaded for check mail has been done Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Tue Mar 20 07:55:01 2007 @@ -163,6 +163,8 @@ ); } function check_for_new_mail(mbox) { + window.location=window.location; +/* if(degraded_service == 'true') { window.location=window.location; return; @@ -308,6 +310,7 @@ } } ); +*/ } function periodic_event() { // NOTE: any functions you put in here may race. This could probably From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 10:03:30 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 14:03:30 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10500 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070320140330.2559A7C813C@vtiger.fosslabs.com> Author: richie Date: Tue Mar 20 08:03:24 2007 New Revision: 10500 Log: added extra statement Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Tue Mar 20 08:03:24 2007 @@ -130,7 +130,7 @@

  • Your install.php file has been renamed to install.php.txt.
  • Your install folder too has been renamed to install/.
  • Please log in using the "admin" user name and the password you entered in step 2. -
  • +
  • Do not forget to set the outgoing emailserver setup accessible from Settings->Outgoing Server @@ -142,6 +142,8 @@ Talk to us at http://forums.vtiger.com

    Discuss with us at http://blogs.vtiger.com +

    + We aim to be - simply the best. Come on over, there is space for you too! From vtigercrm-commits at vtiger.fosslabs.com Tue Mar 20 10:38:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Tue, 20 Mar 2007 14:38:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10501 - /vtigercrm/branches/5.0.3/Smarty/templates/ Message-ID: <20070320143844.05E347C814B@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 08:38:21 2007 New Revision: 10501 Log: fix for i18n issue: lots of untranslatable alt= and title= in *.tpl --Minnie Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ComposeEmail.tpl vtigercrm/branches/5.0.3/Smarty/templates/CreateEmailTemplate.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CurrencyListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldList.tpl vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl vtigercrm/branches/5.0.3/Smarty/templates/DetailViewUI.tpl vtigercrm/branches/5.0.3/Smarty/templates/DisplayFields.tpl vtigercrm/branches/5.0.3/Smarty/templates/FieldAccess.tpl vtigercrm/branches/5.0.3/Smarty/templates/GroupEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListRoles.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/OrgSharingEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/QuickCreate.tpl vtigercrm/branches/5.0.3/Smarty/templates/RoleEditView.tpl vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl vtigercrm/branches/5.0.3/Smarty/templates/SysInformation.tpl vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityEditView.tpl Tue Mar 20 08:38:21 2007 @@ -279,7 +279,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} -

  •  
    - {if $IS_ADMIN eq 'true'} + {if $IS_ADMIN eq 'true' && $AUDITTRAIL eq 'true'} {/if} {if $CATEGORY eq 'Settings'} @@ -157,10 +157,10 @@
    {$UMOD.$values} - {$UMOD.LBL_SHOWN}{$UMOD.LBL_SHOWN}{$UMOD.LBL_SHOWN} - {$UMOD.LBL_HIDDEN}{$UMOD.LBL_HIDDEN}{$UMOD.LBL_HIDDEN}
    Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.date_start} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -300,7 +300,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.due_date} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -321,7 +321,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.due_date} {assign var=date_vl value="$date_fmt"} @@ -746,7 +746,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.date_start} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -765,7 +765,7 @@ {assign var=date_val value="$date_value"} {assign var=time_val value="$time_value"} {/foreach} - Set date.. + {$MOD.LBL_SET_DATE} {foreach key=date_fmt item=date_str from=$secondvalue.due_date} {assign var=date_vl value="$date_fmt"} {/foreach} @@ -877,13 +877,13 @@
    From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 00:45:11 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 04:45:11 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10505 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070321044511.E999378D6CC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 22:45:07 2007 New Revision: 10505 Log: fix for misplaced } --Minnie Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Tue Mar 20 22:45:07 2007 @@ -427,31 +427,30 @@ if($mode=='view') { $fieldListResult = getProfile2AllFieldList($modArr,$profileId); - $field_module=array(); - $module_name=key($fieldListResult); - $module_id = getTabid($module_name); - $language_strings = return_module_language($current_language,$module_name); - for($j=0; $j"; - } - else - { - $visible = ""; - } - if($language_strings[$fieldListResult[$module_name][$j][0]] != '') - $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; - else - $field[]=$fieldListResult[$module_name][$j][0]; - $field[]=$visible; - $field_module[]=$field; - } - $privilege_field[$module_id] = array_chunk($field_module,3); - next($fieldListResult); - } + $field_module=array(); + $module_name=key($fieldListResult); + $module_id = getTabid($module_name); + $language_strings = return_module_language($current_language,$module_name); + for($j=0; $j"; + } + else + { + $visible = ""; + } + if($language_strings[$fieldListResult[$module_name][$j][0]] != '') + $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; + else + $field[]=$fieldListResult[$module_name][$j][0]; + $field[]=$visible; + $field_module[]=$field; + } + $privilege_field[$module_id] = array_chunk($field_module,3); + next($fieldListResult); } elseif($mode=='edit') { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 01:03:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 05:03:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10506 - /vtigercrm/branches/5.0.3/modules/Users/Users.php Message-ID: <20070321050321.361F378D6CC@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 23:03:16 2007 New Revision: 10506 Log: homeorder has been changed. --Minnie Modified: vtigercrm/branches/5.0.3/modules/Users/Users.php Modified: vtigercrm/branches/5.0.3/modules/Users/Users.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Users/Users.php (original) +++ vtigercrm/branches/5.0.3/modules/Users/Users.php Tue Mar 20 23:03:16 2007 @@ -112,7 +112,7 @@ var $object_name = "User"; var $user_preferences; var $defhomeview; - var $homeorder_array = array('ALVT','HDB','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); + var $homeorder_array = array('HDB','ALVT','PLVT','QLTQ','CVLVT','HLT','OLV','GRT','OLTSO','ILTI','MNL','OLTPO','LTFAQ'); var $encodeFields = Array("first_name", "last_name", "description"); From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 01:05:54 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 05:05:54 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10507 - /vtigercrm/branches/5.0.3/install/5createTables.inc.php Message-ID: <20070321050554.BFCE87C80A2@vtiger.fosslabs.com> Author: saraj Date: Tue Mar 20 23:05:50 2007 New Revision: 10507 Log: extra details added for standarduser in default data population. --Minnie Modified: vtigercrm/branches/5.0.3/install/5createTables.inc.php Modified: vtigercrm/branches/5.0.3/install/5createTables.inc.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.inc.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.inc.php Tue Mar 20 23:05:50 2007 @@ -134,6 +134,9 @@ $user->column_fields["namedays"] = ''; $user->column_fields["currency_id"] = 1; $user->column_fields["date_format"] = 'yyyy-mm-dd'; + $user->column_fields["hour_format"] = '24'; + $user->column_fields["start_hour"] = '08:00'; + $user->column_fields["end_hour"] = '23:00'; $user->column_fields["imagename"] = ''; $user->column_fields["activity_view"] = 'This Year'; $user->column_fields["lead_view"] = 'Today'; From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 02:09:59 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 06:09:59 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10508 - /vtigercrm/branches/5.0.3/modules/Reports/Reports.php Message-ID: <20070321060959.0419478D33E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 00:09:55 2007 New Revision: 10508 Log: - removed Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original) +++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Mar 21 00:09:55 2007 @@ -107,7 +107,7 @@ var $module_list = Array( "Leads"=>Array("Information"=>13,"Address"=>15,"Description"=>16,"Custom Information"=>14), - "Contacts"=>Array("Information"=>4,"- Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), + "Contacts"=>Array("Information"=>4,"Portal Information"=>6,"Address"=>7,"Description"=>8,"Custom Information"=>5), "Accounts"=>Array("Information"=>9,"Address"=>11,"Description"=>12,"Custom Information"=>10), "Potentials"=>Array("Information"=>1,"Description"=>3,"Custom Information"=>2), "Calendar"=>Array("Information"=>19,"Description"=>20), From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 02:14:04 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 06:14:04 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10509 - /vtigercrm/branches/5.0.3/include/js/en_us.lang.js Message-ID: <20070321061404.DC19478D33E@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 00:14:00 2007 New Revision: 10509 Log: message has been modified. --Minnie Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Wed Mar 21 00:14:00 2007 @@ -12,8 +12,8 @@ var alert_arr = { DELETE:'Are you sure you want to delete the selected ', RECORDS:' records?', SELECT:'Please select at least one entity', - DELETE_ACCOUNT:'Deleting this account(s) will remove its related Potentials,Quotes,Sales Orders & Invoice. Are you sure you want to delete the selected', - DELETE_VENDOR:'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected', + DELETE_ACCOUNT:'Deleting this account(s) will remove its related Potentials & Quotes. Are you sure you want to delete the selected ', + DELETE_VENDOR:'Deleting this vendor(s) will remove its related Purchase Orders. Are you sure you want to delete the selected ', SELECT_MAILID:'Please Select a mailid', OVERWRITE_EXISTING_ACCOUNT1:'Overwrite the existing address with this selected account(', OVERWRITE_EXISTING_ACCOUNT2:') address details?', From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 02:18:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 06:18:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10510 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070321061849.D71A47C8140@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 00:18:45 2007 New Revision: 10510 Log: problem in profile creation fixed Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Wed Mar 21 00:18:45 2007 @@ -427,30 +427,33 @@ if($mode=='view') { $fieldListResult = getProfile2AllFieldList($modArr,$profileId); - $field_module=array(); - $module_name=key($fieldListResult); - $module_id = getTabid($module_name); - $language_strings = return_module_language($current_language,$module_name); - for($j=0; $j"; - } - else - { - $visible = ""; - } - if($language_strings[$fieldListResult[$module_name][$j][0]] != '') - $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; - else - $field[]=$fieldListResult[$module_name][$j][0]; - $field[]=$visible; - $field_module[]=$field; - } - $privilege_field[$module_id] = array_chunk($field_module,3); - next($fieldListResult); + for($i=0; $i"; + } + else + { + $visible = ""; + } + if($language_strings[$fieldListResult[$module_name][$j][0]] != '') + $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; + else + $field[]=$fieldListResult[$module_name][$j][0]; + $field[]=$visible; + $field_module[]=$field; + } + $privilege_field[$module_id] = array_chunk($field_module,3); + next($fieldListResult); + } } elseif($mode=='edit') { From vtigercrm-commits at vtiger.fosslabs.com Wed Mar 21 03:43:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Wed, 21 Mar 2007 07:43:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10511 - /vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Message-ID: <20070321074348.9EFF27C8147@vtiger.fosslabs.com> Author: saraj Date: Wed Mar 21 01:43:44 2007 New Revision: 10511 Log: changes made to enable proper check during field view Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Modified: vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php (original) +++ vtigercrm/branches/5.0.3/modules/Settings/profilePrivileges.php Wed Mar 21 01:43:44 2007 @@ -436,13 +436,17 @@ for($j=0; $j"; + } + else + { + $visible = ""; + } if($disable_field_array[$fieldListResult[$module_name][$j][4]] == 1) { $visible = ""; - } - else - { - $visible = ""; } if($language_strings[$fieldListResult[$module_name][$j][0]] != '') $field[]=$language_strings[$fieldListResult[$module_name][$j][0]]; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 02:54:06 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 06:54:06 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10512 - /vtigercrm/tags/vtigercrm-5.0.3-rc3/ Message-ID: <20070322065406.B2CF77C813B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 00:53:54 2007 New Revision: 10512 Log: 5.0.3 version tagged for validation Added: vtigercrm/tags/vtigercrm-5.0.3-rc3/ - copied from r10511, vtigercrm/branches/5.0.3/ From thompson at granitecontracting.com Thu Mar 22 04:37:13 2007 From: thompson at granitecontracting.com (Disbar E. Ninja) Date: Thu, 22 Mar 2007 08:37:13 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6879935671.20070322083713@granitecontracting.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6fc7e5a1/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: depreciating.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070322/6fc7e5a1/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 04:43:01 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 08:43:01 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10513 - /vtigercrm/branches/5.0.3/install/4createConfigFile.php Message-ID: <20070322084301.E3C5B7C813B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 02:42:49 2007 New Revision: 10513 Log: opened link in new window, fixes #3300 Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php Modified: vtigercrm/branches/5.0.3/install/4createConfigFile.php ============================================================================== --- vtigercrm/branches/5.0.3/install/4createConfigFile.php (original) +++ vtigercrm/branches/5.0.3/install/4createConfigFile.php Thu Mar 22 02:42:49 2007 @@ -235,7 +235,7 @@

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



    - The installation will take at least 4 minutes.

    Grab a coffee,sit back and relax or browse through our blogs
    + The installation will take at least 4 minutes.

    Grab a coffee,sit back and relax or browse through our blogs


    From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 04:47:26 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 08:47:26 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10514 - /vtigercrm/branches/5.0.3/install/5createTables.php Message-ID: <20070322084727.2ABB97C8159@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 02:46:57 2007 New Revision: 10514 Log: opened link in new window, fixes #3280 Modified: vtigercrm/branches/5.0.3/install/5createTables.php Modified: vtigercrm/branches/5.0.3/install/5createTables.php ============================================================================== --- vtigercrm/branches/5.0.3/install/5createTables.php (original) +++ vtigercrm/branches/5.0.3/install/5createTables.php Thu Mar 22 02:46:57 2007 @@ -139,9 +139,9 @@
  • You are the most important to us! We take pride in being associated with you

    - Talk to us at http://forums.vtiger.com + Talk to us at forums

    - Discuss with us at http://blogs.vtiger.com + Discuss with us at blogs

    We aim to be - simply the best. Come on over, there is space for you too! From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 04:57:33 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 08:57:33 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10515 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070322085733.906727C8174@vtiger.fosslabs.com> Author: richie Date: Thu Mar 22 02:57:26 2007 New Revision: 10515 Log: another variable added to avoid empty hostname Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Thu Mar 22 02:57:26 2007 @@ -28,7 +28,8 @@ //$web_root = $_SERVER['SERVER_NAME']. ":" .$_SERVER['SERVER_PORT'].$_SERVER['PHP_SELF']; //$web_root = $hostname.$_SERVER['PHP_SELF']; //$web_root = $HTTP_SERVER_VARS["HTTP_HOST"] . $HTTP_SERVER_VARS["REQUEST_URI"]; -$web_root = $_ENV["HOSTNAME"] . $HTTP_SERVER_VARS["REQUEST_URI"]; +$web_root = ($_ENV["HOSTNAME"]=='')? $HTTP_SERVER_VARS["HTTP_HOST"]:$_ENV["HOSTNAME"]; +$web_root .= $HTTP_SERVER_VARS["REQUEST_URI"]; $web_root = str_replace("/install.php", "", $web_root); $web_root = "http://".$web_root; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 22 05:34:27 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 22 Mar 2007 09:34:27 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10516 - in /vtigercrm/branches/5.0.3: Smarty/templates/Webmails.tpl include/js/en_us.lang.js modules/Webmails/ListView.php modules/Webmails/Webmails.js modules/Webmails/Webmails.php modules/Webmails/language/en_us.lang.php Message-ID: <20070322093427.C257F7C8181@vtiger.fosslabs.com> Author: jerrydgeorge Date: Thu Mar 22 03:33:40 2007 New Revision: 10516 Log: Issues in Webmails has been fixed Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl vtigercrm/branches/5.0.3/include/js/en_us.lang.js vtigercrm/branches/5.0.3/modules/Webmails/ListView.php vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js vtigercrm/branches/5.0.3/modules/Webmails/Webmails.php vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/Webmails.tpl Thu Mar 22 03:33:40 2007 @@ -115,15 +115,8 @@ {if $DEGRADED_SERVICE eq 'false'}

  • {$APP.LBL_SEARCH}  -   -   +   + {$SEARCH_HTML}  @@ -253,9 +246,9 @@ {rdelim} var gselected_mail = ''; {if $smarty.request.mailbox.value neq ''} -var gCurrentFolder = '{$smarty.request.mailbox}'; + var gCurrentFolder = '{$smarty.request.mailbox}'; {else} -var gCurrentFolder = 'INBOX'; + var gCurrentFolder = 'INBOX'; {/if} {literal} function makeSelected(rowId) Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Thu Mar 22 03:33:40 2007 @@ -94,7 +94,7 @@ SELECTED_MORE_THAN_ONCE:'You have selected the following product(s) more than once.', YES:'yes', NO:'no', - + MAIL:'mail', EQUALS:'equals', NOT_EQUALS_TO:'not equal to', STARTS_WITH:'starts with', @@ -104,5 +104,4 @@ GREATER_THAN:'greater than', LESS_OR_EQUALS:'less or equal', GREATER_OR_EQUALS:'greater or equal', - }; Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Thu Mar 22 03:33:40 2007 @@ -186,7 +186,14 @@ global $displayed_msgs; // AJAX commands (should be moved) if($_POST["command"] == "move_msg" && $_POST["ajax"] == "true") { - imap_mail_move($MailBox->mbox,$_REQUEST["mailid"],$_REQUEST["mvbox"]); + if(isset($_REQUEST["mailid"]) && $_REQUEST["mailid"] != '') + { + $mailids = explode(':',$_REQUEST["mailid"]); + } + foreach($mailids as $mailid) + { + imap_mail_move($MailBox->mbox,$mailid,$_REQUEST["mvbox"]); + } imap_close($MailBox->mbox); echo "SUCCESS"; flush(); @@ -253,7 +260,7 @@ foreach ($overview as $val) { $mails[$val->msgno] = $val; - $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); + $hdr = @imap_headerinfo($MailBox->mbox, $val->msgno); //Added to get the UTF-8 string - 30-11-06 - Mickie //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); @@ -274,6 +281,7 @@ } echo ""; +$search_fields = Array("SUBJECT","BODY","TO","CC","BCC","FROM"); $listview_header = array("".$mod_strings['LBL_INFO']."".$mod_strings['LBL_LIST_SUBJECT']."".$mod_strings['LABEL_DATE']."".$mod_strings['LABEL_FROM']."".$mod_strings['LBL_DEL']."'.$mod_strings['LBL_NO_EMAILS'].'
    - - - - -
    Configuration Wizardvtiger CRM 5
    - - - - - -
    - - - - -
    - - - - - - -
    - - - - - - - - - - -
    Welcome
    Installation Check
    System Configuration
    Confirm Settings
    Config File Creation
    Database Generation
    Finish
    - -
    - -
    - - - - - - - - -
    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 are unsure of your database host, username or password, we suggest that you use the default - values below.

    - - *- required information - - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Database Configuration
    Database Type * - - No Database Support Detected - - - - - - -
    Host Name *" />
    User Name *" />
    Password" />
    Database Name *" />  - - - - - -  Create Database(will drop the database if exists)
    Root Username *
    Root Password
    - -

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

    - - - - - - - - - - - - - - - - - - - - - -
    Admin Configuration
    User nameadmin
    Password*">
    Email*">
    Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
    - -

    - - - - - - - - - - - - - - - - - -
    Currency Configuration
    Name*">
    Symbol*">
    Code*">
    - - -
    - - -
    -
    -
    -
    - -
    -
    - - - - - -
    - - - - -
    - - - - - -
    www.vtiger.com
    - - - +$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; + + if (isset($_REQUEST['db_username'])) + $db_username = $_REQUEST['db_username']; + elseif (isset($dbconfig['db_username'])) + $db_username = $dbconfig['db_username']; + + if (isset($_REQUEST['db_password'])) + $db_password = $_REQUEST['db_password']; + elseif (isset($dbconfig['db_password'])) + $db_password = $dbconfig['db_password']; + + if (isset($_REQUEST['db_type'])) + $db_type = $_REQUEST['db_type']; + elseif (isset($dbconfig['db_type'])) + $db_type = $dbconfig['db_type']; + + if (isset($_REQUEST['db_name'])) + $db_name = $_REQUEST['db_name']; + elseif (isset($dbconfig['db_name']) && $dbconfig['db_name']!='_DBC_NAME_') + $db_name = $dbconfig['db_name']; + else + $db_name = 'vtigercrm503'; + + !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']; + elseif (isset($site_URL) && $site_URL!='_SITE_URL_') + $site_URL = $site_URL; + else $site_URL = $web_root; + + if(isset($_REQUEST['root_directory'])) $root_directory = $_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']; + + if (isset($_REQUEST['currency_name'])) + $currency_name = $_REQUEST['currency_name']; + else + $currency_name = ''; + + if (isset($_REQUEST['currency_symbol'])) + $currency_symbol = $_REQUEST['currency_symbol']; + + if (isset($_REQUEST['currency_code'])) + $currency_code = $_REQUEST['currency_code']; + + } + else { + !isset($_REQUEST['db_hostname']) ? $db_hostname = $hostname: $db_hostname = $_REQUEST['db_hostname']; + !isset($_REQUEST['db_name']) ? $db_name = "vtigercrm503" : $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']; + } + !isset($_REQUEST['check_createdb']) ? $check_createdb = "" : $check_createdb = $_REQUEST['check_createdb']; + !isset($_REQUEST['root_user']) ? $root_user = "" : $root_user = $_REQUEST['root_user']; + !isset($_REQUEST['root_password']) ? $root_password = "" : $root_password = $_REQUEST['root_password']; + // determine database options + $db_options = array(); + if(function_exists('mysql_connect')) { + $db_options['mysql'] = 'MySQL'; + } + if(function_exists('pg_connect')) { + $db_options['pgsql'] = 'Postgres'; + } +?> + + + + + + vtiger CRM 5 - Configuration Wizard - System Configuration + + + + + + + + +


    + + + + + + + +
    Configuration Wizardvtiger CRM 5
    + + + + + +
    + + + + +
    + + + + + + +
    + + + + + + + + + + +
    Welcome
    Installation Check
    System Configuration
    Confirm Settings
    Config File Creation
    Database Generation
    Finish
    + +
    + +
    + + + + + + + + +
    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 are unsure of your database host, username or password, we suggest that you use the default + values below.

    + + *- required information + + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Database Configuration
    Database Type * + + No Database Support Detected + + + + + + +
    Host Name *" />
    User Name *" />
    Password" />
    Database Name *" />  + + + + + +  Create Database(will drop the database if exists)
    Root Username *
    Root Password
    + +

    + + + + + + + + + + + + + + + + + + +
    Site Configuration
    URL * +
    Path *" size="40" />
    Path to Cache Directory *
    (must be writable)
    +

    + + + + + + + + + + + + + + + + + + + + + +
    Admin Configuration
    User nameadmin
    Password*">
    Email*">
    Note: The default password is 'admin'. You can change the password if necessary now or else you can change it later after logging-in.
    + +

    + + + + This will setup the + default currency which will be used for maintaining + transactions in vtiger. + + + + + + + + + + + + + +
    Currency + Configuration
    Name*">
    Symbol*">
    Code*">
    + + +
    + + +
    +
    +
    +
    + +
    +
    + + + + + +
    + + + + +
    + + + + + +
    www.vtiger.com
    + + + From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:04:39 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:04:39 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10520 - /vtigercrm/branches/5.0.3/cron/jobstartwindows.bat Message-ID: <20070329100439.04F267D2622@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 29 04:04:15 2007 New Revision: 10520 Log: url changed Modified: vtigercrm/branches/5.0.3/cron/jobstartwindows.bat Modified: vtigercrm/branches/5.0.3/cron/jobstartwindows.bat ============================================================================== --- vtigercrm/branches/5.0.3/cron/jobstartwindows.bat (original) +++ vtigercrm/branches/5.0.3/cron/jobstartwindows.bat Thu Mar 29 04:04:15 2007 @@ -2,4 +2,4 @@ set SCH_INSTALL=%1 FOR %%X in (%SCH_INSTALL%) DO SET SCH_INSTALL=%%~sX schtasks /create /tn "vtigerCRM Notification Scheduler" /tr %SCH_INSTALL%\apache\htdocs\vtigerCRM\cron\intimateTaskStatus.bat /sc daily /st 11:00:00 /RU SYSTEM -schtasks /create /tn "vtigerCRM Email Reminder" /tr %SCH_INSTALL%\apache\htdocs\vtigerCRM\modules\Activities\SendReminder.bat /sc minute /mo 1 /RU SYSTEM +schtasks /create /tn "vtigerCRM Email Reminder" /tr %SCH_INSTALL%\apache\htdocs\vtigerCRM\modules\Calendar\SendReminder.bat /sc minute /mo 1 /RU SYSTEM From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:09:48 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:09:48 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10521 - /vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Message-ID: <20070329100949.137267D261B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 04:09:43 2007 New Revision: 10521 Log: Fixes #3468 Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Modified: vtigercrm/branches/5.0.3/include/utils/CommonUtils.php ============================================================================== --- vtigercrm/branches/5.0.3/include/utils/CommonUtils.php (original) +++ vtigercrm/branches/5.0.3/include/utils/CommonUtils.php Thu Mar 29 04:09:43 2007 @@ -2059,7 +2059,7 @@ $description .= $app_strings['MSG_THE'].' '.$mod_name.' '.$app_strings['MSG_HAS_BEEN_ASSIGNED_TO_YOU'].'.'; } $description .= '
    '.$app_strings['MSG_THE'].' '.$mod_name.' '.$app_strings['MSG_DETAILS_ARE'].':

    '; - $description .= $mod_name.' '.$app_strings['MSG_ID'].' '.$focus->id.'
    '; + $description .= $mod_name.' '.$app_strings['MSG_ID'].' '.''.$focus->id.'
    '; foreach($object_column_fields as $fieldname => $fieldlabel) { //Get the translated string From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:16:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:16:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10522 - /vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503.php Message-ID: <20070329101638.A1A3F7D2623@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 29 04:16:34 2007 New Revision: 10522 Log: * Removed this file because we have included 503 RC2 migration so that this file contents will be added in the file 502_503rc2.php Removed: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503.php From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 06:23:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 10:23:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10523 - in /vtigercrm/branches/5.0.3/modules/Migration: DBChanges/42P2_to_50.php DBChanges/501_to_502.php DBChanges/502_to_503rc2.php DBChanges/503rc2_to_503.php PatchApply.php versions.php Message-ID: <20070329102338.7ADE37D262B@vtiger.fosslabs.com> Author: saraj Date: Thu Mar 29 04:23:29 2007 New Revision: 10523 Log: * Added 503 RC2 migration in the script and added some debug logs Added: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503rc2.php (with props) vtigercrm/branches/5.0.3/modules/Migration/DBChanges/503rc2_to_503.php Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php vtigercrm/branches/5.0.3/modules/Migration/versions.php Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php Thu Mar 29 04:23:29 2007 @@ -19,18 +19,15 @@ global $query_count, $success_query_count, $failure_query_count; global $success_query_array, $failure_query_array; +$migrationlog->debug("\n\nDB Changes from 4.2.x to 5.0 GA -------- Starts \n\n"); + //Added to put prefix vtiger_ in some of the columns in tables which are used for CV and Reports and field -- 23-06-06 $migrationlog->debug("Going to rename the table names with prefix vtiger_"); include("modules/Migration/rename_tables.php"); $migrationlog->debug("Renaming the table names with prefix vtiger_ has been finished"); - - - - $migrationlog->debug("Database Modifications for 4.2 Patch2 ==> 5.0(Alpha) Dev 3 Starts here."); - //These changes have been made in 4.2.3. The following queries have been included who has run the migration from 4.2 Patch2 @@ -4052,6 +4049,7 @@ } +$migrationlog->debug("\n\nDB Changes from 4.2.x to 5.0 GA -------- Ends \n\n"); //Added to get the conversion rate and update for all records @@ -4118,7 +4116,7 @@ '.$query.' '; $failure_query_array[$failure_query_count++] = $query; - $migrationlog->debug("Query Failed ==> $query"); + $migrationlog->debug("Query Failed ==> $query \n Error is ==> [".$conn->database->ErrorNo()."]".$conn->database->ErrorMsg()); //$migrationlog->debug("Error is ==> ".$conn->ErrorMsg()); } } Modified: vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php Thu Mar 29 04:23:29 2007 @@ -12,6 +12,8 @@ //5.0.2 database changes - added on 27-10-06 global $adb; + +$migrationlog->debug("\n\nDB Changes from 5.0.1 to 5.0.2 -------- Starts \n\n"); //Query added to show Manufacturer field in Products module ExecuteQuery("update vtiger_field set displaytype=1,block=31 where tabid=14 and block=1"); @@ -63,5 +65,6 @@ //echo "
      5.0/5.0.1 ==> 5.0.2 Database changes has been done.
    "; +$migrationlog->debug("\n\nDB Changes from 5.0.1 to 5.0.2 -------- Ends \n\n"); ?> Modified: vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php Thu Mar 29 04:23:29 2007 @@ -10,6 +10,7 @@ ********************************************************************************/ include("modules/Migration/versions.php"); +$migrationlog =& LoggerManager::getLogger('MIGRATION'); //global $vtiger_current_version; if($_REQUEST['source_version'] != '') @@ -76,8 +77,11 @@ echo '

    Failed Queries Log
    '; - foreach($failure_query_array as $failed_query) - echo '
    '.$failed_query.';'; + if(is_array($failure_query_array)) + foreach($failure_query_array as $failed_query) + echo '
    '.$failed_query.';'; + else + echo '
    No queries failed during Patch Update.'; echo '
    '; //echo "Failed Queries ==>
    ";print_r($failure_query_array);echo '
    '; @@ -109,6 +113,7 @@ '.$query.' '; $success_query_array[$success_query_count++] = $query; + $migrationlog->debug("Query Success ==> $query"); } else { @@ -119,16 +124,9 @@ '.$query.' '; $failure_query_array[$failure_query_count++] = $query; + $migrationlog->debug("Query Failed ==> $query \n Error is ==> [".$adb->database->ErrorNo()."]".$adb->database->ErrorMsg()); } } - - - - - - - - ?> Modified: vtigercrm/branches/5.0.3/modules/Migration/versions.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Migration/versions.php (original) +++ vtigercrm/branches/5.0.3/modules/Migration/versions.php Thu Mar 29 04:23:29 2007 @@ -16,6 +16,7 @@ "50"=>"5.0", "501"=>"5.0.1", "502"=>"5.0.2", + "503rc2"=>"5.0.3 RC2", ); $current_version = '503'; From scottmk at gracebaptists.com Thu Mar 29 04:26:45 2007 From: scottmk at gracebaptists.com (Projector Q. Antihistamine) Date: Thu, 29 Mar 2007 04:26:45 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <9769422677.20070329042645@gracebaptists.com> Huh.. I bet you can! Just buy MUST HAVE medication called Viagra and you'll have unbelievable sex 24/7!!! Licensed Viagra and Cialis we are presenting would improve your sexual life in few moments. Cheapest prices, Instant shipping worldwide, Secure purchase HERE: http://commiserationzul.com any pill you need! Absolutely Confidential and Secure purchase From istomin at gps.ca Thu Mar 29 04:17:47 2007 From: istomin at gps.ca (Myopia J. Skyjackers) Date: Thu, 29 Mar 2007 04:17:47 -0400 Subject: [Vtigercrm-commits] Any health troubles? Message-ID: <7864338963.20070329041747@gps.ca> Viagra will help you in any situation. Buy Licensed and Quality Viagra or Cialis at US Drug store now and you'll be at the top all night long! http://commiserationzul.com verified by VISA and certified by CIPA. From kendrick at glebecentre.ca Thu Mar 29 07:08:07 2007 From: kendrick at glebecentre.ca (Upper K. Nightmares) Date: Thu, 29 Mar 2007 11:08:07 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5353485645.20070329110807@glebecentre.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/5d2326fc/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: escapism.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/5d2326fc/attachment.gif From juergen at glorypolyfilms.com Thu Mar 29 12:17:32 2007 From: juergen at glorypolyfilms.com (Enthusiastically F. Hemispheric) Date: Thu, 29 Mar 2007 12:17:32 -0400 Subject: [Vtigercrm-commits] Don't have time to visit local drug store? Message-ID: <0608357559.20070329121732@glorypolyfilms.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://commiserationzul.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From extremedx at greencard-us.org Thu Mar 29 07:26:27 2007 From: extremedx at greencard-us.org (Cohesion A. Miltiades) Date: Thu, 29 Mar 2007 07:26:27 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <1015093807.20070329072627@greencard-us.org> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://commiserationzul.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/0dc41792/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 08:44:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 12:44:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10524 - /vtigercrm/branches/5.0.3/modules/Emails/EditView.php Message-ID: <20070329124405.516F77D2617@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 06:44:01 2007 New Revision: 10524 Log: passed array as parameter Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php Modified: vtigercrm/branches/5.0.3/modules/Emails/EditView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Emails/EditView.php (original) +++ vtigercrm/branches/5.0.3/modules/Emails/EditView.php Thu Mar 29 06:44:01 2007 @@ -142,7 +142,8 @@ $mbox = $MailBox->mbox; $webmail = new Webmails($mbox,$mailid); - $webmail->loadMail(); + $array_tab = Array(); + $webmail->loadMail($array_tab); $hdr = @imap_headerinfo($mbox, $mailid); $smarty->assign('WEBMAIL',"true"); if($_REQUEST["reply"] == "all") { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 09:32:25 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:32:25 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10525 - /vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Message-ID: <20070329133225.63DB07D260B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:32:21 2007 New Revision: 10525 Log: changed the css name Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Modified: vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Webmails.js Thu Mar 29 07:32:21 2007 @@ -106,7 +106,7 @@ // TODO: update this function to allow you to set what entity type // you would like to associate to var rowId = "row_"+mid; - $(rowId).className = "unread_email"; + $(rowId).className = "qualify_email"; $("status").style.display="block"; new Ajax.Request( 'index.php', From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 09:33:44 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:33:44 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10526 - /vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Message-ID: <20070329133344.25C737D261C@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:33:39 2007 New Revision: 10526 Log: added a css entry for qualify email Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Modified: vtigercrm/branches/5.0.3/themes/bluelagoon/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/bluelagoon/style.css (original) +++ vtigercrm/branches/5.0.3/themes/bluelagoon/style.css Thu Mar 29 07:33:39 2007 @@ -1603,6 +1603,15 @@ .unread_email:hover{ font-weight:bold; } + + + + +.qualify_email { + font-weight:bold; + background-color:#FF7F50; + + } .delete_email { From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 09:34:21 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:34:21 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10527 - /vtigercrm/branches/5.0.3/themes/alphagrey/style.css Message-ID: <20070329133422.07CA27D261C@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:34:18 2007 New Revision: 10527 Log: added a css entry for qualify email Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css Modified: vtigercrm/branches/5.0.3/themes/alphagrey/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/alphagrey/style.css (original) +++ vtigercrm/branches/5.0.3/themes/alphagrey/style.css Thu Mar 29 07:34:18 2007 @@ -1628,6 +1628,14 @@ background-color:#FF5151; } +.qualify_email { + font-weight:bold; + background-color:#CDB5CD; + + } + + + .mailSelected { font-family: Arial, Helvetica, sans-serif; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 09:34:55 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 13:34:55 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10528 - /vtigercrm/branches/5.0.3/themes/woodspice/style.css Message-ID: <20070329133455.EEA1E7D260B@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 07:34:51 2007 New Revision: 10528 Log: added a css entry for qualify email Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css Modified: vtigercrm/branches/5.0.3/themes/woodspice/style.css ============================================================================== --- vtigercrm/branches/5.0.3/themes/woodspice/style.css (original) +++ vtigercrm/branches/5.0.3/themes/woodspice/style.css Thu Mar 29 07:34:51 2007 @@ -1665,6 +1665,15 @@ font-weight:bold; background-color:#00FF00; } + + +.qualify_email { + font-weight:bold; + background-color:#FFA500; + + } + + .delete_email { font-weight:bold; background-color:#FF5151; From joyner at granite.k12.ok.us Thu Mar 29 15:16:02 2007 From: joyner at granite.k12.ok.us (Subprograms O. Difficulties) Date: Thu, 29 Mar 2007 15:16:02 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6933616930.20070329151602@granite.k12.ok.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/1059236b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Benet.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/1059236b/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 11:25:20 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 15:25:20 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10529 - in /vtigercrm/branches/5.0.3/modules/Webmails: DetailView.php Save.php Message-ID: <20070329152520.7F8CD7C43F4@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 09:25:13 2007 New Revision: 10529 Log: passed array as parameter Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php vtigercrm/branches/5.0.3/modules/Webmails/Save.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/DetailView.php Thu Mar 29 09:25:13 2007 @@ -40,8 +40,8 @@ echo ''; echo ''; - -$webmail->loadMail(); +$array_tab = Array(); +$webmail->loadMail($array_tab); echo ''; Modified: vtigercrm/branches/5.0.3/modules/Webmails/Save.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/Save.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/Save.php Thu Mar 29 09:25:13 2007 @@ -33,8 +33,8 @@ $email = new Webmails($MailBox->mbox, $_REQUEST["mailid"]); $subject = $email->subject; $date = $email->date; - -$email->loadMail(); +$array_tab = Array(); +$email->loadMail($array_tab); $msgData = $email->body; $focus->column_fields['subject']=$subject; From vtigercrm-commits at vtiger.fosslabs.com Thu Mar 29 11:29:02 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Thu, 29 Mar 2007 15:29:02 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10530 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070329152902.D0FCD7D2609@vtiger.fosslabs.com> Author: richie Date: Thu Mar 29 09:28:58 2007 New Revision: 10530 Log: string added for Loading Image message Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Thu Mar 29 09:28:58 2007 @@ -155,6 +155,7 @@ 'FROM' => 'From:', 'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', - +//Added for 5.0.3 +'LBL_LOADING_IMAGE' => 'Loading Image', ); ?> From isthistaken at greerdesigns.com Thu Mar 29 10:18:03 2007 From: isthistaken at greerdesigns.com (Cavort T. Detonated) Date: Thu, 29 Mar 2007 10:18:03 -0400 Subject: [Vtigercrm-commits] You can't find cure that you need? Message-ID: <0269172661.20070329101803@greerdesigns.com> Or you are afraid that she meets with someone who is better than you in bed? Use licensed Viagra and Cialis pills from our drug store. Now you are the best, you have perfect sex in your life! That is US Drug store with quality ED medications! http://commiserationzul.com Completely secure and confidential purchase. Instant shipping worldwide. From extremsp at gimns.com Thu Mar 29 12:40:28 2007 From: extremsp at gimns.com (Atrophied V. Internals) Date: Thu, 29 Mar 2007 16:40:28 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7392930205.20070329164028@gimns.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/d8a17938/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: God.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/d8a17938/attachment.gif From extradoors at gmbdesign.com Thu Mar 29 13:39:50 2007 From: extradoors at gmbdesign.com (Democritus H. Screwball) Date: Thu, 29 Mar 2007 13:39:50 -0400 Subject: [Vtigercrm-commits] Can you satisfy your girlfriend? Message-ID: <4633394294.20070329133950@gmbdesign.com> U can restore your health right now. Doesn't matter what is the problem - we have pills to cure everything. Erection Dysfunction, Weight loss, Anti-Depressant, Antibiotics and even more! Fantastic low prices! Instant shipping directly from our warehouses! Licensed medications you can by right now! http://commiserationzul.com Only Secure and Confidential purchase! Verified buy VISA! From istmas at goodluckmojo-jpn.com Thu Mar 29 18:38:52 2007 From: istmas at goodluckmojo-jpn.com (Communing S. Asteroid) Date: Thu, 29 Mar 2007 18:38:52 -0400 Subject: [Vtigercrm-commits] Don't waste your time. Cheap pills are here. Message-ID: <9175458500.20070329183852@goodluckmojo-jpn.com> Most wanted pills at LOW price! http://commiserationzul.com Completely secure and confidential purchase. Instant shipping worldwide. From extremefearclan at ggiroux.par32.com Thu Mar 29 14:17:24 2007 From: extremefearclan at ggiroux.par32.com (Dr. Richard French) Date: Thu, 29 Mar 2007 18:17:24 +0000 Subject: [Vtigercrm-commits] Power penis Message-ID: <8773727141.20070329181724@ggiroux.par32.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/7beca371/attachment-0001.html From sadecker at goatsucker.com Thu Mar 29 11:52:49 2007 From: sadecker at goatsucker.com (Holdup M. Polanski) Date: Thu, 29 Mar 2007 11:52:49 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <2407860745.20070329115249@goatsucker.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://commiserationzul.com We are verified by VISA. Confidential purchase. Friendly support. Everything only for you! From istcs at giskard.com Thu Mar 29 22:10:26 2007 From: istcs at giskard.com (Descender R. Prizefight) Date: Thu, 29 Mar 2007 22:10:26 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5554561300.20070329221026@giskard.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/6adc5fb7/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: tranquiler.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/6adc5fb7/attachment.gif From aw at globteam.com Thu Mar 29 17:23:00 2007 From: aw at globteam.com (Volcanoes P. Drawers) Date: Thu, 29 Mar 2007 21:23:00 +0000 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <2771913118.20070329212300@globteam.com> The most powerful medicines for you! Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Clarinex - $2.72 - non-drowsy 24-hour relief from allergy symptoms caused by seasonal allergens such as ragweed, grass, tree pollen and year-round allergens such as dust mites, animal dander, and mould spores. Quick Bust - $35.99 - Get the shape and size you always wanted with natural breast enhancing capsules. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From rjls at globaldarkness.com Thu Mar 29 23:17:21 2007 From: rjls at globaldarkness.com (Puppy D. Guttered) Date: Thu, 29 Mar 2007 23:17:21 -0400 Subject: [Vtigercrm-commits] Unbelievable! U can be healthy! Message-ID: <0034391282.20070329231721@globaldarkness.com> Just buy Viagra or Cialis pills at Canadian Pharmacy store and you'll solve all your sexual problems! Perfect sex all night and day long! Penis Enlargement Pills will help you with you small size. http://scapeidaa.com Verified by VISA and sell FDA Approved Drugs only! From marzette at gls-denmark.com Thu Mar 29 18:52:28 2007 From: marzette at gls-denmark.com (Providing G. Diminuendo) Date: Thu, 29 Mar 2007 18:52:28 -0400 Subject: [Vtigercrm-commits] V1 agra vs sexual disorder Message-ID: <9860287156.20070329185228@gls-denmark.com> The most powerful medicines for you! Zovirax - $1.6 - the treatment of herpes simplex virus infections of the skin and mucous membranes including initial and recurrent genital herpes. Hangover Pills - $35.99 Uncle Rummies Hangover Pills are an all-natural dietary supplement providing protection from the "morning after" symptoms experienced after prolonged or excessive alcohol consumption. If taken as directed, Uncle Rummie's Hangover Helper can completely eliminate unpleasant side-effects such as headaches, nausea and dehydration. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From sdallen at griffinsecurities.com Thu Mar 29 16:12:02 2007 From: sdallen at griffinsecurities.com (Marginal J. Dross) Date: Thu, 29 Mar 2007 16:12:02 -0400 Subject: [Vtigercrm-commits] Want to be a hero in a bed? Message-ID: <0754099448.20070329161202@griffinsecurities.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://scapeidaa.com Recover your health! Completely confidential and secure purchase! Licensed medications only! From lycanthus at dpweb.vendaregroup.com Fri Mar 30 02:32:29 2007 From: lycanthus at dpweb.vendaregroup.com (Studentship S. Dictatorial) Date: Fri, 30 Mar 2007 02:32:29 -0400 Subject: [Vtigercrm-commits] Straining yourself when you are with woman? Message-ID: <5366758538.20070330023229@gmmsolutions.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://scapeidaa.com And improve your sexual life! Only Confidential purchase. Verified by VISA! From istapa at greenzap.com Thu Mar 29 22:54:01 2007 From: istapa at greenzap.com (Gluts S. Zanier) Date: Fri, 30 Mar 2007 02:54:01 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <9552183482.20070330025401@greenzap.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/d6b2f48c/attachment-0001.html From cat at globecities.com Thu Mar 29 23:03:41 2007 From: cat at globecities.com (Pass V. Liquidity) Date: Thu, 29 Mar 2007 23:03:41 -0400 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <3407788765.20070329230341@globecities.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/a5f0ed82/attachment-0001.html From istem at glucotrak.com Thu Mar 29 20:52:57 2007 From: istem at glucotrak.com (Natalie Shepherd) Date: Thu, 29 Mar 2007 20:52:57 -0400 Subject: [Vtigercrm-commits] snishoditelno chto Message-ID: <8481415627.20070329205257@glucotrak.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070329/7b4dfa37/attachment-0001.html From gabriel at goldline.ca Thu Mar 29 23:34:59 2007 From: gabriel at goldline.ca (Handshaking B. Indelible) Date: Fri, 30 Mar 2007 03:34:59 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4159599721.20070330033459@goldline.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/3c63712c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Ana.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/3c63712c/attachment.gif From weiss at gospelpianostudio.com Fri Mar 30 04:52:44 2007 From: weiss at gospelpianostudio.com (Impudence G. Tyro) Date: Fri, 30 Mar 2007 04:52:44 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <6860725471.20070330045244@gospelpianostudio.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/ece6c7b5/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: persecution.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/ece6c7b5/attachment.gif From istahy at grasshopperpie.com Thu Mar 29 23:20:21 2007 From: istahy at grasshopperpie.com (Juliennes L. Slater) Date: Thu, 29 Mar 2007 23:20:21 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <9797152699.20070329232021@grasshopperpie.com> Bring back that time when girls were yours. Buy Viagra or Cialis pills at My Canadian Pharmacy store! Cheapest prices, Instant shipping! ALL MEDICATIONS ARE LICENSED! Click here to become sex giant: http://scapeidaa.com Make SECURE and CONFIDENTIAL purchase now. Don't waste your time. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 02:50:29 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 06:50:29 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10531 - /vtigercrm/branches/5.0.3/include/js/en_us.lang.js Message-ID: <20070330065029.6AB357D262B@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 30 00:50:25 2007 New Revision: 10531 Log: removed comma Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js Modified: vtigercrm/branches/5.0.3/include/js/en_us.lang.js ============================================================================== --- vtigercrm/branches/5.0.3/include/js/en_us.lang.js (original) +++ vtigercrm/branches/5.0.3/include/js/en_us.lang.js Fri Mar 30 00:50:25 2007 @@ -103,5 +103,5 @@ LESS_THAN:'less than', GREATER_THAN:'greater than', LESS_OR_EQUALS:'less or equal', - GREATER_OR_EQUALS:'greater or equal', + GREATER_OR_EQUALS:'greater or equal' }; From samuraiblu at park.funnel.revenuedirect.com.akadns.net Fri Mar 30 02:28:25 2007 From: samuraiblu at park.funnel.revenuedirect.com.akadns.net (Waylon Barnes) Date: Fri, 30 Mar 2007 02:28:25 -0400 Subject: [Vtigercrm-commits] bylo poniala Message-ID: <6902284103.20070330022825@gravitystormz.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/921db226/attachment-0001.html From extrk at gmsaudit.com Fri Mar 30 04:59:18 2007 From: extrk at gmsaudit.com (Westminster U. Irresistibly) Date: Fri, 30 Mar 2007 04:59:18 -0400 Subject: [Vtigercrm-commits] U won't believe! Message-ID: <8226476508.20070330045918@gmsaudit.com> LegalRXMedications drug store gives you opportunity to recover your health. Do it now! Viagra, Cialis, Valium, Levitra and even more medications you can buy here: http://scapeidaa.com ONLY! From highams at gokcenlawoffice.com Fri Mar 30 09:57:45 2007 From: highams at gokcenlawoffice.com (Festoons M. Cardboard) Date: Fri, 30 Mar 2007 09:57:45 -0400 Subject: [Vtigercrm-commits] Tired with sexual troubles? Message-ID: <5441090302.20070330095745@gokcenlawoffice.com> That is true! U can buy any medications that you need at Canadian Pharmacy store. Lowest prices on the web! Become healthy without huge spendings now! http://scapeidaa.com Get licensed mediations that you need! Secure and confidential purchase. We are verified by VISA! From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 05:45:43 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 09:45:43 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10532 - /vtigercrm/branches/5.0.3/modules/Webmails/functions.php Message-ID: <20070330094543.8FC507D2654@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 03:45:35 2007 New Revision: 10532 Log: fixes #3245 Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/functions.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/functions.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/functions.php Fri Mar 30 03:45:35 2007 @@ -235,7 +235,9 @@ "']*>.*?'si", "']*>'si" ); - $body = preg_replace($to_removed_array, '', $body); + $body = preg_replace($to_removed_array, '', $body); + //line added to fix #3245 + $body=preg_replace("/(http:\/\/|ftp:\/\/)([^\s,]*)/i","$1$2 target=_blank",$body ); $body = preg_replace("|href=\"(.*)script:|i", 'href="nocc_removed_script:', $body); $body = preg_replace("|<([^>]*)java|i", ']*)&{.*}([^>]*)>|i", "<&{;}\\3>", $body); From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 05:52:03 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 09:52:03 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10533 - /vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl Message-ID: <20070330095203.734547D2655@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 30 03:51:59 2007 New Revision: 10533 Log: text removed Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl Modified: vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl ============================================================================== --- vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl (original) +++ vtigercrm/branches/5.0.3/Smarty/templates/CustomFieldMapping.tpl Fri Mar 30 03:51:59 2007 @@ -1,4 +1,4 @@ -tamil{* +{* /********************************************************************************* ** The contents of this file are subject to the vtiger CRM Public License Version 1.0 * ("License"); You may not use this file except in compliance with the License From issybelly at goudurix.com Fri Mar 30 06:01:28 2007 From: issybelly at goudurix.com (Detain S. Humid) Date: Fri, 30 Mar 2007 10:01:28 +0000 Subject: [Vtigercrm-commits] Worried about your health? Message-ID: <0892568711.20070330100128@goudurix.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://scapeidaa.com Absolutely legal, licensed and CHEAP pills at your choice. Confidential purchase. Instant shipping! From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 07:48:56 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 11:48:56 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10534 - /vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Message-ID: <20070330114856.4D91E78D0CA@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 05:48:51 2007 New Revision: 10534 Log: fixes #3543 Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Mar 30 05:48:51 2007 @@ -167,7 +167,7 @@ { global $current_user; $this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1"); - echo "
     Could not connect to the server. Please check the server details Here . Please click here to go to your Emails module."; + echo "
     ".$mod_strings['LBL_MAIL_CONNECT_ERROR']." Here . Please ".$mod_strings['LBL_CLICK_HERE']."".$mod_strings['LBL_GOTO_EMAILS_MODULE']." "; exit; } } From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 07:49:16 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 11:49:16 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10535 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070330114916.1E14D7D265F@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 05:49:10 2007 New Revision: 10535 Log: fixes #3543 Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Mar 30 05:49:10 2007 @@ -135,7 +135,10 @@ 'LBL_EMAILS_TITLE'=>'Emails', 'LBL_MAIL_CONNECT_ERROR_INFO'=>'Error connecting mail server!
    Check in My Accounts->List Mail Server -> List Mail Account', // Added for 5.0.3 release +'LBL_MAIL_CONNECT_ERROR'=>'Could not connect to the mail server. Please check the mail server details', 'IN_REPLY_TO_THE_MESSAGE' => 'In reply to the message sent by ', +'LBL_CLICK_HERE' => 'Click Here ', +'LBL_GOTO_EMAILS_MODULE' => ' go to Emails module', 'LBL_NO_EMAILS'=>'No Emails In This Folder', 'LBL_MOVE_TO'=>'Move To...', 'LBL_DEL'=>'Del ', @@ -155,7 +158,6 @@ 'FROM' => 'From:', 'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', -//Added for 5.0.3 -'LBL_LOADING_IMAGE' => 'Loading Image', + ); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 07:50:38 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 11:50:38 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10536 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070330115038.728E278D0CA@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 05:50:34 2007 New Revision: 10536 Log: corrected checkin Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Mar 30 05:50:34 2007 @@ -158,6 +158,7 @@ 'FROM' => 'From:', 'IN'=>'in', 'ADD_FOLDER' => 'Add Folder[X]', - +//Added for 5.0.3 +'LBL_LOADING_IMAGE' => 'Loading Image', ); ?> From sharp at gloriousgospel.org Fri Mar 30 12:53:09 2007 From: sharp at gloriousgospel.org (Witticism P. Cruddy) Date: Fri, 30 Mar 2007 12:53:09 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5394260088.20070330125309@gloriousgospel.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/dbcd6bca/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Maribel.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/dbcd6bca/attachment.gif From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 08:13:05 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:13:05 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10537 - /vtigercrm/branches/5.0.3/install/2setConfig.php Message-ID: <20070330121305.690CB78D16E@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 06:13:00 2007 New Revision: 10537 Log: changed font set to italics Modified: vtigercrm/branches/5.0.3/install/2setConfig.php Modified: vtigercrm/branches/5.0.3/install/2setConfig.php ============================================================================== --- vtigercrm/branches/5.0.3/install/2setConfig.php (original) +++ vtigercrm/branches/5.0.3/install/2setConfig.php Fri Mar 30 06:13:00 2007 @@ -466,9 +466,9 @@ This will setup the + ConfigurationThis will setup the default currency which will be used for maintaining - transactions in vtiger. + transactions in vtiger. From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 08:32:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:32:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10538 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070330123249.340A87D2664@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 06:32:45 2007 New Revision: 10538 Log: removed unwanted print_r Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Fri Mar 30 06:32:45 2007 @@ -130,7 +130,8 @@ $ret .= '"subject":"'.substr($data[$i]->subject,0,40).'",'; $ret .= '"date":"'.substr($data[$i]->date,0,30).'",'; $ret .= '"from":"'.substr($data[$i]->from,0,20).'",'; - $ret .= '"to":"'.$data[$i]->to.'",'; + $ret .= '"to":"'.$data[$i]->to.'",'; + echo ' to field is ' .$data[$i]->to; $email = new Webmails($MailBox->mbox,$data[$i]->msgno); if($email->has_attachments) $ret .= '"attachments":"1"}'; @@ -265,6 +266,7 @@ //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); + echo ' 2 to is '.$val->to; $val->subject = utf8_decode(imap_utf8($val->subject)); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 08:33:19 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:33:19 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10539 - /vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Message-ID: <20070330123319.D139E7D2664@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 06:33:15 2007 New Revision: 10539 Log: removed unwanted echo Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/ListView.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/ListView.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/ListView.php Fri Mar 30 06:33:15 2007 @@ -266,7 +266,6 @@ //we have to do this utf8 decode for the fields which may contains special characters -- Mickie - 02-02-07 $val->from = utf8_decode(imap_utf8(addslashes($val->from))); $val->to = utf8_decode(imap_utf8(addslashes($val->to))); - echo ' 2 to is '.$val->to; $val->subject = utf8_decode(imap_utf8($val->subject)); ?> From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 08:57:35 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 12:57:35 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10540 - /vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Message-ID: <20070330125735.0364D7D266C@vtiger.fosslabs.com> Author: saraj Date: Fri Mar 30 06:57:31 2007 New Revision: 10540 Log: language support. Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/MailBox.php Fri Mar 30 06:57:31 2007 @@ -165,7 +165,7 @@ //try second string which has no tls or validate-cert if(!$this->mbox = @imap_open($connectString1, $this->login_username, $this->secretkey)) { - global $current_user; + global $current_user,$mod_strings; $this->db->println("CONNECTION ERROR - Could not be connected to the server using imap_open function through the connection strings $connectString and $connectString1"); echo "
     ".$mod_strings['LBL_MAIL_CONNECT_ERROR']." Here . Please ".$mod_strings['LBL_CLICK_HERE']."".$mod_strings['LBL_GOTO_EMAILS_MODULE']." "; exit; From krispy_k at gosportstherapy.com Fri Mar 30 06:59:51 2007 From: krispy_k at gosportstherapy.com (Thomas Bruce) Date: Fri, 30 Mar 2007 06:59:51 -0400 Subject: [Vtigercrm-commits] pogasit altar Message-ID: <5645144678.20070330065951@gosportstherapy.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/a9215e95/attachment-0001.html From vtigercrm-commits at vtiger.fosslabs.com Fri Mar 30 09:25:49 2007 From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com) Date: Fri, 30 Mar 2007 13:25:49 -0000 Subject: [Vtigercrm-commits] [vtiger-commits] r10541 - /vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Message-ID: <20070330132549.C86767D2650@vtiger.fosslabs.com> Author: richie Date: Fri Mar 30 07:25:42 2007 New Revision: 10541 Log: changed All Mails to Emails Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Modified: vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php ============================================================================== --- vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php (original) +++ vtigercrm/branches/5.0.3/modules/Webmails/language/en_us.lang.php Fri Mar 30 07:25:42 2007 @@ -147,7 +147,7 @@ 'LABEL_DATE'=>'Date', 'LBL_NO_IFRAMES_SUPPORTED'=>'No Iframes supported', 'LBL_EMAIL_ATTACHMENTS'=>'Email Attachments:', -'LBL_ALLMAILS'=>'All Mails', +'LBL_ALLMAILS'=>'Emails', 'LBL_TO_USERS'=>'To Users', 'LBL_TO_GROUPS'=>'To Groups', 'SUBJECT' => 'Subject', From rblase at goldsealwindows.com Fri Mar 30 10:40:00 2007 From: rblase at goldsealwindows.com (Luminously F. Wineries) Date: Fri, 30 Mar 2007 10:40:00 -0400 Subject: [Vtigercrm-commits] See the results after using V1 agra Message-ID: <9384944219.20070330104000@goldsealwindows.com> The most powerful medicines for you! Vlragra Soft Tabs - $3.86 - are mint flavored soft tablets for the treatment of male erectile dysfunction. They are equivalent to regular Vlragra, however due to their soft formulation, they are absorbed directly into the bloodstream. As such, they contain a much smaller dosage of Sildenafil Citrate to achieve the same result. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Lipitor - $1.42 - used with diet changes to reduce the amount of cholesterol and certain fatty substances in the blood. Lowering blood levels of cholesterol and fats may help to prevent heart disease, angina, strokes, and heart attacks. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From pelletier at gotraining.us Fri Mar 30 09:43:20 2007 From: pelletier at gotraining.us (Angularity J. Rinsing) Date: Fri, 30 Mar 2007 09:43:20 -0400 Subject: [Vtigercrm-commits] Tired with your poor health? Message-ID: <7664821821.20070330094320@gotraining.us> The answer is simple: Online LegalRXMedications drug store. We have cheapest prices and best quality drugs. We ship instantly worldwide, so you don't need to go to your local drug store. http://scapeidaa.com Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From crusherjs at greenlightconsulting.net Fri Mar 30 13:38:14 2007 From: crusherjs at greenlightconsulting.net (Compendium Q. Explicable) Date: Fri, 30 Mar 2007 17:38:14 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4747275593.20070330173814@greenlightconsulting.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/d2fc1af4/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: love.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/d2fc1af4/attachment.gif From extrato at greatlakescichlidsociety.com Fri Mar 30 12:52:38 2007 From: extrato at greatlakescichlidsociety.com (Catherine Wiley) Date: Fri, 30 Mar 2007 12:52:38 -0400 Subject: [Vtigercrm-commits] chut hochu Message-ID: <7489202974.20070330125238@greatlakescichlidsociety.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/a972872d/attachment-0001.html From frimjob at graupintors.com Fri Mar 30 16:21:29 2007 From: frimjob at graupintors.com (Terry Beard) Date: Fri, 30 Mar 2007 16:21:29 -0400 Subject: [Vtigercrm-commits] stoiala zastoialis Message-ID: <2894881772.20070330162129@graupintors.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/68242e91/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: widespread.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/68242e91/attachment.gif From karyn at goldinvestor.com Fri Mar 30 21:39:00 2007 From: karyn at goldinvestor.com (Vizor L. Berrying) Date: Fri, 30 Mar 2007 21:39:00 -0400 Subject: [Vtigercrm-commits] Want to cure yourself? Message-ID: <9078998343.20070330213900@goldinvestor.com> You can buy absolutely legal, perfect quality must have medications at lowest prices just in few minutes! You don't believe it? Then visit US Drug store http://scapeidaa.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From rita.purohit at greghodges.com Fri Mar 30 14:50:20 2007 From: rita.purohit at greghodges.com (Elizabeth Hinton) Date: Fri, 30 Mar 2007 14:50:20 -0400 Subject: [Vtigercrm-commits] olsen etih Message-ID: <3619893283.20070330145020@greghodges.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/b483540e/attachment-0001.html From rodriguez at gnpm-inc.com Fri Mar 30 18:52:23 2007 From: rodriguez at gnpm-inc.com (Dr. Aaron Hendricks) Date: Fri, 30 Mar 2007 22:52:23 +0000 Subject: [Vtigercrm-commits] FYEO Message-ID: <7120267864.20070330225223@gnpm-inc.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/0f6b211a/attachment-0001.html From ajc at graphycad.com Sat Mar 31 01:11:40 2007 From: ajc at graphycad.com (Agency G. Contortionists) Date: Sat, 31 Mar 2007 01:11:40 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <8698779724.20070331011140@graphycad.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://scapeidaa.com Make secure and confidential purchase and you don't have to visit your local drug store. Friendly support. Instant shipping worldwide! From isteg at granada-apartments.com Fri Mar 30 18:07:06 2007 From: isteg at granada-apartments.com (Fred Conrad) Date: Fri, 30 Mar 2007 18:07:06 -0400 Subject: [Vtigercrm-commits] korotyshka tebia Message-ID: <7950276122.20070330180706@granada-apartments.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/4fd1538e/attachment-0001.html From extrmeteam at gnnetcom.fr Sat Mar 31 01:46:38 2007 From: extrmeteam at gnnetcom.fr (Privileging A. Mohammedans) Date: Sat, 31 Mar 2007 01:46:38 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <3035884696.20070331014638@gnnetcom.fr> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/1b06ad30/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: bagel.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/1b06ad30/attachment.gif From istofer.liew at glennen.freeserve.co.uk Fri Mar 30 21:43:19 2007 From: istofer.liew at glennen.freeserve.co.uk (Tara Hancock) Date: Fri, 30 Mar 2007 21:43:19 -0400 Subject: [Vtigercrm-commits] vyrazhenie soboj Message-ID: <5930743132.20070330214319@glennen.freeserve.co.uk> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/cf8f5409/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: trite.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/cf8f5409/attachment.gif From norman at greatlakesorganic.com Fri Mar 30 19:19:37 2007 From: norman at greatlakesorganic.com (Robert Goff) Date: Fri, 30 Mar 2007 19:19:37 -0400 Subject: [Vtigercrm-commits] nepodhodiashchij starostoj Message-ID: <1900356684.20070330191937@greatlakesorganic.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/869554eb/attachment-0001.html From istevenson at gossinternational.com Fri Mar 30 22:59:57 2007 From: istevenson at gossinternational.com (Wolfing F. Incubus) Date: Sat, 31 Mar 2007 02:59:57 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4922095542.20070331025957@gossinternational.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/c525f23c/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: Jeffrey.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/c525f23c/attachment.gif From extremrage at gordlau.com Fri Mar 30 23:05:04 2007 From: extremrage at gordlau.com (Curacao J. Brahma) Date: Sat, 31 Mar 2007 03:05:04 +0000 Subject: [Vtigercrm-commits] Usefull information about drugs Message-ID: <6674817796.20070331030504@gordlau.com> The most powerful medicines for you! Proprecia - $1.03 - first and only FDA-approved pill demonstrated to treat male pattern hair loss on the vertex (top of head) and anterior mid-scalp area (middle front of head) in men only. Altace - $1.14 - Effective in people aged 55 and over, ALTACE may help in reducing the risk of heart attack, stroke or cardiovascular death. Soothenol - $1.08 - safe and soothing formula is intended to ease the symptoms of PMS. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From istenkut at gpac.com Fri Mar 30 21:55:32 2007 From: istenkut at gpac.com (Andrew Cochran) Date: Fri, 30 Mar 2007 21:55:32 -0400 Subject: [Vtigercrm-commits] tishiny obormot Message-ID: <1639752929.20070330215532@gpac.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/c5e6efa7/attachment-0001.html From saishikawa at gratiotdesign.com Sat Mar 31 05:17:06 2007 From: saishikawa at gratiotdesign.com (Cohabits B. Laughing) Date: Sat, 31 Mar 2007 05:17:06 -0400 Subject: [Vtigercrm-commits] Change your sexual life for the better Message-ID: <1027708365.20070331051706@gratiotdesign.com> With Viagra and Cialis pills from Canada Pharmacy store! There is no need to pay more just buy erectile dysfunction medications online at lowest prices on the web. http://scapeidaa.com Only Secure and Confidential purchase! Verified buy VISA! From d.michael_merino at glover.lib.ok.us Fri Mar 30 23:25:42 2007 From: d.michael_merino at glover.lib.ok.us (Hank Massey) Date: Fri, 30 Mar 2007 23:25:42 -0400 Subject: [Vtigercrm-commits] spasaete miasom Message-ID: <6125842305.20070330232542@glover.lib.ok.us> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070330/e54278b3/attachment-0001.html From istith at grolink.com Sat Mar 31 07:46:28 2007 From: istith at grolink.com (Appendectomy J. Albion) Date: Sat, 31 Mar 2007 07:46:28 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4089210056.20070331074628@grolink.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f9d48652/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: roomiest.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f9d48652/attachment.gif From istafford at gntimport.com Sat Mar 31 02:55:35 2007 From: istafford at gntimport.com (Rots H. Scatterbrains) Date: Sat, 31 Mar 2007 06:55:35 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <0449634275.20070331065535@gntimport.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/31bea3a3/attachment-0001.html From istianto_a at go4indiabusiness.com Sat Mar 31 08:36:56 2007 From: istianto_a at go4indiabusiness.com (Trappist I. Atherosclerosis) Date: Sat, 31 Mar 2007 08:36:56 -0400 Subject: [Vtigercrm-commits] Few steps to become healthy! Message-ID: <2216722172.20070331083656@go4indiabusiness.com> Viagra, Cialis, Levitra, Meridia, Valium, Xanax, HGH and even more! All this you can find at LegalRXMedications drug store. Legal and cheap pills only. http://scapeidaa.com Make sure that it is actually true! Confidential and secure purchase! Friendly support! Instant shipping worldwide! From bob.korte at gnld.com.au Sat Mar 31 03:54:41 2007 From: bob.korte at gnld.com.au (Amy Rocha) Date: Sat, 31 Mar 2007 03:54:41 -0400 Subject: [Vtigercrm-commits] videl uzhe Message-ID: <6139788829.20070331035441@gnld.com.au> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/3179cf96/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: pepper.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/3179cf96/attachment.gif From istopsandiego at ghaneminsurance.com Sat Mar 31 02:04:34 2007 From: istopsandiego at ghaneminsurance.com (Christopher Benson) Date: Sat, 31 Mar 2007 02:04:34 -0400 Subject: [Vtigercrm-commits] posledniaia brovi Message-ID: <5570808253.20070331020434@ghaneminsurance.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f6559b64/attachment-0001.html From dave-diggs at giacomotazzi.com Sat Mar 31 06:02:41 2007 From: dave-diggs at giacomotazzi.com (Whip O. Nib) Date: Sat, 31 Mar 2007 10:02:41 +0000 Subject: [Vtigercrm-commits] Can't find good drug store? Message-ID: <9331086086.20070331100241@giacomotazzi.com> There is no need to let everybody know that you have health problems. You want to save your money and get licensed medications? I bet you do! Then click here: http://scapeidaa.com Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From davdor at gilmancorp.com Sat Mar 31 04:16:48 2007 From: davdor at gilmancorp.com (Teresa Hughes) Date: Sat, 31 Mar 2007 04:16:48 -0400 Subject: [Vtigercrm-commits] smerti vospriiatie Message-ID: <8908879100.20070331041648@gilmancorp.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/8a582b51/attachment-0001.html From mcleod at ghigny.com Sat Mar 31 12:22:38 2007 From: mcleod at ghigny.com (Caprice T. Groveler) Date: Sat, 31 Mar 2007 12:22:38 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <6503084461.20070331122238@ghigny.com> We can help you anytime! Various medications for any case! Lowest prices you can find anywhere. Only legal and quality pills here: http://scapeidaa.com And improve your sexual life! Only Confidential purchase. Verified by VISA! From scarecrowmail at gradybritton.com Sat Mar 31 12:36:33 2007 From: scarecrowmail at gradybritton.com (Lumbermen H. Embezzler) Date: Sat, 31 Mar 2007 12:36:33 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <4877147412.20070331123633@gradybritton.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/9cb67ee3/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: ganglia.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/9cb67ee3/attachment.gif From sylvester at globdesign.com Sat Mar 31 05:35:59 2007 From: sylvester at globdesign.com (Bill Foreman) Date: Sat, 31 Mar 2007 05:35:59 -0400 Subject: [Vtigercrm-commits] viazli zaezzhij Message-ID: <9679949198.20070331053559@globdesign.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/d1bb66c2/attachment-0001.html From sesnyder at go2anr.com.au Sat Mar 31 10:08:31 2007 From: sesnyder at go2anr.com.au (Calyces H. Farewell) Date: Sat, 31 Mar 2007 14:08:31 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <9818348334.20070331140831@go2anr.com.au> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/faf5b0bc/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: splinter.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/faf5b0bc/attachment.gif From mark_ng at groceryinsider.com Sat Mar 31 10:27:18 2007 From: mark_ng at groceryinsider.com (Wendy Hurst) Date: Sat, 31 Mar 2007 10:27:18 -0400 Subject: [Vtigercrm-commits] gorlo etoj Message-ID: <1136640001.20070331102718@groceryinsider.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f08faded/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: whichever.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/f08faded/attachment.gif From larkin at getbuf.com Sat Mar 31 15:27:05 2007 From: larkin at getbuf.com (Wooliest S. Babushkas) Date: Sat, 31 Mar 2007 15:27:05 -0400 Subject: [Vtigercrm-commits] Get medications for your cure! Message-ID: <9985335949.20070331152705@getbuf.com> We know solution you are looking for! Viagra, Cialis, Viagra Pro, Cialis Soft ? the right choice you can make! We offer only legal and licensed medications. Cheapest prices you ever seen. http://scapeidaa.com Make secure and confidential purchase. Nobody will know that you are using medications. Buying at our store - the right choice you can make! From corbett at glasscock.org Sat Mar 31 07:43:13 2007 From: corbett at glasscock.org (Bridget Schmidt) Date: Sat, 31 Mar 2007 07:43:13 -0400 Subject: [Vtigercrm-commits] delo silah Message-ID: <0935565890.20070331074313@glasscock.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/121d19f9/attachment-0001.html From crushgrove at gh-ca.com Sat Mar 31 09:38:40 2007 From: crushgrove at gh-ca.com (Candace Cochran) Date: Sat, 31 Mar 2007 09:38:40 -0400 Subject: [Vtigercrm-commits] lecheniia bolshim Message-ID: <6652849679.20070331093840@gh-ca.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/5959e2c3/attachment-0001.html From horne at graphicfactory.com Sat Mar 31 11:59:19 2007 From: horne at graphicfactory.com (Pithy G. Disarray) Date: Sat, 31 Mar 2007 15:59:19 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <1231633649.20070331155919@graphicfactory.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/075ba71b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: corsage.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/075ba71b/attachment.gif From extremecase at getmygames.com Sat Mar 31 17:58:00 2007 From: extremecase at getmygames.com (Destitute U. Rued) Date: Sat, 31 Mar 2007 17:58:00 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <2701411504.20070331175800@getmygames.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/07e781be/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: unfurl.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/07e781be/attachment.gif From sadurrani at godoyle.com Sat Mar 31 19:17:03 2007 From: sadurrani at godoyle.com (Wing V. Leukocyte) Date: Sat, 31 Mar 2007 19:17:03 -0400 Subject: [Vtigercrm-commits] Top pills at low prices. Message-ID: <9429251610.20070331191703@godoyle.com> With Viagra and Cialis from LegalRXMedications drug store you will have perfect sex. You will have sex all night long. You won't think about erectile dysfunction anymore. http://scapeidaa.com There is no need to parade your problems. There is no need to visit your local drug store. Cheapest Viagra and Cialis you can find! Instant shipping worldwide! From alee at gonzoradio.org Sat Mar 31 11:33:41 2007 From: alee at gonzoradio.org (Steven Gregory) Date: Sat, 31 Mar 2007 11:33:41 -0400 Subject: [Vtigercrm-commits] meshalo kakoeto Message-ID: <3691300134.20070331113341@gonzoradio.org> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/5658885e/attachment-0001.html From hewaiau at glennscarpet.com Sat Mar 31 15:14:03 2007 From: hewaiau at glennscarpet.com (Gang Q. Muralist) Date: Sat, 31 Mar 2007 19:14:03 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <0757110770.20070331191403@glennscarpet.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/96ef0c32/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: prophetically.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/96ef0c32/attachment.gif From sdmrt-ls at globeinternationalltd.com Sat Mar 31 15:18:35 2007 From: sdmrt-ls at globeinternationalltd.com (Dr. Andrew Ortiz) Date: Sat, 31 Mar 2007 19:18:35 +0000 Subject: [Vtigercrm-commits] FYEO Message-ID: <0508723319.20070331191835@globeinternationalltd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/8424cfe9/attachment-0001.html From extremesoftware at grafikando.com Sat Mar 31 18:22:32 2007 From: extremesoftware at grafikando.com (Daniel Randall) Date: Sat, 31 Mar 2007 18:22:32 -0400 Subject: [Vtigercrm-commits] chtoby nekotorye Message-ID: <5978478305.20070331182232@grafikando.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/7ff85daf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: dungeon.gif Type: image/gif Size: 10199 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/7ff85daf/attachment.gif From istek at globalsoftit.com Sat Mar 31 18:26:44 2007 From: istek at globalsoftit.com (Keenest M. Advent) Date: Sat, 31 Mar 2007 22:26:44 +0000 Subject: [Vtigercrm-commits] TOP SECRET! Message-ID: <0969334645.20070331222644@globalsoftit.com> The most powerful medicines for you! Prokzac - $3.31 - one of the world's most widely prescribed antidepressants; it has been prescribed for more than 40 million people worldwide. Chances are, someone you know is getting better because of it. Wellbutrin SR - $3 - antidepressant used to treat depression. Aciphex - $1.08 - used for the treatment of persistent, frequent heartburn and other symptoms associated with acid reflux disease. Persistent and frequent occurrences are classified as 2 or more days a week. and more! our site http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== From extronic at gonzvalabogados.com Sat Mar 31 23:31:25 2007 From: extronic at gonzvalabogados.com (Slough G. Cormorant) Date: Sat, 31 Mar 2007 23:31:25 -0400 Subject: [Vtigercrm-commits] Why don't you buy some medications to be healthy? Message-ID: <9547139218.20070331233125@gonzvalabogados.com> US Drug store presents lots of medications at cheapest prices. You won't find such prices in United States or even Canada. We sell legal and quality pills, our friendly support will help you anytime you need. http://scapeidaa.com Even your sexual partner won't know you are using Viagra if you'll buy it here. CONFIDENTIAL and SECURE purchase. Instant shipping! From muzteach at globaltechweb.com Sat Mar 31 15:56:30 2007 From: muzteach at globaltechweb.com (Zachary Anderson) Date: Sat, 31 Mar 2007 15:56:30 -0400 Subject: [Vtigercrm-commits] szhimaia obitaniia Message-ID: <9139171932.20070331155630@globaltechweb.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/17a00f1f/attachment-0001.html From heard at goodonebooks.com Sat Mar 31 23:56:08 2007 From: heard at goodonebooks.com (Telemetry Q. Spartacus) Date: Sat, 31 Mar 2007 23:56:08 -0400 Subject: [Vtigercrm-commits] (no subject) Message-ID: <7834936716.20070331235608@goodonebooks.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/40734dcf/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: unemotional.gif Type: image/gif Size: 5490 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/40734dcf/attachment.gif From extrovert_angel at grantsynergy.net Sat Mar 31 17:48:04 2007 From: extrovert_angel at grantsynergy.net (Friedrick Webb) Date: Sat, 31 Mar 2007 17:48:04 -0400 Subject: [Vtigercrm-commits] tam lezet Message-ID: <7321108105.20070331174804@grantsynergy.net> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/ae30782e/attachment-0001.html From bmw at grandstandsports.com Sat Mar 31 21:37:43 2007 From: bmw at grandstandsports.com (Chisholm S. Lexicographer) Date: Sun, 01 Apr 2007 01:37:43 +0000 Subject: [Vtigercrm-commits] International Legal RX Message-ID: <7219249232.20070401013743@grandstandsports.com> Welcome to International RX! - Best quality drugs - Special Internet prices - Fast and discreet worldwide shipping - Friendly customer support Men's Health Anti-Depressants Pain Relief General health Weight loss Anti-biotics Anti-herpes Women's health Anti-diabetic Blood Pressure/Cholesterol Anti-Allergic/Asthma Anti-Acidity View Full Products List http://scapeidaa.com dfglirsjiel R0ZaU1BDUUFZGFJdXllcRUFzWFxCRkAaQ0VbVFFHUkBeGlZeXw== -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/41e2ed2b/attachment-0001.html From extraloutfi at golfterrebonne.ca Sat Mar 31 20:01:18 2007 From: extraloutfi at golfterrebonne.ca (Joseph Santos) Date: Sat, 31 Mar 2007 20:01:18 -0400 Subject: [Vtigercrm-commits] dazhe leteli Message-ID: <1625614939.20070331200118@golfterrebonne.ca> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/0dade1f5/attachment-0001.html From gardenmstr at global-transactions-ltd.com Sat Mar 31 21:26:39 2007 From: gardenmstr at global-transactions-ltd.com (Stephanie Rosales) Date: Sat, 31 Mar 2007 21:26:39 -0400 Subject: [Vtigercrm-commits] etih golovu Message-ID: <9778367196.20070331212639@global-transactions-ltd.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070331/230b6207/attachment-0001.html From post at glassdude.com Sat Mar 31 23:57:17 2007 From: post at glassdude.com (Jinx T. Shrubbed) Date: Sun, 01 Apr 2007 03:57:17 +0000 Subject: [Vtigercrm-commits] (no subject) Message-ID: <5017468788.20070401035717@glassdude.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d255dd6b/attachment-0001.html -------------- next part -------------- A non-text attachment was scrubbed... Name: shareholders.gif Type: image/gif Size: 3260 bytes Desc: not available Url : http://lists.vtigercrm.com/pipermail/vtigercrm-commits/attachments/20070401/d255dd6b/attachment.gif
    Currency - Configuration
    Name*